@bian-womp/spark-workbench 0.1.14 → 0.1.16

package/lib/cjs/index.cjs

@@ -439,6 +439,7 @@ class GraphRunner {
                     rc.valueCache.set(`${e.nodeId}.${e.handle}`, {
                         io: e.io,
                         value: e.value,
+                        runtimeTypeId: e.runtimeTypeId,
                     });
                     this.emit("value", e);
                 });
@@ -808,12 +809,31 @@ function useQueryParamString(key, defaultValue) {
     return [val, set];
 }
 
+function resolveOutputDisplay(raw, declared) {
+    if (sparkGraph.isTypedOutput(raw)) {
+        return { typeId: String(raw.__spark_type), value: raw.__spark_value };
+    }
+    let typeId = undefined;
+    if (Array.isArray(declared)) {
+        typeId = declared.length === 1 ? declared[0] : undefined;
+    }
+    else if (typeof declared === "string") {
+        typeId = declared.includes("|") ? undefined : declared;
+    }
+    return { typeId, value: raw };
+}
+function formatDeclaredTypeSignature(declared) {
+    if (Array.isArray(declared))
+        return declared.join(" | ");
+    return declared ?? "";
+}
+
 function toReactFlow(def, positions, registry, opts) {
     const nodeHandleMap = {};
     const nodes = def.nodes.map((n) => {
         const desc = registry.nodes.get(n.typeId);
         const inputHandles = Object.entries(desc?.inputs ?? {}).map(([id, typeId]) => ({ id, typeId }));
-        const outputHandles = Object.entries(desc?.outputs ?? {}).map(([id, typeId]) => ({ id, typeId }));
+        const outputHandles = Object.entries(desc?.outputs ?? {}).map(([id, typeId]) => ({ id, typeId: formatDeclaredTypeSignature(typeId) }));
         nodeHandleMap[n.nodeId] = {
             inputs: new Set(inputHandles.map((h) => h.id)),
             outputs: new Set(outputHandles.map((h) => h.id)),
@@ -913,6 +933,41 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
     const [edgeStatus, setEdgeStatus] = React.useState({});
     const [events, setEvents] = React.useState([]);
     const clearEvents = React.useCallback(() => setEvents([]), []);
+    // Fallback progress animation: drive progress to 100% over ~2 minutes
+    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({});
+    // Periodically advance fallback progress for running nodes without explicit progress
+    React.useEffect(() => {
+        const interval = setInterval(() => {
+            setNodeStatus((prev) => {
+                let changed = false;
+                const next = { ...prev };
+                const now = Date.now();
+                for (const id of Object.keys(prev)) {
+                    const st = prev[id];
+                    if (!st)
+                        continue;
+                    const runs = st.activeRuns ?? 0;
+                    const startAt = fallbackStarts[id];
+                    if (runs > 0 && startAt) {
+                        const cur = Math.max(0, Math.min(1, Number(st.progress) || 0));
+                        const elapsed = Math.max(0, now - startAt);
+                        // Approach 100% over the target window, but cap below 1 until done
+                        const target = Math.max(0, Math.min(0.99, elapsed / FALLBACK_TOTAL_MS));
+                        const merged = Math.max(cur, target);
+                        if (merged > cur + 0.005 && merged <= 1) {
+                            next[id] = { ...st, progress: merged };
+                            changed = true;
+                        }
+                    }
+                }
+                return changed ? next : prev;
+            });
+        }, 200);
+        return () => clearInterval(interval);
+    }, [fallbackStarts]);
     // Validation
     const [validation, setValidation] = React.useState(undefined);
     // Selection (mirror workbench selectionChanged)
@@ -1025,6 +1080,13 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
                         lastError: nodeError.err,
                     },
                 }));
+                // Mark this runId as errored
+                if (nodeError.runId) {
+                    setErrorRuns((prev) => ({
+                        ...prev,
+                        [nodeId]: { ...(prev[nodeId] || {}), [nodeError.runId]: true },
+                    }));
+                }
             }
             return add("runner", "error")(e);
         });
@@ -1057,6 +1119,8 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
                         },
                     };
                 });
+                // Start fallback animation window
+                setFallbackStarts((prev) => ({ ...prev, [id]: Date.now() }));
             }
             else if (s.kind === "node-progress") {
                 const id = s.nodeId;
@@ -1070,16 +1134,42 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
             }
             else if (s.kind === "node-done") {
                 const id = s.nodeId;
+                const runId = s.runId;
                 setNodeStatus((prev) => {
                     const current = prev[id]?.activeRuns ?? 0;
+                    const nextActive = current - 1;
+                    const hadError = !!(runId && errorRuns[id]?.[runId]);
+                    const keepProgress = hadError || nextActive > 0;
                     return {
                         ...prev,
                         [id]: {
                             ...prev[id],
-                            activeRuns: current - 1,
+                            activeRuns: nextActive,
+                            progress: keepProgress ? prev[id]?.progress : 0,
                         },
                     };
                 });
+                // 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;
@@ -1447,7 +1537,10 @@ function Inspector({ debug, autoScroll, hideWorkbench, onAutoScrollChange, onHid
                                                     if (e.key === "Escape")
                                                         revert();
                                                 }, ...commonProps }))] }, h));
-                                }))] }), jsxRuntime.jsxs("div", { children: [jsxRuntime.jsx("div", { className: "font-semibold mb-1", children: "Outputs" }), outputHandles.length === 0 ? (jsxRuntime.jsx("div", { className: "text-gray-500", children: "No outputs" })) : (outputHandles.map((h) => (jsxRuntime.jsxs("div", { className: "flex items-center gap-2 mb-1", children: [jsxRuntime.jsx("label", { className: "w-20", children: h }), jsxRuntime.jsx("div", { className: "flex-1", children: toElement(selectedDesc?.outputs?.[h], nodeOutputs[h]) }), (() => {
+                                }))] }), jsxRuntime.jsxs("div", { children: [jsxRuntime.jsx("div", { className: "font-semibold mb-1", children: "Outputs" }), outputHandles.length === 0 ? (jsxRuntime.jsx("div", { className: "text-gray-500", children: "No outputs" })) : (outputHandles.map((h) => (jsxRuntime.jsxs("div", { className: "flex items-center gap-2 mb-1", children: [jsxRuntime.jsx("label", { className: "w-20", children: h }), jsxRuntime.jsx("div", { className: "flex-1", children: (() => {
+                                                const { typeId, value } = resolveOutputDisplay(nodeOutputs[h], selectedDesc?.outputs?.[h]);
+                                                return toElement(typeId, value);
+                                            })() }), (() => {
                                             const outIssues = selectedNodeHandleValidation.outputs.filter((m) => m.handle === h);
                                             if (outIssues.length === 0)
                                                 return null;
@@ -1514,7 +1607,10 @@ const DefaultNode = React.memo(function DefaultNode({ id, data, selected, isConn
                 const title = vIssues
                     .map((v) => `${v.code}: ${v.message}`)
                     .join("; ");
-                return (jsxRuntime.jsxs(React.Fragment, { children: [jsxRuntime.jsx(ReactFlow.Handle, { id: entry.id, type: "source", position: ReactFlow.Position.Right, isConnectable: isConnectable, className: cx("!w-3 !h-3 !bg-white !dark:bg-stone-900 !border-gray-500 dark:!border-gray-400 !rounded-none", hasAny && (hasErr ? "!border-red-500" : "!border-amber-500")), style: { right: -5, top: topFor(i) } }), jsxRuntime.jsxs("div", { className: "absolute right-2 text-[11px] text-gray-700 dark:text-gray-300 pointer-events-none", style: { top: topFor(i) - 8, textAlign: "right" }, title: `${entry.id}: ${entry.typeId}`, children: [entry.id, hasAny && (jsxRuntime.jsx(IssueBadge, { level: hasErr ? "error" : "warning", size: 12, className: "ml-1", title: title })), showValues && (jsxRuntime.jsx("span", { className: "ml-1 opacity-60", children: toString(entry.typeId, outputValues?.[entry.id]) }))] })] }, `out-${entry.id}`));
+                return (jsxRuntime.jsxs(React.Fragment, { children: [jsxRuntime.jsx(ReactFlow.Handle, { id: entry.id, type: "source", position: ReactFlow.Position.Right, isConnectable: isConnectable, className: cx("!w-3 !h-3 !bg-white !dark:bg-stone-900 !border-gray-500 dark:!border-gray-400 !rounded-none", hasAny && (hasErr ? "!border-red-500" : "!border-amber-500")), style: { right: -5, top: topFor(i) } }), jsxRuntime.jsxs("div", { className: "absolute right-2 text-[11px] text-gray-700 dark:text-gray-300 pointer-events-none", style: { top: topFor(i) - 8, textAlign: "right" }, title: `${entry.id}: ${entry.typeId}`, children: [entry.id, hasAny && (jsxRuntime.jsx(IssueBadge, { level: hasErr ? "error" : "warning", size: 12, className: "ml-1", title: title })), showValues && (jsxRuntime.jsx("span", { className: "ml-1 opacity-60", children: (() => {
+                                        const { typeId, value } = resolveOutputDisplay(outputValues?.[entry.id], entry.typeId);
+                                        return toString(typeId, value);
+                                    })() }))] })] }, `out-${entry.id}`));
             })] }));
 });
 DefaultNode.displayName = "DefaultNode";