targetj 1.0.234 → 1.0.235

package/build/TargetUtil.js

@@ -411,7 +411,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "isTargetFullyCompleted",
     value: function isTargetFullyCompleted(tmodel, key) {
-      var result = !tmodel.isTargetUpdating(key) && tmodel.isTargetCompleteDeep(key) === true;
+      var result = !tmodel.isTargetUpdating(key) && tmodel.isTargetTreeComplete(key) === true;
       if (result && !tmodel.isTargetImperative(key)) {
         result = !tmodel.hasUpdatingImperativeTargets(key);
       }
@@ -437,17 +437,17 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         if (tmodel.hasUpdatingImperativeTargets(targetName)) {
           return tmodel.oid + "." + targetName + ": " + tmodel.getUpdatingImperativeTargets(targetName);
         }
-        if (tmodel.isTargetCompleteDeep(targetName) !== true) {
-          //const activeChildrenList = [ ...(tmodel.activeChildrenMap?.values() ?? []) ];
-          //return  tmodel.oid + "." + targetName + " ==> " + tmodel.getTargetStatus(targetName) + ", " + tmodel.isTargetCompleteDeep(targetName) + ":: " + activeChildrenList.map(t => t.oid + ':' + t.hasAnyUpdates()) + ", " + [ ...TargetUtil.getUpdatingChildren(tmodel, targetName).keys() ]; 
+        if (tmodel.isTargetTreeComplete(targetName) !== true) {
+          //const activeChildrenList = [ ...TargetUtil.getActiveChildren(tmodel, tmodel.targets[targetName].completionScope).values() ];
+          //return  tmodel.oid + "." + targetName + " ==> " + tmodel.getTargetStatus(targetName) + ", " + tmodel.isTargetTreeComplete(targetName) + ":: " + activeChildrenList.map(t => t.oid + ':' + t.hasAnyUpdates()) + ", " + [ ...TargetUtil.getUpdatingChildren(tmodel, targetName).keys() ]; 
           return false;
         }
       }
       return true;
     }
   }, {
-    key: "isTargetCompleteDeep",
-    value: function isTargetCompleteDeep(tmodel, key) {
+    key: "isTargetTreeComplete",
+    value: function isTargetTreeComplete(tmodel, key) {
       var target = tmodel.targets[key];
       if (target) {
         var _target$childAction, _target$childAction2, _target$childAction3;
@@ -467,13 +467,13 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         if (!tmodel.isTargetComplete(key) && !tmodel.isTargetDone(key)) {
           return 'not done';
         }
-        if (((_target$childAction = target.childAction) === null || _target$childAction === void 0 ? void 0 : _target$childAction.length) > 0 && TargetUtil.getUpdatingChildren(tmodel, key, target.waitForChildren).size > 0) {
+        if (((_target$childAction = target.childAction) === null || _target$childAction === void 0 ? void 0 : _target$childAction.length) > 0 && TargetUtil.getUpdatingChildren(tmodel, key, target.completionScope).size > 0) {
           return 'updating children';
         }
-        if (((_target$childAction2 = target.childAction) === null || _target$childAction2 === void 0 ? void 0 : _target$childAction2.length) > 0 && TargetUtil.getActiveChildren(tmodel, target.waitForChildren).size > 0) {
+        if (((_target$childAction2 = target.childAction) === null || _target$childAction2 === void 0 ? void 0 : _target$childAction2.length) > 0 && TargetUtil.getActiveChildren(tmodel, target.completionScope).size > 0) {
           return 'active children';
         }
-        if (((_target$childAction3 = target.childAction) === null || _target$childAction3 === void 0 ? void 0 : _target$childAction3.length) > 0 && TargetUtil.areTargetChildrenComplete(target.childAction, target.waitForChildren) !== true) {
+        if (((_target$childAction3 = target.childAction) === null || _target$childAction3 === void 0 ? void 0 : _target$childAction3.length) > 0 && TargetUtil.areTargetChildrenComplete(target.childAction, target.completionScope) !== true) {
           return 'incomplete children';
         }
         if (target.fetchAction && !(0, _App.getLoader)().isLoadingSuccessful(tmodel, key)) {
@@ -485,7 +485,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "areTargetChildrenComplete",
     value: function areTargetChildrenComplete(children) {
-      var waitForChildren = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'all';
+      var completionScope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'all';
       if (!children) {
         return true;
       }
@@ -494,14 +494,14 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var child = _step2.value;
-          if (TargetUtil.shouldIgnoreChildForCompletion(child, waitForChildren)) {
+          if (TargetUtil.shouldIgnoreChildForCompletion(child, completionScope)) {
             continue;
           }
           if (child.exists() && !TargetUtil.isTModelComplete(child)) {
             return child.oid;
           }
           if (child.hasChildren()) {
-            if (!TargetUtil.areTargetChildrenComplete(child.getChildren(), waitForChildren)) {
+            if (!TargetUtil.areTargetChildrenComplete(child.getChildren(), completionScope)) {
               return child.oid;
             }
           }
@@ -517,12 +517,12 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
     key: "getUpdatingChildren",
     value: function getUpdatingChildren(tmodel, originalTargetName) {
       var _tmodel$updatingChild, _tmodel$updatingChild2, _tmodel$animatingChil, _tmodel$animatingChil2;
-      var waitForChildren = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "all";
+      var completionScope = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "all";
       var childrenMap = new Map();
       var children = [].concat(_toConsumableArray((_tmodel$updatingChild = (_tmodel$updatingChild2 = tmodel.updatingChildrenMap) === null || _tmodel$updatingChild2 === void 0 ? void 0 : _tmodel$updatingChild2.values()) !== null && _tmodel$updatingChild !== void 0 ? _tmodel$updatingChild : []), _toConsumableArray((_tmodel$animatingChil = (_tmodel$animatingChil2 = tmodel.animatingChildrenMap) === null || _tmodel$animatingChil2 === void 0 ? void 0 : _tmodel$animatingChil2.values()) !== null && _tmodel$animatingChil !== void 0 ? _tmodel$animatingChil : []));
       children.forEach(function (child) {
         var _child$updatingTarget;
-        if (TargetUtil.shouldIgnoreChildForCompletion(child, waitForChildren)) {
+        if (TargetUtil.shouldIgnoreChildForCompletion(child, completionScope)) {
           return;
         }
         var updatingList = [].concat(_toConsumableArray((_child$updatingTarget = child.updatingTargetList) !== null && _child$updatingTarget !== void 0 ? _child$updatingTarget : []), _toConsumableArray(child.animatingMap ? _toConsumableArray(child.animatingMap.keys()) : []));
@@ -563,11 +563,11 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
     key: "getActiveChildren",
     value: function getActiveChildren(tmodel) {
       var _tmodel$activeChildre, _tmodel$activeChildre2;
-      var waitForChildren = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'all';
+      var completionScope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'all';
       var childrenMap = new Map();
       var children = _toConsumableArray((_tmodel$activeChildre = (_tmodel$activeChildre2 = tmodel.activeChildrenMap) === null || _tmodel$activeChildre2 === void 0 ? void 0 : _tmodel$activeChildre2.values()) !== null && _tmodel$activeChildre !== void 0 ? _tmodel$activeChildre : []);
       children.forEach(function (child) {
-        if (TargetUtil.shouldIgnoreChildForCompletion(child, waitForChildren)) {
+        if (TargetUtil.shouldIgnoreChildForCompletion(child, completionScope)) {
           return;
         }
         if (child.activeTargetList.length) {
@@ -578,11 +578,11 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
     }
   }, {
     key: "shouldIgnoreChildForCompletion",
-    value: function shouldIgnoreChildForCompletion(child, waitForChildren) {
-      if (waitForChildren === "none") {
+    value: function shouldIgnoreChildForCompletion(child, completionScope) {
+      if (completionScope === "none") {
         return true;
       }
-      if (waitForChildren === "visible") {
+      if (completionScope === "visible") {
         return child.visibilityStatus && !child.isVisible();
       }
       return false;
@@ -683,6 +683,23 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         originalTargetName: originalTargetName
       };
     }
+  }, {
+    key: "resetTargetState",
+    value: function resetTargetState(tmodel, targetName) {
+      var visited = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new Set();
+      if (!tmodel || !targetName) {
+        return;
+      }
+      TargetUtil.resetSingleTargetState(tmodel, targetName);
+      var target = tmodel.targets[targetName];
+      var nextTarget = target === null || target === void 0 ? void 0 : target.activateNextTarget;
+      var nextTargetDef = tmodel.targets[nextTarget];
+      if (!nextTargetDef || !nextTarget.endsWith('$') && nextTargetDef.active === false) {
+        return;
+      }
+      TargetUtil.resetTargetsBetween(tmodel, targetName, nextTarget, visited);
+      TargetUtil.resetTargetPipelineState(tmodel, nextTarget, visited);
+    }
   }, {
     key: "resetTargetPipelineState",
     value: function resetTargetPipelineState(tmodel, targetName) {
@@ -699,7 +716,6 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
             TargetUtil.resetTargetChildState(child, visited);
           }
         });
-        target.childAction = [];
       }
       if ((_target$addChildActio = target.addChildAction) !== null && _target$addChildActio !== void 0 && _target$addChildActio.length) {
         target.addChildAction.forEach(function (child) {
@@ -707,7 +723,6 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
             TargetUtil.resetTargetChildState(child, visited);
           }
         });
-        target.addChildAction = [];
       }
       var nextTarget = target === null || target === void 0 ? void 0 : target.activateNextTarget;
       if (!nextTarget) {
@@ -717,8 +732,39 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       if (!nextTargetDef || !nextTarget.endsWith('$') && nextTargetDef.active === false) {
         return;
       }
+      TargetUtil.resetTargetsBetween(tmodel, targetName, nextTarget, visited);
       TargetUtil.resetTargetPipelineState(tmodel, nextTarget, visited);
     }
+  }, {
+    key: "resetTargetsBetween",
+    value: function resetTargetsBetween(tmodel, fromTarget, toTarget, visited) {
+      var names = tmodel.functionTargetNames;
+      var fromIndex = names.indexOf(fromTarget);
+      var toIndex = names.indexOf(toTarget);
+      if (fromIndex < 0 || toIndex < 0 || toIndex <= fromIndex) {
+        return;
+      }
+      for (var i = fromIndex + 1; i < toIndex; i++) {
+        var _target$childAction5, _target$addChildActio2;
+        var key = names[i];
+        TargetUtil.resetSingleTargetState(tmodel, key);
+        var target = tmodel.targets[key];
+        if (target !== null && target !== void 0 && (_target$childAction5 = target.childAction) !== null && _target$childAction5 !== void 0 && _target$childAction5.length) {
+          target.childAction.forEach(function (child) {
+            if (child) {
+              TargetUtil.resetTargetChildState(child, visited);
+            }
+          });
+        }
+        if (target !== null && target !== void 0 && (_target$addChildActio2 = target.addChildAction) !== null && _target$addChildActio2 !== void 0 && _target$addChildActio2.length) {
+          target.addChildAction.forEach(function (child) {
+            if (child) {
+              TargetUtil.resetTargetChildState(child, visited);
+            }
+          });
+        }
+      }
+    }
   }, {
     key: "resetTargetChildState",
     value: function resetTargetChildState(tmodel, visited) {
@@ -729,11 +775,11 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       visited.add(sig);
       var names = Object.keys(tmodel.targetValues);
       for (var i = 0; i < names.length; i++) {
-        var _target$childAction5, _target$addChildActio2;
+        var _target$childAction6, _target$addChildActio3;
         var key = names[i];
         var target = tmodel.targets[key];
         TargetUtil.resetSingleTargetState(tmodel, key);
-        if (target !== null && target !== void 0 && (_target$childAction5 = target.childAction) !== null && _target$childAction5 !== void 0 && _target$childAction5.length) {
+        if (target !== null && target !== void 0 && (_target$childAction6 = target.childAction) !== null && _target$childAction6 !== void 0 && _target$childAction6.length) {
           target.childAction.forEach(function (child) {
             if (child) {
               TargetUtil.resetTargetChildState(child, visited);
@@ -741,7 +787,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
           });
           target.childAction = [];
         }
-        if (target !== null && target !== void 0 && (_target$addChildActio2 = target.addChildAction) !== null && _target$addChildActio2 !== void 0 && _target$addChildActio2.length) {
+        if (target !== null && target !== void 0 && (_target$addChildActio3 = target.addChildAction) !== null && _target$addChildActio3 !== void 0 && _target$addChildActio3.length) {
           target.addChildAction.forEach(function (child) {
             if (child) {
               TargetUtil.resetTargetChildState(child, visited);
@@ -760,7 +806,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         targetValue.triggeredByCompleteCount = 0;
         targetValue.resetFlag = true;
         targetValue.nextTargetUpdateCount = 0;
-        targetValue.status = 'complete';
+        targetValue.status = '';
       }
       tmodel.cancelAnimation();
       tmodel.activatedTargets.length = 0;
@@ -769,5 +815,26 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       tmodel.removeFromUpdatingTargets(key);
       TargetUtil.clearPendingTarget(tmodel, key);
     }
+  }, {
+    key: "removeChildFromTargetActions",
+    value: function removeChildFromTargetActions(parent, child) {
+      if (!parent || !child) {
+        return;
+      }
+      for (var _i2 = 0, _Object$values = Object.values(parent.targets); _i2 < _Object$values.length; _i2++) {
+        var _target$childAction7, _target$addChildActio4;
+        var target = _Object$values[_i2];
+        if ((_target$childAction7 = target.childAction) !== null && _target$childAction7 !== void 0 && _target$childAction7.length) {
+          target.childAction = target.childAction.filter(function (c) {
+            return c !== child;
+          });
+        }
+        if ((_target$addChildActio4 = target.addChildAction) !== null && _target$addChildActio4 !== void 0 && _target$addChildActio4.length) {
+          target.addChildAction = target.addChildAction.filter(function (c) {
+            return c !== child;
+          });
+        }
+      }
+    }
   }]);
 }();