@pogodisco/zephyr 1.3.13 → 1.3.15

package/dist/registry.d.ts

@@ -1,13 +1,14 @@
 import { ActionRegistry, MergeActionRegistries } from "./types.js";
-export declare class ActionRegistryBuilder<R extends ActionRegistry = {}> {
+export declare class ActionRegistryBuilder<R extends ActionRegistry = {}, Prefix extends string = ""> {
+    private prefix;
     private registry;
-    constructor(initial?: R);
+    constructor(prefix: Prefix, initial?: R);
     /**
      * Accepts ANY function - sync or async, any parameter shape
      * F captures the complete function signature for full type inference
      */
-    action<K extends string, F extends (...args: any[]) => any>(key: K, action: F): ActionRegistryBuilder<MergeActionRegistries<R, Record<K, F>>>;
-    extend<Other extends ActionRegistry>(other: ActionRegistryBuilder<Other> | Other): ActionRegistryBuilder<MergeActionRegistries<R, Other>>;
+    action<K extends string, F extends (...args: any[]) => any>(key: K, action: F): ActionRegistryBuilder<MergeActionRegistries<R, Record<`${Prefix}${K}`, F>>, Prefix>;
+    extend<Other extends ActionRegistry>(other: ActionRegistryBuilder<Other, any> | Other): ActionRegistryBuilder<MergeActionRegistries<R, Other>, Prefix>;
     build(): R;
 }
-export declare function createActionRegistry<R extends ActionRegistry = {}>(initial?: R): ActionRegistryBuilder<R>;
+export declare function createActionRegistry<R extends ActionRegistry = {}, Prefix extends string = "">(prefix: Prefix, initial?: R): ActionRegistryBuilder<R, Prefix>;

package/dist/registry.js

@@ -1,5 +1,6 @@
 export class ActionRegistryBuilder {
-    constructor(initial) {
+    constructor(prefix, initial) {
+        this.prefix = prefix;
         this.registry = {};
         if (initial) {
             this.registry = { ...initial };
@@ -10,12 +11,21 @@ export class ActionRegistryBuilder {
      * F captures the complete function signature for full type inference
      */
     action(key, action) {
-        this.registry[key] = action;
+        const fullKey = `${this.prefix}${key}`;
+        if (fullKey in this.registry) {
+            throw new Error(`Action "${fullKey}" already exists`);
+        }
+        this.registry[fullKey] = action;
         return this;
     }
     // Extend with another registry (with override)
     extend(other) {
         const otherRegistry = other instanceof ActionRegistryBuilder ? other.build() : other;
+        for (const key in otherRegistry) {
+            if (key in this.registry) {
+                throw new Error(`Action collision detected "${key}"`);
+            }
+        }
         Object.assign(this.registry, otherRegistry);
         return this;
     }
@@ -23,6 +33,9 @@ export class ActionRegistryBuilder {
         return this.registry;
     }
 }
-export function createActionRegistry(initial) {
-    return new ActionRegistryBuilder(initial);
+export function createActionRegistry(prefix, initial) {
+    if (!prefix || typeof prefix !== "string" || prefix?.trim() === "") {
+        throw new Error(`Registry prefix is required`);
+    }
+    return new ActionRegistryBuilder(prefix, initial);
 }

package/dist/workflow-module.d.ts

@@ -1,26 +1,33 @@
 import { ActionRegistry, WorkflowObserver } from "./types.js";
 import { createWorkflow, WorkflowDef } from "./workflow-composer.js";
+type ModuleDepsPublic<Use> = {
+    [K in keyof Use]: Use[K] extends Module<any, infer Ctx, infer Own, any> ? ModulePublic<Ctx, Own> : never;
+};
+type ModulePublic<Context extends Record<string, any>, Own extends ModuleShape> = {
+    own: Own;
+    __ctx: Context;
+};
 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> : never;
-}[keyof Deps];
 type ModuleShape = Record<string, AnyWorkflow>;
 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>;
-type ModuleMap<Reg extends ActionRegistry> = Record<string, Module<Reg, any, any, any>>;
+type FinalContext<Reg extends ActionRegistry, Context extends Record<string, any>, Deps extends ModuleMap> = Context & ContextFromDeps<Deps>;
+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 Module<Reg extends ActionRegistry, Context extends Record<string, any>, Own extends ModuleShape = {}, Deps extends ModuleMap<Reg> = {}> = {
+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: Deps;
+    deps: ModuleDepsPublic<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>[]) => Promise<{
+        run: <W extends Own[keyof Own] | WorkflowFromDeps<Deps>>(workflow: W, input: WorkflowInput<W>, observers?: WorkflowObserver<Reg>[]) => Promise<{
             results: WorkflowResults<W>;
             output: WorkflowOutput<W>;
             extras: Record<string, any>;
@@ -28,7 +35,7 @@ type Module<Reg extends ActionRegistry, Context extends Record<string, any>, Own
         getContext: () => FinalContext<Reg, Context, Deps>;
     };
 };
-export type ModuleContext<Reg extends ActionRegistry, Context extends Record<string, any>, Deps extends ModuleMap<Reg>> = {
+export type ModuleContext<Reg extends ActionRegistry, Context extends Record<string, any>, Deps extends ModuleMap> = {
     wf: ReturnType<typeof createWorkflow<Reg, Context>>;
     deps: Deps;
     context: Context;
@@ -38,11 +45,7 @@ export type ModuleContext<Reg extends ActionRegistry, Context extends Record<str
         context: Context;
     }) => T) => T;
 };
-export declare function createModule<Reg extends ActionRegistry, Context extends Record<string, any>, Use extends ModuleMap<Reg>, Own extends ModuleShape>(config: {
-    use?: Use;
-    define: (ctx: ModuleContext<Reg, Context, Use>) => Own;
-}): Module<Reg, Context, Own, Use>;
-export declare function createModuleFactory<Reg extends ActionRegistry, Context extends Record<string, any>>(): <Use extends ModuleMap<Reg> = {}, Own extends ModuleShape = {}>(config: {
+export declare function createModuleFactory<Reg extends ActionRegistry, Context extends Record<string, any>>(): <Use extends ModuleMap = {}, Own extends ModuleShape = {}>(config: {
     use?: Use;
     define: (ctx: ModuleContext<Reg, Context, Use>) => Own;
 }) => Module<Reg, Context, Own, Use>;

package/dist/workflow-module.js

@@ -1,6 +1,154 @@
+// import { ActionRegistry, Simplify, WorkflowObserver } from "./types.js";
+// import { createWorkflow, WorkflowDef } from "./workflow-composer.js";
+// import { executeWorkflow } from "./workflow-executor.js";
+//
+// 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>
+//     : never;
+// }[keyof Deps];
+// type ModuleShape = Record<string, AnyWorkflow>;
+//
+// 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 FinalContext<
+//   Reg extends ActionRegistry,
+//   Context extends Record<string, any>,
+//   Deps extends ModuleMap<Reg>,
+// > = Context & ContextFromDeps<Deps>;
+//
+// type ModuleMap<Reg extends ActionRegistry> = Record<
+//   string,
+//   Module<Reg, any, any, any>
+// >;
+//
+// // 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;
+//
+// 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 Module<
+//   Reg extends ActionRegistry,
+//   Context extends Record<string, any>,
+//   Own extends ModuleShape = {},
+//   Deps extends ModuleMap<Reg> = {},
+// > = {
+//   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>[],
+//     ) => Promise<{
+//       results: WorkflowResults<W>;
+//       output: WorkflowOutput<W>;
+//       extras: Record<string, any>;
+//     }>;
+//     getContext: () => FinalContext<Reg, Context, Deps>;
+//   };
+// };
+//
+// export type ModuleContext<
+//   Reg extends ActionRegistry,
+//   Context extends Record<string, any>,
+//   Deps extends ModuleMap<Reg>,
+// > = {
+//   wf: ReturnType<typeof createWorkflow<Reg, Context>>;
+//
+//   deps: Deps;
+//   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>,
+//   Own extends ModuleShape,
+// >(config: {
+//   use?: Use;
+//   define: (ctx: ModuleContext<Reg, Context, Use>) => Own;
+// }): Module<Reg, Context, Own, Use> {
+//   const wf = createWorkflow<Reg, Context>();
+//
+//   const deps = (config.use ?? {}) as Use;
+//
+//   const moduleCtx: ModuleContext<Reg, Context, Use> = {
+//     wf,
+//     deps,
+//     context: {} as Context,
+//
+//     tools: (factory) =>
+//       factory({
+//         wf,
+//         deps,
+//         context: {} as Context,
+//       }),
+//   };
+//
+//   const own = config.define(moduleCtx);
+//
+//   return {
+//     own,
+//     deps,
+//     createRuntime({ registry, context }) {
+//       const runtimeCtx = { ...context } as FinalContext<Reg, Context, Use>;
+//       return {
+//         run: async (workflow, input, observers = []) => {
+//           return executeWorkflow(workflow, registry, input, context, observers);
+//         },
+//         getContext: () => ({ ...runtimeCtx }),
+//       };
+//     },
+//   };
+// }
+//
+// export function createModuleFactory<
+//   Reg extends ActionRegistry,
+//   Context extends Record<string, any>,
+// >() {
+//   return function <
+//     Use extends ModuleMap<Reg> = {},
+//     Own extends ModuleShape = {},
+//   >(config: {
+//     use?: Use;
+//     define: (ctx: ModuleContext<Reg, Context, Use>) => 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";
-export function createModule(config) {
+function toPublicDeps(deps) {
+    return deps;
+}
+function createModule(config) {
     const wf = createWorkflow();
     const deps = (config.use ?? {});
     const moduleCtx = {
@@ -16,7 +164,7 @@ export function createModule(config) {
     const own = config.define(moduleCtx);
     return {
         own,
-        deps,
+        deps: toPublicDeps(deps),
         createRuntime({ registry, context }) {
             const runtimeCtx = { ...context };
             return {

package/package.json

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