targetj 1.0.187 → 1.0.188

package/build/BaseModel.js

@@ -915,26 +915,6 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
         }
       }
     }
-  }, {
-    key: "hasUpdatingChildren",
-    value: function hasUpdatingChildren(originalTargetName) {
-      if (originalTargetName) {
-        var count = 0;
-        this.updatingChildrenList.forEach(function (child) {
-          child.updatingTargetList.forEach(function (target) {
-            var _child$targetValues$t, _child$targets$target;
-            if (child.isTargetImperative(target) && ((_child$targetValues$t = child.targetValues[target]) === null || _child$targetValues$t === void 0 ? void 0 : _child$targetValues$t.originalTargetName) === originalTargetName) {
-              count++;
-            } else if (((_child$targets$target = child.targets[target]) === null || _child$targets$target === void 0 ? void 0 : _child$targets$target.originalTargetName) === originalTargetName) {
-              count++;
-            }
-          });
-        });
-        return count;
-      } else {
-        return this.updatingChildrenList.length > 0;
-      }
-    }
   }, {
     key: "addToActiveChildren",
     value: function addToActiveChildren(child) {

package/build/LoadingManager.js

@@ -29,15 +29,21 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
     this.fetchingImageMap = {};
   }
   return _createClass(LoadingManager, [{
+    key: "clear",
+    value: function clear() {
+      this.tmodelKeyMap = {};
+      this.fetchingAPIMap = {};
+      this.fetchingImageMap = {};
+    }
+  }, {
     key: "fetchCommon",
     value: function fetchCommon(fetchId, cacheId, tmodel, fetchMap, fetchFn) {
       _TargetUtil.TargetUtil.markTargetAction(tmodel, 'fetchAction');
-      if (!cacheId || !this.isFetched(cacheId)) {
+      if (!this.isFetched(cacheId)) {
         if (!fetchMap[fetchId]) {
           fetchMap[fetchId] = {
             fetchId: fetchId,
             cacheId: cacheId,
-            fetchingFlag: true,
             startTime: _TUtil.TUtil.now(),
             targets: [{
               tmodel: tmodel,
@@ -46,17 +52,11 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
             fetchMap: fetchMap
           };
           fetchFn();
-        } else {
-          fetchMap[fetchId].targets.push({
-            tmodel: tmodel,
-            targetName: tmodel.key
-          });
         }
       } else if (!fetchMap[fetchId]) {
         fetchMap[fetchId] = {
           fetchId: fetchId,
           cacheId: cacheId,
-          fetchingFlag: true,
           startTime: _TUtil.TUtil.now(),
           targets: [{
             tmodel: tmodel,
@@ -113,8 +113,11 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
           activeIndex: 0,
           accessIndex: 0
         };
+      }
+      if (!tmodel.val(loadTargetName)) {
         tmodel.val(loadTargetName, []);
       }
+      ;
       if (!this.tmodelKeyMap[key].fetchMap[fetchId]) {
         this.tmodelKeyMap[key].fetchMap[fetchId] = {
           fetchId: fetchId,
@@ -124,6 +127,7 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
         tmodel.val(loadTargetName).push(undefined);
       }
       if (cacheId && this.isFetched(cacheId)) {
+        this.fetchingAPIMap[fetchId].startTime = _TUtil.TUtil.now();
         this.handleSuccess(this.fetchingAPIMap[fetchId], this.cacheMap[cacheId].result);
       }
     }
@@ -208,12 +212,6 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
       }
       return result;
     }
-  }, {
-    key: "isFetching",
-    value: function isFetching(fetchId) {
-      var _this$fetchingAPIMap$, _this$fetchingAPIMap$2;
-      return (_this$fetchingAPIMap$ = (_this$fetchingAPIMap$2 = this.fetchingAPIMap[fetchId]) === null || _this$fetchingAPIMap$2 === void 0 ? void 0 : _this$fetchingAPIMap$2.fetchingFlag) !== null && _this$fetchingAPIMap$ !== void 0 ? _this$fetchingAPIMap$ : false;
-    }
   }, {
     key: "isFetched",
     value: function isFetched(cacheId) {
@@ -260,10 +258,12 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
         }));
         var targetResults = tmodel.val(loadTargetName);
         if (targetResults) {
+          if (!targetResults[fetchEntry.order]) {
+            tmodelEntry.resultCount++;
+          }
           targetResults[fetchEntry.order] = res.result;
         }
         tmodel.val(targetName, (targetResults === null || targetResults === void 0 ? void 0 : targetResults.length) === 1 ? targetResults[0] : targetResults);
-        tmodelEntry.resultCount++;
         _TargetUtil.TargetUtil.shouldActivateNextTarget(tmodel, targetName);
       });
       delete fetchMap[fetchId];
@@ -299,9 +299,13 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
           error: error
         };
         var targetResults = tmodel.val(loadTargetName);
-        targetResults[fetchEntry.order] = res;
+        if (targetResults) {
+          if (!targetResults[fetchEntry.order]) {
+            tmodelEntry.resultCount++;
+          }
+          targetResults[fetchEntry.order] = res;
+        }
         tmodel.val(targetName, targetResults.length === 1 ? targetResults[0] : targetResults);
-        tmodelEntry.resultCount++;
         tmodelEntry.errorCount++;
         _this4.callOnErrorHandler(tmodel, targetName);
         _TargetUtil.TargetUtil.shouldActivateNextTarget(tmodel, targetName);

package/build/RunScheduler.js

@@ -192,9 +192,11 @@ var RunScheduler = exports.RunScheduler = /*#__PURE__*/function () {
         this.defer("rerun-".concat(this.rerunId));
       } else {
         var newDelay = this.nextRuns.length > 0 ? this.nextRuns[0].delay - (_TUtil.TUtil.now() - this.nextRuns[0].insertTime) : undefined;
-        if (newDelay === undefined || (0, _App.getManager)().lists.activeTModels.length > 0 || (0, _App.getManager)().lists.updatingTModels.length > 0) {
+        if (newDelay === undefined || (0, _App.getManager)().lists.activeTModels.length > 0 || (0, _App.getManager)().lists.updatingTModels.length > 0 || (0, _App.getLocationManager)().activatedList.length > 0) {
           if ((0, _App.getEvents)().eventQueue.length > 0) {
             this.schedule(15, "events-".concat((0, _App.getEvents)().eventQueue.length));
+          } else if ((0, _App.getLocationManager)().activatedList.length > 0) {
+            this.schedule(15, "getManager-locationManager-activatedList");
           } else if ((0, _App.getManager)().lists.updatingTModels.length > 0) {
             this.schedule(15, "getManager-needsRerun-updatingTModels");
           } else if ((0, _App.getManager)().lists.activeTModels.length > 0) {

package/build/TargetUtil.js

@@ -6,10 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.TargetUtil = void 0;
 var _App = require("./App.js");
 var _TUtil = require("./TUtil.js");
+var _TargetData = require("./TargetData.js");
 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 _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 _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
 function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
@@ -130,11 +128,20 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       var target = tmodel.targets[key];
       var nextTarget = target === null || target === void 0 ? void 0 : target.activateNextTarget;
       if (!nextTarget || tmodel.isTargetImperative(key)) {
-        var _ref = tmodel.isTargetImperative(key) ? tmodel.targetValues[key] : target,
-          originalTModel = _ref.originalTModel,
-          originalTargetName = _ref.originalTargetName;
-        if (level < 2 && originalTargetName && originalTModel) {
-          TargetUtil.shouldActivateNextTarget(originalTModel, originalTargetName, level + 1);
+        if (tmodel.isTargetImperative(key)) {
+          var _tmodel$targetValues$ = tmodel.targetValues[key],
+            originalTModel = _tmodel$targetValues$.originalTModel,
+            originalTargetName = _tmodel$targetValues$.originalTargetName;
+          if (originalTargetName && originalTModel) {
+            TargetUtil.shouldActivateNextTarget(originalTModel, originalTargetName, level + 1);
+          }
+        } else {
+          var _originalTModel$targe;
+          var _originalTModel = target.originalTModel,
+            _originalTargetName = target.originalTargetName;
+          if (_originalTargetName && _originalTModel && (_originalTModel$targe = _originalTModel.targets[_originalTargetName]) !== null && _originalTModel$targe !== void 0 && _originalTModel$targe.activateNextTarget) {
+            TargetUtil.shouldActivateNextTarget(_originalTModel, _originalTargetName, level + 1);
+          }
         }
         if (!tmodel.isTargetImperative(key)) {
           TargetUtil.cleanupTarget(tmodel, key);
@@ -148,15 +155,22 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       if (fetchAction) {
         if (fetchAction === 'onEnd' && TargetUtil.hasTargetEnded(tmodel, key)) {
           tmodel.activateTarget(cleanNextTarget);
+          return;
         } else if (fetchAction === 'onEach') {
+          var activateFlag = false;
           while ((0, _App.getLoader)().isNextLoadingItemSuccessful(tmodel, key)) {
             if (tmodel.activatedTargets.indexOf(cleanNextTarget) >= 0) {
               tmodel.activatedTargets.push(cleanNextTarget);
+              activateFlag = true;
             } else {
               tmodel.activateTarget(cleanNextTarget);
+              activateFlag = true;
             }
             (0, _App.getLoader)().nextActiveItem(tmodel, key);
           }
+          if (activateFlag) {
+            return;
+          }
         } else {
           TargetUtil.cleanupTarget(tmodel, key);
         }
@@ -170,12 +184,12 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
           target.childAction = 'inactive';
         }
       }
-      if (!childAction && !fetchAction && target && !tmodel.isTargetImperative(key)) {
+      if (!childAction && !fetchAction && target && cleanNextTarget && !tmodel.isTargetImperative(key)) {
         if (isEndTrigger && TargetUtil.hasTargetEnded(tmodel, key) || !isEndTrigger) {
           tmodel.activateTarget(cleanNextTarget);
         }
       }
-      if (TargetUtil.hasTargetEnded(tmodel, key)) {
+      if (TargetUtil.isTargetComplete(tmodel, key)) {
         TargetUtil.cleanupTarget(tmodel, key);
       }
     }
@@ -221,37 +235,43 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       return true;
     }
   }, {
-    key: "hasDeclarativeTargetUpdates",
-    value: function hasDeclarativeTargetUpdates(tmodel) {
-      if (!tmodel.hasTargetUpdates()) {
-        return false;
-      }
-      var _iterator = _createForOfIteratorHelper(tmodel.updatingTargetList),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var target = _step.value;
-          if (!tmodel.isTargetImperative(target)) {
-            return true;
-          }
+    key: "hasTargetEnded",
+    value: function hasTargetEnded(tmodel, key) {
+      return !TargetUtil.isTargetComplete(tmodel, key) || tmodel.hasUpdatingTargets(key) || !TargetUtil.arePreviousTargetsComplete(tmodel, key) ? false : true;
+    }
+  }, {
+    key: "arePreviousTargetsComplete",
+    value: function arePreviousTargetsComplete(tmodel, key) {
+      var keyIndex = tmodel.originalTargetNames.findIndex(function (name) {
+        return key === TargetUtil.getTargetName(name);
+      });
+      for (var i = 0; i < keyIndex; i++) {
+        var prevTarget = TargetUtil.getTargetName(tmodel.originalTargetNames[i]);
+        if (tmodel.isTargetImperative(prevTarget)) {
+          continue;
+        }
+        if (!TargetUtil.isTargetComplete(tmodel, prevTarget)) {
+          return false;
         }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
       }
-      return false;
+      return true;
     }
   }, {
-    key: "hasTargetEnded",
-    value: function hasTargetEnded(tmodel, key) {
-      var inProgress = !tmodel.isTargetComplete(key) && !tmodel.isTargetDone(key) || tmodel.hasUpdatingTargets(key) || TargetUtil.hasDeclarativeTargetUpdates(tmodel);
-      if (inProgress) {
-        return false;
-      }
+    key: "isTargetComplete",
+    value: function isTargetComplete(tmodel, key) {
       var target = tmodel.targets[key];
       if (target) {
-        if (target.childAction && (tmodel.hasUpdatingChildren(key) || tmodel.hasActiveChildren(key))) {
+        var targetType = _typeof(target.value);
+        if (_TargetData.TargetData.controlTargetMap[key]) {
+          return true;
+        }
+        if (!target.childAction && !target.fetchAction && (targetType === 'string' || targetType === 'number' || targetType === 'boolean')) {
+          return true;
+        }
+        if (!tmodel.isTargetComplete(key) && !tmodel.isTargetDone(key)) {
+          return false;
+        }
+        if (target.childAction && (TargetUtil.hasUpdatingChildren(tmodel, key) || tmodel.hasActiveChildren())) {
           return false;
         }
         if (target.fetchAction && !(0, _App.getLoader)().isLoadingSuccessful(tmodel, key)) {
@@ -260,6 +280,24 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       }
       return true;
     }
+  }, {
+    key: "hasUpdatingChildren",
+    value: function hasUpdatingChildren(tmodel, originalTargetName) {
+      var count = 0;
+      tmodel.updatingChildrenList.filter(function (child) {
+        return child.isVisible();
+      }).forEach(function (child) {
+        child.updatingTargetList.forEach(function (target) {
+          var _child$targetValues$t, _child$targets$target;
+          if (child.isTargetImperative(target) && ((_child$targetValues$t = child.targetValues[target]) === null || _child$targetValues$t === void 0 ? void 0 : _child$targetValues$t.originalTargetName) === originalTargetName) {
+            count++;
+          } else if (((_child$targets$target = child.targets[target]) === null || _child$targets$target === void 0 ? void 0 : _child$targets$target.originalTargetName) === originalTargetName) {
+            count++;
+          }
+        });
+      });
+      return count;
+    }
   }, {
     key: "activateSingleTarget",
     value: function activateSingleTarget(tmodel, targetName) {