targetj 1.1.0 → 1.1.2

package/build/StateUtil.js

@@ -1,3 +1,5 @@
+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 _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); }
@@ -24,10 +26,10 @@ var TMODEL_REF_KEY = "__targetjsTModelRef";
  * These fields are reconstructed separately or must be connected to the
  * current DOM rather than copied from the old tree.
  */
-var EXCLUDED_RUNTIME_FIELDS = new Set(["_state", "targets", "targetDefinitions", "restoringRuntime", "restoredUsesExistingDom", "particleRenderer", "particleRuntime", "particleSyncPromise", "layoutCompleteWaiters", "isPrevTargetUpdated", "type", "oid", "oidNum", "originalId", "parent", "allChildrenList", "allChildrenMap", "$dom", "viewport", "visibilityStatus", "currentStatus", "dirtyLayout", "originWindowEpoch", "hasDomNow", "isNowVisible", "domHeightTimestamp", "domWidthTimestamp", "lastBatch", "waapiBatch", "finalKeyframe", "finalRawFrame"]);
+var EXCLUDED_RUNTIME_FIELDS = new Set(["_state", "targets", "targetDefinitions", "restoringRuntime", "restoredUsesExistingDom", "particleRenderer", "particleRuntime", "particleSyncPromise", "layoutCompleteWaiters", "isPrevTargetUpdated", "type", "oid", "oidNum", "originalId", "parent", "allChildrenList", "allChildrenMap", "bracket", "$dom", "viewport", "visibilityStatus", "currentStatus", "dirtyLayout", "originWindowEpoch", "hasDomNow", "isNowVisible", "domHeightTimestamp", "domWidthTimestamp", "lastBatch", "waapiBatch", "finalKeyframe", "finalRawFrame"]);
 var CHILD_OPERATION_FIELDS = ["addedChildren", "deletedChildren", "movedChildren"];
-var RUNTIME_TIMESTAMP_FIELDS = new Set(["lastUpdate", "scheduleTimeStamp", "completeTime", "creationTime", "activationTime", "catchupAt", "startTime", "lastResizeHandledTime"]);
-var TARGET_RUNTIME_FIELDS = ["originalTargetName", "originalTModel", "invokerTargetName", "invokerTModel", "fetchAction", "childAction", "addChildAction"];
+var RUNTIME_TIMESTAMP_FIELDS = new Set(["lastUpdate", "scheduleTimeStamp", "completeTime", "creationTime", "activationTime", "catchupAt", "startTime", "segmentStartTime", "pausedAt", "lastResizeHandledTime"]);
+var TARGET_RUNTIME_FIELDS = ["originalTargetName", "originalTModel", "invokerTargetName", "invokerTModel"];
 
 /**
  * Creates and restores in-memory TargetJS runtime snapshots.
@@ -138,6 +140,11 @@ var StateUtil = /*#__PURE__*/function () {
         return value;
       }
       if (StateUtil.isTModel(value)) {
+        var _value$getParent;
+        var parent = (_value$getParent = value.getParent) === null || _value$getParent === void 0 ? void 0 : _value$getParent.call(value);
+        if (parent && typeof value.exists === "function" && !value.exists()) {
+          return undefined;
+        }
         return StateUtil.createTModelReference(value);
       }
       if (seen.has(value)) {
@@ -216,21 +223,26 @@ var StateUtil = /*#__PURE__*/function () {
     key: "decodeValue",
     value: function decodeValue(value, tmodelIdMap) {
       var seen = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new WeakMap();
-      if (value === null || value === undefined || _typeof(value) !== "object") {
+      if (value === null || _typeof(value) !== "object") {
         return value;
       }
-      if (StateUtil.isTModelReference(value)) {
-        return tmodelIdMap[value[TMODEL_REF_KEY]];
-      }
       if (seen.has(value)) {
         return seen.get(value);
       }
+      if (Array.isArray(value)) {
+        var _copy4 = new Array(value.length);
+        seen.set(value, _copy4);
+        for (var index = 0; index < value.length; index++) {
+          _copy4[index] = StateUtil.decodeValue(value[index], tmodelIdMap, seen);
+        }
+        return _copy4;
+      }
       if (value instanceof Date) {
         return new Date(value.getTime());
       }
       if (value instanceof Map) {
-        var _copy4 = new Map();
-        seen.set(value, _copy4);
+        var _copy5 = new Map();
+        seen.set(value, _copy5);
         var _iterator6 = _createForOfIteratorHelper(value),
           _step6;
         try {
@@ -238,59 +250,45 @@ var StateUtil = /*#__PURE__*/function () {
             var _step6$value = _slicedToArray(_step6.value, 2),
               key = _step6$value[0],
               mapValue = _step6$value[1];
-            _copy4.set(StateUtil.decodeValue(key, tmodelIdMap, seen), StateUtil.decodeValue(mapValue, tmodelIdMap, seen));
+            _copy5.set(StateUtil.decodeValue(key, tmodelIdMap, seen), StateUtil.decodeValue(mapValue, tmodelIdMap, seen));
           }
         } catch (err) {
           _iterator6.e(err);
         } finally {
           _iterator6.f();
         }
-        return _copy4;
+        return _copy5;
       }
       if (value instanceof Set) {
-        var _copy5 = new Set();
-        seen.set(value, _copy5);
+        var _copy6 = new Set();
+        seen.set(value, _copy6);
         var _iterator7 = _createForOfIteratorHelper(value),
           _step7;
         try {
           for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
             var item = _step7.value;
-            _copy5.add(StateUtil.decodeValue(item, tmodelIdMap, seen));
+            _copy6.add(StateUtil.decodeValue(item, tmodelIdMap, seen));
           }
         } catch (err) {
           _iterator7.e(err);
         } finally {
           _iterator7.f();
         }
-        return _copy5;
-      }
-      if (Array.isArray(value)) {
-        var _copy6 = [];
-        seen.set(value, _copy6);
-        var _iterator8 = _createForOfIteratorHelper(value),
-          _step8;
-        try {
-          for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-            var _item2 = _step8.value;
-            _copy6.push(StateUtil.decodeValue(_item2, tmodelIdMap, seen));
-          }
-        } catch (err) {
-          _iterator8.e(err);
-        } finally {
-          _iterator8.f();
-        }
         return _copy6;
       }
-      if (!StateUtil.isPlainObject(value)) {
+      var prototype = Object.getPrototypeOf(value);
+      if (prototype !== Object.prototype && prototype !== null) {
         return value;
       }
+      if (Object.prototype.hasOwnProperty.call(value, TMODEL_REF_KEY)) {
+        var _tmodelIdMap$value$TM;
+        return (_tmodelIdMap$value$TM = tmodelIdMap[value[TMODEL_REF_KEY]]) !== null && _tmodelIdMap$value$TM !== void 0 ? _tmodelIdMap$value$TM : value;
+      }
       var copy = {};
       seen.set(value, copy);
-      for (var _i5 = 0, _Object$entries2 = Object.entries(value); _i5 < _Object$entries2.length; _i5++) {
-        var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i5], 2),
-          _key2 = _Object$entries2$_i[0],
-          propertyValue = _Object$entries2$_i[1];
-        copy[_key2] = StateUtil.decodeValue(propertyValue, tmodelIdMap, seen);
+      for (var _i5 = 0, _Object$keys3 = Object.keys(value); _i5 < _Object$keys3.length; _i5++) {
+        var _key2 = _Object$keys3[_i5];
+        copy[_key2] = StateUtil.decodeValue(value[_key2], tmodelIdMap, seen);
       }
       return copy;
     }
@@ -298,11 +296,16 @@ var StateUtil = /*#__PURE__*/function () {
     key: "resolveTModelReferencesInPlace",
     value: function resolveTModelReferencesInPlace(value, tmodelIdMap) {
       var seen = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new WeakSet();
+      var clearUnresolved = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
       if (value === null || value === undefined || _typeof(value) !== "object") {
         return value;
       }
       if (StateUtil.isTModelReference(value)) {
-        return tmodelIdMap[value[TMODEL_REF_KEY]];
+        var resolved = tmodelIdMap[value[TMODEL_REF_KEY]];
+        if (resolved) {
+          return resolved;
+        }
+        return clearUnresolved ? undefined : value;
       }
       if (seen.has(value)) {
         return value;
@@ -314,51 +317,53 @@ var StateUtil = /*#__PURE__*/function () {
       if (value instanceof Map) {
         var entries = _toConsumableArray(value.entries());
         value.clear();
-        var _iterator9 = _createForOfIteratorHelper(entries),
-          _step9;
+        var _iterator8 = _createForOfIteratorHelper(entries),
+          _step8;
         try {
-          for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-            var _step9$value = _slicedToArray(_step9.value, 2),
-              key = _step9$value[0],
-              mapValue = _step9$value[1];
-            value.set(StateUtil.resolveTModelReferencesInPlace(key, tmodelIdMap, seen), StateUtil.resolveTModelReferencesInPlace(mapValue, tmodelIdMap, seen));
+          for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+            var _step8$value = _slicedToArray(_step8.value, 2),
+              key = _step8$value[0],
+              mapValue = _step8$value[1];
+            var resolvedKey = StateUtil.resolveTModelReferencesInPlace(key, tmodelIdMap, seen, clearUnresolved);
+            var resolvedValue = StateUtil.resolveTModelReferencesInPlace(mapValue, tmodelIdMap, seen, clearUnresolved);
+            value.set(resolvedKey, resolvedValue);
           }
         } catch (err) {
-          _iterator9.e(err);
+          _iterator8.e(err);
         } finally {
-          _iterator9.f();
+          _iterator8.f();
         }
         return value;
       }
       if (value instanceof Set) {
         var _entries = _toConsumableArray(value);
         value.clear();
-        var _iterator10 = _createForOfIteratorHelper(_entries),
-          _step10;
+        var _iterator9 = _createForOfIteratorHelper(_entries),
+          _step9;
         try {
-          for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-            var item = _step10.value;
-            value.add(StateUtil.resolveTModelReferencesInPlace(item, tmodelIdMap, seen));
+          for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+            var item = _step9.value;
+            value.add(StateUtil.resolveTModelReferencesInPlace(item, tmodelIdMap, seen, clearUnresolved));
           }
         } catch (err) {
-          _iterator10.e(err);
+          _iterator9.e(err);
         } finally {
-          _iterator10.f();
+          _iterator9.f();
         }
         return value;
       }
       if (Array.isArray(value)) {
         for (var index = 0; index < value.length; index++) {
-          value[index] = StateUtil.resolveTModelReferencesInPlace(value[index], tmodelIdMap, seen);
+          value[index] = StateUtil.resolveTModelReferencesInPlace(value[index], tmodelIdMap, seen, clearUnresolved);
         }
         return value;
       }
       if (!StateUtil.isPlainObject(value)) {
         return value;
       }
-      for (var _i6 = 0, _Object$keys3 = Object.keys(value); _i6 < _Object$keys3.length; _i6++) {
-        var _key3 = _Object$keys3[_i6];
-        value[_key3] = StateUtil.resolveTModelReferencesInPlace(value[_key3], tmodelIdMap, seen);
+      for (var _i6 = 0, _Object$keys4 = Object.keys(value); _i6 < _Object$keys4.length; _i6++) {
+        var _key3 = _Object$keys4[_i6];
+        value[_key3] = StateUtil.resolveTModelReferencesInPlace(value[_key3], tmodelIdMap, seen, clearUnresolved);
       }
       return value;
     }
@@ -389,15 +394,20 @@ var StateUtil = /*#__PURE__*/function () {
   }, {
     key: "exportRuntimeState",
     value: function exportRuntimeState(tmodel) {
+      var _tmodel$getRuntimeSna;
       var fields = {};
-      for (var _i8 = 0, _Object$keys4 = Object.keys(tmodel); _i8 < _Object$keys4.length; _i8++) {
+      for (var _i8 = 0, _Object$keys5 = Object.keys(tmodel); _i8 < _Object$keys5.length; _i8++) {
         var _tmodel$excludeRuntim;
-        var key = _Object$keys4[_i8];
+        var key = _Object$keys5[_i8];
         if (EXCLUDED_RUNTIME_FIELDS.has(key) || (_tmodel$excludeRuntim = tmodel.excludeRuntimeSnapshotField) !== null && _tmodel$excludeRuntim !== void 0 && _tmodel$excludeRuntim.call(tmodel, key)) {
           continue;
         }
         fields[key] = tmodel[key];
       }
+      var additionalFields = (_tmodel$getRuntimeSna = tmodel.getRuntimeSnapshotFields) === null || _tmodel$getRuntimeSna === void 0 ? void 0 : _tmodel$getRuntimeSna.call(tmodel);
+      if (additionalFields) {
+        Object.assign(fields, additionalFields);
+      }
       var runtime = StateUtil.encodeValue({
         state: tmodel.state(),
         fields: fields
@@ -415,10 +425,10 @@ var StateUtil = /*#__PURE__*/function () {
       var restored = StateUtil.decodeValue(runtime, tmodelIdMap);
       StateUtil.rebaseRuntimeTimes(restored, timeOffset);
       tmodel._state = restored.state || {};
-      for (var _i9 = 0, _Object$entries3 = Object.entries(restored.fields || {}); _i9 < _Object$entries3.length; _i9++) {
-        var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i9], 2),
-          key = _Object$entries3$_i[0],
-          value = _Object$entries3$_i[1];
+      for (var _i9 = 0, _Object$entries2 = Object.entries(restored.fields || {}); _i9 < _Object$entries2.length; _i9++) {
+        var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i9], 2),
+          key = _Object$entries2$_i[0],
+          value = _Object$entries2$_i[1];
         if (EXCLUDED_RUNTIME_FIELDS.has(key)) {
           continue;
         }
@@ -439,7 +449,8 @@ var StateUtil = /*#__PURE__*/function () {
   }, {
     key: "createRuntimeSnapshot",
     value: function createRuntimeSnapshot(tmodel) {
-      var _tmodel$allChildrenLi, _tmodel$oidNum, _tmodel$targets, _tmodel$targets2, _tmodel$originalTarge;
+      var _tmodel$getChildren, _tmodel$allChildrenLi, _tmodel$oidNum, _tmodel$targets, _tmodel$targets2, _tmodel$originalTarge;
+      (_tmodel$getChildren = tmodel.getChildren) === null || _tmodel$getChildren === void 0 || _tmodel$getChildren.call(tmodel);
       var children = _toConsumableArray((_tmodel$allChildrenLi = tmodel.allChildrenList) !== null && _tmodel$allChildrenLi !== void 0 ? _tmodel$allChildrenLi : []);
       var targetDefinitions = TUtil.cloneTargetDefinition(tmodel.targetDefinitions);
       return {
@@ -518,17 +529,17 @@ var StateUtil = /*#__PURE__*/function () {
           runtime: modelSnapshot.runtime,
           targetRuntime: modelSnapshot.targetRuntime
         });
-        var _iterator11 = _createForOfIteratorHelper(modelSnapshot.children || []),
-          _step11;
+        var _iterator10 = _createForOfIteratorHelper(modelSnapshot.children || []),
+          _step10;
         try {
-          for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-            var childSnapshot = _step11.value;
+          for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+            var childSnapshot = _step10.value;
             _buildTree(childSnapshot, tmodel);
           }
         } catch (err) {
-          _iterator11.e(err);
+          _iterator10.e(err);
         } finally {
-          _iterator11.f();
+          _iterator10.f();
         }
         return tmodel;
       };
@@ -549,9 +560,49 @@ var StateUtil = /*#__PURE__*/function () {
           runtime = _imports2$_i.runtime;
         StateUtil.importRuntimeState(_tmodel2, runtime, tmodelIdMap, options);
       }
+      var runtimeReferenceMap = _objectSpread({}, tmodelIdMap);
+      for (var _i13 = 0, _models2 = models; _i13 < _models2.length; _i13++) {
+        var _tmodel3$childHandles;
+        var _tmodel3 = _models2[_i13];
+        var _iterator11 = _createForOfIteratorHelper((_tmodel3$childHandles = _tmodel3.childHandles) !== null && _tmodel3$childHandles !== void 0 ? _tmodel3$childHandles : []),
+          _step11;
+        try {
+          for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+            var child = _step11.value;
+            runtimeReferenceMap[child.oid] = child;
+          }
+        } catch (err) {
+          _iterator11.e(err);
+        } finally {
+          _iterator11.f();
+        }
+      }
+      for (var _i14 = 0, _models3 = models; _i14 < _models3.length; _i14++) {
+        var _tmodel4$childHandles;
+        var _tmodel4 = _models3[_i14];
+        StateUtil.resolveTModelReferencesInPlace(_tmodel4.targets, runtimeReferenceMap, new WeakSet(), true);
+        _tmodel4.targetValues = StateUtil.resolveTModelReferencesInPlace(_tmodel4.targetValues, runtimeReferenceMap, new WeakSet(), true);
+        _tmodel4._state = StateUtil.resolveTModelReferencesInPlace(_tmodel4._state, runtimeReferenceMap, new WeakSet(), true);
+        _tmodel4.updatingChildrenMap = StateUtil.resolveTModelReferencesInPlace(_tmodel4.updatingChildrenMap, runtimeReferenceMap, new WeakSet(), true);
+        _tmodel4.animatingChildrenMap = StateUtil.resolveTModelReferencesInPlace(_tmodel4.animatingChildrenMap, runtimeReferenceMap, new WeakSet(), true);
+        _tmodel4.activeChildrenMap = StateUtil.resolveTModelReferencesInPlace(_tmodel4.activeChildrenMap, runtimeReferenceMap, new WeakSet(), true);
+        var _iterator12 = _createForOfIteratorHelper((_tmodel4$childHandles = _tmodel4.childHandles) !== null && _tmodel4$childHandles !== void 0 ? _tmodel4$childHandles : []),
+          _step12;
+        try {
+          for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+            var _child = _step12.value;
+            _child.targets = StateUtil.resolveTModelReferencesInPlace(_child.targets, runtimeReferenceMap, new WeakSet(), true);
+            _child.targetValues = StateUtil.resolveTModelReferencesInPlace(_child.targetValues, runtimeReferenceMap, new WeakSet(), true);
+          }
+        } catch (err) {
+          _iterator12.e(err);
+        } finally {
+          _iterator12.f();
+        }
+      }
       return {
         root: root,
-        tmodelIdMap: tmodelIdMap,
+        tmodelIdMap: runtimeReferenceMap,
         models: models
       };
     }
@@ -559,17 +610,25 @@ var StateUtil = /*#__PURE__*/function () {
     key: "exportTargetRuntime",
     value: function exportTargetRuntime(tmodel) {
       var result = {};
-      for (var _i13 = 0, _Object$entries4 = Object.entries(tmodel.targets); _i13 < _Object$entries4.length; _i13++) {
-        var _Object$entries4$_i = _slicedToArray(_Object$entries4[_i13], 2),
-          targetName = _Object$entries4$_i[0],
-          target = _Object$entries4$_i[1];
+      for (var _i15 = 0, _Object$entries3 = Object.entries(tmodel.targets); _i15 < _Object$entries3.length; _i15++) {
+        var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i15], 2),
+          targetName = _Object$entries3$_i[0],
+          target = _Object$entries3$_i[1];
         if (!StateUtil.isPlainObject(target)) {
           continue;
         }
         var runtime = {};
-        for (var _i14 = 0, _TARGET_RUNTIME_FIELD = TARGET_RUNTIME_FIELDS; _i14 < _TARGET_RUNTIME_FIELD.length; _i14++) {
-          var field = _TARGET_RUNTIME_FIELD[_i14];
-          if (Object.prototype.hasOwnProperty.call(target, field)) {
+        for (var _i16 = 0, _TARGET_RUNTIME_FIELD = TARGET_RUNTIME_FIELDS; _i16 < _TARGET_RUNTIME_FIELD.length; _i16++) {
+          var field = _TARGET_RUNTIME_FIELD[_i16];
+          if (!Object.prototype.hasOwnProperty.call(target, field)) {
+            continue;
+          }
+          if ((field === "childAction" || field === "addChildAction") && Array.isArray(target[field])) {
+            runtime[field] = target[field].filter(function (child) {
+              var _child$exists;
+              return child === null || child === void 0 || (_child$exists = child.exists) === null || _child$exists === void 0 ? void 0 : _child$exists.call(child);
+            });
+          } else {
             runtime[field] = target[field];
           }
         }
@@ -582,10 +641,10 @@ var StateUtil = /*#__PURE__*/function () {
   }, {
     key: "applyTargetRuntime",
     value: function applyTargetRuntime(tmodel, encodedTargetRuntime, tmodelIdMap) {
-      for (var _i15 = 0, _Object$entries5 = Object.entries(encodedTargetRuntime || {}); _i15 < _Object$entries5.length; _i15++) {
-        var _Object$entries5$_i = _slicedToArray(_Object$entries5[_i15], 2),
-          targetName = _Object$entries5$_i[0],
-          encodedRuntime = _Object$entries5$_i[1];
+      for (var _i17 = 0, _Object$entries4 = Object.entries(encodedTargetRuntime || {}); _i17 < _Object$entries4.length; _i17++) {
+        var _Object$entries4$_i = _slicedToArray(_Object$entries4[_i17], 2),
+          targetName = _Object$entries4$_i[0],
+          encodedRuntime = _Object$entries4$_i[1];
         var target = tmodel.targets[targetName];
         if (!target) {
           continue;