targetj 1.0.153 → 1.0.154

package/README.md

@@ -83,7 +83,7 @@ npm install targetj
 - Targets run initially in the order they appear in the code, so `background` runs first, followed by `width`. The `_` prefix indicates that a target is inactive by default, meaning `height` does not run initially.
 - `background` sets the background to purple, and its lifecycle ends.
 - `width` animates from 100 → 250 → 100px, in 50 steps with 10ms pauses.
-- `height` follows `width` and scales dynamically with its value. The `$` postfix means it is activated each time the proceding target executes. `prevTargetValue` refers to the previous target's value, which in this case is `width`.
+- `height` follows `width` and scales dynamically with its value. The `$` postfix means it is activated each time the preceding target executes. `prevTargetValue` refers to the previous target's value, which in this case is `width`.
 
 ![first example](https://targetjs.io/img/quick1_3.gif)
 
@@ -407,26 +407,25 @@ If you inspect the HTML elements in the browser's developer tools, you'll notice
 ![Single page app](https://targetjs.io/img/infiniteScrolling11.gif)
 
 ```bash
-import { App, TModel, getEvents, getLoader, getScreenWidth, getScreenHeight } from "targetj";
+import { App, getEvents, getLoader, getScreenWidth, getScreenHeight } from "targetj";
 
 App({
     containerOverflowMode: "always",
     children() {
         const childrenCount = this.getChildren().length;
-        return Array.from({ length: 20 }, (_, i) =>
-            new TModel("scrollItem", {
-                width: [{list: [100, 250]}, 15],
-                background: [{list: ["#FCE961", "#B388FF"]}, 15, 15],
-                height: 48,
-                color: "#C2FC61",
-                textAlign: "center",
-                lineHeight: 48,
-                bottomMargin: 2,
-                x() { return this.getCenterX(); },
-                validateVisibilityInParent: true,
-                html: childrenCount + i
-            })
-        );
+        return Array.from({ length: 20 }, (_, i) => ({
+             id: 'scrollItem',
+             width: [{list: [100, 250]}, 15],
+             background: [{list: ["#FCE961", "#B388FF"]}, 15, 15],
+             height: 48,
+             color: "#C2FC61",
+             textAlign: "center",
+             lineHeight: 48,
+             bottomMargin: 2,
+             x() { return this.getCenterX(); },
+             validateVisibilityInParent: true,
+             html: childrenCount + i
+         }));
     },
     _load$() {
         this.prevTargetValue.forEach(data =>

package/build/LocationManager.js

@@ -274,7 +274,14 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
         var target = tmodel.targets[targetName];
         if (tmodel.isTargetEnabled(targetName)) {
           if (typeof target.value === 'function') {
-            target.value.call(tmodel, originalEventTarget);
+            var result = target.value.call(tmodel, originalEventTarget);
+            if (Array.isArray(result)) {
+              result.forEach(function (t) {
+                return _TargetUtil.TargetUtil.activateSingleTarget(tmodel, t);
+              });
+            } else if (typeof result === 'string') {
+              _TargetUtil.TargetUtil.activateSingleTarget(tmodel, result);
+            }
           } else if (Array.isArray(target.value)) {
             target.value.forEach(function (t) {
               return _TargetUtil.TargetUtil.activateSingleTarget(tmodel, t);

package/build/TargetUtil.js

@@ -111,6 +111,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       var doesNextTargetUsePrevValue = nextKey && nextKey.endsWith('$') ? true : false;
       target.originalTargetName = TargetUtil.currentTargetName;
       target.originalTModel = TargetUtil.currentTModel;
+      var cleanKey = TargetUtil.getTargetName(key);
       if (doesNextTargetUsePrevValue) {
         target.activateNextTarget = nextKey.slice(0, -1);
       }
@@ -118,19 +119,32 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       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))) {
+        if (method === 'value') {
           var originalMethod = target[method];
           target[method] = function () {
             var _getPrevUpdateTime;
-            TargetUtil.currentTargetName = TargetUtil.getTargetName(key);
+            TargetUtil.currentTargetName = cleanKey;
             TargetUtil.currentTModel = tmodel;
-            this.key = TargetUtil.getTargetName(key);
+            this.key = cleanKey;
             this.prevTargetValue = getPrevValue();
             this.isPrevTargetUpdated = isPrevTargetUpdated;
-            var result = originalMethod.apply(this, arguments);
+            var result = typeof originalMethod === 'function' ? originalMethod.apply(this, arguments) : originalMethod;
             lastPrevUpdateTime = (_getPrevUpdateTime = getPrevUpdateTime()) !== null && _getPrevUpdateTime !== void 0 ? _getPrevUpdateTime : lastPrevUpdateTime;
             return result;
           };
+        } else if (typeof target[method] === 'function' && (methods.includes(method) || stepPattern.test(method) || endPattern.test(method))) {
+          var _originalMethod = target[method];
+          target[method] = function () {
+            var _getPrevUpdateTime2;
+            TargetUtil.currentTargetName = cleanKey;
+            TargetUtil.currentTModel = tmodel;
+            this.key = cleanKey;
+            this.prevTargetValue = getPrevValue();
+            this.isPrevTargetUpdated = isPrevTargetUpdated;
+            var result = typeof _originalMethod === 'function' ? _originalMethod.apply(this, arguments) : _originalMethod;
+            lastPrevUpdateTime = (_getPrevUpdateTime2 = getPrevUpdateTime()) !== null && _getPrevUpdateTime2 !== void 0 ? _getPrevUpdateTime2 : lastPrevUpdateTime;
+            return result;
+          };
         }
       });
     }

package/package.json

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