feat: align call and construct signature declarations (#74)

BREAKING CHANGE: This changes the AST
JamesHenry · Jan 4, 2019 · 3ec7fce · 3ec7fce
1 parent af73af2
commit 3ec7fce
Show file tree

Hide file tree

Showing 7 changed files with 1,536 additions and 11 deletions.
diff --git a/src/ast-node-types.ts b/src/ast-node-types.ts
@@ -108,7 +108,8 @@ export const AST_NODE_TYPES: { [key: string]: string } = {
   TSBigIntKeyword: 'TSBigIntKeyword',
   TSConditionalType: 'TSConditionalType',
   TSConstructorType: 'TSConstructorType',
-  TSConstructSignature: 'TSConstructSignature',
+  TSCallSignatureDeclaration: 'TSCallSignatureDeclaration',
+  TSConstructSignatureDeclaration: 'TSConstructSignatureDeclaration',
   TSDeclareKeyword: 'TSDeclareKeyword',
   TSDeclareFunction: 'TSDeclareFunction',
   TSEnumDeclaration: 'TSEnumDeclaration',

diff --git a/src/convert.ts b/src/convert.ts
@@ -2450,13 +2450,20 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {
       break;
     }
 
-    case SyntaxKind.ConstructSignature: {
+    case SyntaxKind.ConstructSignature:
+    case SyntaxKind.CallSignature: {
       Object.assign(result, {
-        type: AST_NODE_TYPES.TSConstructSignature,
-        params: convertParameters(node.parameters),
-        typeAnnotation: node.type ? convertTypeAnnotation(node.type) : null
+        type:
+          node.kind === SyntaxKind.ConstructSignature
+            ? AST_NODE_TYPES.TSConstructSignatureDeclaration
+            : AST_NODE_TYPES.TSCallSignatureDeclaration,
+        params: convertParameters(node.parameters)
       });
 
+      if (node.type) {
+        (result as any).returnType = convertTypeAnnotation(node.type);
+      }
+
       if (node.typeParameters) {
         result.typeParameters = convertTSTypeParametersToTypeParametersDeclaration(
           node.typeParameters

diff --git a/tests/ast-alignment/utils.ts b/tests/ast-alignment/utils.ts
@@ -142,6 +142,32 @@ export function preprocessBabylonAST(ast: any): any {
       BooleanLiteral(node: any) {
         node.type = 'Literal';
         node.raw = String(node.value);
+      },
+      /**
+       * Awaiting feedback on Babel issue https://github.com/babel/babel/issues/9231
+       */
+      TSCallSignatureDeclaration(node: any) {
+        if (node.typeAnnotation) {
+          node.returnType = node.typeAnnotation;
+          delete node.typeAnnotation;
+        }
+        if (node.parameters) {
+          node.params = node.parameters;
+          delete node.parameters;
+        }
+      },
+      /**
+       * Awaiting feedback on Babel issue https://github.com/babel/babel/issues/9231
+       */
+      TSConstructSignatureDeclaration(node: any) {
+        if (node.typeAnnotation) {
+          node.returnType = node.typeAnnotation;
+          delete node.typeAnnotation;
+        }
+        if (node.parameters) {
+          node.params = node.parameters;
+          delete node.parameters;
+        }
       }
     }
   );

diff --git a/tests/fixtures/typescript/basics/call-signatures-with-generics.src.ts b/tests/fixtures/typescript/basics/call-signatures-with-generics.src.ts
@@ -0,0 +1,4 @@
+type foo = {
+  <T>(a: string): string
+  new<T>(a: string): string
+}
diff --git a/tests/fixtures/typescript/basics/call-signatures.src.ts b/tests/fixtures/typescript/basics/call-signatures.src.ts
@@ -0,0 +1,4 @@
+type foo = {
+  (a: string): string
+  new(a: string): string
+}
diff --git a/tests/lib/__snapshots__/semantic-diagnostics-enabled.ts.snap b/tests/lib/__snapshots__/semantic-diagnostics-enabled.ts.snap
@@ -1674,6 +1674,10 @@ exports[`Parse all fixtures with "errorOnTypeScriptSyntaticAndSemanticIssues" en
 
 exports[`Parse all fixtures with "errorOnTypeScriptSyntaticAndSemanticIssues" enabled fixtures/typescript/basics/async-function-with-var-declaration.src.ts.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;
 
+exports[`Parse all fixtures with "errorOnTypeScriptSyntaticAndSemanticIssues" enabled fixtures/typescript/basics/call-signatures.src.ts.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;
+
+exports[`Parse all fixtures with "errorOnTypeScriptSyntaticAndSemanticIssues" enabled fixtures/typescript/basics/call-signatures-with-generics.src.ts.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;
+
 exports[`Parse all fixtures with "errorOnTypeScriptSyntaticAndSemanticIssues" enabled fixtures/typescript/basics/cast-as-expression.src.ts.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;
 
 exports[`Parse all fixtures with "errorOnTypeScriptSyntaticAndSemanticIssues" enabled fixtures/typescript/basics/cast-as-multi.src.ts.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;