microsoft · weswigham · Jul 3, 2018 · Jul 2, 2018
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -3733,19 +3733,56 @@ namespace ts {
                 return top;
             }
 
+            function getSpecifierForModuleSymbol(symbol: Symbol, context: NodeBuilderContext) {
+                const file = getDeclarationOfKind<SourceFile>(symbol, SyntaxKind.SourceFile);
+                if (file && file.moduleName !== undefined) {
+                    // Use the amd name if it is available
+                    return file.moduleName;
+                }
+                if (!file) {
+                    if (context.tracker.trackReferencedAmbientModule) {
+                        const ambientDecls = filter(symbol.declarations, isAmbientModule);
+                        if (length(ambientDecls)) {
+                            for (const decl of ambientDecls) {
+                                context.tracker.trackReferencedAmbientModule(decl);
+                            }
+                        }
+                    }
+                    return (symbol.escapedName as string).substring(1, (symbol.escapedName as string).length - 1);
+                }
+                else {
+                    if (!context.enclosingDeclaration || !context.tracker.moduleResolverHost) {
+                        // If there's no context declaration, we can't lookup a non-ambient specifier, so we just use the symbol name
+                        return (symbol.escapedName as string).substring(1, (symbol.escapedName as string).length - 1);
+                    }
+                    const contextFile = getSourceFileOfNode(getOriginalNode(context.enclosingDeclaration));
+                    const links = getSymbolLinks(symbol);
+                    let specifier = links.specifierCache && links.specifierCache.get(contextFile.path);
+                    if (!specifier) {
+                        specifier = flatten(moduleSpecifiers.getModuleSpecifiers(
+                            symbol,
+                            compilerOptions,
+                            contextFile,
+                            context.tracker.moduleResolverHost,
+                            context.tracker.moduleResolverHost.getSourceFiles!(), // TODO: GH#18217
+                            { importModuleSpecifierPreference: "non-relative" }
+                        ))[0];
+                        links.specifierCache = links.specifierCache || createMap();
+                        links.specifierCache.set(contextFile.path, specifier);
+                    }
+                    return specifier;
+                }
+            }
+
             function symbolToTypeNode(symbol: Symbol, context: NodeBuilderContext, meaning: SymbolFlags, overrideTypeArguments?: ReadonlyArray<TypeNode>): TypeNode {
                 const chain = lookupSymbolChain(symbol, context, meaning, !(context.flags & NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope)); // If we're using aliases outside the current scope, dont bother with the module
 
-                context.flags |= NodeBuilderFlags.InInitialEntityName;
-                const rootName = getNameOfSymbolAsWritten(chain[0], context);
-                context.flags ^= NodeBuilderFlags.InInitialEntityName;
-
                 const isTypeOf = meaning === SymbolFlags.Value;
-                if (ambientModuleSymbolRegex.test(rootName)) {
+                if (some(chain[0].declarations, hasNonGlobalAugmentationExternalModuleSymbol)) {
                     // module is root, must use `ImportTypeNode`
                     const nonRootParts = chain.length > 1 ? createAccessFromSymbolChain(chain, chain.length - 1, 1) : undefined;
                     const typeParameterNodes = overrideTypeArguments || lookupTypeParameterNodes(chain, 0, context);
-                    const lit = createLiteralTypeNode(createLiteral(rootName.substring(1, rootName.length - 1)));
+                    const lit = createLiteralTypeNode(createLiteral(getSpecifierForModuleSymbol(chain[0], context)));
                     if (!nonRootParts || isEntityName(nonRootParts)) {
                         if (nonRootParts) {
                             const lastId = isIdentifier(nonRootParts) ? nonRootParts : nonRootParts.right;
@@ -3990,41 +4027,6 @@ namespace ts {
                 return "default";
             }
             if (symbol.declarations && symbol.declarations.length) {
-                if (some(symbol.declarations, hasExternalModuleSymbol) && context!.enclosingDeclaration) { // TODO: GH#18217
-                    const file = getDeclarationOfKind<SourceFile>(symbol, SyntaxKind.SourceFile);
-                    if (!file || !context!.tracker.moduleResolverHost) {
-                        if (context!.tracker.trackReferencedAmbientModule) {
-                            const ambientDecls = filter(symbol.declarations, isAmbientModule);
-                            if (length(ambientDecls)) {
-                                for (const decl of ambientDecls) {
-                                    context!.tracker.trackReferencedAmbientModule!(decl); // TODO: GH#18217
-                                }
-                            }
-                        }
-                        // ambient module, just use declaration/symbol name (fallthrough)
-                    }
-                    else {
-                        if (file.moduleName) {
-                            return `"${file.moduleName}"`;
-                        }
-                        const contextFile = getSourceFileOfNode(getOriginalNode(context!.enclosingDeclaration))!;
-                        const links = getSymbolLinks(symbol);
-                        let specifier = links.specifierCache && links.specifierCache.get(contextFile.path);
-                        if (!specifier) {
-                            specifier = flatten(moduleSpecifiers.getModuleSpecifiers(
-                                symbol,
-                                compilerOptions,
-                                contextFile,
-                                context!.tracker.moduleResolverHost!,
-                                context!.tracker.moduleResolverHost!.getSourceFiles!(),
-                                { importModuleSpecifierPreference: "non-relative" }
-                            ))[0];
-                            links.specifierCache = links.specifierCache || createMap();
-                            links.specifierCache.set(contextFile.path, specifier);
-                        }
-                        return `"${specifier}"`;
-                    }
-                }
                 const declaration = symbol.declarations[0];
                 const name = getNameOfDeclaration(declaration);
                 if (name) {

diff --git a/tests/baselines/reference/aliasDoesNotDuplicateSignatures.types b/tests/baselines/reference/aliasDoesNotDuplicateSignatures.types
@@ -6,7 +6,7 @@ declare namespace demoNS {
 >f : () => void
 }
 declare module 'demoModule' {
->'demoModule' : typeof 'demoModule'
+>'demoModule' : typeof import("demoModule")
 
     import alias = demoNS;
 >alias : typeof alias

diff --git a/tests/baselines/reference/ambientDeclarations.types b/tests/baselines/reference/ambientDeclarations.types
@@ -163,7 +163,7 @@ var q = M1.fn();
 // Ambient external module in the global module
 // Ambient external module with a string literal name that is a top level external module name
 declare module 'external1' {
->'external1' : typeof 'external1'
+>'external1' : typeof import("external1")
 
     var q;
 >q : any

diff --git a/tests/baselines/reference/ambientDeclarationsExternal.types b/tests/baselines/reference/ambientDeclarationsExternal.types
@@ -20,7 +20,7 @@ var n: number;
 === tests/cases/conformance/ambient/decls.ts ===
 // Ambient external module with export assignment
 declare module 'equ' {
->'equ' : typeof 'equ'
+>'equ' : typeof import("equ")
 
     var x;
 >x : any
@@ -30,7 +30,7 @@ declare module 'equ' {
 }
 
 declare module 'equ2' {
->'equ2' : typeof 'equ2'
+>'equ2' : typeof import("equ2")
 
     var x: number;
 >x : number

diff --git a/tests/baselines/reference/ambientErrors.types b/tests/baselines/reference/ambientErrors.types
@@ -97,16 +97,16 @@ module M2 {
 >M2 : any
 
     declare module 'nope' { }
->'nope' : typeof 'nope'
+>'nope' : typeof import("nope")
 }
 
 // Ambient external module with a string literal name that isn't a top level external module name
 declare module '../foo' { }
->'../foo' : typeof '../foo'
+>'../foo' : typeof import("../foo")
 
 // Ambient external module with export assignment and other exported members
 declare module 'bar' {
->'bar' : typeof 'bar'
+>'bar' : typeof import("bar")
 
     var n;
 >n : any

diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types
@@ -10,7 +10,7 @@ var c = new A();
 
 === tests/cases/compiler/ambientExternalModuleWithInternalImportDeclaration_0.ts ===
 declare module 'M' {
->'M' : typeof 'M'
+>'M' : typeof import("M")
 
     module C {
 >C : typeof C

diff --git a/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.types b/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.types
@@ -7,7 +7,7 @@ declare module "./relativeModule" {
 }
 
 declare module ".\\relativeModule" {
->".\\relativeModule" : typeof import(".\\\\relativeModule")
+>".\\relativeModule" : typeof import(".\\relativeModule")
 
     var x: string;
 >x : string

diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types
@@ -10,7 +10,7 @@ var c = new A();
 
 === tests/cases/compiler/ambientExternalModuleWithoutInternalImportDeclaration_0.ts ===
 declare module 'M' {
->'M' : typeof 'M'
+>'M' : typeof import("M")
 
     module C {
 >C : typeof C

diff --git a/tests/baselines/reference/augmentExportEquals3.types b/tests/baselines/reference/augmentExportEquals3.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/file1.ts ===
 function foo() {}
->foo : typeof foo
+>foo : typeof import("o")
 
 namespace foo {
->foo : typeof foo
+>foo : typeof import("o")
 
     export var v = 1;
 >v : number

diff --git a/tests/baselines/reference/augmentExportEquals3_1.types b/tests/baselines/reference/augmentExportEquals3_1.types
@@ -3,10 +3,10 @@ declare module "file1" {
 >"file1" : typeof import("file1")
 
     function foo(): void;
->foo : typeof foo
+>foo : typeof import("o")
 
     namespace foo {
->foo : typeof foo
+>foo : typeof import("o")
 
         export var v: number;
 >v : number

diff --git a/tests/baselines/reference/augmentExportEquals4.types b/tests/baselines/reference/augmentExportEquals4.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/file1.ts ===
 class foo {}
->foo : foo
+>foo : import("o")
 
 namespace foo {
->foo : typeof foo
+>foo : typeof import("o")
 
     export var v = 1;
 >v : number

diff --git a/tests/baselines/reference/augmentExportEquals4_1.types b/tests/baselines/reference/augmentExportEquals4_1.types
@@ -3,10 +3,10 @@ declare module "file1" {
 >"file1" : typeof import("file1")
 
     class foo {}
->foo : foo
+>foo : import("o")
 
     namespace foo {
->foo : typeof foo
+>foo : typeof import("o")
 
         export var v: number;
 >v : number

diff --git a/tests/baselines/reference/augmentExportEquals5.types b/tests/baselines/reference/augmentExportEquals5.types
@@ -16,12 +16,12 @@ declare module "express" {
 >"express" : typeof import("express")
 
     function e(): e.Express;
->e : typeof e
+>e : typeof import("e")
 >e : any
->Express : e.Express
+>Express : import("e").Express
 
     namespace e {
->e : typeof e
+>e : typeof import("e")
 
         interface IRoute {
 >IRoute : IRoute

diff --git a/tests/baselines/reference/augmentExportEquals6.types b/tests/baselines/reference/augmentExportEquals6.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/file1.ts ===
 class foo {}
->foo : foo
+>foo : import("o")
 
 namespace foo {
->foo : typeof foo
+>foo : typeof import("o")
 
     export class A {}
 >A : A

diff --git a/tests/baselines/reference/augmentExportEquals6_1.types b/tests/baselines/reference/augmentExportEquals6_1.types
@@ -3,10 +3,10 @@ declare module "file1" {
 >"file1" : typeof import("file1")
 
     class foo {}
->foo : foo
+>foo : import("o")
 
     namespace foo {
->foo : typeof foo
+>foo : typeof import("o")
 
         class A {}
 >A : A

diff --git a/tests/baselines/reference/bangInModuleName.types b/tests/baselines/reference/bangInModuleName.types
@@ -10,7 +10,7 @@ declare module "http" {
 }
 
 declare module 'intern/dojo/node!http' {
->'intern/dojo/node!http' : typeof 'intern/dojo/node!http'
+>'intern/dojo/node!http' : typeof import("intern/dojo/node!http")
 
     import http = require('http');
 >http : typeof http

diff --git a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types
@@ -4,15 +4,15 @@ class List<T> { }
 >T : T
 
 declare module 'mod1' {
->'mod1' : typeof 'mod1'
+>'mod1' : typeof import("mod1")
 
     class Foo {
 >Foo : Foo
     }
 }
 
 declare module 'moo' {
->'moo' : typeof 'moo'
+>'moo' : typeof import("moo")
 
     import x = require('mod1');
 >x : typeof x

diff --git a/tests/baselines/reference/declarationEmitCrossFileImportTypeOfAmbientModule.js b/tests/baselines/reference/declarationEmitCrossFileImportTypeOfAmbientModule.js
@@ -0,0 +1,24 @@
+//// [tests/cases/compiler/declarationEmitCrossFileImportTypeOfAmbientModule.ts] ////
+
+//// [component.d.ts]
+declare module '@namespace/component' {
+    export class Foo {}
+}
+//// [index.d.ts]
+import { Foo } from "@namespace/component";
+export declare const item: typeof Foo;
+//// [index.ts]
+import { item } from "../somepackage";
+export const reeexported = item;
+
+
+//// [index.js]
+"use strict";
+exports.__esModule = true;
+var somepackage_1 = require("../somepackage");
+exports.reeexported = somepackage_1.item;
+
+
+//// [index.d.ts]
+/// <reference path="../../types/component.d.ts" />
+export declare const reeexported: typeof import("@namespace/component").Foo;
diff --git a/tests/baselines/reference/declarationEmitCrossFileImportTypeOfAmbientModule.symbols b/tests/baselines/reference/declarationEmitCrossFileImportTypeOfAmbientModule.symbols
@@ -0,0 +1,23 @@
+=== tests/cases/compiler/types/component.d.ts ===
+declare module '@namespace/component' {
+>'@namespace/component' : Symbol('@namespace/component', Decl(component.d.ts, 0, 0))
+
+    export class Foo {}
+>Foo : Symbol(Foo, Decl(component.d.ts, 0, 39))
+}
+=== tests/cases/compiler/packages/somepackage/index.d.ts ===
+import { Foo } from "@namespace/component";
+>Foo : Symbol(Foo, Decl(index.d.ts, 0, 8))
+
+export declare const item: typeof Foo;
+>item : Symbol(item, Decl(index.d.ts, 1, 20))
+>Foo : Symbol(Foo, Decl(index.d.ts, 0, 8))
+
+=== tests/cases/compiler/packages/secondpackage/index.ts ===
+import { item } from "../somepackage";
+>item : Symbol(item, Decl(index.ts, 0, 8))
+
+export const reeexported = item;
+>reeexported : Symbol(reeexported, Decl(index.ts, 1, 12))
+>item : Symbol(item, Decl(index.ts, 0, 8))
+
diff --git a/tests/baselines/reference/declarationEmitCrossFileImportTypeOfAmbientModule.types b/tests/baselines/reference/declarationEmitCrossFileImportTypeOfAmbientModule.types
@@ -0,0 +1,23 @@
+=== tests/cases/compiler/types/component.d.ts ===
+declare module '@namespace/component' {
+>'@namespace/component' : typeof import("@namespace/component")
+
+    export class Foo {}
+>Foo : Foo
+}
+=== tests/cases/compiler/packages/somepackage/index.d.ts ===
+import { Foo } from "@namespace/component";
+>Foo : typeof Foo
+
+export declare const item: typeof Foo;
+>item : typeof Foo
+>Foo : typeof Foo
+
+=== tests/cases/compiler/packages/secondpackage/index.ts ===
+import { item } from "../somepackage";
+>item : typeof import("@namespace/component").Foo
+
+export const reeexported = item;
+>reeexported : typeof import("@namespace/component").Foo
+>item : typeof import("@namespace/component").Foo
+
diff --git a/tests/baselines/reference/declaredExternalModule.types b/tests/baselines/reference/declaredExternalModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/declaredExternalModule.ts ===
 declare module 'connect' {
->'connect' : typeof 'connect'
+>'connect' : typeof import("connect")
 
     interface connectModule {
 >connectModule : connectModule

diff --git a/tests/baselines/reference/declaredExternalModuleWithExportAssignment.types b/tests/baselines/reference/declaredExternalModuleWithExportAssignment.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/declaredExternalModuleWithExportAssignment.ts ===
 declare module 'connect' {
->'connect' : typeof 'connect'
+>'connect' : typeof import("connect")
 
     interface connectModule {
 >connectModule : connectModule