@pogodisco/zephyr 1.3.2 → 1.3.4

package/dist/types.d.ts

@@ -1,8 +1,6 @@
 import { createWorkflow } from "./workflow-composer.js";
 export type Action<F extends (...args: any[]) => any = (...args: any[]) => any> = F;
-export interface ActionRegistry {
-    [key: string]: Action;
-}
+export type ActionRegistry = Record<string, (...args: any[]) => any>;
 export type MergeActionRegistries<A extends ActionRegistry, B extends ActionRegistry> = Omit<A, keyof B> & B;
 export type ExecutionFrame = {
     stepId: string;
@@ -12,9 +10,10 @@ export type ExecutionFrame = {
     input?: any;
     output?: any;
     error?: any;
+    skipped?: boolean;
 };
-export type ActionParams<Reg extends ActionRegistry, K extends keyof Reg> = Parameters<Reg[K]>;
-export type ActionReturn<Reg extends ActionRegistry, K extends keyof Reg> = Awaited<ReturnType<Reg[K]>>;
+export type ActionParams<Reg, K extends keyof Reg> = Reg[K] extends (...args: infer P) => any ? P : never;
+export type ActionReturn<Reg, K extends keyof Reg> = Reg[K] extends (...args: any[]) => infer R ? Awaited<R> : never;
 export type WorkflowMiddleware<Reg extends ActionRegistry = any> = {
     (ctx: {
         stepId: string;

package/dist/workflow-composer.d.ts

@@ -49,7 +49,7 @@ export declare class WorkflowBuilder<Reg extends ActionRegistry, Input = unknown
         input: Input;
         results: Results;
         context: Context;
-    }) => ActionParams<Reg, ActionName>): WorkflowBuilder<Reg, Input, Context, [...Steps, StepDef<Reg, ID, ActionName>], Results & { [K in ID]: Awaited<ReturnType<Reg[ActionName]>>; }, undefined>;
+    }) => ActionParams<Reg, ActionName>): WorkflowBuilder<Reg, Input, Context, [...Steps, StepDef<Reg, ID, ActionName>], Results & { [K in ID]: ActionReturn<Reg, ActionName>; }, undefined>;
     parallel<Branches extends WorkflowBuilder<Reg, Input, Context, any, any>[]>(...branches: {
         [K in keyof Branches]: (builder: WorkflowBuilder<Reg, Input, Context, [], Results>) => Branches[K];
     }): WorkflowBuilder<Reg, Input, Context, [
@@ -59,10 +59,12 @@ export declare class WorkflowBuilder<Reg extends ActionRegistry, Input = unknown
     join<ID extends string, ActionName extends keyof Reg & string>(id: ID, action: ActionName, resolve?: ActionParams<Reg, ActionName> extends [] ? (ctx?: {
         input: Input;
         results: Results;
+        context: Context;
     }) => undefined : (ctx: {
         input: Input;
         results: Results;
-    }) => ActionParams<Reg, ActionName>): WorkflowBuilder<Reg, Input, Context, [...Steps, StepDef<Reg, ID, ActionName>], Results & { [K in ID]: Awaited<ReturnType<Reg[ActionName]>>; }, undefined>;
+        context: Context;
+    }) => ActionParams<Reg, ActionName>): WorkflowBuilder<Reg, Input, Context, [...Steps, StepDef<Reg, ID, ActionName>], Results & { [K in ID]: ActionReturn<Reg, ActionName>; }, undefined>;
     subflow<Prefix extends string, SubInput, SubResults, SubSteps extends StepDef<Reg, any, any>[], SubOutput>(prefix: Prefix, workflow: WorkflowDef<Reg, SubInput, SubResults, SubSteps, SubOutput>, resolveInput?: (ctx: {
         input: Input;
         results: Results;
@@ -73,6 +75,11 @@ export declare class WorkflowBuilder<Reg extends ActionRegistry, Input = unknown
     ], Results & {
         [K in Prefix]: SubflowResult<SubResults, SubOutput>;
     }>;
+    when(predicate: (ctx: {
+        input: Input;
+        results: Results;
+        context: Context;
+    }) => boolean): this;
     output<Output>(fn: (ctx: {
         input: Input;
         results: Results;

package/dist/workflow-composer.js

@@ -625,6 +625,14 @@ export class WorkflowBuilder {
         this.frontier = workflow.endSteps.map((e) => idMap.get(e.id));
         return this;
     }
+    when(predicate) {
+        const lastStep = this.steps[this.steps.length - 1];
+        if (!lastStep) {
+            throw new Error("when() must follow a step");
+        }
+        lastStep.when = predicate;
+        return this;
+    }
     output(fn) {
         this.outputResolver = fn;
         return this.build();

package/dist/workflow-executor.js

@@ -243,8 +243,17 @@ export async function executeWorkflow(workflow, registry, input, middleware = []
             };
             const core = async () => {
                 frame.attempts++;
+                const stepCtx = { input, results, context };
+                if (step.when && !step.when(stepCtx)) {
+                    frame.output = undefined;
+                    frame.end = Date.now();
+                    frame.skipped = true;
+                    results[step.id] = undefined;
+                    return undefined;
+                }
                 // 👇 Get the resolved arguments (should be a tuple or undefined)
-                const resolvedArgs = step.resolve?.({ input, results, context });
+                // const resolvedArgs = step.resolve?.({ input, results, context });
+                const resolvedArgs = step.resolve?.(stepCtx);
                 frame.input = resolvedArgs;
                 try {
                     const action = registry[step.action];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pogodisco/zephyr",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "publishConfig": {
     "access": "public"
   },