Skip to content

Commit d876564

Browse files
andrewbranchandrewbranch
authored
Cherry-pick microsoft#37064 into release-3.8 (microsoft#37096)
* Fix renaming an ExportSpecifier name when propertyName is present (microsoft#36790) * Fix renaming exportSpecifier name when propertyName is present * Add baseline test for name without propertyName too * Set correct pos for NamespaceExport (microsoft#36794) * Set correct pos for NamespaceExport * Update tests * Cherry-pick PR microsoft#37064 into release-3.8
1 parent 963c1f0 commit d876564

File tree

8 files changed

+164
-4
lines changed

8 files changed

+164
-4
lines changed

‎src/compiler/checker.ts

+16-4
Original file line numberDiff line numberDiff line change
@@ -1922,10 +1922,11 @@ namespace ts {
19221922
if (!isValidTypeOnlyAliasUseSite(useSite)) {
19231923
const typeOnlyDeclaration = getTypeOnlyAliasDeclaration(symbol);
19241924
if (typeOnlyDeclaration) {
1925-
const message = typeOnlyDeclaration.kind === SyntaxKind.ExportSpecifier
1925+
const isExport = typeOnlyDeclarationIsExport(typeOnlyDeclaration);
1926+
const message = isExport
19261927
? Diagnostics._0_cannot_be_used_as_a_value_because_it_was_exported_using_export_type
19271928
: Diagnostics._0_cannot_be_used_as_a_value_because_it_was_imported_using_import_type;
1928-
const relatedMessage = typeOnlyDeclaration.kind === SyntaxKind.ExportSpecifier
1929+
const relatedMessage = isExport
19291930
? Diagnostics._0_was_exported_here
19301931
: Diagnostics._0_was_imported_here;
19311932
const unescapedName = unescapeLeadingUnderscores(name);
@@ -2272,12 +2273,14 @@ namespace ts {
22722273
function checkAndReportErrorForResolvingImportAliasToTypeOnlySymbol(node: ImportEqualsDeclaration, resolved: Symbol | undefined) {
22732274
if (markSymbolOfAliasDeclarationIfTypeOnly(node, /*immediateTarget*/ undefined, resolved, /*overwriteEmpty*/ false)) {
22742275
const typeOnlyDeclaration = getTypeOnlyAliasDeclaration(getSymbolOfNode(node))!;
2275-
const message = typeOnlyDeclaration.kind === SyntaxKind.ExportSpecifier
2276+
const isExport = typeOnlyDeclarationIsExport(typeOnlyDeclaration);
2277+
const message = isExport
22762278
? Diagnostics.An_import_alias_cannot_reference_a_declaration_that_was_exported_using_export_type
22772279
: Diagnostics.An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type;
2278-
const relatedMessage = typeOnlyDeclaration.kind === SyntaxKind.ExportSpecifier
2280+
const relatedMessage = isExport
22792281
? Diagnostics._0_was_exported_here
22802282
: Diagnostics._0_was_imported_here;
2283+
22812284
// Non-null assertion is safe because the optionality comes from ImportClause,
22822285
// but if an ImportClause was the typeOnlyDeclaration, it had to have a `name`.
22832286
const name = unescapeLeadingUnderscores(typeOnlyDeclaration.name!.escapedText);
@@ -33360,6 +33363,7 @@ namespace ts {
3336033363
grammarErrorOnFirstToken(node, Diagnostics.An_export_declaration_cannot_have_modifiers);
3336133364
}
3336233365

33366+
checkGrammarExportDeclaration(node);
3336333367
if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) {
3336433368
if (node.exportClause) {
3336533369
// export { x, y }
@@ -33392,6 +33396,14 @@ namespace ts {
3339233396
}
3339333397
}
3339433398

33399+
function checkGrammarExportDeclaration(node: ExportDeclaration): boolean {
33400+
const isTypeOnlyExportStar = node.isTypeOnly && node.exportClause?.kind !== SyntaxKind.NamedExports;
33401+
if (isTypeOnlyExportStar) {
33402+
grammarErrorOnNode(node, Diagnostics.Only_named_exports_may_use_export_type);
33403+
}
33404+
return !isTypeOnlyExportStar;
33405+
}
33406+
3339533407
function checkGrammarModuleElementContext(node: Statement, errorMessage: DiagnosticMessage): boolean {
3339633408
const isInAppropriateContext = node.parent.kind === SyntaxKind.SourceFile || node.parent.kind === SyntaxKind.ModuleBlock || node.parent.kind === SyntaxKind.ModuleDeclaration;
3339733409
if (!isInAppropriateContext) {

‎src/compiler/diagnosticMessages.json

+4
Original file line numberDiff line numberDiff line change
@@ -1135,6 +1135,10 @@
11351135
"category": "Error",
11361136
"code": 1380
11371137
},
1138+
"Only named exports may use 'export type'.": {
1139+
"category": "Error",
1140+
"code": 1383
1141+
},
11381142

11391143
"The types of '{0}' are incompatible between these types.": {
11401144
"category": "Error",

‎src/compiler/utilities.ts

+4
Original file line numberDiff line numberDiff line change
@@ -6172,6 +6172,10 @@ namespace ts {
61726172
|| !isExpressionNode(useSite);
61736173
}
61746174

6175+
export function typeOnlyDeclarationIsExport(typeOnlyDeclaration: Node) {
6176+
return typeOnlyDeclaration.kind === SyntaxKind.ExportSpecifier;
6177+
}
6178+
61756179
function isPartOfPossiblyValidTypeOrAbstractComputedPropertyName(node: Node) {
61766180
while (node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.PropertyAccessExpression) {
61776181
node = node.parent;

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

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
tests/cases/conformance/externalModules/typeOnly/b.ts(1,1): error TS1383: Only named exports may use 'export type'.
2+
tests/cases/conformance/externalModules/typeOnly/c.ts(1,1): error TS1383: Only named exports may use 'export type'.
3+
4+
5+
==== tests/cases/conformance/externalModules/typeOnly/a.ts (0 errors) ====
6+
export class A {}
7+
8+
==== tests/cases/conformance/externalModules/typeOnly/b.ts (1 errors) ====
9+
export type * from './a'; // Grammar error
10+
~~~~~~~~~~~~~~~~~~~~~~~~~
11+
!!! error TS1383: Only named exports may use 'export type'.
12+
13+
==== tests/cases/conformance/externalModules/typeOnly/c.ts (1 errors) ====
14+
export type * as ns from './a'; // Grammar error
15+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16+
!!! error TS1383: Only named exports may use 'export type'.
17+
18+
==== tests/cases/conformance/externalModules/typeOnly/d.ts (0 errors) ====
19+
import { A } from './b';
20+
A;
21+
22+
==== tests/cases/conformance/externalModules/typeOnly/e.ts (0 errors) ====
23+
import { ns } from './c';
24+
ns.A;
25+

‎tests/baselines/reference/exportNamespace4.js

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
//// [tests/cases/conformance/externalModules/typeOnly/exportNamespace4.ts] ////
2+
3+
//// [a.ts]
4+
export class A {}
5+
6+
//// [b.ts]
7+
export type * from './a'; // Grammar error
8+
9+
//// [c.ts]
10+
export type * as ns from './a'; // Grammar error
11+
12+
//// [d.ts]
13+
import { A } from './b';
14+
A;
15+
16+
//// [e.ts]
17+
import { ns } from './c';
18+
ns.A;
19+
20+
21+
//// [a.js]
22+
"use strict";
23+
exports.__esModule = true;
24+
var A = /** @class */ (function () {
25+
function A() {
26+
}
27+
return A;
28+
}());
29+
exports.A = A;
30+
//// [b.js]
31+
"use strict";
32+
exports.__esModule = true;
33+
//// [c.js]
34+
"use strict";
35+
exports.__esModule = true;
36+
//// [d.js]
37+
"use strict";
38+
exports.__esModule = true;
39+
var b_1 = require("./b");
40+
b_1.A;
41+
//// [e.js]
42+
"use strict";
43+
exports.__esModule = true;
44+
var c_1 = require("./c");
45+
c_1.ns.A;

‎tests/baselines/reference/exportNamespace4.symbols

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
=== tests/cases/conformance/externalModules/typeOnly/a.ts ===
2+
export class A {}
3+
>A : Symbol(A, Decl(a.ts, 0, 0))
4+
5+
=== tests/cases/conformance/externalModules/typeOnly/b.ts ===
6+
export type * from './a'; // Grammar error
7+
No type information for this code.
8+
No type information for this code.=== tests/cases/conformance/externalModules/typeOnly/c.ts ===
9+
export type * as ns from './a'; // Grammar error
10+
>ns : Symbol(ns, Decl(c.ts, 0, 11))
11+
12+
=== tests/cases/conformance/externalModules/typeOnly/d.ts ===
13+
import { A } from './b';
14+
>A : Symbol(A, Decl(d.ts, 0, 8))
15+
16+
A;
17+
>A : Symbol(A, Decl(d.ts, 0, 8))
18+
19+
=== tests/cases/conformance/externalModules/typeOnly/e.ts ===
20+
import { ns } from './c';
21+
>ns : Symbol(ns, Decl(e.ts, 0, 8))
22+
23+
ns.A;
24+
>ns.A : Symbol(ns.A, Decl(a.ts, 0, 0))
25+
>ns : Symbol(ns, Decl(e.ts, 0, 8))
26+
>A : Symbol(ns.A, Decl(a.ts, 0, 0))
27+

‎tests/baselines/reference/exportNamespace4.types

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
=== tests/cases/conformance/externalModules/typeOnly/a.ts ===
2+
export class A {}
3+
>A : A
4+
5+
=== tests/cases/conformance/externalModules/typeOnly/b.ts ===
6+
export type * from './a'; // Grammar error
7+
No type information for this code.
8+
No type information for this code.=== tests/cases/conformance/externalModules/typeOnly/c.ts ===
9+
export type * as ns from './a'; // Grammar error
10+
>ns : typeof ns
11+
12+
=== tests/cases/conformance/externalModules/typeOnly/d.ts ===
13+
import { A } from './b';
14+
>A : typeof A
15+
16+
A;
17+
>A : typeof A
18+
19+
=== tests/cases/conformance/externalModules/typeOnly/e.ts ===
20+
import { ns } from './c';
21+
>ns : typeof ns
22+
23+
ns.A;
24+
>ns.A : typeof ns.A
25+
>ns : typeof ns
26+
>A : typeof ns.A
27+

‎tests/cases/conformance/externalModules/typeOnly/exportNamespace4.ts

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// @Filename: a.ts
2+
export class A {}
3+
4+
// @Filename: b.ts
5+
export type * from './a'; // Grammar error
6+
7+
// @Filename: c.ts
8+
export type * as ns from './a'; // Grammar error
9+
10+
// @Filename: d.ts
11+
import { A } from './b';
12+
A;
13+
14+
// @Filename: e.ts
15+
import { ns } from './c';
16+
ns.A;

0 commit comments

Comments
 (0)