@geekmidas/cli 10.0.0-alpha.32 → 10.0.0-alpha.34

package/dist/index.mjs

@@ -1,13 +1,13 @@
 #!/usr/bin/env -S npx tsx
 import { n as __require, t as __exportAll } from "./rolldown-runtime-BhDjJH2R.mjs";
 import { c as isPartitionedRoutes, i as ConstructGenerator, t as discover } from "./discover-CMxesskG.mjs";
-import { a as loadConfig, c as parseModuleConfig, i as loadAppConfig, l as appKey, r as getAppNameFromCwd, s as loadWorkspaceConfig, u as derivedApps } from "./config-BH3Ki69F.mjs";
-import { D as assertDeployedStage, E as TEST_STAGE, O as deployedProblems, T as InvalidStages, a as getAppBuildOrder, b as getDeployTargetError, k as stageProblems, m as stripPublicPrefix, o as getAppGkmConfig, p as getPublicEnvPrefix, t as allConstructGlobs, x as isDeployTargetSupported } from "./workspace-T4IVGSoB.mjs";
+import { a as loadConfig, c as parseModuleConfig, i as loadAppConfig, l as appKey, r as getAppNameFromCwd, s as loadWorkspaceConfig, u as derivedApps } from "./config-Du8AQJRK.mjs";
+import { D as assertDeployedStage, E as TEST_STAGE, O as deployedProblems, T as InvalidStages, a as getAppBuildOrder, b as getDeployTargetError, k as stageProblems, m as stripPublicPrefix, o as getAppGkmConfig, p as getPublicEnvPrefix, t as allConstructGlobs, x as isDeployTargetSupported } from "./workspace-CsL76tpc.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-BjTLjDDp.mjs";
-import { _ as findAvailablePort, b as loadSecretsForApp, c as applyPostgres, d as cacheBackendFor, f as eventsBackendFor, g as createEntryWrapper, h as createCredentialsPreload, i as reconcileWorkspace, l as resourceName, m as storageBackendFor, n as constructGlobs, o as COMPOSE_PATH, p as providerOf, r as derivedContainers, s as LOCAL_CA_PATH, t as backendsOf, u as rootSite, v as isPortAvailable, x as prepareEntryCredentials, y as loadEnvFiles } from "./workspace-C97QUCIf.mjs";
+import { _ as findAvailablePort, b as loadSecretsForApp, c as applyPostgres, d as cacheBackendFor, f as eventsBackendFor, g as createEntryWrapper, h as createCredentialsPreload, i as reconcileWorkspace, l as resourceName, m as storageBackendFor, n as constructGlobs, o as COMPOSE_PATH, p as providerOf, r as derivedContainers, s as LOCAL_CA_PATH, t as backendsOf, u as rootSite, v as isPortAvailable, x as prepareEntryCredentials, y as loadEnvFiles } from "./workspace-DB2YHgOl.mjs";
 import { n as EndpointGenerator, r as runtimeFor } from "./OpenApiTsGenerator-hDINScnz.mjs";
 import { generateOpenApi, openapiCommand, resolveOpenApiConfig } from "./openapi.mjs";
-import { a as cacheBackendsIn, i as writeTestHarness, n as TEST_READY_FILE, o as driversFor, r as TEST_MANIFEST_ENV, t as TEST_READY_ENV } from "./ready-CvP3JVEw.mjs";
+import { a as writeTestHarness, i as TEST_MANIFEST_ENV, n as TEST_READY_FILE, o as cacheBackendsIn, s as driversFor, t as TEST_READY_ENV } from "./ready-D1BCiaYU.mjs";
 import { i as withRoutes, r as withCompute } from "./emit-Bzq7JsMP.mjs";
 import { a as createStageSecrets, c as generateServiceCredentials, i as writeDockerEnvFromSecrets, l as rotateServicePassword, o as generateConnectionUrls, r as generateFullstackCustomSecrets, s as generateSecurePassword, t as reconcileMissingSecrets } from "./reconcile-yNq6Shau.mjs";
 import { createRequire } from "node:module";
@@ -19,7 +19,7 @@ import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { basename, dirname, isAbsolute, join, parse, relative, resolve } from "node:path";
 import { execFile, execSync, spawn } from "node:child_process";
-import { cacheTable, canonicalId, cloudName, cookieDomain, dependentsOf, migrationFolder, provideKey, provisionOrder, scopedName, serviceKey } from "@geekmidas/manifest";
+import { cacheTable, canonicalId, cloudName, cookieDomain, dependentsOf, kebabCase, migrationFolder, provideKey, provisionOrder, scopedName, serviceKey } from "@geekmidas/manifest";
 import fg from "fast-glob";
 import chokidar from "chokidar";
 import { createCipheriv, createHash, randomBytes } from "node:crypto";
@@ -37,7 +37,7 @@ import { Subscriber } from "@geekmidas/constructs/subscribers";
 import { Topic } from "@geekmidas/constructs/topic";
 import { lookup } from "node:dns/promises";
 //#region package.json
-var version = "10.0.0-alpha.32";
+var version = "10.0.0-alpha.34";
 //#endregion
 //#region src/auth/credentials.ts
 /**
@@ -1087,9 +1087,9 @@ async function workspaceDevCommand(workspace, options) {
 		...reconciled.env
 	};
 	if (options.migrate || options.seed) {
-		const { prepareDevDatabases } = await import("./migrate-CnPtWnkR.mjs");
+		const { prepareDevDatabases } = await import("./migrate-BbhXxQer.mjs");
 		await prepareDevDatabases(workspace, reconciled.env, { seed: !!options.seed });
-	} else await import("./migrate-CnPtWnkR.mjs").then(({ reportPendingMigrations }) => reportPendingMigrations(workspace, reconciled.env)).catch((error) => {
+	} else await import("./migrate-BbhXxQer.mjs").then(({ reportPendingMigrations }) => reportPendingMigrations(workspace, reconciled.env)).catch((error) => {
 		logger$10.log(`⚠️  Could not check for pending migrations: ${error instanceof Error ? error.message : String(error)}`);
 	});
 	const appUrls = {};
@@ -3102,6 +3102,7 @@ const PROVISIONERS = {
 		context.deferred.push(...statementsFor({
 			id: declaration.id,
 			database: postgres.databaseName,
+			ownsDatabase: true,
 			runtime,
 			owner,
 			...reads ? { reader: readerRole(runtime) } : {},
@@ -3337,6 +3338,7 @@ function statementsFor(options) {
 		owner,
 		...reader ? { reader } : {},
 		schema,
+		...options.ownsDatabase ? { database } : {},
 		passwords: {
 			runtime: derivedPassword(context, runtime),
 			owner: derivedPassword(context, owner),
@@ -8635,7 +8637,27 @@ functions it called on the way.
 ${database ? "gkm test       # starts services, injects secrets, then runs vitest" : "gkm test"}
 \`\`\`
 
-Run tests through \`gkm test\`, not \`vitest\` directly${database ? " — it is what starts the database and injects the secrets the suite needs" : ""}.`;
+Run tests through \`gkm test\`, not \`vitest\` directly${database ? " — it is what starts the database and injects the secrets the suite needs" : ""}.${database ? `
+
+**Factories, one per database.** \`test/factories/<construct>.ts\` at the
+project root — \`database.ts\` for \`Database\` — exports
+\`createFactory(db)\`. A feature test gets each by service name, on that
+test's transaction — the one \`db.get\` returns and its endpoints use — so
+ask for it rather than importing and building one. Sign in the way a person
+does, through \`browser.signIn\`:
+
+\`\`\`typescript
+it('reads a user', async ({ browser, db, factories }) => {
+  const factory = await factories.get('database');
+  const ada = await factory.insert('users', { email: 'ada@example.com' });
+
+  await browser.signIn(ada.email);
+  // … act through browser.api …
+
+  const app = await db.get('database');
+  // … assert on what was written …
+});
+\`\`\`` : ""}`;
 }
 //#endregion
 //#region src/init/dependencies.ts
@@ -8763,26 +8785,26 @@ function loadPackageJson() {
 * Run: pnpm --filter @geekmidas/cli sync-versions
 */
 const GEEKMIDAS_VERSIONS = {
-	"@geekmidas/audit": "~10.0.0-alpha.32",
-	"@geekmidas/auth": "~10.0.0-alpha.32",
-	"@geekmidas/cache": "~10.0.0-alpha.32",
-	"@geekmidas/client": "~10.0.0-alpha.32",
-	"@geekmidas/cloud": "~10.0.0-alpha.32",
-	"@geekmidas/constructs": "~10.0.0-alpha.32",
-	"@geekmidas/db": "~10.0.0-alpha.32",
-	"@geekmidas/emailkit": "~10.0.0-alpha.32",
-	"@geekmidas/envkit": "~10.0.0-alpha.32",
-	"@geekmidas/errors": "~10.0.0-alpha.32",
-	"@geekmidas/events": "~10.0.0-alpha.32",
-	"@geekmidas/logger": "~10.0.0-alpha.32",
-	"@geekmidas/manifest": "~10.0.0-alpha.32",
-	"@geekmidas/rate-limit": "~10.0.0-alpha.32",
-	"@geekmidas/schema": "~10.0.0-alpha.32",
-	"@geekmidas/services": "~10.0.0-alpha.32",
-	"@geekmidas/storage": "~10.0.0-alpha.32",
-	"@geekmidas/studio": "~10.0.0-alpha.32",
-	"@geekmidas/telescope": "~10.0.0-alpha.32",
-	"@geekmidas/testkit": "~10.0.0-alpha.32",
+	"@geekmidas/audit": "~10.0.0-alpha.34",
+	"@geekmidas/auth": "~10.0.0-alpha.34",
+	"@geekmidas/cache": "~10.0.0-alpha.34",
+	"@geekmidas/client": "~10.0.0-alpha.34",
+	"@geekmidas/cloud": "~10.0.0-alpha.34",
+	"@geekmidas/constructs": "~10.0.0-alpha.34",
+	"@geekmidas/db": "~10.0.0-alpha.34",
+	"@geekmidas/emailkit": "~10.0.0-alpha.34",
+	"@geekmidas/envkit": "~10.0.0-alpha.34",
+	"@geekmidas/errors": "~10.0.0-alpha.34",
+	"@geekmidas/events": "~10.0.0-alpha.34",
+	"@geekmidas/logger": "~10.0.0-alpha.34",
+	"@geekmidas/manifest": "~10.0.0-alpha.34",
+	"@geekmidas/rate-limit": "~10.0.0-alpha.34",
+	"@geekmidas/schema": "~10.0.0-alpha.34",
+	"@geekmidas/services": "~10.0.0-alpha.34",
+	"@geekmidas/storage": "~10.0.0-alpha.34",
+	"@geekmidas/studio": "~10.0.0-alpha.34",
+	"@geekmidas/telescope": "~10.0.0-alpha.34",
+	"@geekmidas/testkit": "~10.0.0-alpha.34",
 	"@geekmidas/cli": `~${loadPackageJson().version}`
 };
 //#endregion
@@ -10358,6 +10380,18 @@ function rootConstructDependencies(options) {
 	};
 }
 /**
+* What `test/factories/` imports at the root: the factory and faker, and
+* Kysely's types where the root does not already install it for the
+* constructs.
+*/
+function rootFactoryDependencies(options) {
+	return {
+		"@geekmidas/testkit": GEEKMIDAS_VERSIONS["@geekmidas/testkit"],
+		"@faker-js/faker": DEPENDENCY_VERSIONS["@faker-js/faker"],
+		...options.template === "fullstack" ? {} : { kysely: DEPENDENCY_VERSIONS.kysely }
+	};
+}
+/**
 * Generate monorepo root files (pnpm-workspace.yaml, root package.json, etc.)
 */
 function generateMonorepoFiles(options, _template) {
@@ -10396,6 +10430,7 @@ function generateMonorepoFiles(options, _template) {
 			turbo: DEPENDENCY_VERSIONS["turbo"],
 			typescript: TOOLCHAIN_VERSIONS["typescript"],
 			vitest: TOOLCHAIN_VERSIONS["vitest"],
+			...options.constructs.database ? rootFactoryDependencies(options) : {},
 			...deploy.devDependencies
 		}
 	};
@@ -11976,9 +12011,9 @@ function generateSourceFiles(options, template) {
 //#endregion
 //#region src/init/generators/test.ts
 /**
-* Generate test infrastructure files when database is enabled.
-* Includes transaction-isolated test config,
-* factory system with builders/seeds, and an example spec.
+* Generate test infrastructure files when database is enabled: the
+* transaction-isolated test config and an example spec, in the app. The
+* factory is the project's — see {@link generateTestFactoryFiles}.
 */
 function generateTestFiles(options, _template) {
 	if (!options.constructs.database) return [];
@@ -11986,10 +12021,9 @@ function generateTestFiles(options, _template) {
 	const schema = !options.monorepo ? "../src/constructs/database.ts" : `@${options.name}/constructs/database.ts`;
 	db.urlKey;
 	db.ownerUrlKey;
-	return [
-		{
-			path: "test/config.ts",
-			content: `import { it as itVitest } from 'vitest';
+	return [{
+		path: "test/config.ts",
+		content: `import { it as itVitest } from 'vitest';
 import { wrapVitestKyselyTransaction } from '@geekmidas/testkit/kysely';
 import { type Database, database } from '${schema}';
 
@@ -11999,17 +12033,56 @@ export const it = wrapVitestKyselyTransaction<Database>(itVitest, {
   connection: database,
 });
 `
-		},
-		{
-			path: "test/factory/index.ts",
-			content: `import type { Kysely } from 'kysely';
+	}, {
+		path: "test/example.spec.ts",
+		content: `import { describe, expect } from 'vitest';
+import { it } from './config.ts';
+
+describe('example', () => {
+  it('should have a working test setup', async ({ trx }) => {
+    // trx is a Kysely transaction; everything in it is rolled back after the
+    // test
+    expect(trx).toBeDefined();
+  });
+});
+`
+	}];
+}
+/**
+* The database's test factory, at the project root:
+* `test/factories/<construct>.ts`.
+*
+* A factory belongs to a database, not to an app, so there is one per database
+* for the whole project. `gkm test` finds it by that name and hands every
+* feature test \`factories.get('database')\`, built on the test's transaction.
+*/
+function generateTestFactoryFiles(options) {
+	if (!options.constructs.database) return [];
+	const db = databaseFor();
+	const schema = options.monorepo && options.template === "fullstack" ? `@${options.name}/constructs/database.ts` : options.monorepo ? `../../${options.apiPath}/src/constructs/database.ts` : "../../src/constructs/database.ts";
+	return [{
+		path: `test/factories/${kebabCase(db.id)}.ts`,
+		content: `import type { Kysely } from 'kysely';
 import { KyselyFactory } from '@geekmidas/testkit/kysely';
 import type { Database } from '${schema}';
-import { usersBuilder } from './users.ts';
+
+const usersBuilder = KyselyFactory.createBuilder<Database, 'users'>(
+  'users',
+  ({ faker }) => ({
+    id: faker.string.uuid(),
+    name: faker.person.fullName(),
+    email: faker.internet.email(),
+    createdAt: new Date(),
+  }),
+);
 
 const builders = { users: usersBuilder };
 const seeds = {};
 
+/**
+ * This database's factory. \`gkm test\` builds it on each feature test's
+ * transaction and hands it over as \`factories.get('${serviceKey(db.id)}')\`.
+ */
 export function createFactory(db: Kysely<Database>) {
   return new KyselyFactory<Database, typeof builders, typeof seeds>(
     builders,
@@ -12020,38 +12093,7 @@ export function createFactory(db: Kysely<Database>) {
 
 export type Factory = ReturnType<typeof createFactory>;
 `
-		},
-		{
-			path: "test/factory/users.ts",
-			content: `import { KyselyFactory } from '@geekmidas/testkit/kysely';
-import type { Database } from '${schema}';
-
-export const usersBuilder = KyselyFactory.createBuilder<Database, 'users'>(
-  'users',
-  ({ faker }) => ({
-    id: faker.string.uuid(),
-    name: faker.person.fullName(),
-    email: faker.internet.email(),
-    createdAt: new Date(),
-  }),
-);
-`
-		},
-		{
-			path: "test/example.spec.ts",
-			content: `import { describe, expect } from 'vitest';
-import { it } from './config.ts';
-
-describe('example', () => {
-  it('should have a working test setup', async ({ trx }) => {
-    // trx is a Kysely transaction; everything in it is rolled back after the
-    // test
-    expect(trx).toBeDefined();
-  });
-});
-`
-		}
-	];
+	}];
 }
 //#endregion
 //#region src/init/generators/ui.ts
@@ -14521,7 +14563,8 @@ async function initCommand(projectName, options = {}) {
 		...generateGithubFiles(templateOptions),
 		...generateMonorepoFiles(templateOptions, baseTemplate),
 		...generateRootConstructs(templateOptions),
-		...generateModelsPackage(templateOptions)
+		...generateModelsPackage(templateOptions),
+		...generateTestFactoryFiles(templateOptions)
 	] : [];
 	const webAppFiles = isFullstack ? frontendFramework === "tanstack-start" ? generateTanStackWebFiles(templateOptions) : frontendFramework === "expo" ? generateExpoAppFiles(templateOptions) : generateWebAppFiles(templateOptions) : [];
 	const authAppFiles = isFullstack ? generateAuthAppFiles(templateOptions) : [];
@@ -14984,7 +15027,7 @@ var NoStoredSecrets = class extends Error {
 	}
 };
 async function reconcile(secrets, workspace, stage) {
-	const { derivedContainers } = await import("./workspace-C97QUCIf.mjs").then((n) => n.a);
+	const { derivedContainers } = await import("./workspace-DB2YHgOl.mjs").then((n) => n.a);
 	const result = reconcileMissingSecrets(secrets, workspace, await derivedContainers(workspace, stage));
 	return result ? {
 		secrets: result.secrets,
@@ -15328,7 +15371,8 @@ async function testCommand(options = {}) {
 		patterns: constructGlobs(workspace),
 		cacheBackend: backendsOf(workspace).cache,
 		stage: TEST_STAGE,
-		env: finalCredentials
+		env: finalCredentials,
+		factories: join(workspace.root, workspace.test.factories ?? "test/factories")
 	}) : void 0;
 	if (options.prepare) {
 		console.log(manifestPath ? `  🧪 Test harness written beside ${manifestPath}` : "  🧪 Nothing to prepare: this project declares no constructs");
@@ -15382,7 +15426,7 @@ async function testCommand(options = {}) {
 * starts without the reference data the app needs.
 */
 async function migrateTestStage(workspace, env) {
-	const { migrateAndSeed } = await import("./migrate-CnPtWnkR.mjs");
+	const { migrateAndSeed } = await import("./migrate-BbhXxQer.mjs");
 	const { discover } = await import("./discover-CMxesskG.mjs").then((n) => n.n);
 	const sources = {};
 	const manifest = await discover({
@@ -15827,7 +15871,7 @@ program.command("migrate").description("Apply each database construct's migratio
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
-		const { migrateCommand } = await import("./migrate-CnPtWnkR.mjs");
+		const { migrateCommand } = await import("./migrate-BbhXxQer.mjs");
 		await migrateCommand({
 			...options,
 			...construct ? { construct } : {}
@@ -15841,7 +15885,7 @@ program.command("seed").description("Migrate, then run each database construct's
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
-		const { seedCommand } = await import("./migrate-CnPtWnkR.mjs");
+		const { seedCommand } = await import("./migrate-BbhXxQer.mjs");
 		await seedCommand({
 			...options,
 			...construct ? { construct } : {}
@@ -15855,7 +15899,7 @@ program.command("migration").description("Write a construct's next migration: an
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
-		const { migrationCommand } = await import("./migrate-CnPtWnkR.mjs");
+		const { migrationCommand } = await import("./migrate-BbhXxQer.mjs");
 		await migrationCommand({
 			construct,
 			...name ? { name } : {}
@@ -16023,7 +16067,7 @@ program.command("secrets:reconcile").description("Backfill missing custom secret
 			console.error(`No secrets found for stage "${stage}". Run "gkm secrets:init --stage ${stage}" first.`);
 			process.exit(1);
 		}
-		const { derivedContainers } = await import("./workspace-C97QUCIf.mjs").then((n) => n.a);
+		const { derivedContainers } = await import("./workspace-DB2YHgOl.mjs").then((n) => n.a);
 		const result = reconcileMissingSecrets(secrets, workspace, await derivedContainers(workspace, stage));
 		if (!result) {
 			console.log(`\n✓ Secrets for stage "${stage}" are up-to-date`);
@@ -16082,7 +16126,7 @@ program.command("deploy:github").description("Let GitHub Actions deploy a stage:
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
-		const { deployGithubCommand } = await import("./github-BrDmlm1x.mjs");
+		const { deployGithubCommand } = await import("./github-DN-92LWP.mjs");
 		await deployGithubCommand(options);
 	} catch (error) {
 		console.error(formatError(error));