@pogodisco/zephyr 1.3.10 → 1.3.12

package/dist/types.d.ts

@@ -1,7 +1,7 @@
 import { createWorkflow } from "./workflow-composer.js";
 export type Action<F extends (...args: any[]) => any = (...args: any[]) => any> = F;
 export type ActionRegistry = Record<string, (...args: any[]) => any>;
-export type MergeActionRegistries<A extends ActionRegistry, B extends ActionRegistry> = Omit<A, keyof B> & B;
+export type MergeActionRegistries<A extends ActionRegistry, B extends ActionRegistry> = Simplify<Omit<A, keyof B> & B>;
 export type ExecutionFrame = {
     stepId: string;
     attempts: number;
@@ -12,6 +12,9 @@ export type ExecutionFrame = {
     error?: any;
     skipped?: boolean;
 };
+export type Simplify<T> = {
+    [K in keyof T]: T[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 WorkflowObserver<Reg extends ActionRegistry = any> = {

package/dist/workflow-composer.d.ts

@@ -1,4 +1,4 @@
-import { ActionParams, ActionRegistry, ActionReturn } from "./types.js";
+import { ActionParams, ActionRegistry, ActionReturn, Simplify } from "./types.js";
 type NormalizedCall = {
     kind: "none";
 } | {
@@ -74,7 +74,11 @@ type StepOptions<Input, Results, Context> = {
     label?: string;
     meta?: Record<string, any>;
 };
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
+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;
 export declare class WorkflowBuilder<Reg extends ActionRegistry, Input = unknown, Context extends Record<string, any> = {}, Steps extends StepDef<Reg, any, any>[] = [], Results = {}, Output = undefined> {
     private name;
     private registry;
@@ -92,30 +96,25 @@ export declare class WorkflowBuilder<Reg extends ActionRegistry, Input = unknown
     } & CallHelpers<Reg, ActionName>) => ResolveOut, dependsOn?: string[], options?: StepOptions<Input, Results, Context>): WorkflowBuilder<Reg, Input, Context, [
         ...Steps,
         StepDef<Reg, ID, ActionName>
-    ], Results & {
+    ], Simplify<Results & {
         [K in ID]: StepResultFromResolve<Reg, ActionName, ResolveOut>;
-    }>;
+    }>>;
     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?: StepOptions<Input, Results, Context>): 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> & {
+    } & 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>;
+    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 WorkflowBuilder<Reg, Input, Context, any, any>[]>(...branches: {
+    }> : Results : Results, Output>;
+    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, [
-        ...Steps,
-        ...(Branches[number] extends WorkflowBuilder<Reg, any, any, infer S, any> ? S : never)
-    ], Results & UnionToIntersection<{
-        [K in keyof Branches]: Branches[K] extends WorkflowBuilder<Reg, any, any, any, infer R> ? R : never;
-    }[number]>>;
+    }): 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;
         context: Context;
-    } & CallHelpers<Reg, ActionName>) => ResolveOut, options?: StepOptions<Input, Results, Context>): WorkflowBuilder<Reg, Input, Context, [...Steps, StepDef<Reg, ID, ActionName>], Results & { [K in ID]: StepResultFromResolve<Reg, ActionName, ResolveOut>; }, 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;

package/dist/workflow-composer.js

@@ -37,9 +37,6 @@ export class WorkflowBuilder {
     as() {
         return this;
     }
-    /* ------------------------------------------------ */
-    /* Parallel branches                               */
-    /* ------------------------------------------------ */
     // parallel<Branches extends WorkflowBuilder<Reg, Input, Context, any, any>[]>(
     //   ...branches: {
     //     [K in keyof Branches]: (
@@ -56,10 +53,22 @@ export class WorkflowBuilder {
     //       ? S
     //       : never),
     //   ],
-    //   Results &
-    //     (Branches[number] extends WorkflowBuilder<Reg, any, any, any, infer R>
-    //       ? UnionToIntersection<R>
-    //       : {})
+    //   Simplify<
+    //     Results &
+    //       UnionToIntersection<
+    //         {
+    //           [K in keyof Branches]: Branches[K] extends WorkflowBuilder<
+    //             Reg,
+    //             any,
+    //             any,
+    //             any,
+    //             infer R
+    //           >
+    //             ? R
+    //             : never;
+    //         }[number]
+    //       >
+    //   >
     // > {
     //   const parentFrontier = [...this.frontier];
     //   const branchEnds: string[] = [];

package/dist/workflow-module.d.ts

@@ -1,4 +1,4 @@
-import { ActionRegistry } from "./types.js";
+import { ActionRegistry, Simplify } from "./types.js";
 import { createWorkflow, WorkflowDef } from "./workflow-composer.js";
 type AnyWorkflow = WorkflowDef<any, any, any, any, any>;
 type ModuleShape = Record<string, AnyWorkflow>;
@@ -14,7 +14,9 @@ export type ModuleContext<Reg extends ActionRegistry, Context extends Record<str
         context: Context;
     }) => T) => T;
 };
-export declare function createModule<Reg extends ActionRegistry, Context extends Record<string, any>, Use extends ModuleShape[] = [], Deps extends ModuleShape = UnionToIntersectionOrEmpty<Use[number]> & ModuleShape, Own extends ModuleShape = {}>({ registry, context, use, define, }: {
+export declare function createModule<Reg extends ActionRegistry, Context extends Record<string, any>, Use extends ModuleShape[] = [], Deps extends ModuleShape = Simplify<{
+    [K in keyof UnionToIntersectionOrEmpty<Use[number]>]: AnyWorkflow;
+}>, Own extends ModuleShape = {}>({ registry, context, use, define, }: {
     registry: Reg;
     context: Context;
     use?: [...Use];

package/dist/workflow-module.js

@@ -1,7 +1,21 @@
 import { createWorkflow, } from "./workflow-composer.js";
+function mergeModules(mods) {
+    const seen = new Set();
+    const result = {};
+    for (const mod of mods) {
+        for (const key in mod) {
+            if (!seen.has(key)) {
+                seen.add(key);
+                result[key] = mod[key];
+            }
+        }
+    }
+    return result;
+}
 export function createModule({ registry, context, use, define, }) {
     const wf = createWorkflow(registry, context);
-    const deps = (use ? Object.assign({}, ...use) : {});
+    // const deps = (use ? Object.assign({}, ...use) : {}) as Deps;
+    const deps = (use ? mergeModules(use) : {});
     const moduleCtx = {
         wf,
         deps,

package/package.json

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