@bian-womp/spark-graph 0.2.57 → 0.2.59

package/lib/cjs/index.cjs

@@ -402,6 +402,14 @@ class Registry {
     }
 }
 
+const LOG_LEVEL_VALUES = {
+    debug: 0,
+    info: 1,
+    warn: 2,
+    error: 3,
+    silent: 4,
+};
+
 // Helper: typed promise detection and unwrapping for T | Promise<T>
 function isPromise(value) {
     return !!value && typeof value.then === "function";
@@ -476,6 +484,7 @@ class GraphRuntime {
                     ...desc.policy,
                     ...n.params?.policy,
                 },
+                logLevel: desc.logLevel,
                 runSeq: 0,
                 activeControllers: new Set(),
                 queue: [],
@@ -643,6 +652,36 @@ class GraphRuntime {
             ((p) => {
                 node.stats.progress = Math.max(0, Math.min(1, Number(p) || 0));
             });
+        // Create log function that respects node's logLevel
+        const log = (level, message, context) => {
+            const nodeLogLevel = node.logLevel ?? "info"; // Default to "info" if not set
+            const nodeLogValue = LOG_LEVEL_VALUES[nodeLogLevel] ?? 1;
+            const requestedValue = LOG_LEVEL_VALUES[level] ?? 1;
+            // Only log if requested level >= node's logLevel
+            if (requestedValue >= nodeLogValue && nodeLogLevel !== "silent") {
+                const contextStr = context
+                    ? ` ${Object.entries(context)
+                        .map(([k, v]) => `${k}=${JSON.stringify(v)}`)
+                        .join(" ")}`
+                    : "";
+                const fullMessage = `[node:${runId || nodeId}:${node.typeId}] ${message}${contextStr}`;
+                // For other levels, use appropriate console method
+                switch (level) {
+                    case "debug":
+                        console.info(fullMessage);
+                        break;
+                    case "info":
+                        console.info(fullMessage);
+                        break;
+                    case "warn":
+                        console.warn(fullMessage);
+                        break;
+                    case "error":
+                        console.error(fullMessage);
+                        break;
+                }
+            }
+        };
         return {
             state: node.state,
             setState: (next) => Object.assign(node.state, next),
@@ -658,6 +697,7 @@ class GraphRuntime {
             runId,
             abortSignal,
             reportProgress,
+            log,
         };
     }
     scheduleInputsChangedInternal(nodeId) {
@@ -722,7 +762,11 @@ class GraphRuntime {
             const exec = async (attempt) => {
                 let hadError = false;
                 try {
-                    node.lifecycle?.prepare?.(node.params ?? {}, ctx);
+                    if (node.lifecycle?.prepare) {
+                        ctx.log("debug", "prepare-start");
+                        node.lifecycle.prepare(node.params ?? {}, ctx);
+                        ctx.log("debug", "prepare-done");
+                    }
                     await node.runtime.onInputsChanged?.(capturedInputs, ctx);
                 }
                 catch (err) {
@@ -763,12 +807,17 @@ class GraphRuntime {
                         runId,
                         durationMs: node.stats.lastDurationMs,
                     });
+                    ctx.log("debug", "node-done", {
+                        durationMs: node.stats.lastDurationMs,
+                        hadError,
+                    });
                     if (onDone)
                         onDone();
                 }
             };
             // fire node-start event
             this.emit("stats", { kind: "node-start", nodeId, runId });
+            ctx.log("debug", "node-start");
             exec(0);
         };
         const mode = policy.asyncConcurrency ?? "switch";
@@ -1167,7 +1216,11 @@ class GraphRuntime {
             const effectiveInputs = this.getEffectiveInputs(node.nodeId);
             const ctrl = new AbortController();
             const ctx = this.createExecutionContext(node.nodeId, node, effectiveInputs, `${node.nodeId}:init`, ctrl.signal);
-            node.lifecycle?.prepare?.(node.params ?? {}, ctx);
+            if (node.lifecycle?.prepare) {
+                ctx.log("debug", "prepare-start");
+                node.lifecycle.prepare(node.params ?? {}, ctx);
+                ctx.log("debug", "prepare-done");
+            }
             node.runtime.onActivated?.();
         }
         if (invalidate) {
@@ -1413,7 +1466,11 @@ class GraphRuntime {
                 const effectiveInputs = this.getEffectiveInputs(rn.nodeId);
                 const ctrl = new AbortController();
                 const ctx = this.createExecutionContext(rn.nodeId, rn, effectiveInputs, `${rn.nodeId}:init`, ctrl.signal);
-                rn.lifecycle?.prepare?.(rn.params ?? {}, ctx);
+                if (rn.lifecycle?.prepare) {
+                    ctx.log("debug", "prepare-start");
+                    rn.lifecycle.prepare(rn.params ?? {}, ctx);
+                    ctx.log("debug", "prepare-done");
+                }
                 rn.runtime.onActivated?.();
             }
             else {
@@ -1601,6 +1658,13 @@ class GraphRuntime {
             return;
         const token = (this.recomputeTokenByNode.get(nodeId) ?? 0) + 1;
         this.recomputeTokenByNode.set(nodeId, token);
+        // Log resolveHandles-start
+        const nodeLogLevel = node.logLevel ?? "info";
+        const nodeLogValue = LOG_LEVEL_VALUES[nodeLogLevel] ?? 1;
+        const shouldLog = nodeLogValue <= LOG_LEVEL_VALUES.debug && nodeLogLevel !== "silent";
+        if (shouldLog) {
+            console.info(`[node:${nodeId}:${node.typeId}] resolveHandles-start`);
+        }
         let r;
         try {
             const res = resolveHandles({
@@ -1611,8 +1675,16 @@ class GraphRuntime {
             r = await unwrapMaybePromise(res);
         }
         catch {
+            // Log resolveHandles-done even on error
+            if (shouldLog) {
+                console.info(`[node:${nodeId}:${node.typeId}] resolveHandles-done (error)`);
+            }
             return;
         }
+        // Log resolveHandles-done
+        if (shouldLog) {
+            console.info(`[node:${nodeId}:${node.typeId}] resolveHandles-done`);
+        }
         // If a newer recompute was scheduled, drop this result
         if ((this.recomputeTokenByNode.get(nodeId) ?? 0) !== token)
             return;
@@ -3694,7 +3766,14 @@ function mergeGraphDefinitions(target, source, converter) {
                             ? transformedNode.resolvedHandles.inputs[handleId]
                             : transformedNode.resolvedHandles.inputs[handleId]?.typeId
                         : undefined;
-                    transformedInitialInputs[handleId] = converter(newId, handleId, value, "initialInput", nodeTypeId, handleDataType);
+                    transformedInitialInputs[handleId] = converter({
+                        nodeId: newId,
+                        handleId,
+                        value,
+                        type: "initialInput",
+                        nodeTypeId,
+                        handleDataType,
+                    });
                 }
                 transformedNode.initialInputs = transformedInitialInputs;
             }
@@ -3707,7 +3786,14 @@ function mergeGraphDefinitions(target, source, converter) {
                             ? transformedNode.resolvedHandles.inputs[handleId]
                             : transformedNode.resolvedHandles.inputs[handleId]?.typeId
                         : undefined;
-                    transformedInputDefaults[handleId] = converter(newId, handleId, value, "inputDefault", nodeTypeId, handleDataType);
+                    transformedInputDefaults[handleId] = converter({
+                        nodeId: newId,
+                        handleId,
+                        value,
+                        type: "inputDefault",
+                        nodeTypeId,
+                        handleDataType,
+                    });
                 }
                 transformedNode.resolvedHandles = {
                     ...transformedNode.resolvedHandles,
@@ -3805,7 +3891,14 @@ function mergeInputsOutputs(targetInputs, targetOutputs, sourceInputs, sourceOut
             for (const [handleId, value] of Object.entries(inputs)) {
                 const handleDataType = handleTypeMap?.get(oldId)?.get(handleId);
                 transformedInputs[handleId] = converter
-                    ? converter(newId, handleId, value, "input", nodeTypeId, handleDataType)
+                    ? converter({
+                        nodeId: newId,
+                        handleId,
+                        value,
+                        type: "input",
+                        nodeTypeId,
+                        handleDataType,
+                    })
                     : value;
             }
             mergedInputs[newId] = mergedInputs[newId]
@@ -3824,7 +3917,15 @@ function mergeInputsOutputs(targetInputs, targetOutputs, sourceInputs, sourceOut
                     ? getTypedOutputTypeId(value)
                     : undefined;
                 transformedOutputs[handleId] = converter
-                    ? converter(newId, handleId, value, "output", nodeTypeId, handleDataType, runtimeTypeId)
+                    ? converter({
+                        nodeId: newId,
+                        handleId,
+                        value,
+                        type: "output",
+                        nodeTypeId,
+                        handleDataType,
+                        runtimeTypeId,
+                    })
                     : value;
             }
             mergedOutputs[newId] = mergedOutputs[newId]
@@ -3897,7 +3998,8 @@ function matchesPattern(value, pattern) {
  * - value exists in valueMap
  */
 function buildValueConverter(config) {
-    return (nodeId, handleId, value, type, nodeTypeId, handleDataType, runtimeTypeId) => {
+    return (converterConfig) => {
+        const { nodeId, handleId, value, type, nodeTypeId, handleDataType, runtimeTypeId, } = converterConfig;
         const isTyped = isTypedOutput(value);
         for (const mapping of config.mappings) {
             if (!matchesPattern(handleId, mapping.handleId))