targetj 1.0.159 → 1.0.166

package/Export.js

@@ -1,14 +1,52 @@
-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"
-export * from "./build/$Dom.js"
-export * from "./build/Bracket.js"
-export * from "./build/BracketGenerator.js"
-export * from "./build/ColorUtil.js"
-export * from "./build/Easing.js"
-export * from "./build/TargetExecutor"
+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";
+export * from "./build/$Dom.js";
+export * from "./build/Bracket.js";
+export * from "./build/BracketGenerator.js";
+export * from "./build/ColorUtil.js";
+export * from "./build/Easing.js";
+export * from "./build/TargetExecutor.js";
+
+import * as App from './build/App.js';
+import * as TModel from './build/TModel.js';
+import * as Moves from './build/Moves.js';
+import * as SearchUtil from './build/SearchUtil.js';
+import * as TargetData from './build/TargetData.js';
+import * as TargetUtil from './build/TargetUtil.js';
+import * as TModelUtil from './build/TModelUtil.js';
+import * as TUtil from './build/TUtil.js';
+import * as Dom from './build/$Dom.js';
+import * as Bracket from './build/Bracket.js';
+import * as BracketGenerator from './build/BracketGenerator.js';
+import * as ColorUtil from './build/ColorUtil.js';
+import * as Easing from './build/Easing.js';
+import * as TargetExecutor from './build/TargetExecutor.js';
+
+const TargetJS = {
+  ...App,
+  ...TModel,
+  ...Moves,
+  ...SearchUtil,
+  ...TargetData,
+  ...TargetUtil,
+  ...TModelUtil,
+  ...TUtil,
+  ...Dom,
+  ...Bracket,
+  ...BracketGenerator,
+  ...ColorUtil,
+  ...Easing,
+  ...TargetExecutor,
+};
+
+if (typeof window !== 'undefined') {
+  window.TargetJS = TargetJS;
+}
+
+export default TargetJS;

package/README.md

@@ -99,28 +99,45 @@ App({
 });
 ```
 
+Or in HTML (no JavaScript required), using tg- attributes that mirror object literal keys:
+   
+```html 
+<div
+   tg-background="mediumpurple"
+   tg-width="[{ list: [100, 250, 100] }, 50, 10]"
+   tg-height$="return this.prevTargetValue / 2;">
+</div>
+``` 
+
 ### Simple Loading API Example
 
 In this example, we load one user and display its name.
 
-- `loadUser` calls the fetch API to retrieve user details.
+- `fetch` is a special target that performs a data fetch when given a URL string. For more complex API requests, you can use the framework’s built-in `fetch()` function. See examples below.
 - `html` sets the text content of the div to the user's name. Since the target name is prefixed with `_` and ends with `$`, it executes only when an API call returns a result. `prevTargetValue` refers to the result of the previous target, which, in this case, is the result of the API call.
 
 ![first example](https://targetjs.io/img/quick2_4.gif)
 
 ```bash
-import { App, fetch } from "targetj";
+import { App } from "targetj";
 
 App({
-    loadUser() {
-      fetch(this, "https://targetjs.io/api/randomUser", { id: "user0" });
-    },
-    _html$() {
-      return this.prevTargetValue.name;
-    }
+  fetch: "https://targetjs.io/api/randomUser?id=user0",
+  _html$() {
+    return this.prevTargetValue.name;
+  }
 });
 ```
 
+Or in HTML:
+
+```html 
+<div
+   tg-fetch="https://targetjs.io/api/randomUser?id=user0"
+   tg-html$="return this.prevTargetValue?.name;">
+</div>
+``` 
+
 ### Loading Two Users Example
 
 In this example, we load two separate users and display two purple boxes, each containing a user's name, based on our first example.
@@ -136,8 +153,8 @@ import { App, fetch } from "targetj";
 
 App({
     loadUsers() {
-      fetch(this, "https://targetjs.io/api/randomUser", { id: "user0" });
-      fetch(this, "https://targetjs.io/api/randomUser", { id: "user1" });
+      fetch(this, "https://targetjs.io/api/randomUser?id=user0");
+      fetch(this, "https://targetjs.io/api/randomUser?id=user1");
     },
     _children$() {
       return {
@@ -292,17 +309,17 @@ App({
     width: {
         value: 250,        
         steps: 30,
-        stepInterval: 50
+        interval: 50
     },
     height: {
         value: 250,        
         steps: 30,
-        stepInterval: 50
+        interval: 50
     },
     opacity: {
         value: 0.15,        
         steps: 30,
-        stepInterval: 50
+        interval: 50
     }
  });
 ```

package/build/LoadingManager.js

@@ -72,9 +72,12 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
     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]);
+      var urls = Array.isArray(url) ? url : [url];
+      urls.forEach(function (singleUrl) {
+        var fetchId = "".concat(tmodel.oid, "_").concat(singleUrl, "_").concat(JSON.stringify(query));
+        _this.fetchCommon(fetchId, cacheId, tmodel, _this.fetchingAPIMap, function () {
+          _this.ajaxAPI(singleUrl, query, _this.fetchingAPIMap[fetchId]);
+        });
       });
     }
   }, {
@@ -134,7 +137,10 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
     key: "isLoading",
     value: function isLoading(tmodel, targetName) {
       var key = this.getTModelKey(tmodel, targetName);
-      return this.tmodelKeyMap[key];
+      var tmodelEntry = this.tmodelKeyMap[key];
+      if (tmodelEntry && tmodelEntry.accessIndex < tmodelEntry.resultCount) {
+        return true;
+      }
     }
   }, {
     key: "isLoadingSuccessful",

package/build/RunScheduler.js

@@ -131,14 +131,16 @@ var RunScheduler = exports.RunScheduler = /*#__PURE__*/function () {
         this.schedule(1, "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) {
+        if (newDelay === undefined || (0, _App.getManager)().lists.activeTModels.length > 0) {
           if ((0, _App.getEvents)().eventQueue.length > 0) {
             this.schedule(15, "events-".concat((0, _App.getEvents)().eventQueue.length));
           } else if ((0, _App.getManager)().lists.updatingTModels.length > 0) {
             this.schedule(15, "getManager-needsRerun-updatingTModels");
           } else if ((0, _App.getManager)().lists.activeTModels.length > 0) {
             var activeTModel = (0, _App.getManager)().lists.activeTModels.find(function (tmodel) {
-              return tmodel.targetExecutionCount === 0 || tmodel.activeTargetList.some(function (target) {
+              return tmodel.targetExecutionCount === 0 || tmodel.activeTargetList.filter(function (target) {
+                return !tmodel.isScheduledPending(target);
+              }).some(function (target) {
                 return tmodel.shouldScheduleRun(target);
               });
             });

package/build/TModel.js

@@ -348,6 +348,19 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
       var parent = _SearchUtil.SearchUtil.findParentByTarget(this, targetName);
       return parent ? parent.val(targetName) : undefined;
     }
+  }, {
+    key: "getParentValueAtMyIndex",
+    value: function getParentValueAtMyIndex(targetName) {
+      var parentValue = this.getParentValue(targetName);
+      if (Array.isArray(parentValue)) {
+        var _this$getParent;
+        var index = (_this$getParent = this.getParent()) === null || _this$getParent === void 0 ? void 0 : _this$getParent.getChildIndex(this);
+        if (typeof index === 'number') {
+          return parentValue[index];
+        }
+      }
+      return parentValue;
+    }
   }, {
     key: "delVal",
     value: function delVal(key) {

package/build/TUtil.js

@@ -7,11 +7,11 @@ exports.TUtil = void 0;
 var _$Dom = require("./$Dom.js");
 var _App = require("./App.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 _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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; }
@@ -108,11 +108,11 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
           });
           var attributeSet = {};
           if (isTargetElement) {
-            var _iterator3 = _createForOfIteratorHelper(attrs),
-              _step3;
+            var _iterator4 = _createForOfIteratorHelper(attrs),
+              _step4;
             try {
-              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-                var attr = _step3.value;
+              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                var attr = _step4.value;
                 if (attr.name.startsWith("tg-")) {
                   var rawKey = attr.name.slice(3);
                   var key = _TargetData.TargetData.attributesToTargets[rawKey] || rawKey;
@@ -122,9 +122,9 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
                 }
               }
             } catch (err) {
-              _iterator3.e(err);
+              _iterator4.e(err);
             } finally {
-              _iterator3.f();
+              _iterator4.f();
             }
           }
           var parentEl = element.parentElement;
@@ -152,32 +152,26 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
                 $dom: new _$Dom.$Dom(element)
               };
             }
-            newModel.shouldBeBracketed = false;
-            newModel.otype = newModel.id || (parentModel.id || _App.App.getOid('blank').oid) + "_";
-            newModel.$dom.detach();
-            delete newModel.$dom;
-            delete newModel.id;
-            newModel.isVisible = function () {
-              return this.getParent().isVisible();
-            };
-            newModel.domParent = function () {
-              return this.getParent();
-            };
-            if (parentModel.children) {
-              if (Array.isArray(parentModel.children.value)) {
-                parentModel.children.value.push(newModel);
-              } else {
-                parentModel.children.value = [newModel];
+            var childrenKey = TUtil.getChildrenKey(parentModel);
+            if (childrenKey) {
+              if (Array.isArray(parentModel[childrenKey].value)) {
+                parentModel[childrenKey].value.push(newModel);
+              } else if (typeof parentModel[childrenKey] === 'string') {
+                parentModel[childrenKey] = {
+                  cycles: TUtil.isNumber(+parentModel[childrenKey]) ? +parentModel[childrenKey] : 0,
+                  value: [newModel]
+                };
+              } else if (_typeof(parentModel[childrenKey]) === 'object') {
+                parentModel[childrenKey].value = [newModel];
               }
             } else {
-              parentModel.children = {
+              parentModel._children$ = {
+                cycles: 0,
                 value: [newModel]
               };
             }
             elementToModel.set(element, newModel);
           } else if (newModel) {
-            newModel.isVisible = true;
-            (0, _App.tRoot)().addChild(newModel);
             elementToModel.set(element, newModel);
           }
         }
@@ -186,18 +180,58 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
       } finally {
         _iterator2.f();
       }
+      var _iterator3 = _createForOfIteratorHelper(elementToModel.values()),
+        _step3;
+      try {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var _value = _step3.value;
+          var _parentEl = _value.$dom.element.parentElement;
+          var _parentModel = elementToModel.get(_parentEl);
+          if (_parentModel) {
+            _value.$dom.detach();
+            delete _value.$dom;
+            delete _value.id;
+            _value.shouldBeBracketed = false;
+            _value.otype = _value.id || (_parentModel.id || _App.App.getOid('blank').oid) + "_";
+            _value.isVisible = function () {
+              return this.getParent().isVisible();
+            };
+            _value.domParent = function () {
+              return this.getParent();
+            };
+          } else {
+            _value.isVisible = true;
+            (0, _App.tRoot)().addChild(_value);
+          }
+        }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
+      }
+    }
+  }, {
+    key: "getChildrenKey",
+    value: function getChildrenKey(obj) {
+      for (var _i = 0, _Object$keys = Object.keys(obj); _i < _Object$keys.length; _i++) {
+        var key = _Object$keys[_i];
+        if (key.toLowerCase().includes("children")) {
+          return key;
+        }
+      }
+      return null;
     }
   }, {
     key: "parseString",
     value: function parseString(rawValue) {
-      try {
-        return eval("(".concat(rawValue, ")"));
-      } catch (_unused) {}
-      if (typeof rawValue === 'string' && (rawValue.includes('return') || rawValue.includes('setTarget'))) {
+      if (typeof rawValue === 'string' && (rawValue.includes('return') || rawValue.includes('setTarget') || rawValue.includes('TargetJS.'))) {
         try {
           return new Function(rawValue);
-        } catch (_unused2) {}
+        } catch (_unused) {}
       }
+      try {
+        return eval("(".concat(rawValue, ")"));
+      } catch (_unused2) {}
       try {
         return JSON.parse(rawValue);
       } catch (_unused3) {}
@@ -339,11 +373,11 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
       var tmodel = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : (0, _App.tRoot)();
       var tab = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
       var list = (0, _App.getLocationManager)().getChildren(tmodel);
-      var _iterator4 = _createForOfIteratorHelper(list),
-        _step4;
+      var _iterator5 = _createForOfIteratorHelper(list),
+        _step5;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var g = _step4.value;
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var g = _step5.value;
           var gtab = g.isVisible() ? tab + '|  ' : tab + 'x  ';
           if (g.type === 'BI') {
             console.log("".concat(gtab).concat(g.oid, " v:").concat(g.isVisible(), " x:").concat(Math.floor(g.getX()), " y:").concat(Math.floor(g.getY()), ", absY:").concat(Math.floor(g.absY), " yy:").concat(Math.floor(g.absY + g.getDomParent().absY), " w:").concat(Math.floor(g.getWidth()), " h:").concat(Math.floor(g.getHeight()), " hc:").concat(Math.floor(g.getContentHeight())));
@@ -355,9 +389,9 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator4.f();
+        _iterator5.f();
       }
     }
   }]);

package/build/TargetUtil.js

@@ -197,12 +197,12 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
     }
   }, {
     key: "activateNextTarget",
-    value: function activateNextTarget(tmodel, _activateNextTarget) {
-      if (tmodel.targetValues[_activateNextTarget]) {
-        tmodel.targetValues[_activateNextTarget].isImperative = false;
+    value: function activateNextTarget(tmodel, target) {
+      if (tmodel.targetValues[target]) {
+        tmodel.targetValues[target].isImperative = false;
       }
-      if (!tmodel.activeTargetMap[_activateNextTarget]) {
-        tmodel.activate(_activateNextTarget);
+      if (!tmodel.activeTargetMap[target]) {
+        tmodel.activate(target);
       }
     }
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "targetj",
-  "version": "1.0.159",
+  "version": "1.0.166",
   "description": "TargetJS is a JavaScript framework designed for creating animated and efficient web user interfaces.",
   "keywords": ["targetjs"],
   "main": "Export.js",
@@ -24,7 +24,7 @@
     "build": "babel src --out-dir build"
   },
   "files": [
-    "Export.js",
+    "Export.js",        
     "build/",
     "README.md",
     "LICENSE"