@pogodisco/zephyr 1.3.15 → 1.3.16

package/dist/workflow-module.d.ts

@@ -1,5 +1,15 @@
 import { ActionRegistry, WorkflowObserver } from "./types.js";
 import { createWorkflow, WorkflowDef } from "./workflow-composer.js";
+type ModuleWFRegistry<Own extends ModuleShape, Deps extends ModuleMap> = OwnWFs<Own> & DepsWFs<Deps>;
+type OwnWFs<Own extends ModuleShape> = {
+    [K in keyof Own & string]: Own[K];
+};
+type NamespacedDepWFs<DepName extends string, M extends Module<any, any, any, any>> = {
+    [K in keyof M["own"] & string as `${DepName}.${K}`]: M["own"][K];
+};
+type DepsWFs<Deps extends ModuleMap> = {
+    [DepName in keyof Deps & string]: NamespacedDepWFs<DepName, Deps[DepName]>;
+}[keyof Deps & string];
 type ModuleDepsPublic<Use> = {
     [K in keyof Use]: Use[K] extends Module<any, infer Ctx, infer Own, any> ? ModulePublic<Ctx, Own> : never;
 };
@@ -17,9 +27,6 @@ type ModuleMap = Record<string, Module<any, any, any, any>>;
 export type WorkflowInput<W> = W extends WorkflowDef<any, infer I, any, any, any> ? I : never;
 export type WorkflowResults<W> = W extends WorkflowDef<any, any, infer R, any, any> ? R : never;
 export type WorkflowOutput<W> = W extends WorkflowDef<any, any, any, any, infer O> ? O : never;
-type WorkflowFromDeps<Deps> = {
-    [K in keyof Deps]: Deps[K] extends Module<any, any, infer Own, any> ? Own[keyof Own] : never;
-}[keyof Deps];
 type Module<Reg extends ActionRegistry, Context extends Record<string, any>, Own extends ModuleShape = {}, Deps extends ModuleMap = {}> = {
     own: Own;
     deps: ModuleDepsPublic<Deps>;
@@ -27,9 +34,9 @@ type Module<Reg extends ActionRegistry, Context extends Record<string, any>, Own
         registry: Reg;
         context: FinalContext<Reg, Context, Deps>;
     }) => {
-        run: <W extends Own[keyof Own] | WorkflowFromDeps<Deps>>(workflow: W, input: WorkflowInput<W>, observers?: WorkflowObserver<Reg>[]) => Promise<{
-            results: WorkflowResults<W>;
-            output: WorkflowOutput<W>;
+        run: <K extends keyof ModuleWFRegistry<Own, Deps>>(workflow: K, input: WorkflowInput<ModuleWFRegistry<Own, Deps>[K]>, observers?: WorkflowObserver<Reg>[]) => Promise<{
+            results: WorkflowResults<ModuleWFRegistry<Own, Deps>[K]>;
+            output: WorkflowOutput<ModuleWFRegistry<Own, Deps>[K]>;
             extras: Record<string, any>;
         }>;
         getContext: () => FinalContext<Reg, Context, Deps>;

package/dist/workflow-module.js

@@ -149,29 +149,32 @@ function toPublicDeps(deps) {
     return deps;
 }
 function createModule(config) {
-    const wf = createWorkflow();
     const deps = (config.use ?? {});
-    const moduleCtx = {
-        wf,
+    const own = config.define({
+        wf: createWorkflow(),
         deps,
         context: {},
         tools: (factory) => factory({
-            wf,
+            wf: createWorkflow(),
             deps,
             context: {},
         }),
-    };
-    const own = config.define(moduleCtx);
+    });
+    function mergeWFs() {
+        const depWFs = Object.fromEntries(Object.entries(deps).flatMap(([depName, depModule]) => Object.entries(depModule.own).map(([k, wf]) => [`${depName}.${k}`, wf])));
+        return { ...own, ...depWFs };
+    }
     return {
         own,
         deps: toPublicDeps(deps),
         createRuntime({ registry, context }) {
-            const runtimeCtx = { ...context };
+            const workflowRegistry = mergeWFs();
             return {
-                run: async (workflow, input, observers = []) => {
-                    return executeWorkflow(workflow, registry, input, context, observers);
+                run: async (workflowId, input, observers = []) => {
+                    const wfObj = workflowRegistry[workflowId]; // <-- concrete WorkflowDef
+                    return executeWorkflow(wfObj, registry, input, context, observers);
                 },
-                getContext: () => ({ ...runtimeCtx }),
+                getContext: () => ({ ...context }),
             };
         },
     };

package/package.json

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