@pogodisco/zephyr 1.4.1 → 1.5.0

package/dist/workflow-module.js

@@ -1,38 +1,100 @@
-// import { ActionRegistry, Simplify, WorkflowObserver } from "./types.js";
+//   ActionRegistry,
+// import {
+//   Executor,
+//   Simplify,
+//   WorkflowObserver,
+// } from "./types.js";
 // import { createWorkflow, WorkflowDef } from "./workflow-composer.js";
 // import { executeWorkflow } from "./workflow-executor.js";
+// type UnionToIntersection<U> = (U extends any ? (x: U) => any : never) extends (
+//   x: infer I,
+// ) => any
+//   ? I
+//   : never;
+// /* ------------------------------------------------ */
+// /* WORKFLOW REGISTRY TYPES                          */
+// /* ------------------------------------------------ */
+// type EnsureWorkflowRecord<T> =
+//   T extends Record<string, WorkflowDef<any, any, any, any, any>>
+//     ? T
+//     : Record<string, WorkflowDef<any, any, any, any, any>>;
 //
-// type AnyWorkflow = WorkflowDef<any, any, any, any, any>;
-//
-// type WorkflowFromDeps<Deps extends Record<string, any>> = {
-//   [K in keyof Deps]: Deps[K] extends Module<any, any, infer Own, infer SubDeps>
-//     ? Own[keyof Own] | WorkflowFromDeps<SubDeps>
+// type EnsureWorkflowShape<T> = {
+//   [K in keyof T]: T[K] extends WorkflowDef<any, any, any, any, any>
+//     ? T[K]
 //     : never;
-// }[keyof Deps];
+// };
+//
+// type DepWorkflows<Deps extends ModuleMap> = keyof Deps extends never
+//   ? {}
+//   : Simplify<
+//       EnsureWorkflowShape<
+//         UnionToIntersection<
+//           {
+//             [D in keyof Deps & string]: {
+//               [K in keyof Deps[D]["workflows"] &
+//                 string as `${D}.${K}`]: Deps[D]["workflows"][K];
+//             };
+//           }[keyof Deps & string]
+//         >
+//       >
+//     >;
+//
+// type WorkflowRegistry<Own extends ModuleShape, Deps extends ModuleMap> = Own &
+//   DepWorkflows<Deps>;
+//
+// /* ------------------------------------------------ */
+// /* MODULE TYPES                                     */
+// /* ------------------------------------------------ */
+//
+// type AnyWorkflow = WorkflowDef<any, any, any, any, any>;
 // type ModuleShape = Record<string, AnyWorkflow>;
+// type ModuleMap = Record<string, Module<any, any, any, any>>;
 //
-// type ContextFromDeps<Deps> = [keyof Deps] extends [never]
-//   ? {} // 👈 THIS is the fix
-//   : {
-//       [K in keyof Deps]: Deps[K] extends Module<any, infer Ctx, any, any>
-//         ? Ctx
-//         : never;
-//     }[keyof Deps];
+// // type ContextFromDeps<Deps> = [keyof Deps] extends [never]
+// //   ? {}
+// //   : {
+// //       [K in keyof Deps]: Deps[K] extends Module<any, infer Ctx, any, any>
+// //         ? Ctx
+// //         : never;
+// //     }[keyof Deps];
 //
 // type FinalContext<
-//   Reg extends ActionRegistry,
 //   Context extends Record<string, any>,
-//   Deps extends ModuleMap<Reg>,
-// > = Context & ContextFromDeps<Deps>;
+//   Deps extends ModuleMap,
+// > = Context & ContextFromDepsRecursive<Deps>;
+//
+// // type ContextFromDeps<Deps> = [keyof Deps] extends [never]
+// //   ? {}
+// //   : UnionToIntersection<
+// //       {
+// //         [K in keyof Deps]: Deps[K] extends Module<any, infer Ctx, any, any>
+// //           ? Ctx
+// //           : never;
+// //       }[keyof Deps]
+// //     >;
+//
+// type ContextFromDepsRecursive<Deps extends ModuleMap> = [keyof Deps] extends [
+//   never,
+// ]
+//   ? {} // no deps
+//   : UnionToIntersection<
+//       {
+//         [K in keyof Deps]: Deps[K] extends Module<
+//           any,
+//           infer Ctx,
+//           any,
+//           infer SubDeps
+//         >
+//           ? Ctx & ContextFromDepsRecursive<SubDeps>
+//           : never;
+//       }[keyof Deps]
+//     >;
 //
-// type ModuleMap<Reg extends ActionRegistry> = Record<
-//   string,
-//   Module<Reg, any, any, any>
-// >;
+// /* ------------------------------------------------ */
+// /* WORKFLOW IO TYPES                                */
+// /* ------------------------------------------------ */
 //
-// // type Module<Own extends ModuleShape = {}, Deps extends ModuleMap = {}> = Own & {
-// //   deps: Deps;
-// // };
 // export type WorkflowInput<W> =
 //   W extends WorkflowDef<any, infer I, any, any, any> ? I : never;
 //
@@ -41,134 +103,207 @@
 //
 // export type WorkflowOutput<W> =
 //   W extends WorkflowDef<any, any, any, any, infer O> ? O : never;
+//
+// /* ------------------------------------------------ */
+// /* MODULE RUNTIME                                   */
+// /* ------------------------------------------------ */
+//
 // type Module<
 //   Reg extends ActionRegistry,
 //   Context extends Record<string, any>,
-//   Own extends ModuleShape = {},
-//   Deps extends ModuleMap<Reg> = {},
+//   Own extends ModuleShape,
+//   Deps extends ModuleMap,
 // > = {
-//   own: Own;
-//   deps: Deps;
-//   createRuntime: (config: {
-//     registry: Reg;
-//     context: FinalContext<Reg, Context, Deps>;
-//   }) => {
-//     run: <W extends Own[keyof Own] | WorkflowFromDeps<Deps>>(
-//       workflow: W,
-//       input: WorkflowInput<W>,
-//       obververs?: WorkflowObserver<Reg>[],
+//   workflows: Own;
+//   __getExecutor: () => Executor;
+//
+//   createRuntime: (config: { context: FinalContext<Context, Deps> }) => {
+//     run: <K extends keyof WorkflowRegistry<Own, Deps>>(
+//       workflow: K,
+//       input: WorkflowInput<WorkflowRegistry<Own, Deps>[K]>,
+//       observers?: WorkflowObserver<Reg>[],
 //     ) => Promise<{
-//       results: WorkflowResults<W>;
-//       output: WorkflowOutput<W>;
+//       // results: WorkflowResults<WorkflowRegistry<Own, Deps>[K]>;
+//       output: WorkflowOutput<WorkflowRegistry<Own, Deps>[K]>;
 //       extras: Record<string, any>;
 //     }>;
-//     getContext: () => FinalContext<Reg, Context, Deps>;
+//
+//     getContext: () => FinalContext<Context, Deps>;
 //   };
 // };
 //
-// export type ModuleContext<
+// /* ------------------------------------------------ */
+// /* MODULE CONTEXT (FIXED)                           */
+// /* ------------------------------------------------ */
+//
+// type ModuleContext<
 //   Reg extends ActionRegistry,
+//   WFReg extends Record<string, WorkflowDef<any, any, any, any, any>>,
 //   Context extends Record<string, any>,
-//   Deps extends ModuleMap<Reg>,
 // > = {
-//   wf: ReturnType<typeof createWorkflow<Reg, Context>>;
-//
-//   deps: Deps;
+//   wf: ReturnType<typeof createWorkflow<Reg, WFReg, Context>>;
 //   context: Context;
-//
-//   tools: <T>(
-//     factory: (ctx: {
-//       wf: ModuleContext<Reg, Context, Deps>["wf"];
-//       deps: Deps;
-//       context: Context;
-//     }) => T,
-//   ) => T;
 // };
 //
 // function createModule<
 //   Reg extends ActionRegistry,
 //   Context extends Record<string, any>,
-//   Use extends ModuleMap<Reg>,
+//   Use extends ModuleMap,
 //   Own extends ModuleShape,
 // >(config: {
+//   actionRegistry: Reg;
 //   use?: Use;
-//   define: (ctx: ModuleContext<Reg, Context, Use>) => Own;
+//   define: (ctx: ModuleContext<Reg, DepWorkflows<Use>, Context>) => Own;
 // }): Module<Reg, Context, Own, Use> {
-//   const wf = createWorkflow<Reg, Context>();
-//
 //   const deps = (config.use ?? {}) as Use;
 //
-//   const moduleCtx: ModuleContext<Reg, Context, Use> = {
+//   const wf = createWorkflow<Reg, DepWorkflows<Use>, Context>();
+//
+//   const own = config.define({
 //     wf,
-//     deps,
 //     context: {} as Context,
+//   });
 //
-//     tools: (factory) =>
-//       factory({
-//         wf,
-//         deps,
-//         context: {} as Context,
-//       }),
-//   };
+//   function buildWorkflowMap(): WorkflowRegistry<Own, Use> {
+//     const depWFs = Object.fromEntries(
+//       Object.entries(deps).flatMap(([name, mod]) =>
+//         Object.entries(mod.workflows).map(([k, wf]) => [`${name}.${k}`, wf]),
+//       ),
+//     );
+//
+//     return { ...own, ...depWFs } as WorkflowRegistry<Own, Use>;
+//   }
+//
+//   const workflowMap = buildWorkflowMap();
+//
+//   const depsExecutors = Object.fromEntries(
+//     Object.entries(deps).map(([name, mod]) => [name, mod.__getExecutor()]),
+//   );
+//
+//   const executor: Executor = {
+//     run(wfId, input, context, observers = []) {
+//       const workflow = workflowMap[wfId];
 //
-//   const own = config.define(moduleCtx);
+//       if (!workflow) {
+//         throw new Error(`Workflow not found: ${String(wfId)}`);
+//       }
+//
+//       return executeWorkflow({
+//         workflow,
+//         actionRegistry: config.actionRegistry,
+//         depsExecutors,
+//         input,
+//         context,
+//         observers,
+//       });
+//     },
+//   };
 //
 //   return {
-//     own,
-//     deps,
-//     createRuntime({ registry, context }) {
-//       const runtimeCtx = { ...context } as FinalContext<Reg, Context, Use>;
+//     workflows: own,
+//     __getExecutor: () => executor,
+//
+//     createRuntime({ services }) {
+//       let runtimeActions = config.actionRegistry;
+//
+//       // const runtimeService = createServiceRegisty(services)
 //       return {
-//         run: async (workflow, input, observers = []) => {
-//           return executeWorkflow(workflow, registry, input, context, observers);
+//         run: async <K extends keyof WorkflowRegistry<Own, Use>>(
+//           workflowId: K,
+//           input: WorkflowInput<WorkflowRegistry<Own, Use>[K]>,
+//           observers: WorkflowObserver<Reg>[] = [],
+//         ) => {
+//           return executor.run(workflowId as string, input, context, observers);
+//         },
+//         // make it same, practically nothing changes but naming, and what context holds
+//         getContext: () => ({ ...context }) as FinalContext<Context, Use>,
+//
+//         setActionRegistry(reg: Reg) {
+//           runtimeActions = reg;
+//           // ⚠️ optional: if you REALLY want override, you'd need:
+//           // executor.actions = reg
+//           // but better keep actions immutable
 //         },
-//         getContext: () => ({ ...runtimeCtx }),
 //       };
 //     },
 //   };
 // }
 //
+// /* ------------------------------------------------ */
+// /* FACTORY (FIXED)                                  */
+// /* ------------------------------------------------ */
+//
 // export function createModuleFactory<
-//   Reg extends ActionRegistry,
+//   // Reg extends ActionRegistry,
 //   Context extends Record<string, any>,
 // >() {
 //   return function <
-//     Use extends ModuleMap<Reg> = {},
+//     Reg extends ActionRegistry = Record<string, any>,
+//     Use extends ModuleMap = {},
 //     Own extends ModuleShape = {},
 //   >(config: {
+//     actionRegistry: Reg;
 //     use?: Use;
-//     define: (ctx: ModuleContext<Reg, Context, Use>) => Own;
+//     define: (
+//       ctx: ModuleContext<
+//         typeof config.actionRegistry,
+//         DepWorkflows<Use>,
+//         Context
+//       >, // ✅ FIXED HERE
+//     ) => Own;
 //   }): Module<Reg, Context, Own, Use> {
 //     return createModule<Reg, Context, Use, Own>(config);
 //   };
 // }
-//
 import { createWorkflow } from "./workflow-composer.js";
 import { executeWorkflow } from "./workflow-executor.js";
-/* ------------------------------------------------ */
-/* CREATE MODULE (FIXED)                            */
-/* ------------------------------------------------ */
 function createModule(config) {
     const deps = (config.use ?? {});
-    // ✅ CRITICAL: wf only sees DEP workflows
     const wf = createWorkflow();
     const own = config.define({
         wf,
-        context: {},
+        services: {},
     });
-    function buildRegistry() {
+    function buildWorkflowMap() {
         const depWFs = Object.fromEntries(Object.entries(deps).flatMap(([name, mod]) => Object.entries(mod.workflows).map(([k, wf]) => [`${name}.${k}`, wf])));
         return { ...own, ...depWFs };
     }
+    const workflowMap = buildWorkflowMap();
+    const depsExecutors = Object.fromEntries(Object.entries(deps).map(([name, mod]) => [name, mod.__getExecutor()]));
+    const executor = {
+        run(wfId, input, services, observers = []) {
+            const workflow = workflowMap[wfId];
+            if (!workflow) {
+                throw new Error(`Workflow not found: ${String(wfId)}`);
+            }
+            return executeWorkflow({
+                workflow,
+                actionRegistry: config.actionRegistry,
+                depsExecutors,
+                input,
+                services,
+                observers,
+            });
+        },
+    };
     return {
         workflows: own,
-        createRuntime({ registry, context }) {
-            const workflowRegistry = buildRegistry();
+        __getExecutor: () => executor,
+        createRuntime({ services }) {
+            let runtimeActions = config.actionRegistry;
+            // const runtimeService = createServiceRegisty(services)
             return {
                 run: async (workflowId, input, observers = []) => {
-                    return executeWorkflow(workflowId, workflowRegistry, registry, input, context, observers);
+                    return executor.run(workflowId, input, services, observers);
+                },
+                // make it same, practically nothing changes but naming, and what context holds
+                getServices: () => ({ ...services }),
+                setActionRegistry(reg) {
+                    runtimeActions = reg;
+                    // ⚠️ optional: if you REALLY want override, you'd need:
+                    // executor.actions = reg
+                    // but better keep actions immutable
                 },
-                getContext: () => ({ ...context }),
             };
         },
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pogodisco/zephyr",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "publishConfig": {
     "access": "public"
   },
@@ -33,6 +33,8 @@
     "prepublishOnly": "npm run build",
     "build": "tsc -p tsconfig.build.json",
     "dev": "tsc -w -p tsconfig.json",
+    "test": "vitest",
+    "test:run": "vitest run",
     "test:types": "tsd"
   },
   "tsd": {
@@ -45,6 +47,7 @@
     "@types/node": "^25.2.3",
     "chalk": "^5.6.2",
     "pretty-format": "^30.2.0",
-    "tsd": "^0.33.0"
+    "tsd": "^0.33.0",
+    "vitest": "^4.1.2"
   }
 }