@geekmidas/cli 1.3.0 → 1.5.0

package/dist/index.mjs

@@ -1,9 +1,9 @@
 #!/usr/bin/env -S npx tsx
 import { __require } from "./chunk-Duj1WY3L.mjs";
-import { getAppBuildOrder, getDependencyEnvVars, getDeployTargetError, isDeployTargetSupported } from "./workspace-Cb_I7oCJ.mjs";
-import { getAppNameFromCwd, loadAppConfig, loadConfig, loadWorkspaceConfig, parseModuleConfig } from "./config-C1bidhvG.mjs";
+import { getAppBuildOrder, getDependencyEnvVars, getDeployTargetError, isDeployTargetSupported } from "./workspace-BW2iU37P.mjs";
+import { getAppNameFromCwd, loadAppConfig, loadConfig, loadWorkspaceConfig, parseModuleConfig } from "./config-DfCJ29PQ.mjs";
 import { getCredentialsPath, getDokployCredentials, getDokployRegistryId, getDokployToken, removeDokployCredentials, storeDokployCredentials, storeDokployRegistryId } from "./credentials-s1kLcIzK.mjs";
-import { ConstructGenerator, EndpointGenerator, OPENAPI_OUTPUT_PATH, generateOpenApi, openapiCommand, resolveOpenApiConfig } from "./openapi-9k6a6VA4.mjs";
+import { ConstructGenerator, EndpointGenerator, OPENAPI_OUTPUT_PATH, generateOpenApi, openapiCommand, resolveOpenApiConfig } from "./openapi-BcSjLfWq.mjs";
 import { getKeyPath, maskPassword, readStageSecrets, secretsExist, setCustomSecret, toEmbeddableSecrets, writeStageSecrets } from "./storage-DmCbr6DI.mjs";
 import { DokployApi } from "./dokploy-api-z0833e7r.mjs";
 import { encryptSecrets } from "./encryption-BOH5M-f-.mjs";
@@ -32,7 +32,7 @@ import prompts from "prompts";
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "1.2.3";
+var version = "1.4.0";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -2203,7 +2203,7 @@ async function createDnsProvider(options) {
 		return new HostingerProvider();
 	}
 	if (provider === "route53") {
-		const { Route53Provider } = await import("./Route53Provider-DOWmFnwN.mjs");
+		const { Route53Provider } = await import("./Route53Provider-C8mS0zY6.mjs");
 		const route53Config = config$1;
 		return new Route53Provider({
 			region: route53Config.region,
@@ -4137,33 +4137,6 @@ function isMainFrontendApp(appName, app, allApps) {
 	for (const [name$1, a] of Object.entries(allApps)) if (a.type === "frontend") return name$1 === appName;
 	return false;
 }
-/**
-* Generate public URL build args for a frontend app based on its dependencies.
-*
-* @param app - The frontend app configuration
-* @param deployedUrls - Map of app name to deployed public URL
-* @returns Array of build args like 'NEXT_PUBLIC_API_URL=https://api.example.com'
-*/
-function generatePublicUrlBuildArgs(app, deployedUrls) {
-	const buildArgs = [];
-	for (const dep of app.dependencies) {
-		const publicUrl = deployedUrls[dep];
-		if (publicUrl) {
-			const envVarName = `NEXT_PUBLIC_${dep.toUpperCase()}_URL`;
-			buildArgs.push(`${envVarName}=${publicUrl}`);
-		}
-	}
-	return buildArgs;
-}
-/**
-* Get public URL arg names from app dependencies.
-*
-* @param app - The frontend app configuration
-* @returns Array of arg names like 'NEXT_PUBLIC_API_URL'
-*/
-function getPublicUrlArgNames(app) {
-	return app.dependencies.map((dep) => `NEXT_PUBLIC_${dep.toUpperCase()}_URL`);
-}
 
 //#endregion
 //#region src/deploy/env-resolver.ts
@@ -4224,6 +4197,12 @@ function resolveEnvVar(varName, context) {
 			if (context.masterKey) return context.masterKey;
 			break;
 	}
+	if (context.dependencyUrls && varName.endsWith("_URL")) {
+		let depName;
+		if (varName.startsWith("NEXT_PUBLIC_")) depName = varName.slice(12, -4).toLowerCase();
+		else depName = varName.slice(0, -4).toLowerCase();
+		if (context.dependencyUrls[depName]) return context.dependencyUrls[depName];
+	}
 	if (context.userSecrets) {
 		if (context.userSecrets.custom[varName]) return context.userSecrets.custom[varName];
 		if (varName in context.userSecrets.urls) return context.userSecrets.urls[varName];
@@ -4633,14 +4612,29 @@ function resolveSnifferFile(baseName) {
 */
 async function sniffAppEnvironment(app, appName, workspacePath, options = {}) {
 	const { logWarnings = true } = options;
-	if (app.type === "frontend") return {
-		appName,
-		requiredEnvVars: []
-	};
-	if (app.requiredEnv && app.requiredEnv.length > 0) return {
-		appName,
-		requiredEnvVars: [...app.requiredEnv]
-	};
+	if (app.type === "frontend") {
+		const depVars = (app.dependencies ?? []).map((dep) => `NEXT_PUBLIC_${dep.toUpperCase()}_URL`);
+		if (app.config) {
+			const sniffedVars = [];
+			const configPaths = [];
+			if (app.config.client) configPaths.push(app.config.client);
+			if (app.config.server) configPaths.push(app.config.server);
+			for (const configPath of configPaths) {
+				const result = await sniffEntryFile(configPath, app.path, workspacePath);
+				if (logWarnings && result.error) console.warn(`[sniffer] ${appName}: Config file "${configPath}" threw error during sniffing (env vars still captured): ${result.error.message}`);
+				sniffedVars.push(...result.envVars);
+			}
+			const allVars = [...new Set([...depVars, ...sniffedVars])];
+			return {
+				appName,
+				requiredEnvVars: allVars
+			};
+		}
+		return {
+			appName,
+			requiredEnvVars: depVars
+		};
+	}
 	if (app.entry) {
 		const result = await sniffEntryFile(app.entry, app.path, workspacePath);
 		if (logWarnings && result.error) console.warn(`[sniffer] ${appName}: Entry file threw error during sniffing (env vars still captured): ${result.error.message}`);
@@ -5596,6 +5590,10 @@ async function workspaceDeployCommand(workspace, options) {
 					buildArgs
 				});
 				const backendHost = resolveHost(appName, app, stage, dokployConfig, false);
+				const dependencyUrls = {};
+				if (app.dependencies) {
+					for (const dep of app.dependencies) if (publicUrls[dep]) dependencyUrls[dep] = publicUrls[dep];
+				}
 				const envContext = {
 					app,
 					appName,
@@ -5615,7 +5613,8 @@ async function workspaceDeployCommand(workspace, options) {
 					appHostname: backendHost,
 					frontendUrls,
 					userSecrets: stageSecrets ?? void 0,
-					masterKey: appSecrets?.masterKey
+					masterKey: appSecrets?.masterKey,
+					dependencyUrls
 				};
 				const appRequirements = sniffedApps.get(appName);
 				const sniffedVars = appRequirements?.requiredEnvVars ?? [];
@@ -5701,8 +5700,33 @@ async function workspaceDeployCommand(workspace, options) {
 					else logger$1.log(`      Found existing application: ${application.applicationId}`);
 				}
 				setApplicationId(state, appName, application.applicationId);
-				const buildArgs = generatePublicUrlBuildArgs(app, publicUrls);
-				if (buildArgs.length > 0) logger$1.log(`      Public URLs: ${buildArgs.join(", ")}`);
+				const dependencyUrls = {};
+				if (app.dependencies) {
+					for (const dep of app.dependencies) if (publicUrls[dep]) dependencyUrls[dep] = publicUrls[dep];
+				}
+				const isMainFrontend = isMainFrontendApp(appName, app, workspace.apps);
+				const frontendHost = resolveHost(appName, app, stage, dokployConfig, isMainFrontend);
+				const envContext = {
+					app,
+					appName,
+					stage,
+					state,
+					appHostname: frontendHost,
+					frontendUrls: [],
+					userSecrets: stageSecrets ?? void 0,
+					dependencyUrls
+				};
+				const sniffedVars = sniffedApps.get(appName)?.requiredEnvVars ?? [];
+				const { valid, missing, resolved } = validateEnvVars(sniffedVars, envContext);
+				if (!valid) throw new Error(formatMissingVarsError(appName, missing, stage));
+				if (Object.keys(resolved).length > 0) logger$1.log(`      Resolved ${Object.keys(resolved).length} env vars: ${Object.keys(resolved).join(", ")}`);
+				const buildArgs = [];
+				const publicUrlArgNames = [];
+				for (const [key, value] of Object.entries(resolved)) if (key.startsWith("NEXT_PUBLIC_")) {
+					buildArgs.push(`${key}=${value}`);
+					publicUrlArgNames.push(key);
+				}
+				if (buildArgs.length > 0) logger$1.log(`      Build args: ${publicUrlArgNames.join(", ")}`);
 				const imageName = `${workspace.name}-${appName}`;
 				const imageRef = registry ? `${registry}/${imageName}:${imageTag}` : `${imageName}:${imageTag}`;
 				logger$1.log(`      Building Docker image: ${imageRef}`);
@@ -5716,19 +5740,18 @@ async function workspaceDeployCommand(workspace, options) {
 						appName
 					},
 					buildArgs,
-					publicUrlArgs: getPublicUrlArgNames(app)
+					publicUrlArgs: publicUrlArgNames
 				});
 				const envVars = [
 					`NODE_ENV=production`,
 					`PORT=${app.port}`,
 					`STAGE=${stage}`
 				];
+				for (const [key, value] of Object.entries(resolved)) envVars.push(`${key}=${value}`);
 				await api.saveDockerProvider(application.applicationId, imageRef, { registryId });
 				await api.saveApplicationEnv(application.applicationId, envVars.join("\n"));
 				logger$1.log(`      Deploying to Dokploy...`);
 				await api.deployApplication(application.applicationId);
-				const isMainFrontend = isMainFrontendApp(appName, app, workspace.apps);
-				const frontendHost = resolveHost(appName, app, stage, dokployConfig, isMainFrontend);
 				const existingFrontendDomains = await api.getDomainsByApplicationId(application.applicationId);
 				const existingFrontendDomain = existingFrontendDomains.find((d) => d.host === frontendHost);
 				if (existingFrontendDomain) {
@@ -7083,6 +7106,7 @@ function generateMonorepoFiles(options, _template) {
 			"@biomejs/biome": "~2.3.0",
 			"@geekmidas/cli": GEEKMIDAS_VERSIONS["@geekmidas/cli"],
 			esbuild: "~0.27.0",
+			tsx: "~4.20.0",
 			turbo: "~2.3.0",
 			typescript: "~5.8.2",
 			vitest: "~4.0.0"
@@ -7329,7 +7353,8 @@ export default defineWorkspace({
       port: 3000,
       routes: '${getRoutesGlob()}',
       envParser: './src/config/env#envParser',
-      logger: './src/config/logger#logger',`;
+      logger: './src/config/logger#logger',
+      dependencies: ['auth'],`;
 	if (telescope) config$1 += `
       telescope: {
         enabled: true,
@@ -7354,6 +7379,10 @@ export default defineWorkspace({
       path: 'apps/web',
       port: 3001,
       dependencies: ['api', 'auth'],
+      config: {
+        client: './src/config/client.ts',
+        server: './src/config/server.ts',
+      },
       client: {
         output: './src/api',
       },
@@ -9948,12 +9977,42 @@ export function getQueryClient() {
   if (!browserQueryClient) browserQueryClient = makeQueryClient();
   return browserQueryClient;
 }
+`;
+	const clientConfigTs = `import { EnvironmentParser } from '@geekmidas/envkit';
+
+// Client config - only NEXT_PUBLIC_* vars (available in browser)
+// These values are inlined at build time by Next.js
+const envParser = new EnvironmentParser({
+  NEXT_PUBLIC_API_URL: process.env.NEXT_PUBLIC_API_URL,
+  NEXT_PUBLIC_AUTH_URL: process.env.NEXT_PUBLIC_AUTH_URL,
+});
+
+export const clientConfig = envParser
+  .create((get) => ({
+    apiUrl: get('NEXT_PUBLIC_API_URL').string(),
+    authUrl: get('NEXT_PUBLIC_AUTH_URL').string(),
+  }))
+  .parse();
+`;
+	const serverConfigTs = `import { EnvironmentParser } from '@geekmidas/envkit';
+
+// Server config - all env vars (server-side only, not exposed to browser)
+// Access these only in Server Components, Route Handlers, or Server Actions
+const envParser = new EnvironmentParser({ ...process.env });
+
+export const serverConfig = envParser
+  .create((get) => ({
+    // Add server-only secrets here
+    // Example: stripeSecretKey: get('STRIPE_SECRET_KEY').string(),
+  }))
+  .parse();
 `;
 	const authClientTs = `import { createAuthClient } from 'better-auth/react';
 import { magicLinkClient } from 'better-auth/client/plugins';
+import { clientConfig } from '~/config/client';
 
 export const authClient = createAuthClient({
-  baseURL: process.env.NEXT_PUBLIC_AUTH_URL || 'http://localhost:3002',
+  baseURL: clientConfig.authUrl,
   plugins: [magicLinkClient()],
 });
 
@@ -9974,9 +10033,10 @@ export function Providers({ children }: { children: React.ReactNode }) {
 `;
 	const apiIndexTs = `import { createApi } from './openapi';
 import { getQueryClient } from '~/lib/query-client';
+import { clientConfig } from '~/config/client';
 
 export const api = createApi({
-  baseURL: process.env.NEXT_PUBLIC_API_URL || 'http://localhost:3000',
+  baseURL: clientConfig.apiUrl,
   queryClient: getQueryClient(),
 });
 `;
@@ -10097,6 +10157,14 @@ node_modules/
 			path: "apps/web/src/app/page.tsx",
 			content: pageTsx
 		},
+		{
+			path: "apps/web/src/config/client.ts",
+			content: clientConfigTs
+		},
+		{
+			path: "apps/web/src/config/server.ts",
+			content: serverConfigTs
+		},
 		{
 			path: "apps/web/src/lib/query-client.ts",
 			content: queryClientTs