@bian-womp/spark-graph 0.3.17 → 0.3.18

package/lib/cjs/src/runtime/components/HandleResolver.d.ts

@@ -1,7 +1,7 @@
 import { Registry } from "../../builder/Registry";
 import type { EventEmitter } from "./EventEmitter";
 import type { Graph } from "./Graph";
-import type { RunContextId, RunContextManager } from "./RunContextManager";
+import type { RunContextManager } from "./RunContextManager";
 import type { IEdgePropagator, IHandleResolver } from "./interfaces";
 /**
  * HandleResolver component - manages dynamic handle resolution
@@ -15,22 +15,14 @@ export declare class HandleResolver implements IHandleResolver {
     private recomputeTokenByNode;
     private environment;
     private pendingResolutions;
-    private pendingResolutionRunContexts;
+    private isRecomputing;
     constructor(graph: Graph, eventEmitter: EventEmitter, runContextManager: RunContextManager, edgePropagator: IEdgePropagator, registry?: Registry | undefined, environment?: Record<string, unknown>);
     setRegistry(registry: Registry): void;
     setEnvironment(environment: Record<string, unknown>): void;
-    /**
-     * Check if handle resolution is pending for a node
-     */
-    isResolvingHandles(nodeId: string): boolean;
     /**
      * Get the promise for pending handle resolution, or null if none
      */
     getPendingResolution(nodeId: string): Promise<void> | null;
-    /**
-     * Track additional run contexts for a pending resolution
-     */
-    trackRunContextsForPendingResolution(nodeId: string, runContextIds: Set<RunContextId>): void;
     /**
      * Schedule async recomputation of handles for a node
      */

package/lib/cjs/src/runtime/components/HandleResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HandleResolver.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/components/HandleResolver.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAKrE;;GAEG;AACH,qBAAa,cAAe,YAAW,eAAe;IAOlD,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC;IAVnB,OAAO,CAAC,oBAAoB,CAA6B;IACzD,OAAO,CAAC,WAAW,CAA+B;IAClD,OAAO,CAAC,kBAAkB,CAAoC;IAC9D,OAAO,CAAC,4BAA4B,CAAwC;gBAGzD,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,YAAY,EAC1B,iBAAiB,EAAE,iBAAiB,EACpC,cAAc,EAAE,eAAe,EACxC,QAAQ,CAAC,EAAE,QAAQ,YAAA,EAC3B,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAKvC,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAIrC,cAAc,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAI1D;;OAEG;IACH,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAI3C;;OAEG;IACH,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAI1D;;OAEG;IACH,oCAAoC,CAClC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,GAAG,CAAC,YAAY,CAAC,GAC/B,IAAI;IAaP;;OAEG;IACH,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAoC9C,OAAO,CAAC,iBAAiB;IA+EzB;;OAEG;YACW,uBAAuB;CA0GtC"}
+{"version":3,"file":"HandleResolver.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/components/HandleResolver.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,EAAgB,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAKrE;;GAEG;AACH,qBAAa,cAAe,YAAW,eAAe;IAOlD,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC;IAVnB,OAAO,CAAC,oBAAoB,CAA6B;IACzD,OAAO,CAAC,WAAW,CAA+B;IAClD,OAAO,CAAC,kBAAkB,CAAoC;IAC9D,OAAO,CAAC,aAAa,CAA8B;gBAGhC,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,YAAY,EAC1B,iBAAiB,EAAE,iBAAiB,EACpC,cAAc,EAAE,eAAe,EACxC,QAAQ,CAAC,EAAE,QAAQ,YAAA,EAC3B,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAKvC,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAIrC,cAAc,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAI1D;;OAEG;IACH,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAI1D;;OAEG;IACH,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAqD9C,OAAO,CAAC,iBAAiB;IA+EzB;;OAEG;YACW,uBAAuB;CA0GtC"}

package/lib/cjs/src/runtime/components/interfaces.d.ts

@@ -18,9 +18,7 @@ export interface INodeExecutor {
  */
 export interface IHandleResolver {
     scheduleRecomputeHandles(nodeId: string): void;
-    isResolvingHandles(nodeId: string): boolean;
     getPendingResolution(nodeId: string): Promise<void> | null;
-    trackRunContextsForPendingResolution(nodeId: string, runContextIds: Set<RunContextId>): void;
 }
 /**
  * Interface for runtime coordination operations

package/lib/cjs/src/runtime/components/interfaces.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/components/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,SAAS,CACP,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,OAAO,EACd,aAAa,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,GAChC,IAAI,CAAC;IACR,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5C;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;CAClE;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/C,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IAC5C,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC3D,oCAAoC,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;CAC9F;AAED;;;GAGG;AACH,MAAM,WAAW,QAAQ;IACvB,QAAQ,IAAI,OAAO,CAAC;IACpB,UAAU,IAAI,OAAO,GAAG,IAAI,CAAC;CAC9B"}
+{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/components/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,SAAS,CACP,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,OAAO,EACd,aAAa,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,GAChC,IAAI,CAAC;IACR,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5C;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;CAClE;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/C,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAC5D;AAED;;;GAGG;AACH,MAAM,WAAW,QAAQ;IACvB,QAAQ,IAAI,OAAO,CAAC;IACpB,UAAU,IAAI,OAAO,GAAG,IAAI,CAAC;CAC9B"}

package/lib/esm/index.js

@@ -1530,7 +1530,7 @@ class HandleResolver {
         this.recomputeTokenByNode = new Map();
         this.environment = {};
         this.pendingResolutions = new Map();
-        this.pendingResolutionRunContexts = new Map();
+        this.isRecomputing = new Map();
         this.environment = environment ?? {};
     }
     setRegistry(registry) {
@@ -1539,33 +1539,12 @@ class HandleResolver {
     setEnvironment(environment) {
         this.environment = environment;
     }
-    /**
-     * Check if handle resolution is pending for a node
-     */
-    isResolvingHandles(nodeId) {
-        return this.pendingResolutions.has(nodeId);
-    }
     /**
      * Get the promise for pending handle resolution, or null if none
      */
     getPendingResolution(nodeId) {
         return this.pendingResolutions.get(nodeId) || null;
     }
-    /**
-     * Track additional run contexts for a pending resolution
-     */
-    trackRunContextsForPendingResolution(nodeId, runContextIds) {
-        if (!this.pendingResolutions.has(nodeId))
-            return;
-        const tracked = this.pendingResolutionRunContexts.get(nodeId) ?? new Set();
-        for (const runContextId of runContextIds) {
-            if (!tracked.has(runContextId)) {
-                this.runContextManager.startHandleResolution(runContextId, nodeId);
-                tracked.add(runContextId);
-            }
-        }
-        this.pendingResolutionRunContexts.set(nodeId, tracked);
-    }
     /**
      * Schedule async recomputation of handles for a node
      */
@@ -1576,27 +1555,43 @@ class HandleResolver {
         const node = this.graph.getNode(nodeId);
         if (!node)
             return;
+        // If already recomputing, increment token to mark that a new recompute is needed
+        // but don't schedule another concurrent execution
+        if (this.isRecomputing.get(nodeId)) {
+            const currentToken = this.recomputeTokenByNode.get(nodeId) ?? 0;
+            this.recomputeTokenByNode.set(nodeId, currentToken + 1);
+            return;
+        }
         // Track resolver start for all active run-contexts
         const activeRunContextIds = this.graph.getNodeRunContextIds(nodeId);
-        const trackedRunContextIds = new Set(activeRunContextIds);
         if (activeRunContextIds.size > 0) {
             for (const runContextId of activeRunContextIds) {
                 this.runContextManager.startHandleResolution(runContextId, nodeId);
             }
         }
+        // Mark as recomputing
+        this.isRecomputing.set(nodeId, true);
+        // Capture initial token before starting (will be incremented in recomputeHandlesForNode)
+        const initialToken = this.recomputeTokenByNode.get(nodeId) ?? 0;
         // Create and track the resolution promise
         const resolutionPromise = new Promise((resolve) => {
             setTimeout(async () => {
-                // Get all tracked run contexts (including any added during pending state)
-                const allTracked = this.pendingResolutionRunContexts.get(nodeId) ?? trackedRunContextIds;
-                await this.recomputeHandlesForNode(nodeId, allTracked.size > 0 ? allTracked : undefined);
+                await this.recomputeHandlesForNode(nodeId, activeRunContextIds);
                 this.pendingResolutions.delete(nodeId);
-                this.pendingResolutionRunContexts.delete(nodeId);
+                this.isRecomputing.delete(nodeId);
+                // Check if a new recompute was requested while we were running
+                // (token was incremented by another scheduleRecomputeHandles call)
+                const finalToken = this.recomputeTokenByNode.get(nodeId) ?? 0;
+                // After recomputeHandlesForNode, token should be initialToken + 1
+                // If finalToken > initialToken + 1, a new recompute was requested
+                if (finalToken > initialToken + 1) {
+                    // A new recompute was requested, schedule it now
+                    this.scheduleRecomputeHandles(nodeId);
+                }
                 resolve();
             }, 0);
         });
         this.pendingResolutions.set(nodeId, resolutionPromise);
-        this.pendingResolutionRunContexts.set(nodeId, trackedRunContextIds);
     }
     // Update resolved handles for a single node and refresh edge converters/types that touch it
     updateNodeHandles(nodeId, handles) {
@@ -2302,23 +2297,27 @@ class NodeExecutor {
         }
         // Check if handles are being resolved - wait for resolution before executing
         // Do this AFTER setting up run contexts so handle resolution can track them
-        if (this.handleResolver && this.handleResolver.isResolvingHandles(nodeId)) {
-            // Track run contexts for the pending resolution
+        const pendingResolution = this.handleResolver.getPendingResolution(nodeId);
+        if (pendingResolution) {
             if (runContextIds && runContextIds.size > 0) {
-                this.handleResolver.trackRunContextsForPendingResolution(nodeId, runContextIds);
+                for (const id of runContextIds) {
+                    this.runContextManager.startHandleResolution(id, nodeId);
+                }
             }
-            const pendingResolution = this.handleResolver.getPendingResolution(nodeId);
-            if (pendingResolution) {
-                // Wait for resolution to complete, then re-execute
-                pendingResolution.then(() => {
-                    // Re-check node still exists and conditions
-                    const nodeAfter = this.graph.getNode(nodeId);
-                    if (nodeAfter) {
-                        this.execute(nodeId, runContextIds);
+            // Wait for resolution to complete, then re-execute
+            pendingResolution.then(() => {
+                // Re-check node still exists and conditions
+                const nodeAfter = this.graph.getNode(nodeId);
+                if (nodeAfter) {
+                    this.execute(nodeId, runContextIds);
+                }
+                if (runContextIds && runContextIds.size > 0) {
+                    for (const id of runContextIds) {
+                        this.runContextManager.finishHandleResolution(id, nodeId);
                     }
-                });
-                return;
-            }
+                }
+            });
+            return;
         }
         // Handle debouncing
         const now = Date.now();