Merge branch 'optional-chaining-support' into nullish-coalescing-support

Author: sanex3339

escodegen.js

@@ -100,11 +100,12 @@
         Await: 14,
         Unary: 14,
         Postfix: 15,
-        Call: 16,
-        New: 17,
-        TaggedTemplate: 18,
-        Member: 19,
-        Primary: 20
+        OptionalChaining: 16,
+        Call: 17,
+        New: 18,
+        TaggedTemplate: 19,
+        Member: 20,
+        Primary: 21
     };
 
     BinaryPrecedence = {
@@ -1898,18 +1899,10 @@
         },
 
         CallExpression: function (expr, precedence, flags) {
-            var result,
-                i,
-                iz,
-                exprCalleeFlags = E_TTF;
-
-            if (expr.callee.type === 'ChainExpression' && expr.callee.expression.optional) {
-                // F_ALLOW_UNPARATH_NEW becomes false.
-                result = [this.generateExpression(expr.callee, Precedence.Member, exprCalleeFlags)];
-            } else {
-                // F_ALLOW_UNPARATH_NEW becomes false.
-                result = [this.generateExpression(expr.callee, Precedence.Call, exprCalleeFlags)];
-            }
+            var result, i, iz;
+
+            // F_ALLOW_UNPARATH_NEW becomes false.
+            result = [this.generateExpression(expr.callee, Precedence.Call, E_TTF)];
 
             if (expr.optional) {
                 result.push('?.');
@@ -1933,8 +1926,9 @@
 
         ChainExpression: function (expr, precedence, flags) {
             var expression = expr.expression;
+            var result = this[expression.type](expression, precedence, flags);
 
-            return this[expression.type](expression, precedence, flags);
+            return parenthesize(result, Precedence.OptionalChaining, precedence);
         },
 
         NewExpression: function (expr, precedence, flags) {
@@ -1965,17 +1959,10 @@
         },
 
         MemberExpression: function (expr, precedence, flags) {
-            var result,
-                fragment,
-                exprObjectFlags = (flags & F_ALLOW_CALL) ? E_TTF : E_TFF;
+            var result, fragment;
 
-            if (expr.object.type === 'ChainExpression' && expr.object.expression.optional) {
-                // F_ALLOW_UNPARATH_NEW becomes false.
-                result = [this.generateExpression(expr.object, Precedence.Member, exprObjectFlags)];
-            } else {
-                // F_ALLOW_UNPARATH_NEW becomes false.
-                result = [this.generateExpression(expr.object, Precedence.Call, exprObjectFlags)];
-            }
+            // F_ALLOW_UNPARATH_NEW becomes false.
+            result = [this.generateExpression(expr.object, Precedence.Call, (flags & F_ALLOW_CALL) ? E_TTF : E_TFF)];
 
             if (expr.computed) {
                 if (expr.optional) {
@@ -2007,10 +1994,6 @@
                 result.push(generateIdentifier(expr.property));
             }
 
-            if (precedence === Precedence.Member) {
-                return parenthesize(result, Precedence.Call, precedence);
-            }
-
             return parenthesize(result, Precedence.Member, precedence);
         },
 

test/compare-acorn-es2020/optional-chaining.expected.js

@@ -29,4 +29,15 @@ obj()?.();
 (obj?.())();
 (obj?.())?.();
 obj()()()();
-((obj?.())()?.())();
+((obj?.())()?.())();
+(a?.b)();
+a?.b();
+a?.b?.();
+(a?.b)?.();
+a?.().b;
+(a?.()).b;
+a?.b.c();
+(a?.b.c)();
+a.b?.().c;
+(a.b?.()).c;
+(a.b?.())?.c;

test/compare-acorn-es2020/optional-chaining.expected.min.js

@@ -30,3 +30,14 @@ obj?.()?.();
 (obj?.())?.();
 ((obj())()())();
 ((obj?.())()?.())();
+(a?.b)();
+a?.b();
+a?.b?.();
+(a?.b)?.();
+a?.().b;
+(a?.()).b;
+a?.b.c();
+(a?.b.c)();
+a.b?.().c;
+(a.b?.()).c;
+(a.b?.())?.c;