@synergenius/flow-weaver 0.22.4 → 0.22.6

package/dist/cli/flow-weaver.mjs

@@ -9886,7 +9886,7 @@ var VERSION;
 var init_generated_version = __esm({
   "src/generated-version.ts"() {
     "use strict";
-    VERSION = "0.22.4";
+    VERSION = "0.22.6";
   }
 });
 
@@ -10791,16 +10791,35 @@ function buildNodeArgumentsWithContext(opts) {
   } else if (skipPorts?.has("execute")) {
     args.push(`${safeId}_execute`);
   } else if (executeConnections.length > 0) {
-    const conn = executeConnections[0];
-    const sourceNode = conn.from.node;
-    const sourcePort = conn.from.port;
     const varName = `${safeId}_execute`;
-    const sourceIdx = isStartNode(sourceNode) ? "startIdx" : `${toValidIdentifier(sourceNode)}Idx`;
-    const isConstSource = isStartNode(sourceNode) || sourceNode === instanceParent;
-    const nonNullAssert = isConstSource ? "" : "!";
-    lines.push(
-      `${indent}const ${varName} = ${getCall}({ id: '${sourceNode}', portName: '${sourcePort}', executionIndex: ${sourceIdx}${nonNullAssert} }) as boolean;`
-    );
+    if (executeConnections.length === 1) {
+      const conn = executeConnections[0];
+      const sourceNode = conn.from.node;
+      const sourcePort = conn.from.port;
+      const sourceIdx = isStartNode(sourceNode) ? "startIdx" : `${toValidIdentifier(sourceNode)}Idx`;
+      const isConstSource = isStartNode(sourceNode) || sourceNode === instanceParent;
+      if (isConstSource) {
+        lines.push(
+          `${indent}const ${varName} = ${getCall}({ id: '${sourceNode}', portName: '${sourcePort}', executionIndex: ${sourceIdx} }) as boolean;`
+        );
+      } else {
+        lines.push(
+          `${indent}const ${varName} = ${sourceIdx} !== undefined ? ${getCall}({ id: '${sourceNode}', portName: '${sourcePort}', executionIndex: ${sourceIdx} }) as boolean : false;`
+        );
+      }
+    } else {
+      const parts = executeConnections.map((conn) => {
+        const sourceNode = conn.from.node;
+        const sourcePort = conn.from.port;
+        const sourceIdx = isStartNode(sourceNode) ? "startIdx" : `${toValidIdentifier(sourceNode)}Idx`;
+        const isConstSource = isStartNode(sourceNode) || sourceNode === instanceParent;
+        if (isConstSource) {
+          return `(${getCall}({ id: '${sourceNode}', portName: '${sourcePort}', executionIndex: ${sourceIdx} }) as boolean)`;
+        }
+        return `(${sourceIdx} !== undefined ? ${getCall}({ id: '${sourceNode}', portName: '${sourcePort}', executionIndex: ${sourceIdx} }) as boolean : false)`;
+      });
+      lines.push(`${indent}const ${varName} = ${parts.join(" || ")};`);
+    }
     if (emitInputEvents) {
       lines.push(
         `${indent}${setCall}({ id: '${id}', portName: 'execute', executionIndex: ${safeId}Idx, nodeTypeName: '${effectiveNodeTypeName}' }, ${varName});`
@@ -10866,7 +10885,10 @@ function buildNodeArgumentsWithContext(opts) {
         const sourceIdx = isStartNode(sourceNode) ? "startIdx" : `${toValidIdentifier(sourceNode)}Idx`;
         const isConstSource = isStartNode(sourceNode) || sourceNode === instanceParent;
         const nonNullAssert = isConstSource ? "" : "!";
-        const portType = mapToTypeScript(portConfig.dataType, portConfig.tsType);
+        const rawPortType = mapToTypeScript(portConfig.dataType, portConfig.tsType);
+        const isPrimitive = /^(string|number|boolean|void|unknown|any|never|null|undefined)(\[\])?$/.test(rawPortType);
+        const paramIndex = args.length;
+        const portType = isPrimitive ? rawPortType : `Parameters<typeof ${node.functionName}>[${paramIndex}]`;
         const needsGuard = portConfig.optional && !isConstSource;
         if (portConfig.dataType === "FUNCTION") {
           lines.push(`${indent}const __resolveFunction = typeof resolveFunction === 'function' ? resolveFunction : (p: unknown) => ({ fn: typeof p === 'function' ? p : () => { throw new Error('Cannot resolve function reference'); }, source: 'direct' as const });`);
@@ -10941,7 +10963,10 @@ function buildNodeArgumentsWithContext(opts) {
           }
         });
         const ternary = attempts.join(" ?? ");
-        const portType = mapToTypeScript(portConfig.dataType, portConfig.tsType);
+        const rawPortType2 = mapToTypeScript(portConfig.dataType, portConfig.tsType);
+        const isPrimitive2 = /^(string|number|boolean|void|unknown|any|never|null|undefined)(\[\])?$/.test(rawPortType2);
+        const paramIndex2 = args.length;
+        const portType = isPrimitive2 ? rawPortType2 : `Parameters<typeof ${node.functionName}>[${paramIndex2}]`;
         if (portConfig.dataType === "FUNCTION") {
           lines.push(`${indent}const __resolveFunction = typeof resolveFunction === 'function' ? resolveFunction : (p: unknown) => ({ fn: typeof p === 'function' ? p : () => { throw new Error('Cannot resolve function reference'); }, source: 'direct' as const });`);
           const rawVarName = `${varName}_raw`;
@@ -10961,7 +10986,10 @@ function buildNodeArgumentsWithContext(opts) {
     } else if (portConfig.expression) {
       const expression = portConfig.expression;
       const isFunction2 = expression.includes("=>") || expression.trim().startsWith("function");
-      const portType = mapToTypeScript(portConfig.dataType, portConfig.tsType);
+      const rawPortType3 = mapToTypeScript(portConfig.dataType, portConfig.tsType);
+      const isPrimitive3 = /^(string|number|boolean|void|unknown|any|never|null|undefined)(\[\])?$/.test(rawPortType3);
+      const paramIndex3 = args.length;
+      const portType = isPrimitive3 ? rawPortType3 : `Parameters<typeof ${node.functionName}>[${paramIndex3}]`;
       if (isFunction2) {
         lines.push(`${indent}const ${varName} = ${isAsync2 ? "await " : ""}(${expression})(ctx) as ${portType};`);
       } else {
@@ -10979,7 +11007,10 @@ function buildNodeArgumentsWithContext(opts) {
       args.push(varName);
       emitSetEvent();
     } else {
-      const portType = mapToTypeScript(portConfig.dataType, portConfig.tsType);
+      const rawPortType4 = mapToTypeScript(portConfig.dataType, portConfig.tsType);
+      const isPrimitive4 = /^(string|number|boolean|void|unknown|any|never|null|undefined)(\[\])?$/.test(rawPortType4);
+      const paramIndex4 = args.length;
+      const portType = isPrimitive4 ? rawPortType4 : `Parameters<typeof ${node.functionName}>[${paramIndex4}]`;
       lines.push(
         `${indent}let ${varName}: ${portType} = undefined as unknown as ${portType}; // Required port '${portName}' has no connection`
       );
@@ -11094,7 +11125,7 @@ function generateControlFlowWithExecutionContext(workflow, nodeTypes, isAsync2,
     lines.push(`    typeof globalThis !== 'undefined' && (globalThis as unknown as { __fw_debug_controller__?: TDebugController }).__fw_debug_controller__`);
     lines.push(`      ? (globalThis as unknown as { __fw_debug_controller__?: TDebugController }).__fw_debug_controller__`);
     lines.push(`      : { beforeNode: () => true, afterNode: () => {} }`);
-    lines.push(`  );`);
+    lines.push(`  )!;`);
     lines.push("");
   }
   lines.push(`  const startIdx = ctx.addExecution('${RESERVED_NODE_NAMES.START}');`);
@@ -94908,7 +94939,7 @@ var {
 // src/cli/index.ts
 init_logger();
 init_error_utils();
-var version2 = true ? "0.22.4" : "0.0.0-dev";
+var version2 = true ? "0.22.6" : "0.0.0-dev";
 var program2 = new Command();
 program2.name("fw").description("Flow Weaver Annotations - Compile and validate workflow files").option("-v, --version", "Output the current version").option("--no-color", "Disable colors").option("--color", "Force colors").on("option:version", () => {
   logger.banner(version2);

package/dist/generated-version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "0.22.4";
+export declare const VERSION = "0.22.6";
 //# sourceMappingURL=generated-version.d.ts.map

package/dist/generated-version.js

@@ -1,3 +1,3 @@
 // Auto-generated by scripts/generate-version.ts — do not edit manually
-export const VERSION = '0.22.4';
+export const VERSION = '0.22.6';
 //# sourceMappingURL=generated-version.js.map

package/dist/generator/code-utils.js

@@ -172,16 +172,36 @@ export function buildNodeArgumentsWithContext(opts) {
         args.push(`${safeId}_execute`);
     }
     else if (executeConnections.length > 0) {
-        // Execute port has a connection - use it
-        const conn = executeConnections[0];
-        const sourceNode = conn.from.node;
-        const sourcePort = conn.from.port;
+        // Execute port has connections - use them
         const varName = `${safeId}_execute`;
-        // startIdx is const so no ! needed; parent scope node is also const; other node indices are let so need !
-        const sourceIdx = isStartNode(sourceNode) ? 'startIdx' : `${toValidIdentifier(sourceNode)}Idx`;
-        const isConstSource = isStartNode(sourceNode) || sourceNode === instanceParent;
-        const nonNullAssert = isConstSource ? '' : '!';
-        lines.push(`${indent}const ${varName} = ${getCall}({ id: '${sourceNode}', portName: '${sourcePort}', executionIndex: ${sourceIdx}${nonNullAssert} }) as boolean;`);
+        if (executeConnections.length === 1) {
+            const conn = executeConnections[0];
+            const sourceNode = conn.from.node;
+            const sourcePort = conn.from.port;
+            const sourceIdx = isStartNode(sourceNode) ? 'startIdx' : `${toValidIdentifier(sourceNode)}Idx`;
+            const isConstSource = isStartNode(sourceNode) || sourceNode === instanceParent;
+            if (isConstSource) {
+                lines.push(`${indent}const ${varName} = ${getCall}({ id: '${sourceNode}', portName: '${sourcePort}', executionIndex: ${sourceIdx} }) as boolean;`);
+            }
+            else {
+                // Non-const source may be undefined (CANCELLED branch) — guard with false default
+                lines.push(`${indent}const ${varName} = ${sourceIdx} !== undefined ? ${getCall}({ id: '${sourceNode}', portName: '${sourcePort}', executionIndex: ${sourceIdx} }) as boolean : false;`);
+            }
+        }
+        else {
+            // Multiple execute connections — coalesce with ||, each guarded
+            const parts = executeConnections.map((conn) => {
+                const sourceNode = conn.from.node;
+                const sourcePort = conn.from.port;
+                const sourceIdx = isStartNode(sourceNode) ? 'startIdx' : `${toValidIdentifier(sourceNode)}Idx`;
+                const isConstSource = isStartNode(sourceNode) || sourceNode === instanceParent;
+                if (isConstSource) {
+                    return `(${getCall}({ id: '${sourceNode}', portName: '${sourcePort}', executionIndex: ${sourceIdx} }) as boolean)`;
+                }
+                return `(${sourceIdx} !== undefined ? ${getCall}({ id: '${sourceNode}', portName: '${sourcePort}', executionIndex: ${sourceIdx} }) as boolean : false)`;
+            });
+            lines.push(`${indent}const ${varName} = ${parts.join(' || ')};`);
+        }
         // Emit VARIABLE_SET for execute input port
         if (emitInputEvents) {
             lines.push(`${indent}${setCall}({ id: '${id}', portName: 'execute', executionIndex: ${safeId}Idx, nodeTypeName: '${effectiveNodeTypeName}' }, ${varName});`);
@@ -254,7 +274,13 @@ export function buildNodeArgumentsWithContext(opts) {
                 const sourceIdx = isStartNode(sourceNode) ? 'startIdx' : `${toValidIdentifier(sourceNode)}Idx`;
                 const isConstSource = isStartNode(sourceNode) || sourceNode === instanceParent;
                 const nonNullAssert = isConstSource ? '' : '!';
-                const portType = mapToTypeScript(portConfig.dataType, portConfig.tsType);
+                const rawPortType = mapToTypeScript(portConfig.dataType, portConfig.tsType);
+                // Use Parameters<typeof fn>[N] for non-primitive types to avoid bare
+                // type names from external modules that aren't in scope. The function
+                // IS always imported and in scope, so this is always safe.
+                const isPrimitive = /^(string|number|boolean|void|unknown|any|never|null|undefined)(\[\])?$/.test(rawPortType);
+                const paramIndex = args.length; // Current position in the function's parameter list
+                const portType = isPrimitive ? rawPortType : `Parameters<typeof ${node.functionName}>[${paramIndex}]`;
                 // For optional ports on non-const sources, guard against undefined execution index.
                 // This is critical for DISJUNCTION nodes where the source may not have executed.
                 const needsGuard = portConfig.optional && !isConstSource;
@@ -326,7 +352,10 @@ export function buildNodeArgumentsWithContext(opts) {
                     }
                 });
                 const ternary = attempts.join(' ?? ');
-                const portType = mapToTypeScript(portConfig.dataType, portConfig.tsType);
+                const rawPortType2 = mapToTypeScript(portConfig.dataType, portConfig.tsType);
+                const isPrimitive2 = /^(string|number|boolean|void|unknown|any|never|null|undefined)(\[\])?$/.test(rawPortType2);
+                const paramIndex2 = args.length;
+                const portType = isPrimitive2 ? rawPortType2 : `Parameters<typeof ${node.functionName}>[${paramIndex2}]`;
                 // For FUNCTION type ports, add resolution step to handle registry IDs
                 if (portConfig.dataType === 'FUNCTION') {
                     lines.push(`${indent}const __resolveFunction = typeof resolveFunction === 'function' ? resolveFunction : (p: unknown) => ({ fn: typeof p === 'function' ? p : () => { throw new Error('Cannot resolve function reference'); }, source: 'direct' as const });`);
@@ -345,7 +374,10 @@ export function buildNodeArgumentsWithContext(opts) {
         else if (portConfig.expression) {
             const expression = portConfig.expression;
             const isFunction = expression.includes('=>') || expression.trim().startsWith('function');
-            const portType = mapToTypeScript(portConfig.dataType, portConfig.tsType);
+            const rawPortType3 = mapToTypeScript(portConfig.dataType, portConfig.tsType);
+            const isPrimitive3 = /^(string|number|boolean|void|unknown|any|never|null|undefined)(\[\])?$/.test(rawPortType3);
+            const paramIndex3 = args.length;
+            const portType = isPrimitive3 ? rawPortType3 : `Parameters<typeof ${node.functionName}>[${paramIndex3}]`;
             if (isFunction) {
                 lines.push(`${indent}const ${varName} = ${isAsync ? 'await ' : ''}(${expression})(ctx) as ${portType};`);
             }
@@ -368,7 +400,10 @@ export function buildNodeArgumentsWithContext(opts) {
         }
         else {
             // Required port has no connection, expression, or default - use typed undefined fallback
-            const portType = mapToTypeScript(portConfig.dataType, portConfig.tsType);
+            const rawPortType4 = mapToTypeScript(portConfig.dataType, portConfig.tsType);
+            const isPrimitive4 = /^(string|number|boolean|void|unknown|any|never|null|undefined)(\[\])?$/.test(rawPortType4);
+            const paramIndex4 = args.length;
+            const portType = isPrimitive4 ? rawPortType4 : `Parameters<typeof ${node.functionName}>[${paramIndex4}]`;
             lines.push(`${indent}let ${varName}: ${portType} = undefined as unknown as ${portType}; // Required port '${portName}' has no connection`);
             args.push(varName);
             emitSetEvent();

package/dist/generator/unified.js

@@ -118,7 +118,7 @@ export function generateControlFlowWithExecutionContext(workflow, nodeTypes, isA
         lines.push(`    typeof globalThis !== 'undefined' && (globalThis as unknown as { __fw_debug_controller__?: TDebugController }).__fw_debug_controller__`);
         lines.push(`      ? (globalThis as unknown as { __fw_debug_controller__?: TDebugController }).__fw_debug_controller__`);
         lines.push(`      : { beforeNode: () => true, afterNode: () => {} }`);
-        lines.push(`  );`);
+        lines.push(`  )!;`);
         lines.push('');
     }
     lines.push(`  const startIdx = ctx.addExecution('${RESERVED_NODE_NAMES.START}');`);
@@ -814,7 +814,9 @@ isAsync = false) {
         if (!instance)
             return;
         const safeId = toValidIdentifier(instanceId);
-        // Add execution index for this skipped node so the event has a valid reference
+        // Use const (block-scoped) intentionally — the outer `let ${safeId}Idx`
+        // stays undefined, which signals to downstream guards that this node was
+        // CANCELLED and its data ports should not be read.
         lines.push(`${indent}const ${safeId}Idx = ${ctxVar}.addExecution('${instanceId}');`);
         // Set STEP port variables so downstream nodes reading onSuccess/onFailure
         // from this cancelled node don't crash with "Variable not found".

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@synergenius/flow-weaver",
-  "version": "0.22.4",
+  "version": "0.22.6",
   "description": "Deterministic workflow compiler for AI agents. Compiles to standalone TypeScript, no runtime dependencies.",
   "private": false,
   "type": "module",