targetj 1.0.227 → 1.0.228

package/build/BaseModel.js

@@ -1137,11 +1137,20 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
     }
   }, {
     key: "activateTarget",
-    value: function activateTarget(key, value) {
+    value: function activateTarget(key, value, options) {
+      var actualValue = value;
+      var actualOptions = options;
+      if (value !== null && value !== void 0 && value.reset && Object.keys(value).length === 1 && !options) {
+        actualValue = undefined;
+        actualOptions = value;
+      }
       if (this.canTargetBeActivated(key)) {
-        var _target$childAction, _target$addChildActio;
-        if (_TUtil.TUtil.isDefined(value)) {
-          this.val("___".concat(key), value);
+        var _actualOptions, _target$childAction, _target$addChildActio;
+        if ((_actualOptions = actualOptions) !== null && _actualOptions !== void 0 && _actualOptions.reset) {
+          _TargetUtil.TargetUtil.resetTargetPipelineState(this, key);
+        }
+        if (_TUtil.TUtil.isDefined(actualValue)) {
+          this.val("___".concat(key), actualValue);
         }
         if (this.isVisible()) {
           this.markLayoutDirty(key);

package/build/LoadingManager.js

@@ -36,6 +36,7 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
     this.tmodelKeyMap = {};
     this.fetchingAPIMap = {};
     this.fetchingImageMap = {};
+    this.fetchSeq = 0;
   }
   return _createClass(LoadingManager, [{
     key: "clear",
@@ -43,6 +44,7 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
       this.tmodelKeyMap = {};
       this.fetchingAPIMap = {};
       this.fetchingImageMap = {};
+      this.fetchSeq = 0;
     }
   }, {
     key: "fetchCommon",
@@ -117,7 +119,8 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
   }, {
     key: "getFetchKey",
     value: function getFetchKey(tmodel, url, query) {
-      return query ? "".concat(tmodel.oid, "_").concat(url, "_").concat(tmodel.getTargetCycle(tmodel.key), "_").concat(JSON.stringify(query)) : "".concat(tmodel.oid, "_").concat(url, "_").concat(tmodel.getTargetCycle(tmodel.key));
+      var base = query ? "".concat(tmodel.oid, "_").concat(url, "_").concat(tmodel.getTargetCycle(tmodel.key), "_").concat(JSON.stringify(query)) : "".concat(tmodel.oid, "_").concat(url, "_").concat(tmodel.getTargetCycle(tmodel.key));
+      return "".concat(base, "_").concat(++this.fetchSeq);
     }
   }, {
     key: "getTModelKey",

package/build/TUtil.js

@@ -7,6 +7,7 @@ exports.TUtil = void 0;
 var _App = require("./App.js");
 var _TargetUtil = require("./TargetUtil.js");
 var _TargetData = require("./TargetData.js");
+var _TargetParser = require("./TargetParser");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
@@ -304,6 +305,9 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
   }, {
     key: "runTargetValue",
     value: function runTargetValue(tmodel, target, key, cycle, lastValue) {
+      if (_TargetParser.TargetParser.isIntervalTarget(target) && cycle === 1) {
+        return;
+      }
       var cleanKey = _TargetUtil.TargetUtil.getTargetName(key);
       var isExternalEvent = _TargetData.TargetData.allEventMap[cleanKey];
       if (isExternalEvent) {

package/build/TargetParser.js

@@ -161,7 +161,7 @@ var TargetParser = exports.TargetParser = /*#__PURE__*/function () {
       if (target.isInterval && _TUtil.TUtil.isDefined(target.interval)) {
         return true;
       }
-      return _TUtil.TUtil.isDefined(target.interval) && !_TUtil.TUtil.isDefined(target.steps) && !_TUtil.TUtil.isDefined(target.cycles) && !_TUtil.TUtil.isDefined(target.value);
+      return _TUtil.TUtil.isDefined(target.interval) && !_TUtil.TUtil.isDefined(target.steps) && !_TUtil.TUtil.isDefined(target.cycles);
     }
   }, {
     key: "isPrimitiveArray",

package/build/TargetUtil.js

@@ -642,5 +642,88 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         originalTargetName: originalTargetName
       };
     }
+  }, {
+    key: "resetTargetPipelineState",
+    value: function resetTargetPipelineState(tmodel, targetName) {
+      var _target$childAction4, _target$addChildActio;
+      var visited = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 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);
+          }
+        });
+        target.childAction = [];
+      }
+      if ((_target$addChildActio = target.addChildAction) !== null && _target$addChildActio !== void 0 && _target$addChildActio.length) {
+        target.addChildAction.forEach(function (child) {
+          if (child) {
+            TargetUtil.resetTargetChildState(child, visited);
+          }
+        });
+        target.addChildAction = [];
+      }
+      var nextTarget = target === null || target === void 0 ? void 0 : target.activateNextTarget;
+      if (!nextTarget) {
+        return;
+      }
+      var nextTargetDef = tmodel.targets[nextTarget];
+      if (!nextTargetDef || !nextTarget.endsWith('$') && nextTargetDef.active === false) {
+        return;
+      }
+      TargetUtil.resetTargetPipelineState(tmodel, nextTarget, visited);
+    }
+  }, {
+    key: "resetTargetChildState",
+    value: function resetTargetChildState(tmodel, visited) {
+      var sig = "".concat(tmodel.oid);
+      if (visited.has(sig)) {
+        return;
+      }
+      visited.add(sig);
+      var names = Object.keys(tmodel.targetValues);
+      for (var i = 0; i < names.length; i++) {
+        var _target$childAction5, _target$addChildActio2;
+        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) {
+          target.childAction.forEach(function (child) {
+            if (child) {
+              TargetUtil.resetTargetChildState(child, visited);
+            }
+          });
+          target.childAction = [];
+        }
+        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);
+            }
+          });
+          target.addChildAction = [];
+        }
+      }
+    }
+  }, {
+    key: "resetSingleTargetState",
+    value: function resetSingleTargetState(tmodel, key) {
+      var targetValue = tmodel.targetValues[key];
+      if (targetValue) {
+        targetValue.completeCount = 0;
+        targetValue.nextTargetUpdateCount = 0;
+      }
+      tmodel.cancelAnimation();
+      tmodel.activatedTargets.length = 0;
+      tmodel.removeFromActiveTargets(key);
+      tmodel.removeFromAnimatingMap(key);
+      tmodel.removeFromUpdatingTargets(key);
+      TargetUtil.clearPendingTargets(tmodel, key);
+    }
   }]);
 }();