@chidchanun/bcp 0.3.1 → 0.3.2

package/packages/client/src/application.mjs

@@ -1082,6 +1082,382 @@ function withTimeout(promise, timeoutMs, label) {
   );
 }
 
+// packages/server/src/modules.ts
+var MODULE_V2_KIND = "bcp-module-v2";
+var ModuleDependencyError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "ModuleDependencyError";
+  }
+};
+var ModuleLifecycleError = class extends Error {
+  module;
+  phase;
+  cause;
+  constructor(moduleName, phase, cause) {
+    super(
+      `BCP Modules: ${phase} failed for module "${moduleName}": ${formatError(cause)}`
+    );
+    this.name = "ModuleLifecycleError";
+    this.module = moduleName;
+    this.phase = phase;
+    this.cause = cause;
+  }
+};
+function isModuleDefinition(value) {
+  return Boolean(
+    value && typeof value === "object" && value.kind === MODULE_V2_KIND
+  );
+}
+function composeModules(roots = []) {
+  const ordered = resolveModuleOrder(roots);
+  const providers = [];
+  const plugins = [];
+  const services = [];
+  const resources = [];
+  const serviceKeys = /* @__PURE__ */ new Set();
+  for (const module of ordered) {
+    providers.push(
+      ...module.providers ?? []
+    );
+    plugins.push(
+      ...module.plugins ?? []
+    );
+    resources.push(
+      ...module.resources ?? []
+    );
+    for (const entry of module.services ?? []) {
+      const [key] = entry;
+      if (serviceKeys.has(key)) {
+        throw new ModuleDependencyError(
+          `BCP Modules: duplicate shared service ${formatServiceKey(key)} while composing module "${module.name}".`
+        );
+      }
+      serviceKeys.add(key);
+      services.push(entry);
+    }
+    validateModuleExports(
+      module
+    );
+  }
+  return {
+    modules: ordered,
+    providers,
+    plugins,
+    services,
+    resources,
+    records() {
+      return ordered.map(
+        (module) => ({
+          name: module.name,
+          ...module.version ? {
+            version: module.version
+          } : {},
+          imports: (module.imports ?? []).map(
+            (dependency) => dependency.name
+          ),
+          providers: (module.providers ?? []).map(
+            (provider) => provider.token.description
+          ),
+          exports: (module.exports ?? []).map(
+            (token) => token.description
+          ),
+          plugins: (module.plugins ?? []).map(
+            (plugin) => plugin.name
+          ),
+          resources: (module.resources ?? []).map(
+            (resource) => resource.name
+          )
+        })
+      );
+    },
+    exportedTokens(moduleName) {
+      const normalized = normalizeName3(
+        moduleName,
+        "module name"
+      );
+      const module = ordered.find(
+        (entry) => entry.name === normalized
+      );
+      if (!module) {
+        throw new ModuleDependencyError(
+          `BCP Modules: module "${normalized}" is not part of this composition.`
+        );
+      }
+      return [
+        ...module.exports ?? []
+      ];
+    },
+    createLifecycleResources(context) {
+      return ordered.flatMap(
+        (module) => [
+          ...module.resources ?? [],
+          createModuleLifecycleResource(
+            module,
+            context
+          )
+        ]
+      );
+    }
+  };
+}
+function resolveModuleOrder(roots) {
+  const byName = /* @__PURE__ */ new Map();
+  const visiting = /* @__PURE__ */ new Set();
+  const visited = /* @__PURE__ */ new Set();
+  const order = [];
+  const visit = (module, path) => {
+    validateModuleDefinition(module);
+    const name = module.name;
+    const existing = byName.get(name);
+    if (existing && existing !== module) {
+      throw new ModuleDependencyError(
+        `BCP Modules: duplicate module name "${name}" refers to different definitions.`
+      );
+    }
+    byName.set(name, module);
+    if (visited.has(name)) {
+      return;
+    }
+    if (visiting.has(name)) {
+      throw new ModuleDependencyError(
+        `BCP Modules: circular module dependency detected: ${[
+          ...path,
+          name
+        ].join(" -> ")}.`
+      );
+    }
+    visiting.add(name);
+    for (const dependency of module.imports ?? []) {
+      visit(
+        dependency,
+        [
+          ...path,
+          name
+        ]
+      );
+    }
+    visiting.delete(name);
+    visited.add(name);
+    order.push(module);
+  };
+  for (const root of roots) {
+    visit(root, []);
+  }
+  return order;
+}
+function createModuleLifecycleResource(module, shared) {
+  const config = parseModuleConfig(
+    module.schema,
+    module.config
+  );
+  const context = {
+    name: module.name,
+    config,
+    container: shared.container,
+    services: shared.services,
+    hooks: shared.hooks
+  };
+  let setupComplete = false;
+  let disposed = false;
+  return {
+    name: `bcp:module:${module.name}`,
+    async start() {
+      try {
+        if (!setupComplete) {
+          await runModuleHook(
+            module,
+            "setup",
+            module.setup,
+            context
+          );
+          setupComplete = true;
+        }
+        await runModuleHook(
+          module,
+          "start",
+          module.start,
+          context
+        );
+      } catch (error) {
+        if (!disposed) {
+          disposed = true;
+          try {
+            await runModuleHook(
+              module,
+              "dispose",
+              module.dispose,
+              context
+            );
+          } catch (disposeError) {
+            throw new AggregateError(
+              [
+                error,
+                disposeError
+              ],
+              `BCP Modules: startup and cleanup failed for module "${module.name}".`
+            );
+          }
+        }
+        throw error;
+      }
+    },
+    ready() {
+      return true;
+    },
+    async stop() {
+      const errors = [];
+      try {
+        await runModuleHook(
+          module,
+          "stop",
+          module.stop,
+          context
+        );
+      } catch (error) {
+        errors.push(error);
+      }
+      if (!disposed) {
+        disposed = true;
+        try {
+          await runModuleHook(
+            module,
+            "dispose",
+            module.dispose,
+            context
+          );
+        } catch (error) {
+          errors.push(error);
+        }
+      }
+      if (errors.length > 0) {
+        throw new AggregateError(
+          errors,
+          `BCP Modules: shutdown failed for module "${module.name}".`
+        );
+      }
+    },
+    diagnostics() {
+      return {
+        name: module.name,
+        ...module.version ? {
+          version: module.version
+        } : {},
+        imports: (module.imports ?? []).map(
+          (dependency) => dependency.name
+        ),
+        exports: (module.exports ?? []).map(
+          (token) => token.description
+        )
+      };
+    }
+  };
+}
+async function runModuleHook(module, phase, hook, context) {
+  if (!hook) {
+    return;
+  }
+  try {
+    await hook(context);
+  } catch (error) {
+    throw new ModuleLifecycleError(
+      module.name,
+      phase,
+      error
+    );
+  }
+}
+function validateModuleDefinition(module) {
+  if (!module || typeof module !== "object") {
+    throw new TypeError(
+      "BCP Modules: module must be an object."
+    );
+  }
+  if (module.kind !== MODULE_V2_KIND) {
+    throw new TypeError(
+      `BCP Modules: module kind must be "${MODULE_V2_KIND}". Use defineModule().`
+    );
+  }
+  normalizeName3(
+    module.name,
+    "module name"
+  );
+  for (const [label, value] of [
+    ["imports", module.imports],
+    ["providers", module.providers],
+    ["exports", module.exports],
+    ["plugins", module.plugins],
+    ["resources", module.resources]
+  ]) {
+    if (value !== void 0 && !Array.isArray(value)) {
+      throw new TypeError(
+        `BCP Modules: ${label} must be an array.`
+      );
+    }
+  }
+  for (const [phase, hook] of [
+    ["setup", module.setup],
+    ["start", module.start],
+    ["stop", module.stop],
+    ["dispose", module.dispose]
+  ]) {
+    if (hook !== void 0 && typeof hook !== "function") {
+      throw new TypeError(
+        `BCP Modules: ${phase} must be a function.`
+      );
+    }
+  }
+}
+function validateModuleExports(module) {
+  const available = /* @__PURE__ */ new Set();
+  for (const provider of module.providers ?? []) {
+    available.add(
+      provider.token.id
+    );
+  }
+  for (const dependency of module.imports ?? []) {
+    for (const token of dependency.exports ?? []) {
+      available.add(token.id);
+    }
+  }
+  for (const token of module.exports ?? []) {
+    if (!available.has(token.id)) {
+      throw new ModuleDependencyError(
+        `BCP Modules: module "${module.name}" exports "${token.description}" but does not provide or import it.`
+      );
+    }
+  }
+}
+function parseModuleConfig(parser, value) {
+  if (!parser) {
+    return value;
+  }
+  if (typeof parser === "function") {
+    return parser(value);
+  }
+  return parser.parse(value);
+}
+function normalizeName3(value, label) {
+  if (typeof value !== "string") {
+    throw new TypeError(
+      `BCP Modules: ${label} must be a string.`
+    );
+  }
+  const normalized = value.trim();
+  if (!normalized) {
+    throw new TypeError(
+      `BCP Modules: ${label} cannot be empty.`
+    );
+  }
+  return normalized;
+}
+function formatServiceKey(key) {
+  return typeof key === "symbol" ? key.description ? `Symbol(${key.description})` : key.toString() : key;
+}
+function formatError(value) {
+  return value instanceof Error ? value.message : String(value);
+}
+
 // packages/server/src/plugins.ts
 var PluginDependencyError = class extends Error {
   constructor(message) {
@@ -1095,7 +1471,7 @@ var PluginLifecycleError = class extends Error {
   cause;
   constructor(plugin, phase, cause) {
     super(
-      `BCP Plugins: ${phase} failed for plugin "${plugin}": ${formatError(cause)}`
+      `BCP Plugins: ${phase} failed for plugin "${plugin}": ${formatError2(cause)}`
     );
     this.name = "PluginLifecycleError";
     this.plugin = plugin;
@@ -1109,7 +1485,7 @@ function defineModule(module) {
       "BCP Plugins: module must be an object."
     );
   }
-  normalizeName3(
+  normalizeName4(
     module.name,
     "module name"
   );
@@ -1130,7 +1506,7 @@ function createPluginServiceRegistry(initial) {
       assertServiceKey(key);
       if (values.has(key)) {
         throw new Error(
-          `BCP Plugins: duplicate initial service ${formatServiceKey(key)}.`
+          `BCP Plugins: duplicate initial service ${formatServiceKey2(key)}.`
         );
       }
       values.set(key, value);
@@ -1141,7 +1517,7 @@ function createPluginServiceRegistry(initial) {
       assertServiceKey(key);
       if (values.has(key) && !options.replace) {
         throw new Error(
-          `BCP Plugins: service ${formatServiceKey(key)} is already registered.`
+          `BCP Plugins: service ${formatServiceKey2(key)} is already registered.`
         );
       }
       values.set(key, value);
@@ -1150,7 +1526,7 @@ function createPluginServiceRegistry(initial) {
       assertServiceKey(key);
       if (!values.has(key)) {
         throw new Error(
-          `BCP Plugins: service ${formatServiceKey(key)} is not registered.`
+          `BCP Plugins: service ${formatServiceKey2(key)} is not registered.`
         );
       }
       return values.get(key);
@@ -1179,7 +1555,7 @@ function createPluginHookBus() {
   const hooks = /* @__PURE__ */ new Map();
   const bus = {
     on(name, handler) {
-      const normalized = normalizeName3(
+      const normalized = normalizeName4(
         name,
         "hook name"
       );
@@ -1209,7 +1585,7 @@ function createPluginHookBus() {
       };
     },
     async emit(name, payload) {
-      const normalized = normalizeName3(
+      const normalized = normalizeName4(
         name,
         "hook name"
       );
@@ -1225,7 +1601,7 @@ function createPluginHookBus() {
     },
     listenerCount(name) {
       return hooks.get(
-        normalizeName3(
+        normalizeName4(
           name,
           "hook name"
         )
@@ -1237,7 +1613,7 @@ function createPluginHookBus() {
         return;
       }
       hooks.delete(
-        normalizeName3(
+        normalizeName4(
           name,
           "hook name"
         )
@@ -1470,7 +1846,7 @@ function createPluginHost(options = {}) {
     },
     plugin(name) {
       const entry = entries.get(
-        normalizeName3(
+        normalizeName4(
           name,
           "plugin name"
         )
@@ -1504,7 +1880,7 @@ function createPluginHost(options = {}) {
     validatePluginDefinition(
       definition
     );
-    const name = normalizeName3(
+    const name = normalizeName4(
       definition.name,
       "plugin name"
     );
@@ -1721,7 +2097,7 @@ function validatePluginDefinition(definition) {
       "BCP Plugins: plugin definition must be an object."
     );
   }
-  const name = normalizeName3(
+  const name = normalizeName4(
     definition.name,
     "plugin name"
   );
@@ -1764,7 +2140,7 @@ function normalizeDependencyList(value, plugin, field) {
     );
   }
   const normalized = value.map(
-    (item) => normalizeName3(
+    (item) => normalizeName4(
       item,
       `${field} dependency`
     )
@@ -1805,7 +2181,7 @@ function requireContext(entry) {
 }
 function markFailed(entry, error) {
   entry.record.state = "failed";
-  entry.record.error = formatError(error);
+  entry.record.error = formatError2(error);
 }
 function cloneRecord(record) {
   return {
@@ -1825,7 +2201,7 @@ function isPluginModule(value) {
     )
   );
 }
-function normalizeName3(value, field) {
+function normalizeName4(value, field) {
   const text = String(value ?? "").trim();
   if (!text) {
     throw new TypeError(
@@ -1843,14 +2219,14 @@ function normalizeOptionalVersion(value) {
   if (value === void 0) {
     return void 0;
   }
-  return normalizeName3(
+  return normalizeName4(
     value,
     "plugin version"
   );
 }
 function assertServiceKey(key) {
   if (typeof key === "string") {
-    normalizeName3(
+    normalizeName4(
       key,
       "service key"
     );
@@ -1862,10 +2238,10 @@ function assertServiceKey(key) {
     );
   }
 }
-function formatServiceKey(key) {
+function formatServiceKey2(key) {
   return typeof key === "symbol" ? String(key) : `"${key}"`;
 }
-function formatError(error) {
+function formatError2(error) {
   if (error instanceof Error) {
     return error.message || error.name;
   }
@@ -1889,7 +2265,7 @@ var ApplicationLifecycleError = class extends Error {
   cause;
   constructor(phase, cause) {
     super(
-      `BCP Application: ${phase} failed: ${formatError2(cause)}`
+      `BCP Application: ${phase} failed: ${formatError3(cause)}`
     );
     this.name = "ApplicationLifecycleError";
     this.phase = phase;
@@ -1902,7 +2278,7 @@ function defineApp(definition) {
 }
 function createApp(definition) {
   defineApp(definition);
-  const name = normalizeName4(
+  const name = normalizeName5(
     definition.name,
     "application name"
   );
@@ -1913,15 +2289,33 @@ function createApp(definition) {
     definition.schema,
     definition.config
   );
+  const moduleInputs = definition.modules ?? [];
+  const modules = composeModules(
+    moduleInputs.filter(
+      isModuleDefinition
+    )
+  );
+  const legacyModules = moduleInputs.filter(
+    (module) => !isModuleDefinition(module)
+  );
   const container = createServiceContainer({
     name: `${name}:container`,
-    providers: definition.providers
+    providers: [
+      ...modules.providers,
+      ...definition.providers ?? []
+    ]
   });
   const plugins = createPluginHost({
-    plugins: definition.plugins,
-    modules: definition.modules,
+    plugins: [
+      ...modules.plugins,
+      ...definition.plugins ?? []
+    ],
+    modules: legacyModules,
     configs: definition.pluginConfigs,
-    services: definition.services
+    services: [
+      ...modules.services,
+      ...definition.services ?? []
+    ]
   });
   const deployment = createDeploymentRuntime({
     ...definition.deployment ?? {},
@@ -1944,6 +2338,7 @@ function createApp(definition) {
     } : {},
     config,
     container,
+    modules,
     services: plugins.services,
     hooks: plugins.hooks,
     plugins,
@@ -1999,6 +2394,13 @@ function createApp(definition) {
       };
     }
   });
+  for (const resource of modules.createLifecycleResources({
+    container,
+    services: plugins.services,
+    hooks: plugins.hooks
+  })) {
+    deployment.addResource(resource);
+  }
   for (const resource of definition.resources ?? []) {
     deployment.addResource(resource);
   }
@@ -2010,6 +2412,7 @@ function createApp(definition) {
     config,
     context,
     container,
+    modules,
     services: plugins.services,
     hooks: plugins.hooks,
     plugins,
@@ -2272,11 +2675,12 @@ function createApp(definition) {
           } : {},
           state,
           services: plugins.services.keys().map(
-            formatServiceKey2
+            formatServiceKey3
           ),
           containerProviders: container.graph().map(
             (node) => node.description
           ),
+          modules: modules.records(),
           pluginCount: plugins.plugins().length
         };
       }
@@ -2358,7 +2762,7 @@ function validateDefinition(definition) {
       "BCP Application: definition must be an object."
     );
   }
-  normalizeName4(
+  normalizeName5(
     definition.name,
     "application name"
   );
@@ -2398,7 +2802,7 @@ function validateDefinition(definition) {
     }
   }
 }
-function normalizeName4(value, label) {
+function normalizeName5(value, label) {
   if (typeof value !== "string") {
     throw new TypeError(
       `BCP Application: ${label} must be a string.`
@@ -2423,10 +2827,10 @@ function normalizeOptionalText2(value) {
   }
   return value.trim() || void 0;
 }
-function formatServiceKey2(key) {
+function formatServiceKey3(key) {
   return typeof key === "symbol" ? key.description ? `Symbol(${key.description})` : key.toString() : key;
 }
-function formatError2(value) {
+function formatError3(value) {
   if (value instanceof Error) {
     return value.message;
   }