@pogodisco/zephyr 1.5.3 → 1.5.4

package/dist/utils.js

@@ -1,5 +1,4 @@
 export function generateWorkflowId(name) {
-    // Short random + timestamp for practically unique ID
     const random = Math.random().toString(36).slice(2, 10);
     const time = Date.now().toString(36);
     return `${name}-${time}-${random}`;

package/dist/workflow-composer-pipe.d.ts

@@ -25,7 +25,7 @@ export declare class PipeBuilder<Current, Reg extends ActionRegistry, Services e
     action<A extends keyof Reg & string>(action: A, resolve: (ctx: {
         current: Current;
         results: Results;
-    } & CallHelpers<Reg, A>) => NormalizedCall): PipeBuilder<ActionReturn<Reg, A>, Reg, Services, Results, [
+    } & Results & CallHelpers<Reg, A>) => NormalizedCall): PipeBuilder<ActionReturn<Reg, A>, Reg, Services, Results, [
         ...Steps,
         {
             type: "action";
@@ -35,7 +35,7 @@ export declare class PipeBuilder<Current, Reg extends ActionRegistry, Services e
     service<SK extends keyof Services & string, MK extends keyof Services[SK] & string>(id: string, service: SK, method: MK, resolve: (ctx: {
         current: Current;
         results: Results;
-    } & {
+    } & Results & {
         args: (...args: ServiceParams<Services, SK, MK>) => {
             kind: "positional";
             args: ServiceParams<Services, SK, MK>;
@@ -47,16 +47,6 @@ export declare class PipeBuilder<Current, Reg extends ActionRegistry, Services e
         none: () => {
             kind: "none";
         };
-        loop: (items: {
-            kind: "positional";
-            args: ServiceParams<Services, SK, MK>;
-        }[] | {
-            kind: "object";
-            args: ServiceParams<Services, SK, MK>[0];
-        }[]) => {
-            kind: "loop";
-            items: typeof items;
-        };
     }) => NormalizedCall): PipeBuilder<ServiceReturn<Services, SK, MK>, Reg, Services, Results, [
         ...Steps,
         {

package/dist/workflow-composer.d.ts

@@ -57,7 +57,7 @@ Input = unknown, Steps extends StepDef<Reg, any, any>[] = [], Results = {}, Outp
     step<ID extends string, ActionName extends keyof Reg & string>(id: ID, action: ActionName, resolve?: (ctx: {
         input: Input;
         results: Results;
-    } & CallHelpers<Reg, ActionName>) => NormalizedCall, dependsOn?: string[], options?: StepOptions<Input, Results>): WorkflowBuilder<Reg, Services, WFReg, Input, [
+    } & Results & CallHelpers<Reg, ActionName>) => NormalizedCall, dependsOn?: string[], options?: StepOptions<Input, Results>): WorkflowBuilder<Reg, Services, WFReg, Input, [
         ...Steps,
         StepDef<Reg, ID, ActionName>
     ], Simplify<Results & {
@@ -66,11 +66,11 @@ Input = unknown, Steps extends StepDef<Reg, any, any>[] = [], Results = {}, Outp
     seq<ID extends string = string, ActionName extends keyof Reg & string = any>(id: ID, action: ActionName, resolve?: (ctx: {
         input: Input;
         results: Results;
-    } & CallHelpers<Reg, ActionName>) => NormalizedCall, options?: StepOptions<Input, Results>): WorkflowBuilder<Reg, Services, WFReg, Input, [...Steps, StepDef<Reg, ID, ActionName>], Results & { [K_1 in ID]: ActionReturn<Reg, ActionName>; } extends infer T ? { [K in keyof T]: T[K]; } : never, undefined>;
+    } & Results & CallHelpers<Reg, ActionName>) => NormalizedCall, options?: StepOptions<Input, Results>): WorkflowBuilder<Reg, Services, WFReg, Input, [...Steps, StepDef<Reg, ID, ActionName>], Results & { [K_1 in ID]: ActionReturn<Reg, ActionName>; } extends infer T ? { [K in keyof T]: T[K]; } : never, undefined>;
     service<ID extends string, SK extends keyof Services & string, MK extends keyof Services[SK] & string>(id: ID, service: SK, method: MK, resolve?: (ctx: {
         input: Input;
         results: Results;
-    } & {
+    } & Results & {
         args: (...args: ServiceParams<Services, SK, MK>) => {
             kind: "positional";
             args: ServiceParams<Services, SK, MK>;
@@ -106,22 +106,24 @@ Input = unknown, Steps extends StepDef<Reg, any, any>[] = [], Results = {}, Outp
     join<ID extends string = string, ActionName extends keyof Reg & string = any>(id: ID, action: ActionName, resolve?: (ctx: {
         input: Input;
         results: Results;
-    } & CallHelpers<Reg, ActionName>) => NormalizedCall, options?: StepOptions<Input, Results>): WorkflowBuilder<Reg, Services, WFReg, Input, [...Steps, StepDef<Reg, ID, ActionName>], Results & { [K_1 in ID]: ActionReturn<Reg, ActionName>; } extends infer T ? { [K in keyof T]: T[K]; } : never, undefined>;
+    } & Results & CallHelpers<Reg, ActionName>) => NormalizedCall, options?: StepOptions<Input, Results>): WorkflowBuilder<Reg, Services, WFReg, Input, [...Steps, StepDef<Reg, ID, ActionName>], Results & { [K_1 in ID]: ActionReturn<Reg, ActionName>; } extends infer T ? { [K in keyof T]: T[K]; } : never, undefined>;
     subflow<Prefix extends string, K extends keyof WFReg & string>(prefix: Prefix, workflowKey: K, resolveInput: (ctx: {
         input: Input;
         results: Results;
     }) => WorkflowInput<WFReg[K]>, options?: StepOptions<Input, Results>): WorkflowBuilder<Reg, Services, WFReg, Input, Steps, Results & {
         [P in Prefix]: WorkflowOutput<WFReg[K]>;
     }>;
+    private _subflow;
+    sub: this["subflow"];
     when(predicate: (ctx: {
         input: Input;
         results: Results;
-    }) => boolean): WorkflowBuilder<Reg, Services, WFReg, Input, Steps, Results, Output>;
+    } & Results) => boolean): WorkflowBuilder<Reg, Services, WFReg, Input, Steps, Results, Output>;
     endWhen(): this;
     output<Output>(fn: (ctx: {
         input: Input;
         results: Results;
-    }) => Output): WorkflowDef<Reg, Input, Results, Steps, Output>;
+    } & Results) => Output): WorkflowDef<Reg, Input, Results, Steps, Output>;
     build(): WorkflowDef<Reg, Input, Results, Steps>;
     private validateDependencies;
     private getEndSteps;

package/dist/workflow-composer.js

@@ -11,6 +11,8 @@ export class WorkflowBuilder {
         this.name = name;
         this.steps = [];
         this.frontier = [];
+        this._subflow = this.subflow.bind(this);
+        this.sub = ((...args) => this._subflow(...args));
     }
     step(id, action, resolve, dependsOn, options) {
         const deps = dependsOn ?? [...this.frontier];

package/dist/workflow-executor.js

@@ -14,6 +14,24 @@ async function withTimeout(promise, ms) {
         new Promise((_, reject) => setTimeout(() => reject(new Error("Timeout")), ms)),
     ]);
 }
+function createStepCtx(input, results) {
+    const helpers = createCallHelpers();
+    return new Proxy({
+        input,
+        results,
+        ...helpers,
+    }, {
+        get(target, prop) {
+            // 1. explicit keys first
+            if (prop in target)
+                return target[prop];
+            // 2. fallback to results
+            if (prop in results)
+                return results[prop];
+            return undefined;
+        },
+    });
+}
 // Helper to run action with retry support
 async function runWithRetry(actionFn, stepOptions) {
     const maxRetries = stepOptions?.retry ?? 0;
@@ -100,11 +118,13 @@ export async function executeWorkflow({ workflow, actionRegistry, services, inpu
                 extras,
                 frame,
             };
-            const stepCtx = {
-                input,
-                results,
-                ...createCallHelpers(),
-            };
+            const stepCtx = createStepCtx(input, results);
+            // const stepCtx = {
+            //   input,
+            //   results,
+            //
+            //   ...createCallHelpers(),
+            // };
             const resolvedArgs = step.resolve?.(stepCtx);
             frame.input = resolvedArgs;
             const core = async () => {
@@ -219,11 +239,9 @@ export async function executeWorkflow({ workflow, actionRegistry, services, inpu
     if (completed !== workflow.steps.length) {
         throw new Error("Workflow execution failed (cycle or missing dependency)");
     }
+    const outputCtx = createStepCtx(input, results);
     const output = workflow.outputResolver
-        ? workflow.outputResolver({
-            input,
-            results,
-        })
+        ? workflow.outputResolver(outputCtx)
         : results;
     return {
         // results: results as WorkflowResults<WR[K]>,

package/package.json

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