targetj 1.0.143 → 1.0.145

package/README.md

@@ -146,11 +146,13 @@ App(new TModel('quickExample', {
 
 ### Loading API Example
 
-In this example, we will load two separate users, and once both APIs return a result, we will display their names and flash the background. All targets without a prefix `'_'` will be executed in the order they appear in the code. Targets with the prefix `'_'` are inactive and must be activated externally. Target names with the suffix `'$'` indicate that they will be activated when the previous target is executed. This allows these targets to form a functional execution pipeline.
+In this example, we load two separate users, and once both API calls return results, we display their names and briefly flash the background. 
 
-The `'html'` target initializes the text content of the `'div'` to `'loading'`. The `div` is the default element if no `baseElement` target is specified. Then, the `loadUser1` and `loadUser2` targets are executed. If the API call for `loadUser2` returns a result before `loadUser1`, `loadUser2` will be executed again. However, it will fetch the result from the loader cache because we specified the fourth argument in the `fetch()` function. This means another API call will not be made, but it will still activate the `displayName` target again, ensuring that both users' names are displayed without any race conditions.
+All targets without a prefix `_` execute in the order they appear in the code. Targets prefixed with `_` are inactive by default and must be activated externally. Target names ending with `$` indicate that they will activate when the previous target completes, allowing them to form a functional execution pipeline.
 
-The execution pipeline will then continue, expanding the width and height while morphing the background from yellow to purple over 15 steps, with 15-millisecond pauses between them..
+The `html` target initializes the text content of the `div` to `"loading"`. If no `baseElement` target is specified, the `div` is the default element. Then, the `loadUsers` target executes. Once both API results are retrieved, the `displayName` target runs, accessing the results in an array ordered by the sequence in which the APIs were called.
+
+The execution pipeline then continues, gradually expanding the width and height while transitioning the background color from yellow to purple over 15 steps, with 15-millisecond pauses between each step.
 
 ![first example](https://targetjs.io/img/loadingExample6.gif)
 
@@ -159,19 +161,13 @@ import { App, TModel, getLoader } from "targetj";
 
 App(new TModel('apiCall', {
     html: 'Loading...',
-    loadUser1() {
-        getLoader().fetch(this, 'https://targetjs.io/api/randomUser', { id: 'user0' });
+    loadUsers() {
+      getLoader().fetch(this, "https://targetjs.io/api/randomUser", { id: "user0" });
+      getLoader().fetch(this, "https://targetjs.io/api/randomUser", { id: "user1" });      
     },
-    loadUser2$() {
-        getLoader().fetch(this, 'https://targetjs.io/api/randomUser', { id: 'user1' }, 'user1');
-    },    
-    _displayName$: {
-        value() {
-            this.setTarget('html', `${this.val('loadUser1').name} ${this.val('loadUser2').name}`);
-        },
-        enabledOn() {
-            return this.val('loadUser1') && this.val('loadUser2');
-        }
+    _displayName$() {
+        const [ user0, user1 ] = this.prevTargetValue;
+        this.setTarget("html", `${user0.name} ${user1.name}`);
     },
     _width$: 200,
     _height$: 200,
@@ -361,10 +357,16 @@ This method is invoked only after the final step of updating the actual value is
 13. **initialValue**
 This is only property. It defines the initial value of the actual value.
 
-14. Postfix **$** to the target name  
-Targets with a `$` postfix in their names indicate that they will be activated when the preceding target is executed or updated.
+14. **activateNextTarget**  
+    This is a string property that specifies the target to be activated when this target executes. If the name ends with `$`, the target will only activate after the current target and all of its imperative targets have completed.
 
-15. **this.prevTargetValue** and **this.isPrevTargetUpdated()**  
+15. **Postfix `$` to the target name**  
+    A target name ending with `$` indicates that it will be activated when the preceding target is executed or updated. It works similarly to `activateNextTarget`, but it only applies to the target that appears next to it.
+    
+16. **Postfix `$$` to the target name**  
+    A target name ending with `$$` indicates that it will be activated only after the preceding target and all of its imperative targets have completed. It works similarly to `activateNextTarget` when it ends with `$`, but it applies only to the target immediately following it.
+    
+17. **this.prevTargetValue** and **this.isPrevTargetUpdated()**  
 `this.prevTargetValue` holds the value of the previous target, while `this.isPrevTargetUpdated()` returns `true` if the previous target has been updated. This method is useful when a target is activated externally, such as by a user event, rather than by the preceding target.  
 
 ---

package/build/BaseModel.js

@@ -545,18 +545,18 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
     }
   }, {
     key: "setTarget",
-    value: function setTarget(key, value, steps, interval, easing, originalTargetName) {
+    value: function setTarget(key, value, steps, interval, easing) {
       if (_typeof(key) === 'object' && key !== null) {
         var _ref3 = [key, value, steps, interval, easing];
         value = _ref3[0];
         steps = _ref3[1];
         interval = _ref3[2];
         easing = _ref3[3];
-        originalTargetName = _ref3[4];
         key = '';
       }
-      originalTargetName = originalTargetName || this.key;
-      _TargetExecutor.TargetExecutor.executeImperativeTarget(this, key, value, steps, interval, easing, originalTargetName);
+      var originalTargetName = _TargetUtil.TargetUtil.currentTargetName;
+      var originalTModel = _TargetUtil.TargetUtil.currentTModel;
+      _TargetExecutor.TargetExecutor.executeImperativeTarget(this, key, value, steps, interval, easing, originalTargetName, originalTModel);
       return this;
     }
   }, {

package/build/EventListener.js

@@ -609,8 +609,8 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
   }, {
     key: "resizeRoot",
     value: function resizeRoot() {
-      (0, _App.tRoot)().val('width', (0, _App.tRoot)().targets.width());
-      (0, _App.tRoot)().val('height', (0, _App.tRoot)().targets.height());
+      (0, _App.tRoot)().val('width', (0, _App.tRoot)().targets.width.value());
+      (0, _App.tRoot)().val('height', (0, _App.tRoot)().targets.height.value());
       (0, _App.tRoot)().setActualValueLastUpdate('width');
       (0, _App.tRoot)().setActualValueLastUpdate('height');
     }

package/build/LocationManager.js

@@ -279,18 +279,16 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
       var originalTarget = (0, _App.getEvents)().getEventTarget();
       eventTargets.forEach(function (targetName) {
         var target = tmodel.targets[targetName];
-        if (typeof target === 'function') {
-          target.call(tmodel, originalTarget);
-        } else if (Array.isArray(target)) {
-          target.forEach(function (t) {
-            return _TargetUtil.TargetUtil.activateSingleTarget(tmodel, t);
-          });
-        } else if (_typeof(target) === 'object') {
-          if (tmodel.isTargetEnabled(targetName) && typeof target.value === 'function') {
+        if (tmodel.isTargetEnabled(targetName)) {
+          if (typeof target.value === 'function') {
             target.value.call(tmodel, originalTarget);
+          } else if (Array.isArray(target.value)) {
+            target.value.forEach(function (t) {
+              return _TargetUtil.TargetUtil.activateSingleTarget(tmodel, t);
+            });
+          } else {
+            _TargetUtil.TargetUtil.activateSingleTarget(tmodel, target.value);
           }
-        } else {
-          _TargetUtil.TargetUtil.activateSingleTarget(tmodel, target);
         }
       });
     }

package/build/TModel.js

@@ -116,6 +116,13 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
         index: index,
         child: child
       });
+      child.parent = this;
+      if (child.updatingTargetList.length > 0) {
+        this.addToUpdatingChildren(child);
+      }
+      if (child.activeTargetList.length > 0) {
+        this.addToActiveChildren(child);
+      }
       child.activate();
       return this;
     }
@@ -166,7 +173,6 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
           if (_this2.allChildrenMap[child.oid]) {
             return;
           }
-          child.parent = _this2;
           if (!_TUtil.TUtil.isDefined(child.val('canDeleteDom')) && _this2.val('canDeleteDom') === false) {
             child.val('canDeleteDom', false);
           }

package/build/TargetExecutor.js

@@ -37,21 +37,37 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
     }
   }, {
     key: "executeImperativeTarget",
-    value: function executeImperativeTarget(tmodel, key, value, steps, interval, easing, originalTargetName) {
+    value: function executeImperativeTarget(tmodel, key, value, steps, interval, easing, originalTargetName, originalTModel) {
       tmodel.targetValues[key] = tmodel.targetValues[key] || _TargetUtil.TargetUtil.emptyValue();
       var targetValue = tmodel.targetValues[key];
       targetValue.isImperative = true;
       targetValue.originalTargetName = originalTargetName;
+      targetValue.originalTModel = originalTModel;
       if (_TargetUtil.TargetUtil.isListTarget(value)) {
         TargetExecutor.assignListTarget(targetValue, value.list, value.list[0], steps, interval, easing);
       } else if (_TargetUtil.TargetUtil.isObjectTarget(key, value)) {
         var completeValue = _TargetUtil.TargetUtil.cssFunctionMap[key] ? _objectSpread(_objectSpread({}, _TargetUtil.TargetUtil.cssFunctionMap[key]), value) : value;
         Object.keys(completeValue).forEach(function (objectKey) {
-          TargetExecutor.executeImperativeTarget(tmodel, objectKey, completeValue[objectKey], steps, interval, easing, originalTargetName);
+          var newValue = completeValue[objectKey];
+          if (_typeof(newValue) === 'object' && !_TargetUtil.TargetUtil.isListTarget(newValue)) {
+            var valueArray = _TargetUtil.TargetUtil.getValueStepsCycles(tmodel, completeValue[objectKey], key);
+            newValue = valueArray[0];
+            steps = _TUtil.TUtil.isDefined(valueArray[1]) ? valueArray[1] : steps;
+            interval = _TUtil.TUtil.isDefined(valueArray[2]) ? valueArray[2] : interval;
+          }
+          TargetExecutor.executeImperativeTarget(tmodel, objectKey, newValue, steps, interval, easing, originalTargetName, originalTModel);
         });
       } else {
-        TargetExecutor.assignSingleTarget(targetValue, value, undefined, steps, 0, interval, easing);
-        targetValue.step = 0;
+        if (_typeof(value) === 'object' && !_TargetUtil.TargetUtil.isListTarget(value)) {
+          var valueArray = _TargetUtil.TargetUtil.getValueStepsCycles(tmodel, value, key);
+          value = valueArray[0];
+          steps = _TUtil.TUtil.isDefined(valueArray[1]) ? valueArray[1] : steps;
+          interval = _TUtil.TUtil.isDefined(valueArray[2]) ? valueArray[2] : interval;
+          TargetExecutor.executeImperativeTarget(tmodel, key, value, steps, interval, easing, originalTargetName, originalTModel);
+        } else {
+          TargetExecutor.assignSingleTarget(targetValue, value, undefined, steps, 0, interval, easing);
+          targetValue.step = 0;
+        }
       }
       TargetExecutor.updateTarget(tmodel, targetValue, key);
     }
@@ -121,7 +137,7 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
     key: "resolveTargetValue",
     value: function resolveTargetValue(tmodel, key) {
       var targetInitial = !tmodel.targetValues[key] && _TUtil.TUtil.isDefined(tmodel.targets[key].initialValue) ? tmodel.targets[key].initialValue : undefined;
-      var valueArray = _TargetUtil.TargetUtil.getValueStepsCycles(tmodel, key);
+      var valueArray = _TargetUtil.TargetUtil.getValueStepsCycles(tmodel, tmodel.targets[key], key);
       var newValue = valueArray[0];
       var newSteps = valueArray[1] || 0;
       var newInterval = valueArray[2] || 0;

package/build/TargetManager.js

@@ -235,7 +235,6 @@ var TargetManager = exports.TargetManager = /*#__PURE__*/function () {
             originalTarget.onImperativeEnd.call(originalTModel, key, originalTModel.val(key));
             originalTModel.setTargetMethodName(originalTargetName, 'onImperativeEnd');
           }
-          _TargetUtil.TargetUtil.shouldActivateNextTargetOnEnd(tmodel, originalTargetName);
         } else {
           if (!targetValue.valueList && tmodel.getTargetCycle(key) < tmodel.getTargetCycles(key)) {
             tmodel.incrementTargetCycle(key, tmodel.getTargetCycle(key));
@@ -249,6 +248,7 @@ var TargetManager = exports.TargetManager = /*#__PURE__*/function () {
         }
       }
       tmodel.updateTargetStatus(key);
+      _TargetUtil.TargetUtil.shouldActivateNextTarget(tmodel, key, true);
       (0, _App.getRunScheduler)().schedule(scheduleTime, "".concat(tmodel.oid, "---").concat(key, "-").concat(step, "/").concat(steps, "-").concat(cycle, "-").concat(interval));
     }
   }]);

package/build/TargetUtil.js

@@ -107,72 +107,66 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         return currentPrevUpdateTime !== lastPrevUpdateTime;
       };
       var doesNextTargetUsePrevValue = nextKey && nextKey.endsWith('$') ? true : false;
+      if (_typeof(target) !== 'object' || Array.isArray(target)) {
+        tmodel.targets[key] = {
+          value: target
+        };
+        target = tmodel.targets[key];
+        target.parentTargetName = TargetUtil.currentTargetName;
+        target.parentTModel = TargetUtil.currentTModel;
+      }
       if (doesNextTargetUsePrevValue) {
-        if (_typeof(target) === 'object' && !Array.isArray(target)) {
-          target.activateNextTarget = nextKey.slice(0, -1);
-        } else {
-          tmodel.targets[key] = {
-            value: target,
-            activateNextTarget: nextKey.slice(0, -1)
+        target.activateNextTarget = nextKey.slice(0, -1);
+      }
+      var stepPattern = /^on[A-Za-z]+Step$/;
+      var endPattern = /^on[A-Za-z]+End$/;
+      var methods = ['value', 'enabledOn', 'onStepsEnd', 'onValueChange', 'loop', 'onImperativeEnd', 'onImperativeStep', 'onSuccess', 'onError'];
+      Object.keys(target).forEach(function (method) {
+        if (typeof target[method] === 'function' && (methods.includes(method) || stepPattern.test(method) || endPattern.test(method))) {
+          var originalMethod = target[method];
+          target[method] = function () {
+            var _getPrevUpdateTime;
+            TargetUtil.currentTargetName = TargetUtil.getTargetName(key);
+            TargetUtil.currentTModel = tmodel;
+            this.key = TargetUtil.getTargetName(key);
+            this.prevTargetValue = getPrevValue();
+            this.isPrevTargetUpdated = isPrevTargetUpdated;
+            var result = originalMethod.apply(this, arguments);
+            lastPrevUpdateTime = (_getPrevUpdateTime = getPrevUpdateTime()) !== null && _getPrevUpdateTime !== void 0 ? _getPrevUpdateTime : lastPrevUpdateTime;
+            return result;
           };
-          target = tmodel.targets[key];
         }
-      }
-      if (_typeof(target) === 'object') {
-        var stepPattern = /^on[A-Za-z]+Step$/;
-        var endPattern = /^on[A-Za-z]+End$/;
-        var methods = ['value', 'enabledOn', 'onStepsEnd', 'onValueChange', 'loop', 'onImperativeEnd', 'onImperativeStep', 'onSuccess', 'onError'];
-        Object.keys(target).forEach(function (method) {
-          if (typeof target[method] === 'function' && (methods.includes(method) || stepPattern.test(method) || endPattern.test(method))) {
-            var originalMethod = target[method];
-            target[method] = function () {
-              var _getPrevUpdateTime;
-              this.key = TargetUtil.getTargetName(key);
-              this.prevTargetValue = getPrevValue();
-              this.isPrevTargetUpdated = isPrevTargetUpdated;
-              var result = originalMethod.apply(this, arguments);
-              lastPrevUpdateTime = (_getPrevUpdateTime = getPrevUpdateTime()) !== null && _getPrevUpdateTime !== void 0 ? _getPrevUpdateTime : lastPrevUpdateTime;
-              return result;
-            };
-          }
-        });
-      } else if (typeof target === 'function') {
-        var originalFunction = target;
-        tmodel.targets[key] = function () {
-          var _getPrevUpdateTime2;
-          this.key = TargetUtil.getTargetName(key);
-          this.prevTargetValue = getPrevValue();
-          this.isPrevTargetUpdated = isPrevTargetUpdated;
-          var result = originalFunction.apply(this, arguments);
-          lastPrevUpdateTime = (_getPrevUpdateTime2 = getPrevUpdateTime()) !== null && _getPrevUpdateTime2 !== void 0 ? _getPrevUpdateTime2 : lastPrevUpdateTime;
-          return result;
-        };
-      }
+      });
     }
   }, {
     key: "shouldActivateNextTarget",
     value: function shouldActivateNextTarget(tmodel, key) {
-      var _tmodel$targets$key;
-      var target = (_tmodel$targets$key = tmodel.targets[key]) === null || _tmodel$targets$key === void 0 ? void 0 : _tmodel$targets$key.activateNextTarget;
-      if (!target) {
-        return;
+      var isEndTrigger = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      var level = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+      var isImperative = tmodel.isTargetImperative(key);
+      var target = tmodel.targets[key];
+      if (target) {
+        var targetName = target.activateNextTarget;
+        if (targetName && !isImperative) {
+          isEndTrigger = isEndTrigger || targetName.endsWith('$');
+          if (isEndTrigger) {
+            if ((tmodel.isTargetComplete(key) || tmodel.isTargetDone(key)) && !tmodel.hasUpdatingTargets(key) && !tmodel.hasUpdatingChildren() && !tmodel.hasActiveChildren()) {
+              TargetUtil.activateNextTargetIfEligible(tmodel, key, targetName);
+            }
+          } else {
+            TargetUtil.activateNextTargetIfEligible(tmodel, key, targetName);
+          }
+          return;
+        }
       }
-      var isEndTrigger = target.endsWith('$');
       if (isEndTrigger) {
-        TargetUtil.shouldActivateNextTargetOnEnd(tmodel, key);
-      } else {
-        TargetUtil.activateNextTargetIfEligible(tmodel, key, target);
-      }
-    }
-  }, {
-    key: "shouldActivateNextTargetOnEnd",
-    value: function shouldActivateNextTargetOnEnd(tmodel, key) {
-      var _tmodel$targets$key2;
-      var target = (_tmodel$targets$key2 = tmodel.targets[key]) === null || _tmodel$targets$key2 === void 0 ? void 0 : _tmodel$targets$key2.activateNextTarget;
-      if (target && target.endsWith('$') && tmodel.isTargetComplete(key) && !tmodel.hasUpdatingTargets(key)) {
-        TargetUtil.activateNextTargetIfEligible(tmodel, key, target);
+        var targetValue = tmodel.targetValues[key];
+        if (isImperative && targetValue.originalTargetName && targetValue.originalTModel) {
+          TargetUtil.shouldActivateNextTarget(targetValue.originalTModel, targetValue.originalTargetName, true, level + 1);
+        } else if (!isImperative && target && target.parentTargetName && target.parentTModel) {
+          TargetUtil.shouldActivateNextTarget(target.parentTModel, target.parentTargetName, true, level + 1);
+        }
       }
-      ;
     }
   }, {
     key: "activateNextTargetIfEligible",
@@ -204,13 +198,12 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       if (arr.length > 4 || arr.length === 0) {
         return false;
       }
-      var result = arr.length >= 2;
       for (var i = 1; i < arr.length; i++) {
         if (typeof arr[i] !== 'number') {
           return false;
         }
       }
-      return result && (typeof arr[0] === 'number' || TargetUtil.isListTarget(arr[0]) || typeof arr[0] === 'string');
+      return arr.length >= 2 && (typeof arr[0] === 'number' || TargetUtil.isListTarget(arr[0]) || typeof arr[0] === 'string');
     }
   }, {
     key: "isListTarget",
@@ -229,8 +222,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
     }
   }, {
     key: "getValueStepsCycles",
-    value: function getValueStepsCycles(tmodel, key) {
-      var _target = tmodel.targets[key];
+    value: function getValueStepsCycles(tmodel, _target, key) {
       var valueOnly = _target && _target.valueOnly;
       var cycle = tmodel.getTargetCycle(key);
       var lastValue = tmodel.val(key);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "targetj",
-  "version": "1.0.143",
+  "version": "1.0.145",
   "keywords": [
     "targetjs"
   ],