Skip to content

feat(typescript-estree): support type-only module specifiers #4076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 12, 2021
Merged

feat(typescript-estree): support type-only module specifiers #4076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
405a1ae
feat(ast-spec): add kind property to specifier nodes
sosukesuzuki Oct 30, 2021
62838cd
feat(typescript-estree): support type-only module specifiers
sosukesuzuki Oct 30, 2021
0d9c6e6
test(typescript-estree): updates snapshots
sosukesuzuki Oct 30, 2021
c4b3627
test(typescript-estree): update babel/parser to 7.16.0 for ast alignm…
sosukesuzuki Oct 30, 2021
9f035e8
test(typescript-estree): add fixtures for type only module specifiers
sosukesuzuki Oct 30, 2021
fc913af
test(typescript-estree): fix ast-alignment tests
sosukesuzuki Nov 11, 2021
ed5d3eb
test(typescript-estree): update tests
sosukesuzuki Nov 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/ast-spec/src/special/ExportSpecifier/spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import type { AST_NODE_TYPES } from '../../ast-node-types';
import type { BaseNode } from '../../base/BaseNode';
import type { ExportKind } from '../../declaration/ExportAndImportKind';
import type { Identifier } from '../../expression/Identifier/spec';

export interface ExportSpecifier extends BaseNode {
type: AST_NODE_TYPES.ExportSpecifier;
local: Identifier;
exported: Identifier;
exportKind: ExportKind;
}
2 changes: 2 additions & 0 deletions packages/ast-spec/src/special/ImportSpecifier/spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import type { AST_NODE_TYPES } from '../../ast-node-types';
import type { BaseNode } from '../../base/BaseNode';
import type { ImportKind } from '../../declaration/ExportAndImportKind';
import type { Identifier } from '../../expression/Identifier/spec';

export interface ImportSpecifier extends BaseNode {
type: AST_NODE_TYPES.ImportSpecifier;
local: Identifier;
imported: Identifier;
importKind: ImportKind;
}
1 change: 1 addition & 0 deletions packages/shared-fixtures/fixtures/typescript/basics/type-only-export-specifiers.src.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { type A, type B } from "mod";
1 change: 1 addition & 0 deletions packages/shared-fixtures/fixtures/typescript/basics/type-only-import-specifiers.src.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import { type A, type B } from "mod";
2 changes: 2 additions & 0 deletions packages/typescript-estree/src/convert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1793,6 +1793,7 @@ export class Converter {
type: AST_NODE_TYPES.ImportSpecifier,
local: this.convertChild(node.name),
imported: this.convertChild(node.propertyName ?? node.name),
importKind: node.isTypeOnly ? 'type' : 'value',
});

case SyntaxKind.ImportClause: {
Expand Down Expand Up @@ -1841,6 +1842,7 @@ export class Converter {
type: AST_NODE_TYPES.ExportSpecifier,
local: this.convertChild(node.propertyName ?? node.name),
exported: this.convertChild(node.name),
exportKind: node.isTypeOnly ? 'type' : 'value',
});

case SyntaxKind.ExportAssignment:
Expand Down
12 changes: 0 additions & 12 deletions packages/typescript-estree/tests/ast-alignment/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,18 +263,6 @@ export function preprocessBabylonAST(ast: File): any {
Object.keys(node).forEach(key => delete node[key]);
Object.assign(node, typeAnnotation);
},
/**
* @see https://github.com/babel/babel/pull/13802
*/
ImportSpecifier(node) {
delete node.importKind;
},
/**
* @see https://github.com/babel/babel/pull/13802
*/
ExportSpecifier(node) {
delete node.exportKind;
},
/*
* Babel's AST has no `assertions` property if there are no assertions.
*/
Expand Down
4 changes: 4 additions & 0 deletions packages/typescript-estree/tests/lib/__snapshots__/semantic-diagnostics-enabled.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2126,6 +2126,10 @@ exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" e

exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/basics/type-import-type-with-type-parameters-in-type-reference.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;

exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/basics/type-only-export-specifiers.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;

exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/basics/type-only-import-specifiers.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;

exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/basics/type-parameters-comments.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;

exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/basics/type-parameters-comments-heritage.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;
Expand Down
1 change: 1 addition & 0 deletions ...ages/typescript-estree/tests/snapshots/javascript/modules/export-from-default.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Object {
},
"specifiers": Array [
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down
1 change: 1 addition & 0 deletions ...script-estree/tests/snapshots/javascript/modules/export-from-named-as-default.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Object {
},
"specifiers": Array [
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down
1 change: 1 addition & 0 deletions ...ript-estree/tests/snapshots/javascript/modules/export-from-named-as-specifier.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Object {
},
"specifiers": Array [
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down
2 changes: 2 additions & 0 deletions ...ipt-estree/tests/snapshots/javascript/modules/export-from-named-as-specifiers.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Object {
},
"specifiers": Array [
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down Expand Up @@ -95,6 +96,7 @@ Object {
"type": "ExportSpecifier",
},
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down
1 change: 1 addition & 0 deletions ...es/typescript-estree/tests/snapshots/javascript/modules/export-from-specifier.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Object {
},
"specifiers": Array [
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down
2 changes: 2 additions & 0 deletions ...s/typescript-estree/tests/snapshots/javascript/modules/export-from-specifiers.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Object {
},
"specifiers": Array [
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down Expand Up @@ -95,6 +96,7 @@ Object {
"type": "ExportSpecifier",
},
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down
1 change: 1 addition & 0 deletions .../typescript-estree/tests/snapshots/javascript/modules/export-named-as-default.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Object {
"source": null,
"specifiers": Array [
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down
1 change: 1 addition & 0 deletions ...ypescript-estree/tests/snapshots/javascript/modules/export-named-as-specifier.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Object {
"source": null,
"specifiers": Array [
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down
2 changes: 2 additions & 0 deletions ...pescript-estree/tests/snapshots/javascript/modules/export-named-as-specifiers.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Object {
"source": null,
"specifiers": Array [
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down Expand Up @@ -77,6 +78,7 @@ Object {
"type": "ExportSpecifier",
},
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down
1 change: 1 addition & 0 deletions ...s/typescript-estree/tests/snapshots/javascript/modules/export-named-specifier.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Object {
"source": null,
"specifiers": Array [
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down
2 changes: 2 additions & 0 deletions ...cript-estree/tests/snapshots/javascript/modules/export-named-specifiers-comma.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Object {
"source": null,
"specifiers": Array [
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down Expand Up @@ -77,6 +78,7 @@ Object {
"type": "ExportSpecifier",
},
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down
2 changes: 2 additions & 0 deletions .../typescript-estree/tests/snapshots/javascript/modules/export-named-specifiers.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Object {
"source": null,
"specifiers": Array [
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down Expand Up @@ -77,6 +78,7 @@ Object {
"type": "ExportSpecifier",
},
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down
1 change: 1 addition & 0 deletions ...estree/tests/snapshots/javascript/modules/import-default-and-named-specifiers.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ Object {
"type": "ImportDefaultSpecifier",
},
Object {
"importKind": "value",
"imported": Object {
"loc": Object {
"end": Object {
Expand Down
1 change: 1 addition & 0 deletions packages/typescript-estree/tests/snapshots/javascript/modules/import-default-as.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Object {
},
"specifiers": Array [
Object {
"importKind": "value",
"imported": Object {
"loc": Object {
"end": Object {
Expand Down
1 change: 1 addition & 0 deletions ...ypescript-estree/tests/snapshots/javascript/modules/import-named-as-specifier.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Object {
},
"specifiers": Array [
Object {
"importKind": "value",
"imported": Object {
"loc": Object {
"end": Object {
Expand Down
2 changes: 2 additions & 0 deletions ...pescript-estree/tests/snapshots/javascript/modules/import-named-as-specifiers.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Object {
},
"specifiers": Array [
Object {
"importKind": "value",
"imported": Object {
"loc": Object {
"end": Object {
Expand Down Expand Up @@ -94,6 +95,7 @@ Object {
"type": "ImportSpecifier",
},
Object {
"importKind": "value",
"imported": Object {
"loc": Object {
"end": Object {
Expand Down
1 change: 1 addition & 0 deletions ...s/typescript-estree/tests/snapshots/javascript/modules/import-named-specifier.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Object {
},
"specifiers": Array [
Object {
"importKind": "value",
"imported": Object {
"loc": Object {
"end": Object {
Expand Down
2 changes: 2 additions & 0 deletions ...cript-estree/tests/snapshots/javascript/modules/import-named-specifiers-comma.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Object {
},
"specifiers": Array [
Object {
"importKind": "value",
"imported": Object {
"loc": Object {
"end": Object {
Expand Down Expand Up @@ -94,6 +95,7 @@ Object {
"type": "ImportSpecifier",
},
Object {
"importKind": "value",
"imported": Object {
"loc": Object {
"end": Object {
Expand Down
2 changes: 2 additions & 0 deletions .../typescript-estree/tests/snapshots/javascript/modules/import-named-specifiers.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Object {
},
"specifiers": Array [
Object {
"importKind": "value",
"imported": Object {
"loc": Object {
"end": Object {
Expand Down Expand Up @@ -94,6 +95,7 @@ Object {
"type": "ImportSpecifier",
},
Object {
"importKind": "value",
"imported": Object {
"loc": Object {
"end": Object {
Expand Down
1 change: 1 addition & 0 deletions packages/typescript-estree/tests/snapshots/javascript/modules/import-null-as-nil.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Object {
},
"specifiers": Array [
Object {
"importKind": "value",
"imported": Object {
"loc": Object {
"end": Object {
Expand Down
1 change: 1 addition & 0 deletions ...script-estree/tests/snapshots/javascript/modules/invalid-export-named-default.src.js.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Object {
"source": null,
"specifiers": Array [
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down
1 change: 1 addition & 0 deletions packages/typescript-estree/tests/snapshots/typescript/basics/export-type-as.src.ts.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Object {
"source": null,
"specifiers": Array [
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down
1 change: 1 addition & 0 deletions packages/typescript-estree/tests/snapshots/typescript/basics/export-type-from-as.src.ts.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Object {
},
"specifiers": Array [
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down
1 change: 1 addition & 0 deletions packages/typescript-estree/tests/snapshots/typescript/basics/export-type-from.src.ts.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Object {
},
"specifiers": Array [
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down
1 change: 1 addition & 0 deletions packages/typescript-estree/tests/snapshots/typescript/basics/export-type.src.ts.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Object {
"source": null,
"specifiers": Array [
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down
1 change: 1 addition & 0 deletions ...script-estree/tests/snapshots/typescript/basics/export-with-import-assertions.src.ts.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ Object {
},
"specifiers": Array [
Object {
"exportKind": "value",
"exported": Object {
"loc": Object {
"end": Object {
Expand Down
1 change: 1 addition & 0 deletions packages/typescript-estree/tests/snapshots/typescript/basics/import-type-error.src.ts.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ Object {
"type": "ImportDefaultSpecifier",
},
Object {
"importKind": "value",
"imported": Object {
"loc": Object {
"end": Object {
Expand Down
1 change: 1 addition & 0 deletions ...ages/typescript-estree/tests/snapshots/typescript/basics/import-type-named-as.src.ts.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Object {
},
"specifiers": Array [
Object {
"importKind": "value",
"imported": Object {
"loc": Object {
"end": Object {
Expand Down
2 changes: 2 additions & 0 deletions packages/typescript-estree/tests/snapshots/typescript/basics/import-type-named.src.ts.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Object {
},
"specifiers": Array [
Object {
"importKind": "value",
"imported": Object {
"loc": Object {
"end": Object {
Expand Down Expand Up @@ -94,6 +95,7 @@ Object {
"type": "ImportSpecifier",
},
Object {
"importKind": "value",
"imported": Object {
"loc": Object {
"end": Object {
Expand Down
Loading