Skip to content

Commit

Permalink
feat(typescript-estree): support type-only module specifiers (#4076)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sosukesuzuki
sosukesuzuki committed Nov 12, 2021
1 parent 939d8ea commit 77baa92
Show file tree
Hide file tree
Showing 40 changed files with 834 additions and 13 deletions.
2 changes: 2 additions & 0 deletions packages/ast-spec/src/special/ExportSpecifier/spec.ts
View file
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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

0 comments on commit 77baa92

Please sign in to comment.