@pogodisco/zephyr 1.3.18 → 1.3.19

package/dist/workflow-composer.d.ts

@@ -73,12 +73,11 @@ type StepOptions<Input, Results, Context> = {
     label?: string;
     meta?: Record<string, any>;
 };
+type MergeBranchResults<Branches extends readonly any[], Acc> = Branches extends readonly [infer Head, ...infer Tail] ? MergeBranchResults<Tail, Acc & (Head extends WorkflowBuilder<any, any, any, any, infer R> ? R : {})> : Acc;
 type MergeBranchSteps<Branches extends readonly any[], Acc extends any[]> = Branches extends readonly [infer Head, ...infer Tail] ? MergeBranchSteps<Tail, [
     ...Acc,
     ...(Head extends WorkflowBuilder<any, any, any, infer S, any> ? S : [])
 ]> : Acc;
-type MergeBranchResults<Branches extends readonly WorkflowBuilder<any, any, any, any, any>[]> = Simplify<Branches extends readonly [infer Head, ...infer Tail] ? Head extends WorkflowBuilder<any, any, any, any, infer R> ? Tail extends readonly WorkflowBuilder<any, any, any, any, any>[] ? R & MergeBranchResults<Tail> : R : MergeBranchResults<Tail & WorkflowBuilder<any, any, any, any, any>[]> : {}>;
-type WorkflowBuilderStatic<Reg extends ActionRegistry, Input, Context, Steps extends StepDef<Reg, any, any>[] = [], Results = {}, Output = undefined> = WorkflowBuilder<Reg, Input, Context, Steps, Results, Output>;
 export declare class WorkflowBuilder<Reg extends ActionRegistry, Input = unknown, Context = unknown, Steps extends StepDef<Reg, any, any>[] = [], Results = {}, Output = undefined> {
     private name;
     private steps;
@@ -105,14 +104,14 @@ export declare class WorkflowBuilder<Reg extends ActionRegistry, Input = unknown
     as<NewType>(): WorkflowBuilder<Reg, Input, Context, Steps, Steps extends [...infer Rest, infer Last] ? Last extends StepDef<Reg, infer ID, any> ? Simplify<Omit<Results, ID> & {
         [K in ID]: NewType;
     }> : Results : Results, Output>;
-    parallel<Branches extends readonly WorkflowBuilderStatic<Reg, Input, Context, any, any>[]>(...branches: {
-        [K in keyof Branches]: (builder: WorkflowBuilderStatic<Reg, Input, Context, [], Results>) => Branches[K];
-    }): WorkflowBuilder<Reg, Input, Context, MergeBranchSteps<Branches, Steps>, Results & MergeBranchResults<Branches>>;
-    join<ID extends string = string, ActionName extends keyof Reg & string = any, ResolveOut extends ResolvedStepInput = ResolvedStepInput, BranchResults = {}>(id: ID, action: ActionName, resolve?: (ctx: {
+    parallel<Branches extends readonly WorkflowBuilder<Reg, Input, Context, any, any>[]>(...branches: {
+        [K in keyof Branches]: (builder: WorkflowBuilder<Reg, Input, Context, [], Results>) => Branches[K];
+    }): WorkflowBuilder<Reg, Input, Context, MergeBranchSteps<Branches, Steps>, Simplify<MergeBranchResults<Branches, Results>>>;
+    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 & BranchResults;
+        results: Results;
         context: Context;
-    } & CallHelpers<Reg, ActionName>) => ResolveOut, options?: StepOptions<Input, Results & BranchResults, Context>): WorkflowBuilder<Reg, Input, Context, [...Steps, StepDef<Reg, ID, ActionName>], Results & { [K_1 in ID]: StepResultFromResolve<Reg, ActionName, ResolveOut>; } extends infer T ? { [K in keyof T]: T[K]; } : never, undefined>;
+    } & CallHelpers<Reg, ActionName>) => ResolveOut, options?: StepOptions<Input, Results, Context>): WorkflowBuilder<Reg, Input, Context, [...Steps, StepDef<Reg, ID, ActionName>], Results & { [K_1 in ID]: StepResultFromResolve<Reg, ActionName, ResolveOut>; } extends infer T ? { [K in keyof T]: T[K]; } : never, 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;
@@ -121,10 +120,7 @@ export declare class WorkflowBuilder<Reg extends ActionRegistry, Input = unknown
         input: Input;
         results: Results;
         context: Context;
-    }) => WorkflowInput<WF>, options?: StepOptions<Input, Results, Context>): WorkflowBuilder<Reg, Input, Context, [
-        ...Steps,
-        ...WF["steps"]
-    ], Results & {
+    }) => WorkflowInput<WF>, options?: StepOptions<Input, Results, Context>): WorkflowBuilder<Reg, Input, Context, Steps, Results & {
         [K in Prefix]: SubflowResult<WorkflowResults<WF>, WorkflowOutput<WF>>;
     }>;
     when(predicate: (ctx: {

package/dist/workflow-composer.js

@@ -503,6 +503,9 @@
 //
 //
 //
+/* ------------------------------------------------ */
+/* FLUENT WORKFLOW BUILDER                          */
+/* ------------------------------------------------ */
 export class WorkflowBuilder {
     clearPendingWhen() {
         this.pendingWhen = undefined;
@@ -549,7 +552,6 @@ export class WorkflowBuilder {
         });
         this.frontier = branchEnds;
         this.clearPendingWhen();
-        // TypeScript now knows the returned WorkflowBuilder's Results = parent & branch results
         return this;
     }
     /* ------------------------------------------------ */
@@ -641,6 +643,14 @@ export class WorkflowBuilder {
 /* ------------------------------------------------ */
 /* WORKFLOW CREATOR                                 */
 /* ------------------------------------------------ */
+// export function createWorkflow<
+//   Reg extends ActionRegistry,
+//   Context extends Record<string, any> = {},
+// >(registry: Reg, context?: Context) {
+//   return function workflow<Input = unknown>(name: string) {
+//     return new WorkflowBuilder<Reg, Input, Context>(name);
+//   };
+// }
 export function createWorkflow() {
     return function workflow(name) {
         return new WorkflowBuilder(name);

package/package.json

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