@pogodisco/zephyr 1.3.7 → 1.3.8

package/dist/workflow-composer.d.ts

@@ -1,10 +1,4 @@
 import { ActionParams, ActionRegistry, ActionReturn } from "./types.js";
-type StepBuilderResult<WB, ID extends string, Default> = WB & {
-    as<Override>(): OverrideStepResult<WB, ID, Override>;
-};
-type OverrideStepResult<WB, ID extends string, Override> = WB extends WorkflowBuilder<infer Reg, infer Input, infer Context, infer Steps, infer Results, infer Output> ? WorkflowBuilder<Reg, Input, Context, Steps, Omit<Results, ID> & {
-    [K in ID]: Override;
-}, Output> : never;
 type NormalizedCall = {
     kind: "none";
 } | {
@@ -78,28 +72,31 @@ export declare class WorkflowBuilder<Reg extends ActionRegistry, Input = unknown
         input: Input;
         results: Results;
         context: Context;
-    } & CallHelpers<Reg, ActionName>) => ResolveOut, dependsOn?: string[], options?: {}): StepBuilderResult<WorkflowBuilder<Reg, Input, Context, [
+    } & CallHelpers<Reg, ActionName>) => ResolveOut, dependsOn?: string[], options?: {}): WorkflowBuilder<Reg, Input, Context, [
         ...Steps,
         StepDef<Reg, ID, ActionName>
     ], Results & {
         [K in ID]: StepResultFromResolve<Reg, ActionName, ResolveOut>;
-    }, Output>, ID, StepResultFromResolve<Reg, ActionName, ResolveOut>>;
-    seq<ID extends string, ActionName extends keyof Reg & string, ResolveOut extends ResolvedStepInput = ResolvedStepInput>(id: ID, action: ActionName, resolve?: (ctx: {
+    }>;
+    seq<ID extends string = string, ActionName extends keyof Reg & string = any, ResolveOut extends ResolvedStepInput = ResolvedStepInput>(id: ID, action: ActionName, resolve?: (ctx: {
         input: Input;
         results: Results;
         context: Context;
-    } & CallHelpers<Reg, ActionName>) => ResolveOut, options?: {}): StepBuilderResult<WorkflowBuilder<Reg, Input, Context, [...Steps, StepDef<Reg, ID, ActionName>], Results & { [K in ID]: StepResultFromResolve<Reg, ActionName, ResolveOut>; }, Output>, ID, StepResultFromResolve<Reg, ActionName, ResolveOut>>;
+    } & CallHelpers<Reg, ActionName>) => ResolveOut, options?: {}): WorkflowBuilder<Reg, Input, Context, [...Steps, StepDef<Reg, ID, ActionName>], Results & { [K in ID]: StepResultFromResolve<Reg, ActionName, ResolveOut>; }, undefined>;
+    as<NewType>(): WorkflowBuilder<Reg, Input, Context, Steps, Steps extends [...infer Rest, infer Last] ? Last extends StepDef<Reg, infer ID, any> ? Omit<Results, ID> & {
+        [K in ID]: NewType;
+    } : Results : Results, Output>;
     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, [
         ...Steps,
         ...(Branches[number] extends WorkflowBuilder<Reg, any, any, infer S, any> ? S : never)
     ], Results & (Branches[number] extends WorkflowBuilder<Reg, any, any, any, infer R> ? UnionToIntersection<R> : {})>;
-    join<ID extends string, ActionName extends keyof Reg & string, ResolveOut extends ResolvedStepInput = ResolvedStepInput>(id: ID, action: ActionName, resolve?: (ctx: {
+    join<ID extends string = string, ActionName extends keyof Reg & string = any, ResolveOut extends ResolvedStepInput = ResolvedStepInput>(id: ID, action: ActionName, resolve?: (ctx: {
         input: Input;
         results: Results;
         context: Context;
-    } & CallHelpers<Reg, ActionName>) => ResolveOut, options?: {}): StepBuilderResult<WorkflowBuilder<Reg, Input, Context, [...Steps, StepDef<Reg, ID, ActionName>], Results & { [K in ID]: StepResultFromResolve<Reg, ActionName, ResolveOut>; }, Output>, ID, StepResultFromResolve<Reg, ActionName, ResolveOut>>;
+    } & CallHelpers<Reg, ActionName>) => ResolveOut, options?: {}): WorkflowBuilder<Reg, Input, Context, [...Steps, StepDef<Reg, ID, ActionName>], Results & { [K in ID]: StepResultFromResolve<Reg, ActionName, ResolveOut>; }, undefined>;
     subflow<Prefix extends string, SubSteps extends StepDef<Reg, any, any>[], WF extends WorkflowDef<Reg, any, any, SubSteps, any>>(prefix: Prefix, workflow: WF, resolveInput: WorkflowInput<WF> extends undefined ? ((ctx: {
         input: Input;
         results: Results;

package/dist/workflow-composer.js

@@ -397,7 +397,9 @@ export class WorkflowBuilder {
     //   Input,
     //   Context,
     //   [...Steps, StepDef<Reg, ID, ActionName>],
-    //   Results & { [K in ID]: StepResultFromResolve<Reg, ActionName, ResolveOut> }
+    //   Results & {
+    //     [K in ID]: StepResultFromResolve<Reg, ActionName, ResolveOut>;
+    //   }
     // > {
     //   const deps = dependsOn ?? [...this.frontier];
     //
@@ -410,13 +412,8 @@ export class WorkflowBuilder {
     //
     //   this.frontier = [id];
     //
-    //   // with Override
-    //
     //   return this as any;
     // }
-    /* ------------------------------------------------ */
-    /* Base Step                                       */
-    /* ------------------------------------------------ */
     step(id, action, resolve, dependsOn, options) {
         const deps = dependsOn ?? [...this.frontier];
         this.steps.push({
@@ -426,13 +423,7 @@ export class WorkflowBuilder {
             dependsOn: deps,
         });
         this.frontier = [id];
-        // with Override
-        const next = this;
-        next.as = () => {
-            return next;
-        };
-        return next;
-        // return this as any;
+        return this;
     }
     /* ------------------------------------------------ */
     /* Sequential shortcut                             */
@@ -441,6 +432,12 @@ export class WorkflowBuilder {
         return this.step(id, action, resolve, undefined, options);
     }
     /* ------------------------------------------------ */
+    /* Override the result of the last step            */
+    /* ------------------------------------------------ */
+    as() {
+        return this;
+    }
+    /* ------------------------------------------------ */
     /* Parallel branches                               */
     /* ------------------------------------------------ */
     parallel(...branches) {

package/package.json

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