Updated handling of types with constructor members (the new() method) (dart-archive#66)

Author: derekxu16

lib/base.ts

@@ -69,6 +69,7 @@ export class ImportSummary {
   asPrefix: string;
 }
 
+export type Constructor = ts.ConstructorDeclaration|ts.ConstructSignatureDeclaration;
 export type ClassLike = ts.ClassLikeDeclaration|ts.InterfaceDeclaration;
 export type NamedDeclaration = ClassLike|ts.PropertyDeclaration|ts.VariableDeclaration|
                                ts.MethodDeclaration|ts.ModuleDeclaration|ts.FunctionDeclaration;
@@ -115,7 +116,8 @@ export function isExtendsClause(heritageClause: ts.HeritageClause) {
   return heritageClause.token === ts.SyntaxKind.ExtendsKeyword &&
       !ts.isInterfaceDeclaration(heritageClause.parent);
 }
-export function isConstructor(n: ts.Node): boolean {
+
+export function isConstructor(n: ts.Node): n is Constructor {
   return ts.isConstructorDeclaration(n) || ts.isConstructSignatureDeclaration(n);
 }
 
@@ -274,6 +276,16 @@ export function copyLocation(src: ts.Node, dest: ts.Node) {
   dest.parent = src.parent;
 }
 
+export function cloneNodeArray<T extends ts.Node>(src?: ts.NodeArray<T>): ts.NodeArray<T>|
+    undefined {
+  if (!src) {
+    return undefined;
+  }
+  const clone = ts.createNodeArray(src.map(ts.getMutableClone));
+  copyNodeArrayLocation(src, clone);
+  return clone;
+}
+
 export function copyNodeArrayLocation(src: ts.TextRange, dest: ts.NodeArray<any>) {
   dest.pos = src.pos;
   dest.end = src.end;

lib/declaration.ts

@@ -295,6 +295,10 @@ export default class DeclarationTranspiler extends base.TranspilerBase {
           let propertyDecl = <ts.PropertyDeclaration|ts.VariableDeclaration>node;
           // We need to emit these as properties not fields.
           if (!this.promoteFunctionLikeMembers || !isFunctionLikeProperty(propertyDecl, this.tc)) {
+            // Suppress the prototype member
+            if (base.ident(propertyDecl.name) === 'prototype') {
+              return;
+            }
             orderedGroups.push([node]);
             return;
           }
@@ -611,18 +615,17 @@ export default class DeclarationTranspiler extends base.TranspilerBase {
         this.emit('/* WARNING: export assignment not yet supported. */\n');
         break;
       case ts.SyntaxKind.TypeAliasDeclaration: {
-        // Object literal type alias declarations can be treated like interface declarations.
-        let alias = <ts.TypeAliasDeclaration>node;
-        let type = alias.type;
-        if (type.kind === ts.SyntaxKind.TypeLiteral) {
-          let literal = <ts.TypeLiteralNode>type;
+        const alias = <ts.TypeAliasDeclaration>node;
+        const type = alias.type;
+        if (ts.isTypeLiteralNode(type)) {
+          // Object literal type alias declarations can be treated like interface declarations.
+          const literal = type;
           this.emit('@anonymous\n@JS()\n');
           this.visitClassLikeHelper(
               'abstract class', literal, alias.name, alias.typeParameters, null);
-        } else if (type.kind === ts.SyntaxKind.FunctionType) {
+        } else if (ts.isFunctionTypeNode(type)) {
           // Function type alias definitions are equivalent to dart typedefs.
-          this.visitFunctionTypedefInterface(
-              base.ident(alias.name), type as ts.FunctionTypeNode, alias.typeParameters);
+          this.visitFunctionTypedefInterface(base.ident(alias.name), type, alias.typeParameters);
         } else {
           this.enterCodeComment();
           if (ts.isMappedTypeNode(alias.type)) {
@@ -691,6 +694,17 @@ export default class DeclarationTranspiler extends base.TranspilerBase {
       case ts.SyntaxKind.Constructor:
       case ts.SyntaxKind.ConstructSignature: {
         const ctorDecl = <ts.ConstructorDeclaration>node;
+        if (ts.isTypeLiteralNode(node.parent)) {
+          // All constructors within TypeLiteralNodes should have been merged into corresponding
+          // classes. The only exception is this case, where there exist aliases to those literals.
+          this.emit('// Skipping constructor from aliased type.\n');
+          this.enterCodeComment();
+          this.emit('new');
+          this.visitParameters(ctorDecl.parameters, {namesOnly: false});
+          this.emitNoSpace(';');
+          this.exitCodeComment();
+          break;
+        }
         // Find containing class name.
         let classDecl = base.getEnclosingClass(ctorDecl);
         if (!classDecl) this.reportError(ctorDecl, 'cannot find outer class node');
@@ -802,7 +816,7 @@ export default class DeclarationTranspiler extends base.TranspilerBase {
         this.fc.visitTypeName(name);
       }
 
-      if (fn.typeParameters) {
+      if (fn.typeParameters && fn.typeParameters.length > 0) {
         let insideComment = this.insideCodeComment;
         if (!insideComment) {
           this.enterCodeComment();
@@ -928,7 +942,7 @@ export default class DeclarationTranspiler extends base.TranspilerBase {
       this.emitNoSpace('Extensions');
     }
 
-    if (typeParameters) {
+    if (typeParameters && typeParameters.length > 0) {
       this.emit('<');
       this.enterTypeArguments();
       this.visitList(typeParameters);

lib/main.ts

@@ -194,7 +194,7 @@ export class Transpiler {
     });
 
     sourceFiles.forEach((f: ts.SourceFile) => {
-      const dartCode = this.translate(f);
+      const dartCode = this.translate(f, fileSet);
 
       if (destination) {
         const outputFile = this.getOutputPath(path.resolve(f.fileName), destination);
@@ -219,7 +219,7 @@ export class Transpiler {
         .filter(
             (sourceFile: ts.SourceFile) =>
                 (!sourceFile.fileName.match(/\.d\.ts$/) && !!sourceFile.fileName.match(/\.[jt]s$/)))
-        .forEach((f) => paths[f.fileName] = this.translate(f));
+        .forEach((f) => paths[f.fileName] = this.translate(f, new Set([f.fileName])));
     this.checkForErrors(program);
     return paths;
   }
@@ -278,7 +278,7 @@ export class Transpiler {
     this.outputStack.pop();
   }
 
-  private translate(sourceFile: ts.SourceFile): string {
+  private translate(sourceFile: ts.SourceFile, fileSet: Set<string>): string {
     this.currentFile = sourceFile;
     this.outputs = [];
     this.outputStack = [];
@@ -288,7 +288,7 @@ export class Transpiler {
     }
 
     this.lastCommentIdx = -1;
-    merge.normalizeSourceFile(sourceFile, this.fc, this.options.explicitStatic);
+    merge.normalizeSourceFile(sourceFile, this.fc, fileSet, this.options.explicitStatic);
     this.pushContext(OutputContext.Default);
     this.visit(sourceFile);
     this.popContext();