@bian-womp/spark-workbench 0.1.20 → 0.1.21

package/lib/cjs/index.cjs

@@ -819,7 +819,10 @@ function useQueryParamString(key, defaultValue) {
 
 function resolveOutputDisplay(raw, declared) {
     if (sparkGraph.isTypedOutput(raw)) {
-        return { typeId: String(raw.__spark_type), value: raw.__spark_value };
+        return {
+            typeId: sparkGraph.getTypedOutputTypeId(raw),
+            value: sparkGraph.getTypedOutputValue(raw),
+        };
     }
     let typeId = undefined;
     if (Array.isArray(declared)) {
@@ -841,7 +844,7 @@ function preformatValueForDisplay(typeId, value, registry) {
         return "";
     // Unwrap typed outputs
     if (sparkGraph.isTypedOutput(value)) {
-        return preformatValueForDisplay(String(value.__spark_type), value.__spark_value, registry);
+        return preformatValueForDisplay(sparkGraph.getTypedOutputTypeId(value), sparkGraph.getTypedOutputValue(value), registry);
     }
     // Enums
     if (typeId && typeId.includes("enum:") && registry) {
@@ -885,7 +888,7 @@ function summarizeDeep(value) {
     }
     // Typed output wrapper
     if (sparkGraph.isTypedOutput(value)) {
-        return summarizeDeep(value.__spark_value);
+        return summarizeDeep(sparkGraph.getTypedOutputValue(value));
     }
     // Arrays
     if (Array.isArray(value)) {
@@ -1078,6 +1081,21 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
     const def = wb.export();
     const inputsMap = React.useMemo(() => runner.getInputs(def), [runner, def, valuesTick]);
     const outputsMap = React.useMemo(() => runner.getOutputs(def), [runner, def, valuesTick]);
+    const outputTypesMap = React.useMemo(() => {
+        const out = {};
+        // Local: runtimeTypeId is not stored; derive from typed wrapper in outputsMap
+        for (const n of def.nodes) {
+            const handles = Object.keys(registry.nodes.get(n.typeId)?.outputs ?? {});
+            const cur = {};
+            for (const h of handles) {
+                const v = outputsMap[n.nodeId]?.[h];
+                cur[h] = sparkGraph.getTypedOutputTypeId(v);
+            }
+            if (Object.keys(cur).length > 0)
+                out[n.nodeId] = cur;
+        }
+        return out;
+    }, [def, outputsMap, registry]);
     // Initialize nodes as invalidated by default until first successful run
     React.useEffect(() => {
         setNodeStatus((prev) => {
@@ -1425,6 +1443,7 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
         valuesTick,
         inputsMap,
         outputsMap,
+        outputTypesMap,
         validationByNode,
         validationByEdge,
         validationGlobal,
@@ -1521,7 +1540,7 @@ function Inspector({ debug, autoScroll, hideWorkbench, onAutoScrollChange, onHid
             return String(value ?? "");
         }
     };
-    const { registry, def, selectedNodeId, selectedEdgeId, inputsMap, outputsMap, nodeStatus, validationByNode, validationByEdge, validationGlobal, valuesTick, } = useWorkbenchContext();
+    const { registry, def, selectedNodeId, selectedEdgeId, inputsMap, outputsMap, outputTypesMap, nodeStatus, validationByNode, validationByEdge, validationGlobal, valuesTick, } = useWorkbenchContext();
     const nodeValidationIssues = validationByNode.issues;
     const edgeValidationIssues = validationByEdge.issues;
     const nodeValidationHandles = validationByNode;
@@ -1644,7 +1663,7 @@ 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: (() => {
+                                }))] }), 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.jsxs("label", { className: "w-20 flex flex-col", children: [jsxRuntime.jsx("span", { children: h }), jsxRuntime.jsx("span", { className: "text-gray-500 text-[11px]", children: outputTypesMap[selectedNodeId]?.[h] ?? "" })] }), jsxRuntime.jsx("div", { className: "flex-1", children: (() => {
                                                 const { typeId, value } = resolveOutputDisplay(nodeOutputs[h], selectedDesc?.outputs?.[h]);
                                                 return toElement(typeId, value);
                                             })() }), (() => {
@@ -2308,7 +2327,7 @@ function WorkbenchStudioCanvas({ setRegistry, autoScroll, onAutoScrollChange, ex
             return "";
         // Normalize typed wrapper
         if (sparkGraph.isTypedOutput(value)) {
-            return baseToString(String(value.__spark_type), value.__spark_value);
+            return baseToString(sparkGraph.getTypedOutputTypeId(value), sparkGraph.getTypedOutputValue(value));
         }
         const pre = preformatValueForDisplay(typeId, value, registry);
         if (pre !== undefined)