Dont bind a local symbol for a default export without a name (microsoft#23152)

weswigham · web-flow · commit 9b987eb947d1 · 2018-04-04T15:26:10.000-07:00
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -288,10 +288,6 @@ namespace ts {
                     }
                     Debug.fail("Unknown binary declaration kind");
                     break;
-
-                case SyntaxKind.FunctionDeclaration:
-                case SyntaxKind.ClassDeclaration:
-                    return (hasModifier(node, ModifierFlags.Default) ? InternalSymbolName.Default : undefined);
                 case SyntaxKind.JSDocFunctionType:
                     return (isJSDocConstructSignature(node) ? InternalSymbolName.New : InternalSymbolName.Call);
                 case SyntaxKind.Parameter:
@@ -459,6 +455,9 @@ namespace ts {
                 if (node.kind === SyntaxKind.JSDocTypedefTag) Debug.assert(isInJavaScriptFile(node)); // We shouldn't add symbols for JSDoc nodes if not in a JS file.
                 const isJSDocTypedefInJSDocNamespace = isJSDocTypedefTag(node) && node.name && node.name.kind === SyntaxKind.Identifier && node.name.isInJSDocNamespace;
                 if ((!isAmbientModule(node) && (hasExportModifier || container.flags & NodeFlags.ExportContext)) || isJSDocTypedefInJSDocNamespace) {
+                    if (hasModifier(node, ModifierFlags.Default) && !getDeclarationName(node)) {
+                        return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); // No local symbol for an unnamed default!
+                    }
                     const exportKind = symbolFlags & SymbolFlags.Value ? SymbolFlags.ExportValue : 0;
                     const local = declareSymbol(container.locals, /*parent*/ undefined, node, exportKind, symbolExcludes);
                     local.exportSymbol = declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -1291,7 +1291,7 @@ namespace ts {
                             }
                         }
 
-                        if (result = lookup(moduleExports, name, meaning & SymbolFlags.ModuleMember)) {
+                        if (name !== InternalSymbolName.Default && (result = lookup(moduleExports, name, meaning & SymbolFlags.ModuleMember))) {
                             break loop;
                         }
                         break;
diff --git a/tests/baselines/reference/defaultIsNotVisibleInLocalScope.errors.txt b/tests/baselines/reference/defaultIsNotVisibleInLocalScope.errors.txt
@@ -0,0 +1,17 @@
+tests/cases/compiler/a.ts(4,24): error TS2304: Cannot find name 'default'.
+tests/cases/compiler/b.ts(2,24): error TS2304: Cannot find name 'default'.
+
+
+==== tests/cases/compiler/a.ts (1 errors) ====
+    export default function () {
+        return true;
+    }
+    export type X = typeof default;  // expect error
+                           ~~~~~~~
+!!! error TS2304: Cannot find name 'default'.
+    
+==== tests/cases/compiler/b.ts (1 errors) ====
+    export default { a: true }
+    export type X = typeof default; // expect error
+                           ~~~~~~~
+!!! error TS2304: Cannot find name 'default'.
diff --git a/tests/baselines/reference/defaultIsNotVisibleInLocalScope.js b/tests/baselines/reference/defaultIsNotVisibleInLocalScope.js
@@ -0,0 +1,23 @@
+//// [tests/cases/compiler/defaultIsNotVisibleInLocalScope.ts] ////
+
+//// [a.ts]
+export default function () {
+    return true;
+}
+export type X = typeof default;  // expect error
+
+//// [b.ts]
+export default { a: true }
+export type X = typeof default; // expect error
+
+//// [a.js]
+"use strict";
+exports.__esModule = true;
+function default_1() {
+    return true;
+}
+exports["default"] = default_1;
+//// [b.js]
+"use strict";
+exports.__esModule = true;
+exports["default"] = { a: true };
diff --git a/tests/baselines/reference/defaultIsNotVisibleInLocalScope.symbols b/tests/baselines/reference/defaultIsNotVisibleInLocalScope.symbols
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/a.ts ===
+export default function () {
+    return true;
+}
+export type X = typeof default;  // expect error
+>X : Symbol(X, Decl(a.ts, 2, 1))
+
+=== tests/cases/compiler/b.ts ===
+export default { a: true }
+>a : Symbol(a, Decl(b.ts, 0, 16))
+
+export type X = typeof default; // expect error
+>X : Symbol(X, Decl(b.ts, 0, 26))
+
diff --git a/tests/baselines/reference/defaultIsNotVisibleInLocalScope.types b/tests/baselines/reference/defaultIsNotVisibleInLocalScope.types
@@ -0,0 +1,19 @@
+=== tests/cases/compiler/a.ts ===
+export default function () {
+    return true;
+>true : true
+}
+export type X = typeof default;  // expect error
+>X : any
+>default : any
+
+=== tests/cases/compiler/b.ts ===
+export default { a: true }
+>{ a: true } : { a: boolean; }
+>a : boolean
+>true : true
+
+export type X = typeof default; // expect error
+>X : any
+>default : any
+
diff --git a/tests/cases/compiler/defaultIsNotVisibleInLocalScope.ts b/tests/cases/compiler/defaultIsNotVisibleInLocalScope.ts
@@ -0,0 +1,9 @@
+// @filename: a.ts
+export default function () {
+    return true;
+}
+export type X = typeof default;  // expect error
+
+// @filename: b.ts
+export default { a: true }
+export type X = typeof default; // expect error

Original file line number	Diff line number	Diff line change
`@@ -1291,7 +1291,7 @@ namespace ts {`
`1291`	`1291`	`}`
`1292`	`1292`	`}`
`1293`	`1293`
`1294`		`- if (result = lookup(moduleExports, name, meaning & SymbolFlags.ModuleMember)) {`
	`1294`	`+ if (name !== InternalSymbolName.Default && (result = lookup(moduleExports, name, meaning & SymbolFlags.ModuleMember))) {`
`1295`	`1295`	`break loop;`
`1296`	`1296`	`}`
`1297`	`1297`	`break;`