babel · hzoo · Jun 27, 2017 · Apr 24, 2017 · Apr 25, 2017 · Apr 29, 2017
diff --git a/packages/babel-core/package.json b/packages/babel-core/package.json
@@ -32,7 +32,7 @@
     "babel-template": "7.0.0-alpha.12",
     "babel-traverse": "7.0.0-alpha.12",
     "babel-types": "7.0.0-alpha.12",
-    "babylon": "7.0.0-beta.12",
+    "babylon": "7.0.0-beta.13",
     "convert-source-map": "^1.1.0",
     "debug": "^2.1.1",
     "json5": "^0.5.0",

diff --git a/packages/babel-generator/package.json b/packages/babel-generator/package.json
@@ -20,6 +20,6 @@
   },
   "devDependencies": {
     "babel-helper-fixtures": "7.0.0-alpha.12",
-    "babylon": "^7.0.0-beta.12"
+    "babylon": "^7.0.0-beta.13"
   }
 }
diff --git a/packages/babel-generator/src/generators/expressions.js b/packages/babel-generator/src/generators/expressions.js
@@ -51,11 +51,16 @@ export function NewExpression(node: Object, parent: Object) {
   this.word("new");
   this.space();
   this.print(node.callee, node);
-  if (node.arguments.length === 0 && this.format.minified &&
+  if (this.format.minified &&
+      node.arguments.length === 0 &&
+      !node.optional &&
       !t.isCallExpression(parent, { callee: node }) &&
       !t.isMemberExpression(parent) &&
       !t.isNewExpression(parent)) return;
 
+  if (node.optional) {
+    this.token("?.");
+  }
   this.token("(");
   this.printList(node.arguments, node);
   this.token(")");
@@ -89,6 +94,9 @@ function commaSeparatorNewline() {
 export function CallExpression(node: Object) {
   this.print(node.callee, node);
 
+  if (node.optional) {
+    this.token("?.");
+  }
   this.token("(");
 
   const isPrettyCall = node._prettyCall;
@@ -203,12 +211,17 @@ export function MemberExpression(node: Object) {
     computed = true;
   }
 
+  if (node.optional) {
+    this.token("?.");
+  }
   if (computed) {
     this.token("[");
     this.print(node.property, node);
     this.token("]");
   } else {
-    this.token(".");
+    if (!node.optional) {
+      this.token(".");
+    }
     this.print(node.property, node);
   }
 }

diff --git a/packages/babel-generator/test/fixtures/types/Optional-CallExpression/actual.js b/packages/babel-generator/test/fixtures/types/Optional-CallExpression/actual.js
@@ -0,0 +1,39 @@
+foo?.();
+foo?.("foo");
+foo?.("foo", "bar");
+foo?.(bar());
+foo?.(bar("test"));
+foo(bar?.());
+foo(bar?.("test"));
+
+a.foo?.();
+a.foo?.("foo");
+a.foo?.("foo", "bar");
+a.foo?.(bar());
+a.foo?.(bar("test"));
+a.foo(bar?.());
+a.foo(bar?.("test"));
+
+a?.foo?.();
+a?.foo?.("foo");
+a?.foo?.("foo", "bar");
+a?.foo?.(bar());
+a?.foo?.(bar("test"));
+a?.foo(bar?.());
+a?.foo(bar?.("test"));
+
+a.foo?.().baz;
+a.foo?.("foo").baz;
+a.foo?.("foo", "bar").baz;
+a.foo?.(bar()).baz;
+a.foo?.(bar("test")).baz;
+a.foo(bar?.()).baz;
+a.foo(bar?.("test")).baz;
+
+a.foo?.()?.baz;
+a.foo?.("foo")?.baz;
+a.foo?.("foo", "bar")?.baz;
+a.foo?.(bar())?.baz;
+a.foo?.(bar("test"))?.baz;
+a.foo(bar?.())?.baz;
+a.foo(bar?.("test"))?.baz;
diff --git a/packages/babel-generator/test/fixtures/types/Optional-CallExpression/expected.js b/packages/babel-generator/test/fixtures/types/Optional-CallExpression/expected.js
@@ -0,0 +1,39 @@
+foo?.();
+foo?.("foo");
+foo?.("foo", "bar");
+foo?.(bar());
+foo?.(bar("test"));
+foo(bar?.());
+foo(bar?.("test"));
+
+a.foo?.();
+a.foo?.("foo");
+a.foo?.("foo", "bar");
+a.foo?.(bar());
+a.foo?.(bar("test"));
+a.foo(bar?.());
+a.foo(bar?.("test"));
+
+a?.foo?.();
+a?.foo?.("foo");
+a?.foo?.("foo", "bar");
+a?.foo?.(bar());
+a?.foo?.(bar("test"));
+a?.foo(bar?.());
+a?.foo(bar?.("test"));
+
+a.foo?.().baz;
+a.foo?.("foo").baz;
+a.foo?.("foo", "bar").baz;
+a.foo?.(bar()).baz;
+a.foo?.(bar("test")).baz;
+a.foo(bar?.()).baz;
+a.foo(bar?.("test")).baz;
+
+a.foo?.()?.baz;
+a.foo?.("foo")?.baz;
+a.foo?.("foo", "bar")?.baz;
+a.foo?.(bar())?.baz;
+a.foo?.(bar("test"))?.baz;
+a.foo(bar?.())?.baz;
+a.foo(bar?.("test"))?.baz;
diff --git a/packages/babel-generator/test/fixtures/types/Optional-MemberExpression/actual.js b/packages/babel-generator/test/fixtures/types/Optional-MemberExpression/actual.js
@@ -0,0 +1,16 @@
+foo?.["bar"];
+foo?.bar;
+
+foo.bar?.foo;
+foo?.bar.foo;
+foo?.bar?.foo;
+foo.bar?.["foo"];
+foo?.bar["foo"];
+foo?.bar?.["foo"];
+foo["bar"]?.foo;
+foo?.["bar"].foo;
+foo?.["bar"]?.foo;
+
+0.?.toString();
+0.5?.toString();
+1.000?.toString();
diff --git a/packages/babel-generator/test/fixtures/types/Optional-MemberExpression/expected.js b/packages/babel-generator/test/fixtures/types/Optional-MemberExpression/expected.js
@@ -0,0 +1,16 @@
+foo?.["bar"];
+foo?.bar;
+
+foo.bar?.foo;
+foo?.bar.foo;
+foo?.bar?.foo;
+foo.bar?.["foo"];
+foo?.bar["foo"];
+foo?.bar?.["foo"];
+foo["bar"]?.foo;
+foo?.["bar"].foo;
+foo?.["bar"]?.foo;
+
+0.?.toString();
+0.5?.toString();
+1.000?.toString();
diff --git a/packages/babel-generator/test/fixtures/types/Optional-NewExpression/actual.js b/packages/babel-generator/test/fixtures/types/Optional-NewExpression/actual.js
@@ -0,0 +1,39 @@
+new foo?.();
+new foo?.("foo");
+new foo?.("foo", "bar");
+new foo?.(bar());
+new foo?.(bar("test"));
+foo(new bar?.());
+foo(new bar?.("test"));
+
+new a.foo?.();
+new a.foo?.("foo");
+new a.foo?.("foo", "bar");
+new a.foo?.(bar());
+new a.foo?.(bar("test"));
+a.foo(new bar?.());
+a.foo(new bar?.("test"));
+
+new a?.foo?.();
+new a?.foo?.("foo");
+new a?.foo?.("foo", "bar");
+new a?.foo?.(bar());
+new a?.foo?.(bar("test"));
+a?.foo(new bar?.());
+a?.foo(new bar?.("test"));
+
+new a.foo?.().baz;
+new a.foo?.("foo").baz;
+new a.foo?.("foo", "bar").baz;
+new a.foo?.(bar()).baz;
+new a.foo?.(bar("test")).baz;
+a.foo(new bar?.()).baz;
+a.foo(new bar?.("test")).baz;
+
+new a.foo?.()?.baz;
+new a.foo?.("foo")?.baz;
+new a.foo?.("foo", "bar")?.baz;
+new a.foo?.(bar())?.baz;
+new a.foo?.(bar("test"))?.baz;
+a.foo(new bar?.())?.baz;
+a.foo(new bar?.("test"))?.baz;
diff --git a/packages/babel-generator/test/fixtures/types/Optional-NewExpression/expected.js b/packages/babel-generator/test/fixtures/types/Optional-NewExpression/expected.js
@@ -0,0 +1,39 @@
+new foo?.();
+new foo?.("foo");
+new foo?.("foo", "bar");
+new foo?.(bar());
+new foo?.(bar("test"));
+foo(new bar?.());
+foo(new bar?.("test"));
+
+new a.foo?.();
+new a.foo?.("foo");
+new a.foo?.("foo", "bar");
+new a.foo?.(bar());
+new a.foo?.(bar("test"));
+a.foo(new bar?.());
+a.foo(new bar?.("test"));
+
+new a?.foo?.();
+new a?.foo?.("foo");
+new a?.foo?.("foo", "bar");
+new a?.foo?.(bar());
+new a?.foo?.(bar("test"));
+a?.foo(new bar?.());
+a?.foo(new bar?.("test"));
+
+new a.foo?.().baz;
+new a.foo?.("foo").baz;
+new a.foo?.("foo", "bar").baz;
+new a.foo?.(bar()).baz;
+new a.foo?.(bar("test")).baz;
+a.foo(new bar?.()).baz;
+a.foo(new bar?.("test")).baz;
+
+new a.foo?.()?.baz;
+new a.foo?.("foo")?.baz;
+new a.foo?.("foo", "bar")?.baz;
+new a.foo?.(bar())?.baz;
+new a.foo?.(bar("test"))?.baz;
+a.foo(new bar?.())?.baz;
+a.foo(new bar?.("test"))?.baz;
diff --git a/packages/babel-generator/test/index.js b/packages/babel-generator/test/index.js
@@ -318,6 +318,7 @@ suites.forEach(function (testSuite) {
               "functionSent",
               "jsx",
               "objectRestSpread",
+              "optionalChaining",
             ],
             strictMode: false,
             sourceType: "module",

diff --git a/packages/babel-plugin-syntax-optional-chaining/.gitignore b/packages/babel-plugin-syntax-optional-chaining/.gitignore
@@ -0,0 +1,3 @@
+node_modules
+*.log
+src
diff --git a/packages/babel-plugin-syntax-optional-chaining/.npmignore b/packages/babel-plugin-syntax-optional-chaining/.npmignore
@@ -0,0 +1,3 @@
+src
+test
+*.log
diff --git a/packages/babel-plugin-syntax-optional-chaining/README.md b/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"]
+});
+```
diff --git a/packages/babel-plugin-syntax-optional-chaining/index.js b/packages/babel-plugin-syntax-optional-chaining/index.js
@@ -0,0 +1,7 @@
+export default function () {
+  return {
+    manipulateOptions(opts, parserOpts) {
+      parserOpts.plugins.push("optionalChaining");
+    },
+  };
+}
diff --git a/packages/babel-plugin-syntax-optional-chaining/package.json b/packages/babel-plugin-syntax-optional-chaining/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "babel-plugin-syntax-optional-chaining",
+  "version": "7.0.0-alpha.13",
+  "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": {}
+}
diff --git a/packages/babel-plugin-transform-optional-chaining/.npmignore b/packages/babel-plugin-transform-optional-chaining/.npmignore
@@ -0,0 +1,3 @@
+src
+test
+*.log
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    src
+    test
+    *.log