feat: [4.7] support instantiation expressions (#4938)

typescript-eslint · May 19, 2022 · 79fbc77 · 79fbc77
1 parent c673e15
commit 79fbc77
Show file tree

Hide file tree

Showing 13 changed files with 4,705 additions and 5 deletions.
diff --git a/packages/ast-spec/src/ast-node-types.ts b/packages/ast-spec/src/ast-node-types.ts
@@ -113,6 +113,7 @@ export enum AST_NODE_TYPES {
   TSExportKeyword = 'TSExportKeyword',
   TSExternalModuleReference = 'TSExternalModuleReference',
   TSFunctionType = 'TSFunctionType',
+  TSInstantiationExpression = 'TSInstantiationExpression',
   TSImportEqualsDeclaration = 'TSImportEqualsDeclaration',
   TSImportType = 'TSImportType',
   TSIndexedAccessType = 'TSIndexedAccessType',

diff --git a/packages/ast-spec/src/expression/TSInstantiationExpression/spec.ts b/packages/ast-spec/src/expression/TSInstantiationExpression/spec.ts
@@ -0,0 +1,10 @@
+import type { AST_NODE_TYPES } from '../../ast-node-types';
+import type { BaseNode } from '../../base/BaseNode';
+import type { TSTypeParameterInstantiation } from '../../special/spec';
+import type { Expression } from '../../unions/Expression';
+
+export interface TSInstantiationExpression extends BaseNode {
+  type: AST_NODE_TYPES.TSInstantiationExpression;
+  expression: Expression;
+  typeParameters: TSTypeParameterInstantiation;
+}
diff --git a/packages/ast-spec/src/expression/spec.ts b/packages/ast-spec/src/expression/spec.ts
@@ -21,6 +21,7 @@ export * from './SequenceExpression/spec';
 export * from './Super/spec';
 export * from './TSAsExpression/spec';
 export * from './TSEmptyBodyFunctionExpression/spec';
+export * from './TSInstantiationExpression/spec';
 export * from './TSNonNullExpression/spec';
 export * from './TSTypeAssertion/spec';
 export * from './TaggedTemplateExpression/spec';

diff --git a/packages/ast-spec/src/unions/Expression.ts b/packages/ast-spec/src/unions/Expression.ts
@@ -23,6 +23,7 @@ import type { TaggedTemplateExpression } from '../expression/TaggedTemplateExpre
 import type { TemplateLiteral } from '../expression/TemplateLiteral/spec';
 import type { ThisExpression } from '../expression/ThisExpression/spec';
 import type { TSAsExpression } from '../expression/TSAsExpression/spec';
+import type { TSInstantiationExpression } from '../expression/TSInstantiationExpression/spec';
 import type { TSNonNullExpression } from '../expression/TSNonNullExpression/spec';
 import type { TSTypeAssertion } from '../expression/TSTypeAssertion/spec';
 import type { UnaryExpression } from '../expression/UnaryExpression/spec';
@@ -69,6 +70,7 @@ export type Expression =
   | TemplateLiteral
   | ThisExpression
   | TSAsExpression
+  | TSInstantiationExpression
   | TSNonNullExpression
   | TSTypeAssertion
   | UnaryExpression

diff --git a/packages/ast-spec/src/unions/Node.ts b/packages/ast-spec/src/unions/Node.ts
@@ -51,6 +51,7 @@ import type { TemplateLiteral } from '../expression/TemplateLiteral/spec';
 import type { ThisExpression } from '../expression/ThisExpression/spec';
 import type { TSAsExpression } from '../expression/TSAsExpression/spec';
 import type { TSEmptyBodyFunctionExpression } from '../expression/TSEmptyBodyFunctionExpression/spec';
+import type { TSInstantiationExpression } from '../expression/TSInstantiationExpression/spec';
 import type { TSNonNullExpression } from '../expression/TSNonNullExpression/spec';
 import type { TSTypeAssertion } from '../expression/TSTypeAssertion/spec';
 import type { UnaryExpression } from '../expression/UnaryExpression/spec';
@@ -277,6 +278,7 @@ export type Node =
   | TSIndexedAccessType
   | TSIndexSignature
   | TSInferType
+  | TSInstantiationExpression
   | TSInterfaceBody
   | TSInterfaceDeclaration
   | TSInterfaceHeritage

diff --git a/packages/shared-fixtures/fixtures/typescript/expressions/instantiation-expression.src.ts b/packages/shared-fixtures/fixtures/typescript/expressions/instantiation-expression.src.ts
@@ -0,0 +1,7 @@
+a<b>;
+
+(a<b>)<c>;
+(a<b>)<c>();
+(a<b>)<c>?.();
+(a?.b<c>)<d>();
+new (a<b>)<c>();
diff --git a/packages/typescript-estree/src/convert.ts b/packages/typescript-estree/src/convert.ts
@@ -2574,13 +2574,19 @@ export class Converter {
       }
 
       case SyntaxKind.ExpressionWithTypeArguments: {
+        const parentKind = parent.kind;
+        const type =
+          parentKind === SyntaxKind.InterfaceDeclaration
+            ? AST_NODE_TYPES.TSInterfaceHeritage
+            : parentKind === SyntaxKind.HeritageClause
+            ? AST_NODE_TYPES.TSClassImplements
+            : AST_NODE_TYPES.TSInstantiationExpression;
         const result = this.createNode<
-          TSESTree.TSInterfaceHeritage | TSESTree.TSClassImplements
+          | TSESTree.TSInterfaceHeritage
+          | TSESTree.TSClassImplements
+          | TSESTree.TSInstantiationExpression
         >(node, {
-          type:
-            parent && parent.kind === SyntaxKind.InterfaceDeclaration
-              ? AST_NODE_TYPES.TSInterfaceHeritage
-              : AST_NODE_TYPES.TSClassImplements,
+          type,
           expression: this.convertChild(node.expression),
         });
 

diff --git a/packages/typescript-estree/src/ts-estree/estree-to-ts-node-types.ts b/packages/typescript-estree/src/ts-estree/estree-to-ts-node-types.ts
@@ -180,6 +180,7 @@ export interface EstreeToTsNodeTypes {
   [AST_NODE_TYPES.TSInterfaceBody]: ts.InterfaceDeclaration;
   [AST_NODE_TYPES.TSInterfaceHeritage]: ts.ExpressionWithTypeArguments;
   [AST_NODE_TYPES.TSIntersectionType]: ts.IntersectionTypeNode;
+  [AST_NODE_TYPES.TSInstantiationExpression]: ts.ExpressionWithTypeArguments;
   [AST_NODE_TYPES.TSLiteralType]: ts.LiteralTypeNode;
   [AST_NODE_TYPES.TSMappedType]: ts.MappedTypeNode;
   [AST_NODE_TYPES.TSMethodSignature]:

diff --git a/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts b/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts
@@ -453,6 +453,13 @@ tester.addFixturePatternConfig('typescript/decorators/property-decorators', {
 
 tester.addFixturePatternConfig('typescript/expressions', {
   fileType: 'ts',
+  ignore: [
+    /**
+     * [BABEL ERRORED, BUT TS-ESTREE DID NOT]
+     * Babel doesn't support TS 4.7 new features yet.
+     */
+    'instantiation-expression',
+  ],
 });
 
 tester.addFixturePatternConfig('typescript/errorRecovery', {

diff --git a/packages/typescript-estree/tests/lib/__snapshots__/semantic-diagnostics-enabled.test.ts.snap b/packages/typescript-estree/tests/lib/__snapshots__/semantic-diagnostics-enabled.test.ts.snap
@@ -2640,6 +2640,8 @@ TSError {
 
 exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/expressions/call-expression-type-arguments.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;
 
+exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/expressions/instantiation-expression.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;
+
 exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/expressions/new-expression-type-arguments.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;
 
 exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/expressions/optional-call-expression-type-arguments.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;