targetj 1.0.237 → 1.0.238

package/build/BaseModel.js

@@ -1175,9 +1175,9 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
         actualOptions = value;
       }
       if (this.canTargetBeActivated(key)) {
-        var _actualOptions;
-        if ((_actualOptions = actualOptions) !== null && _actualOptions !== void 0 && _actualOptions.reset) {
-          _TargetUtil.TargetUtil.resetTargetState(this, key);
+        var resetOptions = _TargetUtil.TargetUtil.getResetOptions(actualOptions);
+        if (resetOptions.shouldReset) {
+          _TargetUtil.TargetUtil.resetTargetState(this, key, resetOptions);
         }
         if (_TUtil.TUtil.isDefined(actualValue)) {
           this.val("___".concat(key), actualValue);

package/build/TargetUtil.js

@@ -689,44 +689,33 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "resetTargetState",
     value: function resetTargetState(tmodel, targetName) {
-      var visited = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new Set();
+      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      var visited = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : new Set();
       if (!tmodel || !targetName) {
         return;
       }
       TargetUtil.resetSingleTargetState(tmodel, targetName);
+      TargetUtil.resetTargetChildActions(tmodel, targetName, options, visited);
       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);
+      TargetUtil.resetTargetsBetween(tmodel, targetName, nextTarget, options, visited);
+      TargetUtil.resetTargetPipelineState(tmodel, nextTarget, options, visited);
     }
   }, {
     key: "resetTargetPipelineState",
     value: function resetTargetPipelineState(tmodel, targetName) {
-      var _target$childAction4, _target$addChildActio;
-      var visited = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new Set();
+      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      var visited = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : new Set();
       if (!tmodel || !targetName) {
         return;
       }
-      var target = tmodel.targets[targetName];
       TargetUtil.resetSingleTargetState(tmodel, targetName);
-      if ((_target$childAction4 = target.childAction) !== null && _target$childAction4 !== void 0 && _target$childAction4.length) {
-        target.childAction.forEach(function (child) {
-          if (child) {
-            TargetUtil.resetTargetChildState(child, visited);
-          }
-        });
-      }
-      if ((_target$addChildActio = target.addChildAction) !== null && _target$addChildActio !== void 0 && _target$addChildActio.length) {
-        target.addChildAction.forEach(function (child) {
-          if (child) {
-            TargetUtil.resetTargetChildState(child, visited);
-          }
-        });
-      }
+      TargetUtil.resetTargetChildActions(tmodel, targetName, options, visited);
+      var target = tmodel.targets[targetName];
       var nextTarget = target === null || target === void 0 ? void 0 : target.activateNextTarget;
       if (!nextTarget) {
         return;
@@ -735,12 +724,14 @@ 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);
+      TargetUtil.resetTargetsBetween(tmodel, targetName, nextTarget, options, visited);
+      TargetUtil.resetTargetPipelineState(tmodel, nextTarget, options, visited);
     }
   }, {
     key: "resetTargetsBetween",
-    value: function resetTargetsBetween(tmodel, fromTarget, toTarget, visited) {
+    value: function resetTargetsBetween(tmodel, fromTarget, toTarget) {
+      var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+      var visited = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : new Set();
       var names = tmodel.functionTargetNames;
       var fromIndex = names.indexOf(fromTarget);
       var toIndex = names.indexOf(toTarget);
@@ -748,29 +739,16 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         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);
-            }
-          });
-        }
+        TargetUtil.resetTargetChildActions(tmodel, key, options, visited);
       }
     }
   }, {
     key: "resetTargetChildState",
-    value: function resetTargetChildState(tmodel, visited) {
+    value: function resetTargetChildState(tmodel) {
+      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var visited = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new Set();
       var sig = "".concat(tmodel.oid);
       if (visited.has(sig)) {
         return;
@@ -778,25 +756,38 @@ 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$childAction6, _target$addChildActio3;
         var key = names[i];
-        var target = tmodel.targets[key];
         TargetUtil.resetSingleTargetState(tmodel, key);
-        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);
-            }
-          });
-          target.childAction = [];
+        TargetUtil.resetTargetChildActions(tmodel, key, options, visited);
+      }
+    }
+  }, {
+    key: "resetTargetChildActions",
+    value: function resetTargetChildActions(tmodel, key) {
+      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      var visited = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : new Set();
+      var target = tmodel.targets[key];
+      if (!target) {
+        return;
+      }
+      var childActions = target.childAction ? _toConsumableArray(target.childAction) : [];
+      var addChildActions = target.addChildAction ? _toConsumableArray(target.addChildAction) : [];
+      childActions.forEach(function (child) {
+        if (child) {
+          TargetUtil.resetTargetChildState(child, options, visited);
         }
-        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);
-            }
-          });
-          target.addChildAction = [];
+      });
+      addChildActions.forEach(function (child) {
+        if (child) {
+          TargetUtil.resetTargetChildState(child, options, visited);
+        }
+      });
+      if (options.clearChildActions) {
+        if (Array.isArray(target.childAction)) {
+          target.childAction.length = 0;
+        }
+        if (Array.isArray(target.addChildAction)) {
+          target.addChildAction.length = 0;
         }
       }
     }
@@ -819,25 +810,13 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       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;
-          });
-        }
-      }
+    key: "getResetOptions",
+    value: function getResetOptions(options) {
+      var reset = options === null || options === void 0 ? void 0 : options.reset;
+      return {
+        shouldReset: reset === true || reset === 'pipeline' || reset === 'tree' || reset === 'all',
+        clearChildActions: reset === 'tree' || reset === 'all'
+      };
     }
   }]);
 }();