Emit the types in declaration file

Author: sheetalkamat

src/compiler/checker.ts

@@ -94,19 +94,14 @@ module ts {
         return sourceMapDataList;
     }
 
-    interface TextWriter {
-        write(s: string): void;
+    interface EmitTextWriter extends TextWriter {
         writeLiteral(s: string): void;
-        writeLine(): void;
-        increaseIndent(): void;
-        decreaseIndent(): void;
         getTextPos(): number;
         getLine(): number;
         getColumn(): number;
-        getText(): string;
     }
 
-    function createTextWriter(): TextWriter {
+    function createTextWriter(): EmitTextWriter {
         var output = "";
         var indent = 0;
         var lineStart = true;
@@ -1851,6 +1846,7 @@ module ts {
         var increaseIndent = writer.increaseIndent;
         var decreaseIndent = writer.decreaseIndent;
 
+        var enclosingDeclaration: Node;
         function emitLines(nodes: Node[]) {
             for (var i = 0, n = nodes.length; i < n; i++) {
                 emitNode(nodes[i]);
@@ -1874,6 +1870,7 @@ module ts {
 
         function emitSourceFile(node: SourceFile) {
             currentSourceFile = node;
+            enclosingDeclaration = node;
             emitLines(node.statements);
         }
 
@@ -1969,13 +1966,16 @@ module ts {
                     write(".");
                     emitSourceTextOfNode(node.name);
                 }
+                var prevEnclosingDeclaration = enclosingDeclaration;
+                enclosingDeclaration = node;
                 write(" {");
                 writeLine();
                 increaseIndent();
                 emitLines((<Block>node.body).statements);
                 decreaseIndent();
                 write("}");
                 writeLine();
+                enclosingDeclaration = prevEnclosingDeclaration;
             }
         }
 
@@ -2010,9 +2010,8 @@ module ts {
                 emitSourceTextOfNode(node.name);
                 if (node.constraint) {
                     write(" extends ");
-                    // TODO(shkamat): emit constraint using type
-                    emitSourceTextOfNode(node.constraint);
-                }
+                    resolver.writeTypeAtLocation(node.constraint, enclosingDeclaration, TypeFormatFlags.None, writer);
+                }   
             }
 
             if (typeParameters) {
@@ -2023,10 +2022,13 @@ module ts {
         }
 
         function emitHeritageClause(typeReferences: TypeReferenceNode[], isImplementsList: boolean) {
+            function emitTypeOfTypeReference(node: Node) {
+                resolver.writeTypeAtLocation(node, enclosingDeclaration, TypeFormatFlags.WriteArrayAsGenericType, writer);
+            }
+
             if (typeReferences) {
                 write(isImplementsList ? " implments " : " extends ");
-                // TODO(shkamat): get the symbol name in the scope for this node
-                emitCommaList(typeReferences, emitSourceTextOfNode);
+                emitCommaList(typeReferences, emitTypeOfTypeReference);
             }
         }
 
@@ -2045,6 +2047,8 @@ module ts {
                 emitDeclarationFlags(node);
                 write("class ");
                 emitSourceTextOfNode(node.name);
+                var prevEnclosingDeclaration = enclosingDeclaration;
+                enclosingDeclaration = node;
                 emitTypeParameters(node.typeParameters);
                 if (node.baseType) {
                     emitHeritageClause([node.baseType], /*isImplementsList*/ false);
@@ -2058,6 +2062,7 @@ module ts {
                 decreaseIndent();
                 write("}");
                 writeLine();
+                enclosingDeclaration = prevEnclosingDeclaration;
             }
         }
 
@@ -2066,6 +2071,8 @@ module ts {
                 emitDeclarationFlags(node);
                 write("interface ");
                 emitSourceTextOfNode(node.name);
+                var prevEnclosingDeclaration = enclosingDeclaration;
+                enclosingDeclaration = node;
                 emitTypeParameters(node.typeParameters);
                 emitHeritageClause(node.baseTypes, /*isImplementsList*/ false);
                 write(" {");
@@ -2075,6 +2082,7 @@ module ts {
                 decreaseIndent();
                 write("}");
                 writeLine();
+                enclosingDeclaration = prevEnclosingDeclaration;
             }
         }
 
@@ -2094,7 +2102,8 @@ module ts {
                     write("?");
                 }
                 if (!(node.flags & NodeFlags.Private)) {
-                    // TODO(shkamat): emit type of the node in given scope
+                    write(": ");
+                    resolver.writeTypeAtLocation(node, enclosingDeclaration, TypeFormatFlags.None, writer);
                 }
             }
         }
@@ -2116,8 +2125,8 @@ module ts {
                 emitDeclarationFlags(node);
                 emitSourceTextOfNode(node.name);
                 if (!(node.flags & NodeFlags.Private)) {
-                    // TODO(shkamat): emit type of the node in given scope
-                    // If get accessor -> return type of getAccessor otherwise parameter type of setAccessor
+                    write(": ");
+                    resolver.writeTypeAtLocation(node, enclosingDeclaration, TypeFormatFlags.None, writer);
                 }
                 write(";");
                 writeLine();
@@ -2134,7 +2143,7 @@ module ts {
                     emitSourceTextOfNode(node.name);
                 }
                 else if (node.kind === SyntaxKind.Constructor) {
-                    write("constructor ");
+                    write("constructor");
                 }
                 else {
                     emitSourceTextOfNode(node.name);
@@ -2170,8 +2179,10 @@ module ts {
                 write(")");
             }
 
-            if (!(node.flags & NodeFlags.Private)) {
-                // TODO(shkamat): emit return type of the signature
+            // If this is not a constructor and is not private, emit the return type
+            if (node.kind !== SyntaxKind.Constructor && !(node.flags & NodeFlags.Private)) {
+                write(": ");
+                resolver.writeReturnTypeOfSignatureDeclaration(node, enclosingDeclaration, TypeFormatFlags.None, writer);
             }
             write(";");
             writeLine();
@@ -2187,7 +2198,8 @@ module ts {
             }
 
             if (!(node.parent.flags & NodeFlags.Private)) {
-                // TODO(shkamat): emitType of the parameter if the method is not private
+                write(": ");
+                resolver.writeTypeAtLocation(node, enclosingDeclaration, TypeFormatFlags.None, writer);
             }
         }
 

src/compiler/emitter.ts

@@ -590,6 +590,21 @@ module ts {
         getSymbolOfIdentifier(identifier: Identifier): Symbol;
     }
 
+    export interface TextWriter {
+        write(s: string): void;
+        writeLine(): void;
+        increaseIndent(): void;
+        decreaseIndent(): void;
+        getText(): string;
+    }
+
+    export enum TypeFormatFlags {
+        None                        = 0x00000000, 
+
+        /** writes Array<T> instead T[]  */
+        WriteArrayAsGenericType     = 0x00000001,  // Declarations
+    }
+
     export interface EmitResolver {
         getProgram(): Program;
         getModuleObjectName(node: ModuleDeclaration): string;
@@ -603,6 +618,8 @@ module ts {
         shouldEmitDeclarations(): boolean;
         isReferencedInExportAssignment(node: Declaration): boolean;
         isImplementationOfOverload(node: FunctionDeclaration): boolean;
+        writeTypeAtLocation(location: Node, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: TextWriter): void;
+        writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: TextWriter): void;
     }
 
     export enum SymbolFlags {

src/compiler/types.ts

@@ -120,38 +120,38 @@ var i8_c = c8;
 //// [commentsClass.d.ts]
 declare class c2 {
 }
-declare var i2;
-declare var i2_c;
+declare var i2: c2;
+declare var i2_c: typeof c2;
 declare class c3 {
-    constructor ();
+    constructor();
 }
-declare var i3;
-declare var i3_c;
+declare var i3: c3;
+declare var i3_c: typeof c3;
 declare class c4 {
-    constructor ();
+    constructor();
 }
-declare var i4;
-declare var i4_c;
+declare var i4: c4;
+declare var i4_c: typeof c4;
 declare class c5 {
-    static s1;
+    static s1: number;
 }
-declare var i5;
-declare var i5_c;
+declare var i5: c5;
+declare var i5_c: typeof c5;
 declare class c6 {
-    static s1;
-    constructor ();
+    static s1: number;
+    constructor();
 }
-declare var i6;
-declare var i6_c;
+declare var i6: c6;
+declare var i6_c: typeof c6;
 declare class c7 {
-    static s1;
-    constructor ();
+    static s1: number;
+    constructor();
 }
-declare var i7;
-declare var i7_c;
+declare var i7: c7;
+declare var i7_c: typeof c7;
 declare class c8 {
-    static s1;
-    constructor ();
+    static s1: number;
+    constructor();
 }
-declare var i8;
-declare var i8_c;
+declare var i8: c8;
+declare var i8_c: typeof c8;

tests/baselines/reference/commentsClass.js

@@ -439,67 +439,67 @@ cProperties_i.nc_p2 = cProperties_i.nc_p1;
 
 //// [commentsClassMembers.d.ts]
 declare class c1 {
-    p1;
-    p2(b);
-    p3;
+    p1: number;
+    p2(b: number): number;
+    p3: number;
     private pp1;
     private pp2(b);
     private pp3;
-    constructor ();
-    static s1;
-    static s2(b);
-    static s3;
-    nc_p1;
-    nc_p2(b);
-    nc_p3;
+    constructor();
+    static s1: number;
+    static s2(b: number): number;
+    static s3: number;
+    nc_p1: number;
+    nc_p2(b: number): number;
+    nc_p3: number;
     private nc_pp1;
     private nc_pp2(b);
     private nc_pp3;
-    static nc_s1;
-    static nc_s2(b);
-    static nc_s3;
-    a_p1;
-    a_p2(b);
-    a_p3;
+    static nc_s1: number;
+    static nc_s2(b: number): number;
+    static nc_s3: number;
+    a_p1: number;
+    a_p2(b: number): number;
+    a_p3: number;
     private a_pp1;
     private a_pp2(b);
     private a_pp3;
-    static a_s1;
-    static a_s2(b);
-    static a_s3;
-    b_p1;
-    b_p2(b);
-    b_p3;
+    static a_s1: number;
+    static a_s2(b: number): number;
+    static a_s3: number;
+    b_p1: number;
+    b_p2(b: number): number;
+    b_p3: number;
     private b_pp1;
     private b_pp2(b);
     private b_pp3;
-    static b_s1;
-    static b_s2(b);
-    static b_s3;
+    static b_s1: number;
+    static b_s2(b: number): number;
+    static b_s3: number;
 }
-declare var i1;
-declare var i1_p;
-declare var i1_f;
-declare var i1_r;
-declare var i1_prop;
-declare var i1_nc_p;
-declare var i1_ncf;
-declare var i1_ncr;
-declare var i1_ncprop;
-declare var i1_s_p;
-declare var i1_s_f;
-declare var i1_s_r;
-declare var i1_s_prop;
-declare var i1_s_nc_p;
-declare var i1_s_ncf;
-declare var i1_s_ncr;
-declare var i1_s_ncprop;
-declare var i1_c;
+declare var i1: c1;
+declare var i1_p: number;
+declare var i1_f: (b: number) => number;
+declare var i1_r: number;
+declare var i1_prop: number;
+declare var i1_nc_p: number;
+declare var i1_ncf: (b: number) => number;
+declare var i1_ncr: number;
+declare var i1_ncprop: number;
+declare var i1_s_p: number;
+declare var i1_s_f: (b: number) => number;
+declare var i1_s_r: number;
+declare var i1_s_prop: number;
+declare var i1_s_nc_p: number;
+declare var i1_s_ncf: (b: number) => number;
+declare var i1_s_ncr: number;
+declare var i1_s_ncprop: number;
+declare var i1_c: typeof c1;
 declare class cProperties {
     private val;
-    p1;
-    nc_p1;
-    p2;
-    nc_p2;
+    p1: number;
+    nc_p1: number;
+    p2: number;
+    nc_p2: number;
 }
-declare var cProperties_i;
+declare var cProperties_i: cProperties;