@ricsam/formula-engine 0.2.9 → 0.2.10

package/dist/mjs/core/managers/dependency-manager.mjs

@@ -44,6 +44,49 @@ class DependencyManager {
     this.cacheManager = cacheManager;
     this.workbookManager = workbookManager;
   }
+  getSnapshotEligibilityState(node) {
+    if (node instanceof ResourceDependencyNode) {
+      return {
+        eligible: true,
+        reason: "resource nodes are always snapshot eligible"
+      };
+    }
+    if (node instanceof RangeEvaluationNode) {
+      return node.result.type === "awaiting-evaluation" ? {
+        eligible: false,
+        reason: "range result is still awaiting evaluation"
+      } : {
+        eligible: true,
+        reason: `range result type is ${node.result.type}`
+      };
+    }
+    return node.evaluationResult.type === "awaiting-evaluation" ? {
+      eligible: false,
+      reason: "evaluation result is still awaiting evaluation"
+    } : {
+      eligible: true,
+      reason: `evaluation result type is ${node.evaluationResult.type}`
+    };
+  }
+  logSnapshotRestoreWarning(message, payload) {
+    console.warn("[FormulaEngine snapshot]", message, payload);
+  }
+  getLogicalNodeSnapshotId(node) {
+    if (node instanceof AstEvaluationNode) {
+      return getAstNodeSnapshotId(node);
+    }
+    return node.key;
+  }
+  resetRestoredNodeToColdState(node) {
+    this.unregisterNode(node);
+    if (node instanceof ResourceDependencyNode) {
+      return;
+    }
+    if (node instanceof CellValueNode) {
+      node.clearSpillMetaNode();
+    }
+    node.invalidate();
+  }
   getSheetWatcherKey(address) {
     return `${address.workbookName}:${address.sheetName}`;
   }
@@ -351,13 +394,7 @@ class DependencyManager {
   }
   toSnapshot(evaluationManager) {
     const isNodeSnapshotEligible = (node) => {
-      if (node instanceof ResourceDependencyNode) {
-        return true;
-      }
-      if (node instanceof RangeEvaluationNode) {
-        return node.result.type !== "awaiting-evaluation";
-      }
-      return node.evaluationResult.type !== "awaiting-evaluation";
+      return this.getSnapshotEligibilityState(node).eligible;
     };
     const astNodes = new Set;
     for (const astEntries of this.asts.values()) {
@@ -395,15 +432,17 @@ class DependencyManager {
     }
     const resolvedNodes = Array.from(resolvedNodesSet);
     const allNodeSnapshotIds = new Map;
+    const availableSnapshotIds = new Set;
     for (const node of resolvedNodes) {
-      if (node instanceof AstEvaluationNode) {
-        allNodeSnapshotIds.set(node, getAstNodeSnapshotId(node));
-      } else {
-        allNodeSnapshotIds.set(node, node.key);
-      }
-    }
-    const getAllNodeSnapshotId = (node) => {
-      const snapshotId = allNodeSnapshotIds.get(node);
+      const snapshotId = this.getLogicalNodeSnapshotId(node);
+      allNodeSnapshotIds.set(node, snapshotId);
+      availableSnapshotIds.add(snapshotId);
+    }
+    const getAllNodeSnapshotId = (node, _context) => {
+      const snapshotId = allNodeSnapshotIds.get(node) ?? (() => {
+        const logicalSnapshotId = this.getLogicalNodeSnapshotId(node);
+        return availableSnapshotIds.has(logicalSnapshotId) ? logicalSnapshotId : undefined;
+      })();
       if (!snapshotId) {
         throw new Error(`Missing snapshot id for dependency node ${node.key}`);
       }
@@ -449,9 +488,25 @@ class DependencyManager {
   restoreFromSnapshot(snapshots, evaluationManager) {
     this.clearEvaluationCache();
     const nodesBySnapshotId = new Map;
+    let hadRestoreFailures = false;
     for (const snapshot of snapshots.dependency.nodes) {
-      const node = this.createNodeFromSnapshot(snapshot);
-      nodesBySnapshotId.set(snapshot.snapshotId, node);
+      try {
+        const node = this.createNodeFromSnapshot(snapshot);
+        nodesBySnapshotId.set(snapshot.snapshotId, node);
+      } catch (error) {
+        hadRestoreFailures = true;
+        this.logSnapshotRestoreWarning("Failed to create warm snapshot node; discarding warm dependency state", {
+          phase: "create-node",
+          snapshotId: snapshot.snapshotId,
+          kind: snapshot.kind,
+          key: snapshot.key,
+          error: error instanceof Error ? { name: error.name, message: error.message } : { message: String(error) }
+        });
+      }
+    }
+    if (hadRestoreFailures) {
+      this.clearEvaluationCache();
+      return;
     }
     const resolveNodeSnapshotId = (snapshotId) => nodesBySnapshotId.get(snapshotId);
     const resolveRequiredNodeSnapshotId = (snapshotId) => {
@@ -462,54 +517,71 @@ class DependencyManager {
       return node;
     };
     for (const snapshot of snapshots.dependency.nodes) {
-      const dependencies = new Set(snapshot.dependencies.map(resolveNodeSnapshotId).filter((node2) => node2 !== undefined));
-      if (snapshot.kind === "cell-value") {
-        const node2 = nodesBySnapshotId.get(snapshot.snapshotId);
-        node2.restoreResolvedSnapshot({
-          dependencies,
-          evaluationResult: evaluationManager.deserializeSingleEvaluationResultSnapshot(snapshot.evaluationResult, resolveRequiredNodeSnapshotId)
-        });
-        if (snapshot.spillMetaSnapshotId) {
-          const spillMetaNode = resolveNodeSnapshotId(snapshot.spillMetaSnapshotId);
-          if (spillMetaNode instanceof SpillMetaNode) {
-            node2.setSpillMetaNode(spillMetaNode);
-          }
-        }
-        continue;
-      }
-      if (snapshot.kind === "spill-meta") {
-        const node2 = nodesBySnapshotId.get(snapshot.snapshotId);
-        node2.restoreResolvedSnapshot({
-          dependencies,
-          evaluationResult: evaluationManager.deserializeSpillMetaEvaluationResultSnapshot(snapshot.evaluationResult, resolveRequiredNodeSnapshotId)
-        });
+      const targetNode = nodesBySnapshotId.get(snapshot.snapshotId);
+      if (!targetNode) {
+        hadRestoreFailures = true;
         continue;
       }
-      if (snapshot.kind === "empty") {
-        const node2 = nodesBySnapshotId.get(snapshot.snapshotId);
-        node2.restoreResolvedSnapshot({
+      const dependencies = new Set(snapshot.dependencies.map(resolveNodeSnapshotId).filter((node) => node !== undefined));
+      try {
+        if (snapshot.kind === "cell-value") {
+          const node2 = targetNode;
+          node2.restoreResolvedSnapshot({
+            dependencies,
+            evaluationResult: evaluationManager.deserializeSingleEvaluationResultSnapshot(snapshot.evaluationResult, resolveRequiredNodeSnapshotId)
+          });
+          if (snapshot.spillMetaSnapshotId) {
+            const spillMetaNode = resolveNodeSnapshotId(snapshot.spillMetaSnapshotId);
+            if (spillMetaNode instanceof SpillMetaNode) {
+              node2.setSpillMetaNode(spillMetaNode);
+            }
+          }
+          continue;
+        }
+        if (snapshot.kind === "spill-meta") {
+          const node2 = targetNode;
+          node2.restoreResolvedSnapshot({
+            dependencies,
+            evaluationResult: evaluationManager.deserializeSpillMetaEvaluationResultSnapshot(snapshot.evaluationResult, resolveRequiredNodeSnapshotId)
+          });
+          continue;
+        }
+        if (snapshot.kind === "empty") {
+          const node2 = targetNode;
+          node2.restoreResolvedSnapshot({
+            dependencies,
+            evaluationResult: evaluationManager.deserializeSingleEvaluationResultSnapshot(snapshot.evaluationResult, resolveRequiredNodeSnapshotId)
+          });
+          continue;
+        }
+        if (snapshot.kind === "range") {
+          const node2 = targetNode;
+          node2.restoreResolvedSnapshot({
+            dependencies,
+            result: evaluationManager.deserializeEvaluateAllCellsResultSnapshot(snapshot.result, resolveRequiredNodeSnapshotId)
+          });
+          continue;
+        }
+        if (snapshot.kind === "resource") {
+          continue;
+        }
+        const node = targetNode;
+        node.restoreResolvedSnapshot({
           dependencies,
-          evaluationResult: evaluationManager.deserializeSingleEvaluationResultSnapshot(snapshot.evaluationResult, resolveRequiredNodeSnapshotId)
+          evaluationResult: evaluationManager.deserializeFunctionEvaluationResultSnapshot(snapshot.evaluationResult, resolveRequiredNodeSnapshotId)
         });
-        continue;
-      }
-      if (snapshot.kind === "range") {
-        const node2 = nodesBySnapshotId.get(snapshot.snapshotId);
-        node2.restoreResolvedSnapshot({
-          dependencies,
-          result: evaluationManager.deserializeEvaluateAllCellsResultSnapshot(snapshot.result, resolveRequiredNodeSnapshotId)
+        this.saveAstNode(node, snapshot.contextDependency);
+      } catch (error) {
+        hadRestoreFailures = true;
+        this.resetRestoredNodeToColdState(targetNode);
+        this.logSnapshotRestoreWarning("Failed to deserialize warm snapshot node; discarding warm dependency state", {
+          phase: "restore-node",
+          snapshotId: snapshot.snapshotId,
+          kind: snapshot.kind,
+          key: snapshot.key,
+          error: error instanceof Error ? { name: error.name, message: error.message } : { message: String(error) }
         });
-        continue;
       }
-      if (snapshot.kind === "resource") {
-        continue;
-      }
-      const node = nodesBySnapshotId.get(snapshot.snapshotId);
-      node.restoreResolvedSnapshot({
-        dependencies,
-        evaluationResult: evaluationManager.deserializeFunctionEvaluationResultSnapshot(snapshot.evaluationResult, resolveRequiredNodeSnapshotId)
-      });
-      this.saveAstNode(node, snapshot.contextDependency);
     }
     this._spilledValues = new Map(snapshots.dependency.spilledValues);
     this.rebuildRuntimeIndexes();
@@ -517,20 +589,32 @@ class DependencyManager {
   }
   serializeNodeSnapshot(node, evaluationManager, getNodeSnapshotId, allNodeSnapshotIds) {
     const snapshotId = getNodeSnapshotId(node);
+    const getKnownSnapshotId = (dependency) => {
+      const directSnapshotId = allNodeSnapshotIds.get(dependency);
+      if (directSnapshotId) {
+        return directSnapshotId;
+      }
+      const logicalSnapshotId = this.getLogicalNodeSnapshotId(dependency);
+      return allNodeSnapshotIds.values().some((knownSnapshotId) => knownSnapshotId === logicalSnapshotId) ? logicalSnapshotId : undefined;
+    };
     const dependencies = [];
     for (const dependency of node.getDependencies()) {
-      const dependencySnapshotId = allNodeSnapshotIds.get(dependency);
+      const dependencySnapshotId = getKnownSnapshotId(dependency);
       if (!dependencySnapshotId) {
         return;
       }
       dependencies.push(dependencySnapshotId);
     }
+    const getReferencedNodeSnapshotId = (dependency) => getNodeSnapshotId(dependency, {
+      sourceNode: node,
+      relation: "evaluation result errAddress"
+    });
     if (node instanceof CellValueNode) {
-      const spillMetaSnapshotId = node.spillMeta ? allNodeSnapshotIds.get(node.spillMeta) : undefined;
+      const spillMetaSnapshotId = node.spillMeta ? getKnownSnapshotId(node.spillMeta) : undefined;
       if (node.spillMeta && !spillMetaSnapshotId) {
         return;
       }
-      const evaluationResult2 = evaluationManager.serializeSingleEvaluationResultSnapshot(node.evaluationResult, getNodeSnapshotId);
+      const evaluationResult2 = evaluationManager.serializeSingleEvaluationResultSnapshot(node.evaluationResult, getReferencedNodeSnapshotId);
       if (!evaluationResult2) {
         return;
       }
@@ -546,7 +630,7 @@ class DependencyManager {
     if (node instanceof SpillMetaNode) {
       const evaluationResult2 = evaluationManager.serializeSpillMetaEvaluationResultSnapshot(node.evaluationResult, {
         sourceNode: node,
-        getNodeSnapshotId
+        getNodeSnapshotId: getReferencedNodeSnapshotId
       });
       if (!evaluationResult2) {
         return;
@@ -560,7 +644,7 @@ class DependencyManager {
       };
     }
     if (node instanceof EmptyCellEvaluationNode) {
-      const evaluationResult2 = evaluationManager.serializeSingleEvaluationResultSnapshot(node.evaluationResult, getNodeSnapshotId);
+      const evaluationResult2 = evaluationManager.serializeSingleEvaluationResultSnapshot(node.evaluationResult, getReferencedNodeSnapshotId);
       if (!evaluationResult2) {
         return;
       }
@@ -573,7 +657,7 @@ class DependencyManager {
       };
     }
     if (node instanceof RangeEvaluationNode) {
-      const result = evaluationManager.serializeEvaluateAllCellsResultSnapshot(node.result, getNodeSnapshotId);
+      const result = evaluationManager.serializeEvaluateAllCellsResultSnapshot(node.result, getReferencedNodeSnapshotId);
       if (!result) {
         return;
       }
@@ -595,7 +679,7 @@ class DependencyManager {
     }
     const evaluationResult = evaluationManager.serializeFunctionEvaluationResultSnapshot(node.evaluationResult, {
       sourceNode: node,
-      getNodeSnapshotId
+      getNodeSnapshotId: getReferencedNodeSnapshotId
     });
     if (!evaluationResult) {
       return;
@@ -1424,4 +1508,4 @@ export {
   DependencyManager
 };
 
-//# debugId=FBEAE642404E13D464756E2164756E21
+//# debugId=3C6CF47C62ED503A64756E2164756E21