Fix order of operations with ternary operations (#46)

* Fix order of operations with ternary operations * remove extra paren * bump version * bump version
rimeto · Jul 31, 2019 · b684e88 · b684e88
1 parent 0c6517a
commit b684e88
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ts-optchain",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Optional Chaining for TypeScript",
   "repository": {
     "type": "git",

diff --git a/src/__tests__/ts-optchain-test.ts b/src/__tests__/ts-optchain-test.ts
@@ -91,4 +91,10 @@ describe('ts-optchain', () => {
     const fn = <K extends { prop: string }>(v: K) => oc(v).prop();
     expect(fn({prop: 'foo'})).toEqual('foo');
   });
+
+  it('ternary order of operations', () => {
+    expect(
+      (oc('')('') ? 'bar' : 'bar')
+    ).toEqual('bar');
+  });
 });
diff --git a/src/transform/transform.ts b/src/transform/transform.ts
@@ -24,6 +24,7 @@ function visitNodeAndChildren(node: ts.Node, program: ts.Program, context: ts.Tr
 }
 
 function visitNode(node: ts.Node, program: ts.Program): ts.Node {
+
   const typeChecker = program.getTypeChecker();
   if (ts.isCallExpression(node)) {
     // Check if function call expression is an oc chain, e.g.,
@@ -53,7 +54,6 @@ function visitNode(node: ts.Node, program: ts.Program): ts.Node {
       return _expandOCExpression(node);
     }
   }
-
   return node;
 }
 
@@ -119,5 +119,6 @@ function _expandOCExpression(expression: ts.Expression, defaultExpression?: ts.E
       ts.createBinary(subExpression, ts.SyntaxKind.ExclamationEqualsToken, ts.createNull()),
     );
   }
-  return ts.createConditional(condition, subExpression, defaultExpression || ts.createIdentifier('undefined'));
+
+  return ts.createParen(ts.createConditional(condition, subExpression, defaultExpression || ts.createIdentifier('undefined')));
 }