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

package/dist/index.cjs

@@ -7,7 +7,7 @@ const require_workspace = require("./workspace-CRD9YinV.cjs");
 const require_credentials = require("./credentials-COrSpZfF.cjs");
 const require_generator = require("./generator-Wdfp0jCS.cjs");
 const require_storage = require("./storage-DgypfSD6.cjs");
-const require_openapi = require("./openapi-CN69hrf0.cjs");
+const require_openapi = require("./openapi-DeMqoLuJ.cjs");
 const require_emit = require("./emit-BdoPFjZf.cjs");
 const require_reconcile = require("./reconcile-hx_vBvux.cjs");
 const require_transfer = require("./transfer-BZbyaV3I.cjs");
@@ -44,7 +44,7 @@ prompts = require_rolldown_runtime.__toESM(prompts, 1);
 let _geekmidas_envkit = require("@geekmidas/envkit");
 let _geekmidas_services = require("@geekmidas/services");
 //#region package.json
-var version = "10.0.0-alpha.23";
+var version = "10.0.0-alpha.24";
 //#endregion
 //#region src/auth/credentials.ts
 /**
@@ -329,6 +329,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: (0, _geekmidas_manifest.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) => (0, node_path.resolve)(workspaceRoot, d.path) === (0, node_path.resolve)(appRoot));
+}
+//#endregion
 //#region src/build/providerResolver.ts
 /**
 * Resolves provider configuration from the new simplified system
@@ -1365,12 +1435,13 @@ async function devCommand(options) {
 	if (hooks) logger$11.log(`🪝 Server hooks enabled from ${config.hooks?.server}`);
 	const enableOpenApi = require_openapi.resolveOpenApiConfig(config).enabled || resolved.enableOpenApi;
 	if (enableOpenApi) logger$11.log(`📄 OpenAPI output: ${require_openapi.OPENAPI_OUTPUT_PATH}`);
+	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 require_openapi.generateOpenApiFrom(config.constructs, { openapi: config.openapi });
 	const runtime = config.runtime ?? "node";
 	let secretsJsonPath;
@@ -1435,7 +1506,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 require_openapi.generateOpenApiFrom(config.constructs, {
 					openapi: config.openapi,
 					silent: true,
@@ -1821,24 +1892,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 require_discover.discover({
 			patterns: (Array.isArray(patterns) ? patterns : [patterns]).map((p) => (0, node_path.isAbsolute)(p) ? p : (0, node_path.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), require_credentials.cacheBackendFor(require_credentials.providerOf(config ?? {})))
+			cache: cacheBackendsIn(declared, require_credentials.cacheBackendFor(require_credentials.providerOf(config ?? {})))
 		})
 	};
 	const endpointGenerator = new require_openapi.EndpointGenerator();
@@ -1847,7 +1928,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) : [],
@@ -1855,6 +1936,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 = (0, node_path.join)(appRoot, ".gkm", provider);
 	await (0, node_fs_promises.mkdir)(outputDir, { recursive: true });
 	await Promise.all([
@@ -2486,41 +2568,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) => (0, node_path.resolve)(workspaceRoot, d.path) === (0, node_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: (0, _geekmidas_manifest.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,
@@ -2547,7 +2604,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`);
@@ -2555,6 +2612,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;
@@ -8420,26 +8478,26 @@ function loadPackageJson() {
 * Run: pnpm --filter @geekmidas/cli sync-versions
 */
 const GEEKMIDAS_VERSIONS = {
-	"@geekmidas/audit": "~10.0.0-alpha.23",
-	"@geekmidas/auth": "~10.0.0-alpha.23",
-	"@geekmidas/cache": "~10.0.0-alpha.23",
-	"@geekmidas/client": "~10.0.0-alpha.23",
-	"@geekmidas/cloud": "~10.0.0-alpha.23",
-	"@geekmidas/constructs": "~10.0.0-alpha.23",
-	"@geekmidas/db": "~10.0.0-alpha.23",
-	"@geekmidas/emailkit": "~10.0.0-alpha.23",
-	"@geekmidas/envkit": "~10.0.0-alpha.23",
-	"@geekmidas/errors": "~10.0.0-alpha.23",
-	"@geekmidas/events": "~10.0.0-alpha.23",
-	"@geekmidas/logger": "~10.0.0-alpha.23",
-	"@geekmidas/manifest": "~10.0.0-alpha.23",
-	"@geekmidas/rate-limit": "~10.0.0-alpha.23",
-	"@geekmidas/schema": "~10.0.0-alpha.23",
-	"@geekmidas/services": "~10.0.0-alpha.23",
-	"@geekmidas/storage": "~10.0.0-alpha.23",
-	"@geekmidas/studio": "~10.0.0-alpha.23",
-	"@geekmidas/telescope": "~10.0.0-alpha.23",
-	"@geekmidas/testkit": "~10.0.0-alpha.23",
+	"@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