typescript-eslint · JoshuaKGoldberg · May 24, 2024 · Apr 15, 2024 · Apr 15, 2024 · Apr 16, 2024
diff --git a/packages/ast-spec/src/base/ClassBase.ts b/packages/ast-spec/src/base/ClassBase.ts
@@ -53,10 +53,6 @@ export interface ClassBase extends BaseNode {
    * The generic type parameters passed to the superClass.
    */
   superTypeArguments: TSTypeParameterInstantiation | undefined;
-
-  /** @deprecated Use {@link `superTypeArguments`} instead. */
-  superTypeParameters: TSTypeParameterInstantiation | undefined;
-
   /**
    * The generic type parameters declared for the class.
    */

diff --git a/packages/ast-spec/src/base/TSHeritageBase.ts b/packages/ast-spec/src/base/TSHeritageBase.ts
@@ -6,7 +6,4 @@ export interface TSHeritageBase extends BaseNode {
   // TODO(#1852) - this should be restricted to MemberExpression | Identifier
   expression: Expression;
   typeArguments: TSTypeParameterInstantiation | undefined;
-
-  /** @deprecated Use {@link `typeArguments`} instead. */
-  typeParameters: TSTypeParameterInstantiation | undefined;
 }
diff --git a/packages/ast-spec/src/expression/CallExpression/spec.ts b/packages/ast-spec/src/expression/CallExpression/spec.ts
@@ -9,9 +9,5 @@ export interface CallExpression extends BaseNode {
   callee: LeftHandSideExpression;
   arguments: CallExpressionArgument[];
   typeArguments: TSTypeParameterInstantiation | undefined;
-
-  /** @deprecated Use {@link `typeArguments`} instead. */
-  typeParameters: TSTypeParameterInstantiation | undefined;
-
   optional: boolean;
 }
diff --git a/packages/ast-spec/src/expression/NewExpression/spec.ts b/packages/ast-spec/src/expression/NewExpression/spec.ts
@@ -9,7 +9,4 @@ export interface NewExpression extends BaseNode {
   callee: LeftHandSideExpression;
   arguments: CallExpressionArgument[];
   typeArguments: TSTypeParameterInstantiation | undefined;
-
-  /** @deprecated Use {@link `typeArguments`} instead. */
-  typeParameters: TSTypeParameterInstantiation | undefined;
 }
diff --git a/packages/ast-spec/src/expression/TSInstantiationExpression/spec.ts b/packages/ast-spec/src/expression/TSInstantiationExpression/spec.ts
@@ -7,7 +7,4 @@ export interface TSInstantiationExpression extends BaseNode {
   type: AST_NODE_TYPES.TSInstantiationExpression;
   expression: Expression;
   typeArguments: TSTypeParameterInstantiation;
-
-  /** @deprecated Use {@link `typeArguments`} instead. */
-  typeParameters?: TSTypeParameterInstantiation;
 }
diff --git a/packages/ast-spec/src/expression/TaggedTemplateExpression/spec.ts b/packages/ast-spec/src/expression/TaggedTemplateExpression/spec.ts
@@ -7,10 +7,6 @@ import type { TemplateLiteral } from '../TemplateLiteral/spec';
 export interface TaggedTemplateExpression extends BaseNode {
   type: AST_NODE_TYPES.TaggedTemplateExpression;
   typeArguments: TSTypeParameterInstantiation | undefined;
-
-  /** @deprecated Use {@link `typeArguments`} instead. */
-  typeParameters: TSTypeParameterInstantiation | undefined;
-
   tag: LeftHandSideExpression;
   quasi: TemplateLiteral;
 }
diff --git a/packages/ast-spec/src/jsx/JSXOpeningElement/spec.ts b/packages/ast-spec/src/jsx/JSXOpeningElement/spec.ts
@@ -8,10 +8,6 @@ import type { JSXSpreadAttribute } from '../JSXSpreadAttribute/spec';
 export interface JSXOpeningElement extends BaseNode {
   type: AST_NODE_TYPES.JSXOpeningElement;
   typeArguments: TSTypeParameterInstantiation | undefined;
-
-  /** @deprecated Use {@link `typeArguments`} instead. */
-  typeParameters: TSTypeParameterInstantiation | undefined;
-
   selfClosing: boolean;
   name: JSXTagNameExpression;
   attributes: (JSXAttribute | JSXSpreadAttribute)[];

diff --git a/packages/ast-spec/src/type/TSImportType/spec.ts b/packages/ast-spec/src/type/TSImportType/spec.ts
@@ -9,7 +9,4 @@ export interface TSImportType extends BaseNode {
   argument: TypeNode;
   qualifier: EntityName | null;
   typeArguments: TSTypeParameterInstantiation | null;
-
-  /** @deprecated Use {@link `typeArguments`} instead. */
-  typeParameters: TSTypeParameterInstantiation | null;
 }
diff --git a/packages/ast-spec/src/type/TSTypeQuery/spec.ts b/packages/ast-spec/src/type/TSTypeQuery/spec.ts
@@ -8,7 +8,4 @@ export interface TSTypeQuery extends BaseNode {
   type: AST_NODE_TYPES.TSTypeQuery;
   exprName: EntityName | TSImportType;
   typeArguments: TSTypeParameterInstantiation | undefined;
-
-  /** @deprecated Use {@link `typeArguments`} instead. */
-  typeParameters: TSTypeParameterInstantiation | undefined;
 }
diff --git a/packages/ast-spec/src/type/TSTypeReference/spec.ts b/packages/ast-spec/src/type/TSTypeReference/spec.ts
@@ -6,9 +6,5 @@ import type { EntityName } from '../../unions/EntityName';
 export interface TSTypeReference extends BaseNode {
   type: AST_NODE_TYPES.TSTypeReference;
   typeArguments: TSTypeParameterInstantiation | undefined;
-
-  /** @deprecated Use {@link `typeArguments`} instead. */
-  typeParameters: TSTypeParameterInstantiation | undefined;
-
   typeName: EntityName;
 }
diff --git a/packages/eslint-plugin/src/rules/indent.ts b/packages/eslint-plugin/src/rules/indent.ts
@@ -369,7 +369,6 @@ export default createRule<Options, MessageIds>({
           decorators: [],
           implements: [],
           superTypeArguments: undefined,
-          superTypeParameters: undefined,
           typeParameters: undefined,
 
           // location data
@@ -479,7 +478,6 @@ export default createRule<Options, MessageIds>({
           name: name as any,
           attributes: attributes as any,
           typeArguments: undefined,
-          typeParameters: undefined,
 
           // location data
           parent: node.parent,

diff --git a/packages/typescript-estree/src/convert.ts b/packages/typescript-estree/src/convert.ts
@@ -2889,7 +2889,6 @@ export class Converter {
             type: AST_NODE_TYPES.TSTypeQuery,
             exprName: result,
             typeArguments: undefined,
-            typeParameters: undefined,
           });
         }
         return result;

diff --git a/packages/typescript-estree/tests/lib/convert.test.ts b/packages/typescript-estree/tests/lib/convert.test.ts
@@ -279,12 +279,11 @@ describe('convert', () => {
   });
 
   describe('suppressDeprecatedPropertyWarnings', () => {
-    const getEsCallExpression = (
+    const getEsImportDeclaration = (
       converterOptions?: ConverterOptions,
-    ): TSESTree.CallExpression => {
-      const ast = convertCode(`callee<T>();`);
-      const tsCallExpression = (ast.statements[0] as ts.ExpressionStatement)
-        .expression as ts.CallExpression;
+    ): TSESTree.ImportDeclaration => {
+      const ast = convertCode('import ""');
+      const tsImportDeclaration = ast.statements[0] as ts.ImportDeclaration;
       const instance = new Converter(ast, {
         shouldPreserveNodeMaps: true,
         ...converterOptions,
@@ -294,22 +293,22 @@ describe('convert', () => {
 
       const maps = instance.getASTMaps();
 
-      return maps.tsNodeToESTreeNodeMap.get(tsCallExpression);
+      return maps.tsNodeToESTreeNodeMap.get(tsImportDeclaration);
     };
 
     it('warns on a deprecated property access when suppressDeprecatedPropertyWarnings is false', () => {
       const emitWarning = jest
         .spyOn(process, 'emitWarning')
         .mockImplementation();
-      const esCallExpression = getEsCallExpression({
+      const esImportDeclaration = getEsImportDeclaration({
         suppressDeprecatedPropertyWarnings: false,
       });
 
       // eslint-disable-next-line deprecation/deprecation
-      esCallExpression.typeParameters;
+      esImportDeclaration.assertions;
 
       expect(emitWarning).toHaveBeenCalledWith(
-        `The 'typeParameters' property is deprecated on CallExpression nodes. Use 'typeArguments' instead. See https://typescript-eslint.io/linting/troubleshooting#the-key-property-is-deprecated-on-type-nodes-use-key-instead-warnings.`,
+        `The 'assertions' property is deprecated on ImportDeclaration nodes. Use 'attributes' instead. See https://typescript-eslint.io/linting/troubleshooting#the-key-property-is-deprecated-on-type-nodes-use-key-instead-warnings.`,
         'DeprecationWarning',
       );
     });
@@ -318,13 +317,13 @@ describe('convert', () => {
       const emitWarning = jest
         .spyOn(process, 'emitWarning')
         .mockImplementation();
-      const esCallExpression = getEsCallExpression({
+      const esImportDeclaration = getEsImportDeclaration({
         suppressDeprecatedPropertyWarnings: false,
       });
 
       /* eslint-disable deprecation/deprecation */
-      esCallExpression.typeParameters;
-      esCallExpression.typeParameters;
+      esImportDeclaration.assertions;
+      esImportDeclaration.assertions;
       /* eslint-enable deprecation/deprecation */
 
       expect(emitWarning).toHaveBeenCalledTimes(1);
@@ -334,31 +333,31 @@ describe('convert', () => {
       const emitWarning = jest
         .spyOn(process, 'emitWarning')
         .mockImplementation();
-      const esCallExpression = getEsCallExpression({
+      const esImportDeclaration = getEsImportDeclaration({
         suppressDeprecatedPropertyWarnings: true,
       });
 
       // eslint-disable-next-line deprecation/deprecation
-      esCallExpression.typeParameters;
+      esImportDeclaration.assertions;
 
       expect(emitWarning).not.toHaveBeenCalled();
     });
 
     it('does not allow enumeration of deprecated properties', () => {
-      const esCallExpression = getEsCallExpression();
+      const esImportDeclaration = getEsImportDeclaration();
 
-      expect(Object.keys(esCallExpression)).not.toContain('typeParameters');
+      expect(Object.keys(esImportDeclaration)).not.toContain('assertions');
     });
 
     it('allows writing to the deprecated property as a new enumerable value', () => {
-      const esCallExpression = getEsCallExpression();
+      const esImportDeclaration = getEsImportDeclaration();
 
       // eslint-disable-next-line deprecation/deprecation
-      esCallExpression.typeParameters = undefined;
+      esImportDeclaration.assertions = [];
 
       // eslint-disable-next-line deprecation/deprecation
-      expect(esCallExpression.typeParameters).toBeUndefined();
-      expect(Object.keys(esCallExpression)).toContain('typeParameters');
+      expect(esImportDeclaration.assertions).toBeUndefined();
+      expect(Object.keys(esImportDeclaration)).toContain('assertions');
     });
   });
 });