Fix conditional case, issue #13

Bogdan-Lyashenko · Nov 20, 2017 · 6029c66 · 6029c66
1 parent 004afe4
commit 6029c66
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/dist/js2flowchart.js b/dist/js2flowchart.js
@@ -1317,7 +1317,8 @@ var TOKEN_KEYS = exports.TOKEN_KEYS = {
     BODY: 'body',
     PROGRAM: 'program',
     CONSEQUENT: 'consequent',
-    ALTERNATE: 'alternate'
+    ALTERNATE: 'alternate',
+    TEST: 'test'
 };
 
 var ARROW_TYPE = exports.ARROW_TYPE = {
@@ -4292,7 +4293,8 @@ var DefinitionsMap = exports.DefinitionsMap = (_DefinitionsMap = {}, _defineProp
     getName: _core.assignmentExpressionConverter,
     ignore: function ignore(path) {
         var statementParent = path.getStatementParent();
-        return statementParent.isVariableDeclaration() || statementParent.isConditional() || (0, _core.isNodeContainsFunc)(path.node.right);
+
+        return statementParent.isVariableDeclaration() || path.parent.type === _constants.TOKEN_TYPES.LOGICAL_EXPRESSION || statementParent.isConditional() && path.key === _constants.TOKEN_KEYS.TEST || (0, _core.isNodeContainsFunc)(path.node.right);
     }
 }), _defineProperty(_DefinitionsMap, _constants.TOKEN_TYPES.CALL_EXPRESSION, {
     type: _constants.TOKEN_TYPES.CALL_EXPRESSION,

diff --git a/dist/js2flowchart.js.map b/dist/js2flowchart.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "js2flowchart",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "author": "Bohdan Liashenko",
   "license": "MIT",
   "repository": {

diff --git a/src/builder/entryDefinitionsMap.js b/src/builder/entryDefinitionsMap.js
@@ -111,7 +111,10 @@ export const DefinitionsMap = {
         getName: assignmentExpressionConverter,
         ignore: path => {
             const statementParent = path.getStatementParent();
-            return statementParent.isVariableDeclaration() || statementParent.isConditional() ||
+
+            return statementParent.isVariableDeclaration() ||
+                path.parent.type === TOKEN_TYPES.LOGICAL_EXPRESSION ||
+                (statementParent.isConditional() && path.key === TOKEN_KEYS.TEST) ||
                 isNodeContainsFunc(path.node.right);
         }
     },

diff --git a/src/shared/constants.js b/src/shared/constants.js
@@ -62,7 +62,8 @@ export const TOKEN_KEYS = {
     BODY: 'body',
     PROGRAM: 'program',
     CONSEQUENT: 'consequent',
-    ALTERNATE: 'alternate'
+    ALTERNATE: 'alternate',
+    TEST: 'test'
 };
 
 export const ARROW_TYPE = {