@getstrata/bootstrap 0.2.21 → 0.2.23

package/dist/entries/context.js

@@ -1,187 +1,86 @@
 // @bun
-// ../../src/core/contracts/di.ts
-var requiredDependencyKeys = [
-  "container",
-  "cache",
-  "storage"
-];
-function getRequiredDependency(dependencies, key) {
-  const dependency = dependencies[key];
-  if (dependency === undefined) {
-    throw new Error(`Required dependency "${key}" is not registered.`);
-  }
-  return dependency;
-}
-function assertAppDependenciesComplete(dependencies) {
-  for (const key of requiredDependencyKeys) {
-    getRequiredDependency(dependencies, key);
-  }
-}
-function resolveService(dependencies, token) {
-  return dependencies.container.resolve(token);
-}
-
-// ../../src/core/contracts/serviceTokens.ts
-var CORE_CONFIG_TOKEN = "core.config";
-var CORE_CACHE_TOKEN = "core.cache";
-var CORE_QUEUE_TOKEN = "core.queue";
-var CORE_EVENT_BUS_TOKEN = "core.eventBus";
-var CORE_POLICY_GATE_TOKEN = "core.policyGate";
-var CORE_AUTH_TOKEN = "core.auth";
-var CORE_TOKEN_SERVICE_TOKEN = "core.tokenService";
+// ../../src/bootstrap/applicationRegistry.ts
+import {
+  resolveApplicationAuth,
+  resolveApplicationCache,
+  resolveApplicationConfig,
+  resolveApplicationDependencies,
+  resolveApplicationEventBus,
+  resolveApplicationLogger,
+  resolveApplicationPolicyGate,
+  resolveApplicationQueue,
+  setActiveApplicationContext
+} from "@getstrata/core/runtime/applicationRegistry.ts";
 
-// ../../src/core/logging/logger.ts
-class Logger {
-  channel;
-  constructor(channel = "app") {
-    this.channel = channel;
-  }
-  write(level, message, context = {}) {
-    const entry = {
-      level,
-      channel: this.channel,
-      message,
-      timestamp: new Date().toISOString(),
-      ...context
-    };
-    const line = JSON.stringify(entry);
-    if (level === "error") {
-      console.error(line);
-      return;
-    }
-    console.log(line);
-  }
-  debug(message, context) {
-    this.write("debug", message, context);
-  }
-  info(message, context) {
-    this.write("info", message, context);
-  }
-  warn(message, context) {
-    this.write("warn", message, context);
-  }
-  error(message, context) {
-    this.write("error", message, context);
-  }
-}
-var appLogger = new Logger("app");
+// ../../src/bootstrap/contracts.ts
+import {
+  ConfigStore,
+  ServiceContainer
+} from "@getstrata/core/contracts/container";
+import {
+  assertAppDependenciesComplete,
+  getRequiredDependency,
+  resolveService
+} from "@getstrata/core/contracts/di";
 
-// ../../src/core/runtime/applicationRegistry.ts
-var APPLICATION_CONTEXT_KEY = Symbol.for("@getstrata/applicationContext");
-var activeContext;
-function readStoredApplicationContext() {
-  if (activeContext) {
-    return activeContext;
-  }
-  const globalContext = globalThis[APPLICATION_CONTEXT_KEY];
-  if (globalContext) {
-    activeContext = globalContext;
-  }
-  return activeContext;
-}
-function setActiveApplicationContext(context) {
-  activeContext = context;
-  globalThis[APPLICATION_CONTEXT_KEY] = context;
-}
-function requireActiveApplicationContext() {
-  const context = readStoredApplicationContext();
-  if (!context) {
-    throw new Error("The application context has not been bootstrapped.");
+// ../../src/bootstrap/discoverModules.ts
+import { readdirSync } from "fs";
+import { join } from "path";
+import { pathToFileURL } from "url";
+var DISCOVER_MODULES_STATE_KEY = Symbol.for("@getstrata/discoverModulesState");
+function readDiscoverModulesState() {
+  const existing = globalThis[DISCOVER_MODULES_STATE_KEY];
+  if (existing) {
+    return existing;
   }
-  return context;
-}
-function resolveApplicationCache() {
-  return getRequiredDependency(requireActiveApplicationContext().dependencies, "cache");
-}
-function resolveApplicationQueue() {
-  return requireActiveApplicationContext().container.resolve(CORE_QUEUE_TOKEN);
-}
-function resolveApplicationEventBus() {
-  return requireActiveApplicationContext().container.resolve(CORE_EVENT_BUS_TOKEN);
-}
-function resolveApplicationAuth() {
-  return requireActiveApplicationContext().container.resolve(CORE_AUTH_TOKEN);
-}
-function resolveApplicationPolicyGate() {
-  return requireActiveApplicationContext().container.resolve(CORE_POLICY_GATE_TOKEN);
-}
-function resolveApplicationConfig() {
-  return requireActiveApplicationContext().config;
+  const state = { appModules: [] };
+  globalThis[DISCOVER_MODULES_STATE_KEY] = state;
+  return state;
 }
-function resolveApplicationLogger() {
-  return appLogger;
+function configureModulesDirectory(modulesDir) {
+  readDiscoverModulesState().configuredModulesDir = modulesDir;
 }
-function resolveApplicationDependencies() {
-  return requireActiveApplicationContext().dependencies;
-}
-// ../../src/core/contracts/container.ts
-class ServiceContainer {
-  services = new Map;
-  singletonFactories = new Map;
-  bindings = new Map;
-  set(key, value) {
-    this.singletonFactories.delete(key);
-    this.bindings.delete(key);
-    this.services.set(key, value);
-    return value;
-  }
-  singleton(key, factory) {
-    this.bindings.delete(key);
-    this.services.delete(key);
-    this.singletonFactories.set(key, factory);
-  }
-  bind(key, factory) {
-    this.singletonFactories.delete(key);
-    this.services.delete(key);
-    this.bindings.set(key, factory);
-  }
-  get(key) {
-    if (this.services.has(key)) {
-      return this.services.get(key);
-    }
-    const singletonFactory = this.singletonFactories.get(key);
-    if (singletonFactory) {
-      const value = singletonFactory(this);
-      this.services.set(key, value);
-      return value;
-    }
-    const binding = this.bindings.get(key);
-    if (binding) {
-      return binding(this);
-    }
-    throw new Error(`Service "${key}" is not registered.`);
+function resolveModulesDirectory(options) {
+  const state = readDiscoverModulesState();
+  if (options?.modulesDir) {
+    return options.modulesDir;
   }
-  resolve(key) {
-    return this.get(key);
-  }
-  has(key) {
-    return this.services.has(key) || this.singletonFactories.has(key) || this.bindings.has(key);
+  if (state.configuredModulesDir) {
+    return state.configuredModulesDir;
   }
+  return join(import.meta.dir, "../modules");
 }
-
-class ConfigStore {
-  values = new Map;
-  set(key, value) {
-    this.values.set(key, value);
-    return value;
-  }
-  get(key) {
-    return this.values.get(key);
-  }
-  require(key) {
-    if (!this.values.has(key)) {
-      throw new Error(`Config key "${key}" is not defined.`);
+async function loadDiscoveredModules(options) {
+  const modulesDirectory = resolveModulesDirectory(options);
+  let moduleNames;
+  try {
+    moduleNames = readdirSync(modulesDirectory, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name);
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      return [];
     }
-    return this.values.get(key);
+    throw error;
   }
-  has(key) {
-    return this.values.has(key);
+  const modules = await Promise.all(moduleNames.map(async (moduleName) => {
+    const moduleUrl = pathToFileURL(join(modulesDirectory, moduleName, "index.ts")).href;
+    const loaded = await import(moduleUrl);
+    return loaded.default;
+  }));
+  return modules.filter((module) => module?.name !== undefined).sort((left, right) => (left.order ?? 100) - (right.order ?? 100));
+}
+async function ensureModulesLoaded(options) {
+  const state = readDiscoverModulesState();
+  if (state.appModules.length > 0) {
+    return state.appModules;
   }
+  state.modulesReady ??= loadDiscoveredModules(options).then((modules) => {
+    state.appModules.splice(0, state.appModules.length, ...modules);
+    return state.appModules;
+  });
+  return state.modulesReady;
 }
-// ../../src/bootstrap/discoverModules.ts
-var appModules = [];
 function discoverModules() {
-  return appModules;
+  return readDiscoverModulesState().appModules;
 }
 // ../../src/config/auth.ts
 var authConfig = {
@@ -228,6 +127,15 @@ function resolveAbilitiesForRole(role) {
 }
 
 // ../../src/bootstrap/config.ts
+import {
+  CORE_AUTH_TOKEN,
+  CORE_CACHE_TOKEN,
+  CORE_CONFIG_TOKEN,
+  CORE_EVENT_BUS_TOKEN,
+  CORE_POLICY_GATE_TOKEN,
+  CORE_QUEUE_TOKEN,
+  CORE_TOKEN_SERVICE_TOKEN
+} from "@getstrata/core/contracts/serviceTokens.ts";
 var APP_PORT_CONFIG_KEY = "app.port";
 var CACHE_TTL_MS_CONFIG_KEY = "cache.ttlMs";
 var CACHE_MAX_ENTRIES_CONFIG_KEY = "cache.maxEntries";
@@ -1462,14 +1370,14 @@ var eventsProvider = {
 var events_default = eventsProvider;
 
 // ../../src/bootstrap/discoverListeners.ts
-import { readdirSync } from "fs";
-import { join } from "path";
-import { pathToFileURL } from "url";
+import { readdirSync as readdirSync2 } from "fs";
+import { join as join2 } from "path";
+import { pathToFileURL as pathToFileURL2 } from "url";
 async function loadDiscoveredListeners() {
-  const listenersDirectory = join(import.meta.dir, "../listeners");
+  const listenersDirectory = join2(import.meta.dir, "../listeners");
   let entries;
   try {
-    entries = readdirSync(listenersDirectory, { withFileTypes: true }).filter((entry) => entry.isFile() && entry.name.endsWith(".ts")).map((entry) => entry.name);
+    entries = readdirSync2(listenersDirectory, { withFileTypes: true }).filter((entry) => entry.isFile() && entry.name.endsWith(".ts")).map((entry) => entry.name);
   } catch (error) {
     if (error instanceof Error && "code" in error && error.code === "ENOENT") {
       return [];
@@ -1477,7 +1385,7 @@ async function loadDiscoveredListeners() {
     throw error;
   }
   const listeners = await Promise.all(entries.map(async (fileName) => {
-    const moduleUrl = pathToFileURL(join(listenersDirectory, fileName)).href;
+    const moduleUrl = pathToFileURL2(join2(listenersDirectory, fileName)).href;
     const loaded = await import(moduleUrl);
     return loaded.default;
   }));
@@ -1798,10 +1706,10 @@ function buildHavingClause(tableName, having, params) {
   return body.length > 0 ? ` HAVING ${body}` : "";
 }
 function buildJoinClause(joins = []) {
-  return joins.map((join2) => {
-    const joinType = join2.type === "left" ? "LEFT JOIN" : "INNER JOIN";
-    const onClause = join2.on.map(({ left, right }) => `${qualifyColumn(left.table, left.column)} = ${qualifyColumn(right.table, right.column)}`).join(" AND ");
-    return ` ${joinType} ${quoteIdentifier(join2.table)} ON ${onClause}`;
+  return joins.map((join3) => {
+    const joinType = join3.type === "left" ? "LEFT JOIN" : "INNER JOIN";
+    const onClause = join3.on.map(({ left, right }) => `${qualifyColumn(left.table, left.column)} = ${qualifyColumn(right.table, right.column)}`).join(" AND ");
+    return ` ${joinType} ${quoteIdentifier(join3.table)} ON ${onClause}`;
   }).join("");
 }
 function buildLimitClause(limit) {
@@ -2237,7 +2145,7 @@ class RepositoryQuery {
     const rightRef = parseQualifiedColumn(right);
     const table = type === "inner" ? rightRef.table : rightRef.table;
     const joins = this.queryOptions.joins ?? [];
-    const existing = joins.find((join2) => join2.table === table && join2.type === type);
+    const existing = joins.find((join3) => join3.table === table && join3.type === type);
     if (existing) {
       existing.on.push({ left: leftRef, right: rightRef });
       return this;
@@ -3713,10 +3621,92 @@ class DispatchWebhookJob extends Job {
 }
 var dispatchWebhookJob_default = DispatchWebhookJob;
 
+// ../../src/core/contracts/di.ts
+function getRequiredDependency2(dependencies, key) {
+  const dependency = dependencies[key];
+  if (dependency === undefined) {
+    throw new Error(`Required dependency "${key}" is not registered.`);
+  }
+  return dependency;
+}
+
+// ../../src/core/contracts/serviceTokens.ts
+var CORE_POLICY_GATE_TOKEN2 = "core.policyGate";
+var CORE_AUTH_TOKEN2 = "core.auth";
+
+// ../../src/core/logging/logger.ts
+class Logger {
+  channel;
+  constructor(channel = "app") {
+    this.channel = channel;
+  }
+  write(level, message, context = {}) {
+    const entry = {
+      level,
+      channel: this.channel,
+      message,
+      timestamp: new Date().toISOString(),
+      ...context
+    };
+    const line = JSON.stringify(entry);
+    if (level === "error") {
+      console.error(line);
+      return;
+    }
+    console.log(line);
+  }
+  debug(message, context) {
+    this.write("debug", message, context);
+  }
+  info(message, context) {
+    this.write("info", message, context);
+  }
+  warn(message, context) {
+    this.write("warn", message, context);
+  }
+  error(message, context) {
+    this.write("error", message, context);
+  }
+}
+var appLogger = new Logger("app");
+
+// ../../src/core/runtime/applicationRegistry.ts
+var APPLICATION_CONTEXT_KEY = Symbol.for("@getstrata/applicationContext");
+var activeContext;
+function readStoredApplicationContext() {
+  if (activeContext) {
+    return activeContext;
+  }
+  const globalContext = globalThis[APPLICATION_CONTEXT_KEY];
+  if (globalContext) {
+    activeContext = globalContext;
+  }
+  return activeContext;
+}
+function requireActiveApplicationContext() {
+  const context = readStoredApplicationContext();
+  if (!context) {
+    throw new Error("The application context has not been bootstrapped.");
+  }
+  return context;
+}
+function resolveApplicationCache2() {
+  return getRequiredDependency2(requireActiveApplicationContext().dependencies, "cache");
+}
+function resolveApplicationAuth2() {
+  return requireActiveApplicationContext().container.resolve(CORE_AUTH_TOKEN2);
+}
+function resolveApplicationPolicyGate2() {
+  return requireActiveApplicationContext().container.resolve(CORE_POLICY_GATE_TOKEN2);
+}
+function resolveApplicationDependencies2() {
+  return requireActiveApplicationContext().dependencies;
+}
+
 // ../../src/bootstrap/queue/defaultJobs.ts
 function registerDefaultJobs() {
   jobRegistry.register("cache.invalidate-tags", () => {
-    return new invalidateCacheTagsJob_default(resolveApplicationCache());
+    return new invalidateCacheTagsJob_default(resolveApplicationCache2());
   });
   jobRegistry.register("webhook.dispatch", () => new dispatchWebhookJob_default);
 }
@@ -3737,7 +3727,7 @@ var queue_default = queueProvider;
 
 // ../../src/core/storage/storage.ts
 import { mkdir, readFile, unlink, writeFile } from "fs/promises";
-import { dirname, join as join2 } from "path";
+import { dirname, join as join3 } from "path";
 var {S3Client } = globalThis.Bun;
 
 class LocalStorageDriver {
@@ -3749,7 +3739,7 @@ class LocalStorageDriver {
     return this.rootDirectory ?? process.env.STORAGE_PATH ?? "storage";
   }
   resolvePath(path) {
-    return join2(this.resolveRootDirectory(), path.replace(/^\/+/, ""));
+    return join3(this.resolveRootDirectory(), path.replace(/^\/+/, ""));
   }
   async put(path, contents) {
     const absolutePath = this.resolvePath(path);
@@ -3882,9 +3872,9 @@ function currentRequestMeta() {
 }
 
 // ../../src/core/view/etaViewEngine.ts
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 import { Eta } from "eta";
-var DEFAULT_VIEWS_DIRECTORY = join3(process.cwd(), "resources/views");
+var DEFAULT_VIEWS_DIRECTORY = join4(process.cwd(), "resources/views");
 var DEFAULT_LAYOUT = "layouts/app.eta";
 
 class EtaViewEngine {
@@ -4177,7 +4167,7 @@ function assertProductionSecrets(env = process.env) {
 }
 
 // ../../src/bootstrap/context.ts
-function collectProviders(modules = appModules) {
+function collectProviders(modules = discoverModules()) {
   return [...coreProviders, ...modules.flatMap((module) => module.providers ?? [])];
 }
 function runProviderPhase(providers, phase, context) {

package/dist/entries/contracts.js

@@ -1,89 +1,14 @@
 // @bun
-// ../../src/core/contracts/container.ts
-class ServiceContainer {
-  services = new Map;
-  singletonFactories = new Map;
-  bindings = new Map;
-  set(key, value) {
-    this.singletonFactories.delete(key);
-    this.bindings.delete(key);
-    this.services.set(key, value);
-    return value;
-  }
-  singleton(key, factory) {
-    this.bindings.delete(key);
-    this.services.delete(key);
-    this.singletonFactories.set(key, factory);
-  }
-  bind(key, factory) {
-    this.singletonFactories.delete(key);
-    this.services.delete(key);
-    this.bindings.set(key, factory);
-  }
-  get(key) {
-    if (this.services.has(key)) {
-      return this.services.get(key);
-    }
-    const singletonFactory = this.singletonFactories.get(key);
-    if (singletonFactory) {
-      const value = singletonFactory(this);
-      this.services.set(key, value);
-      return value;
-    }
-    const binding = this.bindings.get(key);
-    if (binding) {
-      return binding(this);
-    }
-    throw new Error(`Service "${key}" is not registered.`);
-  }
-  resolve(key) {
-    return this.get(key);
-  }
-  has(key) {
-    return this.services.has(key) || this.singletonFactories.has(key) || this.bindings.has(key);
-  }
-}
-
-class ConfigStore {
-  values = new Map;
-  set(key, value) {
-    this.values.set(key, value);
-    return value;
-  }
-  get(key) {
-    return this.values.get(key);
-  }
-  require(key) {
-    if (!this.values.has(key)) {
-      throw new Error(`Config key "${key}" is not defined.`);
-    }
-    return this.values.get(key);
-  }
-  has(key) {
-    return this.values.has(key);
-  }
-}
-// ../../src/core/contracts/di.ts
-var requiredDependencyKeys = [
-  "container",
-  "cache",
-  "storage"
-];
-function getRequiredDependency(dependencies, key) {
-  const dependency = dependencies[key];
-  if (dependency === undefined) {
-    throw new Error(`Required dependency "${key}" is not registered.`);
-  }
-  return dependency;
-}
-function assertAppDependenciesComplete(dependencies) {
-  for (const key of requiredDependencyKeys) {
-    getRequiredDependency(dependencies, key);
-  }
-}
-function resolveService(dependencies, token) {
-  return dependencies.container.resolve(token);
-}
+// ../../src/bootstrap/contracts.ts
+import {
+  ConfigStore,
+  ServiceContainer
+} from "@getstrata/core/contracts/container";
+import {
+  assertAppDependenciesComplete,
+  getRequiredDependency,
+  resolveService
+} from "@getstrata/core/contracts/di";
 export {
   resolveService,
   getRequiredDependency,

package/dist/entries/createWebRoutes.js

@@ -1,6 +1,6 @@
 // @bun
 // ../../src/bootstrap/createWebRoutes.ts
-import { join as join2 } from "path";
+import { join as join3 } from "path";
 
 // ../../src/config/frontend.ts
 function readFrontendMode() {
@@ -110,16 +110,16 @@ function htmlResponse(html, init = {}) {
     }
   });
 }
-// ../../src/core/contracts/serviceTokens.ts
-var CORE_CONFIG_TOKEN = "core.config";
-var CORE_CACHE_TOKEN = "core.cache";
-var CORE_QUEUE_TOKEN = "core.queue";
-var CORE_EVENT_BUS_TOKEN = "core.eventBus";
-var CORE_POLICY_GATE_TOKEN = "core.policyGate";
-var CORE_AUTH_TOKEN = "core.auth";
-var CORE_TOKEN_SERVICE_TOKEN = "core.tokenService";
-
 // ../../src/bootstrap/config.ts
+import {
+  CORE_AUTH_TOKEN,
+  CORE_CACHE_TOKEN,
+  CORE_CONFIG_TOKEN,
+  CORE_EVENT_BUS_TOKEN,
+  CORE_POLICY_GATE_TOKEN,
+  CORE_QUEUE_TOKEN,
+  CORE_TOKEN_SERVICE_TOKEN
+} from "@getstrata/core/contracts/serviceTokens.ts";
 var APP_PORT_CONFIG_KEY = "app.port";
 var CACHE_TTL_MS_CONFIG_KEY = "cache.ttlMs";
 var CACHE_MAX_ENTRIES_CONFIG_KEY = "cache.maxEntries";
@@ -908,9 +908,63 @@ function createHttpKernel(dependencies) {
 }
 
 // ../../src/bootstrap/discoverModules.ts
-var appModules = [];
+import { readdirSync } from "fs";
+import { join as join2 } from "path";
+import { pathToFileURL } from "url";
+var DISCOVER_MODULES_STATE_KEY = Symbol.for("@getstrata/discoverModulesState");
+function readDiscoverModulesState() {
+  const existing = globalThis[DISCOVER_MODULES_STATE_KEY];
+  if (existing) {
+    return existing;
+  }
+  const state = { appModules: [] };
+  globalThis[DISCOVER_MODULES_STATE_KEY] = state;
+  return state;
+}
+function configureModulesDirectory(modulesDir) {
+  readDiscoverModulesState().configuredModulesDir = modulesDir;
+}
+function resolveModulesDirectory(options) {
+  const state = readDiscoverModulesState();
+  if (options?.modulesDir) {
+    return options.modulesDir;
+  }
+  if (state.configuredModulesDir) {
+    return state.configuredModulesDir;
+  }
+  return join2(import.meta.dir, "../modules");
+}
+async function loadDiscoveredModules(options) {
+  const modulesDirectory = resolveModulesDirectory(options);
+  let moduleNames;
+  try {
+    moduleNames = readdirSync(modulesDirectory, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name);
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      return [];
+    }
+    throw error;
+  }
+  const modules = await Promise.all(moduleNames.map(async (moduleName) => {
+    const moduleUrl = pathToFileURL(join2(modulesDirectory, moduleName, "index.ts")).href;
+    const loaded = await import(moduleUrl);
+    return loaded.default;
+  }));
+  return modules.filter((module) => module?.name !== undefined).sort((left, right) => (left.order ?? 100) - (right.order ?? 100));
+}
+async function ensureModulesLoaded(options) {
+  const state = readDiscoverModulesState();
+  if (state.appModules.length > 0) {
+    return state.appModules;
+  }
+  state.modulesReady ??= loadDiscoveredModules(options).then((modules) => {
+    state.appModules.splice(0, state.appModules.length, ...modules);
+    return state.appModules;
+  });
+  return state.modulesReady;
+}
 function discoverModules() {
-  return appModules;
+  return readDiscoverModulesState().appModules;
 }
 // ../../src/bootstrap/routeRegistry.ts
 class RouteRegistry {
@@ -964,7 +1018,7 @@ function createWebRoutes(dependencies) {
     "/": () => Response.redirect("/organizations", 302)
   };
   registerRoute("GET", "/", ["global", "web"]);
-  for (const module of appModules) {
+  for (const module of discoverModules()) {
     if (!module.webRoutes) {
       continue;
     }
@@ -979,7 +1033,7 @@ function createWebRoutes(dependencies) {
     registerRoute("GET", "/assets/*", ["global", "web"]);
     const pathname = new URL(request.url).pathname;
     const relativePath = pathname.replace(/^\//, "");
-    const file = Bun.file(join2(process.cwd(), "public", relativePath));
+    const file = Bun.file(join3(process.cwd(), "public", relativePath));
     if (!await file.exists()) {
       return htmlResponse("Not Found", { status: 404 });
     }