@geekmidas/cli 9.0.2 → 10.0.0-alpha.1

package/dist/{openapi-BzNOC7_i.cjs → openapi-CljONd_M.cjs}

@@ -1,81 +1,13 @@
 const require_chunk = require('./chunk-CUT6urMc.cjs');
-const require_config = require('./config-DujV8DbR.cjs');
+const require_discover = require('./discover-DTmFeloL.cjs');
+const require_config = require('./config-DbPE1KXF.cjs');
 const node_path = require_chunk.__toESM(require("node:path"));
 const node_fs_promises = require_chunk.__toESM(require("node:fs/promises"));
 const node_child_process = require_chunk.__toESM(require("node:child_process"));
-const fast_glob = require_chunk.__toESM(require("fast-glob"));
-const lodash_kebabcase = require_chunk.__toESM(require("lodash.kebabcase"));
 const __geekmidas_constructs_endpoints = require_chunk.__toESM(require("@geekmidas/constructs/endpoints"));
 const node_url = require_chunk.__toESM(require("node:url"));
 const __geekmidas_schema_conversion = require_chunk.__toESM(require("@geekmidas/schema/conversion"));
 
-//#region src/types.ts
-function isPartitionedRoutes(routes) {
-	return typeof routes === "object" && routes !== null && !Array.isArray(routes) && "paths" in routes;
-}
-
-//#endregion
-//#region src/generators/Generator.ts
-/**
-* Zod v4 maintains a process-wide registry of schemas registered via
-* `.meta({ id })`. When we cache-bust user module imports (by appending a
-* `?t=timestamp` query), those modules re-execute and try to register the
-* same ids again, which throws `ID X already exists in the registry`.
-*
-* Clearing the registry in the CLI process is safe: the user's running
-* server lives in a subprocess and has its own isolated registry.
-*
-* Exported for tests.
-*/
-function clearZodGlobalRegistry() {
-	const registry = globalThis.__zod_globalRegistry;
-	if (registry && typeof registry.clear === "function") registry.clear();
-}
-var ConstructGenerator = class {
-	static async build(context, outputDir, generator, patterns, options) {
-		const constructs = await generator.load(patterns);
-		return generator.build(context, constructs, outputDir, options);
-	}
-	async load(patterns, cwd = process.cwd(), bustCache = false) {
-		const logger = console;
-		let globPatterns;
-		let partitionFn;
-		if (isPartitionedRoutes(patterns)) {
-			globPatterns = Array.isArray(patterns.paths) ? patterns.paths : [patterns.paths];
-			partitionFn = patterns.partition;
-		} else globPatterns = Array.isArray(patterns) ? patterns : patterns ? [patterns] : [];
-		const files = fast_glob.default.stream(globPatterns, {
-			cwd,
-			absolute: true
-		});
-		if (bustCache) clearZodGlobalRegistry();
-		const constructs = [];
-		for await (const f of files) try {
-			const file = f.toString();
-			const importPath = bustCache ? `${file}?t=${Date.now()}` : file;
-			const module$1 = await import(importPath);
-			const partition = partitionFn ? partitionFn(file) : void 0;
-			for (const [key, construct] of Object.entries(module$1)) if (this.isConstruct(construct)) constructs.push({
-				key,
-				name: (0, lodash_kebabcase.default)(key),
-				construct,
-				path: {
-					absolute: file,
-					relative: (0, node_path.relative)(process.cwd(), file)
-				},
-				partition
-			});
-		} catch (error) {
-			const err = error;
-			logger.error(`Failed to load ${f}: ${err.message}`);
-			if (err.stack) logger.error(err.stack);
-			throw error;
-		}
-		return constructs;
-	}
-};
-
-//#endregion
 //#region src/build/endpoint-analyzer.ts
 /**
 * Analyze an endpoint to extract its features
@@ -657,7 +589,95 @@ export async function setupEndpoints(
 
 //#endregion
 //#region src/generators/EndpointGenerator.ts
-var EndpointGenerator = class extends ConstructGenerator {
+/**
+* How a generated entry gets its logger and environment parser.
+*
+* From the surface it serves, when there is one: the surface holds both as
+* *objects*, and discovery already recorded which module declares it, so the
+* entry imports that module and reads them off it.
+*
+* The alternative — the shape this replaces — was naming both in config as
+* module paths, `envParser: './config/env#envParser'`, and printing an import
+* for each. Two strings per app, checked by nothing, describing files the
+* surface was already holding the contents of.
+*
+* Falls back to the configured paths for an app that declares no surface.
+*/
+function runtimeFor(context, fromDir) {
+	const module$1 = context.surface?.module;
+	if (module$1) {
+		const specifier = importSpecifier(fromDir, module$1.specifier);
+		return {
+			imports: `import { ${module$1.exportName} as __surface } from '${specifier}';`,
+			bindings: [
+				"// What this surface was declared with. Objects, not module paths:",
+				"// the entry imports the surface, so there is nothing to print.",
+				"const envParser = __surface.envParser;",
+				"const logger = __surface.logger;"
+			].join("\n")
+		};
+	}
+	return {
+		imports: [`import ${context.envParserImportPattern} from '${importSpecifier(fromDir, context.envParserPath)}';`, `import ${context.loggerImportPattern} from '${importSpecifier(fromDir, context.loggerPath)}';`].join("\n"),
+		bindings: ""
+	};
+}
+/** A relative specifier ESM will accept: always prefixed, never bare. */
+function importSpecifier(fromDir, target) {
+	const rel = (0, node_path.relative)(fromDir, target).replace(/\.ts$/, ".js");
+	return rel.startsWith(".") ? rel : `./${rel}`;
+}
+/**
+* CORS for a surface, derived rather than hand-written.
+*
+* Who may call a surface is already in the graph — every construct that
+* declared an edge to it — and reaches the process as one comma-separated
+* value. An application that maintained this by hand maintained a list that was
+* wrong in two directions at once: it trusted origins nothing was serving, and
+* it could not name hosts a deploy had not chosen yet.
+*
+* Only the parts a graph cannot answer are configurable, and every one has a
+* default: a surface that says nothing about CORS still gets it.
+*/
+function corsFor(surface) {
+	if (!surface) return {
+		imports: "",
+		setup: ""
+	};
+	const cors = surface.cors ?? {};
+	const allowHeaders = [
+		"content-type",
+		"authorization",
+		...cors.allowHeaders ?? []
+	];
+	return {
+		imports: `import { cors } from 'hono/cors';`,
+		setup: `
+  // Who may call ${surface.id}, read off the graph rather than listed here.
+  {
+    const { origins } = envParser
+      .create((get) => ({
+        origins: get('${surface.trustedOriginsKey}')
+          .string()
+          .default('')
+          .transform((value: string) =>
+            value.split(',').map((origin) => origin.trim()).filter(Boolean),
+          ),
+      }))
+      .parse();
+
+    honoApp.use('*', cors({
+      origin: origins,
+      allowMethods: ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS'],
+      allowHeaders: ${JSON.stringify(allowHeaders)},${cors.exposeHeaders ? `\n      exposeHeaders: ${JSON.stringify(cors.exposeHeaders)},` : ""}
+      credentials: ${cors.credentials ?? true},
+      maxAge: ${cors.maxAge ?? 86400},
+    }));
+  }
+`
+	};
+}
+var EndpointGenerator = class extends require_discover.ConstructGenerator {
 	isConstruct(value) {
 		return __geekmidas_constructs_endpoints.Endpoint.isEndpoint(value);
 	}
@@ -689,6 +709,7 @@ var EndpointGenerator = class extends ConstructGenerator {
 					timeout: construct.timeout,
 					memorySize: construct.memorySize,
 					environment: await construct.getEnvironment({ markOptional: context.markOptional }),
+					dependencies: construct.constructs,
 					authorizer: construct.authorizer?.name ?? "none"
 				};
 				routes.push(routeInfo);
@@ -703,6 +724,7 @@ var EndpointGenerator = class extends ConstructGenerator {
 				timeout: construct.timeout,
 				memorySize: construct.memorySize,
 				environment: await construct.getEnvironment({ markOptional: context.markOptional }),
+				dependencies: construct.constructs,
 				authorizer: construct.authorizer?.name ?? "none"
 			};
 			routes.push(routeInfo);
@@ -715,14 +737,13 @@ var EndpointGenerator = class extends ConstructGenerator {
 		const handlerPath = (0, node_path.join)(outputDir, handlerFileName);
 		const relativePath = (0, node_path.relative)((0, node_path.dirname)(handlerPath), sourceFile);
 		const importPath = relativePath.replace(/\.ts$/, ".js");
-		const relativeEnvParserPath = (0, node_path.relative)((0, node_path.dirname)(handlerPath), context.envParserPath);
 		let content;
 		switch (provider) {
 			case "aws-apigatewayv1":
-				content = this.generateAWSApiGatewayV1Handler(importPath, exportName, relativeEnvParserPath, context.envParserImportPattern);
+				content = this.generateAWSApiGatewayV1Handler(importPath, exportName, context.storageDrivers);
 				break;
 			case "aws-apigatewayv2":
-				content = this.generateAWSApiGatewayV2Handler(importPath, exportName, relativeEnvParserPath, context.envParserImportPattern);
+				content = this.generateAWSApiGatewayV2Handler(importPath, exportName, context.storageDrivers);
 				break;
 			case "server":
 				content = this.generateServerHandler(importPath, exportName);
@@ -832,15 +853,17 @@ export async function setupEndpoints(
 		if (context.production?.enabled) return this.generateProductionAppFile(outputDir, context);
 		const appFileName = "app.ts";
 		const appPath = (0, node_path.join)(outputDir, appFileName);
-		const relativeLoggerPath = (0, node_path.relative)((0, node_path.dirname)(appPath), context.loggerPath);
-		const relativeEnvParserPath = (0, node_path.relative)((0, node_path.dirname)(appPath), context.envParserPath);
+		const runtime = runtimeFor(context, (0, node_path.dirname)(appPath));
 		const telescopeEnabled = context.telescope?.enabled;
 		const telescopeWebSocketEnabled = context.telescope?.websocket;
 		const usesExternalTelescope = !!context.telescope?.telescopePath;
 		const studioEnabled = context.studio?.enabled;
 		const usesExternalStudio = !!context.studio?.studioPath;
+		const studioFromDatabase = !usesExternalStudio && !!context.studio?.database;
+		const telescopeFromSurface = !!context.surface?.module && !usesExternalTelescope;
 		let telescopeImports = "";
-		if (telescopeEnabled) if (usesExternalTelescope) {
+		if (telescopeEnabled) if (telescopeFromSurface) telescopeImports = "import { createMiddleware, createUI } from '@geekmidas/telescope/hono';";
+		else if (usesExternalTelescope) {
 			const relativeTelescopePath = (0, node_path.relative)((0, node_path.dirname)(appPath), context.telescope?.telescopePath);
 			telescopeImports = `import ${context.telescope?.telescopeImportPattern} from '${relativeTelescopePath}';
 import { createMiddleware, createUI } from '@geekmidas/telescope/hono';`;
@@ -851,8 +874,14 @@ import { createMiddleware, createUI } from '@geekmidas/telescope/hono';`;
 			const relativeStudioPath = (0, node_path.relative)((0, node_path.dirname)(appPath), context.studio?.studioPath);
 			studioImports = `import ${context.studio?.studioImportPattern} from '${relativeStudioPath}';
 import { createStudioApp } from '@geekmidas/studio/server/hono';`;
-		} else studioImports = `// Studio requires a configured instance - use studio config path
-// import { createStudioApp } from '@geekmidas/studio/server/hono';`;
+		} else if (studioFromDatabase) {
+			const dbSpecifier = importSpecifier((0, node_path.dirname)(appPath), context.studio.database.specifier);
+			studioImports = `import { snifferContext } from '@geekmidas/constructs';
+import { Direction, InMemoryMonitoringStorage, Studio } from '@geekmidas/studio';
+import { ${context.studio.database.exportName} as __studioDb } from '${dbSpecifier}';
+import { createStudioApp } from '@geekmidas/studio/server/hono';`;
+		} else studioImports = "";
+		const cors = corsFor(context.surface);
 		let hooksImports = "";
 		let beforeSetupCall = "";
 		let afterSetupCall = "";
@@ -904,7 +933,7 @@ import { createStudioApp } from '@geekmidas/studio/server/hono';`;
   }
 ` : "";
 		let telescopeSetup = "";
-		if (telescopeEnabled) if (usesExternalTelescope) telescopeSetup = `
+		if (telescopeEnabled) if (telescopeFromSurface || usesExternalTelescope) telescopeSetup = `
 ${telescopeWebSocketSetupCode}
   // Add telescope middleware (before endpoints to capture all requests)
   honoApp.use('*', createMiddleware(telescope));
@@ -932,7 +961,22 @@ ${telescopeWebSocketSetupCode}
   honoApp.route('${context.telescope?.path}', telescopeUI);
 `;
 		let studioSetup = "";
-		if (studioEnabled && usesExternalStudio) studioSetup = `
+		if (studioEnabled && studioFromDatabase) studioSetup = `
+  // Studio, built from the declared database. The client comes from the
+  // construct, so what you inspect is by definition what the handlers write to.
+  const studio = new Studio({
+    monitoring: { storage: new InMemoryMonitoringStorage({ maxEntries: 100 }) },
+    data: {
+      db: await __studioDb.service.register({ envParser, context: snifferContext }),
+      cursor: { field: 'id', direction: Direction.Desc },
+    },
+    enabled: true,
+  });
+
+  const studioApp = createStudioApp(studio);
+  honoApp.route('${context.studio?.path}', studioApp);
+`;
+		else if (studioEnabled && usesExternalStudio) studioSetup = `
   // Mount Studio data browser UI
   const studioApp = createStudioApp(studio);
   honoApp.route('${context.studio?.path}', studioApp);
@@ -949,12 +993,21 @@ import type { Hono as HonoType } from 'hono';
 import { setupEndpoints } from './endpoints.js';
 import { setupSubscribers } from './subscribers.js';
 import { setupQueues } from './queues.js';
-import ${context.envParserImportPattern} from '${relativeEnvParserPath}';
-import ${context.loggerImportPattern} from '${relativeLoggerPath}';
+${runtime.imports}
 ${telescopeImports}
 ${studioImports}
 ${hooksImports}
+${cors.imports}
+${context.storageDrivers?.imports ?? ""}
 
+${runtime.bindings}
+${telescopeFromSurface ? "const telescope = __surface.telescope;" : ""}
+
+${context.storageDrivers?.setup ? `// Which storage drivers exist is the entry point's decision: the scheme in
+// each injected URL picks one, so no construct and no application module names
+// a provider.
+${context.storageDrivers.setup}
+` : ""}
 export interface ServerApp {
   app: HonoType;
   start: (options?: {
@@ -999,7 +1052,7 @@ export interface ServerApp {
  */
 export async function createApp(app?: HonoType, enableOpenApi: boolean = true): Promise<ServerApp> {
   const honoApp = app || new Hono();
-${telescopeSetup}${beforeSetupCall}${studioSetup}
+${telescopeSetup}${cors.setup}${beforeSetupCall}${studioSetup}
   // Setup HTTP endpoints
   await setupEndpoints(honoApp, envParser, logger, enableOpenApi);
 ${afterSetupCall}
@@ -1043,22 +1096,42 @@ export default createApp;
 		await (0, node_fs_promises.writeFile)(appPath, content);
 		return appPath;
 	}
-	generateAWSApiGatewayV1Handler(importPath, exportName, envParserPath, envParserImportPattern) {
+	/**
+	* One Lambda, one endpoint — and no environment import.
+	*
+	* The endpoint was built from its surface, so it carries the parser the
+	* adaptor needs. This used to read
+	* `import { envParser } from '../../config/env'`, a line the build wrote
+	* because a generator can print a module specifier and cannot print an
+	* object. Nothing has to be printed now, which is also why nothing has to be
+	* named in config.
+	*/
+	generateAWSApiGatewayV1Handler(importPath, exportName, drivers) {
 		return `import { AmazonApiGatewayV1Endpoint } from '@geekmidas/constructs/aws';
 import { ${exportName} } from '${importPath}';
-import ${envParserImportPattern} from '${envParserPath}';
-
-const adapter = new AmazonApiGatewayV1Endpoint(envParser, ${exportName});
+${drivers?.imports ?? ""}
+${drivers?.setup ? `\n// The handler registers the drivers its target needs.\n${drivers.setup}\n` : ""}
+const adapter = new AmazonApiGatewayV1Endpoint(${exportName});
 
 export const handler = adapter.handler;
 `;
 	}
-	generateAWSApiGatewayV2Handler(importPath, exportName, envParserPath, envParserImportPattern) {
+	/**
+	* One Lambda, one endpoint — and no environment import.
+	*
+	* The endpoint was built from its surface, so it carries the parser the
+	* adaptor needs. This used to read
+	* `import { envParser } from '../../config/env'`, a line the build wrote
+	* because a generator can print a module specifier and cannot print an
+	* object. Nothing has to be printed now, which is also why nothing has to be
+	* named in config.
+	*/
+	generateAWSApiGatewayV2Handler(importPath, exportName, drivers) {
 		return `import { AmazonApiGatewayV2Endpoint } from '@geekmidas/constructs/aws';
 import { ${exportName} } from '${importPath}';
-import ${envParserImportPattern} from '${envParserPath}';
-
-const adapter = new AmazonApiGatewayV2Endpoint(envParser, ${exportName});
+${drivers?.imports ?? ""}
+${drivers?.setup ? `\n// The handler registers the drivers its target needs.\n${drivers.setup}\n` : ""}
+const adapter = new AmazonApiGatewayV2Endpoint(${exportName});
 
 export const handler = adapter.handler;
 `;
@@ -1084,6 +1157,7 @@ export const handler = ${exportName};
 		const enableGracefulShutdown = production.gracefulShutdown;
 		const enableOpenApi = production.openapi;
 		const includeSubscribers = production.subscribers === "include";
+		const cors = corsFor(context.surface);
 		let hooksImports = "";
 		let beforeSetupCall = "";
 		let afterSetupCall = "";
@@ -1148,7 +1222,12 @@ ${subscriberImport}
 import ${context.envParserImportPattern} from '${relativeEnvParserPath}';
 import ${context.loggerImportPattern} from '${relativeLoggerPath}';
 ${hooksImports}
+${cors.imports}
+${context.storageDrivers?.imports ?? ""}
 
+${context.storageDrivers?.setup ? `// The entry point registers the drivers its target needs.
+${context.storageDrivers.setup}
+` : ""}
 export interface ServerApp {
   app: HonoType;
   start: (options?: {
@@ -1166,7 +1245,7 @@ export async function createApp(app?: HonoType): Promise<ServerApp> {
   // Health check endpoint (always first)
   honoApp.get('${healthCheckPath}', (c) => c.json({ status: 'ok', timestamp: Date.now() }));
   honoApp.get('/ready', (c) => c.json({ ready: true }));
-${beforeSetupCall}
+${cors.setup}${beforeSetupCall}
   // Setup HTTP endpoints (OpenAPI: ${enableOpenApi})
   await setupEndpoints(honoApp, envParser, logger, ${enableOpenApi});
 ${afterSetupCall}
@@ -1733,7 +1812,7 @@ ${createApiSection}
 */
 function normalizeRoutes(routes) {
 	if (!routes) return [];
-	if (isPartitionedRoutes(routes)) return Array.isArray(routes.paths) ? routes.paths : [routes.paths];
+	if (require_discover.isPartitionedRoutes(routes)) return Array.isArray(routes.paths) ? routes.paths : [routes.paths];
 	return Array.isArray(routes) ? routes : [routes];
 }
 
@@ -1803,7 +1882,7 @@ async function openapiCommand(options = {}) {
 		} else {
 			const { workspace } = loadedConfig;
 			const workspaceRoot = workspace.root;
-			const backendApps = Object.entries(workspace.apps).filter(([_, app]) => app.type === "backend" && (app.openapi === true || typeof app.openapi === "object" && app.openapi.enabled !== false));
+			const backendApps = Object.entries(workspace.apps).filter(([_, app]) => app.type === "backend" && app.routes !== void 0 && app.openapi !== false && (typeof app.openapi !== "object" || app.openapi.enabled !== false));
 			if (backendApps.length === 0) {
 				logger.log("No backend apps with OpenAPI enabled found");
 				return;
@@ -1880,12 +1959,6 @@ async function runOpenApiInSubprocess(appCwd, appName) {
 }
 
 //#endregion
-Object.defineProperty(exports, 'ConstructGenerator', {
-  enumerable: true,
-  get: function () {
-    return ConstructGenerator;
-  }
-});
 Object.defineProperty(exports, 'EndpointGenerator', {
   enumerable: true,
   get: function () {
@@ -1904,12 +1977,6 @@ Object.defineProperty(exports, 'generateOpenApi', {
     return generateOpenApi;
   }
 });
-Object.defineProperty(exports, 'isPartitionedRoutes', {
-  enumerable: true,
-  get: function () {
-    return isPartitionedRoutes;
-  }
-});
 Object.defineProperty(exports, 'normalizeRoutes', {
   enumerable: true,
   get: function () {
@@ -1928,4 +1995,4 @@ Object.defineProperty(exports, 'resolveOpenApiConfig', {
     return resolveOpenApiConfig;
   }
 });
-//# sourceMappingURL=openapi-BzNOC7_i.cjs.map
+//# sourceMappingURL=openapi-CljONd_M.cjs.map