@pogodisco/zephyr 1.3.5 → 1.3.7

package/dist/index.d.ts

@@ -6,6 +6,5 @@ export * from "./workflow-module.js";
 export * from "./utils.js";
 export * from "./types.js";
 export * from "./utils.js";
-export * from "./node/index.js";
 export * from "./session.js";
 export { useMetrics, useLog } from "./observer.js";

package/dist/index.js

@@ -6,6 +6,5 @@ export * from "./workflow-module.js";
 export * from "./utils.js";
 export * from "./types.js";
 export * from "./utils.js";
-export * from "./node/index.js";
 export * from "./session.js";
 export { useMetrics, useLog } from "./observer.js";

package/dist/registry.js

@@ -1,43 +1,3 @@
-// import { Action, ActionRegistry, MergeActionRegistries } from "./types.js";
-//
-// export class ActionRegistryBuilder<R extends ActionRegistry = {}> {
-//   private registry: Partial<R> = {};
-//
-//   constructor(initial?: R) {
-//     if (initial) {
-//       this.registry = { ...initial };
-//     }
-//   }
-//
-//   action<K extends string, I, O>(
-//     key: K,
-//     action: Action<I, O>,
-//   ): ActionRegistryBuilder<MergeActionRegistries<R, Record<K, Action<I, O>>>> {
-//     (this.registry as any)[key] = action;
-//     return this as any;
-//   }
-//
-//   // Extend with another registry (with override)
-//   extend<Other extends ActionRegistry>(
-//     other: ActionRegistryBuilder<Other> | Other,
-//   ): ActionRegistryBuilder<MergeActionRegistries<R, Other>> {
-//     const otherRegistry =
-//       other instanceof ActionRegistryBuilder ? other.build() : other;
-//
-//     Object.assign(this.registry, otherRegistry);
-//     return this as any;
-//   }
-//
-//   build(): R {
-//     return this.registry as R;
-//   }
-// }
-//
-// export function createActionRegistry<R extends ActionRegistry = {}>(
-//   initial?: R,
-// ): ActionRegistryBuilder<R> {
-//   return new ActionRegistryBuilder(initial);
-// }
 export class ActionRegistryBuilder {
     constructor(initial) {
         this.registry = {};

package/dist/utils.js

@@ -1,44 +1,3 @@
-// import { defineNode, execNode } from "./node/main.js";
-// import { TaskMap, TaskNodeWithContracts, TasksFromFns } from "./node/types.js";
-//
-// export function createAction<
-//   FN extends (args: any) => any, // Allow sync or async
-//   Out = Awaited<ReturnType<FN>>, // Unwrap Promise if present
-// >(fn: FN) {
-//   // Just return the raw node definition, not wrapped with useNode
-//   return defineNode<TasksFromFns<{ run: FN }>, Parameters<FN>[0], Out>({
-//     run: {
-//       fn, // Function can throw or return data
-//       argMap: (r) => r._init,
-//     },
-//     _output: (r) => r.run as Out,
-//   });
-// }
-//
-// export function genericAction<FN extends (args: any) => any>(fn: FN) {
-//   return <T = Awaited<ReturnType<FN>>>() => useAction(createAction<FN, T>(fn));
-// }
-//
-// export function fixedAction<
-//   FN extends (args: any) => any,
-//   T = Awaited<ReturnType<FN>>,
-// >(fn: FN): () => (args: Parameters<FN>[0]) => Promise<T> {
-//   return () => useAction(createAction<FN, T>(fn));
-// }
-//
-// export function useAction<
-//   T extends TaskMap,
-//   I extends Record<string, any> | undefined,
-//   O,
-// >(node: TaskNodeWithContracts<T, I, O>) {
-//   // Returns a function that graph can call, but WITHOUT withResponse
-//   // Just a simple adapter that calls callNode and returns raw _output
-//   return async (initArgs: I): Promise<O> => {
-//     const result = await execNode(node, initArgs);
-//     return result._output; // Just raw data, throws on error
-//   };
-// }
-//
 /**
  * For generic actions - preserves the generic parameter
  */

package/dist/workflow-composer.d.ts

@@ -1,5 +1,11 @@
-import { ActionRegistry, ActionReturn } from "./types.js";
-export type NormalizedCall = {
+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";
 } | {
     kind: "positional";
@@ -12,15 +18,42 @@ export type ResolvedStepInput = NormalizedCall | {
     kind: "loop";
     items: NormalizedCall[];
 };
+type CallHelpers<Reg extends ActionRegistry, ActionName extends keyof Reg> = {
+    args: (...args: ActionParams<Reg, ActionName>) => {
+        kind: "positional";
+        args: ActionParams<Reg, ActionName>;
+    };
+    obj: ActionParams<Reg, ActionName> extends [infer A] ? (arg: A) => {
+        kind: "object";
+        args: A;
+    } : never;
+    none: () => {
+        kind: "none";
+    };
+    loop: (items: {
+        kind: "positional";
+        args: ActionParams<Reg, ActionName>;
+    }[] | {
+        kind: "object";
+        args: ActionParams<Reg, ActionName>[0];
+    }[]) => {
+        kind: "loop";
+        items: typeof items;
+    };
+};
 type SubflowResult<SubResults, SubOutput> = SubOutput extends undefined ? SubResults : SubOutput;
-export type StepResult<Reg extends ActionRegistry, ActionName extends keyof Reg, Loop extends boolean | undefined = undefined> = Loop extends true ? ActionReturn<Reg, ActionName>[] : ActionReturn<Reg, ActionName>;
+type WorkflowInput<T> = T extends WorkflowDef<any, infer I, any, any, any> ? I : never;
+type WorkflowResults<T> = T extends WorkflowDef<any, any, infer R, any, any> ? R : never;
+type WorkflowOutput<T> = T extends WorkflowDef<any, any, any, any, infer O> ? O : never;
+export type StepResultFromResolve<Reg extends ActionRegistry, ActionName extends keyof Reg, R extends ResolvedStepInput> = R extends {
+    kind: "loop";
+} ? ActionReturn<Reg, ActionName>[] : ActionReturn<Reg, ActionName>;
 export type StepDef<Reg extends ActionRegistry, ID extends string = string, ActionName extends keyof Reg = any> = {
     id: ID;
     action: ActionName;
     dependsOn: string[];
     resolve: (ctx: any) => ResolvedStepInput;
     when?: (ctx: any) => boolean;
-    loop?: boolean;
 };
 export type WorkflowDef<Reg extends ActionRegistry, Input, Results, Steps extends StepDef<Reg, any, any>[] = StepDef<Reg, any, any>[], Output = undefined> = {
     name: string;
@@ -41,49 +74,45 @@ 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, Loop extends boolean | undefined = undefined>(id: ID, action: ActionName, resolve?: (ctx: {
+    step<ID extends string, ActionName extends keyof Reg & string, ResolveOut extends ResolvedStepInput = ResolvedStepInput>(id: ID, action: ActionName, resolve?: (ctx: {
         input: Input;
         results: Results;
         context: Context;
-    }) => ResolvedStepInput, dependsOn?: string[], options?: {
-        loop?: Loop;
-    }): WorkflowBuilder<Reg, Input, Context, [
+    } & CallHelpers<Reg, ActionName>) => ResolveOut, dependsOn?: string[], options?: {}): StepBuilderResult<WorkflowBuilder<Reg, Input, Context, [
         ...Steps,
         StepDef<Reg, ID, ActionName>
     ], Results & {
-        [K in ID]: StepResult<Reg, ActionName, Loop>;
-    }>;
-    seq<ID extends string, ActionName extends keyof Reg & string>(id: ID, action: ActionName, resolve?: (ctx: {
+        [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: {
         input: Input;
         results: Results;
         context: Context;
-    }) => ResolvedStepInput, options?: {
-        loop?: boolean;
-    }): WorkflowBuilder<Reg, Input, Context, [...Steps, StepDef<Reg, ID, ActionName>], Results & { [K in ID]: ActionReturn<Reg, ActionName> | ActionReturn<Reg, ActionName>[]; }, undefined>;
+    } & 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>>;
     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>(id: ID, action: ActionName, resolve?: (ctx: {
+    join<ID extends string, ActionName extends keyof Reg & string, ResolveOut extends ResolvedStepInput = ResolvedStepInput>(id: ID, action: ActionName, resolve?: (ctx: {
         input: Input;
         results: Results;
         context: Context;
-    }) => ResolvedStepInput, options?: {
-        loop?: boolean;
-    }): WorkflowBuilder<Reg, Input, Context, [...Steps, StepDef<Reg, ID, ActionName>], Results & { [K in ID]: ActionReturn<Reg, ActionName> | ActionReturn<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: {
+    } & 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>>;
+    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;
         context: Context;
-    }) => SubInput, options?: {
-        loop?: boolean;
-    }): WorkflowBuilder<Reg, Input, Context, [
+    }) => WorkflowInput<WF>) | undefined : (ctx: {
+        input: Input;
+        results: Results;
+        context: Context;
+    }) => WorkflowInput<WF>, options?: {}): WorkflowBuilder<Reg, Input, Context, [
         ...Steps,
-        ...SubSteps
+        ...WF["steps"]
     ], Results & {
-        [K in Prefix]: SubflowResult<SubResults, SubOutput>;
+        [K in Prefix]: SubflowResult<WorkflowResults<WF>, WorkflowOutput<WF>>;
     }>;
     when(predicate: (ctx: {
         input: Input;
@@ -98,10 +127,6 @@ export declare class WorkflowBuilder<Reg extends ActionRegistry, Input = unknown
     build(): WorkflowDef<Reg, Input, Results, Steps>;
     private validateDependencies;
     private getEndSteps;
-    static args: (...args: any[]) => NormalizedCall;
-    static obj: (args: any) => NormalizedCall;
-    static none: () => NormalizedCall;
-    static loop: (items: NormalizedCall[]) => ResolvedStepInput;
 }
 export declare function createWorkflow<Reg extends ActionRegistry, Context extends Record<string, any> = {}>(registry: Reg, context?: Context): <Input = unknown>(name: string) => WorkflowBuilder<Reg, Input, Context, [], {}, undefined>;
 export {};