upgrade to Babel 6 (WIP)

Author: chicoxyzzy

src/index.js

@@ -1,4 +1,4 @@
-export default function ({ Plugin, types: t }) {
+export default function ({ types: t }) {
   const depthKey = '__reactTransformDepth';
   const recordsKey = '__reactTransformRecords';
   const wrapComponentIdKey = '__reactTransformWrapComponentId';
@@ -55,10 +55,7 @@ export default function ({ Plugin, types: t }) {
       return false;
     }
     const first = args[0];
-    if (!t.isObjectExpression(first)) {
-      return false;
-    }
-    return true;
+    return t.isObjectExpression(first);
   }
 
   /**
@@ -86,26 +83,6 @@ export default function ({ Plugin, types: t }) {
       Array.isArray(options.transforms);
   }
 
-  /**
-   * Enforces plugin options to be defined and returns them.
-   */
-  function getPluginOptions(file) {
-    if (!file.opts || !file.opts.extra) {
-      return;
-    }
-
-    let pluginOptions = file.opts.extra['react-transform'];
-    if (!isValidOptions(pluginOptions)) {
-      throw new Error(
-        'babel-plugin-react-transform requires that you specify ' +
-        'extras["react-transform"] in .babelrc ' +
-        'or in your Babel Node API call options, and that it is an object with ' +
-        'a transforms property which is an array.'
-      );
-    }
-    return pluginOptions;
-  }
-
   /**
    * Creates a record about us having visited a valid React component.
    * Such records will later be merged into a single object.
@@ -118,15 +95,15 @@ export default function ({ Plugin, types: t }) {
 
     let props = [];
     if (typeof displayName === 'string') {
-      props.push(t.property('init',
+      props.push(t.objectProperty(
         t.identifier('displayName'),
-        t.literal(displayName)
+        t.stringLiteral(displayName)
       ));
     }
     if (state[depthKey] > 0) {
-      props.push(t.property('init',
+      props.push(t.objectProperty(
         t.identifier('isInFunction'),
-        t.literal(true)
+        t.booleanLiteral(true)
       ));
     }
 
@@ -140,7 +117,7 @@ export default function ({ Plugin, types: t }) {
   function addComponentRecord(node, scope, file, state) {
     const [uniqueId, definition] = createComponentRecord(node, scope, file, state);
     state[recordsKey] = state[recordsKey] || [];
-    state[recordsKey].push(t.property('init',
+    state[recordsKey].push(t.objectProperty(
       t.identifier(uniqueId),
       definition
     ));
@@ -172,21 +149,20 @@ export default function ({ Plugin, types: t }) {
    * Imports and calls a particular transformation target function.
    * You may specify several such transformations, so they are handled separately.
    */
-  function defineInitTransformCall(scope, file, recordsId, targetOptions) {
+  function defineInitTransformCall(scope, { file }, recordsId, targetOptions) {
     const id = scope.generateUidIdentifier('reactComponentWrapper');
     const { transform, imports = [], locals = [] } = targetOptions;
     const { filename } = file.opts;
-
     return [id, t.variableDeclaration('var', [
       t.variableDeclarator(id,
         t.callExpression(file.addImport(transform), [
           t.objectExpression([
-            t.property('init', t.identifier('filename'), t.literal(filename)),
-            t.property('init', t.identifier('components'), recordsId),
-            t.property('init', t.identifier('locals'), t.arrayExpression(
+            t.objectProperty(t.identifier('filename'), t.stringLiteral(filename)),
+            t.objectProperty(t.identifier('components'), recordsId),
+            t.objectProperty(t.identifier('locals'), t.arrayExpression(
               locals.map(local => t.identifier(local))
             )),
-            t.property('init', t.identifier('imports'), t.arrayExpression(
+            t.objectProperty(t.identifier('imports'), t.arrayExpression(
               imports.map(imp => file.addImport(imp, null, 'absolute'))
             ))
           ])
@@ -216,21 +192,21 @@ export default function ({ Plugin, types: t }) {
     );
   }
 
-  return new Plugin('babel-plugin-react-transform', {
+  return {
     visitor: {
       Function: {
-        enter(node, parent, scope, file) {
+        enter({ node, parent, scope }, file) {
           if (!this.state[depthKey]) {
             this.state[depthKey] = 0;
           }
           this.state[depthKey]++;
         },
-        exit(node, parent, scope, file) {
+        exit({ node, parent, scope }, file) {
           this.state[depthKey]--;
         }
       },
 
-      Class(node, parent, scope, file) {
+      Class({ node, scope }, file) {
         if (!isComponentishClass(node)) {
           return;
         }
@@ -240,12 +216,12 @@ export default function ({ Plugin, types: t }) {
 
         node.decorators = node.decorators || [];
         node.decorators.push(t.decorator(
-          t.callExpression(wrapReactComponentId, [t.literal(uniqueId)])
+          t.callExpression(wrapReactComponentId, [t.stringLiteral(uniqueId)])
         ));
       },
 
       CallExpression: {
-        exit(node, parent, scope, file) {
+        exit({ node, scope }, file) {
           const { isCreateClassCallExpression } = this.state[cacheKey];
           if (!isCreateClass(node, isCreateClassCallExpression)) {
             return;
@@ -255,25 +231,34 @@ export default function ({ Plugin, types: t }) {
           const uniqueId = addComponentRecord(node, scope, file, this.state);
 
           return t.callExpression(
-            t.callExpression(wrapReactComponentId, [t.literal(uniqueId)]),
+            t.callExpression(wrapReactComponentId, [t.stringLiteral(uniqueId)]),
             [node]
           );
         }
       },
 
       Program: {
-        enter(node, parent, scope, file) {
-          const options = getPluginOptions(file);
-          const factoryMethods = options.factoryMethods || ['React.createClass', 'createClass'];
-          this.state[optionsKey] = options;
+        enter({ scope }, file) {
+          const { opts } = file;
+          if (!isValidOptions(opts)) {
+            throw new Error(
+              'babel-plugin-react-transform requires that you specify options in .babelrc ' +
+              'or in your Babel Node API call options, and that it is an object with ' +
+              'a transforms property which is an array.'
+            );
+          }
+          const factoryMethods = opts.factoryMethods || ['React.createClass', 'createClass'];
+
+          this.state = {};
+          this.state[optionsKey] = opts;
           this.state[cacheKey] = {
             isCreateClassCallExpression: buildIsCreateClassCallExpression(factoryMethods),
           };
 
           this.state[wrapComponentIdKey] = scope.generateUidIdentifier('wrapComponent');
         },
 
-        exit(node, parent, scope, file) {
+        exit({ node, scope }, file) {
           if (!foundComponentRecords(this.state)) {
             return;
           }
@@ -293,7 +278,6 @@ export default function ({ Plugin, types: t }) {
           // Create one uber function calling each transformation
           const wrapComponentId = this.state[wrapComponentIdKey];
           const wrapComponent = defineWrapComponent(wrapComponentId, initTransformIds);
-
           return t.program([
             recordsVar,
             ...initTransformVars,
@@ -303,5 +287,5 @@ export default function ({ Plugin, types: t }) {
         }
       }
     }
-  });
+  };
 }