Eliminate TildeCallExpression node type

wcjohnson · Sep 24, 2017 · 2766ce4 · 2766ce4
1 parent f2c3328
commit 2766ce4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 35 deletions.
diff --git a/src/index.lsc b/src/index.lsc
@@ -89,15 +89,6 @@ Lightscript(babel) ->
         else:
           comprehension.transformPlainObjectComprehension(path)
 
-      TildeCallExpression: {
-        enter(path): void ->
-          { node } = path
-          args = [ node.left, ...node.arguments ]
-          callExpr = t.callExpression(node.right, args)~atNode(node)
-          if node.optional: callExpr.optional = true
-          path.replaceWith(callExpr)
-      }
-
       CallExpression: {
         enter(path): void ->
           maybeTransformSafe(path)

diff --git a/src/lscNodeTypes.lsc b/src/lscNodeTypes.lsc
@@ -110,26 +110,6 @@ export registerLightscriptNodeTypes(t): void ->
       }
     })
 
-  if not t.hasType("TildeCallExpression"):
-    definePluginType("TildeCallExpression", {
-      visitor: ["left", "right", "arguments"],
-      aliases: ["CallExpression", "Expression"],
-      fields: {
-        left: {
-          validate: assertNodeType("Expression"),
-        },
-        right: {
-          validate: assertOneOf("Identifier", "MemberExpression"),
-        },
-        arguments: {
-          validate: chain(
-            assertValueType("array"),
-            assertEach(assertNodeType("Expression", "SpreadElement"))
-          ),
-        },
-      },
-    });
-
   if not t.hasType("NamedArrowDeclaration"):
     definePluginType("NamedArrowDeclaration", {
       builder: ["id", "params", "body", "skinny", "async", "generator"],

diff --git a/test/fixtures/configuration-directives/multiple/expected.js b/test/fixtures/configuration-directives/multiple/expected.js
@@ -11,4 +11,4 @@ comment 4
 */
 'use @oigroup/lightscript with safeCall';
 
-(typeof a === 'function' ? a() : void 0).b;
+typeof a !== 'function' ? void 0 : a().b;
diff --git a/test/fixtures/safe-member-expression/calls-after/expected.js b/test/fixtures/safe-member-expression/calls-after/expected.js
@@ -1,11 +1,11 @@
-var _ref, _ref2, _ref3;
+var _a$b, _a$b$c, _c;
 
 a == null ? void 0 : a.b();
 
-(_ref = a == null ? void 0 : a.b()) == null ? void 0 : _ref.c().d.e();
+a == null ? void 0 : (_a$b = a.b()) == null ? void 0 : _a$b.c().d.e();
 
-(_ref2 = a == null ? void 0 : a.b().c) == null ? void 0 : _ref2.d().e.f();
+a == null ? void 0 : (_a$b$c = a.b().c) == null ? void 0 : _a$b$c.d().e.f();
 
-a == null ? void 0 : c(a.b);
+c(a == null ? void 0 : a.b);
 
-(_ref3 = a == null ? void 0 : c(a.b)) == null ? void 0 : e(_ref3.d);
+e((_c = c(a == null ? void 0 : a.b)) == null ? void 0 : _c.d);