targetj 1.0.238 → 1.0.240

package/build/BaseModel.js

@@ -7,7 +7,7 @@ exports.BaseModel = void 0;
 var _App = require("./App.js");
 var _TargetExecutor = require("./TargetExecutor.js");
 var _TUtil = require("./TUtil.js");
-var _TargetParser = require("./TargetParser");
+var _TargetParser = require("./TargetParser.js");
 var _TargetUtil = require("./TargetUtil.js");
 var _TargetData = require("./TargetData.js");
 var _$Dom = require("./$Dom.js");
@@ -183,6 +183,24 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
       var _this$state16, _this$state16$visible;
       return (_this$state16$visible = (_this$state16 = this.state()).visibleChildren) !== null && _this$state16$visible !== void 0 ? _this$state16$visible : _this$state16.visibleChildren = [];
     }
+  }, {
+    key: "passiveTargetList",
+    get: function get() {
+      var _this$state17, _this$state17$passive;
+      return (_this$state17$passive = (_this$state17 = this.state()).passiveTargetList) !== null && _this$state17$passive !== void 0 ? _this$state17$passive : _this$state17.passiveTargetList = [];
+    },
+    set: function set(val) {
+      this.state().passiveTargetList = val;
+    }
+  }, {
+    key: "passiveTargetMap",
+    get: function get() {
+      var _this$state18, _this$state18$passive;
+      return (_this$state18$passive = (_this$state18 = this.state()).passiveTargetMap) !== null && _this$state18$passive !== void 0 ? _this$state18$passive : _this$state18.passiveTargetMap = {};
+    },
+    set: function set(val) {
+      this.state().passiveTargetMap = val;
+    }
   }, {
     key: "getParent",
     value: function getParent() {
@@ -260,6 +278,12 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
         this.delVal(key);
         return;
       }
+      if (target.loop === 'passive' || typeof target.loop === 'function') {
+        if (!this.passiveTargetMap[key]) {
+          this.passiveTargetMap[key] = true;
+          this.passiveTargetList.push(key);
+        }
+      }
       var targetType = _typeof(target);
       var isInactiveKey = key.startsWith('_') || key.endsWith('$');
       var needsTargetExecution = _TargetData.TargetData.mustExecuteTargets[cleanKey] || isInactiveKey || targetType !== 'string' && targetType !== 'number' && targetType !== 'boolean';
@@ -474,14 +498,6 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
       }
       return this;
     }
-  }, {
-    key: "resetScheduleTimeStamp",
-    value: function resetScheduleTimeStamp(key) {
-      if (this.targetValues[key]) {
-        this.targetValues[key].scheduleTimeStamp = undefined;
-      }
-      return this;
-    }
   }, {
     key: "resetTargetInitialValue",
     value: function resetTargetInitialValue(key) {
@@ -490,6 +506,33 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
       }
       return this;
     }
+  }, {
+    key: "addTargetToStatusList",
+    value: function addTargetToStatusList(key) {
+      var targetValue = this.targetValues[key];
+      if (!targetValue) {
+        return;
+      }
+      if (targetValue.status === 'fetching') {
+        var _this$getParent;
+        this.removeFromActiveTargets(key);
+        this.removeFromUpdatingTargets(key);
+        (_this$getParent = this.getParent()) === null || _this$getParent === void 0 || _this$getParent.addToActiveChildren(this);
+        return;
+      }
+      if (this.isTargetUpdating(key)) {
+        this.addToUpdatingTargets(key);
+        this.removeFromActiveTargets(key);
+        return;
+      }
+      if (this.isTargetActive(key)) {
+        this.addToActiveTargets(key);
+        this.removeFromUpdatingTargets(key);
+        return;
+      }
+      this.removeFromActiveTargets(key);
+      this.removeFromUpdatingTargets(key);
+    }
   }, {
     key: "setTargetStatus",
     value: function setTargetStatus(key, status) {
@@ -504,20 +547,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
       }
       targetValue.resetFlag = false;
       targetValue.status = status;
-      if (targetValue.status === 'fetching') {
-        this.removeFromActiveTargets(key);
-        this.removeFromUpdatingTargets(key);
-        this.getParent().addToActiveChildren(this);
-      } else if (this.isTargetUpdating(key)) {
-        this.addToUpdatingTargets(key);
-        this.removeFromActiveTargets(key);
-      } else if (this.isTargetActive(key)) {
-        this.addToActiveTargets(key);
-        this.removeFromUpdatingTargets(key);
-      } else {
-        this.removeFromActiveTargets(key);
-        this.removeFromUpdatingTargets(key);
-      }
+      this.addTargetToStatusList(key);
     }
   }, {
     key: "getTargetStatus",
@@ -551,8 +581,13 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
     }
   }, {
     key: "isTargetTreeComplete",
-    value: function isTargetTreeComplete(key) {
-      return _TargetUtil.TargetUtil.isTargetTreeComplete(this, key) === true;
+    value: function isTargetTreeComplete(key, completionScope) {
+      return _TargetUtil.TargetUtil.isTargetTreeComplete(this, key, completionScope) === true;
+    }
+  }, {
+    key: "isTargetVisibleTreeComplete",
+    value: function isTargetVisibleTreeComplete(key) {
+      return this.isTargetTreeComplete(key, 'visible');
     }
   }, {
     key: "isTargetFullyCompleted",
@@ -665,12 +700,12 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
     }
   }, {
     key: "setScheduleRemainingTime",
-    value: function setScheduleRemainingTime(key, remainingTime) {
+    value: function setScheduleRemainingTime(key, value) {
       var targetValue = this.targetValues[key];
       if (!targetValue) {
         return;
       }
-      targetValue.scheduleRemainingTime = remainingTime;
+      targetValue.scheduleRemainingTime = value;
     }
   }, {
     key: "resetScheduleRemainingTime",
@@ -679,7 +714,25 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
       if (!targetValue) {
         return;
       }
-      delete targetValue.scheduleRemainingTime;
+      targetValue.scheduleRemainingTime = undefined;
+    }
+  }, {
+    key: "setScheduleTimeStamp",
+    value: function setScheduleTimeStamp(key, value) {
+      var targetValue = this.targetValues[key];
+      if (!targetValue) {
+        return;
+      }
+      targetValue.scheduleTimeStamp = value;
+    }
+  }, {
+    key: "resetScheduleTimeStamp",
+    value: function resetScheduleTimeStamp(key) {
+      var targetValue = this.targetValues[key];
+      if (!targetValue) {
+        return;
+      }
+      targetValue.scheduleTimeStamp = undefined;
     }
   }, {
     key: "isTargetInLoop",
@@ -689,7 +742,17 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
         return false;
       }
       var loop = typeof t.loop === 'function' ? t.loop.call(this, key) : t.loop;
-      return loop === true || loop === 'passive';
+      return loop === true;
+    }
+  }, {
+    key: "isTargetPassiveLoop",
+    value: function isTargetPassiveLoop(key) {
+      var t = this.targets[key];
+      if (!t) {
+        return false;
+      }
+      var loop = typeof t.loop === 'function' ? t.loop.call(this, key) : t.loop;
+      return loop === 'passive';
     }
   }, {
     key: "shouldScheduleRun",
@@ -701,15 +764,49 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
       if (t.triggerRerun !== undefined) {
         return !!t.triggerRerun;
       }
-      if (t.loop !== undefined) {
-        var loop = typeof t.loop === 'function' ? t.loop.call(this, key) : t.loop;
-        if (loop === 'passive') {
-          var values = _TargetParser.TargetParser.getValueStepsCycles(this, key);
-          return values[0] === this.getTargetValue(key) ? false : true;
-        }
+      var loop = typeof t.loop === 'function' ? t.loop.call(this, key) : t.loop;
+      if (loop === 'passive') {
+        var _t$deepEquality;
+        var values = _TargetParser.TargetParser.getValueStepsCycles(this, key);
+        var nextValue = values[0];
+        var currentTargetValue = this.getTargetValue(key);
+        return !_TUtil.TUtil.areEqual(nextValue, currentTargetValue, (_t$deepEquality = t.deepEquality) !== null && _t$deepEquality !== void 0 ? _t$deepEquality : false);
       }
       return true;
     }
+  }, {
+    key: "activateChangedPassiveTargets",
+    value: function activateChangedPassiveTargets() {
+      var _this$passiveTargetLi;
+      if (!((_this$passiveTargetLi = this.passiveTargetList) !== null && _this$passiveTargetLi !== void 0 && _this$passiveTargetLi.length)) {
+        return false;
+      }
+      var activated = false;
+      var _iterator = _createForOfIteratorHelper(this.passiveTargetList),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var _this$animatingMap;
+          var key = _step.value;
+          if (!this.isTargetPassiveLoop(key)) {
+            continue;
+          }
+          if (this.isTargetUpdating(key) || (_this$animatingMap = this.animatingMap) !== null && _this$animatingMap !== void 0 && _this$animatingMap.has(key)) {
+            continue;
+          }
+          if (!this.shouldScheduleRun(key)) {
+            continue;
+          }
+          this.addToActiveTargets(key);
+          activated = true;
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      return activated;
+    }
   }, {
     key: "getTargetInitialValue",
     value: function getTargetInitialValue(key) {
@@ -806,7 +903,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
     key: "getValueListPointer",
     value: function getValueListPointer(key) {
       var _this$targetValues$ke22, _this$targetValues$ke23;
-      return (_this$targetValues$ke22 = (_this$targetValues$ke23 = this.targetValues[key]) === null || _this$targetValues$ke23 === void 0 ? void 0 : _this$targetValues$ke23.valuePointer) !== null && _this$targetValues$ke22 !== void 0 ? _this$targetValues$ke22 : 0;
+      return (_this$targetValues$ke22 = (_this$targetValues$ke23 = this.targetValues[key]) === null || _this$targetValues$ke23 === void 0 ? void 0 : _this$targetValues$ke23.valuePointer) !== null && _this$targetValues$ke22 !== void 0 ? _this$targetValues$ke22 : 1;
     }
   }, {
     key: "incrementTargetCycle",
@@ -830,13 +927,6 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
       }
       return this.targetValues[key].interval;
     }
-  }, {
-    key: "setScheduleTimeStamp",
-    value: function setScheduleTimeStamp(key, value) {
-      if (this.targetValues[key]) {
-        this.targetValues[key].scheduleTimeStamp = value;
-      }
-    }
   }, {
     key: "setTargetInitialValue",
     value: function setTargetInitialValue(key, value) {
@@ -881,12 +971,12 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
       if (!this.hasAnimatingTargets()) {
         return;
       }
-      var _iterator = _createForOfIteratorHelper(this.animatingMap),
-        _step;
+      var _iterator2 = _createForOfIteratorHelper(this.animatingMap),
+        _step2;
       try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var _step$value = _slicedToArray(_step.value, 1),
-            key = _step$value[0];
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var _step2$value = _slicedToArray(_step2.value, 1),
+            key = _step2$value[0];
           if (this.targetValues[key]) {
             this.targetValues[key].status = 'done';
             this.removeFromUpdatingTargets(key);
@@ -894,28 +984,27 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator.f();
+        _iterator2.f();
       }
       (0, _App.getAnimationManager)().deleteAnimation(this);
-      this.pausedBatch = undefined;
     }
   }, {
     key: "hasTargetUpdates",
     value: function hasTargetUpdates(key) {
-      var _this$animatingMap;
-      return key ? this.updatingTargetMap[key] === true || ((_this$animatingMap = this.animatingMap) === null || _this$animatingMap === void 0 ? void 0 : _this$animatingMap.has(key)) : this.updatingTargetList.length > 0;
+      var _this$animatingMap2;
+      return key ? this.updatingTargetMap[key] === true || ((_this$animatingMap2 = this.animatingMap) === null || _this$animatingMap2 === void 0 ? void 0 : _this$animatingMap2.has(key)) : this.updatingTargetList.length > 0;
     }
   }, {
     key: "addToActiveTargets",
     value: function addToActiveTargets(key) {
       if (!this.activeTargetMap[key] && this.canTargetBeActivated(key)) {
-        var _this$getParent;
+        var _this$getParent2;
         this.markLayoutDirty(key);
         this.activeTargetMap[key] = true;
         this.activeTargetList.push(key);
-        (_this$getParent = this.getParent()) === null || _this$getParent === void 0 || _this$getParent.addToActiveChildren(this);
+        (_this$getParent2 = this.getParent()) === null || _this$getParent2 === void 0 || _this$getParent2.addToActiveChildren(this);
       }
     }
   }, {
@@ -929,19 +1018,19 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
         }
       }
       if (this.activeTargetList.length === 0) {
-        var _this$getParent2;
-        (_this$getParent2 = this.getParent()) === null || _this$getParent2 === void 0 || _this$getParent2.removeFromActiveChildren(this);
+        var _this$getParent3;
+        (_this$getParent3 = this.getParent()) === null || _this$getParent3 === void 0 || _this$getParent3.removeFromActiveChildren(this);
       }
     }
   }, {
     key: "addToUpdatingTargets",
     value: function addToUpdatingTargets(key) {
       if (!this.updatingTargetMap[key]) {
-        var _this$getParent3;
+        var _this$getParent4;
         this.markLayoutDirty(key);
         this.updatingTargetMap[key] = true;
         this.updatingTargetList.push(key);
-        (_this$getParent3 = this.getParent()) === null || _this$getParent3 === void 0 || _this$getParent3.addToUpdatingChildren(this);
+        (_this$getParent4 = this.getParent()) === null || _this$getParent4 === void 0 || _this$getParent4.addToUpdatingChildren(this);
       }
     }
   }, {
@@ -955,8 +1044,8 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
         }
       }
       if (this.updatingTargetList.length === 0) {
-        var _this$getParent4;
-        (_this$getParent4 = this.getParent()) === null || _this$getParent4 === void 0 || _this$getParent4.removeFromUpdatingChildren(this);
+        var _this$getParent5;
+        (_this$getParent5 = this.getParent()) === null || _this$getParent5 === void 0 || _this$getParent5.removeFromUpdatingChildren(this);
       }
     }
   }, {
@@ -964,19 +1053,19 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
     value: function hasUpdatingImperativeTargets(originalTargetName) {
       var _this$updatingTargetL;
       var updatingList = [].concat(_toConsumableArray((_this$updatingTargetL = this.updatingTargetList) !== null && _this$updatingTargetL !== void 0 ? _this$updatingTargetL : []), _toConsumableArray(this.hasAnimatingTargets() ? _toConsumableArray(this.animatingMap.keys()) : []));
-      var _iterator2 = _createForOfIteratorHelper(updatingList),
-        _step2;
+      var _iterator3 = _createForOfIteratorHelper(updatingList),
+        _step3;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var target = _step2.value;
-          if (this.isTargetImperative(target) && this.targetValues[target].originalTargetName === originalTargetName) {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var target = _step3.value;
+          if (this.isTargetImperative(target) && (this.targetValues[target].originalTargetName === originalTargetName || _TargetUtil.TargetUtil.getTargetName(target) === originalTargetName)) {
             return true;
           }
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator2.f();
+        _iterator3.f();
       }
       return false;
     }
@@ -984,58 +1073,57 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
     key: "getUpdatingImperativeTargets",
     value: function getUpdatingImperativeTargets(originalTargetName) {
       var targets = [];
-      var _iterator3 = _createForOfIteratorHelper(this.updatingTargetList),
-        _step3;
+      var _iterator4 = _createForOfIteratorHelper(this.updatingTargetList),
+        _step4;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var target = _step3.value;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var target = _step4.value;
           if (this.isTargetImperative(target) && this.targetValues[target].originalTargetName === originalTargetName) {
             targets.push(target);
           }
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator3.f();
+        _iterator4.f();
       }
       return targets;
     }
   }, {
     key: "hasAnyUpdates",
     value: function hasAnyUpdates() {
-      var _this$animatingMap$si, _this$animatingMap2;
-      return this.updatingTargetList.length !== 0 || this.activeTargetList.length !== 0 || ((_this$animatingMap$si = (_this$animatingMap2 = this.animatingMap) === null || _this$animatingMap2 === void 0 ? void 0 : _this$animatingMap2.size) !== null && _this$animatingMap$si !== void 0 ? _this$animatingMap$si : 0) !== 0;
+      var _this$animatingMap$si, _this$animatingMap3;
+      return this.updatingTargetList.length !== 0 || this.activeTargetList.length !== 0 || ((_this$animatingMap$si = (_this$animatingMap3 = this.animatingMap) === null || _this$animatingMap3 === void 0 ? void 0 : _this$animatingMap3.size) !== null && _this$animatingMap$si !== void 0 ? _this$animatingMap$si : 0) !== 0;
     }
   }, {
     key: "removeFromAnimatingMap",
     value: function removeFromAnimatingMap(key) {
-      var _this$animatingMap3;
-      if ((_this$animatingMap3 = this.animatingMap) !== null && _this$animatingMap3 !== void 0 && _this$animatingMap3.has(key)) {
+      var _this$animatingMap4;
+      if ((_this$animatingMap4 = this.animatingMap) !== null && _this$animatingMap4 !== void 0 && _this$animatingMap4.has(key)) {
         this.animatingMap.delete(key);
         if (this.animatingMap.size === 0) {
-          var _this$getParent5;
-          (_this$getParent5 = this.getParent()) === null || _this$getParent5 === void 0 || _this$getParent5.removeFromAnimatingChildren(this);
+          var _this$getParent6;
+          (_this$getParent6 = this.getParent()) === null || _this$getParent6 === void 0 || _this$getParent6.removeFromAnimatingChildren(this);
         }
       }
     }
   }, {
     key: "clearAnimatingMap",
     value: function clearAnimatingMap() {
-      var _this$animatingMap4, _this$getParent6;
-      (_this$animatingMap4 = this.animatingMap) === null || _this$animatingMap4 === void 0 || _this$animatingMap4.clear();
-      (_this$getParent6 = this.getParent()) === null || _this$getParent6 === void 0 || _this$getParent6.removeFromAnimatingChildren(this);
+      var _this$animatingMap5, _this$getParent7;
+      (_this$animatingMap5 = this.animatingMap) === null || _this$animatingMap5 === void 0 || _this$animatingMap5.clear();
+      (_this$getParent7 = this.getParent()) === null || _this$getParent7 === void 0 || _this$getParent7.removeFromAnimatingChildren(this);
     }
   }, {
     key: "addToAnimatingMap",
     value: function addToAnimatingMap(key) {
-      var _this$targetValues$ke24, _this$getParent7;
-      var record = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      var _this$targetValues$ke24, _this$getParent8;
       if ((_this$targetValues$ke24 = this.targetValues[key]) !== null && _this$targetValues$ke24 !== void 0 && _this$targetValues$ke24.snapAnimation) {
         return;
       }
       this.animatingMap || (this.animatingMap = new Map());
-      this.animatingMap.set(key, record);
-      (_this$getParent7 = this.getParent()) === null || _this$getParent7 === void 0 || _this$getParent7.addToAnimatingChildren(this);
+      this.animatingMap.set(key, true);
+      (_this$getParent8 = this.getParent()) === null || _this$getParent8 === void 0 || _this$getParent8.addToAnimatingChildren(this);
     }
   }, {
     key: "isKeyAnimating",
@@ -1104,8 +1192,8 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
   }, {
     key: "hasAnimatingTargets",
     value: function hasAnimatingTargets() {
-      var _this$animatingMap5;
-      return !!((_this$animatingMap5 = this.animatingMap) !== null && _this$animatingMap5 !== void 0 && _this$animatingMap5.size);
+      var _this$animatingMap6;
+      return !!((_this$animatingMap6 = this.animatingMap) !== null && _this$animatingMap6 !== void 0 && _this$animatingMap6.size);
     }
   }, {
     key: "hasValidAnimation",

package/build/Bracket.js

@@ -108,9 +108,6 @@ var Bracket = exports.Bracket = /*#__PURE__*/function (_TModel) {
     value: function getBracketThreshold() {
       return this.getRealParent().getBracketSize();
     }
-  }, {
-    key: "addToParentVisibleChildren",
-    value: function addToParentVisibleChildren() {}
   }, {
     key: "createViewport",
     value: function createViewport() {