@geekmidas/cli 1.10.26 → 1.10.28

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-C6jD5nlK.mjs";
+import { createStageSecrets, generateConnectionUrls, generateDbPassword, generateDbUrl, generateFullstackCustomSecrets, generateLocalStackCredentials, generatePgBossUrl, generateSecurePassword, generateServiceCredentials, rotateServicePassword, writeDockerEnvFromSecrets } from "./fullstack-secrets-BDE7Sk93.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.25";
+var version = "1.10.27";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -781,10 +781,10 @@ async function prepareEntryCredentials(options) {
 		const depEnv = getDependencyEnvVars(appInfo.workspace, appInfo.appName);
 		Object.assign(credentials, depEnv);
 	}
-	if (!credentials.EVENT_PUBLISHER_CONNECTION_STRING && !credentials.EVENT_SUBSCRIBER_CONNECTION_STRING && credentials.POSTGRES_USER) {
+	if (!credentials.EVENT_PUBLISHER_CONNECTION_STRING && !credentials.EVENT_SUBSCRIBER_CONNECTION_STRING && credentials.PGBOSS_DB_USER) {
 		const pgbossUrl = generatePgBossUrl({
-			username: credentials.POSTGRES_USER,
-			password: credentials.POSTGRES_PASSWORD ?? "",
+			username: credentials.PGBOSS_DB_USER,
+			password: credentials.PGBOSS_DB_PASSWORD ?? "",
 			host: credentials.POSTGRES_HOST ?? "localhost",
 			port: Number(credentials.POSTGRES_PORT ?? "5432"),
 			database: credentials.POSTGRES_DB ?? "app"
@@ -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();
 		});
@@ -7504,7 +7459,7 @@ function generateDockerEnv(apps, eventsBackend) {
 		const envVar = `${app.name.toUpperCase()}_DB_PASSWORD`;
 		return `${envVar}=${app.password}`;
 	});
-	if (eventsBackend === "pgboss") envVars.push(`PGBOSS_DB_PASSWORD=pgboss-dev-password`);
+	envVars.push(`PGBOSS_DB_PASSWORD=pgboss-dev-password`);
 	return `# Auto-generated docker environment file
 # Contains database passwords for docker-compose postgres init
 # This file is gitignored - do not commit to version control
@@ -7565,8 +7520,7 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E
 EOSQL
 `;
 	});
-	let pgbossBlock = "";
-	if (eventsBackend === "pgboss") pgbossBlock = `
+	const pgbossBlock = `
 # Create pgboss user with dedicated schema - idempotent
 echo "Creating pgboss user and schema..."
 psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
@@ -7602,7 +7556,8 @@ set -e
 # Auto-generated PostgreSQL init script (idempotent - safe to re-run)
 # Creates per-app users with separate schemas in a single database
 # - api: uses public schema
-# - auth: uses auth schema (search_path=auth)${eventsBackend === "pgboss" ? "\n# - pgboss: uses pgboss schema for event processing" : ""}
+# - auth: uses auth schema (search_path=auth)
+# - pgboss: uses pgboss schema for event processing
 ${extensions}
 ${userCreations.join("\n")}${pgbossBlock}
 echo "Database initialization complete!"
@@ -8104,9 +8059,6 @@ export default defineWorkspace({
         client: './src/config/client.ts',
         server: './src/config/server.ts',
       },
-      client: {
-        output: './src/api',
-      },
     },
   },
   shared: {
@@ -9179,10 +9131,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)
@@ -10736,6 +10685,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 +10700,7 @@ function generateWebAppFiles(options) {
 			typecheck: "tsc --noEmit"
 		},
 		dependencies: {
+			[apiPackage]: "workspace:*",
 			[modelsPackage]: "workspace:*",
 			[uiPackage]: "workspace:*",
 			"@geekmidas/client": GEEKMIDAS_VERSIONS["@geekmidas/client"],
@@ -10776,7 +10727,7 @@ function generateWebAppFiles(options) {
 const nextConfig: NextConfig = {
   output: 'standalone',
   reactStrictMode: true,
-  transpilePackages: ['${modelsPackage}', '${uiPackage}'],
+  transpilePackages: ['${apiPackage}', '${modelsPackage}', '${uiPackage}'],
 };
 
 export default nextConfig;
@@ -10811,6 +10762,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 +10776,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 +10859,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';
 
@@ -11837,26 +11793,27 @@ function reconcileSecrets(secrets, workspace) {
 		logger$1.log(`   🔄 Adding missing service credentials: ${name$1}`);
 		changed = true;
 	}
+	if (result.services.postgres && !result.services.pgboss) {
+		result = {
+			...result,
+			services: {
+				...result.services,
+				pgboss: {
+					host: result.services.postgres.host,
+					port: result.services.postgres.port,
+					username: "pgboss",
+					password: generateSecurePassword(),
+					database: result.services.postgres.database ?? "app"
+				}
+			}
+		};
+		result.urls = generateConnectionUrls(result.services, result.eventsBackend);
+		logger$1.log("   🔄 Adding missing service credentials: pgboss");
+		changed = true;
+	}
 	const eventsBackend = workspace.services.events;
 	if (eventsBackend && result.eventsBackend !== eventsBackend) {
 		result.eventsBackend = eventsBackend;
-		if (eventsBackend === "pgboss" && !result.services.pgboss) {
-			result = {
-				...result,
-				services: {
-					...result.services,
-					pgboss: {
-						host: result.services.postgres?.host ?? "localhost",
-						port: result.services.postgres?.port ?? 5432,
-						username: "pgboss",
-						password: generateSecurePassword(),
-						database: result.services.postgres?.database ?? "app"
-					}
-				}
-			};
-			logger$1.log("   🔄 Adding missing service credentials: pgboss");
-			changed = true;
-		}
 		if (eventsBackend === "sns" && !result.services.localstack) {
 			result = {
 				...result,
@@ -12427,7 +12384,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-jfx0dsno.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-BjWhjfSp.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);
@@ -12453,7 +12410,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-jfx0dsno.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-BjWhjfSp.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		let secrets = await pullSecrets$1(options.stage, workspace);
 		if (!secrets) {
@@ -12478,7 +12435,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-jfx0dsno.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-BjWhjfSp.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);