Added --explicit-static flag

This flag allows the user to disable the default behavior of assuming
that all properties declared on the anonymous types of top level
variable declarations are static

Author: derekxu16

index.js

@@ -4,8 +4,12 @@ const main = require('./build/lib/main.js');
 
 var args = require('minimist')(process.argv.slice(2), {
   base: 'string',
-  boolean: ['semantic-diagnostics', 'generate-html'],
-  alias: {'semantic-diagnostics': 'semanticDiagnostics', 'generate-html': 'generateHTML'}
+  boolean: ['semantic-diagnostics', 'generate-html', 'explicit-static'],
+  alias: {
+    'semantic-diagnostics': 'semanticDiagnostics',
+    'generate-html': 'generateHTML',
+    'explicit-static': 'explicitStatic'
+  }
 });
 try {
   var transpiler = new main.Transpiler(args);

lib/main.ts

@@ -45,6 +45,11 @@ export interface TranspilerOptions {
    * Generate browser API facades instead of importing them from dart:html.
    */
   generateHTML?: boolean;
+  /**
+   * Do not assume that all properties declared on the anonymous types of top level variable
+   * declarations are static.
+   */
+  explicitStatic?: boolean;
 
   /**
    * Experimental JS Interop specific option to promote properties with function
@@ -255,7 +260,7 @@ export class Transpiler {
     }
 
     this.lastCommentIdx = -1;
-    merge.normalizeSourceFile(sourceFile, this.fc);
+    merge.normalizeSourceFile(sourceFile, this.fc, this.options.explicitStatic);
     this.pushContext(OutputContext.Default);
     this.visit(sourceFile);
     this.popContext();

lib/merge.ts

@@ -227,7 +227,7 @@ export class MergedTypeParameters {
 /**
  * Normalize a SourceFile
  */
-export function normalizeSourceFile(f: ts.SourceFile, fc: FacadeConverter) {
+export function normalizeSourceFile(f: ts.SourceFile, fc: FacadeConverter, explicitStatic = false) {
   let modules: Map<string, ts.ModuleDeclaration> = new Map();
 
   // Merge top level modules.
@@ -375,24 +375,26 @@ export function normalizeSourceFile(f: ts.SourceFile, fc: FacadeConverter) {
                         break;
                       }
 
-                      // Finds all existing declarations of this property in the inheritance
-                      // hierarchy of this class
-                      const existingDeclarations =
-                          findPropertyInHierarchy(base.ident(member.name), existing, classes);
-
-                      if (existingDeclarations.size) {
-                        // TODO(derekx): For dom.d.ts it makes sense to make all properties that are
-                        // declared on the anonymous types of top level variable declarations
-                        // static, but this may not always be correct
-                        for (const existingDecl of existingDeclarations) {
-                          addModifier(existingDecl, ts.createModifier(ts.SyntaxKind.StaticKeyword));
+                      if (!explicitStatic) {
+                        // Finds all existing declarations of this property in the inheritance
+                        // hierarchy of this class
+                        const existingDeclarations =
+                            findPropertyInHierarchy(base.ident(member.name), existing, classes);
+
+                        if (existingDeclarations.size) {
+                          for (const existingDecl of existingDeclarations) {
+                            addModifier(
+                                existingDecl, ts.createModifier(ts.SyntaxKind.StaticKeyword));
+                          }
                         }
                       }
 
                       // If needed, add declaration of property to the interface that we are
                       // currently handling
                       if (!findPropertyInClass(base.ident(member.name), existing)) {
-                        addModifier(member, ts.createModifier(ts.SyntaxKind.StaticKeyword));
+                        if (!explicitStatic) {
+                          addModifier(member, ts.createModifier(ts.SyntaxKind.StaticKeyword));
+                        }
                         member.parent = existing;
                         Array.prototype.push.call(members, member);
                       }

test/declaration_test.ts

@@ -522,8 +522,9 @@ abstract class AbstractRange {
 }`);
   });
 
-  it('makes properties of top level variables with anonymous types static', () => {
-    expectTranslate(`
+  describe('emitting properties of top level variables with anonymous types as static', () => {
+    it('performs this by default', () => {
+      expectTranslate(`
      declare interface CacheBase {
       readonly CHECKING: number;
       readonly DOWNLOADING: number;
@@ -538,9 +539,7 @@ abstract class AbstractRange {
       readonly CHECKING: number;
       readonly DOWNLOADING: number;
       readonly IDLE: number;
-    };
-
-     `).to.equal(`@anonymous
+    };`).to.equal(`@anonymous
 @JS()
 abstract class CacheBase {
   external static num get CHECKING;
@@ -555,6 +554,45 @@ abstract class MyCache implements CacheBase {
   external static num get DOWNLOADING;
   external static num get IDLE;
 }`);
+    });
+
+    it('but not when the --explicit-static flag is set', () => {
+      const explicitStaticOpts = {failFast: true, explicitStatic: true};
+      expectTranslate(
+          `
+     declare interface CacheBase {
+      readonly CHECKING: number;
+      readonly DOWNLOADING: number;
+      readonly IDLE: number;
+    }
+    
+    declare interface MyCache extends CacheBase {}
+    
+    declare var MyCache: {
+      prototype: MyCache;
+      new (): MyCache;
+      readonly CHECKING: number;
+      readonly DOWNLOADING: number;
+      readonly IDLE: number;
+    };`,
+          explicitStaticOpts)
+          .to.equal(`@anonymous
+@JS()
+abstract class CacheBase {
+  external num get CHECKING;
+  external num get DOWNLOADING;
+  external num get IDLE;
+  external factory CacheBase({num CHECKING, num DOWNLOADING, num IDLE});
+}
+
+@JS("MyCache")
+abstract class MyCache implements CacheBase {
+  external factory MyCache();
+  external num get CHECKING;
+  external num get DOWNLOADING;
+  external num get IDLE;
+}`);
+    });
   });
 });