@geekmidas/cli 10.0.0-alpha.22 → 10.0.0-alpha.24

package/dist/index.mjs

@@ -6,7 +6,7 @@ import { A as stripPublicPrefix, C as InvalidStages, D as stageProblems, E as de
 import { C as providerOf, S as eventsBackendFor, _ as COMPOSE_PATH, a as loadEnvFiles, b as resourceName, c as resolveServicePorts, d as backendsOf, f as constructGlobs, h as usesConstructs, i as isPortAvailable, l as rewriteUrlsWithPorts, m as reconcileWorkspace, n as createEntryWrapper, o as loadSecretsForApp, p as derivedContainers, r as findAvailablePort, s as prepareEntryCredentials, t as createCredentialsPreload, u as startWorkspaceServices, v as LOCAL_CA_PATH, w as storageBackendFor, x as cacheBackendFor, y as applyPostgres } from "./credentials-D9TKJJZc.mjs";
 import { a as generateServiceCredentials, i as generateSecurePassword, n as generateConnectionUrls, o as rotateServicePassword, t as createStageSecrets } from "./generator-LfZU7NlU.mjs";
 import { c as getKeyPath, i as setCustomSecret, n as readStageSecrets, o as toEmbeddableSecrets, r as secretsExist, s as writeStageSecrets, t as maskPassword } from "./storage-TP0x118M.mjs";
-import { a as openapiCommand, c as EndpointGenerator, l as runtimeFor, n as generateOpenApi, o as resolveOpenApiConfig, r as generateOpenApiFrom, s as OpenApiTsGenerator, t as OPENAPI_OUTPUT_PATH$1 } from "./openapi-B5PSuLym.mjs";
+import { a as openapiCommand, c as EndpointGenerator, l as runtimeFor, n as generateOpenApi, o as resolveOpenApiConfig, r as generateOpenApiFrom, s as OpenApiTsGenerator, t as OPENAPI_OUTPUT_PATH$1 } from "./openapi-Co2Tv7zh.mjs";
 import { i as withRoutes, r as withCompute } from "./emit-Bzq7JsMP.mjs";
 import { i as writeDockerEnvFromSecrets, r as generateFullstackCustomSecrets } from "./reconcile-gb1lz1Dk.mjs";
 import { a as isRemoteStore, n as pullStageSecrets, r as pushStageSecrets, t as NoStoredSecrets } from "./transfer-Bk5YlRyB.mjs";
@@ -39,7 +39,7 @@ import prompts from "prompts";
 import { EnvironmentParser } from "@geekmidas/envkit";
 import { serviceContext } from "@geekmidas/services";
 //#region package.json
-var version = "10.0.0-alpha.22";
+var version = "10.0.0-alpha.24";
 //#endregion
 //#region src/auth/credentials.ts
 /**
@@ -324,6 +324,76 @@ function maskToken(token) {
 	return `${token.slice(0, 4)}...${token.slice(-4)}`;
 }
 //#endregion
+//#region src/build/owners.ts
+/**
+* What a generated entry imports its runtime from, read off the discovered
+* constructs: the surface it serves, every construct a runnable can be built
+* from, and the database Studio browses.
+*
+* `gkm build` and `gkm dev` both write entries that import the surface for its
+* logger and environment parser, so both ask here. A dev server that skipped it
+* had nothing to import them from.
+*/
+function ownersContext(options) {
+	const { declared, sources, workspaceRoot, appRoot, studio } = options;
+	const surfaces = restApis(declared);
+	const primary = servedSurface(declared, workspaceRoot, appRoot) ?? surfaces.find((d) => d.endpoints.length === 0) ?? surfaces[0];
+	const browsable = Object.entries(declared).find(([, d]) => d.kind === "database");
+	const browsableSource = browsable ? sources[browsable[0]] : void 0;
+	const owners = {};
+	for (const [id, declaration] of Object.entries(declared)) {
+		if (declaration.kind !== "rest-api" && declaration.kind !== "worker") continue;
+		const source = sources[id];
+		if (!source) continue;
+		owners[id] = {
+			specifier: source.file,
+			exportName: source.exportName
+		};
+	}
+	const primarySource = primary ? sources[primary.id] : void 0;
+	return {
+		owners,
+		...primary ? { surface: {
+			id: primary.id,
+			trustedOriginsKey: provideKey(primary.id, "trustedOrigins"),
+			...primary.cors ? { cors: primary.cors } : {},
+			...primarySource ? { module: {
+				specifier: primarySource.file,
+				exportName: primarySource.exportName
+			} } : {}
+		} } : {},
+		studio: studio && browsableSource ? {
+			...studio,
+			database: {
+				specifier: browsableSource.file,
+				exportName: browsableSource.exportName
+			}
+		} : studio
+	};
+}
+/**
+* The endpoints one surface serves.
+*
+* One glob finds every surface's endpoints, wherever their files live. A build
+* keeps the ones built from the surface it serves; one built from no surface at
+* all has nowhere else to go.
+*/
+function servedBy(endpoints, surface) {
+	if (!surface) return endpoints;
+	return endpoints.filter(({ construct }) => !construct.surface || construct.surface.id === surface.id);
+}
+function restApis(declared) {
+	return Object.values(declared).filter((d) => d.kind === "rest-api");
+}
+/**
+* The surface whose declared `path` is the directory being built — asked of
+* every surface, because a workspace has several and each app's build serves
+* exactly one.
+*/
+function servedSurface(declared, workspaceRoot, appRoot) {
+	return restApis(declared).find((d) => resolve(workspaceRoot, d.path) === resolve(appRoot));
+}
+//#endregion
 //#region src/build/providerResolver.ts
 /**
 * Resolves provider configuration from the new simplified system
@@ -1360,12 +1430,13 @@ async function devCommand(options) {
 	if (hooks) logger$11.log(`🪝 Server hooks enabled from ${config.hooks?.server}`);
 	const enableOpenApi = resolveOpenApiConfig(config).enabled || resolved.enableOpenApi;
 	if (enableOpenApi) logger$11.log(`📄 OpenAPI output: ${OPENAPI_OUTPUT_PATH$1}`);
+	const workspaceRoot = workspace?.root ?? secretsRoot;
 	const buildContext = {
 		telescope,
 		studio,
 		hooks
 	};
-	await buildServer(config, buildContext, resolved.providers[0], enableOpenApi, appRoot);
+	await buildServer(config, buildContext, resolved.providers[0], enableOpenApi, appRoot, workspaceRoot);
 	if (enableOpenApi) await generateOpenApiFrom(config.constructs, { openapi: config.openapi });
 	const runtime = config.runtime ?? "node";
 	let secretsJsonPath;
@@ -1430,7 +1501,7 @@ async function devCommand(options) {
 		rebuildTimeout = setTimeout(async () => {
 			try {
 				logger$11.log("🔄 Rebuilding...");
-				await buildServer(config, buildContext, resolved.providers[0], enableOpenApi, appRoot, true);
+				await buildServer(config, buildContext, resolved.providers[0], enableOpenApi, appRoot, workspaceRoot, true);
 				if (enableOpenApi) await generateOpenApiFrom(config.constructs, {
 					openapi: config.openapi,
 					silent: true,
@@ -1816,24 +1887,34 @@ async function workspaceDevCommand(workspace, options) {
 * guarded rather than unconditional: a project with no `constructs` glob has
 * not adopted the model, and there is nothing to import.
 */
-async function declaredConstructs(config, appRoot) {
+async function declaredConstructs(config, appRoot, sources) {
 	const patterns = typeof config?.constructs === "string" || Array.isArray(config?.constructs) ? config.constructs : void 0;
 	if (!patterns) return {};
 	try {
 		return await discover({
 			patterns: (Array.isArray(patterns) ? patterns : [patterns]).map((p) => isAbsolute(p) ? p : join(appRoot, p)),
-			cwd: appRoot
+			cwd: appRoot,
+			sources
 		});
 	} catch {
 		return {};
 	}
 }
-async function buildServer(config, context, provider, enableOpenApi, appRoot = process.cwd(), bustCache = false) {
+async function buildServer(config, context, provider, enableOpenApi, appRoot, workspaceRoot, bustCache = false) {
+	const sources = {};
+	const declared = await declaredConstructs(config, appRoot, sources);
 	context = {
 		...context,
+		...ownersContext({
+			declared,
+			sources,
+			workspaceRoot,
+			appRoot,
+			studio: context.studio
+		}),
 		storageDrivers: driversFor({
 			appRoot,
-			cache: cacheBackendsIn(await declaredConstructs(config, appRoot), cacheBackendFor(providerOf(config ?? {})))
+			cache: cacheBackendsIn(declared, cacheBackendFor(providerOf(config ?? {})))
 		})
 	};
 	const endpointGenerator = new EndpointGenerator();
@@ -1842,7 +1923,7 @@ async function buildServer(config, context, provider, enableOpenApi, appRoot = p
 	const subscriberGenerator = new SubscriberGenerator();
 	const queueGenerator = new QueueGenerator();
 	const topicGenerator = new TopicGenerator();
-	const [allEndpoints, allFunctions, allCrons, allSubscribers, allQueues, allTopics] = await Promise.all([
+	const [loadedEndpoints, allFunctions, allCrons, allSubscribers, allQueues, allTopics] = await Promise.all([
 		endpointGenerator.load(config.constructs, appRoot, bustCache),
 		config.functions ? functionGenerator.load(config.functions, appRoot, bustCache) : [],
 		config.crons ? cronGenerator.load(config.crons, appRoot, bustCache) : [],
@@ -1850,6 +1931,7 @@ async function buildServer(config, context, provider, enableOpenApi, appRoot = p
 		config.queues ? queueGenerator.load(config.queues, appRoot, bustCache) : [],
 		config.topics ? topicGenerator.load(config.topics, appRoot, bustCache) : []
 	]);
+	const allEndpoints = servedBy(loadedEndpoints, context.surface);
 	const outputDir = join(appRoot, ".gkm", provider);
 	await mkdir(outputDir, { recursive: true });
 	await Promise.all([
@@ -2481,41 +2563,16 @@ async function buildCommand(options) {
 		cwd: process.cwd(),
 		sources: constructSources
 	}) : {};
-	const surfaces = Object.values(declared).filter((d) => d.kind === "rest-api");
-	const workspaceRoot = loadedConfig.workspace.root;
-	const served = surfaces.find((d) => resolve(workspaceRoot, d.path) === resolve(process.cwd()));
-	const primary = served ?? surfaces.find((d) => d.endpoints.length === 0) ?? surfaces[0];
-	const browsable = Object.entries(declared).find(([, d]) => d.kind === "database");
-	const browsableSource = browsable ? constructSources[browsable[0]] : void 0;
-	const owners = {};
-	for (const [id, declaration] of Object.entries(declared)) {
-		if (declaration.kind !== "rest-api" && declaration.kind !== "worker") continue;
-		const source = constructSources[id];
-		if (!source) continue;
-		owners[id] = {
-			specifier: source.file,
-			exportName: source.exportName
-		};
-	}
+	const derived = ownersContext({
+		declared,
+		sources: constructSources,
+		workspaceRoot: loadedConfig.workspace.root,
+		appRoot: process.cwd(),
+		studio
+	});
 	const buildContext = {
-		owners,
-		...primary ? { surface: {
-			id: primary.id,
-			trustedOriginsKey: provideKey(primary.id, "trustedOrigins"),
-			...primary.cors ? { cors: primary.cors } : {},
-			...constructSources[primary.id] ? { module: {
-				specifier: constructSources[primary.id].file,
-				exportName: constructSources[primary.id].exportName
-			} } : {}
-		} } : {},
+		...derived,
 		telescope,
-		studio: studio && browsableSource ? {
-			...studio,
-			database: {
-				specifier: browsableSource.file,
-				exportName: browsableSource.exportName
-			}
-		} : studio,
 		hooks,
 		production,
 		constructGlobs,
@@ -2542,7 +2599,7 @@ async function buildCommand(options) {
 		queueGenerator.load(code),
 		topicGenerator.load(code)
 	]);
-	const allEndpoints = primary ? loadedEndpoints.filter(({ construct }) => !construct.surface || construct.surface.id === primary.id) : loadedEndpoints;
+	const allEndpoints = servedBy(loadedEndpoints, derived.surface);
 	logger$9.log(`Found ${allEndpoints.length} endpoints`);
 	logger$9.log(`Found ${allFunctions.length} functions`);
 	logger$9.log(`Found ${allCrons.length} crons`);
@@ -2550,6 +2607,7 @@ async function buildCommand(options) {
 	logger$9.log(`Found ${allQueues.length} queues`);
 	logger$9.log(`Found ${allTopics.length} topics`);
 	if (allEndpoints.length === 0 && allFunctions.length === 0 && allCrons.length === 0 && allSubscribers.length === 0 && allQueues.length === 0 && allTopics.length === 0) {
+		const served = servedSurface(declared, loadedConfig.workspace.root, process.cwd());
 		const selfServing = served && served.endpoints.length > 0 && constructSources[served.id] !== void 0 ? [served.id, served] : void 0;
 		if (selfServing) {
 			const [id] = selfServing;
@@ -8409,26 +8467,26 @@ function loadPackageJson() {
 * Run: pnpm --filter @geekmidas/cli sync-versions
 */
 const GEEKMIDAS_VERSIONS = {
-	"@geekmidas/audit": "~10.0.0-alpha.22",
-	"@geekmidas/auth": "~10.0.0-alpha.22",
-	"@geekmidas/cache": "~10.0.0-alpha.22",
-	"@geekmidas/client": "~10.0.0-alpha.22",
-	"@geekmidas/cloud": "~10.0.0-alpha.22",
-	"@geekmidas/constructs": "~10.0.0-alpha.22",
-	"@geekmidas/db": "~10.0.0-alpha.22",
-	"@geekmidas/emailkit": "~10.0.0-alpha.22",
-	"@geekmidas/envkit": "~10.0.0-alpha.22",
-	"@geekmidas/errors": "~10.0.0-alpha.22",
-	"@geekmidas/events": "~10.0.0-alpha.22",
-	"@geekmidas/logger": "~10.0.0-alpha.22",
-	"@geekmidas/manifest": "~10.0.0-alpha.22",
-	"@geekmidas/rate-limit": "~10.0.0-alpha.22",
-	"@geekmidas/schema": "~10.0.0-alpha.22",
-	"@geekmidas/services": "~10.0.0-alpha.22",
-	"@geekmidas/storage": "~10.0.0-alpha.22",
-	"@geekmidas/studio": "~10.0.0-alpha.22",
-	"@geekmidas/telescope": "~10.0.0-alpha.22",
-	"@geekmidas/testkit": "~10.0.0-alpha.22",
+	"@geekmidas/audit": "~10.0.0-alpha.24",
+	"@geekmidas/auth": "~10.0.0-alpha.24",
+	"@geekmidas/cache": "~10.0.0-alpha.24",
+	"@geekmidas/client": "~10.0.0-alpha.24",
+	"@geekmidas/cloud": "~10.0.0-alpha.24",
+	"@geekmidas/constructs": "~10.0.0-alpha.24",
+	"@geekmidas/db": "~10.0.0-alpha.24",
+	"@geekmidas/emailkit": "~10.0.0-alpha.24",
+	"@geekmidas/envkit": "~10.0.0-alpha.24",
+	"@geekmidas/errors": "~10.0.0-alpha.24",
+	"@geekmidas/events": "~10.0.0-alpha.24",
+	"@geekmidas/logger": "~10.0.0-alpha.24",
+	"@geekmidas/manifest": "~10.0.0-alpha.24",
+	"@geekmidas/rate-limit": "~10.0.0-alpha.24",
+	"@geekmidas/schema": "~10.0.0-alpha.24",
+	"@geekmidas/services": "~10.0.0-alpha.24",
+	"@geekmidas/storage": "~10.0.0-alpha.24",
+	"@geekmidas/studio": "~10.0.0-alpha.24",
+	"@geekmidas/telescope": "~10.0.0-alpha.24",
+	"@geekmidas/testkit": "~10.0.0-alpha.24",
 	"@geekmidas/cli": `~${loadPackageJson().version}`
 };
 //#endregion
@@ -15232,8 +15290,10 @@ async function writeTestHarness(options) {
 		cache: cacheBackendsIn(declared, options.cacheBackend)
 	});
 	const database = await databaseSource(declared, sources, endpoints.map(({ construct }) => construct));
+	const files = [.../* @__PURE__ */ new Set([...Object.values(manifest.constructs).map(({ source }) => source.file), ...manifest.endpoints.map(({ source }) => source.file)])];
 	const harnessFor = (dir) => harnessModule({
 		dir,
+		files,
 		database,
 		surfaces: surfaces.map((id, index) => ({
 			id,
@@ -15306,7 +15366,7 @@ function specifierFrom(dir, file) {
 	return path.startsWith(".") ? path : `./${path}`;
 }
 function harnessModule(options) {
-	const { surfaces, auths, drivers, database, dir } = options;
+	const { surfaces, auths, drivers, database, dir, files } = options;
 	const plugins = [...new Set(auths.flatMap(({ plugins }) => plugins))].sort();
 	const imports = [
 		`import {${database ? " type DatabaseOf," : ""} featureTest, loadTestManifest } from '@geekmidas/constructs/testing';`,
@@ -15315,7 +15375,8 @@ function harnessModule(options) {
 		...surfaces.map(({ id }) => `import { createApi as create${id} } from './clients/${kebabCase(id)}.js';`),
 		...auths.length ? [`import { createAuthClient } from 'better-auth/client';`] : [],
 		...plugins.length ? [`import { ${plugins.join(", ")} } from 'better-auth/client/plugins';`] : [],
-		...drivers.imports ? [drivers.imports] : []
+		...drivers.imports ? [drivers.imports] : [],
+		...files.map((file, index) => `import * as __module${index} from '${specifierFrom(dir, file)}';`)
 	];
 	const url = (id) => `manifest.env[${JSON.stringify(provideKey(id, "url"))}]!`;
 	const members = [...surfaces.map(({ id, secured }) => `	/** \`${id}\`, at ${provideKey(id, "url")}. */
@@ -15341,8 +15402,13 @@ export class Browser extends TestBrowser {
 ${members.join("\n\n")}
 }
 
+/** The app's modules, by the path the manifest records for each. */
+const modules = {
+${files.map((file, index) => `\t${JSON.stringify(file)}: __module${index},`).join("\n")}
+};
+
 /** \`it\`, for a test that drives the app the way it runs deployed. */
-export const it = featureTest${database ? "<Browser, DatabaseOf<typeof __database>>" : ""}({ manifest, browser: Browser });
+export const it = featureTest${database ? "<Browser, DatabaseOf<typeof __database>>" : ""}({ manifest, modules, browser: Browser });
 `;
 }
 //#endregion