Ensure export= symbol from JavaScript always has a valueDeclaration (microsoft#34553)

andrewbranch · web-flow · commit 1d3ecc061088 · 2019-10-21T09:56:02.000-07:00
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -2690,7 +2690,8 @@ namespace ts {
             const flags = exportAssignmentIsAlias(node)
                 ? SymbolFlags.Alias // An export= with an EntityNameExpression or a ClassExpression exports all meanings of that identifier or class
                 : SymbolFlags.Property | SymbolFlags.ExportValue | SymbolFlags.ValueModule;
-            declareSymbol(file.symbol.exports!, file.symbol, node, flags | SymbolFlags.Assignment, SymbolFlags.None);
+            const symbol = declareSymbol(file.symbol.exports!, file.symbol, node, flags | SymbolFlags.Assignment, SymbolFlags.None);
+            setValueDeclaration(symbol, node);
         }
 
         function bindThisPropertyAssignment(node: BindablePropertyAssignmentExpression | PropertyAccessExpression | LiteralLikeElementAccessExpression) {
diff --git a/tests/baselines/reference/javascriptImportDefaultBadExport.errors.txt b/tests/baselines/reference/javascriptImportDefaultBadExport.errors.txt
@@ -0,0 +1,16 @@
+/b.js(1,8): error TS1259: Module '"/a"' can only be default-imported using the 'esModuleInterop' flag
+
+
+==== /a.js (0 errors) ====
+    // https://github.com/microsoft/TypeScript/issues/34481
+    
+    
+    const alias = {};
+    module.exports = alias;
+    
+==== /b.js (1 errors) ====
+    import a from "./a";
+           ~
+!!! error TS1259: Module '"/a"' can only be default-imported using the 'esModuleInterop' flag
+!!! related TS2594 /a.js:5:1: This module is declared with using 'export =', and can only be used with a default import when using the 'esModuleInterop' flag.
+    
diff --git a/tests/baselines/reference/javascriptImportDefaultBadExport.symbols b/tests/baselines/reference/javascriptImportDefaultBadExport.symbols
@@ -0,0 +1,17 @@
+=== /a.js ===
+// https://github.com/microsoft/TypeScript/issues/34481
+
+
+const alias = {};
+>alias : Symbol(alias, Decl(a.js, 3, 5))
+
+module.exports = alias;
+>module.exports : Symbol("/a", Decl(a.js, 0, 0))
+>module : Symbol(export=, Decl(a.js, 3, 17))
+>exports : Symbol(export=, Decl(a.js, 3, 17))
+>alias : Symbol(alias, Decl(a.js, 3, 5))
+
+=== /b.js ===
+import a from "./a";
+>a : Symbol(a, Decl(b.js, 0, 6))
+
diff --git a/tests/baselines/reference/javascriptImportDefaultBadExport.types b/tests/baselines/reference/javascriptImportDefaultBadExport.types
@@ -0,0 +1,19 @@
+=== /a.js ===
+// https://github.com/microsoft/TypeScript/issues/34481
+
+
+const alias = {};
+>alias : {}
+>{} : {}
+
+module.exports = alias;
+>module.exports = alias : {}
+>module.exports : {}
+>module : { "/a": {}; }
+>exports : {}
+>alias : {}
+
+=== /b.js ===
+import a from "./a";
+>a : any
+
diff --git a/tests/cases/compiler/javascriptImportDefaultBadExport.ts b/tests/cases/compiler/javascriptImportDefaultBadExport.ts
@@ -0,0 +1,12 @@
+// https://github.com/microsoft/TypeScript/issues/34481
+
+// @allowJs: true
+// @checkJs: true
+// @noEmit: true
+
+// @Filename: /a.js
+const alias = {};
+module.exports = alias;
+
+// @Filename: /b.js
+import a from "./a";

Original file line number	Diff line number	Diff line change
`@@ -2690,7 +2690,8 @@ namespace ts {`
`2690`	`2690`	`const flags = exportAssignmentIsAlias(node)`
`2691`	`2691`	`? SymbolFlags.Alias // An export= with an EntityNameExpression or a ClassExpression exports all meanings of that identifier or class`
`2692`	`2692`	`: SymbolFlags.Property \| SymbolFlags.ExportValue \| SymbolFlags.ValueModule;`
`2693`		`- declareSymbol(file.symbol.exports!, file.symbol, node, flags \| SymbolFlags.Assignment, SymbolFlags.None);`
	`2693`	`+ const symbol = declareSymbol(file.symbol.exports!, file.symbol, node, flags \| SymbolFlags.Assignment, SymbolFlags.None);`
	`2694`	`+ setValueDeclaration(symbol, node);`
`2694`	`2695`	`}`
`2695`	`2696`
`2696`	`2697`	`function bindThisPropertyAssignment(node: BindablePropertyAssignmentExpression \| PropertyAccessExpression \| LiteralLikeElementAccessExpression) {`