Check the ambientness of a symbol name before attempting to trim it

weswigham · weswigham · commit 7ff7dcc27ddc · 2018-08-08T15:18:32.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -3880,31 +3880,34 @@ namespace ts {
                             }
                         }
                     }
-                    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
+                    if (ambientModuleSymbolRegex.test(symbol.escapedName as string)) {
                         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 = moduleSpecifiers.getModuleSpecifierForDeclarationFile(
-                            symbol,
-                            compilerOptions,
-                            contextFile,
-                            context.tracker.moduleResolverHost,
-                            context.tracker.moduleResolverHost.getSourceFiles!(), // TODO: GH#18217
-                            { importModuleSpecifierPreference: "non-relative" },
-                            host.redirectTargetsMap,
-                        );
-                        links.specifierCache = links.specifierCache || createMap();
-                        links.specifierCache.set(contextFile.path, specifier);
+                }
+                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
+                    if (ambientModuleSymbolRegex.test(symbol.escapedName as string)) {
+                        return (symbol.escapedName as string).substring(1, (symbol.escapedName as string).length - 1);
                     }
-                    return specifier;
+                    return getSourceFileOfNode(getNonAugmentationDeclaration(symbol)!).fileName; // A resolver may not be provided for baselines and errors - in those cases we use the fileName in full
+                }
+                const contextFile = getSourceFileOfNode(getOriginalNode(context.enclosingDeclaration));
+                const links = getSymbolLinks(symbol);
+                let specifier = links.specifierCache && links.specifierCache.get(contextFile.path);
+                if (!specifier) {
+                    specifier = moduleSpecifiers.getModuleSpecifierForDeclarationFile(
+                        symbol,
+                        compilerOptions,
+                        contextFile,
+                        context.tracker.moduleResolverHost,
+                        context.tracker.moduleResolverHost.getSourceFiles!(), // TODO: GH#18217
+                        { importModuleSpecifierPreference: "non-relative" },
+                        host.redirectTargetsMap,
+                    );
+                    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 {
diff --git a/src/compiler/moduleSpecifiers.ts b/src/compiler/moduleSpecifiers.ts
@@ -51,7 +51,7 @@ namespace ts.moduleSpecifiers {
         if (!files) {
             return Debug.fail("Files list must be present to resolve symlinks in specifier resolution");
         }
-        const moduleSourceFile = getSourceFileOfNode(moduleSymbol.valueDeclaration);
+        const moduleSourceFile = getSourceFileOfNode(moduleSymbol.valueDeclaration || getNonAugmentationDeclaration(moduleSymbol));
         const modulePaths = getAllModulePaths(files, importingSourceFile.path, moduleSourceFile.fileName, info.getCanonicalFileName, host, redirectTargetsMap);
 
         const global = mapDefined(modulePaths, moduleFileName => getGlobalModuleSpecifier(moduleFileName, info, host, compilerOptions));
@@ -232,8 +232,17 @@ namespace ts.moduleSpecifiers {
     }
 
     function tryGetModuleNameFromAmbientModule(moduleSymbol: Symbol): string | undefined {
-        const decl = moduleSymbol.valueDeclaration;
-        if (isModuleDeclaration(decl) && isStringLiteral(decl.name)) {
+        const decl = forEach(moduleSymbol.declarations, d => {
+            if (!isAmbientModule(d)) return;
+            if (isExternalModuleAugmentation(d)) {
+                if (!isExternalModuleNameRelative(getTextOfIdentifierOrLiteral(d.name))) {
+                    return d;
+                }
+                return;
+            }
+            return d;
+        });
+        if (decl && isModuleDeclaration(decl) && isStringLiteral(decl.name)) {
             return decl.name.text;
         }
     }
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -638,6 +638,10 @@ namespace ts {
         return false;
     }
 
+    export function getNonAugmentationDeclaration(symbol: Symbol) {
+        return forEach(symbol.declarations, d => isExternalModuleAugmentation(d) ? undefined : d);
+    }
+
     export function isEffectiveExternalModule(node: SourceFile, compilerOptions: CompilerOptions) {
         return isExternalModule(node) || compilerOptions.isolatedModules || ((getEmitModuleKind(compilerOptions) === ModuleKind.CommonJS) && !!node.commonJsModuleIndicator);
     }
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 import("o")
+>foo : typeof import("tests/cases/compiler/file1.ts")
 
 namespace foo {
->foo : typeof import("o")
+>foo : typeof import("tests/cases/compiler/file1.ts")
 
     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 import("o")
+>foo : typeof import("tests/cases/compiler/file1.d.ts")
 
     namespace foo {
->foo : typeof import("o")
+>foo : typeof import("tests/cases/compiler/file1.d.ts")
 
         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 : import("o")
+>foo : import("tests/cases/compiler/file1.ts")
 
 namespace foo {
->foo : typeof import("o")
+>foo : typeof import("tests/cases/compiler/file1.ts")
 
     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 : import("o")
+>foo : import("tests/cases/compiler/file1.d.ts")
 
     namespace foo {
->foo : typeof import("o")
+>foo : typeof import("tests/cases/compiler/file1.d.ts")
 
         export var v: number;
 >v : number
diff --git a/tests/baselines/reference/augmentExportEquals5.types b/tests/baselines/reference/augmentExportEquals5.types
@@ -9,11 +9,11 @@ declare module "express" {
 >"express" : typeof import("express")
 
     function e(): e.Express;
->e : typeof import("e")
+>e : typeof import("tests/cases/compiler/express.d.ts")
 >e : any
 
     namespace e {
->e : typeof import("e")
+>e : typeof import("tests/cases/compiler/express.d.ts")
 
         interface IRoute {
             all(...handler: RequestHandler[]): 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 : import("o")
+>foo : import("tests/cases/compiler/file1.ts")
 
 namespace foo {
->foo : typeof import("o")
+>foo : typeof import("tests/cases/compiler/file1.ts")
 
     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 : import("o")
+>foo : import("tests/cases/compiler/file1.d.ts")
 
     namespace foo {
->foo : typeof import("o")
+>foo : typeof import("tests/cases/compiler/file1.d.ts")
 
         class A {}
 >A : A
diff --git a/tests/baselines/reference/moduleAugmentationDuringSyntheticDefaultCheck.types b/tests/baselines/reference/moduleAugmentationDuringSyntheticDefaultCheck.types
@@ -6,7 +6,7 @@ import moment = require("moment-timezone");
 
 === tests/cases/compiler/node_modules/moment/index.d.ts ===
 declare function moment(): moment.Moment;
->moment : () => import("omen").Moment
+>moment : () => import("tests/cases/compiler/node_modules/moment/index.d.ts").Moment
 >moment : any
 
 declare namespace moment {
@@ -16,7 +16,7 @@ declare namespace moment {
   }
 }
 export = moment;
->moment : () => import("omen").Moment
+>moment : () => import("tests/cases/compiler/node_modules/moment/index.d.ts").Moment
 
 === tests/cases/compiler/node_modules/moment-timezone/index.d.ts ===
 import * as moment from 'moment';
diff --git a/tests/baselines/reference/reactTransitiveImportHasValidDeclaration.js b/tests/baselines/reference/reactTransitiveImportHasValidDeclaration.js
@@ -0,0 +1,49 @@
+//// [tests/cases/compiler/reactTransitiveImportHasValidDeclaration.ts] ////
+
+//// [index.d.ts]
+declare namespace React {
+    export interface DetailedHTMLProps<T, U> {}
+    export interface HTMLAttributes<T> {}
+}
+export = React;
+export as namespace React;
+//// [index.d.ts]
+/// <reference types="react" />
+declare module 'react' { // augment
+    interface HTMLAttributes<T> {
+        css?: unknown;
+    }
+}
+export interface StyledOtherComponentList {
+    "div": React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>
+}
+export interface StyledOtherComponent<A, B, C> {}
+
+//// [index.d.ts]
+export * from "./types/react";
+
+//// [index.d.ts]
+import {StyledOtherComponent, StyledOtherComponentList} from "create-emotion-styled";
+export default function styled(tag: string): (o: object) => StyledOtherComponent<{}, StyledOtherComponentList["div"], any>;
+
+//// [index.ts]
+import styled from "react-emotion"
+
+const Form = styled('div')({ color: "red" })
+
+export default Form
+
+
+//// [index.js]
+"use strict";
+exports.__esModule = true;
+var react_emotion_1 = require("react-emotion");
+var Form = react_emotion_1["default"]('div')({ color: "red" });
+exports["default"] = Form;
+
+
+//// [index.d.ts]
+/// <reference path="node_modules/create-emotion-styled/types/react/index.d.ts" />
+/// <reference types="react" />
+declare const Form: import("create-emotion-styled/types/react").StyledOtherComponent<{}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>;
+export default Form;
diff --git a/tests/baselines/reference/reactTransitiveImportHasValidDeclaration.symbols b/tests/baselines/reference/reactTransitiveImportHasValidDeclaration.symbols
@@ -0,0 +1,77 @@
+=== tests/cases/compiler/node_modules/react/index.d.ts ===
+declare namespace React {
+>React : Symbol(React, Decl(index.d.ts, 0, 0), Decl(index.d.ts, 0, 0))
+
+    export interface DetailedHTMLProps<T, U> {}
+>DetailedHTMLProps : Symbol(DetailedHTMLProps, Decl(index.d.ts, 0, 25))
+>T : Symbol(T, Decl(index.d.ts, 1, 39))
+>U : Symbol(U, Decl(index.d.ts, 1, 41))
+
+    export interface HTMLAttributes<T> {}
+>HTMLAttributes : Symbol(HTMLAttributes, Decl(index.d.ts, 1, 47), Decl(index.d.ts, 1, 24))
+>T : Symbol(T, Decl(index.d.ts, 2, 36), Decl(index.d.ts, 2, 29))
+}
+export = React;
+>React : Symbol(React, Decl(index.d.ts, 0, 0))
+
+export as namespace React;
+>React : Symbol(React, Decl(index.d.ts, 4, 15))
+
+=== tests/cases/compiler/node_modules/create-emotion-styled/types/react/index.d.ts ===
+/// <reference types="react" />
+declare module 'react' { // augment
+>'react' : Symbol(React, Decl(index.d.ts, 0, 0), Decl(index.d.ts, 0, 0))
+
+    interface HTMLAttributes<T> {
+>HTMLAttributes : Symbol(HTMLAttributes, Decl(index.d.ts, 1, 47), Decl(index.d.ts, 1, 24))
+>T : Symbol(T, Decl(index.d.ts, 2, 36), Decl(index.d.ts, 2, 29))
+
+        css?: unknown;
+>css : Symbol(HTMLAttributes.css, Decl(index.d.ts, 2, 33))
+    }
+}
+export interface StyledOtherComponentList {
+>StyledOtherComponentList : Symbol(StyledOtherComponentList, Decl(index.d.ts, 5, 1))
+
+    "div": React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>
+>"div" : Symbol(StyledOtherComponentList["div"], Decl(index.d.ts, 6, 43))
+>React : Symbol(React, Decl(index.d.ts, 4, 15))
+>DetailedHTMLProps : Symbol(DetailedHTMLProps, Decl(index.d.ts, 0, 25))
+>React : Symbol(React, Decl(index.d.ts, 4, 15))
+>HTMLAttributes : Symbol(HTMLAttributes, Decl(index.d.ts, 1, 47), Decl(index.d.ts, 1, 24))
+>HTMLDivElement : Symbol(HTMLDivElement, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
+>HTMLDivElement : Symbol(HTMLDivElement, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
+}
+export interface StyledOtherComponent<A, B, C> {}
+>StyledOtherComponent : Symbol(StyledOtherComponent, Decl(index.d.ts, 8, 1))
+>A : Symbol(A, Decl(index.d.ts, 9, 38))
+>B : Symbol(B, Decl(index.d.ts, 9, 40))
+>C : Symbol(C, Decl(index.d.ts, 9, 43))
+
+=== tests/cases/compiler/node_modules/create-emotion-styled/index.d.ts ===
+export * from "./types/react";
+No type information for this code.
+No type information for this code.=== tests/cases/compiler/node_modules/react-emotion/index.d.ts ===
+import {StyledOtherComponent, StyledOtherComponentList} from "create-emotion-styled";
+>StyledOtherComponent : Symbol(StyledOtherComponent, Decl(index.d.ts, 0, 8))
+>StyledOtherComponentList : Symbol(StyledOtherComponentList, Decl(index.d.ts, 0, 29))
+
+export default function styled(tag: string): (o: object) => StyledOtherComponent<{}, StyledOtherComponentList["div"], any>;
+>styled : Symbol(styled, Decl(index.d.ts, 0, 85))
+>tag : Symbol(tag, Decl(index.d.ts, 1, 31))
+>o : Symbol(o, Decl(index.d.ts, 1, 46))
+>StyledOtherComponent : Symbol(StyledOtherComponent, Decl(index.d.ts, 0, 8))
+>StyledOtherComponentList : Symbol(StyledOtherComponentList, Decl(index.d.ts, 0, 29))
+
+=== tests/cases/compiler/index.ts ===
+import styled from "react-emotion"
+>styled : Symbol(styled, Decl(index.ts, 0, 6))
+
+const Form = styled('div')({ color: "red" })
+>Form : Symbol(Form, Decl(index.ts, 2, 5))
+>styled : Symbol(styled, Decl(index.ts, 0, 6))
+>color : Symbol(color, Decl(index.ts, 2, 28))
+
+export default Form
+>Form : Symbol(Form, Decl(index.ts, 2, 5))
+
diff --git a/tests/baselines/reference/reactTransitiveImportHasValidDeclaration.types b/tests/baselines/reference/reactTransitiveImportHasValidDeclaration.types
@@ -0,0 +1,59 @@
+=== tests/cases/compiler/node_modules/react/index.d.ts ===
+declare namespace React {
+    export interface DetailedHTMLProps<T, U> {}
+    export interface HTMLAttributes<T> {}
+}
+export = React;
+>React : any
+
+export as namespace React;
+>React : any
+
+=== tests/cases/compiler/node_modules/create-emotion-styled/types/react/index.d.ts ===
+/// <reference types="react" />
+declare module 'react' { // augment
+>'react' : any
+
+    interface HTMLAttributes<T> {
+        css?: unknown;
+>css : unknown
+    }
+}
+export interface StyledOtherComponentList {
+    "div": React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>
+>"div" : import("tests/cases/compiler/node_modules/react/index.d.ts").DetailedHTMLProps<import("tests/cases/compiler/node_modules/react/index.d.ts").HTMLAttributes<HTMLDivElement>, HTMLDivElement>
+>React : any
+>React : any
+}
+export interface StyledOtherComponent<A, B, C> {}
+
+=== tests/cases/compiler/node_modules/create-emotion-styled/index.d.ts ===
+export * from "./types/react";
+No type information for this code.
+No type information for this code.=== tests/cases/compiler/node_modules/react-emotion/index.d.ts ===
+import {StyledOtherComponent, StyledOtherComponentList} from "create-emotion-styled";
+>StyledOtherComponent : any
+>StyledOtherComponentList : any
+
+export default function styled(tag: string): (o: object) => StyledOtherComponent<{}, StyledOtherComponentList["div"], any>;
+>styled : (tag: string) => (o: object) => StyledOtherComponent<{}, import("tests/cases/compiler/node_modules/react/index.d.ts").DetailedHTMLProps<import("tests/cases/compiler/node_modules/react/index.d.ts").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
+>tag : string
+>o : object
+
+=== tests/cases/compiler/index.ts ===
+import styled from "react-emotion"
+>styled : (tag: string) => (o: object) => import("tests/cases/compiler/node_modules/create-emotion-styled/types/react/index").StyledOtherComponent<{}, import("tests/cases/compiler/node_modules/react/index.d.ts").DetailedHTMLProps<import("tests/cases/compiler/node_modules/react/index.d.ts").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
+
+const Form = styled('div')({ color: "red" })
+>Form : import("tests/cases/compiler/node_modules/create-emotion-styled/types/react/index").StyledOtherComponent<{}, import("tests/cases/compiler/node_modules/react/index.d.ts").DetailedHTMLProps<import("tests/cases/compiler/node_modules/react/index.d.ts").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
+>styled('div')({ color: "red" }) : import("tests/cases/compiler/node_modules/create-emotion-styled/types/react/index").StyledOtherComponent<{}, import("tests/cases/compiler/node_modules/react/index.d.ts").DetailedHTMLProps<import("tests/cases/compiler/node_modules/react/index.d.ts").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
+>styled('div') : (o: object) => import("tests/cases/compiler/node_modules/create-emotion-styled/types/react/index").StyledOtherComponent<{}, import("tests/cases/compiler/node_modules/react/index.d.ts").DetailedHTMLProps<import("tests/cases/compiler/node_modules/react/index.d.ts").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
+>styled : (tag: string) => (o: object) => import("tests/cases/compiler/node_modules/create-emotion-styled/types/react/index").StyledOtherComponent<{}, import("tests/cases/compiler/node_modules/react/index.d.ts").DetailedHTMLProps<import("tests/cases/compiler/node_modules/react/index.d.ts").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
+>'div' : "div"
+>{ color: "red" } : { color: string; }
+>color : string
+>"red" : "red"
+
+export default Form
+>Form : import("tests/cases/compiler/node_modules/create-emotion-styled/types/react/index").StyledOtherComponent<{}, import("tests/cases/compiler/node_modules/react/index.d.ts").DetailedHTMLProps<import("tests/cases/compiler/node_modules/react/index.d.ts").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
+
diff --git a/tests/baselines/reference/umd-augmentation-3.types b/tests/baselines/reference/umd-augmentation-3.types
diff --git a/tests/baselines/reference/umd-augmentation-4.types b/tests/baselines/reference/umd-augmentation-4.types
diff --git a/tests/cases/compiler/reactTransitiveImportHasValidDeclaration.ts b/tests/cases/compiler/reactTransitiveImportHasValidDeclaration.ts

Original file line number	Diff line number	Diff line change
`@@ -638,6 +638,10 @@ namespace ts {`
`638`	`638`	`return false;`
`639`	`639`	`}`
`640`	`640`
	`641`	`+ export function getNonAugmentationDeclaration(symbol: Symbol) {`
	`642`	`+ return forEach(symbol.declarations, d => isExternalModuleAugmentation(d) ? undefined : d);`
	`643`	`+ }`
	`644`	`+`
`641`	`645`	`export function isEffectiveExternalModule(node: SourceFile, compilerOptions: CompilerOptions) {`
`642`	`646`	`return isExternalModule(node) \|\| compilerOptions.isolatedModules \|\| ((getEmitModuleKind(compilerOptions) === ModuleKind.CommonJS) && !!node.commonJsModuleIndicator);`
`643`	`647`	`}`