@geekmidas/cli 1.10.27 → 1.10.29

package/dist/index.mjs

@@ -3,9 +3,9 @@ import { __require } from "./chunk-Duj1WY3L.mjs";
 import { getAppBuildOrder, getDependencyEnvVars, getDeployTargetError, isDeployTargetSupported } from "./workspace-D4z4A4cq.mjs";
 import { getAppNameFromCwd, loadAppConfig, loadConfig, loadWorkspaceAppInfo, loadWorkspaceConfig, parseModuleConfig } from "./config-jsRYHOHU.mjs";
 import { getCredentialsPath, getDokployCredentials, getDokployRegistryId, getDokployToken, removeDokployCredentials, storeDokployCredentials, storeDokployRegistryId } from "./credentials-s1kLcIzK.mjs";
-import { createStageSecrets, generateConnectionUrls, generateDbPassword, generateDbUrl, generateFullstackCustomSecrets, generateLocalStackCredentials, generatePgBossUrl, generateSecurePassword, generateServiceCredentials, rotateServicePassword, writeDockerEnvFromSecrets } from "./fullstack-secrets-BDE7Sk93.mjs";
+import { createStageSecrets, generateConnectionUrls, generateDbPassword, generateDbUrl, generateFullstackCustomSecrets, generateLocalStackCredentials, generatePgBossUrl, generateSecurePassword, generateServiceCredentials, rotateServicePassword, writeDockerEnvFromSecrets } from "./fullstack-secrets-P84v8zWn.mjs";
 import { getKeyPath, maskPassword, readStageSecrets, secretsExist, setCustomSecret, toEmbeddableSecrets, writeStageSecrets } from "./storage-dbb9RyBl.mjs";
-import { ConstructGenerator, EndpointGenerator, OPENAPI_OUTPUT_PATH, copyAllClients, copyClientToFrontends, generateOpenApi, getBackendOpenApiPath, isPartitionedRoutes, normalizeRoutes, openapiCommand, resolveOpenApiConfig } from "./openapi-DeG0ffQ8.mjs";
+import { ConstructGenerator, EndpointGenerator, OPENAPI_OUTPUT_PATH, generateOpenApi, isPartitionedRoutes, normalizeRoutes, openapiCommand, resolveOpenApiConfig } from "./openapi-CQCoLuzh.mjs";
 import { DokployApi } from "./dokploy-api-BIT0683o.mjs";
 import { encryptSecrets } from "./encryption-DSkIlEZ6.mjs";
 import { CachedStateProvider } from "./CachedStateProvider-C8A-cCm5.mjs";
@@ -35,7 +35,7 @@ import prompts from "prompts";
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "1.10.26";
+var version = "1.10.28";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -1558,11 +1558,6 @@ async function workspaceDevCommand(workspace, options) {
 		if (hasErrors) throw new Error("Frontend app validation failed. Fix the issues above and try again.");
 		logger$11.log("✅ Frontend apps validated");
 	}
-	if (frontendApps.length > 0 && backendApps.length > 0) {
-		const clientResults = await copyAllClients(workspace);
-		const copiedCount = clientResults.filter((r) => r.success).length;
-		if (copiedCount > 0) logger$11.log(`\n📦 Copied ${copiedCount} API client(s)`);
-	}
 	const resolvedPorts = await resolveServicePorts(workspace.root);
 	const rawSecrets = await loadDevSecrets(workspace);
 	await startWorkspaceServices(workspace, resolvedPorts.dockerEnv, rawSecrets);
@@ -1625,50 +1620,11 @@ async function workspaceDevCommand(workspace, options) {
 		env: turboEnv,
 		detached: true
 	});
-	let openApiWatcher = null;
-	if (frontendApps.length > 0 && backendApps.length > 0) {
-		const openApiPaths = [];
-		for (const [appName] of backendApps) {
-			const openApiPath = getBackendOpenApiPath(workspace, appName);
-			if (openApiPath) openApiPaths.push({
-				path: openApiPath,
-				appName
-			});
-		}
-		if (openApiPaths.length > 0) {
-			logger$11.log(`\n👀 Watching ${openApiPaths.length} backend OpenAPI spec(s) for changes`);
-			const pathToApp = new Map(openApiPaths.map((p) => [p.path, p.appName]));
-			openApiWatcher = chokidar.watch(openApiPaths.map((p) => p.path), {
-				persistent: true,
-				ignoreInitial: true,
-				depth: 0
-			});
-			let copyTimeout = null;
-			const handleChange = async (changedPath) => {
-				if (copyTimeout) clearTimeout(copyTimeout);
-				copyTimeout = setTimeout(async () => {
-					const backendAppName = pathToApp.get(changedPath);
-					if (!backendAppName) return;
-					logger$11.log(`\n🔄 OpenAPI spec changed for ${backendAppName}`);
-					try {
-						const results = await copyClientToFrontends(workspace, backendAppName, { silent: true });
-						for (const result of results) if (result.success) logger$11.log(`   📦 Copied client to ${result.frontendApp} (${result.endpointCount} endpoints)`);
-						else if (result.error) logger$11.error(`   ❌ Failed to copy client to ${result.frontendApp}: ${result.error}`);
-					} catch (error) {
-						logger$11.error(`   ❌ Failed to copy clients: ${error.message}`);
-					}
-				}, 200);
-			};
-			openApiWatcher.on("change", handleChange);
-			openApiWatcher.on("add", handleChange);
-		}
-	}
 	let isShuttingDown = false;
 	const shutdown = () => {
 		if (isShuttingDown) return;
 		isShuttingDown = true;
 		logger$11.log("\n🛑 Shutting down workspace...");
-		if (openApiWatcher) openApiWatcher.close().catch(() => {});
 		const pid = turboProcess.pid;
 		if (pid) try {
 			process.kill(-pid, "SIGTERM");
@@ -1696,7 +1652,6 @@ async function workspaceDevCommand(workspace, options) {
 			reject(error);
 		});
 		turboProcess.on("exit", (code) => {
-			if (openApiWatcher) openApiWatcher.close().catch(() => {});
 			if (code !== null && code !== 0) reject(new Error(`Turbo exited with code ${code}`));
 			else resolve$1();
 		});
@@ -8104,9 +8059,6 @@ export default defineWorkspace({
         client: './src/config/client.ts',
         server: './src/config/server.ts',
       },
-      client: {
-        output: './src/api',
-      },
     },
   },
   shared: {
@@ -9155,6 +9107,7 @@ function generatePackageJson(options, template) {
 		devDependencies$1["@types/pg"] = "~8.15.0";
 		devDependencies$1["@geekmidas/testkit"] = GEEKMIDAS_VERSIONS["@geekmidas/testkit"];
 		devDependencies$1["@faker-js/faker"] = "~9.8.0";
+		devDependencies$1["kysely-ctl"] = "~0.10.0";
 		devDependencies$1["vite-tsconfig-paths"] = "~5.1.0";
 	}
 	if (monorepo) {
@@ -9179,10 +9132,7 @@ function generatePackageJson(options, template) {
 		version: "0.0.1",
 		private: true,
 		type: "module",
-		exports: { "./client": {
-			types: OPENAPI_OUTPUT_PATH$1,
-			import: OPENAPI_OUTPUT_PATH$1
-		} },
+		exports: { "./client": OPENAPI_OUTPUT_PATH$1 },
 		scripts: scripts$1,
 		dependencies: sortObject(dependencies$1),
 		devDependencies: sortObject(devDependencies$1)
@@ -9212,6 +9162,29 @@ function generateSourceFiles(options, template) {
 function generateTestFiles(options, _template) {
 	if (!options.database) return [];
 	return [
+		{
+			path: "kysely.config.ts",
+			content: `import { Credentials } from '@geekmidas/envkit/credentials';
+import { PostgresDialect } from 'kysely';
+import { defineConfig } from 'kysely-ctl';
+import pg from 'pg';
+
+export default defineConfig({
+  dialect: new PostgresDialect({
+    pool: new pg.Pool({
+      password: Credentials.POSTGRES_PASSWORD,
+      user: Credentials.POSTGRES_USER,
+      database: Credentials.POSTGRES_DB,
+      port: Number(Credentials.POSTGRES_PORT),
+      host: Credentials.POSTGRES_HOST,
+    }),
+  }),
+  migrations: {
+    migrationFolder: './src/db/migrations',
+  },
+});
+`
+		},
 		{
 			path: "test/config.ts",
 			content: `import { it as itVitest } from 'vitest';
@@ -9233,30 +9206,52 @@ export const it = wrapVitestKyselyTransaction<Database>(itVitest, {
 		},
 		{
 			path: "test/globalSetup.ts",
-			content: `import { Kysely, PostgresDialect } from 'kysely';
-import pg from 'pg';
+			content: `import fs from 'node:fs/promises';
+import path from 'node:path';
+import { Credentials } from '@geekmidas/envkit/credentials';
 import { PostgresKyselyMigrator } from '@geekmidas/testkit/kysely';
-import type { Database } from '~/services/database.ts';
+import { runInitScript } from '@geekmidas/testkit/postgres';
+import { FileMigrationProvider, Kysely, PostgresDialect } from 'kysely';
+import pg from 'pg';
 
-export async function setup() {
-  const testUrl = process.env.DATABASE_URL;
-  if (!testUrl) throw new Error('DATABASE_URL is required for tests');
+export default async function globalSetup() {
+  const databaseUrl = Credentials.DATABASE_URL!;
+  const migrationFolder = path.resolve(import.meta.dirname, '../db/migrations');
 
-  // Run migrations on the test database
-  // (gkm test already rewrites DATABASE_URL to point to the _test database)
-  const db = new Kysely<Database>({
+  const db = new Kysely({
     dialect: new PostgresDialect({
-      pool: new pg.Pool({ connectionString: testUrl }),
+      pool: new pg.Pool({ connectionString: databaseUrl }),
     }),
   });
 
   const migrator = new PostgresKyselyMigrator({
+    uri: databaseUrl,
     db,
-    migrationsPath: './src/migrations',
+    afterCreate: async (uri) => {
+      const initScriptPath = path.resolve(process.cwd(), 'docker/postgres/init.sh');
+      const dbUrl = new URL(Credentials.DATABASE_URL!);
+      const apiUrl = new URL(Credentials.API_DATABASE_URL!);
+      const authUrl = new URL(Credentials.AUTH_DATABASE_URL!);
+
+      const env = {
+        POSTGRES_USER: dbUrl.username,
+        POSTGRES_DB: dbUrl.pathname.slice(1),
+        API_DB_PASSWORD: decodeURIComponent(apiUrl.password),
+        AUTH_DB_PASSWORD: decodeURIComponent(authUrl.password),
+        PGBOSS_DB_PASSWORD: Credentials.PGBOSS_DB_PASSWORD ?? 'pgboss-dev-password',
+      };
+
+      await runInitScript(initScriptPath, uri, env);
+    },
+    provider: new FileMigrationProvider({
+      fs,
+      path,
+      migrationFolder,
+    }),
   });
 
-  await migrator.migrateToLatest();
-  await db.destroy();
+  const teardown = await migrator.start();
+  return teardown;
 }
 `
 		},
@@ -10736,6 +10731,7 @@ storybook-static/
 function generateWebAppFiles(options) {
 	if (!options.monorepo || options.template !== "fullstack") return [];
 	const packageName = `@${options.name}/web`;
+	const apiPackage = `@${options.name}/api`;
 	const modelsPackage = `@${options.name}/models`;
 	const uiPackage = `@${options.name}/ui`;
 	const packageJson = {
@@ -10750,6 +10746,7 @@ function generateWebAppFiles(options) {
 			typecheck: "tsc --noEmit"
 		},
 		dependencies: {
+			[apiPackage]: "workspace:*",
 			[modelsPackage]: "workspace:*",
 			[uiPackage]: "workspace:*",
 			"@geekmidas/client": GEEKMIDAS_VERSIONS["@geekmidas/client"],
@@ -10776,7 +10773,7 @@ function generateWebAppFiles(options) {
 const nextConfig: NextConfig = {
   output: 'standalone',
   reactStrictMode: true,
-  transpilePackages: ['${modelsPackage}', '${uiPackage}'],
+  transpilePackages: ['${apiPackage}', '${modelsPackage}', '${uiPackage}'],
 };
 
 export default nextConfig;
@@ -10811,6 +10808,7 @@ export default nextConfig;
 			baseUrl: ".",
 			paths: {
 				"~/*": ["./src/*", "../../packages/ui/src/*"],
+				[`${apiPackage}/client`]: ["../../apps/api/.gkm/openapi.ts"],
 				[`${modelsPackage}`]: ["../../packages/models/src"],
 				[`${modelsPackage}/*`]: ["../../packages/models/src/*"],
 				[`${uiPackage}`]: ["../../packages/ui/src"],
@@ -10824,7 +10822,11 @@ export default nextConfig;
 			".next/types/**/*.ts"
 		],
 		exclude: ["node_modules"],
-		references: [{ path: "../../packages/ui" }, { path: "../../packages/models" }]
+		references: [
+			{ path: "../../apps/api" },
+			{ path: "../../packages/ui" },
+			{ path: "../../packages/models" }
+		]
 	};
 	const queryClientTs = `import { QueryClient } from '@tanstack/react-query';
 
@@ -10903,7 +10905,7 @@ export function Providers({ children }: { children: React.ReactNode }) {
   );
 }
 `;
-	const apiIndexTs = `import { createApi } from './api.ts';
+	const apiIndexTs = `import { createApi } from '${apiPackage}/client';
 import { getQueryClient } from '~/lib/query-client.ts';
 import { clientConfig } from '~/config/client.ts';
 
@@ -12428,7 +12430,7 @@ program.command("secrets:push").description("Push secrets to remote provider (SS
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 		const { loadWorkspaceConfig: loadWorkspaceConfig$1 } = await import("./config.mjs");
 		const { pushSecrets: pushSecrets$1 } = await import("./sync-COnAugP-.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile-BjWhjfSp.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-DAAKa0YR.mjs");
 		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-Cs4WBsc4.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		const secrets = await readStageSecrets$1(options.stage, workspace.root);
@@ -12454,7 +12456,7 @@ program.command("secrets:pull").description("Pull secrets from remote provider (
 		const { loadWorkspaceConfig: loadWorkspaceConfig$1 } = await import("./config.mjs");
 		const { pullSecrets: pullSecrets$1 } = await import("./sync-COnAugP-.mjs");
 		const { writeStageSecrets: writeStageSecrets$1 } = await import("./storage-Cs4WBsc4.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile-BjWhjfSp.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-DAAKa0YR.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		let secrets = await pullSecrets$1(options.stage, workspace);
 		if (!secrets) {
@@ -12479,7 +12481,7 @@ program.command("secrets:reconcile").description("Backfill missing custom secret
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 		const { loadWorkspaceConfig: loadWorkspaceConfig$1 } = await import("./config.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile-BjWhjfSp.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-DAAKa0YR.mjs");
 		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-Cs4WBsc4.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		const secrets = await readStageSecrets$1(options.stage, workspace.root);