@geekmidas/cli 0.28.0 → 0.30.0

package/dist/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env -S npx tsx
-import { __require, getAppBuildOrder, getDependencyEnvVars, getDeployTargetError, isDeployTargetSupported } from "./workspace-DQjmv9lk.mjs";
-import { getAppNameFromCwd, loadAppConfig, loadConfig, loadWorkspaceConfig, parseModuleConfig } from "./config-C9bdq0l-.mjs";
-import { ConstructGenerator, EndpointGenerator, OPENAPI_OUTPUT_PATH, OpenApiTsGenerator, generateOpenApi, openapiCommand, resolveOpenApiConfig } from "./openapi-BCEFhkLh.mjs";
+import { __require, getAppBuildOrder, getDependencyEnvVars, getDeployTargetError, isDeployTargetSupported } from "./workspace-DFJ3sWfY.mjs";
+import { getAppNameFromCwd, loadAppConfig, loadConfig, loadWorkspaceConfig, parseModuleConfig } from "./config-BC5n1a2D.mjs";
+import { ConstructGenerator, EndpointGenerator, OPENAPI_OUTPUT_PATH, OpenApiTsGenerator, generateOpenApi, openapiCommand, resolveOpenApiConfig } from "./openapi-CjYeF-Tg.mjs";
 import { getKeyPath, maskPassword, readStageSecrets, secretsExist, setCustomSecret, toEmbeddableSecrets, writeStageSecrets } from "./storage-Dhst7BhI.mjs";
 import { DokployApi } from "./dokploy-api-B9qR2Yn1.mjs";
 import { generateReactQueryCommand } from "./openapi-react-query-5rSortLH.mjs";
@@ -26,7 +26,7 @@ import prompts from "prompts";
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "0.28.0";
+var version = "0.30.0";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -1016,10 +1016,14 @@ async function devCommand(options) {
 	const appName = getAppNameFromCwd();
 	let config$1;
 	let appRoot = process.cwd();
+	let secretsRoot = process.cwd();
+	let workspaceAppName;
 	if (appName) try {
 		const appConfig = await loadAppConfig();
 		config$1 = appConfig.gkmConfig;
 		appRoot = appConfig.appRoot;
+		secretsRoot = appConfig.workspaceRoot;
+		workspaceAppName = appConfig.appName;
 		logger$8.log(`📦 Running app: ${appConfig.appName}`);
 	} catch {
 		const loadedConfig = await loadWorkspaceConfig();
@@ -1072,7 +1076,16 @@ async function devCommand(options) {
 	await buildServer(config$1, buildContext, resolved.providers[0], enableOpenApi, appRoot);
 	if (enableOpenApi) await generateOpenApi(config$1);
 	const runtime = config$1.runtime ?? "node";
-	const devServer = new DevServer(resolved.providers[0], options.port || 3e3, options.portExplicit ?? false, enableOpenApi, telescope, studio, runtime, appRoot);
+	let secretsJsonPath;
+	const appSecrets = await loadSecretsForApp(secretsRoot, workspaceAppName);
+	if (Object.keys(appSecrets).length > 0) {
+		const secretsDir = join(secretsRoot, ".gkm");
+		await mkdir(secretsDir, { recursive: true });
+		secretsJsonPath = join(secretsDir, "dev-secrets.json");
+		await writeFile(secretsJsonPath, JSON.stringify(appSecrets, null, 2));
+		logger$8.log(`🔐 Loaded ${Object.keys(appSecrets).length} secret(s)`);
+	}
+	const devServer = new DevServer(resolved.providers[0], options.port || 3e3, options.portExplicit ?? false, enableOpenApi, telescope, studio, runtime, appRoot, secretsJsonPath);
 	await devServer.start();
 	const envParserFile = config$1.envParser.split("#")[0] ?? config$1.envParser;
 	const loggerFile = config$1.logger.split("#")[0] ?? config$1.logger;
@@ -1244,6 +1257,31 @@ async function loadDevSecrets(workspace) {
 	return {};
 }
 /**
+* Load secrets from a path for dev mode.
+* For single app: returns secrets as-is.
+* For workspace app: maps {APP}_DATABASE_URL → DATABASE_URL.
+* @internal Exported for testing
+*/
+async function loadSecretsForApp(secretsRoot, appName) {
+	const stages = ["dev", "development"];
+	let secrets = {};
+	for (const stage of stages) if (secretsExist(stage, secretsRoot)) {
+		const stageSecrets = await readStageSecrets(stage, secretsRoot);
+		if (stageSecrets) {
+			logger$8.log(`🔐 Loading secrets from stage: ${stage}`);
+			secrets = toEmbeddableSecrets(stageSecrets);
+			break;
+		}
+	}
+	if (Object.keys(secrets).length === 0) return {};
+	if (!appName) return secrets;
+	const prefix = appName.toUpperCase();
+	const mapped = { ...secrets };
+	const appDbUrl = secrets[`${prefix}_DATABASE_URL`];
+	if (appDbUrl) mapped.DATABASE_URL = appDbUrl;
+	return mapped;
+}
+/**
 * Start docker-compose services for the workspace.
 * @internal Exported for testing
 */
@@ -1488,7 +1526,7 @@ var DevServer = class {
 	serverProcess = null;
 	isRunning = false;
 	actualPort;
-	constructor(provider, requestedPort, portExplicit, enableOpenApi, telescope, studio, runtime = "node", appRoot = process.cwd()) {
+	constructor(provider, requestedPort, portExplicit, enableOpenApi, telescope, studio, runtime = "node", appRoot = process.cwd(), secretsJsonPath) {
 		this.provider = provider;
 		this.requestedPort = requestedPort;
 		this.portExplicit = portExplicit;
@@ -1497,6 +1535,7 @@ var DevServer = class {
 		this.studio = studio;
 		this.runtime = runtime;
 		this.appRoot = appRoot;
+		this.secretsJsonPath = secretsJsonPath;
 		this.actualPort = requestedPort;
 	}
 	async start() {
@@ -1575,10 +1614,20 @@ var DevServer = class {
 		await this.start();
 	}
 	async createServerEntry() {
-		const { writeFile: writeFile$1 } = await import("node:fs/promises");
+		const { writeFile: fsWriteFile } = await import("node:fs/promises");
 		const { relative: relative$1, dirname: dirname$1 } = await import("node:path");
 		const serverPath = join(this.appRoot, ".gkm", this.provider, "server.ts");
 		const relativeAppPath = relative$1(dirname$1(serverPath), join(dirname$1(serverPath), "app.js"));
+		const credentialsInjection = this.secretsJsonPath ? `import { Credentials } from '@geekmidas/envkit/credentials';
+import { existsSync, readFileSync } from 'node:fs';
+
+// Inject dev secrets into Credentials (must happen before app import)
+const secretsPath = '${this.secretsJsonPath}';
+if (existsSync(secretsPath)) {
+  Object.assign(Credentials, JSON.parse(readFileSync(secretsPath, 'utf-8')));
+}
+
+` : "";
 		const serveCode = this.runtime === "bun" ? `Bun.serve({
       port,
       fetch: app.fetch,
@@ -1598,7 +1647,7 @@ var DevServer = class {
  * Development server entry point
  * This file is auto-generated by 'gkm dev'
  */
-import { createApp } from './${relativeAppPath.startsWith(".") ? relativeAppPath : `./${relativeAppPath}`}';
+${credentialsInjection}import { createApp } from './${relativeAppPath.startsWith(".") ? relativeAppPath : `./${relativeAppPath}`}';
 
 const port = process.argv.includes('--port')
   ? Number.parseInt(process.argv[process.argv.indexOf('--port') + 1])
@@ -1618,7 +1667,7 @@ start({
   process.exit(1);
 });
 `;
-		await writeFile$1(serverPath, content);
+		await fsWriteFile(serverPath, content);
 	}
 };
 
@@ -6298,6 +6347,8 @@ function generateWebAppFiles(options) {
 		},
 		dependencies: {
 			[modelsPackage]: "workspace:*",
+			"@geekmidas/client": GEEKMIDAS_VERSIONS["@geekmidas/client"],
+			"@tanstack/react-query": "~5.80.0",
 			next: "~16.1.0",
 			react: "~19.2.0",
 			"react-dom": "~19.2.0"
@@ -6354,7 +6405,68 @@ export default nextConfig;
 		],
 		exclude: ["node_modules"]
 	};
+	const providersTsx = `'use client';
+
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { useState } from 'react';
+
+export function Providers({ children }: { children: React.ReactNode }) {
+  const [queryClient] = useState(
+    () =>
+      new QueryClient({
+        defaultOptions: {
+          queries: {
+            staleTime: 60 * 1000,
+          },
+        },
+      }),
+  );
+
+  return (
+    <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
+  );
+}
+`;
+	const apiIndexTs = `import { TypedFetcher } from '@geekmidas/client/fetcher';
+import { createEndpointHooks } from '@geekmidas/client/endpoint-hooks';
+
+// TODO: Run 'gkm openapi' to generate typed paths from your API
+// This is a placeholder that will be replaced by the generated openapi.ts
+interface paths {
+  '/health': {
+    get: {
+      responses: {
+        200: {
+          content: {
+            'application/json': { status: string; timestamp: string };
+          };
+        };
+      };
+    };
+  };
+  '/users': {
+    get: {
+      responses: {
+        200: {
+          content: {
+            'application/json': { users: Array<{ id: string; name: string }> };
+          };
+        };
+      };
+    };
+  };
+}
+
+const baseURL = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:3000';
+
+const fetcher = new TypedFetcher<paths>({ baseURL });
+
+const hooks = createEndpointHooks<paths>(fetcher.request.bind(fetcher));
+
+export const api = Object.assign(fetcher.request.bind(fetcher), hooks);
+`;
 	const layoutTsx = `import type { Metadata } from 'next';
+import { Providers } from './providers';
 
 export const metadata: Metadata = {
   title: '${options.name}',
@@ -6368,35 +6480,18 @@ export default function RootLayout({
 }) {
   return (
     <html lang="en">
-      <body>{children}</body>
+      <body>
+        <Providers>{children}</Providers>
+      </body>
     </html>
   );
 }
 `;
-	const pageTsx = `import type { User } from '${modelsPackage}';
+	const pageTsx = `import { api } from '@/api';
 
 export default async function Home() {
-  // Example: Fetch from API
-  const apiUrl = process.env.API_URL || 'http://localhost:3000';
-  let health = null;
-
-  try {
-    const response = await fetch(\`\${apiUrl}/health\`, {
-      cache: 'no-store',
-    });
-    health = await response.json();
-  } catch (error) {
-    console.error('Failed to fetch health:', error);
-  }
-
-  // Example: Type-safe model usage
-  const exampleUser: User = {
-    id: '123e4567-e89b-12d3-a456-426614174000',
-    email: 'user@example.com',
-    name: 'Example User',
-    createdAt: new Date(),
-    updatedAt: new Date(),
-  };
+  // Type-safe API call using the generated client
+  const health = await api('GET /health').catch(() => null);
 
   return (
     <main style={{ padding: '2rem', fontFamily: 'system-ui' }}>
@@ -6409,21 +6504,14 @@ export default async function Home() {
             {JSON.stringify(health, null, 2)}
           </pre>
         ) : (
-          <p>Unable to connect to API at {apiUrl}</p>
+          <p>Unable to connect to API</p>
         )}
       </section>
 
-      <section style={{ marginTop: '2rem' }}>
-        <h2>Shared Models</h2>
-        <p>This user object is typed from @${options.name}/models:</p>
-        <pre style={{ background: '#f0f0f0', padding: '1rem', borderRadius: '8px' }}>
-          {JSON.stringify(exampleUser, null, 2)}
-        </pre>
-      </section>
-
       <section style={{ marginTop: '2rem' }}>
         <h2>Next Steps</h2>
         <ul>
+          <li>Run <code>gkm openapi</code> to generate typed API client</li>
           <li>Edit <code>apps/web/src/app/page.tsx</code> to customize this page</li>
           <li>Add API routes in <code>apps/api/src/endpoints/</code></li>
           <li>Define shared schemas in <code>packages/models/src/</code></li>
@@ -6433,11 +6521,8 @@ export default async function Home() {
   );
 }
 `;
-	const envLocal = `# API URL (injected automatically in workspace mode)
-API_URL=http://localhost:3000
-
-# Other environment variables
-# NEXT_PUBLIC_API_URL=http://localhost:3000
+	const envLocal = `# API URL for client-side requests
+NEXT_PUBLIC_API_URL=http://localhost:3000
 `;
 	const gitignore = `.next/
 node_modules/
@@ -6461,10 +6546,18 @@ node_modules/
 			path: "apps/web/src/app/layout.tsx",
 			content: layoutTsx
 		},
+		{
+			path: "apps/web/src/app/providers.tsx",
+			content: providersTsx
+		},
 		{
 			path: "apps/web/src/app/page.tsx",
 			content: pageTsx
 		},
+		{
+			path: "apps/web/src/api/index.ts",
+			content: apiIndexTs
+		},
 		{
 			path: "apps/web/.env.local",
 			content: envLocal