fix(typescript-estree): wrap import = declaration in an export node

packages/ast-spec/src/declaration/TSEnumDeclaration/spec.ts

@@ -2,7 +2,6 @@ import type { AST_NODE_TYPES } from '../../ast-node-types';
 import type { BaseNode } from '../../base/BaseNode';
 import type { TSEnumMember } from '../../element/TSEnumMember/spec';
 import type { Identifier } from '../../expression/Identifier/spec';
-import type { Modifier } from '../../unions/Modifier';
 
 export interface TSEnumDeclaration extends BaseNode {
   type: AST_NODE_TYPES.TSEnumDeclaration;
@@ -30,6 +29,4 @@ export interface TSEnumDeclaration extends BaseNode {
    * The enum members.
    */
   members: TSEnumMember[];
-  // TODO(#4759) - breaking change remove this
-  modifiers?: Modifier[];
 }

packages/ast-spec/src/declaration/TSImportEqualsDeclaration/fixtures/entity-name-many/snapshots/1-TSESTree-AST.shot

@@ -17,7 +17,6 @@ Program {
         },
       },
       importKind: "value",
-      isExport: false,
       moduleReference: TSQualifiedName {
         type: "TSQualifiedName",
         left: TSQualifiedName {

packages/ast-spec/src/declaration/TSImportEqualsDeclaration/fixtures/entity-name-many/snapshots/5-AST-Alignment-AST.shot

@@ -2,5 +2,88 @@
 
 exports[`AST Fixtures declaration TSImportEqualsDeclaration entity-name-many AST Alignment - AST 1`] = `
 "Snapshot Diff:
-Compared values have no visual difference."
+- TSESTree
++ Babel
+
+  Program {
+    type: 'Program',
+    body: Array [
+      TSImportEqualsDeclaration {
+        type: 'TSImportEqualsDeclaration',
+        id: Identifier {
+          type: 'Identifier',
+          name: 'F',
+
+          range: [7, 8],
+          loc: {
+            start: { column: 7, line: 1 },
+            end: { column: 8, line: 1 },
+          },
+        },
+        importKind: 'value',
++       isExport: false,
+        moduleReference: TSQualifiedName {
+          type: 'TSQualifiedName',
+          left: TSQualifiedName {
+            type: 'TSQualifiedName',
+            left: Identifier {
+              type: 'Identifier',
+              name: 'A',
+
+              range: [11, 12],
+              loc: {
+                start: { column: 11, line: 1 },
+                end: { column: 12, line: 1 },
+              },
+            },
+            right: Identifier {
+              type: 'Identifier',
+              name: 'B',
+
+              range: [13, 14],
+              loc: {
+                start: { column: 13, line: 1 },
+                end: { column: 14, line: 1 },
+              },
+            },
+
+            range: [11, 14],
+            loc: {
+              start: { column: 11, line: 1 },
+              end: { column: 14, line: 1 },
+            },
+          },
+          right: Identifier {
+            type: 'Identifier',
+            name: 'C',
+
+            range: [15, 16],
+            loc: {
+              start: { column: 15, line: 1 },
+              end: { column: 16, line: 1 },
+            },
+          },
+
+          range: [11, 16],
+          loc: {
+            start: { column: 11, line: 1 },
+            end: { column: 16, line: 1 },
+          },
+        },
+
+        range: [0, 17],
+        loc: {
+          start: { column: 0, line: 1 },
+          end: { column: 17, line: 1 },
+        },
+      },
+    ],
+    sourceType: 'script',
+
+    range: [0, 18],
+    loc: {
+      start: { column: 0, line: 1 },
+      end: { column: 0, line: 2 },
+    },
+  }"
 `;

packages/ast-spec/src/declaration/TSImportEqualsDeclaration/fixtures/entity-name-one/snapshots/1-TSESTree-AST.shot

@@ -17,7 +17,6 @@ Program {
         },
       },
       importKind: "value",
-      isExport: false,
       moduleReference: Identifier {
         type: "Identifier",
         name: "A",

packages/ast-spec/src/declaration/TSImportEqualsDeclaration/fixtures/entity-name-one/snapshots/5-AST-Alignment-AST.shot

@@ -2,5 +2,50 @@
 
 exports[`AST Fixtures declaration TSImportEqualsDeclaration entity-name-one AST Alignment - AST 1`] = `
 "Snapshot Diff:
-Compared values have no visual difference."
+- TSESTree
++ Babel
+
+  Program {
+    type: 'Program',
+    body: Array [
+      TSImportEqualsDeclaration {
+        type: 'TSImportEqualsDeclaration',
+        id: Identifier {
+          type: 'Identifier',
+          name: 'F',
+
+          range: [7, 8],
+          loc: {
+            start: { column: 7, line: 1 },
+            end: { column: 8, line: 1 },
+          },
+        },
+        importKind: 'value',
++       isExport: false,
+        moduleReference: Identifier {
+          type: 'Identifier',
+          name: 'A',
+
+          range: [11, 12],
+          loc: {
+            start: { column: 11, line: 1 },
+            end: { column: 12, line: 1 },
+          },
+        },
+
+        range: [0, 13],
+        loc: {
+          start: { column: 0, line: 1 },
+          end: { column: 13, line: 1 },
+        },
+      },
+    ],
+    sourceType: 'script',
+
+    range: [0, 14],
+    loc: {
+      start: { column: 0, line: 1 },
+      end: { column: 0, line: 2 },
+    },
+  }"
 `;

packages/ast-spec/src/declaration/TSImportEqualsDeclaration/fixtures/external-module-ref-string/snapshots/1-TSESTree-AST.shot

@@ -17,7 +17,6 @@ Program {
         },
       },
       importKind: "value",
-      isExport: false,
       moduleReference: TSExternalModuleReference {
         type: "TSExternalModuleReference",
         expression: Literal {

packages/ast-spec/src/declaration/TSImportEqualsDeclaration/fixtures/external-module-ref-string/snapshots/5-AST-Alignment-AST.shot

@@ -21,7 +21,7 @@ exports[`AST Fixtures declaration TSImportEqualsDeclaration external-module-ref-
           },
         },
         importKind: 'value',
-        isExport: false,
++       isExport: false,
         moduleReference: TSExternalModuleReference {
           type: 'TSExternalModuleReference',
           expression: Literal {

packages/ast-spec/src/declaration/TSImportEqualsDeclaration/spec.ts

@@ -22,12 +22,4 @@ export interface TSImportEqualsDeclaration extends BaseNode {
   moduleReference: EntityName | TSExternalModuleReference;
   // TODO(#1852) - breaking change remove this as it is invalid
   importKind: ImportKind;
-  /**
-   * Whether this is immediately exported
-   * ```
-   * export import F = A;
-   * ```
-   */
-  // TODO(#4130) - this should be represented in the AST
-  isExport: boolean;
 }

packages/ast-spec/src/declaration/TSInterfaceDeclaration/spec.ts

@@ -7,8 +7,6 @@ import type { TSTypeParameterDeclaration } from '../../special/TSTypeParameterDe
 
 export interface TSInterfaceDeclaration extends BaseNode {
   type: AST_NODE_TYPES.TSInterfaceDeclaration;
-  // TODO(#4759) - breaking change remove this
-  abstract?: boolean;
   /**
    * The body of the interface
    */
@@ -26,8 +24,6 @@ export interface TSInterfaceDeclaration extends BaseNode {
    * The name of this interface
    */
   id: Identifier;
-  // TODO(#4759) - breaking change remove this
-  implements?: TSInterfaceHeritage[];
   /**
    * The generic type parameters declared for the interface.
    * This is `undefined` if there are no generic type parameters declared.

packages/ast-spec/src/declaration/TSModuleDeclaration/spec.ts

@@ -3,7 +3,6 @@ import type { BaseNode } from '../../base/BaseNode';
 import type { Identifier } from '../../expression/Identifier/spec';
 import type { TSModuleBlock } from '../../special/TSModuleBlock/spec';
 import type { Literal } from '../../unions/Literal';
-import type { Modifier } from '../../unions/Modifier';
 
 export interface TSModuleDeclaration extends BaseNode {
   type: AST_NODE_TYPES.TSModuleDeclaration;
@@ -49,6 +48,4 @@ export interface TSModuleDeclaration extends BaseNode {
    */
   // TODO(#5020) - make this `false` if it is not `declare`d
   declare?: boolean;
-  // TODO(#4759) - breaking change remove this
-  modifiers?: Modifier[];
 }

packages/ast-spec/src/index.ts

@@ -26,7 +26,6 @@ export * from './unions/JSXTagNameExpression';
 export * from './unions/LeftHandSideExpression';
 export * from './unions/Literal';
 export * from './unions/LiteralExpression';
-export * from './unions/Modifier';
 export * from './unions/Node';
 export * from './unions/ObjectLiteralElement';
 export * from './unions/Parameter';

packages/ast-spec/src/type/TSImportType/spec.ts

@@ -6,8 +6,7 @@ import type { TypeNode } from '../../unions/TypeNode';
 
 export interface TSImportType extends BaseNode {
   type: AST_NODE_TYPES.TSImportType;
-  isTypeOf: boolean;
-  parameter: TypeNode;
+  argument: TypeNode;
   qualifier: EntityName | null;
   typeParameters: TSTypeParameterInstantiation | null;
 }

packages/ast-spec/src/type/TSTypeQuery/spec.ts

@@ -2,9 +2,10 @@ import type { AST_NODE_TYPES } from '../../ast-node-types';
 import type { BaseNode } from '../../base/BaseNode';
 import type { TSTypeParameterInstantiation } from '../../special/spec';
 import type { EntityName } from '../../unions/EntityName';
+import type { TSImportType } from '../TSImportType/spec';
 
 export interface TSTypeQuery extends BaseNode {
   type: AST_NODE_TYPES.TSTypeQuery;
-  exprName: EntityName;
+  exprName: EntityName | TSImportType;
   typeParameters?: TSTypeParameterInstantiation;
 }

packages/ast-spec/src/unions/ExportDeclaration.ts

@@ -8,6 +8,7 @@ import type {
 } from '../declaration/FunctionDeclaration/spec';
 import type { TSDeclareFunction } from '../declaration/TSDeclareFunction/spec';
 import type { TSEnumDeclaration } from '../declaration/TSEnumDeclaration/spec';
+import type { TSImportEqualsDeclaration } from '../declaration/TSImportEqualsDeclaration/spec';
 import type { TSInterfaceDeclaration } from '../declaration/TSInterfaceDeclaration/spec';
 import type { TSModuleDeclaration } from '../declaration/TSModuleDeclaration/spec';
 import type { TSTypeAliasDeclaration } from '../declaration/TSTypeAliasDeclaration/spec';
@@ -37,6 +38,7 @@ export type NamedExportDeclarations =
   | FunctionDeclarationWithOptionalName
   | TSDeclareFunction
   | TSEnumDeclaration
+  | TSImportEqualsDeclaration
   | TSInterfaceDeclaration
   | TSModuleDeclaration
   | TSTypeAliasDeclaration

packages/ast-spec/tests/fixtures-with-differences-ast.shot

@@ -17,6 +17,8 @@ Set {
   "declaration/FunctionDeclaration/fixtures/type-param-one/fixture.ts",
   "declaration/TSDeclareFunction/fixtures/type-param-many/fixture.ts",
   "declaration/TSDeclareFunction/fixtures/type-param-one/fixture.ts",
+  "declaration/TSImportEqualsDeclaration/fixtures/entity-name-many/fixture.ts",
+  "declaration/TSImportEqualsDeclaration/fixtures/entity-name-one/fixture.ts",
   "declaration/TSImportEqualsDeclaration/fixtures/external-module-ref-string/fixture.ts",
   "declaration/TSInterfaceDeclaration/fixtures/extends-many/fixture.ts",
   "declaration/TSInterfaceDeclaration/fixtures/extends-one/fixture.ts",

packages/eslint-plugin/src/configs/eslint-recommended.ts

@@ -28,7 +28,6 @@ export = {
         'prefer-const': 'error', // ts provides better types with const
         'prefer-rest-params': 'error', // ts provides better types with rest args over arguments
         'prefer-spread': 'error', // ts transpiles spread to apply, so no need for manual apply
-        'valid-typeof': 'off', // ts(2367)
       },
     },
   ],

packages/parser/src/parser.ts

@@ -105,7 +105,6 @@ function parseForESLint(
     jsx: validateBoolean(options.ecmaFeatures.jsx),
   });
   const analyzeOptions: AnalyzeOptions = {
-    ecmaVersion: options.ecmaVersion === 'latest' ? 1e8 : options.ecmaVersion,
     globalReturn: options.ecmaFeatures.globalReturn,
     jsxPragma: options.jsxPragma,
     jsxFragmentName: options.jsxFragmentName,

packages/parser/tests/lib/parser.ts

@@ -19,11 +19,6 @@ describe('parser', () => {
     expect(() => parseForESLint(code, null)).not.toThrow();
   });
 
-  it("parseForESLint() should work if options.ecmaVersion is `'latest'`", () => {
-    const code = 'const valid = true;';
-    expect(() => parseForESLint(code, { ecmaVersion: 'latest' })).not.toThrow();
-  });
-
   it('parseAndGenerateServices() should be called with options', () => {
     const code = 'const valid = true;';
     const spy = jest.spyOn(typescriptESTree, 'parseAndGenerateServices');
@@ -33,7 +28,6 @@ describe('parser', () => {
       range: false,
       tokens: false,
       sourceType: 'module' as const,
-      ecmaVersion: 2018,
       ecmaFeatures: {
         globalReturn: false,
         jsx: false,
@@ -84,7 +78,6 @@ describe('parser', () => {
       range: false,
       tokens: false,
       sourceType: 'module' as const,
-      ecmaVersion: 2018,
       ecmaFeatures: {
         globalReturn: false,
         jsx: false,
@@ -104,7 +97,6 @@ describe('parser', () => {
     parseForESLint(code, config);
     expect(spy).toHaveBeenCalledTimes(1);
     expect(spy).toHaveBeenLastCalledWith(expect.anything(), {
-      ecmaVersion: 2018,
       globalReturn: false,
       lib: ['dom.iterable'],
       jsxPragma: 'Foo',

packages/scope-manager/README.md

@@ -36,13 +36,6 @@ interface AnalyzeOptions {
    */
   childVisitorKeys?: Record<string, string[]> | null;
 
-  /**
-   * Which ECMAScript version is considered.
-   * Defaults to `2018`.
-   * `'latest'` is converted to 1e8 at parser.
-   */
-  ecmaVersion?: EcmaVersion | 1e8;
-
   /**
    * Whether the whole script is executed under node.js environment.
    * When enabled, the scope manager adds a function scope immediately following the global scope.
@@ -51,7 +44,7 @@ interface AnalyzeOptions {
   globalReturn?: boolean;
 
   /**
-   * Implied strict mode (if ecmaVersion >= 5).
+   * Implied strict mode.
    * Defaults to `false`.
    */
   impliedStrict?: boolean;
@@ -76,7 +69,7 @@ interface AnalyzeOptions {
    * This automatically defines a type variable for any types provided by the configured TS libs.
    * For more information, see https://www.typescriptlang.org/tsconfig#lib
    *
-   * Defaults to the lib for the provided `ecmaVersion`.
+   * Defaults to ['esnext'].
    */
   lib?: Lib[];
 
@@ -105,7 +98,6 @@ const ast = parse(code, {
   range: true,
 });
 const scope = analyze(ast, {
-  ecmaVersion: 2020,
   sourceType: 'module',
 });
 ```