@geekmidas/cli 1.2.1 → 1.2.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @geekmidas/cli
 
+## 1.2.3
+
+### Patch Changes
+
+- 🐛 [`11c96af`](https://github.com/geekmidas/toolbox/commit/11c96af896fa5355f37edd276fc96010cd177ccc) Thanks [@geekmidas](https://github.com/geekmidas)! - Fix cli client generation for monorepos
+
+## 1.2.2
+
+### Patch Changes
+
+- 🐛 [`ab91786`](https://github.com/geekmidas/toolbox/commit/ab917864eaf64793e5bc93818a98caeb5b766324) Thanks [@geekmidas](https://github.com/geekmidas)! - Fix env var injection for dev, and make sure openapi generation for client apps
+
 ## 1.2.1
 
 ### Patch Changes

package/dist/index.cjs

@@ -3,7 +3,7 @@ const require_chunk = require('./chunk-CUT6urMc.cjs');
 const require_workspace = require('./workspace-BMJE18LV.cjs');
 const require_config = require('./config-Bayob8pB.cjs');
 const require_credentials = require('./credentials-C8DWtnMY.cjs');
-const require_openapi = require('./openapi-BZP8jkI4.cjs');
+const require_openapi = require('./openapi-ZhO7wwya.cjs');
 const require_storage = require('./storage-CoCNe0Pt.cjs');
 const require_dokploy_api = require('./dokploy-api-CQvhV6Hd.cjs');
 const require_encryption = require('./encryption-BE0UOb8j.cjs');
@@ -32,7 +32,7 @@ const prompts = require_chunk.__toESM(require("prompts"));
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "1.2.0";
+var version = "1.2.2";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -628,99 +628,61 @@ export async function setupSubscribers(
 //#region src/workspace/client-generator.ts
 const logger$10 = console;
 /**
-* Cache of OpenAPI spec hashes to detect changes.
-*/
-const specHashCache = /* @__PURE__ */ new Map();
-/**
-* Calculate hash of content for change detection.
+* Get frontend apps that depend on a backend app.
 */
-function hashContent(content) {
-	return (0, node_crypto.createHash)("sha256").update(content).digest("hex").slice(0, 16);
+function getDependentFrontends(workspace, backendAppName) {
+	const dependentApps = [];
+	for (const [appName, app] of Object.entries(workspace.apps)) if (app.type === "frontend" && app.dependencies.includes(backendAppName)) dependentApps.push(appName);
+	return dependentApps;
 }
 /**
-* Normalize routes to an array of patterns.
-* @internal Exported for use in dev command
+* Get the path to a backend's OpenAPI spec file.
 */
-function normalizeRoutes(routes) {
-	if (!routes) return [];
-	return Array.isArray(routes) ? routes : [routes];
+function getBackendOpenApiPath(workspace, backendAppName) {
+	const app = workspace.apps[backendAppName];
+	if (!app || app.type !== "backend") return null;
+	return (0, node_path.join)(workspace.root, app.path, ".gkm", "openapi.ts");
 }
 /**
-* Generate OpenAPI spec for a backend app.
-* Returns the spec content and endpoint count.
+* Count endpoints in an OpenAPI spec content.
 */
-async function generateBackendOpenApi(workspace, appName) {
-	const app = workspace.apps[appName];
-	if (!app || app.type !== "backend" || !app.routes) return null;
-	const appPath = (0, node_path.join)(workspace.root, app.path);
-	const routesPatterns = normalizeRoutes(app.routes);
-	if (routesPatterns.length === 0) return null;
-	const endpointGenerator = new require_openapi.EndpointGenerator();
-	const allLoadedEndpoints = [];
-	for (const pattern of routesPatterns) {
-		const fullPattern = (0, node_path.join)(appPath, pattern);
-		const loaded = await endpointGenerator.load(fullPattern);
-		allLoadedEndpoints.push(...loaded);
-	}
-	const loadedEndpoints = allLoadedEndpoints;
-	if (loadedEndpoints.length === 0) return null;
-	const endpoints = loadedEndpoints.map(({ construct }) => construct);
-	const tsGenerator = new require_openapi.OpenApiTsGenerator();
-	const content = await tsGenerator.generate(endpoints, {
-		title: `${appName} API`,
-		version: "1.0.0",
-		description: `Auto-generated API client for ${appName}`
-	});
-	return {
-		content,
-		endpointCount: loadedEndpoints.length
-	};
+function countEndpoints(content) {
+	const endpointMatches = content.match(/'(GET|POST|PUT|PATCH|DELETE)\s+\/[^']+'/g);
+	return endpointMatches?.length ?? 0;
 }
 /**
-* Generate client for a frontend app from its backend dependencies.
-* Only regenerates if the OpenAPI spec has changed.
+* Copy the OpenAPI client from a backend to all dependent frontend apps.
+* Called when the backend's .gkm/openapi.ts file changes.
 */
-async function generateClientForFrontend(workspace, frontendAppName, options = {}) {
+async function copyClientToFrontends(workspace, backendAppName, options = {}) {
+	const log = options.silent ? () => {} : logger$10.log.bind(logger$10);
 	const results = [];
-	const frontendApp = workspace.apps[frontendAppName];
-	if (!frontendApp || frontendApp.type !== "frontend") return results;
-	const dependencies$1 = frontendApp.dependencies || [];
-	const backendDeps = dependencies$1.filter((dep) => {
-		const depApp = workspace.apps[dep];
-		return depApp?.type === "backend" && depApp.routes;
-	});
-	if (backendDeps.length === 0) return results;
-	const clientOutput = frontendApp.client?.output || "src/api";
-	const frontendPath = (0, node_path.join)(workspace.root, frontendApp.path);
-	const outputDir = (0, node_path.join)(frontendPath, clientOutput);
-	for (const backendAppName of backendDeps) {
+	const backendApp = workspace.apps[backendAppName];
+	if (!backendApp || backendApp.type !== "backend") return results;
+	const openApiPath = (0, node_path.join)(workspace.root, backendApp.path, ".gkm", "openapi.ts");
+	if (!(0, node_fs.existsSync)(openApiPath)) return results;
+	const content = await (0, node_fs_promises.readFile)(openApiPath, "utf-8");
+	const endpointCount = countEndpoints(content);
+	const dependentFrontends = getDependentFrontends(workspace, backendAppName);
+	for (const frontendAppName of dependentFrontends) {
+		const frontendApp = workspace.apps[frontendAppName];
+		if (!frontendApp || frontendApp.type !== "frontend") continue;
+		const clientOutput = frontendApp.client?.output;
+		if (!clientOutput) continue;
 		const result = {
 			frontendApp: frontendAppName,
 			backendApp: backendAppName,
 			outputPath: "",
-			endpointCount: 0,
-			generated: false
+			endpointCount,
+			success: false
 		};
 		try {
-			const spec = await generateBackendOpenApi(workspace, backendAppName);
-			if (!spec) {
-				result.reason = "No endpoints found in backend";
-				results.push(result);
-				continue;
-			}
-			result.endpointCount = spec.endpointCount;
-			const cacheKey = `${backendAppName}:${frontendAppName}`;
-			const newHash = hashContent(spec.content);
-			const oldHash = specHashCache.get(cacheKey);
-			if (!options.force && oldHash === newHash) {
-				result.reason = "No schema changes detected";
-				results.push(result);
-				continue;
-			}
+			const frontendPath = (0, node_path.join)(workspace.root, frontendApp.path);
+			const outputDir = (0, node_path.join)(frontendPath, clientOutput);
 			await (0, node_fs_promises.mkdir)(outputDir, { recursive: true });
-			const fileName = backendDeps.length === 1 ? "openapi.ts" : `${backendAppName}-api.ts`;
+			const fileName = `${backendAppName}.ts`;
 			const outputPath = (0, node_path.join)(outputDir, fileName);
-			const backendRelPath = (0, node_path.relative)((0, node_path.dirname)(outputPath), (0, node_path.join)(workspace.root, workspace.apps[backendAppName].path));
+			const backendRelPath = (0, node_path.relative)((0, node_path.dirname)(outputPath), (0, node_path.join)(workspace.root, backendApp.path));
 			const clientContent = `/**
  * Auto-generated API client for ${backendAppName}
  * Generated from: ${backendRelPath}
@@ -728,43 +690,31 @@ async function generateClientForFrontend(workspace, frontendAppName, options = {
  * DO NOT EDIT - This file is automatically regenerated when backend schemas change.
  */
 
-${spec.content}
+${content}
 `;
 			await (0, node_fs_promises.writeFile)(outputPath, clientContent);
-			specHashCache.set(cacheKey, newHash);
 			result.outputPath = outputPath;
-			result.generated = true;
-			results.push(result);
+			result.success = true;
+			log(`📦 Copied client to ${frontendAppName} from ${backendAppName} (${endpointCount} endpoints)`);
 		} catch (error) {
-			result.reason = `Error: ${error.message}`;
-			results.push(result);
+			result.error = error.message;
 		}
+		results.push(result);
 	}
 	return results;
 }
 /**
-* Generate clients for all frontend apps in the workspace.
+* Copy clients from all backends to their dependent frontends.
+* Useful for initial setup or force refresh.
 */
-async function generateAllClients(workspace, options = {}) {
-	const log = options.silent ? () => {} : logger$10.log.bind(logger$10);
+async function copyAllClients(workspace, options = {}) {
 	const allResults = [];
-	for (const [appName, app] of Object.entries(workspace.apps)) if (app.type === "frontend" && app.dependencies.length > 0) {
-		const results = await generateClientForFrontend(workspace, appName, { force: options.force });
-		for (const result of results) {
-			if (result.generated) log(`📦 Generated client for ${result.frontendApp} from ${result.backendApp} (${result.endpointCount} endpoints)`);
-			allResults.push(result);
-		}
+	for (const [appName, app] of Object.entries(workspace.apps)) if (app.type === "backend" && app.routes) {
+		const results = await copyClientToFrontends(workspace, appName, options);
+		allResults.push(...results);
 	}
 	return allResults;
 }
-/**
-* Get frontend apps that depend on a backend app.
-*/
-function getDependentFrontends(workspace, backendAppName) {
-	const dependentApps = [];
-	for (const [appName, app] of Object.entries(workspace.apps)) if (app.type === "frontend" && app.dependencies.includes(backendAppName)) dependentApps.push(appName);
-	return dependentApps;
-}
 
 //#endregion
 //#region src/dev/index.ts
@@ -1264,10 +1214,10 @@ async function workspaceDevCommand(workspace, options) {
 		if (hasErrors) throw new Error("Frontend app validation failed. Fix the issues above and try again.");
 		logger$9.log("✅ Frontend apps validated");
 	}
-	if (frontendApps.length > 0) {
-		const clientResults = await generateAllClients(workspace, { force: true });
-		const generatedCount = clientResults.filter((r) => r.generated).length;
-		if (generatedCount > 0) logger$9.log(`\n📦 Generated ${generatedCount} API client(s)`);
+	if (frontendApps.length > 0 && backendApps.length > 0) {
+		const clientResults = await copyAllClients(workspace);
+		const copiedCount = clientResults.filter((r) => r.success).length;
+		if (copiedCount > 0) logger$9.log(`\n📦 Copied ${copiedCount} API client(s)`);
 	}
 	await startWorkspaceServices(workspace);
 	const secretsEnv = await loadDevSecrets(workspace);
@@ -1328,65 +1278,42 @@ async function workspaceDevCommand(workspace, options) {
 		stdio: "inherit",
 		env: turboEnv
 	});
-	let endpointWatcher = null;
+	let openApiWatcher = null;
 	if (frontendApps.length > 0 && backendApps.length > 0) {
-		const watchPatterns = [];
-		const backendRouteMap = /* @__PURE__ */ new Map();
-		for (const [appName, app] of backendApps) {
-			const routePatterns = normalizeRoutes(app.routes);
-			for (const routePattern of routePatterns) {
-				const fullPattern = (0, node_path.join)(workspace.root, app.path, routePattern);
-				watchPatterns.push(fullPattern);
-				const patternKey = (0, node_path.join)(app.path, routePattern);
-				const existing = backendRouteMap.get(patternKey) || [];
-				backendRouteMap.set(patternKey, [...existing, appName]);
-			}
+		const openApiPaths = [];
+		for (const [appName] of backendApps) {
+			const openApiPath = getBackendOpenApiPath(workspace, appName);
+			if (openApiPath) openApiPaths.push({
+				path: openApiPath,
+				appName
+			});
 		}
-		if (watchPatterns.length > 0) {
-			const resolvedFiles = await (0, fast_glob.default)(watchPatterns, {
-				cwd: workspace.root,
-				absolute: true,
-				onlyFiles: true
+		if (openApiPaths.length > 0) {
+			logger$9.log(`\n👀 Watching ${openApiPaths.length} backend OpenAPI spec(s) for changes`);
+			const pathToApp = new Map(openApiPaths.map((p) => [p.path, p.appName]));
+			openApiWatcher = chokidar.default.watch(openApiPaths.map((p) => p.path), {
+				persistent: true,
+				ignoreInitial: true,
+				depth: 0
 			});
-			if (resolvedFiles.length > 0) {
-				logger$9.log(`\n👀 Watching ${resolvedFiles.length} endpoint file(s) for schema changes`);
-				endpointWatcher = chokidar.default.watch(resolvedFiles, {
-					ignored: /(^|[/\\])\../,
-					persistent: true,
-					ignoreInitial: true
-				});
-				let regenerateTimeout = null;
-				endpointWatcher.on("change", async (changedPath) => {
-					if (regenerateTimeout) clearTimeout(regenerateTimeout);
-					regenerateTimeout = setTimeout(async () => {
-						const changedBackends = [];
-						for (const [appName, app] of backendApps) {
-							const routePatterns = normalizeRoutes(app.routes);
-							for (const routePattern of routePatterns) {
-								const routesDir = (0, node_path.join)(workspace.root, app.path, routePattern.split("*")[0] || "");
-								if (changedPath.startsWith(routesDir.replace(/\/$/, ""))) {
-									changedBackends.push(appName);
-									break;
-								}
-							}
-						}
-						if (changedBackends.length === 0) return;
-						const affectedFrontends = /* @__PURE__ */ new Set();
-						for (const backend of changedBackends) {
-							const dependents = getDependentFrontends(workspace, backend);
-							for (const frontend of dependents) affectedFrontends.add(frontend);
-						}
-						if (affectedFrontends.size === 0) return;
-						logger$9.log(`\n🔄 Detected schema change in ${changedBackends.join(", ")}`);
-						for (const frontend of affectedFrontends) try {
-							const results = await generateClientForFrontend(workspace, frontend);
-							for (const result of results) if (result.generated) logger$9.log(`   📦 Regenerated client for ${result.frontendApp} (${result.endpointCount} endpoints)`);
-						} catch (error) {
-							logger$9.error(`   ❌ Failed to regenerate client for ${frontend}: ${error.message}`);
-						}
-					}, 500);
-				});
-			}
+			let copyTimeout = null;
+			const handleChange = async (changedPath) => {
+				if (copyTimeout) clearTimeout(copyTimeout);
+				copyTimeout = setTimeout(async () => {
+					const backendAppName = pathToApp.get(changedPath);
+					if (!backendAppName) return;
+					logger$9.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$9.log(`   📦 Copied client to ${result.frontendApp} (${result.endpointCount} endpoints)`);
+						else if (result.error) logger$9.error(`   ❌ Failed to copy client to ${result.frontendApp}: ${result.error}`);
+					} catch (error) {
+						logger$9.error(`   ❌ Failed to copy clients: ${error.message}`);
+					}
+				}, 200);
+			};
+			openApiWatcher.on("change", handleChange);
+			openApiWatcher.on("add", handleChange);
 		}
 	}
 	let isShuttingDown = false;
@@ -1394,7 +1321,7 @@ async function workspaceDevCommand(workspace, options) {
 		if (isShuttingDown) return;
 		isShuttingDown = true;
 		logger$9.log("\n🛑 Shutting down workspace...");
-		if (endpointWatcher) endpointWatcher.close().catch(() => {});
+		if (openApiWatcher) openApiWatcher.close().catch(() => {});
 		if (turboProcess.pid) try {
 			process.kill(-turboProcess.pid, "SIGTERM");
 		} catch {
@@ -1412,7 +1339,7 @@ async function workspaceDevCommand(workspace, options) {
 			reject(error);
 		});
 		turboProcess.on("exit", (code) => {
-			if (endpointWatcher) endpointWatcher.close().catch(() => {});
+			if (openApiWatcher) openApiWatcher.close().catch(() => {});
 			if (code !== null && code !== 0) reject(new Error(`Turbo exited with code ${code}`));
 			else resolve$3();
 		});
@@ -1465,11 +1392,12 @@ function generateCredentialsInjection(secretsJsonPath) {
 	return `import { Credentials } from '@geekmidas/envkit/credentials';
 import { existsSync, readFileSync } from 'node:fs';
 
-// Inject dev secrets into Credentials
+// Inject dev secrets into Credentials and process.env
 const secretsPath = '${secretsJsonPath}';
 if (existsSync(secretsPath)) {
   const secrets = JSON.parse(readFileSync(secretsPath, 'utf-8'));
   Object.assign(Credentials, secrets);
+  Object.assign(process.env, secrets);
   // Debug: uncomment to verify preload is running
   // console.log('[gkm preload] Injected', Object.keys(secrets).length, 'credentials');
 }
@@ -8787,7 +8715,7 @@ Button.displayName = 'Button';
 export { Button, buttonVariants };
 `;
 	const buttonStories = `import type { Meta, StoryObj } from '@storybook/react';
-import { Button } from '.';
+import { Button } from '~/components/ui/button';
 
 const meta: Meta<typeof Button> = {
   title: 'Components/Button',
@@ -8952,7 +8880,7 @@ CardFooter.displayName = 'CardFooter';
 export { Card, CardHeader, CardFooter, CardTitle, CardDescription, CardContent };
 `;
 	const inputStories = `import type { Meta, StoryObj } from '@storybook/react';
-import { Input } from '.';
+import { Input } from '~/components/ui/input';
 
 const meta: Meta<typeof Input> = {
   title: 'Components/Input',
@@ -9006,7 +8934,7 @@ export const WithValue: Story = {
 };
 `;
 	const cardStories = `import type { Meta, StoryObj } from '@storybook/react';
-import { Button } from '../button';
+import { Button } from '~/components/ui/button';
 import {
   Card,
   CardContent,
@@ -9014,8 +8942,8 @@ import {
   CardFooter,
   CardHeader,
   CardTitle,
-} from '.';
-import { Input } from '../input';
+} from '~/components/ui/card';
+import { Input } from '~/components/ui/input';
 
 const meta: Meta<typeof Card> = {
   title: 'Components/Card',
@@ -9093,8 +9021,8 @@ Label.displayName = LabelPrimitive.Root.displayName;
 export { Label };
 `;
 	const labelStories = `import type { Meta, StoryObj } from '@storybook/react';
-import { Input } from '../input';
-import { Label } from '.';
+import { Input } from '~/components/ui/input';
+import { Label } from '~/components/ui/label';
 
 const meta: Meta<typeof Label> = {
   title: 'Components/Label',
@@ -9169,7 +9097,7 @@ function Badge({ className, variant, ...props }: BadgeProps) {
 export { Badge, badgeVariants };
 `;
 	const badgeStories = `import type { Meta, StoryObj } from '@storybook/react';
-import { Badge } from '.';
+import { Badge } from '~/components/ui/badge';
 
 const meta: Meta<typeof Badge> = {
   title: 'Components/Badge',
@@ -9245,7 +9173,7 @@ Separator.displayName = SeparatorPrimitive.Root.displayName;
 export { Separator };
 `;
 	const separatorStories = `import type { Meta, StoryObj } from '@storybook/react';
-import { Separator } from '.';
+import { Separator } from '~/components/ui/separator';
 
 const meta: Meta<typeof Separator> = {
   title: 'Components/Separator',
@@ -9350,11 +9278,11 @@ TabsContent.displayName = TabsPrimitive.Content.displayName;
 export { Tabs, TabsList, TabsTrigger, TabsContent };
 `;
 	const tabsStories = `import type { Meta, StoryObj } from '@storybook/react';
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '.';
-import { Button } from '../button';
-import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from '../card';
-import { Input } from '../input';
-import { Label } from '../label';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '~/components/ui/tabs';
+import { Button } from '~/components/ui/button';
+import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from '~/components/ui/card';
+import { Input } from '~/components/ui/input';
+import { Label } from '~/components/ui/label';
 
 const meta: Meta<typeof Tabs> = {
   title: 'Components/Tabs',
@@ -9454,8 +9382,8 @@ TooltipContent.displayName = TooltipPrimitive.Content.displayName;
 export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };
 `;
 	const tooltipStories = `import type { Meta, StoryObj } from '@storybook/react';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '.';
-import { Button } from '../button';
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '~/components/ui/tooltip';
+import { Button } from '~/components/ui/button';
 
 const meta: Meta<typeof Tooltip> = {
   title: 'Components/Tooltip',
@@ -9655,10 +9583,10 @@ import {
   DialogHeader,
   DialogTitle,
   DialogTrigger,
-} from '.';
-import { Button } from '../button';
-import { Input } from '../input';
-import { Label } from '../label';
+} from '~/components/ui/dialog';
+import { Button } from '~/components/ui/button';
+import { Input } from '~/components/ui/input';
+import { Label } from '~/components/ui/label';
 
 const meta: Meta<typeof Dialog> = {
   title: 'Components/Dialog',