feat: align class property representation with ESTree

Half of #3430 Closes #3077
typescript-eslint · Aug 28, 2021 · 143d4fa · 143d4fa
1 parent ea6a97c
commit 143d4fa
Show file tree

Hide file tree

Showing 81 changed files with 744 additions and 356 deletions.
diff --git a/packages/ast-spec/src/ast-node-types.ts b/packages/ast-spec/src/ast-node-types.ts
@@ -14,7 +14,6 @@ export enum AST_NODE_TYPES {
   ClassBody = 'ClassBody',
   ClassDeclaration = 'ClassDeclaration',
   ClassExpression = 'ClassExpression',
-  ClassProperty = 'ClassProperty',
   ConditionalExpression = 'ConditionalExpression',
   ContinueStatement = 'ContinueStatement',
   DebuggerStatement = 'DebuggerStatement',
@@ -64,6 +63,7 @@ export enum AST_NODE_TYPES {
   ObjectPattern = 'ObjectPattern',
   Program = 'Program',
   Property = 'Property',
+  PropertyDefinition = 'PropertyDefinition',
   RestElement = 'RestElement',
   ReturnStatement = 'ReturnStatement',
   SequenceExpression = 'SequenceExpression',
@@ -88,9 +88,9 @@ export enum AST_NODE_TYPES {
   /**
    * TS-prefixed nodes
    */
-  TSAbstractClassProperty = 'TSAbstractClassProperty',
   TSAbstractKeyword = 'TSAbstractKeyword',
   TSAbstractMethodDefinition = 'TSAbstractMethodDefinition',
+  TSAbstractPropertyDefinition = 'TSAbstractPropertyDefinition',
   TSAnyKeyword = 'TSAnyKeyword',
   TSArrayType = 'TSArrayType',
   TSAsExpression = 'TSAsExpression',

diff --git a/...es/ast-spec/src/base/ClassPropertyBase.ts → ...t-spec/src/base/PropertyDefinitionBase.ts b/...es/ast-spec/src/base/ClassPropertyBase.ts → ...t-spec/src/base/PropertyDefinitionBase.ts
@@ -9,7 +9,7 @@ import type {
 import type { Accessibility } from './Accessibility';
 import type { BaseNode } from './BaseNode';
 
-interface ClassPropertyBase extends BaseNode {
+interface PropertyDefinitionBase extends BaseNode {
   key: PropertyName;
   value: Expression | null;
   computed: boolean;
@@ -24,12 +24,14 @@ interface ClassPropertyBase extends BaseNode {
   override?: boolean;
 }
 
-export interface ClassPropertyComputedNameBase extends ClassPropertyBase {
+export interface PropertyDefinitionComputedNameBase
+  extends PropertyDefinitionBase {
   key: PropertyNameComputed;
   computed: true;
 }
 
-export interface ClassPropertyNonComputedNameBase extends ClassPropertyBase {
+export interface PropertyDefinitionNonComputedNameBase
+  extends PropertyDefinitionBase {
   key: PropertyNameNonComputed;
   computed: false;
 }
diff --git a/packages/ast-spec/src/element/ClassProperty/spec.ts b/packages/ast-spec/src/element/ClassProperty/spec.ts
diff --git a/packages/ast-spec/src/element/PropertyDefinition/spec.ts b/packages/ast-spec/src/element/PropertyDefinition/spec.ts
@@ -0,0 +1,19 @@
+import type { AST_NODE_TYPES } from '../../ast-node-types';
+import type {
+  PropertyDefinitionComputedNameBase,
+  PropertyDefinitionNonComputedNameBase,
+} from '../../base/PropertyDefinitionBase';
+
+export interface PropertyDefinitionComputedName
+  extends PropertyDefinitionComputedNameBase {
+  type: AST_NODE_TYPES.PropertyDefinition;
+}
+
+export interface PropertyDefinitionNonComputedName
+  extends PropertyDefinitionNonComputedNameBase {
+  type: AST_NODE_TYPES.PropertyDefinition;
+}
+
+export type PropertyDefinition =
+  | PropertyDefinitionComputedName
+  | PropertyDefinitionNonComputedName;
diff --git a/packages/ast-spec/src/element/TSAbstractClassProperty/spec.ts b/packages/ast-spec/src/element/TSAbstractClassProperty/spec.ts
diff --git a/packages/ast-spec/src/element/TSAbstractPropertyDefinition/spec.ts b/packages/ast-spec/src/element/TSAbstractPropertyDefinition/spec.ts
@@ -0,0 +1,19 @@
+import type { AST_NODE_TYPES } from '../../ast-node-types';
+import type {
+  PropertyDefinitionComputedNameBase,
+  PropertyDefinitionNonComputedNameBase,
+} from '../../base/PropertyDefinitionBase';
+
+export interface TSAbstractPropertyDefinitionComputedName
+  extends PropertyDefinitionComputedNameBase {
+  type: AST_NODE_TYPES.TSAbstractPropertyDefinition;
+}
+
+export interface TSAbstractPropertyDefinitionNonComputedName
+  extends PropertyDefinitionNonComputedNameBase {
+  type: AST_NODE_TYPES.TSAbstractPropertyDefinition;
+}
+
+export type TSAbstractPropertyDefinition =
+  | TSAbstractPropertyDefinitionComputedName
+  | TSAbstractPropertyDefinitionNonComputedName;
diff --git a/packages/ast-spec/src/element/spec.ts b/packages/ast-spec/src/element/spec.ts
@@ -1,9 +1,9 @@
-export * from './ClassProperty/spec';
+export * from './PropertyDefinition/spec';
 export * from './MethodDefinition/spec';
 export * from './Property/spec';
 export * from './SpreadElement/spec';
 export * from './StaticBlock/spec';
-export * from './TSAbstractClassProperty/spec';
+export * from './TSAbstractPropertyDefinition/spec';
 export * from './TSAbstractMethodDefinition/spec';
 export * from './TSCallSignatureDeclaration/spec';
 export * from './TSConstructSignatureDeclaration/spec';

diff --git a/packages/ast-spec/src/unions/ClassElement.ts b/packages/ast-spec/src/unions/ClassElement.ts
@@ -1,14 +1,14 @@
-import type { ClassProperty } from '../element/ClassProperty/spec';
+import type { PropertyDefinition } from '../element/PropertyDefinition/spec';
 import type { MethodDefinition } from '../element/MethodDefinition/spec';
 import type { StaticBlock } from '../element/StaticBlock/spec';
-import type { TSAbstractClassProperty } from '../element/TSAbstractClassProperty/spec';
+import type { TSAbstractPropertyDefinition } from '../element/TSAbstractPropertyDefinition/spec';
 import type { TSAbstractMethodDefinition } from '../element/TSAbstractMethodDefinition/spec';
 import type { TSIndexSignature } from '../element/TSIndexSignature/spec';
 
 export type ClassElement =
-  | ClassProperty
+  | PropertyDefinition
   | MethodDefinition
   | StaticBlock
-  | TSAbstractClassProperty
+  | TSAbstractPropertyDefinition
   | TSAbstractMethodDefinition
   | TSIndexSignature;