targetj 1.0.145 → 1.0.147

package/Export.js

@@ -2,6 +2,7 @@ export * from "./build/App.js"
 export * from "./build/TModel.js"
 export * from "./build/Moves.js"
 export * from "./build/SearchUtil.js"
+export * from "./build/TargetData.js"
 export * from "./build/TargetUtil.js"
 export * from "./build/TModelUtil.js"
 export * from "./build/TUtil.js"

package/README.md

@@ -520,7 +520,8 @@ Below is a comparison between implementing animations in TargetJS versus using t
 ```bash
 import { App, TModel, getScreenHeight, getScreenWidth } from "targetj";
 
-App(new TModel('TargetJS vs Animation Api', { 
+App(new TModel('compare', {
+    domHolder: true,
     addAnimateChild() {
         this.addChild(new TModel('animation', {
             width: 150,
@@ -550,10 +551,11 @@ App(new TModel('TargetJS vs Animation Api', {
                     }];
 
                     return this.$dom.animate(keyframes, {
-                        duration: 4500, 
+                        duration: 4000, 
                         iterations: 1
                     });
-                }, enabledOn: function() {
+                },
+                enabledOn: function() {
                     return this.hasDom();
                 }
             }
@@ -562,38 +564,24 @@ App(new TModel('TargetJS vs Animation Api', {
     addDomChild() {
         this.addChild(new TModel('dom', {
             color: 'white',
-            html: 'TargetJS',
-            animate: {
-                cycles: 3,
-                value(cycle) {
-                    return [
-                        { x: 200, y: 0, rotate: 0, scale: 1, width: 80, height: 80, background: 'orange' },
-                        { x: 250, y: 100, rotate: 180, scale: 1.5, width: 120, height: 120, background: 'brown' },
-                        { x: 350, y: 0, rotate: 360, scale: 1, width: 100, height: 100, background: 'crimson' },
-                        { x: 200, y: 0, rotate: 360, scale: 1, width: 150, height: 150, background: 'purple' }
-                    ][cycle];
-                },
-                onValueChange(newValue) {
-                    const steps = this.getTargetCycle(this.key) === 0 ? 0 : 180;
-                    this.setTarget("move", newValue, steps);
-                }
-            }
+            html: 'TargetJ',
+            setup() {
+                this.setTarget({ x: 200, y: 0, rotate: 0, scale: 1, width: 80, height: 80, background: 'orange' });
+            },
+            step1$() {
+                this.setTarget({ x: 250, y: 100, rotate: 180, scale: 1.5, width: 120, height: 120, background: 'brown' }, 160);                
+            },
+            _step2$$() {
+                this.setTarget({ x: 350, y: 0, rotate: 360, scale: 1, width: 100, height: 100, background: 'crimson' }, 160);                
+            },            
+            _step3$$() {
+                this.setTarget({ x: 200, y: 0, rotate: 360, scale: 1, width: 150, height: 150, background: 'purple' }, 160);                
+            }                                                   
         }));
     },
-    restartOnBothComplete: {
-        loop: true,
-        interval: 50,
-        value() {
-            const animation = this.getChild(0).val('animate');            
-            if (animation.currentTime === animation.effect.getComputedTiming().duration 
-                    && this.getChild(1).isTargetComplete('animate')) {
-                this.getChild(0).activateTarget('animate');
-                this.getChild(1).activateTarget('animate');
-            }
-        },
-        enabledOn: function() {
-            return this.getChildren().length === 2 && this.getChild(0).val('animate');
-        }
+    _restartOnBothComplete$$() {
+        this.getChild(0).activateTarget('animate');
+        this.getChild(1).activateTarget('setup');
     },
     width() { return getScreenWidth(); },
     height() { return getScreenHeight(); }    

package/build/BaseModel.js

@@ -9,6 +9,7 @@ var _TargetExecutor = require("./TargetExecutor.js");
 var _TUtil = require("./TUtil.js");
 var _TModelUtil = require("./TModelUtil.js");
 var _TargetUtil = require("./TargetUtil.js");
+var _TargetData = require("./TargetData.js");
 var _$Dom = require("./$Dom.js");
 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 _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -98,34 +99,36 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
   }, {
     key: "processNewTarget",
     value: function processNewTarget(key, targetNames) {
-      if (!_TUtil.TUtil.isDefined(this.targets[key])) {
+      var target = this.targets[key];
+      if (!_TUtil.TUtil.isDefined(target)) {
         this.delVal('key');
         return;
       }
+      if (_typeof(target) !== 'object' || Array.isArray(target)) {
+        this.targets[key] = {
+          value: target
+        };
+        target = this.targets[key];
+      }
       _TargetUtil.TargetUtil.bindTarget(this, key, targetNames);
       var cleanKey = _TargetUtil.TargetUtil.getTargetName(key);
       var isInactiveKey = key.startsWith('_');
       if (cleanKey !== key) {
+        this.targets[cleanKey] = this.targets[key];
         if (isInactiveKey) {
-          this.targets[cleanKey] = _typeof(this.targets[key]) === 'object' && this.targets[key].value ? this.targets[key] : {
-            value: this.targets[key]
-          };
           this.targets[cleanKey].active = false;
-        } else {
-          this.targets[cleanKey] = this.targets[key];
         }
         delete this.targets[key];
         key = cleanKey;
       }
-      var target = this.targets[key];
-      if (_TargetUtil.TargetUtil.allEventMap[key] || _TargetUtil.TargetUtil.internalEventMap[key]) {
+      if (_TargetData.TargetData.allEventMap[key] || _TargetData.TargetData.internalEventMap[key]) {
         if (!this.eventTargetMap[key]) {
           this.eventTargetList.push(key);
           this.eventTargetMap[key] = true;
         }
         return;
       }
-      if (_TargetUtil.TargetUtil.bypassInitialProcessingTargetMap[key]) {
+      if (_TargetData.TargetData.bypassInitialProcessingTargetMap[key]) {
         return;
       }
       if (_TUtil.TUtil.isDefined(target.initialValue)) {
@@ -134,10 +137,10 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
       if (!isInactiveKey) {
         this.addToStyleTargetList(key);
       }
-      if (_TargetUtil.TargetUtil.coreTargetMap[key] && !this.coreTargets.includes(key)) {
+      if (_TargetData.TargetData.coreTargetMap[key] && !this.coreTargets.includes(key)) {
         this.coreTargets.push(key);
       }
-      if (!_TargetUtil.TargetUtil.mustExecuteTargets[key] && _TUtil.TUtil.isStringBooleanOrNumber(target)) {
+      if (!_TargetData.TargetData.mustExecuteTargets[key] && _TUtil.TUtil.isStringBooleanOrNumber(target)) {
         this.val(key, target);
         return;
       }
@@ -183,8 +186,8 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
       if (this.excludeStyling() || this.targets["exclude".concat(_TUtil.TUtil.capitalizeFirstLetter(key))]) {
         return;
       }
-      var isAsyncStyleTarget = _TargetUtil.TargetUtil.asyncStyleTargetMap[key];
-      var isAttributeTarget = _TargetUtil.TargetUtil.attributeTargetMap[key];
+      var isAsyncStyleTarget = _TargetData.TargetData.asyncStyleTargetMap[key];
+      var isAttributeTarget = _TargetData.TargetData.attributeTargetMap[key];
       if (isAsyncStyleTarget || isAttributeTarget) {
         if (!this.asyncStyleTargetMap[key]) {
           this.asyncStyleTargetList.push(key);
@@ -192,7 +195,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
         }
       } else if (this.isStyleTarget(key)) {
         var styleFlag = true;
-        if (_TargetUtil.TargetUtil.transformMap[key]) {
+        if (_TargetData.TargetData.transformMap[key]) {
           if (this.getParent()) {
             this.calcAbsolutePosition(this.getX(), this.getY());
           }
@@ -225,7 +228,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
   }, {
     key: "isStyleTarget",
     value: function isStyleTarget(key) {
-      return _TargetUtil.TargetUtil.styleTargetMap[key];
+      return _TargetData.TargetData.styleTargetMap[key];
     }
   }, {
     key: "useWindowFrame",
@@ -556,6 +559,9 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
       }
       var originalTargetName = _TargetUtil.TargetUtil.currentTargetName;
       var originalTModel = _TargetUtil.TargetUtil.currentTModel;
+      if (this.getParent() === originalTModel) {
+        _TargetUtil.TargetUtil.markTargetAction(originalTModel, 'childAction');
+      }
       _TargetExecutor.TargetExecutor.executeImperativeTarget(this, key, value, steps, interval, easing, originalTargetName, originalTModel);
       return this;
     }
@@ -652,7 +658,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
     value: function addToUpdatingChildren(child) {
       if (!this.updatingChildrenMap[child.oid]) {
         this.updatingChildrenMap[child.oid] = true;
-        this.updatingChildrenList.push(child.oid);
+        this.updatingChildrenList.push(child);
       }
     }
   }, {
@@ -660,7 +666,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
     value: function removeFromUpdatingChildren(child) {
       if (this.updatingChildrenMap[child.oid]) {
         delete this.updatingChildrenMap[child.oid];
-        var index = this.updatingChildrenList.indexOf(child.oid);
+        var index = this.updatingChildrenList.indexOf(child);
         if (index >= 0) {
           this.updatingChildrenList.splice(index, 1);
         }
@@ -676,7 +682,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
     value: function addToActiveChildren(child) {
       if (!this.activeChildrenMap[child.oid]) {
         this.activeChildrenMap[child.oid] = true;
-        this.activeChildrenList.push(child.oid);
+        this.activeChildrenList.push(child);
       }
     }
   }, {
@@ -684,7 +690,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
     value: function removeFromActiveChildren(child) {
       if (this.activeChildrenMap[child.oid]) {
         delete this.activeChildrenMap[child.oid];
-        var index = this.activeChildrenList.indexOf(child.oid);
+        var index = this.activeChildrenList.indexOf(child);
         if (index >= 0) {
           this.activeChildrenList.splice(index, 1);
         }

package/build/Bracket.js

@@ -138,7 +138,7 @@ var Bracket = exports.Bracket = /*#__PURE__*/function (_TModel) {
   }, {
     key: "validateVisibilityInParent",
     value: function validateVisibilityInParent() {
-      return this.getRealParent().validateVisibilityInParent();
+      return this.getChildren().length > 0 ? this.getChild(0).validateVisibilityInParent() : false;
     }
   }, {
     key: "getChildren",

package/build/EventListener.js

@@ -7,7 +7,7 @@ exports.EventListener = void 0;
 var _$Dom = require("./$Dom.js");
 var _SearchUtil = require("./SearchUtil.js");
 var _TUtil = require("./TUtil.js");
-var _TargetUtil = require("./TargetUtil.js");
+var _TargetData = require("./TargetData.js");
 var _App = require("./App.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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -322,7 +322,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
         return;
       }
       this.eventTargetMap[targetName] = true;
-      var events = _TargetUtil.TargetUtil.targetToEventsMapping[targetName];
+      var events = _TargetData.TargetData.targetToEventsMapping[targetName];
       events.forEach(function (event) {
         if (targetName === 'onTouchStart') {
           _this3.ignoreStartEvents = false;

package/build/LoadingManager.js

@@ -31,7 +31,7 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
   return _createClass(LoadingManager, [{
     key: "fetchCommon",
     value: function fetchCommon(fetchId, cacheId, tmodel, fetchMap, fetchFn) {
-      this.addToTModelKeyMap(tmodel, tmodel.key, fetchId, cacheId);
+      _TargetUtil.TargetUtil.markTargetAction(tmodel, 'fetchAction');
       if (!cacheId || !this.isFetched(cacheId)) {
         if (!fetchMap[fetchId]) {
           fetchMap[fetchId] = {
@@ -52,80 +52,76 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
             targetName: tmodel.key
           });
         }
+      } else if (!fetchMap[fetchId]) {
+        fetchMap[fetchId] = {
+          fetchId: fetchId,
+          cacheId: cacheId,
+          fetchingFlag: true,
+          startTime: _TUtil.TUtil.now(),
+          targets: [{
+            tmodel: tmodel,
+            targetName: tmodel.key
+          }],
+          fetchMap: fetchMap
+        };
       }
+      this.addToTModelKeyMap(tmodel, tmodel.key, fetchId, cacheId);
       return fetchId;
     }
+  }, {
+    key: "fetch",
+    value: function fetch(tmodel, url, query, cacheId) {
+      var _this = this;
+      var fetchId = "".concat(tmodel.oid, "_").concat(url, "_").concat(JSON.stringify(query));
+      this.fetchCommon(fetchId, cacheId, tmodel, this.fetchingAPIMap, function () {
+        _this.ajaxAPI(url, query, _this.fetchingAPIMap[fetchId]);
+      });
+    }
+  }, {
+    key: "fetchImage",
+    value: function fetchImage(tmodel, src, cacheId) {
+      var _this2 = this;
+      var fetchId = "".concat(tmodel.oid, "_").concat(src);
+      return this.fetchCommon(fetchId, cacheId, tmodel, this.fetchingImageMap, function () {
+        _this2.loadImage(src, _this2.fetchingImageMap[fetchId]);
+      });
+    }
   }, {
     key: "getTModelKey",
     value: function getTModelKey(tmodel, targetName) {
       return "".concat(tmodel.oid, " ").concat(targetName);
     }
+  }, {
+    key: "getLoadTargetName",
+    value: function getLoadTargetName(targetName) {
+      return "load-".concat(targetName);
+    }
   }, {
     key: "addToTModelKeyMap",
     value: function addToTModelKeyMap(tmodel, targetName, fetchId, cacheId) {
       var key = this.getTModelKey(tmodel, targetName);
+      var loadTargetName = this.getLoadTargetName(targetName);
       if (!this.tmodelKeyMap[key]) {
         this.tmodelKeyMap[key] = {
           fetchMap: {},
           entryCount: 0,
           resultCount: 0,
-          errorCount: 0
+          errorCount: 0,
+          activeIndex: 0,
+          accessIndex: 0
         };
+        tmodel.val(loadTargetName, []);
       }
       if (!this.tmodelKeyMap[key].fetchMap[fetchId]) {
         this.tmodelKeyMap[key].fetchMap[fetchId] = {
           fetchId: fetchId,
-          order: this.tmodelKeyMap[key].entryCount,
-          cachedValue: cacheId && this.isFetched(cacheId) ? this.cacheMap[cacheId] : undefined
+          order: this.tmodelKeyMap[key].entryCount
         };
         this.tmodelKeyMap[key].entryCount++;
+        tmodel.val(loadTargetName).push(undefined);
       }
-    }
-  }, {
-    key: "initializeLoaderTargetValue",
-    value: function initializeLoaderTargetValue(tmodel, targetName) {
-      var _this = this;
-      var key = this.getTModelKey(tmodel, targetName);
-      var tmodelEntry = this.tmodelKeyMap[key];
-      if (!tmodelEntry) {
-        return;
-      }
-      tmodelEntry.resultCount = 0;
-      if (tmodelEntry.entryCount > 1) {
-        var fetchEntries = Object.values(tmodelEntry.fetchMap);
-        var targetValue = Array.from({
-          length: tmodelEntry.entryCount
-        }, function (_, i) {
-          var fetchEntry = fetchEntries.find(function (entry) {
-            return entry.order === i;
-          });
-          if ((fetchEntry === null || fetchEntry === void 0 ? void 0 : fetchEntry.cachedValue) !== undefined) {
-            tmodelEntry.resultCount++;
-            _this.callOnSuccessHandler(tmodel, targetName, _objectSpread(_objectSpread({}, fetchEntry.cachedValue), {}, {
-              fetchingPeriod: 0,
-              order: i
-            }));
-            return fetchEntry.cachedValue.result;
-          }
-          return undefined;
-        });
-        tmodel.val(targetName, targetValue);
-      } else {
-        var singleEntry = Object.values(tmodelEntry.fetchMap)[0];
-        if ((singleEntry === null || singleEntry === void 0 ? void 0 : singleEntry.cachedValue) !== undefined) {
-          tmodel.val(targetName, singleEntry.cachedValue.result);
-          this.callOnSuccessHandler(tmodel, targetName, _objectSpread(_objectSpread({}, singleEntry.cachedValue), {}, {
-            fetchingPeriod: 0,
-            order: 0
-          }));
-          tmodelEntry.resultCount = 1;
-        } else {
-          tmodel.val(targetName, undefined);
-        }
-      }
-      if (tmodelEntry.resultCount === tmodelEntry.entryCount) {
-        this.removeFromTModelKeyMap(tmodel, targetName);
-        _TargetUtil.TargetUtil.shouldActivateNextTarget(tmodel, targetName);
+      if (cacheId && this.isFetched(cacheId)) {
+        this.handleSuccess(this.fetchingAPIMap[fetchId], this.cacheMap[cacheId].result);
       }
     }
   }, {
@@ -135,28 +131,68 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
       delete this.tmodelKeyMap[key];
     }
   }, {
-    key: "isInTModelKeyMap",
-    value: function isInTModelKeyMap(tmodel, targetName) {
+    key: "isLoading",
+    value: function isLoading(tmodel, targetName) {
       var key = this.getTModelKey(tmodel, targetName);
       return this.tmodelKeyMap[key];
     }
   }, {
-    key: "fetch",
-    value: function fetch(tmodel, url, query, cacheId) {
-      var _this2 = this;
-      var fetchId = "".concat(tmodel.oid, "_").concat(url, "_").concat(JSON.stringify(query));
-      return this.fetchCommon(fetchId, cacheId, tmodel, this.fetchingAPIMap, function () {
-        _this2.ajaxAPI(url, query, _this2.fetchingAPIMap[fetchId]);
-      });
+    key: "isLoadingSuccessful",
+    value: function isLoadingSuccessful(tmodel, targetName) {
+      var key = this.getTModelKey(tmodel, targetName);
+      return this.tmodelKeyMap[key] && this.tmodelKeyMap[key].resultCount === this.tmodelKeyMap[key].entryCount && this.tmodelKeyMap[key].errorCount === 0;
     }
   }, {
-    key: "fetchImage",
-    value: function fetchImage(tmodel, src, cacheId) {
-      var _this3 = this;
-      var fetchId = "".concat(tmodel.oid, "_").concat(src);
-      return this.fetchCommon(fetchId, cacheId, tmodel, this.fetchingImageMap, function () {
-        _this3.loadImage(src, _this3.fetchingImageMap[fetchId]);
-      });
+    key: "resetLoadingError",
+    value: function resetLoadingError(tmodel, targetName) {
+      var key = this.getTModelKey(tmodel, targetName);
+      var modelEntry = this.tmodelKeyMap[key];
+      if (modelEntry) {
+        modelEntry.errorCount = 0;
+      }
+    }
+  }, {
+    key: "nextActiveItem",
+    value: function nextActiveItem(tmodel, targetName) {
+      var key = this.getTModelKey(tmodel, targetName);
+      var modelEntry = this.tmodelKeyMap[key];
+      if (!modelEntry) {
+        return false;
+      }
+      return modelEntry.activeIndex++;
+    }
+  }, {
+    key: "isNextLoadingItemSuccessful",
+    value: function isNextLoadingItemSuccessful(tmodel, targetName) {
+      var key = this.getTModelKey(tmodel, targetName);
+      var modelEntry = this.tmodelKeyMap[key];
+      if (!modelEntry) {
+        return false;
+      }
+      var loadTargetName = this.getLoadTargetName(targetName);
+      var targetValue = tmodel.val(loadTargetName);
+      return modelEntry.errorCount === 0 && Array.isArray(targetValue) && _TUtil.TUtil.isDefined(targetValue[modelEntry.activeIndex]);
+    }
+  }, {
+    key: "getLoadingItemValue",
+    value: function getLoadingItemValue(tmodel, targetName) {
+      var target = tmodel.targets[targetName];
+      var key = this.getTModelKey(tmodel, targetName);
+      var modelEntry = this.tmodelKeyMap[key];
+      if (!modelEntry || !target) {
+        return undefined;
+      }
+      var loadTargetName = this.getLoadTargetName(targetName);
+      var targetValue = tmodel.val(loadTargetName);
+      var result;
+      if (target.fetchAction === 'onEnd') {
+        result = targetValue.slice(modelEntry.accessIndex);
+        modelEntry.accessIndex += result.length;
+      } else {
+        result = targetValue[modelEntry.accessIndex];
+        modelEntry.accessIndex++;
+      }
+      return result;
     }
   }, {
     key: "isFetching",
@@ -183,7 +219,7 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
   }, {
     key: "handleSuccess",
     value: function handleSuccess(fetchStatus, result) {
-      var _this4 = this;
+      var _this3 = this;
       var fetchTime = _TUtil.TUtil.now();
       var fetchId = fetchStatus.fetchId,
         cacheId = fetchStatus.cacheId,
@@ -198,31 +234,21 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
       targets.forEach(function (_ref) {
         var tmodel = _ref.tmodel,
           targetName = _ref.targetName;
-        var key = _this4.getTModelKey(tmodel, targetName);
-        var tmodelEntry = _this4.tmodelKeyMap[key];
+        var key = _this3.getTModelKey(tmodel, targetName);
+        var tmodelEntry = _this3.tmodelKeyMap[key];
+        var loadTargetName = _this3.getLoadTargetName(targetName);
         if (!tmodelEntry) {
           return;
         }
         var fetchEntry = tmodelEntry.fetchMap[fetchId];
-        _this4.callOnSuccessHandler(tmodel, targetName, _objectSpread(_objectSpread({}, res), {}, {
+        _this3.callOnSuccessHandler(tmodel, targetName, _objectSpread(_objectSpread({}, res), {}, {
           order: fetchEntry.order
         }));
-        if (tmodelEntry.entryCount > 1) {
-          var targetResults = tmodel.val(targetName);
-          var _fetchEntry = tmodelEntry.fetchMap[fetchId];
-          targetResults[_fetchEntry.order] = res.result;
-          tmodelEntry.resultCount++;
-          if (tmodelEntry.resultCount === tmodelEntry.entryCount) {
-            _this4.removeFromTModelKeyMap(tmodel, targetName);
-            if (tmodelEntry.errorCount === 0) {
-              _TargetUtil.TargetUtil.shouldActivateNextTarget(tmodel, targetName);
-            } else {
-              _this4.callOnErrorHandler(tmodel, targetName);
-            }
-          }
-        } else {
-          tmodel.val(targetName, res.result);
-          _this4.removeFromTModelKeyMap(tmodel, targetName);
+        var targetResults = tmodel.val(loadTargetName);
+        targetResults[fetchEntry.order] = res.result;
+        tmodel.val(targetName, targetResults.length === 1 ? targetResults[0] : targetResults);
+        tmodelEntry.resultCount++;
+        if (tmodelEntry.errorCount === 0) {
           _TargetUtil.TargetUtil.shouldActivateNextTarget(tmodel, targetName);
         }
       });
@@ -235,7 +261,7 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
   }, {
     key: "handleError",
     value: function handleError(fetchStatus, error) {
-      var _this5 = this;
+      var _this4 = this;
       var fetchTime = _TUtil.TUtil.now();
       var fetchId = fetchStatus.fetchId,
         cacheId = fetchStatus.cacheId,
@@ -246,7 +272,7 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
         var tmodel = _ref2.tmodel,
           targetName = _ref2.targetName;
         var key = "".concat(tmodel.oid, " ").concat(targetName);
-        var tmodelEntry = _this5.tmodelKeyMap[key];
+        var tmodelEntry = _this4.tmodelKeyMap[key];
         if (!tmodelEntry) {
           return;
         }
@@ -257,19 +283,11 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
           order: fetchEntry.order,
           error: error
         };
-        if (tmodelEntry.entryCount > 1) {
-          var targetValue = tmodel.val(targetName);
-          targetValue[fetchEntry.order] = res;
-          tmodelEntry.resultCount++;
-          tmodelEntry.errorCount++;
-          if (tmodelEntry.resultCount === tmodelEntry.entryCount) {
-            _this5.removeFromTModelKeyMap(tmodel, targetName);
-            _this5.callOnErrorHandler(tmodel, targetName);
-          }
-        } else {
-          tmodel.val(targetName, res);
-          _this5.removeFromTModelKeyMap(tmodel, targetName);
-        }
+        var targetValue = tmodel.val(targetName);
+        targetValue[fetchEntry.order] = res;
+        tmodelEntry.resultCount++;
+        tmodelEntry.errorCount++;
+        _this4.callOnErrorHandler(tmodel, targetName);
       });
       delete fetchMap[fetchId];
       if (cacheId) {
@@ -314,15 +332,15 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
   }, {
     key: "ajaxAPI",
     value: function ajaxAPI(url, query, fetchStatus) {
-      var _this6 = this;
+      var _this5 = this;
       var defaultQuery = {
         dataType: "json",
         type: "GET",
         success: function success(dataList) {
-          return _this6.handleSuccess(fetchStatus, dataList);
+          return _this5.handleSuccess(fetchStatus, dataList);
         },
         error: function error(textStatus) {
-          return _this6.handleError(fetchStatus, textStatus);
+          return _this5.handleError(fetchStatus, textStatus);
         }
       };
       _$Dom.$Dom.ajax(_objectSpread(_objectSpread({}, defaultQuery), {}, {
@@ -334,7 +352,7 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
   }, {
     key: "loadImage",
     value: function loadImage(src, fetchStatus) {
-      var _this7 = this;
+      var _this6 = this;
       var image = new Image();
       image.src = src;
       image.onload = function () {
@@ -343,10 +361,10 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
           height: image.height,
           src: image.src
         };
-        _this7.handleSuccess(fetchStatus, result);
+        _this6.handleSuccess(fetchStatus, result);
       };
       image.onerror = function () {
-        _this7.handleError(fetchStatus, "not found");
+        _this6.handleError(fetchStatus, "not found");
       };
     }
   }]);

package/build/LocationManager.js

@@ -7,6 +7,7 @@ exports.LocationManager = void 0;
 var _BracketGenerator = require("./BracketGenerator.js");
 var _TUtil = require("./TUtil.js");
 var _TargetUtil = require("./TargetUtil.js");
+var _TargetData = require("./TargetData.js");
 var _TModelUtil = require("./TModelUtil.js");
 var _TargetExecutor = require("./TargetExecutor.js");
 var _App = require("./App.js");
@@ -73,7 +74,6 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
   }, {
     key: "calculate",
     value: function calculate() {
-      this.addToLocationList(_App.tApp.tRoot);
       this.calculateContainer(_App.tApp.tRoot);
     }
   }, {
@@ -160,7 +160,7 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
           }
           child.getCoreTargets().forEach(function (target) {
             if (child.isTargetEnabled(target) && !child.isTargetUpdating(target) && !child.isTargetImperative(target)) {
-              _TargetExecutor.TargetExecutor.executeDeclarativeTarget(child, target);
+              _TargetExecutor.TargetExecutor.executeDeclarativeTarget(child, target, child.getTargetCycle(target));
             }
             ;
           });
@@ -254,7 +254,7 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
         if (eventMap[targetName] && eventMap[targetName](tmodel)) {
           eventTargets.push(targetName);
         }
-        if (attachEvents && _TargetUtil.TargetUtil.targetToEventsMapping[targetName]) {
+        if (attachEvents && _TargetData.TargetData.targetToEventsMapping[targetName]) {
           (0, _App.getEvents)().attachTargetEvents(targetName);
         }
       });
@@ -263,12 +263,12 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
   }, {
     key: "checkInternalEventTargets",
     value: function checkInternalEventTargets(tmodel) {
-      this.checkEventTargetsByType(tmodel, _TargetUtil.TargetUtil.internalEventMap);
+      this.checkEventTargetsByType(tmodel, _TargetData.TargetData.internalEventMap);
     }
   }, {
     key: "checkEventTargets",
     value: function checkEventTargets(tmodel) {
-      this.checkEventTargetsByType(tmodel, _TargetUtil.TargetUtil.allEventMap, true);
+      this.checkEventTargetsByType(tmodel, _TargetData.TargetData.allEventMap, true);
     }
   }, {
     key: "runEventTargets",