@pogodisco/zephyr 1.2.6 → 1.2.8

package/dist/workflow-composer.d.ts

@@ -26,7 +26,11 @@ export declare class WorkflowBuilder<Reg extends ActionRegistry, Input = unknown
     private frontier;
     private outputResolver?;
     constructor(name: string, registry: Reg, context: Context);
-    step<ID extends string, ActionName extends keyof Reg & string>(id: ID, action: ActionName, resolve: (ctx: {
+    step<ID extends string, ActionName extends keyof Reg & string>(id: ID, action: ActionName, resolve?: Parameters<Reg[ActionName]>[0] extends undefined ? (ctx?: {
+        input: Input;
+        results: Results;
+        context: Context;
+    }) => undefined : (ctx: {
         input: Input;
         results: Results;
         context: Context;
@@ -36,7 +40,11 @@ export declare class WorkflowBuilder<Reg extends ActionRegistry, Input = unknown
     ], Results & {
         [K in ID]: StepResult<Reg, ActionName>;
     }>;
-    seq<ID extends string, ActionName extends keyof Reg & string>(id: ID, action: ActionName, resolve: (ctx: {
+    seq<ID extends string, ActionName extends keyof Reg & string>(id: ID, action: ActionName, resolve?: Parameters<Reg[ActionName]>[0] extends undefined ? (ctx?: {
+        input: Input;
+        results: Results;
+        context: Context;
+    }) => undefined : (ctx: {
         input: Input;
         results: Results;
         context: Context;
@@ -47,15 +55,18 @@ export declare class WorkflowBuilder<Reg extends ActionRegistry, Input = unknown
         ...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>(id: ID, action: ActionName, resolve: (ctx: {
+    join<ID extends string, ActionName extends keyof Reg & string>(id: ID, action: ActionName, resolve?: Parameters<Reg[ActionName]>[0] extends undefined ? (ctx?: {
+        input: Input;
+        results: Results;
+    }) => undefined : (ctx: {
         input: Input;
         results: Results;
     }) => Parameters<Reg[ActionName]>[0]): WorkflowBuilder<Reg, Input, Context, [...Steps, StepDef<Reg, ID, ActionName>], Results & { [K in ID]: Awaited<ReturnType<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: {
+    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;
         context: Context;
-    }) => SubInput): WorkflowBuilder<Reg, Input, Context, [
+    }) => [SubInput] extends [never] ? any : SubInput & Record<Exclude<keyof SubInput, keyof any>, never>): WorkflowBuilder<Reg, Input, Context, [
         ...Steps,
         ...SubSteps
     ], Results & {

package/dist/workflow-composer.js

@@ -560,7 +560,7 @@ export class WorkflowBuilder {
         this.steps.push({
             id,
             action,
-            resolve,
+            resolve: resolve ?? (() => undefined),
             dependsOn: deps,
         });
         this.frontier = [id];
@@ -607,7 +607,8 @@ export class WorkflowBuilder {
                 id: idMap.get(step.id),
                 dependsOn: step.dependsOn.map((d) => idMap.get(d)),
                 resolve: (ctx) => {
-                    const subInput = resolveInput(ctx);
+                    const subInput = resolveInput ? resolveInput(ctx) : undefined;
+                    // const subInput = resolveInput(ctx);
                     return step.resolve({
                         input: subInput,
                         results: ctx.results,
@@ -627,9 +628,6 @@ export class WorkflowBuilder {
         this.outputResolver = fn;
         return this.build();
     }
-    /* ------------------------------------------------ */
-    /* Build                                             */
-    /* ------------------------------------------------ */
     build() {
         this.validateDependencies();
         return {
@@ -642,7 +640,6 @@ export class WorkflowBuilder {
             outputResolver: this.outputResolver,
         };
     }
-    /* ------------------------------------------------ */
     validateDependencies() {
         const stepIds = new Set(this.steps.map((s) => s.id));
         for (const step of this.steps) {

package/dist/workflow-executor.js

@@ -132,10 +132,13 @@ export async function executeWorkflow(workflow, registry, input, middleware = []
             const ctx = { stepId, input, results, registry, extras, frame };
             const core = async () => {
                 frame.attempts++;
-                frame.input = step.resolve({ input, results });
+                frame.input = step.resolve?.({ input, results }) ?? undefined;
                 try {
                     const action = registry[step.action];
-                    const result = await action(frame.input);
+                    const result = frame.input === undefined
+                        ? await action()
+                        : await action(frame.input);
+                    // const result = await action(frame.input);
                     frame.output = result;
                     frame.end = Date.now();
                     results[step.id] = result;

package/dist/workflow-module.d.ts

@@ -1,7 +1,18 @@
 import { ActionRegistry } from "./types.js";
-import { createWorkflow } from "./workflow-composer.js";
+import { createWorkflow, WorkflowDef } from "./workflow-composer.js";
 export declare function workflowModule<Reg extends ActionRegistry, Context extends Record<string, any>, Flows extends Record<string, any>>(registry: Reg, context: Context, factory: (wf: ReturnType<typeof createWorkflow<Reg, Context>>) => Flows): {
     wf: <Input = unknown>(name: string) => import("./workflow-composer.js").WorkflowBuilder<Reg, Input, Context, [], {}, undefined>;
 } & Flows & {
     extend<Extra extends Record<string, any>>(overrides: Extra): Flows & Extra;
 };
+type AnyWorkflow = WorkflowDef<any, any, any, any, any>;
+type ModuleShape = Record<string, AnyWorkflow>;
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
+type UnionToIntersectionOrEmpty<U> = [U] extends [never] ? {} : UnionToIntersection<U>;
+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, }: {
+    registry: Reg;
+    context: Context;
+    use?: [...Use];
+    define: (wf: ReturnType<typeof createWorkflow<Reg, Context>>, deps: Deps) => Own;
+}): Deps & Own;
+export {};

package/dist/workflow-module.js

@@ -35,3 +35,12 @@ export function workflowModule(registry, context, factory) {
         },
     };
 }
+export function createModule({ registry, context, use, define, }) {
+    const wf = createWorkflow(registry, context);
+    const deps = (use ? Object.assign({}, ...use) : {});
+    const own = define(wf, deps);
+    return {
+        ...deps,
+        ...own,
+    };
+}

package/package.json

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