Skip to content

Commit 6bfb935

Browse files
DanielRosenwasserDanielRosenwasser
authored
Merge pull request #25445 from a-tarasyuk/bug/24542-bad-error-message-for-import-ing-an-export
24542 - bad error message for `import *`-ing an `export=`
2 parents b52a7fc + 52057ac commit 6bfb935

13 files changed

+194
-20
lines changed

‎src/compiler/checker.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2408,11 +2408,18 @@ namespace ts {
24082408
// combine other declarations with the module or variable (e.g. a class/module, function/module, interface/variable).
24092409
function resolveESModuleSymbol(moduleSymbol: Symbol | undefined, referencingLocation: Node, dontResolveAlias: boolean): Symbol | undefined {
24102410
const symbol = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias);
2411+
24112412
if (!dontResolveAlias && symbol) {
24122413
if (!(symbol.flags & (SymbolFlags.Module | SymbolFlags.Variable)) && !getDeclarationOfKind(symbol, SyntaxKind.SourceFile)) {
2413-
error(referencingLocation, Diagnostics.Module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct, symbolToString(moduleSymbol!));
2414+
const compilerOptionName = moduleKind >= ModuleKind.ES2015
2415+
? "allowSyntheticDefaultImports"
2416+
: "esModuleInterop";
2417+
2418+
error(referencingLocation, Diagnostics.This_module_can_only_be_referenced_with_ECMAScript_imports_Slashexports_by_turning_on_the_0_flag_and_referencing_its_default_export, compilerOptionName);
2419+
24142420
return symbol;
24152421
}
2422+
24162423
if (compilerOptions.esModuleInterop) {
24172424
const referenceParent = referencingLocation.parent;
24182425
if (

‎src/compiler/diagnosticMessages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1776,7 +1776,7 @@
17761776
"category": "Error",
17771777
"code": 2496
17781778
},
1779-
"Module '{0}' resolves to a non-module entity and cannot be imported using this construct.": {
1779+
"This module can only be referenced with ECMAScript imports/exports by turning on the '{0}' flag and referencing its default export.": {
17801780
"category": "Error",
17811781
"code": 2497
17821782
},

‎tests/baselines/reference/es6ExportEqualsInterop.errors.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,24 @@ tests/cases/compiler/main.ts(33,8): error TS1192: Module '"function"' has no def
1111
tests/cases/compiler/main.ts(34,8): error TS1192: Module '"function-module"' has no default export.
1212
tests/cases/compiler/main.ts(35,8): error TS1192: Module '"class"' has no default export.
1313
tests/cases/compiler/main.ts(36,8): error TS1192: Module '"class-module"' has no default export.
14-
tests/cases/compiler/main.ts(39,21): error TS2497: Module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
15-
tests/cases/compiler/main.ts(45,21): error TS2497: Module '"function"' resolves to a non-module entity and cannot be imported using this construct.
16-
tests/cases/compiler/main.ts(47,21): error TS2497: Module '"class"' resolves to a non-module entity and cannot be imported using this construct.
14+
tests/cases/compiler/main.ts(39,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
15+
tests/cases/compiler/main.ts(45,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
16+
tests/cases/compiler/main.ts(47,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
1717
tests/cases/compiler/main.ts(50,1): error TS2693: 'y1' only refers to a type, but is being used as a value here.
1818
tests/cases/compiler/main.ts(56,4): error TS2339: Property 'a' does not exist on type '() => any'.
1919
tests/cases/compiler/main.ts(58,4): error TS2339: Property 'a' does not exist on type 'typeof Foo'.
2020
tests/cases/compiler/main.ts(62,10): error TS2305: Module '"interface"' has no exported member 'a'.
21-
tests/cases/compiler/main.ts(62,25): error TS2497: Module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
21+
tests/cases/compiler/main.ts(62,25): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
2222
tests/cases/compiler/main.ts(68,10): error TS2305: Module '"function"' has no exported member 'a'.
23-
tests/cases/compiler/main.ts(68,25): error TS2497: Module '"function"' resolves to a non-module entity and cannot be imported using this construct.
23+
tests/cases/compiler/main.ts(68,25): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
2424
tests/cases/compiler/main.ts(70,10): error TS2305: Module '"class"' has no exported member 'a'.
25-
tests/cases/compiler/main.ts(70,25): error TS2497: Module '"class"' resolves to a non-module entity and cannot be imported using this construct.
25+
tests/cases/compiler/main.ts(70,25): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
2626
tests/cases/compiler/main.ts(85,10): error TS2305: Module '"interface"' has no exported member 'a'.
27-
tests/cases/compiler/main.ts(85,25): error TS2497: Module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
27+
tests/cases/compiler/main.ts(85,25): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
2828
tests/cases/compiler/main.ts(91,10): error TS2305: Module '"function"' has no exported member 'a'.
29-
tests/cases/compiler/main.ts(91,25): error TS2497: Module '"function"' resolves to a non-module entity and cannot be imported using this construct.
29+
tests/cases/compiler/main.ts(91,25): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
3030
tests/cases/compiler/main.ts(93,10): error TS2305: Module '"class"' has no exported member 'a'.
31-
tests/cases/compiler/main.ts(93,25): error TS2497: Module '"class"' resolves to a non-module entity and cannot be imported using this construct.
31+
tests/cases/compiler/main.ts(93,25): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
3232
tests/cases/compiler/main.ts(97,15): error TS2498: Module '"interface"' uses 'export =' and cannot be used with 'export *'.
3333
tests/cases/compiler/main.ts(98,15): error TS2498: Module '"variable"' uses 'export =' and cannot be used with 'export *'.
3434
tests/cases/compiler/main.ts(99,15): error TS2498: Module '"interface-variable"' uses 'export =' and cannot be used with 'export *'.
@@ -108,19 +108,19 @@ tests/cases/compiler/main.ts(106,15): error TS2498: Module '"class-module"' uses
108108
// namespace import
109109
import * as y1 from "interface";
110110
~~~~~~~~~~~
111-
!!! error TS2497: Module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
111+
!!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
112112
import * as y2 from "variable";
113113
import * as y3 from "interface-variable";
114114
import * as y4 from "module";
115115
import * as y5 from "interface-module";
116116
import * as y6 from "variable-module";
117117
import * as y7 from "function";
118118
~~~~~~~~~~
119-
!!! error TS2497: Module '"function"' resolves to a non-module entity and cannot be imported using this construct.
119+
!!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
120120
import * as y8 from "function-module";
121121
import * as y9 from "class";
122122
~~~~~~~
123-
!!! error TS2497: Module '"class"' resolves to a non-module entity and cannot be imported using this construct.
123+
!!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
124124
import * as y0 from "class-module";
125125

126126
y1.a;
@@ -145,7 +145,7 @@ tests/cases/compiler/main.ts(106,15): error TS2498: Module '"class-module"' uses
145145
~
146146
!!! error TS2305: Module '"interface"' has no exported member 'a'.
147147
~~~~~~~~~~~
148-
!!! error TS2497: Module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
148+
!!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
149149
import { a as a2 } from "variable";
150150
import { a as a3 } from "interface-variable";
151151
import { a as a4 } from "module";
@@ -155,13 +155,13 @@ tests/cases/compiler/main.ts(106,15): error TS2498: Module '"class-module"' uses
155155
~
156156
!!! error TS2305: Module '"function"' has no exported member 'a'.
157157
~~~~~~~~~~
158-
!!! error TS2497: Module '"function"' resolves to a non-module entity and cannot be imported using this construct.
158+
!!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
159159
import { a as a8 } from "function-module";
160160
import { a as a9 } from "class";
161161
~
162162
!!! error TS2305: Module '"class"' has no exported member 'a'.
163163
~~~~~~~
164-
!!! error TS2497: Module '"class"' resolves to a non-module entity and cannot be imported using this construct.
164+
!!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
165165
import { a as a0 } from "class-module";
166166

167167
a1;
@@ -180,7 +180,7 @@ tests/cases/compiler/main.ts(106,15): error TS2498: Module '"class-module"' uses
180180
~
181181
!!! error TS2305: Module '"interface"' has no exported member 'a'.
182182
~~~~~~~~~~~
183-
!!! error TS2497: Module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
183+
!!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
184184
export { a as a2 } from "variable";
185185
export { a as a3 } from "interface-variable";
186186
export { a as a4 } from "module";
@@ -190,13 +190,13 @@ tests/cases/compiler/main.ts(106,15): error TS2498: Module '"class-module"' uses
190190
~
191191
!!! error TS2305: Module '"function"' has no exported member 'a'.
192192
~~~~~~~~~~
193-
!!! error TS2497: Module '"function"' resolves to a non-module entity and cannot be imported using this construct.
193+
!!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
194194
export { a as a8 } from "function-module";
195195
export { a as a9 } from "class";
196196
~
197197
!!! error TS2305: Module '"class"' has no exported member 'a'.
198198
~~~~~~~
199-
!!! error TS2497: Module '"class"' resolves to a non-module entity and cannot be imported using this construct.
199+
!!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
200200
export { a as a0 } from "class-module";
201201

202202
// export-star

‎tests/baselines/reference/es6ImportEqualsExportModuleCommonJsError.errors.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
tests/cases/compiler/main.ts(1,20): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
2+
3+
4+
==== tests/cases/compiler/a.ts (0 errors) ====
5+
class a { }
6+
export = a;
7+
8+
==== tests/cases/compiler/main.ts (1 errors) ====
9+
import * as a from "./a";
10+
~~~~~
11+
!!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
12+
a;
13+
14+
15+

‎tests/baselines/reference/es6ImportEqualsExportModuleCommonJsError.js

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
//// [tests/cases/compiler/es6ImportEqualsExportModuleCommonJsError.ts] ////
2+
3+
//// [a.ts]
4+
class a { }
5+
export = a;
6+
7+
//// [main.ts]
8+
import * as a from "./a";
9+
a;
10+
11+
12+
13+
14+
//// [a.js]
15+
"use strict";
16+
var a = /** @class */ (function () {
17+
function a() {
18+
}
19+
return a;
20+
}());
21+
module.exports = a;
22+
//// [main.js]
23+
"use strict";
24+
exports.__esModule = true;
25+
var a = require("./a");
26+
a;

‎tests/baselines/reference/es6ImportEqualsExportModuleCommonJsError.symbols

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
=== tests/cases/compiler/a.ts ===
2+
class a { }
3+
>a : Symbol(a, Decl(a.ts, 0, 0))
4+
5+
export = a;
6+
>a : Symbol(a, Decl(a.ts, 0, 0))
7+
8+
=== tests/cases/compiler/main.ts ===
9+
import * as a from "./a";
10+
>a : Symbol(a, Decl(main.ts, 0, 6))
11+
12+
a;
13+
>a : Symbol(a, Decl(main.ts, 0, 6))
14+
15+
16+

‎tests/baselines/reference/es6ImportEqualsExportModuleCommonJsError.types

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
=== tests/cases/compiler/a.ts ===
2+
class a { }
3+
>a : a
4+
5+
export = a;
6+
>a : a
7+
8+
=== tests/cases/compiler/main.ts ===
9+
import * as a from "./a";
10+
>a : typeof a
11+
12+
a;
13+
>a : typeof a
14+
15+
16+

‎tests/baselines/reference/es6ImportEqualsExportModuleEs2015Error.errors.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
tests/cases/compiler/a.ts(2,1): error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead.
2+
tests/cases/compiler/main.ts(1,20): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'allowSyntheticDefaultImports' flag and referencing its default export.
3+
4+
5+
==== tests/cases/compiler/a.ts (1 errors) ====
6+
class a { }
7+
export = a;
8+
~~~~~~~~~~~
9+
!!! error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead.
10+
11+
==== tests/cases/compiler/main.ts (1 errors) ====
12+
import * as a from "./a";
13+
~~~~~
14+
!!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'allowSyntheticDefaultImports' flag and referencing its default export.
15+
a;
16+
17+
18+

‎tests/baselines/reference/es6ImportEqualsExportModuleEs2015Error.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
//// [tests/cases/compiler/es6ImportEqualsExportModuleEs2015Error.ts] ////
2+
3+
//// [a.ts]
4+
class a { }
5+
export = a;
6+
7+
//// [main.ts]
8+
import * as a from "./a";
9+
a;
10+
11+
12+
13+
14+
//// [a.js]
15+
var a = /** @class */ (function () {
16+
function a() {
17+
}
18+
return a;
19+
}());
20+
//// [main.js]
21+
import * as a from "./a";
22+
a;

‎tests/baselines/reference/es6ImportEqualsExportModuleEs2015Error.symbols

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
=== tests/cases/compiler/a.ts ===
2+
class a { }
3+
>a : Symbol(a, Decl(a.ts, 0, 0))
4+
5+
export = a;
6+
>a : Symbol(a, Decl(a.ts, 0, 0))
7+
8+
=== tests/cases/compiler/main.ts ===
9+
import * as a from "./a";
10+
>a : Symbol(a, Decl(main.ts, 0, 6))
11+
12+
a;
13+
>a : Symbol(a, Decl(main.ts, 0, 6))
14+
15+
16+

0 commit comments

Comments
 (0)