chore(types): use typings for babel packages as much as possible

Also upgrades most development dependencies.

Author: eventualbuddha

package.json

@@ -32,35 +32,36 @@
   "author": "Brian Donovan <[email protected]>",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@commitlint/cli": "^7.0.0",
-    "@commitlint/config-conventional": "^7.0.1",
-    "@types/babel-traverse": "^6.25.3",
-    "@types/babylon": "^6.16.2",
+    "@commitlint/cli": "^7.2.1",
+    "@commitlint/config-conventional": "^7.1.2",
+    "@types/babel__core": "^7.0.2",
+    "@types/babel__generator": "^7.0.1",
+    "@types/babel__traverse": "^7.0.1",
     "@types/get-port": "^4.0.0",
     "@types/get-stream": "^3.0.1",
     "@types/glob": "^7.1.0",
     "@types/got": "^8.3.1",
     "@types/make-dir": "^1.0.3",
     "@types/mocha": "^5.2.1",
     "@types/mz": "0.0.32",
-    "@types/node": "^10.3.0",
-    "@types/prettier": "^1.12.4",
+    "@types/node": "^10.12.9",
+    "@types/prettier": "^1.15.1",
     "@types/rimraf": "2.0.2",
     "@types/semver": "^5.5.0",
     "@types/source-map-support": "^0.4.1",
     "@types/tmp": "^0.0.33",
-    "commitlint": "^7.0.0",
+    "commitlint": "^7.2.1",
     "get-port": "^4.0.0",
-    "husky": "^1.0.0",
+    "husky": "^1.1.4",
     "lint-staged": "^8.0.5",
     "make-dir": "^1.3.0",
     "mocha": "^5.2.0",
     "prettier-check": "^2.0.0",
     "rimraf": "2.6.2",
-    "semver": "^5.5.0",
-    "tslint": "^5.10.0",
-    "tslint-config-prettier": "^1.13.0",
-    "typescript": "^2.9.1",
+    "semver": "^5.6.0",
+    "tslint": "^5.11.0",
+    "tslint-config-prettier": "^1.16.0",
+    "typescript": "^3.1.6",
     "yarnhook": "^0.3.0"
   },
   "dependencies": {

src/AllSyntaxPlugin.ts

@@ -1,14 +1,14 @@
 import * as Babel from '@babel/core';
+import { ParserPlugin } from '@babel/parser';
 import { extname } from 'path';
-import { BabelOptions, ParseOptions } from './BabelPluginTypes';
+import { PluginObj } from './BabelPluginTypes';
 import { TypeScriptExtensions } from './extensions';
 
-const BASIC_PLUGINS: Array<string | [string, object]> = [
+const BASIC_PLUGINS: Array<ParserPlugin | [ParserPlugin, object]> = [
   'jsx',
   'asyncGenerators',
   'classProperties',
   'doExpressions',
-  'exportExtensions',
   'functionBind',
   'functionSent',
   'objectRestSpread',
@@ -18,25 +18,29 @@ const BASIC_PLUGINS: Array<string | [string, object]> = [
 
 function pluginsForFilename(
   filename: string
-): Array<string | [string, object]> {
+): Array<ParserPlugin | [ParserPlugin, object]> {
   let isTypeScript = TypeScriptExtensions.has(extname(filename));
 
   return isTypeScript
     ? [...BASIC_PLUGINS, 'typescript']
     : [...BASIC_PLUGINS, 'flow'];
 }
 
-export default function(babel: typeof Babel) {
+export default function(babel: typeof Babel): PluginObj {
   return {
-    manipulateOptions(opts: BabelOptions, parserOpts: ParseOptions) {
+    manipulateOptions(
+      opts: Babel.TransformOptions,
+      parserOpts: Babel.ParserOptions
+    ): void {
       parserOpts.sourceType = 'module';
       parserOpts.allowImportExportEverywhere = true;
       parserOpts.allowReturnOutsideFunction = true;
       parserOpts.allowSuperOutsideMethod = true;
+      // Cast this because @babel/types typings don't allow plugin options.
       parserOpts.plugins = [
         ...(parserOpts.plugins || []),
-        ...pluginsForFilename(opts.filename)
-      ];
+        ...pluginsForFilename(opts.filename as string)
+      ] as Array<ParserPlugin>;
     }
   };
 }

src/BabelPluginTypes.ts

@@ -1,37 +1,25 @@
 import * as Babel from '@babel/core';
-import { GeneratorOptions } from '@babel/generator';
-import { Visitor } from '@babel/traverse';
+import { File } from '@babel/types';
 
-export interface BabelOptions {
-  filename: string;
-}
-export interface ParseOptions {
-  sourceType?: 'module' | 'script';
-  allowImportExportEverywhere?: boolean;
-  allowReturnOutsideFunction?: boolean;
-  allowSuperOutsideMethod?: boolean;
-  plugins?: Array<string | [string, object]>;
-  tokens?: boolean;
-}
-export type AST = object;
-
-export type RawBabelPlugin = (
-  babel: typeof Babel
-) => {
-  name?: string;
-  visitor?: Visitor;
-  manipulateOptions?: (opts: object, parserOpts: ParseOptions) => void;
-  parserOverride?: (
+/**
+ * Fixes the `PluginObj` type from `@babel/core` by making all fields optional
+ * and adding parser and generator override methods.
+ */
+export interface PluginObj<S = File> extends Partial<Babel.PluginObj<S>> {
+  parserOverride?(
     code: string,
-    options: ParseOptions,
-    parse: (code: string, options: ParseOptions) => AST
-  ) => AST;
-  generatorOverride?: (
-    ast: AST,
-    options: GeneratorOptions,
+    options: Babel.ParserOptions,
+    parse: (code: string, options: Babel.ParserOptions) => File
+  ): File;
+
+  generatorOverride?(
+    ast: File,
+    options: Babel.GeneratorOptions,
     code: string,
-    generate: (ast: AST, options: GeneratorOptions) => string
-  ) => { code: string; map?: object };
-};
+    generate: (ast: File, options: Babel.GeneratorOptions) => string
+  ): { code: string; map?: object };
+}
+
+export type RawBabelPlugin = (babel: typeof Babel) => PluginObj;
 export type RawBabelPluginWithOptions = [RawBabelPlugin, object];
 export type BabelPlugin = RawBabelPlugin | RawBabelPluginWithOptions;

src/InlineTransformer.ts

@@ -1,15 +1,21 @@
-import { transform } from '@babel/core';
+import { transformAsync } from '@babel/core';
 import { BabelPlugin } from './BabelPluginTypes';
 import Transformer from './Transformer';
 
 export default class InlineTransformer implements Transformer {
   constructor(private readonly plugins: Array<BabelPlugin>) {}
 
   async transform(filepath: string, content: string): Promise<string> {
-    return transform(content, {
+    let result = await transformAsync(content, {
       filename: filepath,
       babelrc: false,
       plugins: this.plugins
-    } as {}).code as string;
+    });
+
+    if (!result) {
+      throw new Error(`[${filepath}] babel transform returned null`);
+    }
+
+    return result.code as string;
   }
 }

src/PrettierPrinterPlugin.ts

@@ -1,8 +1,8 @@
 import * as Babel from '@babel/core';
 import { GeneratorOptions } from '@babel/generator';
+import { File } from '@babel/types';
 import * as Prettier from 'prettier';
 import { sync as resolveSync } from 'resolve';
-import { AST } from './BabelPluginTypes';
 import { generate, parse } from './RecastPlugin';
 
 function loadPrettier(): typeof Prettier {
@@ -26,15 +26,15 @@ export default function(babel: typeof Babel) {
   return {
     parserOverride: parse,
     generatorOverride(
-      ast: AST,
+      ast: File,
       options: GeneratorOptions,
       code: string,
-      _generate: (ast: AST, options: GeneratorOptions) => string
+      _generate: (ast: File, options: GeneratorOptions) => string
     ): { code: string; map?: object } {
       return {
         code: prettier.format(
           generate(ast, options, code, _generate).code,
-          resolvePrettierConfig(options.filename)
+          resolvePrettierConfig(options.filename as string)
         )
       };
     }

src/RecastPlugin.ts

@@ -1,13 +1,13 @@
 import * as Babel from '@babel/core';
-import { GeneratorOptions } from '@babel/generator';
+import { File } from '@babel/types';
 import * as recast from 'recast';
-import { AST, ParseOptions } from './BabelPluginTypes';
+import { PluginObj } from './BabelPluginTypes';
 
 export function parse(
   code: string,
-  options: ParseOptions,
-  parse: (code: string, options: ParseOptions) => AST
-): AST {
+  options: Babel.ParserOptions,
+  parse: (code: string, options: Babel.ParserOptions) => File
+): File {
   return recast.parse(code, {
     parser: {
       parse(code: string) {
@@ -18,15 +18,15 @@ export function parse(
 }
 
 export function generate(
-  ast: AST,
-  options: GeneratorOptions,
+  ast: File,
+  options: Babel.GeneratorOptions,
   code: string,
-  generate: (ast: AST, options: GeneratorOptions) => string
+  generate: (ast: File, options: Babel.GeneratorOptions) => string
 ): { code: string; map?: object } {
   return recast.print(ast);
 }
 
-export default function(babel: typeof Babel) {
+export default function(babel: typeof Babel): PluginObj {
   return {
     parserOverride: parse,
     generatorOverride: generate

src/transpile-requires.ts

@@ -1,4 +1,4 @@
-import { transform } from '@babel/core';
+import { transformSync, TransformOptions } from '@babel/core';
 import { extname } from 'path';
 import { addHook } from 'pirates';
 import AllSyntaxPlugin from './AllSyntaxPlugin';
@@ -14,23 +14,30 @@ export function hook(code: string, filename: string): string {
     throw new Error(`cannot load file type '${ext}': ${filename}`);
   }
 
-  let options = {
+  let presets: Array<string> = [];
+  let options: TransformOptions = {
     filename,
     babelrc: useBabelrc,
-    presets: [] as Array<string>,
+    presets: presets,
     plugins: [AllSyntaxPlugin],
     sourceMaps: 'inline'
   };
 
   if (!useBabelrc) {
     if (TypeScriptExtensions.has(ext)) {
-      options.presets.push(require.resolve('@babel/preset-typescript'));
+      presets.push(require.resolve('@babel/preset-typescript'));
     }
 
-    options.presets.push(require.resolve('@babel/preset-env'));
+    presets.push(require.resolve('@babel/preset-env'));
   }
 
-  return transform(code, options).code as string;
+  let result = transformSync(code, options);
+
+  if (!result) {
+    throw new Error(`[${filename}] babel transform returned null`);
+  }
+
+  return result.code as string;
 }
 
 export function enable(babelrc: boolean = false) {