@bian-womp/spark-workbench 0.2.21 → 0.2.22

package/lib/cjs/index.cjs

@@ -1420,7 +1420,7 @@ function useWorkbenchContext() {
     return ctx;
 }
 
-function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
+function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, children, }) {
     const [nodeStatus, setNodeStatus] = React.useState({});
     const [edgeStatus, setEdgeStatus] = React.useState({});
     const [events, setEvents] = React.useState([]);
@@ -1551,8 +1551,14 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
                 if (!node)
                     continue;
                 // Prefer showValues sizing similar to node rendering
-                // Lazy import to avoid circular deps at module top
-                const size = estimateNodeSize({ node, registry, showValues: true });
+                // Consider per-type overrides when available via UI
+                const overrideSize = overrides?.getDefaultNodeSize?.(node.typeId) ?? undefined;
+                const size = estimateNodeSize({
+                    node,
+                    registry,
+                    showValues: true,
+                    overrides: overrideSize,
+                });
                 heights[id] = size.height;
                 if (size.width > maxWidth)
                     maxWidth = size.width;
@@ -1567,7 +1573,7 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
             curX += maxWidth + H_GAP;
         }
         wb.setPositions(pos);
-    }, [wb]);
+    }, [wb, registry, overrides?.getDefaultNodeSize]);
     const updateEdgeType = React.useCallback((edgeId, typeId) => wb.updateEdgeType(edgeId, typeId), [wb]);
     const triggerExternal = React.useCallback((nodeId, event) => runner.triggerExternal(nodeId, event), [runner]);
     // Subscribe to runner/workbench events
@@ -2262,6 +2268,18 @@ function DefaultNodeHeader({ id, title, validation, right, showId, onInvalidate,
 }
 function DefaultNodeContent({ data, isConnectable, }) {
     const { showValues, inputValues, outputValues, toString } = data;
+    const prettyHandle = React.useCallback((id) => {
+        try {
+            const parts = String(id).split(":");
+            // If there are exactly 3 colons (4 parts), display only the second part
+            if (parts.length === 4)
+                return parts[1] || id;
+            return id;
+        }
+        catch {
+            return id;
+        }
+    }, []);
     const inputEntries = data.inputHandles ?? [];
     const outputEntries = data.outputHandles ?? [];
     const status = data.status ?? { activeRuns: 0 };
@@ -2297,7 +2315,7 @@ function DefaultNodeContent({ data, isConnectable, }) {
                         const txt = toString(resolved.typeId, resolved.value);
                         return typeof txt === "string" ? txt : String(txt);
                     })();
-                    return (jsxRuntime.jsxs("span", { className: "flex items-center gap-1 w-full", children: [kind === "output" ? (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [valueText !== undefined ? (jsxRuntime.jsx("span", { className: "opacity-60 truncate pl-1", style: { flex: 1, minWidth: 0, maxWidth: "100%" }, children: valueText })) : (jsxRuntime.jsx("span", { style: { flex: 1, minWidth: 0, maxWidth: "100%" } })), jsxRuntime.jsx("span", { className: "truncate shrink-0", style: valueText !== undefined ? { maxWidth: "40%" } : {}, children: handleId })] })) : (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx("span", { className: "truncate shrink-0", style: valueText !== undefined ? { maxWidth: "40%" } : {}, children: handleId }), valueText !== undefined && (jsxRuntime.jsx("span", { className: "opacity-60 truncate pr-1", style: { flex: 1, minWidth: 0, maxWidth: "100%" }, children: valueText }))] })), hasAny && (jsxRuntime.jsx(IssueBadge, { level: hasErr ? "error" : "warning", size: 12, className: "shrink-0", title: title }))] }));
+                    return (jsxRuntime.jsxs("span", { className: "flex items-center gap-1 w-full", children: [kind === "output" ? (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [valueText !== undefined ? (jsxRuntime.jsx("span", { className: "opacity-60 truncate pl-1", style: { flex: 1, minWidth: 0, maxWidth: "100%" }, children: valueText })) : (jsxRuntime.jsx("span", { style: { flex: 1, minWidth: 0, maxWidth: "100%" } })), jsxRuntime.jsx("span", { className: "truncate shrink-0", style: valueText !== undefined ? { maxWidth: "40%" } : {}, children: prettyHandle(handleId) })] })) : (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx("span", { className: "truncate shrink-0", style: valueText !== undefined ? { maxWidth: "40%" } : {}, children: prettyHandle(handleId) }), valueText !== undefined && (jsxRuntime.jsx("span", { className: "opacity-60 truncate pr-1", style: { flex: 1, minWidth: 0, maxWidth: "100%" }, children: valueText }))] })), hasAny && (jsxRuntime.jsx(IssueBadge, { level: hasErr ? "error" : "warning", size: 12, className: "shrink-0", title: title }))] }));
                 } })] }));
 }
 
@@ -2887,6 +2905,7 @@ function WorkbenchStudioCanvas({ setRegistry, autoScroll, onAutoScrollChange, ex
             return overrides.getExamples(defaultExamples);
         return defaultExamples;
     }, [overrides, defaultExamples]);
+    const [hydrated, setHydrated] = React.useState(false);
     const lastAutoLaunched = React.useRef(undefined);
     const autoLayoutRan = React.useRef(false);
     const canvasRef = React.useRef(null);
@@ -2910,7 +2929,6 @@ function WorkbenchStudioCanvas({ setRegistry, autoScroll, onAutoScrollChange, ex
                     runner.setInputs(nodeId, map);
                 }
             }
-            runAutoLayout();
         };
         onInit({ wb, runner, setInitialGraph });
     }, [onInit, wb, runner, runAutoLayout, registry, setRegistry]);
@@ -3098,7 +3116,7 @@ function WorkbenchStudioCanvas({ setRegistry, autoScroll, onAutoScrollChange, ex
                     createRuntime: () => ({
                         async onInputsChanged() { },
                     }),
-                    policy: { mode: "push", asyncConcurrency: "switch" },
+                    policy: { asyncConcurrency: "switch" },
                 };
                 r.categories.register(category);
             }
@@ -3167,23 +3185,32 @@ function WorkbenchStudioCanvas({ setRegistry, autoScroll, onAutoScrollChange, ex
     }, [engine, runner, wb, backendKind]);
     // When switching to remote backend, auto-hydrate registry from backend
     React.useEffect(() => {
+        let hydrate;
         if (backendKind === "remote-http" && httpBaseUrl) {
-            hydrateFromBackend("remote-http", httpBaseUrl);
+            hydrate = hydrateFromBackend("remote-http", httpBaseUrl);
         }
         else if (backendKind === "remote-ws" && wsUrl) {
-            hydrateFromBackend("remote-ws", wsUrl);
+            hydrate = hydrateFromBackend("remote-ws", wsUrl);
         }
-    }, [backendKind, httpBaseUrl, wsUrl, hydrateFromBackend]);
+        if (hydrate) {
+            hydrate.then(() => {
+                setHydrated(true);
+            });
+        }
+    }, [backendKind, httpBaseUrl, wsUrl, hydrateFromBackend, setHydrated]);
     React.useEffect(() => {
         if (autoLayoutRan.current)
             return;
+        if (backendKind !== "local" && !hydrated)
+            return;
         const cur = wb.export();
-        const allMissing = cur.nodes.every((n) => !wb.getPositions()[n.nodeId]);
+        const positions = wb.getPositions();
+        const allMissing = cur.nodes.every((n) => !positions[n.nodeId]);
         if (allMissing) {
             autoLayoutRan.current = true;
             runAutoLayout();
         }
-    }, [wb, runAutoLayout]);
+    }, [wb, runAutoLayout, backendKind, hydrated]);
     const baseSetInput = React.useCallback((handle, raw) => {
         if (!selectedNodeId)
             return;
@@ -3409,7 +3436,7 @@ function WorkbenchStudio({ engine, onEngineChange, example, onExampleChange, bac
         overrides?.registerUI?.(baseRegisterUI, { wb, wbRunner: runner });
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [wb, runner, overrides]);
-    return (jsxRuntime.jsx(WorkbenchProvider, { wb: wb, runner: runner, registry: registry, setRegistry: setRegistry, children: jsxRuntime.jsx(WorkbenchStudioCanvas, { setRegistry: setRegistry, autoScroll: autoScroll, onAutoScrollChange: onAutoScrollChange, example: example, onExampleChange: onExampleChange, engine: engine, onEngineChange: onEngineChange, backendKind: backendKind, onBackendKindChange: (v) => {
+    return (jsxRuntime.jsx(WorkbenchProvider, { wb: wb, runner: runner, registry: registry, setRegistry: setRegistry, overrides: overrides, children: jsxRuntime.jsx(WorkbenchStudioCanvas, { setRegistry: setRegistry, autoScroll: autoScroll, onAutoScrollChange: onAutoScrollChange, example: example, onExampleChange: onExampleChange, engine: engine, onEngineChange: onEngineChange, backendKind: backendKind, onBackendKindChange: (v) => {
                 if (runner.isRunning())
                     runner.dispose();
                 onBackendKindChange(v);