targetj 1.0.230 → 1.0.232

package/build/TargetUtil.js

@@ -7,11 +7,11 @@ 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 _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 _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; }
@@ -123,7 +123,10 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         var originalMethod = target[method];
         var shouldWrap = method === 'value' || typeof originalMethod === 'function' && _TargetData.TargetData.isLifeCycleMethod(method);
         if (shouldWrap) {
-          target[method] = function () {
+          if (originalMethod.__isBoundTargetMethod) {
+            return;
+          }
+          var wrappedMethod = function wrappedMethod() {
             var _getPrevUpdateTime;
             if (!_TargetData.TargetData.lifecycleCoreSet.has(method)) {
               TargetUtil.currentTargetName = key;
@@ -137,6 +140,8 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
             lastPrevUpdateTime = (_getPrevUpdateTime = getPrevUpdateTime()) !== null && _getPrevUpdateTime !== void 0 ? _getPrevUpdateTime : lastPrevUpdateTime;
             return result;
           };
+          wrappedMethod.__isBoundTargetMethod = true;
+          target[method] = wrappedMethod;
         }
       });
     }
@@ -414,12 +419,9 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
           return tmodel.oid + "." + targetName + ": " + tmodel.getUpdatingImperativeTargets(targetName);
         }
         if (tmodel.isTargetCompleteDeep(targetName) !== true) {
-          var _tmodel$activeChildre, _tmodel$activeChildre2;
-          var activeChildrenList = _toConsumableArray((_tmodel$activeChildre = (_tmodel$activeChildre2 = tmodel.activeChildrenMap) === null || _tmodel$activeChildre2 === void 0 ? void 0 : _tmodel$activeChildre2.values()) !== null && _tmodel$activeChildre !== void 0 ? _tmodel$activeChildre : []);
-          return tmodel.oid + "." + targetName + " ==> " + tmodel.getTargetStatus(targetName) + ", " + tmodel.isTargetCompleteDeep(targetName) + ":: " + activeChildrenList.map(function (t) {
-            return t.oid + ':' + t.hasAnyUpdates();
-          }) + ", " + _toConsumableArray(TargetUtil.getUpdatingChildren(tmodel, targetName).keys());
-          //return false;
+          //const activeChildrenList = [ ...(tmodel.activeChildrenMap?.values() ?? []) ];
+          //return  tmodel.oid + "." + targetName + " ==> " + tmodel.getTargetStatus(targetName) + ", " + tmodel.isTargetCompleteDeep(targetName) + ":: " + activeChildrenList.map(t => t.oid + ':' + t.hasAnyUpdates()) + ", " + [ ...TargetUtil.getUpdatingChildren(tmodel, targetName).keys() ]; 
+          return false;
         }
       }
       return true;
@@ -446,13 +448,13 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         if (!tmodel.isTargetComplete(key) && !tmodel.isTargetDone(key)) {
           return 'not done';
         }
-        if (((_target$childAction = target.childAction) === null || _target$childAction === void 0 ? void 0 : _target$childAction.length) > 0 && TargetUtil.getUpdatingChildren(tmodel, key).size > 0) {
+        if (((_target$childAction = target.childAction) === null || _target$childAction === void 0 ? void 0 : _target$childAction.length) > 0 && TargetUtil.getUpdatingChildren(tmodel, key, target.waitForChildren).size > 0) {
           return 'updating children';
         }
-        if (((_target$childAction2 = target.childAction) === null || _target$childAction2 === void 0 ? void 0 : _target$childAction2.length) > 0 && TargetUtil.getActiveChildren(tmodel).size > 0) {
+        if (((_target$childAction2 = target.childAction) === null || _target$childAction2 === void 0 ? void 0 : _target$childAction2.length) > 0 && TargetUtil.getActiveChildren(tmodel, target.waitForChildren).size > 0) {
           return 'active children';
         }
-        if (((_target$childAction3 = target.childAction) === null || _target$childAction3 === void 0 ? void 0 : _target$childAction3.length) > 0 && TargetUtil.areTargetChildrenComplete(target.childAction) !== true) {
+        if (((_target$childAction3 = target.childAction) === null || _target$childAction3 === void 0 ? void 0 : _target$childAction3.length) > 0 && TargetUtil.areTargetChildrenComplete(target.childAction, target.waitForChildren) !== true) {
           return 'incomplete children';
         }
         if (target.fetchAction && !(0, _App.getLoader)().isLoadingSuccessful(tmodel, key)) {
@@ -464,6 +466,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "areTargetChildrenComplete",
     value: function areTargetChildrenComplete(children) {
+      var waitForChildren = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'all';
       if (!children) {
         return true;
       }
@@ -472,14 +475,14 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var child = _step2.value;
-          if (!child.isVisible() && child.visibilityStatus) {
+          if (TargetUtil.shouldIgnoreChildForCompletion(child, waitForChildren)) {
             continue;
           }
           if (_App.App.tmodelIdMap[child.oid] && !TargetUtil.isTModelComplete(child)) {
             return false;
           }
           if (child.hasChildren()) {
-            if (!TargetUtil.areTargetChildrenComplete(child.getChildren())) {
+            if (!TargetUtil.areTargetChildrenComplete(child.getChildren(), waitForChildren)) {
               return false;
             }
           }
@@ -495,12 +498,14 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
     key: "getUpdatingChildren",
     value: function getUpdatingChildren(tmodel, originalTargetName) {
       var _tmodel$updatingChild, _tmodel$updatingChild2, _tmodel$animatingChil, _tmodel$animatingChil2;
+      var waitForChildren = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "all";
       var childrenMap = new Map();
       var children = [].concat(_toConsumableArray((_tmodel$updatingChild = (_tmodel$updatingChild2 = tmodel.updatingChildrenMap) === null || _tmodel$updatingChild2 === void 0 ? void 0 : _tmodel$updatingChild2.values()) !== null && _tmodel$updatingChild !== void 0 ? _tmodel$updatingChild : []), _toConsumableArray((_tmodel$animatingChil = (_tmodel$animatingChil2 = tmodel.animatingChildrenMap) === null || _tmodel$animatingChil2 === void 0 ? void 0 : _tmodel$animatingChil2.values()) !== null && _tmodel$animatingChil !== void 0 ? _tmodel$animatingChil : []));
-      children.filter(function (child) {
-        return child.isVisible() || !child.visibilityStatus;
-      }).forEach(function (child) {
+      children.forEach(function (child) {
         var _child$updatingTarget;
+        if (TargetUtil.shouldIgnoreChildForCompletion(child, waitForChildren)) {
+          return;
+        }
         var updatingList = [].concat(_toConsumableArray((_child$updatingTarget = child.updatingTargetList) !== null && _child$updatingTarget !== void 0 ? _child$updatingTarget : []), _toConsumableArray(child.animatingMap ? _toConsumableArray(child.animatingMap.keys()) : []));
         var _iterator3 = _createForOfIteratorHelper(updatingList),
           _step3;
@@ -538,18 +543,31 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "getActiveChildren",
     value: function getActiveChildren(tmodel) {
-      var _tmodel$activeChildre3, _tmodel$activeChildre4;
+      var _tmodel$activeChildre, _tmodel$activeChildre2;
+      var waitForChildren = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'all';
       var childrenMap = new Map();
-      var children = _toConsumableArray((_tmodel$activeChildre3 = (_tmodel$activeChildre4 = tmodel.activeChildrenMap) === null || _tmodel$activeChildre4 === void 0 ? void 0 : _tmodel$activeChildre4.values()) !== null && _tmodel$activeChildre3 !== void 0 ? _tmodel$activeChildre3 : []);
-      children.filter(function (child) {
-        return child.isVisible() || !child.visibilityStatus;
-      }).forEach(function (child) {
+      var children = _toConsumableArray((_tmodel$activeChildre = (_tmodel$activeChildre2 = tmodel.activeChildrenMap) === null || _tmodel$activeChildre2 === void 0 ? void 0 : _tmodel$activeChildre2.values()) !== null && _tmodel$activeChildre !== void 0 ? _tmodel$activeChildre : []);
+      children.forEach(function (child) {
+        if (TargetUtil.shouldIgnoreChildForCompletion(child, waitForChildren)) {
+          return;
+        }
         if (child.activeTargetList.length) {
           childrenMap.set(child.oid, child);
         }
       });
       return childrenMap;
     }
+  }, {
+    key: "shouldIgnoreChildForCompletion",
+    value: function shouldIgnoreChildForCompletion(child, waitForChildren) {
+      if (waitForChildren === "none") {
+        return true;
+      }
+      if (waitForChildren === "visible") {
+        return child.visibilityStatus && !child.isVisible();
+      }
+      return false;
+    }
   }, {
     key: "activateSingleTarget",
     value: function activateSingleTarget(tmodel, targetName) {