feat: fix issues in AST

Author: armano2

src/ast-node-types.ts

@@ -26,7 +26,6 @@ export const AST_NODE_TYPES: { [key: string]: string } = {
   ConditionalExpression: 'ConditionalExpression',
   ContinueStatement: 'ContinueStatement',
   DebuggerStatement: 'DebuggerStatement',
-  DeclareFunction: 'DeclareFunction',
   Decorator: 'Decorator',
   DoWhileStatement: 'DoWhileStatement',
   EmptyStatement: 'EmptyStatement',
@@ -99,6 +98,7 @@ export const AST_NODE_TYPES: { [key: string]: string } = {
   TSBooleanKeyword: 'TSBooleanKeyword',
   TSConstructorType: 'TSConstructorType',
   TSConstructSignature: 'TSConstructSignature',
+  TSDeclareFunction: 'TSDeclareFunction',
   TSDeclareKeyword: 'TSDeclareKeyword',
   TSEnumDeclaration: 'TSEnumDeclaration',
   TSEnumMember: 'TSEnumMember',

src/convert.ts

@@ -676,15 +676,8 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {
 
     case SyntaxKind.FunctionDeclaration: {
       let functionDeclarationType = AST_NODE_TYPES.FunctionDeclaration;
-
-      if (node.modifiers && node.modifiers.length) {
-        const isDeclareFunction = nodeUtils.hasModifier(
-          SyntaxKind.DeclareKeyword,
-          node
-        );
-        if (isDeclareFunction) {
-          functionDeclarationType = AST_NODE_TYPES.DeclareFunction;
-        }
+      if (nodeUtils.hasModifier(SyntaxKind.DeclareKeyword, node)) {
+        functionDeclarationType = AST_NODE_TYPES.TSDeclareFunction;
       }
 
       Object.assign(result, {
@@ -694,14 +687,18 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {
         expression: false,
         async: nodeUtils.hasModifier(SyntaxKind.AsyncKeyword, node),
         params: convertParameters((node as any).parameters),
-        body: convertChild((node as any).body)
+        body: convertChild((node as any).body) || undefined
       });
 
       // Process returnType
       if ((node as any).type) {
         (result as any).returnType = convertTypeAnnotation((node as any).type);
       }
 
+      if (functionDeclarationType === AST_NODE_TYPES.TSDeclareFunction) {
+        result.declare = true;
+      }
+
       // Process typeParameters
       if ((node as any).typeParameters && (node as any).typeParameters.length) {
         result.typeParameters = convertTSTypeParametersToTypeParametersDeclaration(
@@ -744,6 +741,10 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {
         kind: nodeUtils.getDeclarationKind((node as any).declarationList)
       });
 
+      if (nodeUtils.hasModifier(SyntaxKind.DeclareKeyword, node)) {
+        result.declare = true;
+      }
+
       // check for exports
       result = nodeUtils.fixExports(node, result as any, ast);
       break;
@@ -1611,6 +1612,10 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {
         );
       }
 
+      if (nodeUtils.hasModifier(SyntaxKind.DeclareKeyword, node)) {
+        result.declare = true;
+      }
+
       if (node.decorators) {
         result.decorators = convertDecorators(node.decorators);
       }
@@ -2421,10 +2426,6 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {
       }
 
       const hasImplementsClause = interfaceHeritageClauses.length > 0;
-      const hasAbstractKeyword = nodeUtils.hasModifier(
-        SyntaxKind.AbstractKeyword,
-        node
-      );
       const interfaceOpenBrace = nodeUtils.findNextToken(
         interfaceLastClassToken,
         ast,
@@ -2443,7 +2444,6 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {
       };
 
       Object.assign(result, {
-        abstract: hasAbstractKeyword,
         type: AST_NODE_TYPES.TSInterfaceDeclaration,
         body: interfaceBody,
         id: convertChild((node as any).name),
@@ -2461,6 +2461,12 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {
       if (node.decorators) {
         result.decorators = convertDecorators(node.decorators);
       }
+      if (nodeUtils.hasModifier(SyntaxKind.AbstractKeyword, node)) {
+        result.abstract = true;
+      }
+      if (nodeUtils.hasModifier(SyntaxKind.DeclareKeyword, node)) {
+        result.declare = true;
+      }
       // check for exports
       result = nodeUtils.fixExports(node, result as any, ast);
 

src/temp-types-based-on-js-source.ts

@@ -41,6 +41,7 @@ export interface ESTreeNode {
   static?: boolean;
   export?: boolean;
   parameter?: any;
+  abstract?: boolean;
 }
 
 export interface ESTreeComment extends ESTreeNode {}

tests/ast-alignment/fixtures-to-test.ts

@@ -6,7 +6,10 @@ import { ParserOptions } from '../../src/temp-types-based-on-js-source';
 
 interface Fixture {
   filename: string;
-  config?: any;
+  config?: {
+    babelParserOptions?: BabelParserOptions;
+    typeScriptESTreeOptions?: ParserOptions;
+  };
 }
 
 interface FixturePatternConfig {
@@ -395,11 +398,6 @@ let fixturePatternConfigsToTest = [
       'class-with-implements-generic',
       'class-with-implements',
       'class-with-extends-and-implements',
-      /**
-       * Babylon: TSDeclareFunction + declare: true
-       * tsep: DeclareFunction
-       */
-      'declare-function',
       /**
        * Babylon: TSTypeReference + identifier
        * tsep: TSUnknownKeyword
@@ -508,6 +506,18 @@ let fixturePatternConfigsToTest = [
     ]
   }),
 
+  createFixturePatternConfigFor('typescript/declare', {
+    fileType: 'ts',
+    ignore: [
+      /**
+       * AST difference
+       */
+      'type-alias',
+      'interface',
+      'abstract-class'
+    ]
+  }),
+
   createFixturePatternConfigFor('typescript/namespaces-and-modules', {
     fileType: 'ts',
     ignore: [

tests/ast-alignment/spec.ts

@@ -7,26 +7,24 @@ fixturesToTest.forEach(fixture => {
   const filename = fixture.filename;
   const source = fs.readFileSync(filename, 'utf8').replace(/\r\n/g, '\n');
 
+  const config = fixture.config || {};
+  config.typeScriptESTreeOptions = config.typeScriptESTreeOptions || {};
+  config.babelParserOptions = config.babelParserOptions || {};
+
   /**
    * Parse with typescript-estree
    */
   const typeScriptESTreeResult = parse(source, {
     parser: 'typescript-estree',
-    typeScriptESTreeOptions:
-      fixture.config && fixture.config.typeScriptESTreeOptions
-        ? fixture.config.typeScriptESTreeOptions
-        : null
+    typeScriptESTreeOptions: config.typeScriptESTreeOptions
   });
 
   /**
    * Parse the source with babylon typescript-plugin
    */
   const babelParserResult = parse(source, {
     parser: '@babel/parser',
-    babelParserOptions:
-      fixture.config && fixture.config.babelParserOptions
-        ? fixture.config.babelParserOptions
-        : null
+    babelParserOptions: config.babelParserOptions
   });
 
   /**

tests/fixtures/typescript/declare/abstract-class.src.ts

@@ -0,0 +1,3 @@
+declare abstract class Foo {
+
+}

tests/fixtures/typescript/declare/class.src.ts

@@ -0,0 +1,3 @@
+declare class Foo {
+
+}

tests/fixtures/typescript/declare/enum.src.ts

@@ -0,0 +1,4 @@
+declare enum Foo {
+    Bar,
+    Baz
+}

tests/fixtures/typescript/declare/function.src.ts

@@ -0,0 +1 @@
+declare function foo(): void

tests/fixtures/typescript/declare/interface.src.ts

@@ -0,0 +1,3 @@
+declare interface Foo {
+
+}

tests/fixtures/typescript/declare/module.src.ts

@@ -0,0 +1,3 @@
+declare module Foo {
+
+}

tests/fixtures/typescript/declare/namespace.src.ts

@@ -0,0 +1,3 @@
+declare namespace Foo {
+
+}

tests/fixtures/typescript/declare/type-alias.src.ts

@@ -0,0 +1 @@
+declare type Foo = string

tests/fixtures/typescript/declare/variable.src.ts

@@ -0,0 +1 @@
+declare var foo: any;

tests/lib/__snapshots__/javascript.ts.snap

@@ -105760,7 +105760,6 @@ Object {
   "body": Array [
     Object {
       "async": false,
-      "body": null,
       "expression": false,
       "generator": false,
       "id": Object {
@@ -106077,7 +106076,6 @@ Object {
   "body": Array [
     Object {
       "async": false,
-      "body": null,
       "expression": false,
       "generator": false,
       "id": Object {