test: replace babylon(beta) with babel/parser (#40)

Author: armano2

.gitignore

@@ -5,4 +5,5 @@ npm-debug.log
 _test.js
 .DS_Store
 .vscode
-dist
+.idea
+dist

package.json

@@ -18,6 +18,7 @@
   },
   "license": "BSD-2-Clause",
   "devDependencies": {
+    "@babel/code-frame": "7.0.0",
     "@babel/parser": "7.1.6",
     "@commitlint/cli": "^7.1.2",
     "@commitlint/config-conventional": "^7.1.2",
@@ -29,7 +30,6 @@
     "@types/node": "^10.12.2",
     "@types/semver": "^5.5.0",
     "@types/shelljs": "^0.8.0",
-    "babel-code-frame": "6.26.0",
     "cz-conventional-changelog": "2.1.0",
     "glob": "7.1.2",
     "husky": "0.14.3",

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

@@ -1,6 +1,8 @@
 import glob from 'glob';
 import path from 'path';
 import jsxKnownIssues from '../jsx-known-issues';
+import { ParserOptions as BabelParserOptions } from '@babel/parser';
+import { ParserOptions } from '../../src/temp-types-based-on-js-source';
 
 interface Fixture {
   filename: string;
@@ -10,8 +12,8 @@ interface Fixture {
 interface FixturePatternConfig {
   pattern: string;
   config?: {
-    babylonParserOptions?: any;
-    typeScriptESTreeOptions?: any;
+    babelParserOptions?: BabelParserOptions;
+    typeScriptESTreeOptions?: ParserOptions;
   };
 }
 
@@ -77,16 +79,17 @@ function createFixturePatternConfigFor(
       config.ignore,
       config.parseWithSourceTypeModule
     );
-    fixturesRequiringSourceTypeModule = ([] as FixturePatternConfig[]).concat(
-      fixturesRequiringSourceTypeModule,
-      config.parseWithSourceTypeModule.map(fixture => ({
+    for (const fixture of config.parseWithSourceTypeModule) {
+      fixturesRequiringSourceTypeModule.push({
         // It needs to be the full path from within fixtures/ for the pattern
-        pattern: `${fixturesSubPath}/${fixture}.src.${
-          (config as CreateFixturePatternConfig).fileType
-        }`,
-        config: { babylonParserOptions: { sourceType: 'module' } }
-      }))
-    );
+        pattern: `${fixturesSubPath}/${fixture}.src.${config.fileType}`,
+        config: {
+          babelParserOptions: {
+            sourceType: 'module'
+          }
+        }
+      });
+    }
   }
   return {
     pattern: `${fixturesSubPath}/!(${config.ignore.join('|')}).src.${
@@ -370,8 +373,6 @@ let fixturePatternConfigsToTest = [
       'interface-with-all-property-types', // babylon parse errors
       'interface-with-construct-signature-with-parameter-accessibility', // babylon parse errors
       'class-with-implements-and-extends', // babylon parse errors
-      'var-with-definite-assignment', // babylon parse errors
-      'class-with-definite-assignment', // babylon parse errors
       /**
        * typescript-estree erroring, but babylon not.
        */

tests/ast-alignment/parse.ts

@@ -1,7 +1,8 @@
 import codeFrame from 'babel-code-frame';
 import * as parser from '../../src/parser';
-import { ParserOptions } from '../../src/temp-types-based-on-js-source';
 import * as parseUtils from './utils';
+import { ParserOptions as BabelParserOptions } from '@babel/parser';
+import { ParserOptions } from '../../src/temp-types-based-on-js-source';
 
 function createError(message: string, line: number, column: number) {
   // Construct an error similar to the ones thrown by Babylon.
@@ -13,7 +14,10 @@ function createError(message: string, line: number, column: number) {
   return error;
 }
 
-function parseWithBabylonPluginTypescript(text: string, parserOptions?: any) {
+function parseWithBabelParser(
+  text: string,
+  parserOptions?: BabelParserOptions
+) {
   parserOptions = parserOptions || {};
   const babylon = require('@babel/parser');
   return babylon.parse(
@@ -67,7 +71,7 @@ function parseWithTypeScriptESTree(
 interface ASTComparisonParseOptions {
   parser: string;
   typeScriptESTreeOptions?: ParserOptions;
-  babylonParserOptions?: any;
+  babelParserOptions?: BabelParserOptions;
 }
 
 export function parse(text: string, opts: ASTComparisonParseOptions) {
@@ -87,14 +91,14 @@ export function parse(text: string, opts: ASTComparisonParseOptions) {
           parseWithTypeScriptESTree(text, opts.typeScriptESTreeOptions)
         );
         break;
-      case 'babylon-plugin-typescript':
+      case '@babel/parser':
         result.ast = parseUtils.normalizeNodeTypes(
-          parseWithBabylonPluginTypescript(text, opts.babylonParserOptions)
+          parseWithBabelParser(text, opts.babelParserOptions)
         );
         break;
       default:
         throw new Error(
-          'Please provide a valid parser: either "typescript-estree" or "babylon-plugin-typescript"'
+          'Please provide a valid parser: either "typescript-estree" or "@babel/parser"'
         );
     }
   } catch (error) {

tests/ast-alignment/spec.ts

@@ -21,25 +21,25 @@ fixturesToTest.forEach(fixture => {
   /**
    * Parse the source with babylon typescript-plugin
    */
-  const babylonTypeScriptPluginResult = parse(source, {
-    parser: 'babylon-plugin-typescript',
-    babylonParserOptions:
-      fixture.config && fixture.config.babylonParserOptions
-        ? fixture.config.babylonParserOptions
+  const babelParserResult = parse(source, {
+    parser: '@babel/parser',
+    babelParserOptions:
+      fixture.config && fixture.config.babelParserOptions
+        ? fixture.config.babelParserOptions
         : null
   });
 
   /**
    * If babylon fails to parse the source, ensure that typescript-estree has the same fundamental issue
    */
-  if (babylonTypeScriptPluginResult.parseError) {
+  if (babelParserResult.parseError) {
     /**
      * FAIL: babylon errored but typescript-estree did not
      */
     if (!typeScriptESTreeResult.parseError) {
       it(`TEST FAIL [BABYLON ERRORED, BUT TSEP DID NOT] - ${filename}`, () => {
         expect(typeScriptESTreeResult.parseError).toEqual(
-          babylonTypeScriptPluginResult.parseError
+          babelParserResult.parseError
         );
       });
       return;
@@ -48,7 +48,7 @@ fixturesToTest.forEach(fixture => {
      * Both parsers errored - this is OK as long as the errors are of the same "type"
      */
     it(`[Both parsers error as expected] - ${filename}`, () => {
-      expect(babylonTypeScriptPluginResult.parseError.name).toEqual(
+      expect(babelParserResult.parseError.name).toEqual(
         typeScriptESTreeResult.parseError.name
       );
     });
@@ -60,7 +60,7 @@ fixturesToTest.forEach(fixture => {
    */
   if (typeScriptESTreeResult.parseError) {
     it(`TEST FAIL [TSEP ERRORED, BUT BABYLON DID NOT] - ${filename}`, () => {
-      expect(babylonTypeScriptPluginResult.parseError).toEqual(
+      expect(babelParserResult.parseError).toEqual(
         typeScriptESTreeResult.parseError
       );
     });
@@ -71,14 +71,14 @@ fixturesToTest.forEach(fixture => {
    * No errors, assert the two ASTs match
    */
   it(`${filename}`, () => {
-    expect(babylonTypeScriptPluginResult.ast).toBeTruthy();
+    expect(babelParserResult.ast).toBeTruthy();
     expect(typeScriptESTreeResult.ast).toBeTruthy();
     /**
      * Perform some extra formatting steps on the babylon AST before comparing
      */
     expect(
       parseUtils.removeLocationDataFromProgramNode(
-        parseUtils.preprocessBabylonAST(babylonTypeScriptPluginResult.ast)
+        parseUtils.preprocessBabylonAST(babelParserResult.ast)
       )
     ).toEqual(
       parseUtils.removeLocationDataFromProgramNode(typeScriptESTreeResult.ast)

yarn.lock

@@ -2,9 +2,10 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@^7.0.0":
+"@babel/code-frame@7.0.0", "@babel/code-frame@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
   dependencies:
     "@babel/highlight" "^7.0.0"
 
@@ -1125,7 +1126,7 @@ aws4@^1.6.0, aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
 
-babel-code-frame@6.26.0, babel-code-frame@^6.26.0:
+babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   dependencies: