@scenario-labs/sdk 2.0.0 → 2.1.0

package/src/lib/workflow_converter.ts

@@ -60,6 +60,7 @@ export type WorkflowEditorNode =
       type: 'ifElse';
       data: NodeCommonData & { conditionBlocks?: WorkflowEditorConditionBlock[] };
     }
+  | { id: string; type: 'approval'; data: NodeCommonData & { message?: string } }
   | { id: string; type: string; data: NodeCommonData };
 
 export type WorkflowEditorEdge = {
@@ -67,6 +68,7 @@ export type WorkflowEditorEdge = {
   target: string;
   sourceHandle?: string | null;
   targetHandle?: string | null;
+  data?: { isForEachEndEdge?: boolean } | undefined;
 };
 
 export type WorkflowEditorCondition = {
@@ -122,6 +124,8 @@ export type WorkflowEditorFlowItem = {
   logicType?: 'if-else' | undefined;
   loopBodyNodeIds?: string[] | undefined;
   includeOutputsInWorkflowJob?: true | undefined;
+  dependsOn?: string[] | undefined;
+  label?: string | undefined;
 };
 
 // ---- Internal types ----
@@ -582,6 +586,22 @@ function internalGetConnectedNodes(
   return nodes.filter((n) => idSet.has(n.id));
 }
 
+function resolveIfElseConditionField(
+  field: string,
+  candidateNodes: WorkflowEditorNode[],
+): { nodeId: string; targetHandleId?: string } | undefined {
+  const byExactId = candidateNodes.find((n) => n.id === field);
+  if (byExactId) return { nodeId: field };
+  for (const node of candidateNodes) {
+    for (const handle of node.data.outputHandles ?? []) {
+      if (`${node.id}_${handle.name}` === field) {
+        return { nodeId: node.id, targetHandleId: handle.id };
+      }
+    }
+  }
+  return undefined;
+}
+
 function normalizeNodes(nodes: WorkflowEditorNode[]): WorkflowEditorNode[] {
   return nodes.map((node) => {
     if (node.type !== 'model' && node.type !== 'llm') return node;
@@ -675,6 +695,12 @@ export function convertWorkflowEditorToFlow(params: {
       .map((n) => [n.id, nodeIdToFlowId(n.id)]),
   );
   const nodeIdToInputNameMap = new Map<string, string>(inputNodeIds.map((id) => [id, nodeIdToFlowId(id)]));
+  const approvalByApprovedNodeId = buildApprovalByApprovedNodeIdMap({
+    nodes,
+    edges,
+    nodesInSelectedBranches,
+    selectedOutputNodeIds,
+  });
   const nodeHandleTransformMap = new Map<string, string>();
 
   const ctx: SourceRefContext = {
@@ -1084,7 +1110,7 @@ export function convertWorkflowEditorToFlow(params: {
         if (!ref) continue;
         const outHandle = targetNode.data.outputHandles?.find((h) => h.id === edge.targetHandle);
         const outHandleName = outHandle?.name ?? 'output';
-        const varName = getOutputHandleVarName(targetNode.id, outHandleName);
+        const varName = `${targetNode.id}_${outHandleName}`;
         const isArr =
           (targetNode.type === 'asset' && !!(targetNode.data as { isMultiple?: boolean }).isMultiple) ||
           targetNode.type === 'groupItems' ||
@@ -1199,16 +1225,50 @@ export function convertWorkflowEditorToFlow(params: {
         }
       }
 
-      for (const fieldNodeId of fieldsUsed) {
+      const edgesIntoIfElse = edges.filter((e) => e.target === node.id);
+      for (const fieldKey of fieldsUsed) {
+        const resolved = resolveIfElseConditionField(fieldKey, nodes);
+        const fieldNodeId = resolved?.nodeId;
+        if (!fieldNodeId) continue;
+
+        const outputHandleName =
+          resolved?.targetHandleId !== undefined ?
+            nodes
+              .find((n) => n.id === fieldNodeId)
+              ?.data.outputHandles?.find((h) => h.id === resolved.targetHandleId)?.name ?? 'output'
+          : 'output';
+
+        const celVarName = getOutputHandleVarName(fieldNodeId, outputHandleName);
+        nodeIdToInputNameMap.set(fieldKey, celVarName);
+
+        const edgeToIfElse =
+          edgesIntoIfElse
+            .filter((e) => e.source === fieldNodeId)
+            .find((e) => {
+              if (resolved.targetHandleId === undefined) return true;
+              return e.sourceHandle === resolved.targetHandleId;
+            }) ?? edgesIntoIfElse.find((e) => e.source === fieldNodeId);
+
         if (inputNodeIds.includes(fieldNodeId)) {
-          const inputName = nodeIdToInputNameMap.get(fieldNodeId);
-          if (inputName)
-            flowInputs.push({ name: inputName, type: 'string', ref: { node: 'workflow', name: inputName } });
+          const workflowInputName = nodeIdToInputNameMap.get(fieldNodeId);
+          if (workflowInputName) {
+            const ref =
+              edgeToIfElse ?
+                getSourceRef(edgeToIfElse, ctx)
+              : { node: 'workflow' as const, name: workflowInputName };
+            flowInputs.push({
+              name: celVarName,
+              type: 'string',
+              ref: ref ?? { node: 'workflow', name: workflowInputName },
+            });
+          }
         } else {
+          const refFromEdge = edgeToIfElse ? getSourceRef(edgeToIfElse, ctx) : undefined;
           const targetFlowId = nodeIdToFlowIdMap.get(fieldNodeId);
-          if (targetFlowId) {
-            flowInputs.push({ name: targetFlowId, type: 'string', ref: { node: targetFlowId, name: 'all' } });
-            nodeIdToInputNameMap.set(fieldNodeId, targetFlowId);
+          if (refFromEdge) {
+            flowInputs.push({ name: celVarName, type: 'string', ref: refFromEdge });
+          } else if (targetFlowId) {
+            flowInputs.push({ name: celVarName, type: 'string', ref: { node: targetFlowId, name: 'all' } });
           }
         }
       }
@@ -1246,5 +1306,97 @@ export function convertWorkflowEditorToFlow(params: {
     forEachFlowItem.loopBodyNodeIds = forEachLoopFlowIds.get(forEachId) ?? [];
   }
 
+  applyApprovalsToFlow({ flow, edges, approvalByApprovedNodeId, nodeIdToFlowIdMap });
+
   return flow;
 }
+
+// ---- Approval helpers ----
+
+interface ApprovalInfo {
+  approvalFlowId: string;
+  approvedFlowId: string;
+  message: string;
+}
+
+function buildApprovalByApprovedNodeIdMap({
+  nodes,
+  edges,
+  nodesInSelectedBranches,
+  selectedOutputNodeIds,
+}: {
+  nodes: WorkflowEditorNode[];
+  edges: WorkflowEditorEdge[];
+  nodesInSelectedBranches: Set<string>;
+  selectedOutputNodeIds: string[];
+}): Map<string, ApprovalInfo> {
+  const result = new Map<string, ApprovalInfo>();
+  for (const approvalNode of nodes) {
+    if (approvalNode.type !== 'approval') continue;
+    const approvalEdge = edges.find(
+      (e) => e.source === approvalNode.id && e.sourceHandle === `${approvalNode.id}-source-approval`,
+    );
+    if (!approvalEdge) continue;
+    const approvedNodeId = approvalEdge.target;
+    if (!nodesInSelectedBranches.has(approvedNodeId) && !selectedOutputNodeIds.includes(approvedNodeId))
+      continue;
+    const approvedNode = nodes.find((n) => n.id === approvedNodeId);
+    if (!approvedNode) continue;
+    const approvedFlowId =
+      approvedNode.type === 'forEachEnd' ?
+        (approvedNode.data as { parentNodeId?: string }).parentNodeId ?
+          nodeIdToFlowId((approvedNode.data as { parentNodeId?: string }).parentNodeId!)
+        : undefined
+      : nodeIdToFlowId(approvedNodeId);
+    if (!approvedFlowId) continue;
+    result.set(approvedNodeId, {
+      approvalFlowId: nodeIdToFlowId(approvalNode.id),
+      approvedFlowId,
+      message: (approvalNode.data as { message?: string }).message ?? '',
+    });
+  }
+  return result;
+}
+
+function applyApprovalsToFlow({
+  flow,
+  edges,
+  approvalByApprovedNodeId,
+  nodeIdToFlowIdMap,
+}: {
+  flow: WorkflowEditorFlowItem[];
+  edges: WorkflowEditorEdge[];
+  approvalByApprovedNodeId: Map<string, ApprovalInfo>;
+  nodeIdToFlowIdMap: Map<string, string>;
+}): void {
+  if (approvalByApprovedNodeId.size === 0) return;
+
+  const flowIdToWorkflowNodeId = new Map<string, string>(
+    [...nodeIdToFlowIdMap.entries()].map(([nodeId, flowId]) => [flowId, nodeId]),
+  );
+
+  for (const flowItem of flow) {
+    const workflowNodeId = flowIdToWorkflowNodeId.get(flowItem.id);
+    if (!workflowNodeId) continue;
+    const dependsOn = new Set(flowItem.dependsOn ?? []);
+    const incomingEdges = edges.filter(
+      (e) =>
+        e.source === workflowNodeId &&
+        !(e.data as { isForEachEndEdge?: boolean } | undefined)?.isForEachEndEdge,
+    );
+    for (const edge of incomingEdges) {
+      const approval = approvalByApprovedNodeId.get(edge.target);
+      if (approval) dependsOn.add(approval.approvalFlowId);
+    }
+    if (dependsOn.size > 0) flowItem.dependsOn = [...dependsOn].sort();
+  }
+
+  for (const approvalInfo of approvalByApprovedNodeId.values()) {
+    flow.push({
+      id: approvalInfo.approvalFlowId,
+      type: 'user-approval',
+      dependsOn: [approvalInfo.approvedFlowId],
+      label: approvalInfo.message,
+    });
+  }
+}

package/src/version.ts

@@ -1 +1 @@
-export const VERSION = '2.0.0'; // x-release-please-version
+export const VERSION = '2.1.0'; // x-release-please-version

package/uploads.d.mts

@@ -1,2 +1,3 @@
+/** @deprecated Import from ./core/uploads instead */
 export * from "./core/uploads.mjs";
 //# sourceMappingURL=uploads.d.mts.map

package/uploads.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"uploads.d.mts","sourceRoot":"","sources":["src/uploads.ts"],"names":[],"mappings":""}
+{"version":3,"file":"uploads.d.mts","sourceRoot":"","sources":["src/uploads.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,mCAA+B"}

package/uploads.d.ts

@@ -1,2 +1,3 @@
+/** @deprecated Import from ./core/uploads instead */
 export * from "./core/uploads.js";
 //# sourceMappingURL=uploads.d.ts.map

package/uploads.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploads.d.ts","sourceRoot":"","sources":["src/uploads.ts"],"names":[],"mappings":""}
+{"version":3,"file":"uploads.d.ts","sourceRoot":"","sources":["src/uploads.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,kCAA+B"}

package/uploads.mjs

@@ -1,2 +1,3 @@
+/** @deprecated Import from ./core/uploads instead */
 export * from "./core/uploads.mjs";
 //# sourceMappingURL=uploads.mjs.map

package/uploads.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"uploads.mjs","sourceRoot":"","sources":["src/uploads.ts"],"names":[],"mappings":""}
+{"version":3,"file":"uploads.mjs","sourceRoot":"","sources":["src/uploads.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,mCAA+B"}

package/version.d.mts

@@ -1,2 +1,2 @@
-export declare const VERSION = "2.0.0";
+export declare const VERSION = "2.1.0";
 //# sourceMappingURL=version.d.mts.map

package/version.d.ts

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

package/version.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
-exports.VERSION = '2.0.0'; // x-release-please-version
+exports.VERSION = '2.1.0'; // x-release-please-version
 //# sourceMappingURL=version.js.map

package/version.mjs

@@ -1,2 +1,2 @@
-export const VERSION = '2.0.0'; // x-release-please-version
+export const VERSION = '2.1.0'; // x-release-please-version
 //# sourceMappingURL=version.mjs.map