Check typeof(x) === function in safecalls

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

Hide file tree

Showing 7 changed files with 17 additions and 11 deletions.
diff --git a/src/safe.lsc b/src/safe.lsc
@@ -82,10 +82,16 @@ replaceOptionals(path, replacementPath, loose = true): void ->
 
     replacementPath.replaceWith(
       t.conditionalExpression(
-        t.binaryExpression("==", check, t.nullLiteral()),
-        nil,
-        replacementPath.node,
-      ),
+        if isCall:
+          t.binaryExpression("!==",
+            t.unaryExpression("typeof", check),
+            t.stringLiteral("function")
+          )
+        else:
+          t.binaryExpression("==", check, t.nullLiteral())
+        nil
+        replacementPath.node
+      )
     )
 
     now replacementPath = replacementPath.get("alternate")

diff --git a/test/fixtures/bang-calls/safe-tilde/expected.js b/test/fixtures/bang-calls/safe-tilde/expected.js
@@ -1 +1 @@
-typeof b === "function" ? b(a, c) : void 0;
+typeof b !== "function" ? void 0 : b(a, c);
diff --git a/test/fixtures/bang-calls/safe/expected.js b/test/fixtures/bang-calls/safe/expected.js
@@ -1 +1 @@
-typeof a === "function" ? a(b, c) : void 0;
+typeof a !== "function" ? void 0 : a(b, c);
diff --git a/test/fixtures/configuration-directives/kitchen-sink/expected.js b/test/fixtures/configuration-directives/kitchen-sink/expected.js
@@ -15,4 +15,4 @@
 // we do
 'use @oigroup/lightscript with safeCall';
 
-typeof what === 'function' ? what() : void 0;
+typeof what !== 'function' ? void 0 : what();
diff --git a/test/fixtures/safe-call-expression/basic/expected.js b/test/fixtures/safe-call-expression/basic/expected.js
@@ -1 +1 @@
-typeof a === "function" ? a(b) : void 0;
+typeof a !== "function" ? void 0 : a(b);
diff --git a/test/fixtures/safe-call-expression/this/expected.js b/test/fixtures/safe-call-expression/this/expected.js
@@ -1,3 +1,3 @@
-typeof obj.method === "function" ? obj.method() : void 0;
+typeof obj.method !== "function" ? void 0 : obj.method();
 
-typeof this.method === "function" ? this.method() : void 0;
+typeof this.method !== "function" ? void 0 : this.method();
diff --git a/test/fixtures/safe-call-expression/tilde/expected.js b/test/fixtures/safe-call-expression/tilde/expected.js
@@ -1 +1 @@
-typeof b === "function" ? b(a, c) : void 0;
+typeof b !== "function" ? void 0 : b(a, c);