@bian-womp/spark-workbench 0.2.6 → 0.2.8

package/lib/cjs/index.cjs

@@ -1288,7 +1288,7 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
     const FALLBACK_TOTAL_MS = 2 * 60 * 1000;
     const [fallbackStarts, setFallbackStarts] = React.useState({});
     // Track runs that emitted an error so we can keep progress on completion
-    const [errorRuns, setErrorRuns] = React.useState({});
+    const errorRunsRef = React.useRef({});
     // Periodically advance fallback progress for running nodes without explicit progress
     React.useEffect(() => {
         const interval = setInterval(() => {
@@ -1451,6 +1451,7 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
             }
             else if (nodeError.nodeId) {
                 const nodeId = nodeError.nodeId;
+                const runId = nodeError.runId;
                 setNodeStatus((s) => ({
                     ...s,
                     [nodeId]: {
@@ -1459,11 +1460,11 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
                     },
                 }));
                 // Mark this runId as errored
-                if (nodeError.runId) {
-                    setErrorRuns((prev) => ({
-                        ...prev,
-                        [nodeId]: { ...(prev[nodeId] || {}), [nodeError.runId]: true },
-                    }));
+                if (runId) {
+                    errorRunsRef.current[nodeId] = {
+                        ...errorRunsRef.current[nodeId],
+                        [runId]: true,
+                    };
                 }
             }
             return add("runner", "error")(e);
@@ -1516,38 +1517,29 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
                 setNodeStatus((prev) => {
                     const current = prev[id]?.activeRuns ?? 0;
                     const nextActive = current - 1;
-                    const hadError = !!(runId && errorRuns[id]?.[runId]);
+                    const hadError = !!(runId && errorRunsRef.current[id]?.[runId]);
                     const keepProgress = hadError || nextActive > 0;
+                    // Clear error flag for this runId
+                    if (runId && errorRunsRef.current[id]?.[runId]) {
+                        delete errorRunsRef.current[id]?.[runId];
+                    }
                     return {
                         ...prev,
                         [id]: {
                             ...prev[id],
                             activeRuns: nextActive,
                             progress: keepProgress ? prev[id]?.progress : 0,
+                            lastError: hadError ? prev[id]?.lastError : undefined,
                         },
                     };
                 });
                 // Clear fallback start timestamp if no more active runs
                 setFallbackStarts((prev) => {
-                    prev[id];
                     const nextPrev = { ...prev };
                     // If we don't know nextActive here, conservatively clear to stop animation
                     delete nextPrev[id];
                     return nextPrev;
                 });
-                // Clear error flag for this runId
-                if (runId) {
-                    setErrorRuns((prev) => {
-                        const nodeMap = { ...(prev[id] || {}) };
-                        delete nodeMap[runId];
-                        const next = { ...prev };
-                        if (Object.keys(nodeMap).length === 0)
-                            delete next[id];
-                        else
-                            next[id] = nodeMap;
-                        return next;
-                    });
-                }
             }
             else if (s.kind === "edge-start") {
                 const id = s.edgeId;
@@ -1966,12 +1958,20 @@ function NodeHandles({ data, isConnectable, inputClassName = "!w-2 !h-2 !bg-gray
     const byId = React.useMemo(() => {
         const m = new Map();
         for (const h of layout) {
-            m.set(h.id, { position: h.position, y: h.y, type: h.type });
+            // Prefer namespaced key to disambiguate inputs/outputs that share id
+            m.set(`${h.type}:${h.id}`, {
+                position: h.position,
+                y: h.y,
+                type: h.type,
+            });
+            // Back-compat: also store by id-only if not already set
+            if (!m.has(h.id))
+                m.set(h.id, { position: h.position, y: h.y, type: h.type });
         }
         return m;
     }, [layout]);
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [(data.inputHandles ?? []).map((h) => {
-                const placed = byId.get(h.id);
+                const placed = byId.get(`target:${h.id}`) ?? byId.get(h.id);
                 const position = placed?.position ?? react.Position.Left;
                 const y = placed?.y;
                 const cls = getClassName?.({ kind: "input", id: h.id, type: "target" }) ??
@@ -1984,7 +1984,7 @@ function NodeHandles({ data, isConnectable, inputClassName = "!w-2 !h-2 !bg-gray
                                 textOverflow: "ellipsis",
                             }, children: renderLabel({ kind: "input", id: h.id }) }))] }, h.id));
             }), (data.outputHandles ?? []).map((h) => {
-                const placed = byId.get(h.id);
+                const placed = byId.get(`source:${h.id}`) ?? byId.get(h.id);
                 const position = placed?.position ?? react.Position.Right;
                 const y = placed?.y;
                 const cls = getClassName?.({ kind: "output", id: h.id, type: "source" }) ??
@@ -2467,7 +2467,7 @@ const WorkbenchCanvas = React.forwardRef(({ showValues, toString, toElement, get
     const addNodeAt = (typeId, pos) => {
         wb.addNode({ typeId, position: pos });
     };
-    return (jsxRuntime.jsx("div", { className: "w-full h-full", onContextMenu: onContextMenu, children: jsxRuntime.jsx(react.ReactFlowProvider, { children: jsxRuntime.jsxs(react.ReactFlow, { nodes: throttled.nodes, edges: throttled.edges, nodeTypes: nodeTypes, onlyRenderVisibleElements: true, selectionOnDrag: true, onInit: (inst) => (rfInstanceRef.current = inst), onConnect: onConnect, onEdgesChange: onEdgesChange, onEdgesDelete: onEdgesDelete, onNodesDelete: onNodesDelete, onNodesChange: onNodesChange, deleteKeyCode: ["Backspace", "Delete"], proOptions: { hideAttribution: true }, noDragClassName: "wb-nodrag", noWheelClassName: "wb-nowheel", noPanClassName: "wb-nopan", fitView: true, children: [jsxRuntime.jsx(react.Background, { variant: react.BackgroundVariant.Dots, gap: 12, size: 1 }), jsxRuntime.jsx(react.MiniMap, {}), jsxRuntime.jsx(react.Controls, {}), jsxRuntime.jsx(DefaultContextMenu, { open: menuOpen, clientPos: menuPos, onAdd: addNodeAt, onClose: () => setMenuOpen(false) }), jsxRuntime.jsx(NodeContextMenu, { open: nodeMenuOpen, clientPos: nodeMenuPos, nodeId: nodeAtMenu, onClose: () => setNodeMenuOpen(false) })] }) }) }));
+    return (jsxRuntime.jsx("div", { className: "w-full h-full", onContextMenu: onContextMenu, children: jsxRuntime.jsx(react.ReactFlowProvider, { children: jsxRuntime.jsxs(react.ReactFlow, { nodes: throttled.nodes, edges: throttled.edges, nodeTypes: nodeTypes, selectionOnDrag: true, onInit: (inst) => (rfInstanceRef.current = inst), onConnect: onConnect, onEdgesChange: onEdgesChange, onEdgesDelete: onEdgesDelete, onNodesDelete: onNodesDelete, onNodesChange: onNodesChange, deleteKeyCode: ["Backspace", "Delete"], proOptions: { hideAttribution: true }, noDragClassName: "wb-nodrag", noWheelClassName: "wb-nowheel", noPanClassName: "wb-nopan", fitView: true, children: [jsxRuntime.jsx(react.Background, { id: "workbench-canvas-background", variant: react.BackgroundVariant.Dots, gap: 12, size: 1 }), jsxRuntime.jsx(react.MiniMap, {}), jsxRuntime.jsx(react.Controls, {}), jsxRuntime.jsx(DefaultContextMenu, { open: menuOpen, clientPos: menuPos, onAdd: addNodeAt, onClose: () => setMenuOpen(false) }), jsxRuntime.jsx(NodeContextMenu, { open: nodeMenuOpen, clientPos: nodeMenuPos, nodeId: nodeAtMenu, onClose: () => setNodeMenuOpen(false) })] }) }) }));
 });
 
 function WorkbenchStudioCanvas({ setRegistry, autoScroll, onAutoScrollChange, example, onExampleChange, engine, onEngineChange, backendKind, onBackendKindChange, httpBaseUrl, onHttpBaseUrlChange, wsUrl, onWsUrlChange, debug, onDebugChange, showValues, onShowValuesChange, hideWorkbench, onHideWorkbenchChange, overrides, onInit, onChange, }) {