@getstrata/bootstrap 0.2.21 → 0.2.22

package/dist/bootstrap/discoverModules.d.ts

@@ -1,5 +1,9 @@
 import type { AppModule } from "./contracts";
-declare let appModules: AppModule[];
-declare function ensureModulesLoaded(): Promise<AppModule[]>;
+interface DiscoverModulesOptions {
+    modulesDir?: string;
+}
+declare function configureModulesDirectory(modulesDir: string): void;
+declare function ensureModulesLoaded(options?: DiscoverModulesOptions): Promise<AppModule[]>;
 declare function discoverModules(): AppModule[];
-export { appModules, discoverModules, ensureModulesLoaded };
+export type { DiscoverModulesOptions };
+export { configureModulesDirectory, discoverModules, ensureModulesLoaded };

package/dist/bootstrap/modules.d.ts

@@ -1 +1 @@
-export { appModules, discoverModules, ensureModulesLoaded } from "./discoverModules";
+export { configureModulesDirectory, discoverModules, ensureModulesLoaded, } from "./discoverModules";

package/dist/bootstrap/public-api.d.ts

@@ -12,6 +12,8 @@ export type { AppContext, AppDependencies, AppModule, AppRouteMap, CachedJson, C
 export { assertAppDependenciesComplete, getRequiredDependency, resolveService, ServiceContainer, } from "./contracts.ts";
 export { createWebRoutes, mergeWebRoutes } from "./createWebRoutes.ts";
 export { createAppDependencies } from "./dependencies.ts";
+export type { DiscoverModulesOptions } from "./discoverModules.ts";
+export { configureModulesDirectory, discoverModules, ensureModulesLoaded, } from "./discoverModules.ts";
 export { type RouteModelAuthorization, securedBindRouteModel, securedBindRouteModelByKey, } from "./http/securedRouteModelBinding.ts";
 export { createHttpKernel, type HttpKernel, type MiddlewareGroupName } from "./httpKernel.ts";
 export { resolveMembershipService } from "./membershipService.ts";

package/dist/entries/cache/modelCacheTags.js

@@ -1,8 +1,62 @@
 // @bun
 // ../../src/bootstrap/discoverModules.ts
-var appModules = [];
+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;
+  }
+  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 join(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(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;
+}
 function discoverModules() {
-  return appModules;
+  return readDiscoverModulesState().appModules;
 }
 
 // ../../src/bootstrap/cache/modelCacheTags.ts

package/dist/entries/context.js

@@ -179,9 +179,63 @@ class ConfigStore {
   }
 }
 // ../../src/bootstrap/discoverModules.ts
-var appModules = [];
+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;
+  }
+  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 join(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(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;
+}
 function discoverModules() {
-  return appModules;
+  return readDiscoverModulesState().appModules;
 }
 // ../../src/config/auth.ts
 var authConfig = {
@@ -1462,14 +1516,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 +1531,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 +1852,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 +2291,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;
@@ -3737,7 +3791,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 +3803,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 +3936,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 +4231,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/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() {
@@ -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 });
     }

package/dist/entries/dependencies.js

@@ -179,9 +179,63 @@ class ConfigStore {
   }
 }
 // ../../src/bootstrap/discoverModules.ts
-var appModules = [];
+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;
+  }
+  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 join(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(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;
+}
 function discoverModules() {
-  return appModules;
+  return readDiscoverModulesState().appModules;
 }
 // ../../src/config/auth.ts
 var authConfig = {
@@ -1462,14 +1516,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 +1531,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 +1852,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 +2291,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;
@@ -3737,7 +3791,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 +3803,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 +3936,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 +4231,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/discoverModules.js

@@ -0,0 +1,65 @@
+// @bun
+// ../../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;
+  }
+  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 join(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(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;
+}
+function discoverModules() {
+  return readDiscoverModulesState().appModules;
+}
+export {
+  ensureModulesLoaded,
+  discoverModules,
+  configureModulesDirectory
+};

package/dist/entries/providers.js

@@ -3351,9 +3351,63 @@ function resolveApplicationDependencies() {
   return requireActiveApplicationContext().dependencies;
 }
 // ../../src/bootstrap/discoverModules.ts
-var appModules = [];
+import { readdirSync as readdirSync2 } from "fs";
+import { join as join2 } from "path";
+import { pathToFileURL as pathToFileURL2 } 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 = readdirSync2(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 = pathToFileURL2(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/cache/modelCacheTags.ts
@@ -3674,7 +3728,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 {
@@ -3686,7 +3740,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);
@@ -3819,9 +3873,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 {

package/dist/index.js

@@ -583,9 +583,63 @@ function resolveApplicationDependencies() {
   return requireActiveApplicationContext().dependencies;
 }
 // ../../src/bootstrap/discoverModules.ts
-var appModules = [];
+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;
+  }
+  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 join(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(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;
+}
 function discoverModules() {
-  return appModules;
+  return readDiscoverModulesState().appModules;
 }
 
 // ../../src/bootstrap/cache/modelCacheTags.ts
@@ -1803,14 +1857,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 [];
@@ -1818,7 +1872,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;
   }));
@@ -2139,10 +2193,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) {
@@ -2555,7 +2609,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;
@@ -3917,7 +3971,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 {
@@ -3929,7 +3983,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);
@@ -4062,9 +4116,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 {
@@ -4357,7 +4411,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) {
@@ -4390,7 +4444,7 @@ function createAppContext() {
   return appContext;
 }
 // ../../src/bootstrap/createWebRoutes.ts
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 
 // ../../src/core/http/middleware.ts
 function isRouteHandler(value) {
@@ -4719,7 +4773,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;
     }
@@ -4734,7 +4788,7 @@ function createWebRoutes(dependencies) {
     registerRoute("GET", "/assets/*", ["global", "web"]);
     const pathname = new URL(request.url).pathname;
     const relativePath = pathname.replace(/^\//, "");
-    const file = Bun.file(join4(process.cwd(), "public", relativePath));
+    const file = Bun.file(join5(process.cwd(), "public", relativePath));
     if (!await file.exists()) {
       return htmlResponse("Not Found", { status: 404 });
     }
@@ -5304,6 +5358,8 @@ export {
   parseFormBody,
   mergeWebRoutes,
   getRequiredDependency,
+  ensureModulesLoaded,
+  discoverModules,
   discoverModelTableNames,
   createWebServer,
   createWebRoutes,
@@ -5313,6 +5369,7 @@ export {
   createAppDependencies,
   createAppContext,
   coreProviders,
+  configureModulesDirectory,
   collectProviders,
   cacheTagsForModelWrite,
   assertProductionSecrets,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getstrata/bootstrap",
-  "version": "0.2.21",
+  "version": "0.2.22",
   "description": "Strata application bootstrap — HttpKernel, DI, web session helpers",
   "type": "module",
   "license": "MIT",
@@ -50,6 +50,11 @@
       "import": "./dist/entries/dependencies.js",
       "default": "./dist/entries/dependencies.js"
     },
+    "./discoverModules": {
+      "types": "./dist/bootstrap/discoverModules.d.ts",
+      "import": "./dist/entries/discoverModules.js",
+      "default": "./dist/entries/discoverModules.js"
+    },
     "./http/securedRouteModelBinding": {
       "types": "./dist/bootstrap/http/securedRouteModelBinding.d.ts",
       "import": "./dist/entries/http/securedRouteModelBinding.js",
@@ -127,14 +132,14 @@
     "build:bundle": "bun build index.ts --outdir dist --target bun --external bun --external eta --external @getstrata/core",
     "build:types": "tsc -p tsconfig.types.json",
     "prepublishOnly": "bun run build",
-    "build:subpaths": "bun build entries/applicationRegistry.ts entries/cache/modelCacheTags.ts entries/config.ts entries/context.ts entries/contracts.ts entries/createWebRoutes.ts entries/dependencies.ts entries/http/securedRouteModelBinding.ts entries/httpKernel.ts entries/membershipService.ts entries/queue/defaultJobs.ts entries/providers.ts entries/providers/view.ts entries/routeRegistry.ts entries/secretsGuard.ts entries/web/forms.ts entries/web/routing.ts entries/web/server.ts entries/web/session.ts entries/web/slug.ts --outdir dist --root . --target bun --external bun --external eta --external @getstrata/core",
+    "build:subpaths": "bun build entries/applicationRegistry.ts entries/cache/modelCacheTags.ts entries/config.ts entries/context.ts entries/contracts.ts entries/createWebRoutes.ts entries/dependencies.ts entries/discoverModules.ts entries/http/securedRouteModelBinding.ts entries/httpKernel.ts entries/membershipService.ts entries/queue/defaultJobs.ts entries/providers.ts entries/providers/view.ts entries/routeRegistry.ts entries/secretsGuard.ts entries/web/forms.ts entries/web/routing.ts entries/web/server.ts entries/web/session.ts entries/web/slug.ts --outdir dist --root . --target bun --external bun --external eta --external @getstrata/core",
     "build:shims": "true"
   },
   "publishConfig": {
     "access": "public"
   },
   "peerDependencies": {
-    "@getstrata/core": "^0.5.29",
+    "@getstrata/core": "^0.5.30",
     "typescript": "^5.9.0"
   }
 }