Add undefined guard

mhegazy · mhegazy · commit 8dc9b76b6d22 · 2018-05-17T11:45:34.000-07:00
diff --git a/src/compiler/transformers/declarations.ts b/src/compiler/transformers/declarations.ts
@@ -217,16 +217,18 @@ namespace ts {
 
             function getFileReferenceForTypeName(typeName: string): FileReference | undefined {
                 // Elide type references for which we have imports
-                for (const importStatement of emittedImports) {
-                    if (isImportEqualsDeclaration(importStatement) && isExternalModuleReference(importStatement.moduleReference)) {
-                        const expr = importStatement.moduleReference.expression;
-                        if (isStringLiteralLike(expr) && expr.text === typeName) {
+                if (emittedImports) {
+                    for (const importStatement of emittedImports) {
+                        if (isImportEqualsDeclaration(importStatement) && isExternalModuleReference(importStatement.moduleReference)) {
+                            const expr = importStatement.moduleReference.expression;
+                            if (isStringLiteralLike(expr) && expr.text === typeName) {
+                                return undefined;
+                            }
+                        }
+                        else if (isImportDeclaration(importStatement) && isStringLiteral(importStatement.moduleSpecifier) && importStatement.moduleSpecifier.text === typeName) {
                             return undefined;
                         }
                     }
-                    else if (isImportDeclaration(importStatement) && isStringLiteral(importStatement.moduleSpecifier) && importStatement.moduleSpecifier.text === typeName) {
-                        return undefined;
-                    }
                 }
                 return { fileName: typeName, pos: -1, end: -1 };
             }
@@ -1325,4 +1327,4 @@ namespace ts {
         }
         return false;
     }
-}
+}
diff --git a/tests/baselines/reference/declarationFilesGeneratingTypeReferences.js b/tests/baselines/reference/declarationFilesGeneratingTypeReferences.js
@@ -0,0 +1,46 @@
+//// [tests/cases/compiler/declarationFilesGeneratingTypeReferences.ts] ////
+
+//// [index.d.ts]
+interface JQuery {
+
+}
+
+//// [app.ts]
+/// <reference types="jquery"/>
+namespace Test {
+    export var x: JQuery;
+}
+
+//// [out.js]
+/// <reference types="jquery"/>
+var Test;
+(function (Test) {
+})(Test || (Test = {}));
+
+
+//// [out.d.ts]
+/// <reference types="jquery" />
+declare namespace Test {
+    var x: JQuery;
+}
+
+
+//// [DtsFileErrors]
+
+
+out.d.ts(1,23): error TS2688: Cannot find type definition file for 'jquery'.
+
+
+==== /a/node_modules/@types/jquery/index.d.ts (0 errors) ====
+    interface JQuery {
+    
+    }
+    
+==== out.d.ts (1 errors) ====
+    /// <reference types="jquery" />
+                          ~~~~~~
+!!! error TS2688: Cannot find type definition file for 'jquery'.
+    declare namespace Test {
+        var x: JQuery;
+    }
+    
diff --git a/tests/baselines/reference/declarationFilesGeneratingTypeReferences.symbols b/tests/baselines/reference/declarationFilesGeneratingTypeReferences.symbols
@@ -0,0 +1,15 @@
+=== /a/node_modules/@types/jquery/index.d.ts ===
+interface JQuery {
+>JQuery : Symbol(JQuery, Decl(index.d.ts, 0, 0))
+
+}
+
+=== /a/app.ts ===
+/// <reference types="jquery"/>
+namespace Test {
+>Test : Symbol(Test, Decl(app.ts, 0, 0))
+
+    export var x: JQuery;
+>x : Symbol(x, Decl(app.ts, 2, 14))
+>JQuery : Symbol(JQuery, Decl(index.d.ts, 0, 0))
+}
diff --git a/tests/baselines/reference/declarationFilesGeneratingTypeReferences.types b/tests/baselines/reference/declarationFilesGeneratingTypeReferences.types
@@ -0,0 +1,15 @@
+=== /a/node_modules/@types/jquery/index.d.ts ===
+interface JQuery {
+>JQuery : JQuery
+
+}
+
+=== /a/app.ts ===
+/// <reference types="jquery"/>
+namespace Test {
+>Test : typeof Test
+
+    export var x: JQuery;
+>x : JQuery
+>JQuery : JQuery
+}
diff --git a/tests/cases/compiler/declarationFilesGeneratingTypeReferences.ts b/tests/cases/compiler/declarationFilesGeneratingTypeReferences.ts
@@ -0,0 +1,13 @@
+// @declaration: true
+// @outFile: out.js
+
+// @filename: /a/node_modules/@types/jquery/index.d.ts
+interface JQuery {
+
+}
+
+// @filename: /a/app.ts
+/// <reference types="jquery"/>
+namespace Test {
+    export var x: JQuery;
+}

Original file line number	Diff line number	Diff line change
`@@ -217,16 +217,18 @@ namespace ts {`
`217`	`217`
`218`	`218`	`function getFileReferenceForTypeName(typeName: string): FileReference \| undefined {`
`219`	`219`	`// Elide type references for which we have imports`
`220`		`- for (const importStatement of emittedImports) {`
`221`		`- if (isImportEqualsDeclaration(importStatement) && isExternalModuleReference(importStatement.moduleReference)) {`
`222`		`- const expr = importStatement.moduleReference.expression;`
`223`		`- if (isStringLiteralLike(expr) && expr.text === typeName) {`
	`220`	`+ if (emittedImports) {`
	`221`	`+ for (const importStatement of emittedImports) {`
	`222`	`+ if (isImportEqualsDeclaration(importStatement) && isExternalModuleReference(importStatement.moduleReference)) {`
	`223`	`+ const expr = importStatement.moduleReference.expression;`
	`224`	`+ if (isStringLiteralLike(expr) && expr.text === typeName) {`
	`225`	`+ return undefined;`
	`226`	`+ }`
	`227`	`+ }`
	`228`	`+ else if (isImportDeclaration(importStatement) && isStringLiteral(importStatement.moduleSpecifier) && importStatement.moduleSpecifier.text === typeName) {`
`224`	`229`	`return undefined;`
`225`	`230`	`}`
`226`	`231`	`}`
`227`		`- else if (isImportDeclaration(importStatement) && isStringLiteral(importStatement.moduleSpecifier) && importStatement.moduleSpecifier.text === typeName) {`
`228`		`- return undefined;`
`229`		`- }`
`230`	`232`	`}`
`231`	`233`	`return { fileName: typeName, pos: -1, end: -1 };`
`232`	`234`	`}`
`@@ -1325,4 +1327,4 @@ namespace ts {`
`1325`	`1327`	`}`
`1326`	`1328`	`return false;`
`1327`	`1329`	`}`
`1328`		`-}`
	`1330`	`+}`