@pogodisco/zephyr 1.2.7 → 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.js

@@ -44,53 +44,3 @@ export function createModule({ registry, context, use, define, }) {
         ...own,
     };
 }
-// type MergeFlows<T extends any[]> = T extends [infer F, ...infer R]
-//   ? F extends { flows: infer Fl }
-//     ? MergeFlows<R> & Fl
-//     : MergeFlows<R>
-//   : {};
-//
-// type Module<
-//   Reg extends ActionRegistry,
-//   Context extends Record<string, any>,
-//   Flows,
-// > = {
-//   wf: ReturnType<typeof createWorkflow<Reg, Context>>;
-//   flows: Flows;
-// };
-//
-// export function createModule<
-//   Reg extends ActionRegistry,
-//   Context extends Record<string, any>,
-//   Flows extends Record<string, any>,
-//   UseModules extends Module<any, any, any>[] = [],
-// >({
-//   registry,
-//   context,
-//   use = [] as unknown as UseModules,
-//   define,
-// }: {
-//   registry: Reg;
-//   context: Context;
-//   use?: UseModules;
-//   define?: (
-//     wf: ReturnType<typeof createWorkflow<Reg, Context>>,
-//     deps: MergeFlows<UseModules>,
-//   ) => Flows;
-// }) {
-//   const wf = createWorkflow(registry, context);
-//
-//   const inherited = Object.assign({}, ...use.map((m) => m.flows));
-//   const own = define ? define(wf, inherited as MergeFlows<UseModules>) : {};
-//
-//   const flows = {
-//     ...inherited,
-//     ...own,
-//   };
-//
-//   return {
-//     wf,
-//     flows,
-//     ...flows,
-//   } as Module<Reg, Context, typeof flows>;
-// }

package/package.json

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