emit types with their namespace

Summary:
If you import a type from another module, when emitting the
type in Closure-land you also need to qualify it with its module
name.

This is the first step towards solving #112.
This is the easy but necessary part; further changes will add
the harder cases.

Reviewers: rkirov

Reviewed By: rkirov

Subscribers: typescript-eng

Differential Revision: https://reviews.angular.io/D125

Author: evmar

src/type-translator.ts

@@ -67,6 +67,41 @@ export class TypeTranslator {
    */
   constructor(private typeChecker: ts.TypeChecker, private node: ts.Node) {}
 
+  /**
+   * Converts a ts.Symbol to a string.
+   * Other approaches that don't work:
+   * - TypeChecker.typeToString translates Array as T[].
+   * - TypeChecker.symbolToString emits types without their namespace,
+   *   and doesn't let you pass the flag to control that.
+   */
+  private symbolToString(sym: ts.Symbol): string {
+    // This follows getSingleLineStringWriter in the TypeScript compiler.
+    let str = '';
+    let writeText = (text: string) => str += text;
+    let doNothing = () => { return; };
+
+    let builder = this.typeChecker.getSymbolDisplayBuilder();
+    let writer: ts.SymbolWriter = {
+      writeKeyword: writeText,
+      writeOperator: writeText,
+      writePunctuation: writeText,
+      writeSpace: writeText,
+      writeStringLiteral: writeText,
+      writeParameter: writeText,
+      writeSymbol: writeText,
+      writeLine: doNothing,
+      increaseIndent: doNothing,
+      decreaseIndent: doNothing,
+      clear: doNothing,
+      trackSymbol(symbol: ts.Symbol, enclosingDeclaration?: ts.Node, meaning?: ts.SymbolFlags) {
+        return;
+      },
+      reportInaccessibleThisError: doNothing,
+    };
+    builder.buildSymbolDisplay(sym, writer, this.node);
+    return str;
+  }
+
   /**
    * @param notNull When true, insert a ! before any type references.  This
    *    is to work around the difference between TS and Closure destructuring.
@@ -112,7 +147,7 @@ export class TypeTranslator {
       // InterfaceType "Array", but the "number" type parameter is
       // part of the outer TypeReference, not a typeParameter on
       // the InterfaceType.
-      return type.symbol.name;
+      return this.symbolToString(type.symbol);
     } else if (type.flags & ts.TypeFlags.Reference) {
       // A reference to another type, e.g. Array<number> refers to Array.
       // Emit the referenced type and any type arguments.

test_files/jsdoc_types/jsdoc_types.js

@@ -0,0 +1,8 @@
+goog.module('tsickle_test.jsdoc_types.jsdoc_types');/**
+ * This test tests importing a type across module boundaries,
+ * ensuring that the type gets the proper name in JSDoc comments.
+ */
+
+var module1 = goog.require('tsickle_test.jsdoc_types.module1');
+// Check that imported types get the proper names in JSDoc.
+let /** @type {module1.Class} */ x1 = new module1.Class();

test_files/jsdoc_types/jsdoc_types.ts

@@ -0,0 +1,9 @@
+/**
+ * This test tests importing a type across module boundaries,
+ * ensuring that the type gets the proper name in JSDoc comments.
+ */
+
+import * as module1 from './module1';
+
+// Check that imported types get the proper names in JSDoc.
+let x1 = new module1.Class();

test_files/jsdoc_types/jsdoc_types.tsickle.ts

@@ -0,0 +1,9 @@
+/**
+ * This test tests importing a type across module boundaries,
+ * ensuring that the type gets the proper name in JSDoc comments.
+ */
+
+import * as module1 from './module1';
+
+// Check that imported types get the proper names in JSDoc.
+let /** @type {module1.Class} */ x1 = new module1.Class();

test_files/jsdoc_types/module1.js

@@ -0,0 +1,4 @@
+goog.module('tsickle_test.jsdoc_types.module1');
+class Class {
+}
+exports.Class = Class;

test_files/jsdoc_types/module1.ts

@@ -0,0 +1 @@
+export class Class {}

test_files/jsdoc_types/module1.tsickle.ts

@@ -0,0 +1 @@
+export class Class {}

test_files/jsx/externs.js

@@ -17,7 +17,7 @@ var React = {};
 React.createElement = function(args) {};
 
 /**
- * @param {Element} element
+ * @param {JSX.Element} element
  * @param {HTMLElement} node
  * @return {void}
  */

test_files/jsx/jsx.js

@@ -1,4 +1,4 @@
-goog.module('tsickle_test.jsx.jsx');let /** @type {Element} */ simple = React.createElement("div", null);
+goog.module('tsickle_test.jsx.jsx');let /** @type {JSX.Element} */ simple = React.createElement("div", null);
 let /** @type {string} */ hello = 'hello';
-let /** @type {Element} */ helloDiv = React.createElement("div", null, hello, "hello, world", React.createElement(Component, null));
+let /** @type {JSX.Element} */ helloDiv = React.createElement("div", null, hello, "hello, world", React.createElement(Component, null));
 React.render(helloDiv, document.body);

test_files/jsx/jsx.tsickle.tsx

@@ -16,10 +16,10 @@ declare module React {
 // Fake a subcomponent, just to exercise components within components.
 declare var Component: any;
 
-let /** @type {Element} */ simple = <div></div>;
+let /** @type {JSX.Element} */ simple = <div></div>;
 
 let /** @type {string} */ hello = 'hello';
-let /** @type {Element} */ helloDiv = <div>
+let /** @type {JSX.Element} */ helloDiv = <div>
   {hello}
   hello, world
   <Component/>