Skip to content

Commit 0cfe24e

Browse files
DanielRosenwasserDanielRosenwasser
committed
Merge pull request microsoft#8051 from Microsoft/cannotExportName
Elaborate on the name of a declaration when telling users we can't export it
2 parents 96deb55 + a25c70b commit 0cfe24e

10 files changed

Lines changed: 70 additions & 70 deletions

‎src/compiler/checker.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15802,7 +15802,7 @@ namespace ts {
1580215802
const symbol = resolveName(exportedName, exportedName.text, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Alias,
1580315803
/*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
1580415804
if (symbol && (symbol === undefinedSymbol || isGlobalSourceFile(getDeclarationContainer(symbol.declarations[0])))) {
15805-
error(exportedName, Diagnostics.Cannot_re_export_name_that_is_not_defined_in_the_module);
15805+
error(exportedName, Diagnostics.Cannot_export_0_Only_local_declarations_can_be_exported_from_a_module, exportedName.text);
1580615806
}
1580715807
else {
1580815808
markExportAsReferenced(node);

‎src/compiler/diagnosticMessages.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1819,7 +1819,7 @@
18191819
"category": "Error",
18201820
"code": 2660
18211821
},
1822-
"Cannot re-export name that is not defined in the module.": {
1822+
"Cannot export '{0}'. Only local declarations can be exported from a module.": {
18231823
"category": "Error",
18241824
"code": 2661
18251825
},

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/compiler/b.ts(1,9): error TS2661: Cannot re-export name that is not defined in the module.
1+
tests/cases/compiler/b.ts(1,9): error TS2661: Cannot export 'X'. Only local declarations can be exported from a module.
22

33

44
==== tests/cases/compiler/a.d.ts (0 errors) ====
@@ -8,7 +8,7 @@ tests/cases/compiler/b.ts(1,9): error TS2661: Cannot re-export name that is not
88
==== tests/cases/compiler/b.ts (1 errors) ====
99
export {X};
1010
~
11-
!!! error TS2661: Cannot re-export name that is not defined in the module.
11+
!!! error TS2661: Cannot export 'X'. Only local declarations can be exported from a module.
1212
export function f() {
1313
var x: X;
1414
return x;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
tests/cases/compiler/exportSpecifierReferencingOuterDeclaration1.ts(3,14): error TS2661: Cannot re-export name that is not defined in the module.
1+
tests/cases/compiler/exportSpecifierReferencingOuterDeclaration1.ts(3,14): error TS2661: Cannot export 'X'. Only local declarations can be exported from a module.
22

33

44
==== tests/cases/compiler/exportSpecifierReferencingOuterDeclaration1.ts (1 errors) ====
55
declare module X { export interface bar { } }
66
declare module "m" {
77
export { X };
88
~
9-
!!! error TS2661: Cannot re-export name that is not defined in the module.
9+
!!! error TS2661: Cannot export 'X'. Only local declarations can be exported from a module.
1010
export function foo(): X.bar;
1111
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2_B.ts(1,10): error TS2661: Cannot re-export name that is not defined in the module.
1+
tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2_B.ts(1,10): error TS2661: Cannot export 'X'. Only local declarations can be exported from a module.
22

33

44
==== tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2_A.ts (0 errors) ====
@@ -7,5 +7,5 @@ tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2_B.ts(1,10): err
77
==== tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2_B.ts (1 errors) ====
88
export { X };
99
~
10-
!!! error TS2661: Cannot re-export name that is not defined in the module.
10+
!!! error TS2661: Cannot export 'X'. Only local declarations can be exported from a module.
1111
export declare function foo(): X.bar;

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
tests/cases/compiler/file2.ts(1,9): error TS2661: Cannot re-export name that is not defined in the module.
2-
tests/cases/compiler/file2.ts(1,12): error TS2661: Cannot re-export name that is not defined in the module.
3-
tests/cases/compiler/file2.ts(2,9): error TS2661: Cannot re-export name that is not defined in the module.
4-
tests/cases/compiler/file2.ts(2,13): error TS2661: Cannot re-export name that is not defined in the module.
5-
tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot re-export name that is not defined in the module.
6-
tests/cases/compiler/file2.ts(4,12): error TS2661: Cannot re-export name that is not defined in the module.
7-
tests/cases/compiler/file2.ts(5,9): error TS2661: Cannot re-export name that is not defined in the module.
8-
tests/cases/compiler/file2.ts(5,12): error TS2661: Cannot re-export name that is not defined in the module.
9-
tests/cases/compiler/file2.ts(8,9): error TS2661: Cannot re-export name that is not defined in the module.
10-
tests/cases/compiler/file2.ts(9,9): error TS2661: Cannot re-export name that is not defined in the module.
11-
tests/cases/compiler/file2.ts(10,9): error TS2661: Cannot re-export name that is not defined in the module.
12-
tests/cases/compiler/file2.ts(11,9): error TS2661: Cannot re-export name that is not defined in the module.
1+
tests/cases/compiler/file2.ts(1,9): error TS2661: Cannot export 'x'. Only local declarations can be exported from a module.
2+
tests/cases/compiler/file2.ts(1,12): error TS2661: Cannot export 'x'. Only local declarations can be exported from a module.
3+
tests/cases/compiler/file2.ts(2,9): error TS2661: Cannot export 'x1'. Only local declarations can be exported from a module.
4+
tests/cases/compiler/file2.ts(2,13): error TS2661: Cannot export 'x1'. Only local declarations can be exported from a module.
5+
tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot export 'a'. Only local declarations can be exported from a module.
6+
tests/cases/compiler/file2.ts(4,12): error TS2661: Cannot export 'a'. Only local declarations can be exported from a module.
7+
tests/cases/compiler/file2.ts(5,9): error TS2661: Cannot export 'b'. Only local declarations can be exported from a module.
8+
tests/cases/compiler/file2.ts(5,12): error TS2661: Cannot export 'b'. Only local declarations can be exported from a module.
9+
tests/cases/compiler/file2.ts(8,9): error TS2661: Cannot export 'x'. Only local declarations can be exported from a module.
10+
tests/cases/compiler/file2.ts(9,9): error TS2661: Cannot export 'x1'. Only local declarations can be exported from a module.
11+
tests/cases/compiler/file2.ts(10,9): error TS2661: Cannot export 'a'. Only local declarations can be exported from a module.
12+
tests/cases/compiler/file2.ts(11,9): error TS2661: Cannot export 'b'. Only local declarations can be exported from a module.
1313

1414

1515
==== tests/cases/compiler/file1.d.ts (0 errors) ====
@@ -21,37 +21,37 @@ tests/cases/compiler/file2.ts(11,9): error TS2661: Cannot re-export name that is
2121
==== tests/cases/compiler/file2.ts (12 errors) ====
2222
export {x, x as y};
2323
~
24-
!!! error TS2661: Cannot re-export name that is not defined in the module.
24+
!!! error TS2661: Cannot export 'x'. Only local declarations can be exported from a module.
2525
~
26-
!!! error TS2661: Cannot re-export name that is not defined in the module.
26+
!!! error TS2661: Cannot export 'x'. Only local declarations can be exported from a module.
2727
export {x1, x1 as y1};
2828
~~
29-
!!! error TS2661: Cannot re-export name that is not defined in the module.
29+
!!! error TS2661: Cannot export 'x1'. Only local declarations can be exported from a module.
3030
~~
31-
!!! error TS2661: Cannot re-export name that is not defined in the module.
31+
!!! error TS2661: Cannot export 'x1'. Only local declarations can be exported from a module.
3232

3333
export {a, a as a1};
3434
~
35-
!!! error TS2661: Cannot re-export name that is not defined in the module.
35+
!!! error TS2661: Cannot export 'a'. Only local declarations can be exported from a module.
3636
~
37-
!!! error TS2661: Cannot re-export name that is not defined in the module.
37+
!!! error TS2661: Cannot export 'a'. Only local declarations can be exported from a module.
3838
export {b, b as b1};
3939
~
40-
!!! error TS2661: Cannot re-export name that is not defined in the module.
40+
!!! error TS2661: Cannot export 'b'. Only local declarations can be exported from a module.
4141
~
42-
!!! error TS2661: Cannot re-export name that is not defined in the module.
42+
!!! error TS2661: Cannot export 'b'. Only local declarations can be exported from a module.
4343

4444

4545
export {x as z};
4646
~
47-
!!! error TS2661: Cannot re-export name that is not defined in the module.
47+
!!! error TS2661: Cannot export 'x'. Only local declarations can be exported from a module.
4848
export {x1 as z1};
4949
~~
50-
!!! error TS2661: Cannot re-export name that is not defined in the module.
50+
!!! error TS2661: Cannot export 'x1'. Only local declarations can be exported from a module.
5151
export {a as a2};
5252
~
53-
!!! error TS2661: Cannot re-export name that is not defined in the module.
53+
!!! error TS2661: Cannot export 'a'. Only local declarations can be exported from a module.
5454
export {b as b2};
5555
~
56-
!!! error TS2661: Cannot re-export name that is not defined in the module.
56+
!!! error TS2661: Cannot export 'b'. Only local declarations can be exported from a module.
5757

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
tests/cases/compiler/file2.ts(1,9): error TS2661: Cannot re-export name that is not defined in the module.
2-
tests/cases/compiler/file2.ts(1,13): error TS2661: Cannot re-export name that is not defined in the module.
3-
tests/cases/compiler/file2.ts(2,9): error TS2661: Cannot re-export name that is not defined in the module.
4-
tests/cases/compiler/file2.ts(2,13): error TS2661: Cannot re-export name that is not defined in the module.
5-
tests/cases/compiler/file2.ts(3,9): error TS2661: Cannot re-export name that is not defined in the module.
6-
tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot re-export name that is not defined in the module.
1+
tests/cases/compiler/file2.ts(1,9): error TS2661: Cannot export 'I1'. Only local declarations can be exported from a module.
2+
tests/cases/compiler/file2.ts(1,13): error TS2661: Cannot export 'I1'. Only local declarations can be exported from a module.
3+
tests/cases/compiler/file2.ts(2,9): error TS2661: Cannot export 'I2'. Only local declarations can be exported from a module.
4+
tests/cases/compiler/file2.ts(2,13): error TS2661: Cannot export 'I2'. Only local declarations can be exported from a module.
5+
tests/cases/compiler/file2.ts(3,9): error TS2661: Cannot export 'I1'. Only local declarations can be exported from a module.
6+
tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot export 'I2'. Only local declarations can be exported from a module.
77

88

99
==== tests/cases/compiler/file1.d.ts (0 errors) ====
@@ -19,17 +19,17 @@ tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot re-export name that is
1919
==== tests/cases/compiler/file2.ts (6 errors) ====
2020
export {I1, I1 as II1};
2121
~~
22-
!!! error TS2661: Cannot re-export name that is not defined in the module.
22+
!!! error TS2661: Cannot export 'I1'. Only local declarations can be exported from a module.
2323
~~
24-
!!! error TS2661: Cannot re-export name that is not defined in the module.
24+
!!! error TS2661: Cannot export 'I1'. Only local declarations can be exported from a module.
2525
export {I2, I2 as II2};
2626
~~
27-
!!! error TS2661: Cannot re-export name that is not defined in the module.
27+
!!! error TS2661: Cannot export 'I2'. Only local declarations can be exported from a module.
2828
~~
29-
!!! error TS2661: Cannot re-export name that is not defined in the module.
29+
!!! error TS2661: Cannot export 'I2'. Only local declarations can be exported from a module.
3030
export {I1 as III1};
3131
~~
32-
!!! error TS2661: Cannot re-export name that is not defined in the module.
32+
!!! error TS2661: Cannot export 'I1'. Only local declarations can be exported from a module.
3333
export {I2 as III2};
3434
~~
35-
!!! error TS2661: Cannot re-export name that is not defined in the module.
35+
!!! error TS2661: Cannot export 'I2'. Only local declarations can be exported from a module.

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
tests/cases/compiler/file2.ts(1,9): error TS2661: Cannot re-export name that is not defined in the module.
2-
tests/cases/compiler/file2.ts(1,14): error TS2661: Cannot re-export name that is not defined in the module.
3-
tests/cases/compiler/file2.ts(2,9): error TS2661: Cannot re-export name that is not defined in the module.
4-
tests/cases/compiler/file2.ts(2,14): error TS2661: Cannot re-export name that is not defined in the module.
5-
tests/cases/compiler/file2.ts(3,9): error TS2661: Cannot re-export name that is not defined in the module.
6-
tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot re-export name that is not defined in the module.
1+
tests/cases/compiler/file2.ts(1,9): error TS2661: Cannot export 'NS1'. Only local declarations can be exported from a module.
2+
tests/cases/compiler/file2.ts(1,14): error TS2661: Cannot export 'NS1'. Only local declarations can be exported from a module.
3+
tests/cases/compiler/file2.ts(2,9): error TS2661: Cannot export 'NS2'. Only local declarations can be exported from a module.
4+
tests/cases/compiler/file2.ts(2,14): error TS2661: Cannot export 'NS2'. Only local declarations can be exported from a module.
5+
tests/cases/compiler/file2.ts(3,9): error TS2661: Cannot export 'NS1'. Only local declarations can be exported from a module.
6+
tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot export 'NS2'. Only local declarations can be exported from a module.
77

88

99
==== tests/cases/compiler/file1.d.ts (0 errors) ====
@@ -19,17 +19,17 @@ tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot re-export name that is
1919
==== tests/cases/compiler/file2.ts (6 errors) ====
2020
export {NS1, NS1 as NNS1};
2121
~~~
22-
!!! error TS2661: Cannot re-export name that is not defined in the module.
22+
!!! error TS2661: Cannot export 'NS1'. Only local declarations can be exported from a module.
2323
~~~
24-
!!! error TS2661: Cannot re-export name that is not defined in the module.
24+
!!! error TS2661: Cannot export 'NS1'. Only local declarations can be exported from a module.
2525
export {NS2, NS2 as NNS2};
2626
~~~
27-
!!! error TS2661: Cannot re-export name that is not defined in the module.
27+
!!! error TS2661: Cannot export 'NS2'. Only local declarations can be exported from a module.
2828
~~~
29-
!!! error TS2661: Cannot re-export name that is not defined in the module.
29+
!!! error TS2661: Cannot export 'NS2'. Only local declarations can be exported from a module.
3030
export {NS1 as NNNS1};
3131
~~~
32-
!!! error TS2661: Cannot re-export name that is not defined in the module.
32+
!!! error TS2661: Cannot export 'NS1'. Only local declarations can be exported from a module.
3333
export {NS2 as NNNS2};
3434
~~~
35-
!!! error TS2661: Cannot re-export name that is not defined in the module.
35+
!!! error TS2661: Cannot export 'NS2'. Only local declarations can be exported from a module.

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
tests/cases/compiler/file2.ts(1,9): error TS2661: Cannot re-export name that is not defined in the module.
2-
tests/cases/compiler/file2.ts(1,15): error TS2661: Cannot re-export name that is not defined in the module.
3-
tests/cases/compiler/file2.ts(2,9): error TS2661: Cannot re-export name that is not defined in the module.
4-
tests/cases/compiler/file2.ts(2,15): error TS2661: Cannot re-export name that is not defined in the module.
5-
tests/cases/compiler/file2.ts(3,9): error TS2661: Cannot re-export name that is not defined in the module.
6-
tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot re-export name that is not defined in the module.
1+
tests/cases/compiler/file2.ts(1,9): error TS2661: Cannot export 'Cls1'. Only local declarations can be exported from a module.
2+
tests/cases/compiler/file2.ts(1,15): error TS2661: Cannot export 'Cls1'. Only local declarations can be exported from a module.
3+
tests/cases/compiler/file2.ts(2,9): error TS2661: Cannot export 'Cls2'. Only local declarations can be exported from a module.
4+
tests/cases/compiler/file2.ts(2,15): error TS2661: Cannot export 'Cls2'. Only local declarations can be exported from a module.
5+
tests/cases/compiler/file2.ts(3,9): error TS2661: Cannot export 'Cls1'. Only local declarations can be exported from a module.
6+
tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot export 'Cls2'. Only local declarations can be exported from a module.
77

88

99
==== tests/cases/compiler/file1.d.ts (0 errors) ====
@@ -19,17 +19,17 @@ tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot re-export name that is
1919
==== tests/cases/compiler/file2.ts (6 errors) ====
2020
export {Cls1, Cls1 as CCls1};
2121
~~~~
22-
!!! error TS2661: Cannot re-export name that is not defined in the module.
22+
!!! error TS2661: Cannot export 'Cls1'. Only local declarations can be exported from a module.
2323
~~~~
24-
!!! error TS2661: Cannot re-export name that is not defined in the module.
24+
!!! error TS2661: Cannot export 'Cls1'. Only local declarations can be exported from a module.
2525
export {Cls2, Cls2 as CCls2};
2626
~~~~
27-
!!! error TS2661: Cannot re-export name that is not defined in the module.
27+
!!! error TS2661: Cannot export 'Cls2'. Only local declarations can be exported from a module.
2828
~~~~
29-
!!! error TS2661: Cannot re-export name that is not defined in the module.
29+
!!! error TS2661: Cannot export 'Cls2'. Only local declarations can be exported from a module.
3030
export {Cls1 as CCCls1};
3131
~~~~
32-
!!! error TS2661: Cannot re-export name that is not defined in the module.
32+
!!! error TS2661: Cannot export 'Cls1'. Only local declarations can be exported from a module.
3333
export {Cls2 as CCCls2};
3434
~~~~
35-
!!! error TS2661: Cannot re-export name that is not defined in the module.
35+
!!! error TS2661: Cannot export 'Cls2'. Only local declarations can be exported from a module.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
tests/cases/compiler/a.ts(2,10): error TS2661: Cannot re-export name that is not defined in the module.
1+
tests/cases/compiler/a.ts(2,10): error TS2661: Cannot export 'undefined'. Only local declarations can be exported from a module.
22

33

44
==== tests/cases/compiler/a.ts (1 errors) ====
55

66
export { undefined };
77
~~~~~~~~~
8-
!!! error TS2661: Cannot re-export name that is not defined in the module.
8+
!!! error TS2661: Cannot export 'undefined'. Only local declarations can be exported from a module.

0 commit comments

Comments
 (0)