@teleporthq/teleport-plugin-next-workflows 0.45.15 → 0.45.16

package/__tests__/streaming-route-if-branch.test.ts

@@ -0,0 +1,107 @@
+import { generateStreamingServerSegmentAPIRoute } from '../src/api-route-generator'
+import type { WorkflowSegment } from '../src/types'
+import { loadServerRuntime } from './_helpers/load-server-runtime'
+
+/**
+ * A streaming segment route evaluated an if-statement and then ran both of its
+ * branches: it never recorded the branch not taken, and never read the record
+ * a switch made of its unmatched cases.
+ */
+
+const RUNS_KEY = '__streamingIfBranchRuns'
+
+const runs = (): string[] => (globalThis as Record<string, any>)[RUNS_KEY] || []
+
+const recordingNode = (id: string, stepNumber: number) => ({
+  id,
+  type: 'general-custom-js',
+  config: {
+    code: [
+      'function customHandler() {',
+      `  globalThis.${RUNS_KEY} = (globalThis.${RUNS_KEY} || []).concat('${id}');`,
+      '  return { ok: true };',
+      '}',
+    ].join('\n'),
+    context: 'server',
+  },
+  stepNumber,
+  label: id,
+})
+
+const segmentWhere = (leftValue: number): WorkflowSegment =>
+  ({
+    id: 'seg-if',
+    env: 'server',
+    nodeIds: ['if-1', 'yes-1', 'no-1'],
+    nodes: [
+      {
+        id: 'if-1',
+        type: 'general-if-statement',
+        config: { conditionType: 'simple-comparison', leftValue, operator: '===', rightValue: 1 },
+        stepNumber: 1,
+        label: 'Is One',
+      },
+      recordingNode('yes-1', 2),
+      recordingNode('no-1', 3),
+    ],
+    edges: [
+      { id: 'e1', source: 'if-1', target: 'yes-1', sourceHandle: 'true' },
+      { id: 'e2', source: 'if-1', target: 'no-1', sourceHandle: 'false' },
+    ],
+  } as unknown as WorkflowSegment)
+
+const run = async (segment: WorkflowSegment) => {
+  const runtime = loadServerRuntime()
+  const routeModule: { exports: any } = { exports: {} }
+  // eslint-disable-next-line @typescript-eslint/no-implied-eval
+  new Function('module', 'exports', 'require', generateStreamingServerSegmentAPIRoute(segment))(
+    routeModule,
+    routeModule.exports,
+    (id: string): unknown => {
+      if (id.endsWith('/utils/workflows/server-runtime')) {
+        return runtime
+      }
+      throw new Error('Unexpected require: ' + id)
+    }
+  )
+  const reply = { status: 0 }
+  const res = {
+    status(code: number) {
+      reply.status = code
+      return this
+    },
+    json() {
+      return this
+    },
+    setHeader: (): void => undefined,
+  }
+  await routeModule.exports(
+    { method: 'POST', body: { context: {} }, headers: { host: 'site.example' } },
+    res
+  )
+  return reply
+}
+
+beforeEach(() => {
+  delete (globalThis as Record<string, any>)[RUNS_KEY]
+})
+
+afterAll(() => {
+  delete (globalThis as Record<string, any>)[RUNS_KEY]
+})
+
+describe('a streaming server segment route runs one branch of an if-statement', () => {
+  it('runs only the true branch when the condition holds', async () => {
+    const reply = await run(segmentWhere(1))
+
+    expect(reply.status).toBe(200)
+    expect(runs()).toEqual(['yes-1'])
+  })
+
+  it('runs only the false branch when it does not', async () => {
+    const reply = await run(segmentWhere(2))
+
+    expect(reply.status).toBe(200)
+    expect(runs()).toEqual(['no-1'])
+  })
+})

package/dist/cjs/api-route-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-route-generator.d.ts","sourceRoot":"","sources":["../../src/api-route-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EAGb,iBAAiB,EACjB,sBAAsB,EACtB,sBAAsB,EACvB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAE9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAA;AAuEvE,MAAM,WAAW,yBAAyB;IACxC,0EAA0E;IAC1E,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IACxB;;;;OAIG;IACH,KAAK,CAAC,EAAE,YAAY,CAAA;IACpB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAA;CACrD;AAED,OAAO,EAAE,qBAAqB,EAAE,CAAA;AAEhC,wEAAwE;AACxE,eAAO,MAAM,wBAAwB;;;CAAiC,CAAA;AAEtE,iFAAiF;AACjF,eAAO,MAAM,oBAAoB,4CAA4C,CAAA;AA+O7E,eAAO,MAAM,6BAA6B,YAC/B,eAAe,iBACT,MAAM,eACR,sBAAsB,YAC1B,yBAAyB,KACjC,MA0XF,CAAA;AAED,eAAO,MAAM,kBAAkB,YAAa,eAAe,KAAG,OAE7D,CAAA;AAED,eAAO,MAAM,sCAAsC,YACxC,eAAe,iBACT,MAAM,eACR,sBAAsB,YAC1B,yBAAyB,KACjC,MA0cF,CAAA;AA6ID;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,aA4D5B,CAAA;AAEF,qDAAqD;AACrD,MAAM,WAAW,0BAA0B;IACzC,kEAAkE;IAClE,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B;AAqBD,eAAO,MAAM,oBAAoB,aACrB,YAAY,gBACR,OAAO,MAAM,EAAE,sBAAsB,CAAC,YAC3C,0BAA0B,KAClC,MA0HF,CAAA;AAED,eAAO,MAAM,mBAAmB,eAClB,MAAM,aACP,MAAM,iBACF,MAAM,KACpB,MA4BF,CAAA;AAED,eAAO,MAAM,oBAAoB,aAAc,YAAY,KAAG,MAa7D,CAAA;AAuTD,uHAAuH;AACvH,eAAO,MAAM,uBAAuB,kBAAmB,iBAAiB,KAAG,OAES,CAAA;AAEpF,eAAO,MAAM,+BAA+B,aAChC,YAAY,gBACR,OAAO,MAAM,EAAE,sBAAsB,CAAC,YAC3C,0BAA0B,KAClC,MAkOF,CAAA;AAkED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,uBAAuB,aACxB,YAAY,gBACR,OAAO,MAAM,EAAE,sBAAsB,CAAC,KACnD,MA8KF,CAAA;AAED,eAAO,MAAM,uBAAuB,aAAc,YAAY,KAAG,MAiBhE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,0BAA0B,cAC1B,aAAa,GAAG,SAAS,cACxB,MAAM,KACjB,MAAM,GAAG,IAYX,CAAA;AAED,eAAO,MAAM,mBAAmB,aAAc,YAAY,KAAG,MAAM,EAqBlE,CAAA"}
+{"version":3,"file":"api-route-generator.d.ts","sourceRoot":"","sources":["../../src/api-route-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EAGb,iBAAiB,EACjB,sBAAsB,EACtB,sBAAsB,EACvB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAE9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAA;AAuEvE,MAAM,WAAW,yBAAyB;IACxC,0EAA0E;IAC1E,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IACxB;;;;OAIG;IACH,KAAK,CAAC,EAAE,YAAY,CAAA;IACpB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAA;CACrD;AAED,OAAO,EAAE,qBAAqB,EAAE,CAAA;AAEhC,wEAAwE;AACxE,eAAO,MAAM,wBAAwB;;;CAAiC,CAAA;AAEtE,iFAAiF;AACjF,eAAO,MAAM,oBAAoB,4CAA4C,CAAA;AA+O7E,eAAO,MAAM,6BAA6B,YAC/B,eAAe,iBACT,MAAM,eACR,sBAAsB,YAC1B,yBAAyB,KACjC,MAuSF,CAAA;AAED,eAAO,MAAM,kBAAkB,YAAa,eAAe,KAAG,OAE7D,CAAA;AAED,eAAO,MAAM,sCAAsC,YACxC,eAAe,iBACT,MAAM,eACR,sBAAsB,YAC1B,yBAAyB,KACjC,MA+ZF,CAAA;AA6ID;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,aA4D5B,CAAA;AAEF,qDAAqD;AACrD,MAAM,WAAW,0BAA0B;IACzC,kEAAkE;IAClE,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B;AAqBD,eAAO,MAAM,oBAAoB,aACrB,YAAY,gBACR,OAAO,MAAM,EAAE,sBAAsB,CAAC,YAC3C,0BAA0B,KAClC,MA0HF,CAAA;AAED,eAAO,MAAM,mBAAmB,eAClB,MAAM,aACP,MAAM,iBACF,MAAM,KACpB,MA4BF,CAAA;AAED,eAAO,MAAM,oBAAoB,aAAc,YAAY,KAAG,MAa7D,CAAA;AAmPD,uHAAuH;AACvH,eAAO,MAAM,uBAAuB,kBAAmB,iBAAiB,KAAG,OAES,CAAA;AAEpF,eAAO,MAAM,+BAA+B,aAChC,YAAY,gBACR,OAAO,MAAM,EAAE,sBAAsB,CAAC,YAC3C,0BAA0B,KAClC,MAkOF,CAAA;AAkED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,uBAAuB,aACxB,YAAY,gBACR,OAAO,MAAM,EAAE,sBAAsB,CAAC,KACnD,MA8KF,CAAA;AAED,eAAO,MAAM,uBAAuB,aAAc,YAAY,KAAG,MAiBhE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,0BAA0B,cAC1B,aAAa,GAAG,SAAS,cACxB,MAAM,KACjB,MAAM,GAAG,IAYX,CAAA;AAED,eAAO,MAAM,mBAAmB,aAAc,YAAY,KAAG,MAAM,EAqBlE,CAAA"}

package/dist/cjs/api-route-generator.js

@@ -319,6 +319,8 @@ module.exports = async function handler(req, res) {
       // the caller as if that branch had run (a custom node answers the output
       // of the last node it ran).
       if (context.__skippedNodes && context.__skippedNodes[node.id]) continue;
+      // A node of a loop body ran inside its loop, an if-statement included.
+      if (context.__loopBodyNodeIds && context.__loopBodyNodeIds[node.id]) continue;
       const resolved = resolveNodeConfig(node, context);
       // Every data node lives in a SERVER segment, so this guard — which turns an
       // unresolved {{…}} into a validation error instead of letting the literal
@@ -334,119 +336,34 @@ module.exports = async function handler(req, res) {
       if (node.type === 'general-if-statement') {
         const condResult = utils.evaluateCondition(resolved, context, node.config);
         context[node.id] = { result: condResult };
-        var skipHandle = condResult ? 'false' : 'true';
-        var segEdgesIf = SEGMENT_CONFIG.edges || [];
-        var skipEdge = segEdgesIf.find(function(e) { return e.source === node.id && e.sourceHandle === skipHandle; });
-        if (skipEdge) {
-          // BFS to collect all nodes in the non-taken branch
-          var skipIds = {};
-          var skipQueue = [skipEdge.target];
-          while (skipQueue.length > 0) {
-            var sid = skipQueue.shift();
-            if (skipIds[sid] || sid === node.id) continue;
-            skipIds[sid] = true;
-            segEdgesIf.forEach(function(e) {
-              if (e.source === sid && !skipIds[e.target] && e.target !== node.id) skipQueue.push(e.target);
-            });
-          }
-          if (!context.__skippedNodes) context.__skippedNodes = {};
-          Object.assign(context.__skippedNodes, skipIds);
-        }
+        if (!context.__skippedNodes) context.__skippedNodes = {};
+        Object.assign(context.__skippedNodes, utils.nonTakenBranchNodeIds(SEGMENT_CONFIG.edges, node.id, condResult));
         continue;
       }
 
-      // Loop nodes must be handled specially: run the loop body nodes once per
-      // pass of the loop type (see createLoopSteps), then continue after the loop.
+      // A loop runs its body once per pass of its type, a loop inside the body
+      // included (see runServerLoop in the server runtime).
       if (node.type === 'general-loop') {
-        const loopEdges = SEGMENT_CONFIG.edges.filter(function(e) { return e.source === node.id; });
-        const loopBodyEdge = loopEdges.find(function(e) { return e.sourceHandle === 'loop'; });
-        const exitEdge = loopEdges.find(function(e) { return e.sourceHandle === 'exit'; });
-
-        // Collect loop body node IDs by following loop-body edges
-        const bodyNodeIds = {};
-        if (loopBodyEdge) {
-          const queue = [loopBodyEdge.target];
-          while (queue.length > 0) {
-            const nid = queue.shift();
-            if (bodyNodeIds[nid] || nid === node.id) continue;
-            bodyNodeIds[nid] = true;
-            SEGMENT_CONFIG.edges.forEach(function(e) {
-              if (e.source === nid && (e.sourceHandle === 'loop-body-out' || !e.sourceHandle)) {
-                if (e.target !== node.id) queue.push(e.target);
-              }
-            });
-          }
-        }
-        const bodyNodes = sortedNodes.filter(function(n) { return bodyNodeIds[n.id]; });
-        // For loopType=map, the schema (general-loop in node-context-schemas.json)
-        // defines results as the array of last body node outputs (same as
-        // Array.prototype.map). Pick the last body node so downstream nodes
-        // (e.g. state-update-global-state) consume the transformed value
-        // instead of the per-iteration scaffolding object.
-        const __loopType = resolved.loopType || 'forEach';
-        const __lastBodyNode = bodyNodes[bodyNodes.length - 1];
-
-        // Resolve the collection to iterate over. unwrapWorkflowCollection
-        // handles the common envelope shape that helper nodes return —
-        // transform-array { result, ... }, integration-airtable { records, ... },
-        // utility-semantic-search { matches, ... } — by unwrapping a single
-        // array property when the upstream binding pointed at the parent node
-        // instead of the inner field. See runtime-utils for the full rules.
-        var collection = utils.unwrapWorkflowCollection(resolved.collection);
-        var loopResults = [];
-
-        // Track this loop's body scope so general-custom-js (and any handler
-        // that consults the scope stack) can build the params / innerParams
-        // arrays the workflow editor advertises: params = nodes BEFORE the
-        // outermost loop, innerParamsN = nodes inside the loop at depth N.
-        if (!context.__loopScopeStack) context.__loopScopeStack = [];
-        context.__loopScopeStack.push({ loopNodeId: node.id, bodyNodeIds: bodyNodeIds });
-        // Persistent registry of every loop scaffold node we've entered, so
-        // a sibling that runs AFTER an inner loop completes still recognises
-        // that inner loop id as scaffolding (not as a regular workflow node).
-        if (!context.__loopNodeIds) context.__loopNodeIds = {};
-        context.__loopNodeIds[node.id] = true;
-
-        var loopSteps = utils.createLoopSteps(node, resolved, context, collection);
-        for (var loopPass = loopSteps.next(context); loopPass; loopPass = loopSteps.next(context)) {
-          context[loopPass.key] = loopPass.value;
-          for (var bi = 0; bi < bodyNodes.length; bi++) {
-            var bNode = bodyNodes[bi];
-            var bResolved = resolveNodeConfig(bNode, context);
-            bResolved.__nodeId = bNode.id;
-            if (bNode.type === 'general-if-statement') {
-              context[bNode.id] = { result: utils.evaluateCondition(bResolved, context, bNode.config) };
-              continue;
-            }
-            var bHandler = nodeHandlers[bNode.type];
-            if (!bHandler) continue;
-            if (utils.isFireAndForgetNode(bNode)) {
-              utils.registerPendingNodePromise(context, utils.startFireAndForgetNode(bNode, bHandler, bResolved, context));
-              context[bNode.id] = null;
-              continue;
-            }
-            var bResult = await bHandler(bResolved, context);
-            if (bResult && (bResult.success === false || (typeof bResult.error === 'string' && bResult.error))) {
-              throw new Error(bResult.error || 'Loop body node execution failed');
-            }
-            context[bNode.id] = bResult;
+        const bodyNodeIds = await utils.runServerLoop(node, resolved, sortedNodes, SEGMENT_CONFIG.edges, context, async function(bNode, bResolved) {
+          var bHandler = nodeHandlers[bNode.type];
+          if (!bHandler) return;
+          if (utils.isFireAndForgetNode(bNode)) {
+            utils.registerPendingNodePromise(context, utils.startFireAndForgetNode(bNode, bHandler, bResolved, context));
+            context[bNode.id] = null;
+            return;
           }
-          if (__loopType === 'map') {
-            loopResults.push(__lastBodyNode ? context[__lastBodyNode.id] : context[node.id]);
+          var bResult = await bHandler(bResolved, context);
+          if (bResult && (bResult.success === false || (typeof bResult.error === 'string' && bResult.error))) {
+            throw new Error(bResult.error || 'Loop body node execution failed');
           }
-        }
-
-        context.__loopScopeStack.pop();
-
-        context[node.id] = { completed: true, iterations: loopSteps.iterations(), results: loopResults };
-        // Store body node IDs so the outer loop can skip them
+          context[bNode.id] = bResult;
+        });
+        // The walk below must not run a body node again.
         if (!context.__loopBodyNodeIds) context.__loopBodyNodeIds = {};
         Object.assign(context.__loopBodyNodeIds, bodyNodeIds);
         continue;
       }
 
-      // Skip nodes that were part of a loop body (already executed inside the loop)
-      if (context.__loopBodyNodeIds && context.__loopBodyNodeIds[node.id]) continue;
 
       // Switch nodes evaluate a value, match a case, execute that branch, skip all others
       if (node.type === 'general-switch') {
@@ -719,6 +636,8 @@ module.exports = async function handler(req, res) {
     for (let i = 0; i < sortedNodes.length; i++) {
       const node = sortedNodes[i];
       if (executed[node.id]) continue;
+      // The branch an if-statement or a switch did not take never runs.
+      if (context.__skippedNodes && context.__skippedNodes[node.id]) continue;
       const resolved = resolveNodeConfig(node, context);
       // See the non-streaming segment above — without this the unresolved-token
       // guard never runs on the server, which is where every data node executes.
@@ -731,72 +650,27 @@ module.exports = async function handler(req, res) {
         const condResult = utils.evaluateCondition(resolved, context, node.config);
         context[node.id] = { result: condResult };
         executed[node.id] = true;
+        if (!context.__skippedNodes) context.__skippedNodes = {};
+        Object.assign(context.__skippedNodes, utils.nonTakenBranchNodeIds(SEGMENT_CONFIG.edges, node.id, condResult));
         if (streamStarted) {
           __streamNodeResult(res, node.id, context[node.id]);
         }
         continue;
       }
 
-      // Loop nodes in streaming segments
+      // Loop nodes in streaming segments: same runner as the regular-segment
+      // loop above, a loop inside the body included.
       if (node.type === 'general-loop') {
-        var ssLoopEdges = SEGMENT_CONFIG.edges.filter(function(e) { return e.source === node.id; });
-        var ssLoopBodyEdge = ssLoopEdges.find(function(e) { return e.sourceHandle === 'loop'; });
-        var ssBodyNodeIds = {};
-        if (ssLoopBodyEdge) {
-          var sslq = [ssLoopBodyEdge.target];
-          while (sslq.length > 0) {
-            var sslnid = sslq.shift();
-            if (ssBodyNodeIds[sslnid] || sslnid === node.id) continue;
-            ssBodyNodeIds[sslnid] = true;
-            SEGMENT_CONFIG.edges.forEach(function(e) {
-              if (e.source === sslnid && (e.sourceHandle === 'loop-body-out' || !e.sourceHandle)) {
-                if (e.target !== node.id) sslq.push(e.target);
-              }
-            });
-          }
-        }
-        var ssBodyNodes = sortedNodes.filter(function(n) { return ssBodyNodeIds[n.id]; });
-        // See the regular-segment loop above: loopType=map must publish the
-        // last body node output as results[i] so the schema contract holds.
-        var ssLoopType = resolved.loopType || 'forEach';
-        var ssLastBodyNode = ssBodyNodes[ssBodyNodes.length - 1];
-        // Same envelope unwrap as the regular-segment loop above.
-        var ssLoopCollection = utils.unwrapWorkflowCollection(resolved.collection);
-        var ssLoopResults = [];
-        // Same loop-scope tracking as the regular-segment loop above. Custom-js
-        // bodies can read context.__loopScopeStack to recover the params /
-        // innerParams contract documented in workflow-utils.ts.
-        if (!context.__loopScopeStack) context.__loopScopeStack = [];
-        context.__loopScopeStack.push({ loopNodeId: node.id, bodyNodeIds: ssBodyNodeIds });
-        if (!context.__loopNodeIds) context.__loopNodeIds = {};
-        context.__loopNodeIds[node.id] = true;
-        var ssLoopSteps = utils.createLoopSteps(node, resolved, context, ssLoopCollection);
-        for (var ssLoopPass = ssLoopSteps.next(context); ssLoopPass; ssLoopPass = ssLoopSteps.next(context)) {
-          context[ssLoopPass.key] = ssLoopPass.value;
-          for (var ssbi = 0; ssbi < ssBodyNodes.length; ssbi++) {
-            var ssbNode = ssBodyNodes[ssbi];
-            var ssbRes = resolveNodeConfig(ssbNode, context);
-            ssbRes.__nodeId = ssbNode.id;
-            if (ssbNode.type === 'general-if-statement') {
-              context[ssbNode.id] = { result: utils.evaluateCondition(ssbRes, context, ssbNode.config) };
-              continue;
-            }
-            var ssbHandler = nodeHandlers[ssbNode.type];
-            if (!ssbHandler) continue;
-            if (utils.isFireAndForgetNode(ssbNode)) {
-              utils.registerPendingNodePromise(context, utils.startFireAndForgetNode(ssbNode, ssbHandler, ssbRes, context));
-              context[ssbNode.id] = null;
-              continue;
-            }
-            var ssbResult = await ssbHandler(ssbRes, context);
-            context[ssbNode.id] = ssbResult;
-          }
-          if (ssLoopType === 'map') {
-            ssLoopResults.push(ssLastBodyNode ? context[ssLastBodyNode.id] : context[node.id]);
+        var ssBodyNodeIds = await utils.runServerLoop(node, resolved, sortedNodes, SEGMENT_CONFIG.edges, context, async function(ssbNode, ssbRes) {
+          var ssbHandler = nodeHandlers[ssbNode.type];
+          if (!ssbHandler) return;
+          if (utils.isFireAndForgetNode(ssbNode)) {
+            utils.registerPendingNodePromise(context, utils.startFireAndForgetNode(ssbNode, ssbHandler, ssbRes, context));
+            context[ssbNode.id] = null;
+            return;
           }
-        }
-        context.__loopScopeStack.pop();
-        context[node.id] = { completed: true, iterations: ssLoopSteps.iterations(), results: ssLoopResults };
+          context[ssbNode.id] = await ssbHandler(ssbRes, context);
+        });
         Object.keys(ssBodyNodeIds).forEach(function(k) { executed[k] = true; });
         executed[node.id] = true;
         if (streamStarted) {
@@ -1459,11 +1333,11 @@ const generateNodeExecutionLoop = (configVar, options) => {
     // top-level one does: its handler only hands back the marker.
     const loopBodyCustomNodeBlock = (options === null || options === void 0 ? void 0 : options.hasCustomNodes)
         ? `
-            if (bResult && bResult.__customNode) {
-              var bcnFn = typeof __customNodes !== 'undefined' ? __customNodes[bResult.customNodeId] : null;
-              context[bNode.id] = bcnFn ? await bcnFn(context, bResult.parameters, nodeHandlers) : null;
-              continue;
-            }`
+          if (bResult && bResult.__customNode) {
+            var bcnFn = typeof __customNodes !== 'undefined' ? __customNodes[bResult.customNodeId] : null;
+            context[bNode.id] = bcnFn ? await bcnFn(context, bResult.parameters, nodeHandlers) : null;
+            return;
+          }`
         : '';
     return `    var sortedNodes = ${configVar}.nodes.slice().sort(function(a, b) { return a.stepNumber - b.stepNumber; });
 ${resumeBlock}
@@ -1472,6 +1346,8 @@ ${resumeBlock}
       // Never resolved nor run on a non-taken branch, an if-statement included
       // (see the segment executor above).
       if (context.__skippedNodes && context.__skippedNodes[node.id]) continue;
+      // A node of a loop body ran inside its loop, an if-statement included.
+      if (context.__loopBodyNodeIds && context.__loopBodyNodeIds[node.id]) continue;
       var resolved = resolveNodeConfig(node, context);
       // See the other segment executors — the unresolved-token guard must run
       // wherever data nodes execute, and they all execute on the server.
@@ -1482,103 +1358,33 @@ ${resumeBlock}
       if (node.type === 'general-if-statement') {
         var condResult = utils.evaluateCondition(resolved, context, node.config);
         context[node.id] = { result: condResult };
-        var skipHandle = condResult ? 'false' : 'true';
-        var cfgEdges = ${configVar}.edges || [];
-        var skipEdge = cfgEdges.find(function(e) { return e.source === node.id && e.sourceHandle === skipHandle; });
-        if (skipEdge) {
-          var skipIds = {};
-          var skipQueue = [skipEdge.target];
-          while (skipQueue.length > 0) {
-            var sid = skipQueue.shift();
-            if (skipIds[sid] || sid === node.id) continue;
-            skipIds[sid] = true;
-            cfgEdges.forEach(function(e) {
-              if (e.source === sid && !skipIds[e.target] && e.target !== node.id) skipQueue.push(e.target);
-            });
-          }
-          if (!context.__skippedNodes) context.__skippedNodes = {};
-          Object.assign(context.__skippedNodes, skipIds);
-        }
+        if (!context.__skippedNodes) context.__skippedNodes = {};
+        Object.assign(context.__skippedNodes, utils.nonTakenBranchNodeIds(${configVar}.edges, node.id, condResult));
         continue;
       }
 
+      // Same runner as the segment routes, a loop inside the body included
+      // (see runServerLoop in the server runtime).
       if (node.type === 'general-loop') {
-        var loopEdges = ${configVar}.edges.filter(function(e) { return e.source === node.id; });
-        var loopBodyEdge = loopEdges.find(function(e) { return e.sourceHandle === 'loop'; });
-
-        var bodyNodeIds = {};
-        if (loopBodyEdge) {
-          var lQueue = [loopBodyEdge.target];
-          while (lQueue.length > 0) {
-            var nid = lQueue.shift();
-            if (bodyNodeIds[nid] || nid === node.id) continue;
-            bodyNodeIds[nid] = true;
-            ${configVar}.edges.forEach(function(e) {
-              if (e.source === nid && (e.sourceHandle === 'loop-body-out' || !e.sourceHandle)) {
-                if (e.target !== node.id) lQueue.push(e.target);
-              }
-            });
-          }
-        }
-        var bodyNodes = sortedNodes.filter(function(n) { return bodyNodeIds[n.id]; });
-        // For loopType=map, the schema (general-loop in node-context-schemas.json)
-        // defines results as the array of last body node outputs (same as
-        // Array.prototype.map). Pick the last body node so downstream nodes
-        // (e.g. state-update-global-state) consume the transformed value.
-        var __wfLoopType = resolved.loopType || 'forEach';
-        var __wfLastBodyNode = bodyNodes[bodyNodes.length - 1];
-
-        // Same envelope unwrap as the regular-segment loop above.
-        var collection = utils.unwrapWorkflowCollection(resolved.collection);
-        var loopResults = [];
-
-        // Same loop-scope tracking as the regular-segment loop above so
-        // general-custom-js inside the loop body sees the right params /
-        // innerParams. Required for webhook + cron routes.
-        if (!context.__loopScopeStack) context.__loopScopeStack = [];
-        context.__loopScopeStack.push({ loopNodeId: node.id, bodyNodeIds: bodyNodeIds });
-        if (!context.__loopNodeIds) context.__loopNodeIds = {};
-        context.__loopNodeIds[node.id] = true;
-
-        var loopSteps = utils.createLoopSteps(node, resolved, context, collection);
-        for (var loopPass = loopSteps.next(context); loopPass; loopPass = loopSteps.next(context)) {
-          context[loopPass.key] = loopPass.value;
-          for (var bi = 0; bi < bodyNodes.length; bi++) {
-            var bNode = bodyNodes[bi];
-            var bResolved = resolveNodeConfig(bNode, context);
-            bResolved.__nodeId = bNode.id;
-            if (bNode.type === 'general-if-statement') {
-              context[bNode.id] = { result: utils.evaluateCondition(bResolved, context, bNode.config) };
-              continue;
-            }
-            var bHandler = nodeHandlers[bNode.type];
-            if (!bHandler) continue;
-            if (utils.isFireAndForgetNode(bNode)) {
-              utils.registerPendingNodePromise(context, utils.startFireAndForgetNode(bNode, bHandler, bResolved, context));
-              context[bNode.id] = null;
-              continue;
-            }
-            var bResult = await bHandler(bResolved, context);${loopBodyCustomNodeBlock}
-            if (bResult && (bResult.success === false || (typeof bResult.error === 'string' && bResult.error))) {
-              throw new Error(bResult.error || 'Loop body node execution failed');
-            }
-            context[bNode.id] = bResult;
+        var bodyNodeIds = await utils.runServerLoop(node, resolved, sortedNodes, ${configVar}.edges, context, async function(bNode, bResolved) {
+          var bHandler = nodeHandlers[bNode.type];
+          if (!bHandler) return;
+          if (utils.isFireAndForgetNode(bNode)) {
+            utils.registerPendingNodePromise(context, utils.startFireAndForgetNode(bNode, bHandler, bResolved, context));
+            context[bNode.id] = null;
+            return;
           }
-          if (__wfLoopType === 'map') {
-            loopResults.push(__wfLastBodyNode ? context[__wfLastBodyNode.id] : context[node.id]);
+          var bResult = await bHandler(bResolved, context);${loopBodyCustomNodeBlock}
+          if (bResult && (bResult.success === false || (typeof bResult.error === 'string' && bResult.error))) {
+            throw new Error(bResult.error || 'Loop body node execution failed');
           }
-        }
-
-        context.__loopScopeStack.pop();
-
-        context[node.id] = { completed: true, iterations: loopSteps.iterations(), results: loopResults };
+          context[bNode.id] = bResult;
+        });
         if (!context.__loopBodyNodeIds) context.__loopBodyNodeIds = {};
         Object.assign(context.__loopBodyNodeIds, bodyNodeIds);
         continue;
       }
 
-      if (context.__loopBodyNodeIds && context.__loopBodyNodeIds[node.id]) continue;
-
       if (node.type === 'general-switch') {
         // Only an authored case expression is compiled (see matchSwitchCase).
         var swMatchedCase = utils.matchSwitchCase(node.config, resolved, context);