targetj 1.1.0 → 1.1.2

package/build/TargetUtil.js

@@ -174,13 +174,14 @@ var TargetUtil = /*#__PURE__*/function () {
       }
       var nextTarget = target.activateNextTarget;
       var isEndTrigger = (_nextTarget$endsWith = nextTarget === null || nextTarget === void 0 ? void 0 : nextTarget.endsWith('$$')) !== null && _nextTarget$endsWith !== void 0 ? _nextTarget$endsWith : false;
-      var fetchAction = target.fetchAction;
+      var fetchAction = TargetUtil.hasFetchAction(tmodel, key);
       if (isUpdateMode && isEndTrigger) {
         return;
       }
       var nextTargetActivated = false;
       var canActivate = false;
       if (nextTarget) {
+        var waitingForDom = TargetData.requiresDom(TargetUtil.getTargetName(nextTarget)) && !tmodel.hasDom();
         if (isEndTrigger) {
           var lastTriggeredCount = TargetUtil.getTriggeredByCompleteCount(tmodel, nextTarget, key);
           if (targetValue.completeCount > lastTriggeredCount) {
@@ -193,7 +194,13 @@ var TargetUtil = /*#__PURE__*/function () {
         }
         if (!isEndTrigger && sideStep === 0 && (canActivate || isImperative) || isEndTrigger && canActivate) {
           var prevOk = isEndTrigger ? TargetUtil.arePreviousTargetsComplete(tmodel, nextTarget) : false;
-          if (fetchAction) {
+          if (isEndTrigger) {
+            var _tmodel$targetValues, _tmodel$targetValues$2;
+            ((_tmodel$targetValues$2 = (_tmodel$targetValues = tmodel.targetValues)[nextTarget]) !== null && _tmodel$targetValues$2 !== void 0 ? _tmodel$targetValues$2 : _tmodel$targetValues[nextTarget] = TargetUtil.emptyValue()).previousTargetsStatus = prevOk;
+          }
+          if (waitingForDom) {
+            TargetUtil.markPendingTargets(tmodel, key);
+          } else if (fetchAction) {
             if (isEndTrigger) {
               if (prevOk === true) {
                 var activated = TargetUtil.activateTargetOnce(tmodel, nextTarget);
@@ -223,7 +230,7 @@ var TargetUtil = /*#__PURE__*/function () {
             } else {
               TargetUtil.markPendingTargets(tmodel, key);
             }
-          } else if (!isEndTrigger) {
+          } else {
             if (tmodel.activatedTargets.indexOf(nextTarget) >= 0 && !tmodel.isTargetUpdating(key)) {
               tmodel.activatedTargets.push(nextTarget);
             } else {
@@ -254,7 +261,11 @@ var TargetUtil = /*#__PURE__*/function () {
           var _originalTModel = target.originalTModel,
             _originalTargetName = target.originalTargetName;
           if (_originalTModel && _originalTargetName) {
-            TargetUtil.shouldActivateNextTarget(_originalTModel, _originalTargetName, levelUp + 1, sideStep, isImperative, "complete");
+            var _originalTModel$targe, _originalTModel$targe2;
+            var completionScope = (_originalTModel$targe = (_originalTModel$targe2 = _originalTModel.targets[_originalTargetName]) === null || _originalTModel$targe2 === void 0 ? void 0 : _originalTModel$targe2.completionScope) !== null && _originalTModel$targe !== void 0 ? _originalTModel$targe : "all";
+            if (completionScope !== "none" && TargetUtil.isTModelComplete(tmodel, completionScope)) {
+              TargetUtil.shouldActivateNextTarget(_originalTModel, _originalTargetName, levelUp + 1, sideStep, isImperative, "complete");
+            }
           }
         }
       }
@@ -311,13 +322,11 @@ var TargetUtil = /*#__PURE__*/function () {
         target.onComplete.call(tmodel);
         tmodel.setTargetMethodName(key, "onComplete");
       }
-      var fetchAction = target === null || target === void 0 ? void 0 : target.fetchAction;
-      if (fetchAction && getLoader().isLoadingSuccessful(tmodel, key)) {
+      if (TargetUtil.hasFetchAction(tmodel, key) && getLoader().isLoadingSuccessful(tmodel, key)) {
         var index = tmodel.fetchActionTargetList.indexOf(key);
         if (index >= 0) {
           tmodel.fetchActionTargetList.splice(index, 1);
         }
-        target.fetchAction = false;
       }
       TargetUtil.bubbleInvokerCompletion(tmodel, key);
       return true;
@@ -391,35 +400,35 @@ var TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "getTriggeredByCompleteCount",
     value: function getTriggeredByCompleteCount(tmodel, nextTarget, key) {
-      var _tmodel$targetValues$2, _tmodel$targetValues$3;
-      return (_tmodel$targetValues$2 = (_tmodel$targetValues$3 = tmodel.targetValues[nextTarget]) === null || _tmodel$targetValues$3 === void 0 || (_tmodel$targetValues$3 = _tmodel$targetValues$3.triggeredByCompleteCountMap) === null || _tmodel$targetValues$3 === void 0 ? void 0 : _tmodel$targetValues$3.get(key)) !== null && _tmodel$targetValues$2 !== void 0 ? _tmodel$targetValues$2 : 0;
+      var _tmodel$targetValues$3, _tmodel$targetValues$4;
+      return (_tmodel$targetValues$3 = (_tmodel$targetValues$4 = tmodel.targetValues[nextTarget]) === null || _tmodel$targetValues$4 === void 0 || (_tmodel$targetValues$4 = _tmodel$targetValues$4.triggeredByCompleteCountMap) === null || _tmodel$targetValues$4 === void 0 ? void 0 : _tmodel$targetValues$4.get(key)) !== null && _tmodel$targetValues$3 !== void 0 ? _tmodel$targetValues$3 : 0;
     }
   }, {
     key: "snapshotTriggeredByCompleteCounts",
     value: function snapshotTriggeredByCompleteCounts(tmodel, nextTarget) {
-      var _tmodel$targetValues;
-      var nextTargetValue = (_tmodel$targetValues = tmodel.targetValues)[nextTarget] || (_tmodel$targetValues[nextTarget] = TargetUtil.emptyValue());
+      var _tmodel$targetValues2;
+      var nextTargetValue = (_tmodel$targetValues2 = tmodel.targetValues)[nextTarget] || (_tmodel$targetValues2[nextTarget] = TargetUtil.emptyValue());
       var map = nextTargetValue.triggeredByCompleteCountMap || (nextTargetValue.triggeredByCompleteCountMap = new Map());
       var nextIndex = tmodel.functionTargetNames.indexOf(nextTarget);
       if (nextIndex < 0) {
         return;
       }
       for (var i = 0; i < nextIndex; i++) {
-        var _tmodel$targetValues$4, _tmodel$targetValues$5;
+        var _tmodel$targetValues$5, _tmodel$targetValues$6;
         var previousKey = tmodel.functionTargetNames[i];
         var previousTarget = tmodel.targets[previousKey];
         if ((previousTarget === null || previousTarget === void 0 ? void 0 : previousTarget.activateNextTarget) !== nextTarget) {
           continue;
         }
-        var completeCount = (_tmodel$targetValues$4 = (_tmodel$targetValues$5 = tmodel.targetValues[previousKey]) === null || _tmodel$targetValues$5 === void 0 ? void 0 : _tmodel$targetValues$5.completeCount) !== null && _tmodel$targetValues$4 !== void 0 ? _tmodel$targetValues$4 : 0;
+        var completeCount = (_tmodel$targetValues$5 = (_tmodel$targetValues$6 = tmodel.targetValues[previousKey]) === null || _tmodel$targetValues$6 === void 0 ? void 0 : _tmodel$targetValues$6.completeCount) !== null && _tmodel$targetValues$5 !== void 0 ? _tmodel$targetValues$5 : 0;
         map.set(previousKey, completeCount);
       }
     }
   }, {
     key: "activateTargetOnce",
     value: function activateTargetOnce(tmodel, nextTarget) {
-      var _tmodel$targetValues2, _nextTargetValue$acti;
-      var nextTargetValue = (_tmodel$targetValues2 = tmodel.targetValues)[nextTarget] || (_tmodel$targetValues2[nextTarget] = TargetUtil.emptyValue());
+      var _tmodel$targetValues3, _nextTargetValue$acti;
+      var nextTargetValue = (_tmodel$targetValues3 = tmodel.targetValues)[nextTarget] || (_tmodel$targetValues3[nextTarget] = TargetUtil.emptyValue());
       var last = (_nextTargetValue$acti = nextTargetValue.activationTime) !== null && _nextTargetValue$acti !== void 0 ? _nextTargetValue$acti : 0;
       if (last > 0 && last >= tmodel.getLastUpdate(nextTarget)) {
         return false;
@@ -436,33 +445,42 @@ var TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "isTModelComplete",
     value: function isTModelComplete(tmodel) {
-      var _state$updatingTarget2, _state$activeTargetLi2, _state$activatedTarge2, _state$lastChildrenUp3, _state$lastChildrenUp4;
+      var _tmodel$particleRunti, _state$updatingTarget2, _state$activeTargetLi2, _state$activatedTarge2, _state$lastChildrenUp3, _state$lastChildrenUp4;
       var completionScope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "all";
+      if (completionScope === "visible" && TargetUtil.shouldIgnoreChildForCompletion(tmodel, "visible")) {
+        return true;
+      }
+      if ((_tmodel$particleRunti = tmodel.particleRuntime) !== null && _tmodel$particleRunti !== void 0 && _tmodel$particleRunti.hasPendingAny(completionScope)) {
+        return false;
+      }
+      var waitingForDom = !tmodel.isLightweightChild && getManager().shouldHaveDom(tmodel) && !tmodel.hasDom();
       var state = tmodel.state();
+      var pendingStyles = !tmodel.isLightweightChild && TargetUtil.hasPendingStyles(tmodel);
+      var needsReattach = !tmodel.isLightweightChild && getManager().needsReattach(tmodel);
       if (completionScope === "visible") {
         var _state$updatingTarget, _state$activeTargetLi, _state$activatedTarge, _state$lastChildrenUp, _state$lastChildrenUp2;
-        if (TargetUtil.shouldIgnoreChildForCompletion(tmodel, "visible")) {
-          return true;
-        }
-        return !((_state$updatingTarget = state.updatingTargetList) !== null && _state$updatingTarget !== void 0 && _state$updatingTarget.length) && !((_state$activeTargetLi = state.activeTargetList) !== null && _state$activeTargetLi !== void 0 && _state$activeTargetLi.length) && !((_state$activatedTarge = state.activatedTargets) !== null && _state$activatedTarge !== void 0 && _state$activatedTarge.length) && !tmodel.hasAnimatingTargets() && TargetUtil.isFetchingComplete(tmodel) && TargetUtil.getUpdatingChildren(tmodel, undefined, "visible").size === 0 && TargetUtil.getActiveChildren(tmodel, "visible").size === 0 && !((_state$lastChildrenUp = state.lastChildrenUpdate) !== null && _state$lastChildrenUp !== void 0 && (_state$lastChildrenUp = _state$lastChildrenUp.deletions) !== null && _state$lastChildrenUp !== void 0 && _state$lastChildrenUp.length) && !((_state$lastChildrenUp2 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp2 !== void 0 && (_state$lastChildrenUp2 = _state$lastChildrenUp2.additions) !== null && _state$lastChildrenUp2 !== void 0 && _state$lastChildrenUp2.length) && !tmodel.noDomUpdatingTargets && !tmodel.pendingTargets && !getManager().needsReattach(tmodel);
+        return !waitingForDom && !((_state$updatingTarget = state.updatingTargetList) !== null && _state$updatingTarget !== void 0 && _state$updatingTarget.length) && !((_state$activeTargetLi = state.activeTargetList) !== null && _state$activeTargetLi !== void 0 && _state$activeTargetLi.length) && !((_state$activatedTarge = state.activatedTargets) !== null && _state$activatedTarge !== void 0 && _state$activatedTarge.length) && !tmodel.hasAnimatingTargets() && TargetUtil.isFetchingComplete(tmodel) && TargetUtil.getUpdatingChildren(tmodel, undefined, "visible").size === 0 && TargetUtil.getActiveChildren(tmodel, "visible").size === 0 && !((_state$lastChildrenUp = state.lastChildrenUpdate) !== null && _state$lastChildrenUp !== void 0 && (_state$lastChildrenUp = _state$lastChildrenUp.deletions) !== null && _state$lastChildrenUp !== void 0 && _state$lastChildrenUp.length) && !((_state$lastChildrenUp2 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp2 !== void 0 && (_state$lastChildrenUp2 = _state$lastChildrenUp2.additions) !== null && _state$lastChildrenUp2 !== void 0 && _state$lastChildrenUp2.length) && !tmodel.noDomUpdatingTargets && !tmodel.pendingTargets && !pendingStyles && !needsReattach;
       }
-      return !((_state$updatingTarget2 = state.updatingTargetList) !== null && _state$updatingTarget2 !== void 0 && _state$updatingTarget2.length) && !((_state$activeTargetLi2 = state.activeTargetList) !== null && _state$activeTargetLi2 !== void 0 && _state$activeTargetLi2.length) && !((_state$activatedTarge2 = state.activatedTargets) !== null && _state$activatedTarge2 !== void 0 && _state$activatedTarge2.length) && !tmodel.hasAnimatingTargets() && TargetUtil.isFetchingComplete(tmodel) && !tmodel.hasAnimatingChildren() && !tmodel.hasUpdatingChildren() && !tmodel.hasActiveChildren() && !((_state$lastChildrenUp3 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp3 !== void 0 && (_state$lastChildrenUp3 = _state$lastChildrenUp3.deletions) !== null && _state$lastChildrenUp3 !== void 0 && _state$lastChildrenUp3.length) && !((_state$lastChildrenUp4 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp4 !== void 0 && (_state$lastChildrenUp4 = _state$lastChildrenUp4.additions) !== null && _state$lastChildrenUp4 !== void 0 && _state$lastChildrenUp4.length) && !tmodel.noDomUpdatingTargets && !tmodel.pendingTargets && !getManager().needsReattach(tmodel);
+      return !waitingForDom && !((_state$updatingTarget2 = state.updatingTargetList) !== null && _state$updatingTarget2 !== void 0 && _state$updatingTarget2.length) && !((_state$activeTargetLi2 = state.activeTargetList) !== null && _state$activeTargetLi2 !== void 0 && _state$activeTargetLi2.length) && !((_state$activatedTarge2 = state.activatedTargets) !== null && _state$activatedTarge2 !== void 0 && _state$activatedTarge2.length) && !tmodel.hasAnimatingTargets() && TargetUtil.isFetchingComplete(tmodel) && !tmodel.hasAnimatingChildren() && !tmodel.hasUpdatingChildren() && !tmodel.hasActiveChildren() && !((_state$lastChildrenUp3 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp3 !== void 0 && (_state$lastChildrenUp3 = _state$lastChildrenUp3.deletions) !== null && _state$lastChildrenUp3 !== void 0 && _state$lastChildrenUp3.length) && !((_state$lastChildrenUp4 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp4 !== void 0 && (_state$lastChildrenUp4 = _state$lastChildrenUp4.additions) !== null && _state$lastChildrenUp4 !== void 0 && _state$lastChildrenUp4.length) && !tmodel.noDomUpdatingTargets && !tmodel.pendingTargets && !pendingStyles && !needsReattach;
     }
   }, {
     key: "getCompletionBlockers",
     value: function getCompletionBlockers(tmodel) {
-      var _state$lastChildrenUp7, _state$lastChildrenUp8;
+      var _state$lastChildrenUp5, _state$lastChildrenUp6;
       var completionScope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "all";
+      var visible = completionScope === "visible";
+      if (visible && TargetUtil.shouldIgnoreChildForCompletion(tmodel, "visible")) {
+        return [];
+      }
       var state = tmodel.state();
       var blockers = [];
       var add = function add(name, value) {
-        if (!value) {
-          return;
+        if (value && (!Array.isArray(value) || value.length > 0)) {
+          blockers.push({
+            name: name,
+            value: value
+          });
         }
-        blockers.push({
-          name: name,
-          value: value
-        });
       };
       var list = function list(value) {
         if (!value) {
@@ -474,56 +492,38 @@ var TargetUtil = /*#__PURE__*/function () {
         if (value instanceof Map) {
           return _toConsumableArray(value.keys());
         }
-        if (Array.isArray(value)) {
-          return value;
-        }
-        return [value];
+        return Array.isArray(value) ? value : [value];
       };
-      if (completionScope === "visible") {
-        var _state$lastChildrenUp5, _state$lastChildrenUp6;
-        if (TargetUtil.shouldIgnoreChildForCompletion(tmodel, "visible")) {
-          return [];
-        }
-        var updatingChildren = TargetUtil.getUpdatingChildren(tmodel, undefined, "visible");
-        var activeChildren = TargetUtil.getActiveChildren(tmodel, "visible");
-        add("updatingTargetList", list(state.updatingTargetList));
-        add("activeTargetList", list(state.activeTargetList));
-        add("activatedTargets", list(state.activatedTargets));
-        add("animatingTargets", tmodel.hasAnimatingTargets() ? list(tmodel.animatingMap) : []);
-        add("fetching", !TargetUtil.isFetchingComplete(tmodel) ? true : false);
-        add("updatingChildren", _toConsumableArray(updatingChildren.keys()));
-        add("activeChildren", _toConsumableArray(activeChildren.keys()));
-        add("deletedChildren", list((_state$lastChildrenUp5 = state.lastChildrenUpdate) === null || _state$lastChildrenUp5 === void 0 ? void 0 : _state$lastChildrenUp5.deletions));
-        add("addedChildren", list((_state$lastChildrenUp6 = state.lastChildrenUpdate) === null || _state$lastChildrenUp6 === void 0 ? void 0 : _state$lastChildrenUp6.additions));
-        add("noDomUpdatingTargets", list(tmodel.noDomUpdatingTargets));
-        add("pendingTargets", list(tmodel.pendingTargets));
-        add("needsReattach", getManager().needsReattach(tmodel) ? true : false);
-        return blockers.filter(function (blocker) {
-          if (Array.isArray(blocker.value)) {
-            return blocker.value.length > 0;
-          }
-          return !!blocker.value;
-        });
-      }
+      add("waitingForDom", !tmodel.isLightweightChild && getManager().shouldHaveDom(tmodel) && !tmodel.hasDom());
       add("updatingTargetList", list(state.updatingTargetList));
       add("activeTargetList", list(state.activeTargetList));
       add("activatedTargets", list(state.activatedTargets));
       add("animatingTargets", tmodel.hasAnimatingTargets() ? list(tmodel.animatingMap) : []);
-      add("fetching", !TargetUtil.isFetchingComplete(tmodel) ? true : false);
-      add("animatingChildren", tmodel.hasAnimatingChildren() ? true : false);
-      add("updatingChildren", tmodel.hasUpdatingChildren() ? list(tmodel.updatingChildrenMap) : []);
-      add("activeChildren", tmodel.hasActiveChildren() ? list(tmodel.activeChildrenMap) : []);
-      add("deletedChildren", list((_state$lastChildrenUp7 = state.lastChildrenUpdate) === null || _state$lastChildrenUp7 === void 0 ? void 0 : _state$lastChildrenUp7.deletions));
-      add("addedChildren", list((_state$lastChildrenUp8 = state.lastChildrenUpdate) === null || _state$lastChildrenUp8 === void 0 ? void 0 : _state$lastChildrenUp8.additions));
+      add("fetching", !TargetUtil.isFetchingComplete(tmodel));
+      if (visible) {
+        add("updatingChildren", _toConsumableArray(TargetUtil.getUpdatingChildren(tmodel, undefined, "visible").keys()));
+        add("activeChildren", _toConsumableArray(TargetUtil.getActiveChildren(tmodel, "visible").keys()));
+      } else {
+        add("animatingChildren", tmodel.hasAnimatingChildren());
+        add("updatingChildren", tmodel.hasUpdatingChildren() ? list(tmodel.updatingChildrenMap) : []);
+        add("activeChildren", tmodel.hasActiveChildren() ? list(tmodel.activeChildrenMap) : []);
+      }
+      add("deletedChildren", list((_state$lastChildrenUp5 = state.lastChildrenUpdate) === null || _state$lastChildrenUp5 === void 0 ? void 0 : _state$lastChildrenUp5.deletions));
+      add("addedChildren", list((_state$lastChildrenUp6 = state.lastChildrenUpdate) === null || _state$lastChildrenUp6 === void 0 ? void 0 : _state$lastChildrenUp6.additions));
       add("noDomUpdatingTargets", list(tmodel.noDomUpdatingTargets));
       add("pendingTargets", list(tmodel.pendingTargets));
-      add("needsReattach", getManager().needsReattach(tmodel) ? true : false);
-      return blockers.filter(function (blocker) {
-        if (Array.isArray(blocker.value)) {
-          return blocker.value.length > 0;
-        }
-        return !!blocker.value;
-      });
+      if (tmodel.hasDom()) {
+        add("styleTargetMap", list(tmodel.styleTargetMap));
+        add("asyncStyleTargetMap", list(tmodel.asyncStyleTargetMap));
+      }
+      add("needsReattach", getManager().needsReattach(tmodel));
+      return blockers;
+    }
+  }, {
+    key: "hasPendingStyles",
+    value: function hasPendingStyles(tmodel) {
+      var _tmodel$styleTargetMa, _tmodel$asyncStyleTar;
+      return tmodel.hasDom() && (((_tmodel$styleTargetMa = tmodel.styleTargetMap) === null || _tmodel$styleTargetMa === void 0 ? void 0 : _tmodel$styleTargetMa.size) > 0 || ((_tmodel$asyncStyleTar = tmodel.asyncStyleTargetMap) === null || _tmodel$asyncStyleTar === void 0 ? void 0 : _tmodel$asyncStyleTar.size) > 0);
     }
   }, {
     key: "isFetchingComplete",
@@ -567,6 +567,9 @@ var TargetUtil = /*#__PURE__*/function () {
       var keyIndex = tmodel.functionTargetNames.findIndex(function (name) {
         return key === name;
       });
+      if (TargetUtil.hasPendingStyles(tmodel)) {
+        return "pending styles";
+      }
       for (var i = keyIndex - 1; i >= 0; i--) {
         var targetName = tmodel.functionTargetNames[i];
         if (tmodel.isTargetImperative(targetName)) {
@@ -582,9 +585,12 @@ var TargetUtil = /*#__PURE__*/function () {
           return tmodel.oid + "." + targetName + ": " + tmodel.getUpdatingImperativeTargets(targetName);
         }
         if (tmodel.isTargetTreeComplete(targetName) !== true) {
-          //const activeChildrenList = [ ...TargetUtil.getActiveChildren(tmodel, tmodel.targets[targetName].completionScope).values() ];
-          //return  tmodel.oid + "." + targetName + " ==> " + tmodel.getTargetStatus(targetName) + ", " + TargetUtil.isTargetTreeComplete(tmodel, targetName) + ":: " + activeChildrenList.map(t => t.oid + ':' + t.hasAnyUpdates()) + ", " + [ ...TargetUtil.getUpdatingChildren(tmodel, targetName, tmodel.targets[targetName].completionScope).keys() ]; 
-          return false;
+          var _tmodel$targets$targe;
+          var completionScope = (_tmodel$targets$targe = tmodel.targets[targetName].completionScope) !== null && _tmodel$targets$targe !== void 0 ? _tmodel$targets$targe : "all";
+          var reason = TargetUtil.isTargetTreeComplete(tmodel, targetName);
+          var activeChildren = _toConsumableArray(TargetUtil.getActiveChildren(tmodel, completionScope).keys());
+          var updatingChildren = _toConsumableArray(TargetUtil.getUpdatingChildren(tmodel, targetName, completionScope).keys());
+          return "".concat(tmodel.oid, ".").concat(targetName, ": ").concat(reason, "; active=[").concat(activeChildren.join(", "), "]; updating=[").concat(updatingChildren.join(", "), "]");
         }
       }
       return true;
@@ -593,14 +599,19 @@ var TargetUtil = /*#__PURE__*/function () {
     key: "isTargetTreeComplete",
     value: function isTargetTreeComplete(tmodel, key, completionScopeOverride) {
       var target = tmodel.targets[key];
+      var targetValue = tmodel.targetValues[key];
+      var childAction = targetValue === null || targetValue === void 0 ? void 0 : targetValue.childAction;
       if (target) {
-        var _target$childAction, _target$childAction2, _target$childAction3, _tmodel$particleRunti;
+        var _tmodel$particleRunti2, _tmodel$particleRunti3;
         var completionScope = completionScopeOverride !== null && completionScopeOverride !== void 0 ? completionScopeOverride : target.completionScope;
+        if ((_tmodel$particleRunti2 = tmodel.particleRuntime) !== null && _tmodel$particleRunti2 !== void 0 && _tmodel$particleRunti2.hasPending(key, completionScope !== null && completionScope !== void 0 ? completionScope : "all")) {
+          return "pending GPU children";
+        }
         var targetType = _typeof(target.value);
         if (TargetData.controlTargetMap[key]) {
           return true;
         }
-        if (!target.fetchAction && (targetType === 'string' || targetType === 'number' || targetType === 'boolean')) {
+        if (!TargetUtil.hasFetchAction(tmodel, key) && (targetType === 'string' || targetType === 'number' || targetType === 'boolean')) {
           return true;
         }
         if (getManager().needsReattach(tmodel)) {
@@ -612,19 +623,20 @@ var 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, completionScope).size > 0) {
-          return 'updating children';
+        var children;
+        if ((childAction === null || childAction === void 0 ? void 0 : childAction.length) > 0 && (children = TargetUtil.getUpdatingChildren(tmodel, key, completionScope)).size > 0) {
+          return "updating children: " + _toConsumableArray(children.keys()).join(", ");
         }
-        if (((_target$childAction2 = target.childAction) === null || _target$childAction2 === void 0 ? void 0 : _target$childAction2.length) > 0 && TargetUtil.getActiveChildren(tmodel, completionScope).size > 0) {
-          return 'active children';
+        if ((childAction === null || childAction === void 0 ? void 0 : childAction.length) > 0 && (children = TargetUtil.getActiveChildren(tmodel, completionScope)).size > 0) {
+          return "active children: " + _toConsumableArray(children.keys()).join(", ");
         }
-        if (((_target$childAction3 = target.childAction) === null || _target$childAction3 === void 0 ? void 0 : _target$childAction3.length) > 0 && TargetUtil.areTargetChildrenComplete(target.childAction, completionScope) !== true) {
-          return 'incomplete children';
+        if ((childAction === null || childAction === void 0 ? void 0 : childAction.length) > 0 && (children = TargetUtil.areTargetChildrenComplete(childAction, completionScope)) !== true) {
+          return "incomplete children: " + children;
         }
-        if (target.fetchAction && !getLoader().isLoadingSuccessful(tmodel, key)) {
+        if (TargetUtil.hasFetchAction(tmodel, key) && !getLoader().isLoadingSuccessful(tmodel, key)) {
           return 'incomplete loading';
         }
-        if ((_tmodel$particleRunti = tmodel.particleRuntime) !== null && _tmodel$particleRunti !== void 0 && _tmodel$particleRunti.hasPending(key, completionScope)) {
+        if ((_tmodel$particleRunti3 = tmodel.particleRuntime) !== null && _tmodel$particleRunti3 !== void 0 && _tmodel$particleRunti3.hasPending(key, completionScope)) {
           return "pending GPU children";
         }
       }
@@ -697,9 +709,9 @@ var TargetUtil = /*#__PURE__*/function () {
               if (imperativeOriginalTarget === originalTargetName) {
                 childrenMap.set(child.oid, child);
               } else if (imperativeOriginalTarget) {
-                var _child$targetValues$t3, _originalTModel$targe;
+                var _child$targetValues$t3, _originalTModel$targe3;
                 var originalTModel = (_child$targetValues$t3 = child.targetValues[target]) === null || _child$targetValues$t3 === void 0 ? void 0 : _child$targetValues$t3.originalTModel;
-                if (((_originalTModel$targe = originalTModel.targets[imperativeOriginalTarget]) === null || _originalTModel$targe === void 0 ? void 0 : _originalTModel$targe.originalTargetName) === originalTargetName) {
+                if (((_originalTModel$targe3 = originalTModel.targets[imperativeOriginalTarget]) === null || _originalTModel$targe3 === void 0 ? void 0 : _originalTModel$targe3.originalTargetName) === originalTargetName) {
                   childrenMap.set(child.oid, child);
                 }
               }
@@ -767,6 +779,10 @@ var TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "shouldIgnoreChildForCompletion",
     value: function shouldIgnoreChildForCompletion(child, completionScope) {
+      if (child && typeof child.exists !== "function") {
+        console.warn("Invalid child reference", JSON.stringify(child));
+        return true;
+      }
       if (!child || !child.exists()) {
         return true;
       }
@@ -796,44 +812,44 @@ var TargetUtil = /*#__PURE__*/function () {
       }
     }
   }, {
-    key: "markChildAction",
-    value: function markChildAction(parentTModel, parentTargetName, child) {
-      var target = parentTModel.targets[parentTargetName];
-      if (_typeof(target) === 'object') {
-        if (!target['childAction']) {
-          target['childAction'] = [child];
-        } else if (!target['childAction'].includes(child)) {
-          target['childAction'].push(child);
-        }
+    key: "markTargetChildAction",
+    value: function markTargetChildAction(tmodel, key, child, action) {
+      var _tmodel$targetValues4, _tmodel$targetValues5, _targetValue$action;
+      if (!child || !(tmodel !== null && tmodel !== void 0 && tmodel.targets[key]) || _typeof(tmodel.targets[key]) !== "object") {
+        return;
+      }
+      var targetValue = (_tmodel$targetValues5 = (_tmodel$targetValues4 = tmodel.targetValues)[key]) !== null && _tmodel$targetValues5 !== void 0 ? _tmodel$targetValues5 : _tmodel$targetValues4[key] = TargetUtil.emptyValue();
+      var children = (_targetValue$action = targetValue[action]) !== null && _targetValue$action !== void 0 ? _targetValue$action : targetValue[action] = [];
+      if (!children.includes(child)) {
+        children.push(child);
       }
     }
+  }, {
+    key: "markChildAction",
+    value: function markChildAction(tmodel, key, child) {
+      TargetUtil.markTargetChildAction(tmodel, key, child, "childAction");
+    }
   }, {
     key: "markAddChild",
-    value: function markAddChild(parentTModel, parentTargetName, child) {
-      var target = parentTModel.targets[parentTargetName];
-      if (_typeof(target) === 'object') {
-        if (!target['addChildAction']) {
-          target['addChildAction'] = [child];
-        } else if (!target['addChildAction'].includes(child)) {
-          target['addChildAction'].push(child);
-        }
-      }
+    value: function markAddChild(tmodel, key, child) {
+      TargetUtil.markTargetChildAction(tmodel, key, child, "addChildAction");
     }
   }, {
     key: "markFetchAction",
     value: function markFetchAction(tmodel) {
-      if (!tmodel) {
+      var key = TargetUtil.currentTargetName;
+      if (!(tmodel !== null && tmodel !== void 0 && tmodel.targets[key])) {
         return;
       }
-      var currentTargetName = TargetUtil.currentTargetName;
-      var target = tmodel.targets[currentTargetName];
-      if (_typeof(target) === 'object') {
-        target['fetchAction'] = true;
-        if (!tmodel.fetchActionTargetList.includes(currentTargetName)) {
-          tmodel.fetchActionTargetList.push(currentTargetName);
-        }
+      if (!tmodel.fetchActionTargetList.includes(key)) {
+        tmodel.fetchActionTargetList.push(key);
       }
     }
+  }, {
+    key: "hasFetchAction",
+    value: function hasFetchAction(tmodel, key) {
+      return tmodel.fetchActionTargetList.includes(key);
+    }
   }, {
     key: "wrapTarget",
     value: function wrapTarget(tmodel, target, key) {
@@ -867,9 +883,9 @@ var TargetUtil = /*#__PURE__*/function () {
     value: function getOriginalNames(tmodel, key) {
       var originalTModel, originalTargetName;
       if (tmodel.isTargetImperative(key)) {
-        var _tmodel$targetValues$6, _tmodel$targetValues$7;
-        originalTModel = (_tmodel$targetValues$6 = tmodel.targetValues[key]) === null || _tmodel$targetValues$6 === void 0 ? void 0 : _tmodel$targetValues$6.originalTModel;
-        originalTargetName = (_tmodel$targetValues$7 = tmodel.targetValues[key]) === null || _tmodel$targetValues$7 === void 0 ? void 0 : _tmodel$targetValues$7.originalTargetName;
+        var _tmodel$targetValues$7, _tmodel$targetValues$8;
+        originalTModel = (_tmodel$targetValues$7 = tmodel.targetValues[key]) === null || _tmodel$targetValues$7 === void 0 ? void 0 : _tmodel$targetValues$7.originalTModel;
+        originalTargetName = (_tmodel$targetValues$8 = tmodel.targetValues[key]) === null || _tmodel$targetValues$8 === void 0 ? void 0 : _tmodel$targetValues$8.originalTargetName;
       } else {
         var _tmodel$targets$key4, _tmodel$targets$key5;
         originalTModel = (_tmodel$targets$key4 = tmodel.targets[key]) === null || _tmodel$targets$key4 === void 0 ? void 0 : _tmodel$targets$key4.originalTModel;
@@ -961,14 +977,15 @@ var TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "resetTargetChildActions",
     value: function resetTargetChildActions(tmodel, key) {
+      var _targetValue$childAct, _targetValue$addChild;
       var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       var visited = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : new Set();
-      var target = tmodel.targets[key];
-      if (!target) {
+      var targetValue = tmodel.targetValues[key];
+      if (!targetValue) {
         return;
       }
-      var childActions = target.childAction ? _toConsumableArray(target.childAction) : [];
-      var addChildActions = target.addChildAction ? _toConsumableArray(target.addChildAction) : [];
+      var childActions = _toConsumableArray((_targetValue$childAct = targetValue.childAction) !== null && _targetValue$childAct !== void 0 ? _targetValue$childAct : []);
+      var addChildActions = _toConsumableArray((_targetValue$addChild = targetValue.addChildAction) !== null && _targetValue$addChild !== void 0 ? _targetValue$addChild : []);
       childActions.forEach(function (child) {
         if (child) {
           TargetUtil.resetTargetChildState(child, options, visited);
@@ -980,11 +997,11 @@ var TargetUtil = /*#__PURE__*/function () {
         }
       });
       if (options.clearChildActions) {
-        if (Array.isArray(target.childAction)) {
-          target.childAction.length = 0;
+        if (Array.isArray(targetValue.childAction)) {
+          targetValue.childAction = [];
         }
-        if (Array.isArray(target.addChildAction)) {
-          target.addChildAction.length = 0;
+        if (Array.isArray(targetValue.addChildAction)) {
+          targetValue.addChildAction = [];
         }
       }
     }
@@ -1002,8 +1019,8 @@ var TargetUtil = /*#__PURE__*/function () {
       }
     }
   }, {
-    key: "resetSingleTargetState",
-    value: function resetSingleTargetState(tmodel, key) {
+    key: "resetTargetStateOnly",
+    value: function resetTargetStateOnly(tmodel, key) {
       var _tmodel$targets$key6;
       var targetValue = tmodel.targetValues[key];
       var nextTarget = (_tmodel$targets$key6 = tmodel.targets[key]) === null || _tmodel$targets$key6 === void 0 ? void 0 : _tmodel$targets$key6.activateNextTarget;
@@ -1016,15 +1033,38 @@ var TargetUtil = /*#__PURE__*/function () {
         targetValue.resetFlag = true;
         targetValue.nextTargetUpdateCount = 0;
         targetValue.visibleCompleteSignature = undefined;
-        targetValue.status = '';
+        targetValue.status = "";
       }
-      tmodel.cancelAnimation();
-      tmodel.activatedTargets.length = 0;
       tmodel.removeFromActiveTargets(key);
       tmodel.removeFromAnimatingMap(key);
       tmodel.removeFromUpdatingTargets(key);
       TargetUtil.clearPendingTarget(tmodel, key);
     }
+  }, {
+    key: "resetSingleTargetState",
+    value: function resetSingleTargetState(tmodel, key) {
+      TargetUtil.resetTargetStateOnly(tmodel, key);
+      tmodel.cancelAnimation();
+      tmodel.activatedTargets.length = 0;
+    }
+  }, {
+    key: "resetRemovedChildTarget",
+    value: function resetRemovedChildTarget(tmodel, key, child) {
+      var targetValue = tmodel.targetValues[key];
+      if (!targetValue) {
+        return;
+      }
+      TargetUtil.resetTargetStateOnly(tmodel, key);
+      for (var _i2 = 0, _arr2 = ["childAction", "addChildAction"]; _i2 < _arr2.length; _i2++) {
+        var _children$indexOf;
+        var name = _arr2[_i2];
+        var children = targetValue[name];
+        var index = (_children$indexOf = children === null || children === void 0 ? void 0 : children.indexOf(child)) !== null && _children$indexOf !== void 0 ? _children$indexOf : -1;
+        if (index >= 0) {
+          children.splice(index, 1);
+        }
+      }
+    }
   }, {
     key: "convertAnimatingTargetsToUpdating",
     value: function convertAnimatingTargetsToUpdating(tmodels) {
@@ -1066,6 +1106,27 @@ var TargetUtil = /*#__PURE__*/function () {
         clearChildActions: reset === 'tree' || reset === 'all'
       };
     }
+  }, {
+    key: "isTargetUpdating",
+    value: function isTargetUpdating(tmodel, key) {
+      var targetValue = tmodel.targetValues[key];
+      if (!targetValue) {
+        return false;
+      }
+      var valuePointer = tmodel.getValueListPointer(key);
+      var cycle = tmodel.getTargetCycle(key);
+      var cycles = tmodel.getTargetCycles(key);
+      var step = tmodel.getTargetStep(key);
+      var steps = tmodel.getTargetSteps(key);
+      if (Array.isArray(targetValue.valueList) && valuePointer < targetValue.valueList.length) {
+        return true;
+      } else if (tmodel.isTargetImperative(key) && cycle < cycles - 1) {
+        return true;
+      } else if (step < steps) {
+        return true;
+      }
+      return false;
+    }
   }]);
 }();
 export { TargetUtil };

package/build/VisibilityUtil.js

@@ -100,16 +100,14 @@ var VisibilityUtil = /*#__PURE__*/function () {
   }, {
     key: "getParentClip",
     value: function getParentClip(parent) {
-      var _parent$$dom, _parent$$dom2;
-      var domScrollLeft = ((_parent$$dom = parent.$dom) === null || _parent$$dom === void 0 ? void 0 : _parent$$dom.getScrollLeft()) || 0;
-      var domScrollTop = ((_parent$$dom2 = parent.$dom) === null || _parent$$dom2 === void 0 ? void 0 : _parent$$dom2.getScrollTop()) || 0;
-      var height = parent.getHeight();
-      var width = parent.getWidth();
+      var _parent$$dom$getScrol, _parent$$dom, _parent$$dom$getScrol2, _parent$$dom2;
+      var domScrollLeft = (_parent$$dom$getScrol = (_parent$$dom = parent.$dom) === null || _parent$$dom === void 0 ? void 0 : _parent$$dom.getScrollLeft()) !== null && _parent$$dom$getScrol !== void 0 ? _parent$$dom$getScrol : 0;
+      var domScrollTop = (_parent$$dom$getScrol2 = (_parent$$dom2 = parent.$dom) === null || _parent$$dom2 === void 0 ? void 0 : _parent$$dom2.getScrollTop()) !== null && _parent$$dom$getScrol2 !== void 0 ? _parent$$dom$getScrol2 : 0;
       return {
         x: parent.absX + domScrollLeft,
         y: parent.absY + domScrollTop,
-        r: parent.absX + width + domScrollLeft,
-        b: parent.absY + height + domScrollTop,
+        r: parent.absX + parent.getWidth() + domScrollLeft,
+        b: parent.absY + parent.getHeight() + domScrollTop,
         source: parent
       };
     }
@@ -122,17 +120,30 @@ var VisibilityUtil = /*#__PURE__*/function () {
   }, {
     key: "intersectRects",
     value: function intersectRects(parent, a, b) {
-      var _parent$$dom3, _parent$$dom4;
-      var domScrollLeft = ((_parent$$dom3 = parent.$dom) === null || _parent$$dom3 === void 0 ? void 0 : _parent$$dom3.getScrollLeft()) || 0;
-      var domScrollTop = ((_parent$$dom4 = parent.$dom) === null || _parent$$dom4 === void 0 ? void 0 : _parent$$dom4.getScrollTop()) || 0;
+      var _parent$$dom$getScrol3, _parent$$dom3, _parent$$dom$getScrol4, _parent$$dom4;
+      var scrollLeft = (_parent$$dom$getScrol3 = (_parent$$dom3 = parent.$dom) === null || _parent$$dom3 === void 0 ? void 0 : _parent$$dom3.getScrollLeft()) !== null && _parent$$dom$getScrol3 !== void 0 ? _parent$$dom$getScrol3 : 0;
+      var scrollTop = (_parent$$dom$getScrol4 = (_parent$$dom4 = parent.$dom) === null || _parent$$dom4 === void 0 ? void 0 : _parent$$dom4.getScrollTop()) !== null && _parent$$dom$getScrol4 !== void 0 ? _parent$$dom$getScrol4 : 0;
       return {
-        x: Math.max(a.x - domScrollLeft, b.x - domScrollLeft),
-        y: Math.max(a.y - domScrollTop, b.y - domScrollTop),
-        r: Math.min(a.r - domScrollLeft, b.r - domScrollLeft),
-        b: Math.min(a.b - domScrollTop, b.b - domScrollTop),
+        x: Math.max(a.x, b.x) - scrollLeft,
+        y: Math.max(a.y, b.y) - scrollTop,
+        r: Math.min(a.r, b.r) - scrollLeft,
+        b: Math.min(a.b, b.b) - scrollTop,
         source: b.source
       };
     }
+  }, {
+    key: "getUnappliedScroll",
+    value: function getUnappliedScroll(tmodel) {
+      var _tmodel$$dom$getScrol, _tmodel$$dom, _tmodel$$dom$getScrol2, _tmodel$$dom2, _tmodel$getScrollTop, _tmodel$getScrollLeft;
+      var domTop = (_tmodel$$dom$getScrol = (_tmodel$$dom = tmodel.$dom) === null || _tmodel$$dom === void 0 ? void 0 : _tmodel$$dom.getScrollTop()) !== null && _tmodel$$dom$getScrol !== void 0 ? _tmodel$$dom$getScrol : 0;
+      var domLeft = (_tmodel$$dom$getScrol2 = (_tmodel$$dom2 = tmodel.$dom) === null || _tmodel$$dom2 === void 0 ? void 0 : _tmodel$$dom2.getScrollLeft()) !== null && _tmodel$$dom$getScrol2 !== void 0 ? _tmodel$$dom$getScrol2 : 0;
+      var modelTop = (_tmodel$getScrollTop = tmodel.getScrollTop()) !== null && _tmodel$getScrollTop !== void 0 ? _tmodel$getScrollTop : 0;
+      var modelLeft = (_tmodel$getScrollLeft = tmodel.getScrollLeft()) !== null && _tmodel$getScrollLeft !== void 0 ? _tmodel$getScrollLeft : 0;
+      return {
+        x: Math.max(0, domLeft - modelLeft),
+        y: Math.max(0, domTop - modelTop)
+      };
+    }
   }]);
 }();
 export { VisibilityUtil };