bug fixes

samiaghezal · Apr 24, 2019 · d95eaed · d95eaed
1 parent ec357a7
commit d95eaed
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/libjs/durable.js b/libjs/durable.js
@@ -686,6 +686,7 @@ exports = module.exports = durableEngine = function () {
                 }
             }
         });
+
         return func;
     }
 
@@ -1537,8 +1538,10 @@ exports = module.exports = durableEngine = function () {
     };
 
     var stateTrigger = function (stateName, run, parent, triggerObject) {
+        console.log(JSON.stringify(triggerObject))
         var that = {};
         var condition;
+        var pri;
 
         that.getName = function() {
             return stateName;
@@ -1557,9 +1560,17 @@ exports = module.exports = durableEngine = function () {
         that.define = function(name)  {
             if (!condition) {
                 if (!run) {
-                    return {to: stateName};
+                    if (pri) {
+                        return {to: stateName, pri: pri}; 
+                    } else {
+                        return {to: stateName};
+                    }
                 } else {
-                    return {to: stateName, run: run};
+                    if (pri) {
+                        return {to: stateName, pri: triggerObject.pri, run: run};
+                    } else {
+                        return {to: stateName, run: run};
+                    }
                 }
             } 
 
@@ -1572,6 +1583,10 @@ exports = module.exports = durableEngine = function () {
             condition = rule(triggerObject);
         }
 
+        if (triggerObject && typeof triggerObject.pri !==  "undefined") {
+            pri = triggerObject.pri;
+        }
+
         return that;
     };
 

diff --git a/libjs/durableEngine.js b/libjs/durableEngine.js
@@ -761,7 +761,6 @@ exports = module.exports = durableEngine = function () {
 
             delete(rule.run);
         }
-
         handle = r.createRuleset(name, JSON.stringify(rulesetDefinition));
         return that;
     }
@@ -1066,6 +1065,7 @@ exports = module.exports = durableEngine = function () {
     };
 
     var createRulesets = function (parentName, host, rulesetDefinitions) {
+
         var branches = {};
         for (var name in rulesetDefinitions) {
             var currentDefinition = rulesetDefinitions[name];

diff --git a/testjs/waltzdb.js b/testjs/waltzdb.js
@@ -145,7 +145,7 @@ d.statechart('waltzdb', function() {
         whenAll: {
             e1 = m.t == 'edge' && m.joined == false
             e2 = m.t == 'edge' && m.joined == false && m.p1 == e1.p1 && m.p2 != e1.p2
-            none(m.t == 'edge' && m.joined == false && m.p1 == e1.p1 && m.p2 != e1.p2 && m.p2 != e2.p2)
+            none(m.t == 'edge' && m.p1 == e1.p1 && m.p2 != e1.p2 && m.p2 != e2.p2)
         }
         cap: 1
         run: {
@@ -219,7 +219,7 @@ d.statechart('waltzdb', function() {
             j = m.t == 'junction' && m.jt == '3j' && m.name == 'arrow' && m.visited == 'no'
             e1 = m.t == 'edge' && m.p1 == j.basePoint && m.p2 == j.p1
             e2 = m.t == 'edge' && m.p1 == j.basePoint && m.p2 == j.p2
-            e2 = m.t == 'edge' && m.p1 == j.basePoint && m.p2 == j.p3
+            e3 = m.t == 'edge' && m.p1 == j.basePoint && m.p2 == j.p3
             none(m.t == 'junction' && m.visited != 'no' && m.basePoint < j.basePoint)
         }
         run: {