Merge pull request #204 from codemod-js/handle-more-es-syntax

fix: allow loading plugins with additional JavaScript syntax

packages/cli/package.json

@@ -63,6 +63,8 @@
     "@babel/core": "^7.1.6",
     "@babel/generator": "^7.1.6",
     "@babel/parser": "^7.1.6",
+    "@babel/plugin-proposal-class-properties": "^7.3.0",
+    "@babel/polyfill": "^7.2.5",
     "@babel/preset-env": "^7.1.6",
     "@babel/preset-typescript": "^7.1.0",
     "@babel/traverse": "^7.1.6",

packages/cli/src/transpile-requires.ts

@@ -1,4 +1,4 @@
-import { transformSync, TransformOptions } from '@babel/core';
+import { transformSync, TransformOptions, PluginItem } from '@babel/core';
 import { extname } from 'path';
 import { addHook } from 'pirates';
 import buildAllSyntaxPlugin from './AllSyntaxPlugin';
@@ -14,15 +14,21 @@ export function hook(code: string, filename: string): string {
     throw new Error(`cannot load file type '${ext}': ${filename}`);
   }
 
-  let presets: Array<string> = [];
+  let plugins: Array<PluginItem> = [];
+  let presets: Array<PluginItem> = [];
   let options: TransformOptions = {
     filename,
     babelrc: useBabelConfig,
-    presets: presets,
-    plugins: [buildAllSyntaxPlugin('module')],
+    presets,
+    plugins,
     sourceMaps: 'inline'
   };
 
+  plugins.push(
+    buildAllSyntaxPlugin('module'),
+    require.resolve('@babel/plugin-proposal-class-properties')
+  );
+
   if (!useBabelConfig) {
     options.configFile = useBabelConfig;
   }
@@ -32,7 +38,10 @@ export function hook(code: string, filename: string): string {
       presets.push(require.resolve('@babel/preset-typescript'));
     }
 
-    presets.push(require.resolve('@babel/preset-env'));
+    presets.push([
+      require.resolve('@babel/preset-env'),
+      { useBuiltIns: 'entry' }
+    ]);
   }
 
   let result = transformSync(code, options);
@@ -47,6 +56,7 @@ export function hook(code: string, filename: string): string {
 export function enable(shouldUseBabelConfig: boolean = false): void {
   disable();
   useBabelConfig = shouldUseBabelConfig;
+  require('@babel/polyfill');
   revert = addHook(hook, {
     exts: Array.from(PluginExtensions),
     ignoreNodeModules: true

packages/cli/test/cli/CLITest.ts

@@ -629,4 +629,36 @@ describe('CLI', function() {
       }
     );
   });
+
+  it('can load a plugin that uses class properties', async function() {
+    let { status, stdout, stderr } = await runCodemodCLI(
+      ['--plugin', plugin('class-properties', '.ts'), '--stdio'],
+      ''
+    );
+
+    deepEqual(
+      { status, stdout, stderr },
+      {
+        status: 0,
+        stdout: '',
+        stderr: ''
+      }
+    );
+  });
+
+  it('can load a plugin that uses generators', async function() {
+    let { status, stdout, stderr } = await runCodemodCLI(
+      ['--plugin', plugin('generators', '.ts'), '--stdio'],
+      ''
+    );
+
+    deepEqual(
+      { status, stdout, stderr },
+      {
+        status: 0,
+        stdout: '',
+        stderr: ''
+      }
+    );
+  });
 });

packages/cli/test/fixtures/plugin/class-properties.ts

@@ -0,0 +1,22 @@
+import { PluginObj } from '@babel/core';
+
+class Count {
+  // This file exists to verify that class properties like ↓ can be loaded.
+  count: number = 0;
+
+  incr(): void {
+    this.count++;
+  }
+}
+
+export default function(): PluginObj {
+  const debuggerCount = new Count();
+
+  return {
+    visitor: {
+      DebuggerStatement(): void {
+        debuggerCount.incr();
+      }
+    }
+  };
+}

packages/cli/test/fixtures/plugin/generators.ts

@@ -0,0 +1,22 @@
+import { PluginObj } from '@babel/core';
+
+// This file exists to verify that generator functions like ↓ can be loaded.
+function* counter(): IterableIterator<number> {
+  let i = 0;
+
+  while (true) {
+    yield i++;
+  }
+}
+
+export default function(): PluginObj {
+  const identifiers = counter();
+
+  return {
+    visitor: {
+      Identifier(): void {
+        console.log(identifiers.next());
+      }
+    }
+  };
+}