@bian-womp/spark-graph 0.3.8 → 0.3.9

package/lib/cjs/index.cjs

@@ -28,6 +28,46 @@ function isInputPrivate(inputs, handle) {
     const v = inputs ? inputs[handle] : undefined;
     return !!(v && typeof v === "object" && v.private);
 }
+/**
+ * Merge two InputHandleDescriptor values, with dynamic taking precedence.
+ * If both have metadata, merge the metadata objects (dynamic overrides static).
+ */
+function mergeInputHandleDescriptors(staticDesc, dynamicDesc) {
+    // If only one exists, return it
+    if (!staticDesc)
+        return dynamicDesc;
+    if (!dynamicDesc)
+        return staticDesc;
+    // If both are strings, dynamic wins
+    if (typeof staticDesc === "string" && typeof dynamicDesc === "string") {
+        return dynamicDesc;
+    }
+    const staticObj = typeof staticDesc === "string" ? { typeId: staticDesc } : staticDesc;
+    const dynamicObj = typeof dynamicDesc === "string" ? { typeId: dynamicDesc } : dynamicDesc;
+    // Merge: dynamic takes precedence, but merge metadata objects
+    const merged = {
+        typeId: dynamicObj.typeId ?? staticObj.typeId,
+        private: dynamicObj.private ?? staticObj.private,
+    };
+    // Merge metadata if either has it
+    if (staticObj.metadata || dynamicObj.metadata) {
+        merged.metadata = {
+            ...staticObj.metadata,
+            ...dynamicObj.metadata, // Dynamic metadata overrides static
+        };
+    }
+    // Return as InputHandleDescriptor (which accepts object form)
+    return merged;
+}
+/**
+ * Extract metadata from an InputHandleDescriptor
+ */
+function getInputHandleMetadata(inputs, handle) {
+    const v = inputs ? inputs[handle] : undefined;
+    if (!v || typeof v === "string")
+        return undefined;
+    return v.metadata;
+}
 
 class CategoryRegistry {
     constructor() {
@@ -752,11 +792,34 @@ function tryHandleResolving(def, registry, environment) {
             // ignore dynamic resolution errors at this stage
         }
         // Merge base with dynamic and overrides (allow partial resolvedHandles)
-        const inputs = {
-            ...desc.inputs,
-            ...dyn.inputs,
-            ...overrideInputs,
-        };
+        // Merge inputs properly, handling metadata
+        const inputs = {};
+        // First, add all static handles
+        if (desc.inputs) {
+            for (const [handle, staticDesc] of Object.entries(desc.inputs)) {
+                inputs[handle] = staticDesc;
+            }
+        }
+        // Then, merge dynamic handles
+        if (dyn.inputs) {
+            for (const [handle, dynamicDesc] of Object.entries(dyn.inputs)) {
+                const staticDesc = desc.inputs?.[handle];
+                const merged = mergeInputHandleDescriptors(staticDesc, dynamicDesc);
+                if (merged) {
+                    inputs[handle] = merged;
+                }
+            }
+        }
+        // Finally, merge overrides
+        if (overrideInputs) {
+            for (const [handle, overrideDesc] of Object.entries(overrideInputs)) {
+                const existingDesc = inputs[handle];
+                const merged = mergeInputHandleDescriptors(existingDesc, overrideDesc);
+                if (merged) {
+                    inputs[handle] = merged;
+                }
+            }
+        }
         const outputs = {
             ...desc.outputs,
             ...dyn.outputs,
@@ -1022,7 +1085,24 @@ class HandleResolver {
             const nodeDesc = this.registry.nodes.get(node.typeId);
             if (!nodeDesc)
                 return;
-            const inputs = { ...nodeDesc.inputs, ...resolved?.inputs };
+            // Merge inputs properly, handling metadata
+            const inputs = {};
+            // First, add all static handles
+            if (nodeDesc.inputs) {
+                for (const [handle, staticDesc] of Object.entries(nodeDesc.inputs)) {
+                    inputs[handle] = staticDesc;
+                }
+            }
+            // Then, merge dynamic handles
+            if (resolved?.inputs) {
+                for (const [handle, dynamicDesc] of Object.entries(resolved.inputs)) {
+                    const staticDesc = nodeDesc.inputs?.[handle];
+                    const merged = mergeInputHandleDescriptors(staticDesc, dynamicDesc);
+                    if (merged) {
+                        inputs[handle] = merged;
+                    }
+                }
+            }
             const outputs = { ...nodeDesc.outputs, ...resolved?.outputs };
             const inputDefaults = {
                 ...nodeDesc.inputDefaults,
@@ -5087,6 +5167,7 @@ exports.createValidationGraphDef = createValidationGraphDef;
 exports.createValidationGraphRegistry = createValidationGraphRegistry;
 exports.findMatchingPaths = findMatchingPaths;
 exports.generateId = generateId;
+exports.getInputHandleMetadata = getInputHandleMetadata;
 exports.getInputTypeId = getInputTypeId;
 exports.getTypedOutputTypeId = getTypedOutputTypeId;
 exports.getTypedOutputValue = getTypedOutputValue;
@@ -5095,6 +5176,7 @@ exports.installLogging = installLogging;
 exports.isInputPrivate = isInputPrivate;
 exports.isTypedOutput = isTypedOutput;
 exports.mergeGraphDefinitions = mergeGraphDefinitions;
+exports.mergeInputHandleDescriptors = mergeInputHandleDescriptors;
 exports.mergeInputsOutputs = mergeInputsOutputs;
 exports.mergeRuntimeState = mergeRuntimeState;
 exports.mergeSnapshotData = mergeSnapshotData;