feat(eslint-plugin): removed value from abstract property nodes (#3765)

* chore: bump @types/jest from 26.0.24 to 27.0.1 (#3748) Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 26.0.24 to 27.0.1. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest) --- updated-dependencies: - dependency-name: "@types/jest" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: address comments Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brad Zacher <brad.zacher@gmail.com>
typescript-eslint · Oct 11, 2021 · 5823524 · 5823524
1 parent 71c9370
commit 5823524
Show file tree

Hide file tree

Showing 14 changed files with 128 additions and 138 deletions.
diff --git a/packages/ast-spec/src/element/TSAbstractClassProperty/spec.ts b/packages/ast-spec/src/element/TSAbstractClassProperty/spec.ts
@@ -7,11 +7,13 @@ import type {
 export interface TSAbstractClassPropertyComputedName
   extends ClassPropertyComputedNameBase {
   type: AST_NODE_TYPES.TSAbstractClassProperty;
+  value: null;
 }
 
 export interface TSAbstractClassPropertyNonComputedName
   extends ClassPropertyNonComputedNameBase {
   type: AST_NODE_TYPES.TSAbstractClassProperty;
+  value: null;
 }
 
 export type TSAbstractClassProperty =

diff --git a/packages/eslint-plugin/src/rules/explicit-module-boundary-types.ts b/packages/eslint-plugin/src/rules/explicit-module-boundary-types.ts
@@ -337,7 +337,6 @@ export default util.createRule<Options, MessageIds>({
           return;
 
         case AST_NODE_TYPES.ClassProperty:
-        case AST_NODE_TYPES.TSAbstractClassProperty:
           if (node.accessibility === 'private') {
             return;
           }

diff --git a/packages/eslint-plugin/src/rules/member-ordering.ts b/packages/eslint-plugin/src/rules/member-ordering.ts
@@ -251,6 +251,7 @@ function getNodeType(node: Member): string | null {
     case AST_NODE_TYPES.TSConstructSignatureDeclaration:
       return 'constructor';
     case AST_NODE_TYPES.TSAbstractClassProperty:
+      return 'field';
     case AST_NODE_TYPES.ClassProperty:
       return node.value && functionExpressions.includes(node.value.type)
         ? 'method'

diff --git a/packages/eslint-plugin/tests/rules/member-ordering.test.ts b/packages/eslint-plugin/tests/rules/member-ordering.test.ts
@@ -1311,7 +1311,7 @@ abstract class Foo {
     private D: string;
     protected static F(): {};
     public E(): {};
-    public abstract A = () => {};
+    public abstract A(): void;
     protected abstract G(): void;
 }
     `,
@@ -3618,7 +3618,7 @@ type Foo = {
     {
       code: `
 abstract class Foo {
-    abstract A = () => {};
+    abstract A(): void;
     B: string;
 }
           `,
@@ -3639,9 +3639,6 @@ abstract class Foo {
 abstract class Foo {
     abstract A: () => {};
     B: string;
-    public C() {};
-    private D() {};
-    abstract E() {};
 }
           `,
       errors: [
@@ -3659,18 +3656,19 @@ abstract class Foo {
     {
       code: `
 abstract class Foo {
-    B: string;
-    abstract C = () => {};
     abstract A: () => {};
+    B: string;
+    public C() {};
+    private D() {};
+    abstract E() {};
 }
           `,
-      options: [{ default: ['method', 'constructor', 'field'] }],
       errors: [
         {
           messageId: 'incorrectGroupOrder',
           data: {
-            name: 'C',
-            rank: 'field',
+            name: 'B',
+            rank: 'public abstract field',
           },
           line: 4,
           column: 5,

diff --git a/packages/eslint-plugin/tests/rules/quotes.test.ts b/packages/eslint-plugin/tests/rules/quotes.test.ts
@@ -455,25 +455,25 @@ class Foo {
     {
       code: `
 abstract class Foo {
-  public abstract a = "";
-  public abstract "a-b" = "";
+  public abstract a: "";
+  public abstract "a-b": "";
 }
       `,
     },
     {
       code: `
 abstract class Foo {
-  public abstract a = '';
-  public abstract 'a-b' = '';
+  public abstract a: '';
+  public abstract 'a-b': '';
 }
       `,
       options: ['single'],
     },
     {
       code: `
 abstract class Foo {
-  public abstract a = \`\`;
-  public abstract 'a-b' = \`\`;
+  public abstract a: \`\`;
+  public abstract 'a-b': \`\`;
 }
       `,
       options: ['backtick'],
@@ -1047,21 +1047,21 @@ class Foo {
     {
       code: `
 abstract class Foo {
-  public abstract a = '';
-  public abstract 'a-b' = '';
+  public abstract a: '';
+  public abstract 'a-b': '';
 }
       `,
       output: `
 abstract class Foo {
-  public abstract a = "";
-  public abstract "a-b" = "";
+  public abstract a: "";
+  public abstract "a-b": "";
 }
       `,
       errors: [
         {
           ...useDoubleQuote,
           line: 3,
-          column: 23,
+          column: 22,
         },
         {
           ...useDoubleQuote,
@@ -1071,28 +1071,28 @@ abstract class Foo {
         {
           ...useDoubleQuote,
           line: 4,
-          column: 27,
+          column: 26,
         },
       ],
     },
     {
       code: `
 abstract class Foo {
-  public abstract a = "";
-  public abstract "a-b" = "";
+  public abstract a: "";
+  public abstract "a-b": "";
 }
       `,
       output: `
 abstract class Foo {
-  public abstract a = '';
-  public abstract 'a-b' = '';
+  public abstract a: '';
+  public abstract 'a-b': '';
 }
       `,
       errors: [
         {
           ...useSingleQuote,
           line: 3,
-          column: 23,
+          column: 22,
         },
         {
           ...useSingleQuote,
@@ -1102,38 +1102,11 @@ abstract class Foo {
         {
           ...useSingleQuote,
           line: 4,
-          column: 27,
+          column: 26,
         },
       ],
       options: ['single'],
     },
-    {
-      code: `
-abstract class Foo {
-  public abstract a = "";
-  public abstract "a-b" = "";
-}
-      `,
-      output: `
-abstract class Foo {
-  public abstract a = \`\`;
-  public abstract "a-b" = \`\`;
-}
-      `,
-      errors: [
-        {
-          ...useBacktick,
-          line: 3,
-          column: 23,
-        },
-        {
-          ...useBacktick,
-          line: 4,
-          column: 27,
-        },
-      ],
-      options: ['backtick'],
-    },
 
     // TSAbstractMethodDefinition
     {

diff --git a/packages/scope-manager/src/referencer/ClassVisitor.ts b/packages/scope-manager/src/referencer/ClassVisitor.ts
@@ -237,7 +237,9 @@ class ClassVisitor extends Visitor {
       this.#referencer.visit(node.key);
     }
 
-    this.#referencer.visit(node.value);
+    if (node.type !== AST_NODE_TYPES.TSAbstractClassProperty) {
+      this.#referencer.visit(node.value);
+    }
 
     if ('decorators' in node) {
       node.decorators?.forEach(d => this.#referencer.visit(d));

diff --git a/...shared-fixtures/fixtures/typescript/basics/abstract-class-with-abstract-properties.src.ts b/...shared-fixtures/fixtures/typescript/basics/abstract-class-with-abstract-properties.src.ts
@@ -1,4 +1,4 @@
 abstract class Foo {
     abstract bar;
-    abstract baz = 3;
+    abstract baz: number;
 }
diff --git a/...fixtures/fixtures/typescript/basics/abstract-class-with-abstract-readonly-property.src.ts b/...fixtures/fixtures/typescript/basics/abstract-class-with-abstract-readonly-property.src.ts
@@ -1,3 +1,3 @@
 abstract class Foo {
-  public abstract readonly foo = 'string';
+  public abstract readonly foo: string;
 }
diff --git a/packages/typescript-estree/src/convert.ts b/packages/typescript-estree/src/convert.ts
@@ -1109,7 +1109,7 @@ export class Converter {
             ? AST_NODE_TYPES.TSAbstractClassProperty
             : AST_NODE_TYPES.ClassProperty,
           key: this.convertChild(node.name),
-          value: this.convertChild(node.initializer),
+          value: isAbstract ? null : this.convertChild(node.initializer),
           computed: isComputedProperty(node.name),
           static: hasModifier(SyntaxKind.StaticKeyword, node),
           readonly: hasModifier(SyntaxKind.ReadonlyKeyword, node) || undefined,

diff --git a/packages/typescript-estree/tests/ast-alignment/utils.ts b/packages/typescript-estree/tests/ast-alignment/utils.ts
@@ -176,6 +176,7 @@ export function preprocessBabylonAST(ast: BabelTypes.File): any {
         if (node.abstract) {
           node.type = AST_NODE_TYPES.TSAbstractClassProperty;
           delete node.abstract;
+          node.value = null;
         }
         /**
          * TS 3.7: declare class properties