@bian-womp/spark-workbench 0.1.12 → 0.1.14

package/lib/cjs/index.cjs

@@ -399,9 +399,7 @@ class GraphRunner {
             this.runningKind = opts.engine;
             this.emit("status", { running: true, engine: this.runningKind });
             for (const [nodeId, map] of Object.entries(this.stagedInputs)) {
-                for (const [handle, value] of Object.entries(map)) {
-                    this.engine.setInput(nodeId, handle, value);
-                }
+                this.engine.setInputs(nodeId, map);
             }
             return;
         }
@@ -410,6 +408,31 @@ class GraphRunner {
             await rc.runner.build(def);
             // Signal UI after remote build as well
             this.emit("invalidate", { reason: "graph-built" });
+            // Hydrate current remote inputs/outputs (including defaults) into cache
+            try {
+                const snap = await rc.runner.snapshot();
+                for (const [nodeId, map] of Object.entries(snap.inputs || {})) {
+                    for (const [handle, value] of Object.entries(map || {})) {
+                        rc.valueCache.set(`${nodeId}.${handle}`, {
+                            io: "input",
+                            value,
+                        });
+                        this.emit("value", { nodeId, handle, value, io: "input" });
+                    }
+                }
+                for (const [nodeId, map] of Object.entries(snap.outputs || {})) {
+                    for (const [handle, value] of Object.entries(map || {})) {
+                        rc.valueCache.set(`${nodeId}.${handle}`, {
+                            io: "output",
+                            value,
+                        });
+                        this.emit("value", { nodeId, handle, value, io: "output" });
+                    }
+                }
+            }
+            catch {
+                console.error("Failed to hydrate remote inputs/outputs");
+            }
             const eng = rc.runner.getEngine();
             if (!rc.listenersBound) {
                 eng.on("value", (e) => {
@@ -429,9 +452,7 @@ class GraphRunner {
             this.runningKind = "push";
             this.emit("status", { running: true, engine: this.runningKind });
             for (const [nodeId, map] of Object.entries(this.stagedInputs)) {
-                for (const [handle, value] of Object.entries(map)) {
-                    this.engine.setInput(nodeId, handle, value);
-                }
+                this.engine.setInputs(nodeId, map);
             }
         });
     }
@@ -456,32 +477,13 @@ class GraphRunner {
         Object.assign(this.stagedInputs[nodeId], inputs);
         // Local running: pause, set all inputs, resume, schedule a single recompute
         if (this.backend.kind === "local" && this.engine && this.runtime) {
-            this.runtime.pause();
-            try {
-                for (const [handle, value] of Object.entries(inputs)) {
-                    this.engine.setInput(nodeId, handle, value);
-                }
-            }
-            finally {
-                this.runtime.resume();
-                try {
-                    this.runtime.__unsafe_scheduleInputsChanged(nodeId);
-                }
-                catch { }
-            }
+            this.engine.setInputs(nodeId, inputs);
         }
         // Remote running: forward inputs individually (no batch API available)
-        else if (this.engine && this.backend.kind !== "local") {
-            // Prefer batch if supported by remote engine
-            if (this.engine instanceof sparkRemote.RemoteEngine) {
-                this.engine.setInputs(nodeId, inputs);
-            }
-            else {
-                console.warn("Remote engine does not support setInputs");
-                for (const [handle, value] of Object.entries(inputs)) {
-                    this.engine.setInput(nodeId, handle, value);
-                }
-            }
+        else if (this.engine &&
+            this.backend.kind !== "local" &&
+            this.engine instanceof sparkRemote.RemoteEngine) {
+            this.engine.setInputs(nodeId, inputs);
         }
         // Not running: emit value events so UI reflects staged values
         else if (!this.engine) {
@@ -556,7 +558,7 @@ class GraphRunner {
             for (const n of def.nodes) {
                 const staged = this.stagedInputs[n.nodeId] ?? {};
                 const runtimeInputs = this.runtime
-                    ? this.runtime.__unsafe_getNodeData?.(n.nodeId)?.inputs ?? {}
+                    ? this.runtime.getNodeData?.(n.nodeId)?.inputs ?? {}
                     : {};
                 if (this.isRunning()) {
                     out[n.nodeId] = runtimeInputs;
@@ -881,7 +883,7 @@ function getNodeBorderClassNames(args) {
     const status = args.status || {};
     const issues = args.validation?.issues ?? [];
     const hasError = !!status.lastError;
-    const hasValidationError = issues.some((i) => i?.level === "error");
+    const hasValidationError = issues.some((i) => i.level === "error");
     const hasValidationWarning = !hasValidationError && issues.length > 0;
     const isRunning = !!status.activeRuns;
     const isInvalid = !!status.invalidated && !isRunning && !hasError;
@@ -983,7 +985,8 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
         const add = (source, type) => (payload) => setEvents((prev) => {
             if (source === "workbench" &&
                 (type === "graphChanged" || type === "graphUiChanged")) {
-                const changeType = payload?.change?.type;
+                const changeType = payload
+                    .change?.type;
                 if (changeType === "moveNode" || changeType === "moveNodes")
                     return prev;
             }
@@ -998,7 +1001,7 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
                 const nodeId = e?.nodeId;
                 setNodeStatus((s) => ({
                     ...s,
-                    [nodeId]: { ...(s[nodeId] ?? {}), invalidated: true },
+                    [nodeId]: { ...s[nodeId], invalidated: true },
                 }));
             }
             return add("runner", "value")(e);
@@ -1010,7 +1013,7 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
                 const edgeId = edgeError.edgeId;
                 setEdgeStatus((s) => ({
                     ...s,
-                    [edgeId]: { ...(s[edgeId] ?? {}), lastError: edgeError.err },
+                    [edgeId]: { ...s[edgeId], lastError: edgeError.err },
                 }));
             }
             else if (nodeError.nodeId) {
@@ -1018,7 +1021,7 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
                 setNodeStatus((s) => ({
                     ...s,
                     [nodeId]: {
-                        ...(s[nodeId] ?? {}),
+                        ...s[nodeId],
                         lastError: nodeError.err,
                     },
                 }));
@@ -1030,7 +1033,7 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
                 setNodeStatus((s) => {
                     const next = {};
                     for (const n of wb.export().nodes) {
-                        next[n.nodeId] = { ...(s[n.nodeId] ?? {}), invalidated: true };
+                        next[n.nodeId] = { ...s[n.nodeId], invalidated: true };
                     }
                     return next;
                 });
@@ -1043,12 +1046,12 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
             if (s.kind === "node-start") {
                 const id = s.nodeId;
                 setNodeStatus((prev) => {
-                    const active = Math.max(1, (prev[id]?.activeRuns ?? 0) + 1);
+                    const current = prev[id]?.activeRuns ?? 0;
                     return {
                         ...prev,
                         [id]: {
-                            ...(prev[id] ?? {}),
-                            activeRuns: active,
+                            ...prev[id],
+                            activeRuns: current + 1,
                             progress: 0,
                             invalidated: false,
                         },
@@ -1060,7 +1063,7 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
                 setNodeStatus((prev) => ({
                     ...prev,
                     [id]: {
-                        ...(prev[id] ?? {}),
+                        ...prev[id],
                         progress: Number(s.progress) || 0,
                     },
                 }));
@@ -1068,13 +1071,12 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
             else if (s.kind === "node-done") {
                 const id = s.nodeId;
                 setNodeStatus((prev) => {
-                    const current = prev[id]?.activeRuns ?? 1;
-                    const nextActive = Math.max(0, current - 1);
+                    const current = prev[id]?.activeRuns ?? 0;
                     return {
                         ...prev,
                         [id]: {
-                            ...(prev[id] ?? {}),
-                            activeRuns: nextActive,
+                            ...prev[id],
+                            activeRuns: current - 1,
                         },
                     };
                 });
@@ -1082,22 +1084,20 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
             else if (s.kind === "edge-start") {
                 const id = s.edgeId;
                 setEdgeStatus((prev) => {
-                    const current = prev[id]?.activeRuns ?? 1;
-                    const nextActive = Math.max(0, current + 1);
+                    const current = prev[id]?.activeRuns ?? 0;
                     return {
                         ...prev,
-                        [id]: { ...(prev[id] ?? {}), activeRuns: nextActive },
+                        [id]: { ...prev[id], activeRuns: current + 1 },
                     };
                 });
             }
             else if (s.kind === "edge-done") {
                 const id = s.edgeId;
                 setEdgeStatus((prev) => {
-                    const current = prev[id]?.activeRuns ?? 1;
-                    const nextActive = Math.max(0, current - 1);
+                    const current = prev[id]?.activeRuns ?? 0;
                     return {
                         ...prev,
-                        [id]: { ...(prev[id] ?? {}), activeRuns: nextActive },
+                        [id]: { ...prev[id], activeRuns: current - 1 },
                     };
                 });
             }
@@ -1111,7 +1111,7 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
                 const id = change.nodeId;
                 setNodeStatus((s) => ({
                     ...s,
-                    [id]: { ...(s[id] ?? {}), invalidated: true },
+                    [id]: { ...s[id], invalidated: true },
                 }));
             }
         });
@@ -1463,7 +1463,7 @@ const DefaultNode = React.memo(function DefaultNode({ id, data, selected, isConn
     const { typeId, showValues, inputValues, outputValues, toString } = data;
     const inputEntries = data.inputHandles ?? [];
     const outputEntries = data.outputHandles ?? [];
-    const status = data.status ?? {};
+    const status = data.status ?? { activeRuns: 0 };
     const validation = data.validation ?? {
         inputs: [],
         outputs: [],
@@ -1743,6 +1743,45 @@ function WorkbenchStudioCanvas({ setRegistry, autoScroll, onAutoScrollChange, ex
         ? registry.nodes.get(selectedNode.typeId)
         : undefined;
     const [exampleState, setExampleState] = React.useState(example ?? "simple");
+    const defaultExamples = React.useMemo(() => [
+        {
+            id: "simple",
+            label: "Simple",
+            load: async () => ({
+                registry: sparkGraph.createSimpleGraphRegistry(),
+                def: sparkGraph.createSimpleGraphDef(),
+            }),
+        },
+        {
+            id: "async",
+            label: "Async Chain",
+            load: async () => ({
+                registry: sparkGraph.createAsyncGraphRegistry(),
+                def: sparkGraph.createAsyncGraphDef(),
+            }),
+        },
+        {
+            id: "progress",
+            label: "Progress + Errors",
+            load: async () => ({
+                registry: sparkGraph.createProgressGraphRegistry(),
+                def: sparkGraph.createProgressGraphDef(),
+            }),
+        },
+        {
+            id: "validation",
+            label: "Validation",
+            load: async () => ({
+                registry: sparkGraph.createValidationGraphRegistry(),
+                def: sparkGraph.createValidationGraphDef(),
+            }),
+        },
+    ], []);
+    const examples = React.useMemo(() => {
+        if (overrides?.getExamples)
+            return overrides.getExamples(defaultExamples);
+        return defaultExamples;
+    }, [overrides, defaultExamples]);
     const lastAutoLaunched = React.useRef(undefined);
     const autoLayoutRan = React.useRef(false);
     const applyExample = React.useCallback(async (key) => {
@@ -1750,46 +1789,21 @@ function WorkbenchStudioCanvas({ setRegistry, autoScroll, onAutoScrollChange, ex
             alert(`Stop engine before switching example.`);
             return;
         }
-        switch (key) {
-            case "simple": {
-                const r = sparkGraph.createSimpleGraphRegistry();
-                setRegistry(r);
-                wb.setRegistry(r);
-                await wb.load(sparkGraph.createSimpleGraphDef());
-                break;
-            }
-            case "async": {
-                const r = sparkGraph.createAsyncGraphRegistry();
-                setRegistry(r);
-                wb.setRegistry(r);
-                await wb.load(sparkGraph.createAsyncGraphDef());
-                break;
-            }
-            case "progress": {
-                const r = sparkGraph.createProgressGraphRegistry();
-                setRegistry(r);
-                wb.setRegistry(r);
-                await wb.load(sparkGraph.createProgressGraphDef());
-                break;
-            }
-            case "validation": {
-                const r = sparkGraph.createValidationGraphRegistry();
-                setRegistry(r);
-                wb.setRegistry(r);
-                await wb.load(sparkGraph.createValidationGraphDef());
-                break;
-            }
-            default: {
-                const r = sparkGraph.createSimpleGraphRegistry();
-                setRegistry(r);
-                wb.setRegistry(r);
-                await wb.load(sparkGraph.createSimpleGraphDef());
-            }
+        const ex = examples.find((e) => e.id === key) ?? examples[0];
+        if (!ex)
+            return;
+        const { registry: r, def } = await ex.load();
+        if (r) {
+            setRegistry(r);
+            wb.setRegistry(r);
         }
+        await wb.load(def);
+        // Build a local runtime so seeded defaults are visible pre-run
+        runner.build(wb.export());
         runAutoLayout();
         setExampleState(key);
         onExampleChange?.(key);
-    }, [runner, wb, onExampleChange, runAutoLayout]);
+    }, [runner, wb, onExampleChange, runAutoLayout, examples, setRegistry]);
     const hydrateFromBackend = React.useCallback(async (kind, base) => {
         try {
             const transport = kind === "remote-http"
@@ -2040,9 +2054,9 @@ function WorkbenchStudioCanvas({ setRegistry, autoScroll, onAutoScrollChange, ex
             return overrides.toElement(baseToElement, { registry });
         return baseToElement;
     }, [overrides, baseToElement, registry]);
-    return (jsxRuntime.jsxs("div", { className: "w-full h-screen flex flex-col", children: [jsxRuntime.jsxs("div", { className: "p-2 border-b border-gray-300 flex gap-2 items-center", children: [runner.isRunning() ? (jsxRuntime.jsxs("span", { className: "ml-2 text-sm text-green-700", children: ["Running: ", runner.getRunningEngine()] })) : (jsxRuntime.jsx("span", { className: "ml-2 text-sm text-gray-500", children: "Stopped" })), jsxRuntime.jsx("label", { className: "ml-2 text-sm", children: "Example:" }), jsxRuntime.jsxs("select", { className: "border border-gray-300 rounded px-2 py-1", value: exampleState, onChange: (e) => applyExample(e.target.value), disabled: runner.isRunning(), title: runner.isRunning()
+    return (jsxRuntime.jsxs("div", { className: "w-full h-screen flex flex-col", children: [jsxRuntime.jsxs("div", { className: "p-2 border-b border-gray-300 flex gap-2 items-center", children: [runner.isRunning() ? (jsxRuntime.jsxs("span", { className: "ml-2 text-sm text-green-700", children: ["Running: ", runner.getRunningEngine()] })) : (jsxRuntime.jsx("span", { className: "ml-2 text-sm text-gray-500", children: "Stopped" })), jsxRuntime.jsx("label", { className: "ml-2 text-sm", children: "Example:" }), jsxRuntime.jsx("select", { className: "border border-gray-300 rounded px-2 py-1", value: exampleState, onChange: (e) => applyExample(e.target.value), disabled: runner.isRunning(), title: runner.isRunning()
                             ? "Stop engine before switching example"
-                            : undefined, children: [jsxRuntime.jsx("option", { value: "simple", children: "Simple" }), jsxRuntime.jsx("option", { value: "async", children: "Async Chain" }), jsxRuntime.jsx("option", { value: "progress", children: "Progress + Errors" }), jsxRuntime.jsx("option", { value: "validation", children: "Validation" })] }), jsxRuntime.jsx("label", { className: "ml-2 text-sm", children: "Backend:" }), jsxRuntime.jsxs("select", { className: "border border-gray-300 rounded px-2 py-1", value: backendKind, onChange: (e) => onBackendKindChange(e.target.value), disabled: runner.isRunning(), title: runner.isRunning()
+                            : undefined, children: examples.map((ex) => (jsxRuntime.jsx("option", { value: ex.id, children: ex.label }, ex.id))) }), jsxRuntime.jsx("label", { className: "ml-2 text-sm", children: "Backend:" }), jsxRuntime.jsxs("select", { className: "border border-gray-300 rounded px-2 py-1", value: backendKind, onChange: (e) => onBackendKindChange(e.target.value), disabled: runner.isRunning(), title: runner.isRunning()
                             ? "Stop engine before switching backend"
                             : undefined, children: [jsxRuntime.jsx("option", { value: "local", children: "Local" }), jsxRuntime.jsx("option", { value: "remote-http", children: "Remote (HTTP)" }), jsxRuntime.jsx("option", { value: "remote-ws", children: "Remote (WebSocket)" })] }), backendKind === "remote-http" && (jsxRuntime.jsx("input", { className: "ml-2 border border-gray-300 rounded px-2 py-1 w-72", placeholder: "http://127.0.0.1:18080", value: httpBaseUrl, onChange: (e) => onHttpBaseUrlChange(e.target.value) })), backendKind === "remote-ws" && (jsxRuntime.jsx("input", { className: "ml-2 border border-gray-300 rounded px-2 py-1 w-72", placeholder: "ws://127.0.0.1:18081", value: wsUrl, onChange: (e) => onWsUrlChange(e.target.value) })), jsxRuntime.jsxs("select", { className: "border border-gray-300 rounded px-2 py-1", value: runner.getRunningEngine() ?? engine ?? "", onChange: (e) => {
                             const kind = e.target.value || undefined;