Split syntax and transform into two plugins

packages/babel-plugin-syntax-optional-chaining/.gitignore

@@ -0,0 +1,3 @@
+node_modules
+*.log
+src

packages/babel-plugin-syntax-optional-chaining/.npmignore

@@ -0,0 +1,3 @@
+src
+test
+*.log

packages/babel-plugin-syntax-optional-chaining/README.md

@@ -0,0 +1,35 @@
+# babel-plugin-syntax-optional-chaining
+
+Allow parsing of optional properties.
+
+## Installation
+
+```sh
+npm install --save-dev babel-plugin-syntax-optional-chaining
+```
+
+## Usage
+
+### Via `.babelrc` (Recommended)
+
+**.babelrc**
+
+```json
+{
+  "plugins": ["syntax-optional-chaining"]
+}
+```
+
+### Via CLI
+
+```sh
+babel --plugins syntax-optional-chaining script.js
+```
+
+### Via Node API
+
+```javascript
+require("babel-core").transform("code", {
+  plugins: ["syntax-optional-chaining"]
+});
+```

packages/babel-plugin-syntax-optional-chaining/index.js

@@ -0,0 +1,7 @@
+export default function () {
+  return {
+    manipulateOptions(opts, parserOpts) {
+      parserOpts.plugins.push("optionalChaining");
+    },
+  };
+}

packages/babel-plugin-syntax-optional-chaining/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "babel-plugin-syntax-optional-chaining",
+  "version": "7.0.0-alpha.12",
+  "description": "Allow parsing of optional properties",
+  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-optional-chaining",
+  "license": "MIT",
+  "main": "lib/index.js",
+  "keywords": [
+    "babel-plugin"
+  ],
+  "dependencies": {},
+  "devDependencies": {}
+}

packages/babel-plugin-transform-optional-chaining/package.json

@@ -6,10 +6,7 @@
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "babel-traverse": "7.0.0-alpha.7",
-    "babel-types": "7.0.0-alpha.7",
-    "babel-template": "7.0.0-alpha.7",
-    "lodash": "^4.2.0"
+    "babel-plugin-syntax-optional-chaining": "7.0.0-alpha.12"
   },
   "keywords": [
     "babel-plugin"

packages/babel-plugin-transform-optional-chaining/src/index.js

@@ -1,37 +1,10 @@
+import syntaxOptionalChaining from "babel-plugin-syntax-optional-chaining";
+
 export default function ({ types: t }) {
-  // DO NOT SUBMIT. This is until the parser is complete
-  const fixer = {
-    NewExpression: {
-      exit(path) {
-        const { callee } = path.node;
-        if (t.isCallExpression(callee)) {
-          const replacement = t.newExpression(callee.callee, callee.arguments);
-          replacement.optional = true;
-          path.replaceWith(replacement);
-        }
-      },
-    },
-
-    CallExpression(path) {
-      const { node } = path;
-      if (!node.optional || node.callee) {
-        return;
-      }
-
-      const callee = t.clone(node.arguments[0]);
-      if (t.isMemberExpression(callee)) {
-        callee.optional = node.arguments[1].value;
-      }
-      node.callee = callee;
-    },
-  };
-    // END DO NOT SUBMIT
-
-  const visitor = {
-    Program(path) {
-      path.traverse(fixer);
-    },
+  return {
+    inherits: syntaxOptionalChaining,
 
+    visitor: {
       MemberExpression(path) {
         if (!path.node.optional) {
           return;
@@ -92,14 +65,6 @@ export default function ({ types: t }) {
           ));
         },
       },
-
-  };
-
-  return {
-    visitor,
-
-    manipulateOptions(opts, parserOpts) {
-      parserOpts.plugins.push("optionalChaining");
     },
   };
 }