@pogodisco/zephyr 1.5.7 → 1.5.9

package/dist/workflow-module.d.ts

@@ -6,7 +6,7 @@ type EnsureWorkflowShape<T> = {
 };
 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];
+        [K in keyof Deps[D]["__public"] & string as `${D}.${K}`]: Deps[D]["__public"][K];
     };
 }[keyof Deps & string]>>>;
 type AnyWorkflow = WorkflowDef<any, any, any, any, any>;
@@ -23,6 +23,7 @@ export type WorkflowResults<W> = W extends WorkflowDef<any, any, infer R, any, a
 export type WorkflowOutput<W> = W extends WorkflowDef<any, any, any, any, infer O> ? O : never;
 export type Module<Reg extends ActionRegistry, S extends ServiceRegistry, Own extends ModuleShape, Deps extends ModuleMap, Public extends ModuleShape = Own> = {
     workflows: Own;
+    __public: Public;
     __getExecutor: () => Executor;
     createRuntime: (config: {
         services: FinalServices<S, Deps>;

package/dist/workflow-module.js

@@ -5,7 +5,12 @@
 //   Simplify,
 //   WorkflowObserver,
 // } from "./types.js";
-// import { createWorkflow, WorkflowDef } from "./workflow-composer.js";
+// import {
+//   createWorkflow,
+//   StepDef,
+//   WorkflowBuilder,
+//   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,
@@ -15,10 +20,6 @@
 // /* ------------------------------------------------ */
 // /* 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 EnsureWorkflowShape<T> = {
 //   [K in keyof T]: T[K] extends WorkflowDef<any, any, any, any, any>
@@ -52,27 +53,9 @@
 // type ModuleShape = Record<string, AnyWorkflow>;
 // type ModuleMap = Record<string, Module<any, any, any, any>>;
 //
-// // 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 FinalServices<S extends ServiceRegistry, Deps extends ModuleMap> = S &
 //   ServicesFromDepsRecursive<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 ServicesFromDepsRecursive<Deps extends ModuleMap> = [keyof Deps] extends [
 //   never,
 // ]
@@ -107,23 +90,25 @@
 // /* MODULE RUNTIME                                   */
 // /* ------------------------------------------------ */
 //
-// type Module<
+// export type Module<
 //   Reg extends ActionRegistry,
 //   S extends ServiceRegistry,
 //   Own extends ModuleShape,
 //   Deps extends ModuleMap,
+//   Public extends ModuleShape = Own,
 // > = {
 //   workflows: Own;
 //   __getExecutor: () => Executor;
 //
 //   createRuntime: (config: { services: FinalServices<S, Deps> }) => {
-//     run: <K extends keyof WorkflowRegistry<Own, Deps>>(
+//     run: <K extends keyof Public>(
+//       // run: <K extends keyof WorkflowRegistry<Own, Deps>>(
 //       workflow: K,
-//       input: WorkflowInput<WorkflowRegistry<Own, Deps>[K]>,
+//       input: WorkflowInput<Public[K]>,
 //       observers?: WorkflowObserver<Reg>[],
 //     ) => Promise<{
 //       // results: WorkflowResults<WorkflowRegistry<Own, Deps>[K]>;
-//       output: WorkflowOutput<WorkflowRegistry<Own, Deps>[K]>;
+//       output: WorkflowOutput<Public[K]>;
 //       extras: Record<string, any>;
 //     }>;
 //
@@ -144,16 +129,28 @@
 //   services: S;
 // };
 //
+// type ExposedWorkflows<
+//   Own extends ModuleShape,
+//   Use extends ModuleMap,
+//   Expose extends Record<string, keyof DepWorkflows<Use>> | undefined,
+// > = Own &
+//   (Expose extends Record<string, keyof DepWorkflows<Use>>
+//     ? {
+//         [K in keyof Expose]: DepWorkflows<Use>[Expose[K]];
+//       }
+//     : {});
 // function createModule<
 //   Reg extends ActionRegistry,
 //   S extends ServiceRegistry,
 //   Use extends ModuleMap,
 //   Own extends ModuleShape,
+//   Expose extends Record<string, keyof DepWorkflows<Use>> | undefined,
 // >(config: {
 //   actionRegistry: Reg;
 //   use?: Use;
+//   expose?: Expose;
 //   define: (ctx: ModuleContext<Reg, DepWorkflows<Use>, S>) => Own;
-// }): Module<Reg, S, Own, Use> {
+// }): Module<Reg, S, Own, Use, ExposedWorkflows<Own, Use, Expose>> {
 //   const deps = (config.use ?? {}) as Use;
 //
 //   const wf = createWorkflow<Reg, DepWorkflows<Use>, S>();
@@ -163,17 +160,65 @@
 //     services: {} as S,
 //   });
 //
-//   function buildWorkflowMap(): WorkflowRegistry<Own, Use> {
+//   // 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]),
+//   //     ),
+//   //   );
+//   //
+//   //   const internal = { ...own, ...depWFs } as WorkflowRegistry<Own, Use>;
+//   //
+//   //   const publicMap = own;
+//   //   return { internal, publicMap };
+//   // }
+//
+//   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 } as WorkflowRegistry<Own, Use>;
+//     // const internal = { ...own, ...depWFs } as WorkflowRegistry<Own, Use>;
+//
+//     // const exposed = Object.fromEntries(
+//     //   Object.entries(config.expose ?? {}).map(([alias, key]) => [
+//     //     alias,
+//     //     internal[key], // reuse already resolved workflow
+//     //   ]),
+//     // );
+//     //
+//     const internalBase = { ...own, ...depWFs } as WorkflowRegistry<Own, Use>;
+//
+//     const exposed = {} as Record<string, AnyWorkflow>;
+//
+//     if (config.expose) {
+//       for (const alias in config.expose) {
+//         const key = config.expose[alias];
+//         exposed[alias] = internalBase[key];
+//       }
+//     }
+//     const internal = {
+//       ...internalBase,
+//       ...exposed,
+//     } as WorkflowRegistry<Own, Use> & typeof exposed;
+//     // if (config.expose) {
+//     //   for (const alias in config.expose) {
+//     //     const key = config.expose[alias];
+//     //     exposed[alias] = internal[key];
+//     //   }
+//     // }
+//
+//     const publicMap = { ...own, ...exposed } as ExposedWorkflows<
+//       Own,
+//       Use,
+//       Expose
+//     >;
+//     return { internal, publicMap };
 //   }
 //
-//   const workflowMap = buildWorkflowMap();
+//   const { internal, publicMap } = buildWorkflowMap();
 //
 //   const depsExecutors = Object.fromEntries(
 //     Object.entries(deps).map(([name, mod]) => [name, mod.__getExecutor()]),
@@ -181,7 +226,11 @@
 //
 //   const executor: Executor = {
 //     run(wfId, input, services, observers = []) {
-//       const workflow = workflowMap[wfId];
+//       if (!(wfId in publicMap)) {
+//         throw new Error(`Workflow not in public: ${wfId}`);
+//       }
+//
+//       const workflow = internal[wfId];
 //
 //       if (!workflow) {
 //         throw new Error(`Workflow not found: ${String(wfId)}`);
@@ -207,9 +256,12 @@
 //
 //       // const runtimeService = createServiceRegisty(services)
 //       return {
-//         run: async <K extends keyof WorkflowRegistry<Own, Use>>(
+//         run: async <K extends keyof typeof publicMap>(
+//           // run: async <K extends keyof WorkflowRegistry<Own, Use>>(
 //           workflowId: K,
-//           input: WorkflowInput<WorkflowRegistry<Own, Use>[K]>,
+//           input: WorkflowInput<(typeof publicMap)[K]>,
+//           // input: WorkflowInput<WorkflowRegistry<Own, Use>[K]>,
+//           // input: WorkflowInput<WorkflowRegistry<Own, Use>[K]>,
 //           observers: WorkflowObserver<Reg>[] = [],
 //         ) => {
 //           return executor.run(workflowId as string, input, services, observers);
@@ -240,48 +292,31 @@
 //     Reg extends ActionRegistry = Record<string, any>,
 //     Use extends ModuleMap = {},
 //     Own extends ModuleShape = {},
+//     Expose extends Record<string, keyof DepWorkflows<Use>> | undefined =
+//       undefined,
 //   >(config: {
 //     actionRegistry: Reg;
 //     use?: Use;
+//     expose?: Expose;
 //     define: (
 //       ctx: ModuleContext<typeof config.actionRegistry, DepWorkflows<Use>, S>,
 //     ) => Own;
-//   }): Module<Reg, S, Own, Use> {
-//     return createModule<Reg, S, Use, Own>(config);
+//   }): Module<Reg, S, Own, Use, ExposedWorkflows<Own, Use, Expose>> {
+//     return createModule<Reg, S, Use, Own, Expose>(config);
 //   };
 // }
+//
 import { createWorkflow, } from "./workflow-composer.js";
 import { executeWorkflow } from "./workflow-executor.js";
 function createModule(config) {
     const deps = (config.use ?? {});
     const wf = createWorkflow();
-    // const macro = createMacro<Reg, S, DepWorkflows<Use>>();
     const own = config.define({
         wf,
         services: {},
     });
-    // 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]),
-    //     ),
-    //   );
-    //
-    //   const internal = { ...own, ...depWFs } as WorkflowRegistry<Own, Use>;
-    //
-    //   const publicMap = own;
-    //   return { internal, publicMap };
-    // }
     function buildWorkflowMap() {
-        const depWFs = Object.fromEntries(Object.entries(deps).flatMap(([name, mod]) => Object.entries(mod.workflows).map(([k, wf]) => [`${name}.${k}`, wf])));
-        // const internal = { ...own, ...depWFs } as WorkflowRegistry<Own, Use>;
-        // const exposed = Object.fromEntries(
-        //   Object.entries(config.expose ?? {}).map(([alias, key]) => [
-        //     alias,
-        //     internal[key], // reuse already resolved workflow
-        //   ]),
-        // );
-        //
+        const depWFs = Object.fromEntries(Object.entries(deps).flatMap(([name, mod]) => Object.entries(mod.__public).map(([k, wf]) => [`${name}.${k}`, wf])));
         const internalBase = { ...own, ...depWFs };
         const exposed = {};
         if (config.expose) {
@@ -294,12 +329,6 @@ function createModule(config) {
             ...internalBase,
             ...exposed,
         };
-        // if (config.expose) {
-        //   for (const alias in config.expose) {
-        //     const key = config.expose[alias];
-        //     exposed[alias] = internal[key];
-        //   }
-        // }
         const publicMap = { ...own, ...exposed };
         return { internal, publicMap };
     }
@@ -326,26 +355,17 @@ function createModule(config) {
     };
     return {
         workflows: own,
+        __public: publicMap,
         __getExecutor: () => executor,
         createRuntime({ services }) {
             let runtimeActions = config.actionRegistry;
-            // const runtimeService = createServiceRegisty(services)
             return {
-                run: async (
-                // run: async <K extends keyof WorkflowRegistry<Own, Use>>(
-                workflowId, input, 
-                // input: WorkflowInput<WorkflowRegistry<Own, Use>[K]>,
-                // input: WorkflowInput<WorkflowRegistry<Own, Use>[K]>,
-                observers = []) => {
+                run: async (workflowId, input, 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
                 },
             };
         },

package/package.json

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