@geekmidas/cli 1.2.1 → 1.2.3

package/src/dev/index.ts

@@ -46,10 +46,9 @@ import type {
 	TelescopeConfig,
 } from '../types';
 import {
-	generateAllClients,
-	generateClientForFrontend,
-	getDependentFrontends,
-	normalizeRoutes,
+	copyAllClients,
+	copyClientToFrontends,
+	getBackendOpenApiPath,
 } from '../workspace/client-generator.js';
 import {
 	getAppBuildOrder,
@@ -964,12 +963,12 @@ async function workspaceDevCommand(
 		logger.log('✅ Frontend apps validated');
 	}
 
-	// Generate initial clients for frontends with backend dependencies
-	if (frontendApps.length > 0) {
-		const clientResults = await generateAllClients(workspace, { force: true });
-		const generatedCount = clientResults.filter((r) => r.generated).length;
-		if (generatedCount > 0) {
-			logger.log(`\n📦 Generated ${generatedCount} API client(s)`);
+	// Copy initial clients from backends to frontends
+	if (frontendApps.length > 0 && backendApps.length > 0) {
+		const clientResults = await copyAllClients(workspace);
+		const copiedCount = clientResults.filter((r) => r.success).length;
+		if (copiedCount > 0) {
+			logger.log(`\n📦 Copied ${copiedCount} API client(s)`);
 		}
 	}
 
@@ -1058,117 +1057,81 @@ async function workspaceDevCommand(
 		env: turboEnv,
 	});
 
-	// Set up file watcher for backend endpoint changes (smart client regeneration)
-	let endpointWatcher: ReturnType<typeof chokidar.watch> | null = null;
+	// Set up file watcher for backend .gkm/openapi.ts changes (auto-copy to frontends)
+	let openApiWatcher: ReturnType<typeof chokidar.watch> | null = null;
 
 	if (frontendApps.length > 0 && backendApps.length > 0) {
-		// Collect all backend route patterns to watch
-		const watchPatterns: string[] = [];
-		const backendRouteMap = new Map<string, string[]>(); // routes pattern -> backend app names
-
-		for (const [appName, app] of backendApps) {
-			const routePatterns = normalizeRoutes(app.routes);
-			for (const routePattern of routePatterns) {
-				const fullPattern = join(workspace.root, app.path, routePattern);
-				watchPatterns.push(fullPattern);
-
-				// Map pattern to app name for change detection
-				const patternKey = join(app.path, routePattern);
-				const existing = backendRouteMap.get(patternKey) || [];
-				backendRouteMap.set(patternKey, [...existing, appName]);
+		// Collect all backend openapi.ts file paths to watch
+		const openApiPaths: { path: string; appName: string }[] = [];
+
+		for (const [appName] of backendApps) {
+			const openApiPath = getBackendOpenApiPath(workspace, appName);
+			if (openApiPath) {
+				openApiPaths.push({ path: openApiPath, appName });
 			}
 		}
 
-		if (watchPatterns.length > 0) {
-			// Resolve glob patterns to files
-			const resolvedFiles = await fg(watchPatterns, {
-				cwd: workspace.root,
-				absolute: true,
-				onlyFiles: true,
-			});
+		if (openApiPaths.length > 0) {
+			logger.log(
+				`\n👀 Watching ${openApiPaths.length} backend OpenAPI spec(s) for changes`,
+			);
 
-			if (resolvedFiles.length > 0) {
-				logger.log(
-					`\n👀 Watching ${resolvedFiles.length} endpoint file(s) for schema changes`,
-				);
+			// Create a map for quick lookup of app name from path
+			const pathToApp = new Map(openApiPaths.map((p) => [p.path, p.appName]));
 
-				endpointWatcher = chokidar.watch(resolvedFiles, {
-					ignored: /(^|[/\\])\../,
+			openApiWatcher = chokidar.watch(
+				openApiPaths.map((p) => p.path),
+				{
 					persistent: true,
 					ignoreInitial: true,
-				});
-
-				let regenerateTimeout: NodeJS.Timeout | null = null;
+					// Watch parent directory too since file may not exist yet
+					depth: 0,
+				},
+			);
 
-				endpointWatcher.on('change', async (changedPath) => {
-					// Debounce regeneration
-					if (regenerateTimeout) {
-						clearTimeout(regenerateTimeout);
-					}
+			let copyTimeout: NodeJS.Timeout | null = null;
 
-					regenerateTimeout = setTimeout(async () => {
-						// Find which backend app this file belongs to
-						const changedBackends: string[] = [];
-
-						for (const [appName, app] of backendApps) {
-							const routePatterns = normalizeRoutes(app.routes);
-							for (const routePattern of routePatterns) {
-								const routesDir = join(
-									workspace.root,
-									app.path,
-									routePattern.split('*')[0] || '',
-								);
-								if (changedPath.startsWith(routesDir.replace(/\/$/, ''))) {
-									changedBackends.push(appName);
-									break; // Found a match, no need to check other patterns
-								}
-							}
-						}
-
-						if (changedBackends.length === 0) {
-							return;
-						}
+			const handleChange = async (changedPath: string) => {
+				// Debounce to handle rapid changes
+				if (copyTimeout) {
+					clearTimeout(copyTimeout);
+				}
 
-						// Find frontends that depend on changed backends
-						const affectedFrontends = new Set<string>();
-						for (const backend of changedBackends) {
-							const dependents = getDependentFrontends(workspace, backend);
-							for (const frontend of dependents) {
-								affectedFrontends.add(frontend);
-							}
-						}
+				copyTimeout = setTimeout(async () => {
+					const backendAppName = pathToApp.get(changedPath);
+					if (!backendAppName) {
+						return;
+					}
 
-						if (affectedFrontends.size === 0) {
-							return;
-						}
+					logger.log(`\n🔄 OpenAPI spec changed for ${backendAppName}`);
 
-						// Regenerate clients for affected frontends
-						logger.log(
-							`\n🔄 Detected schema change in ${changedBackends.join(', ')}`,
+					try {
+						const results = await copyClientToFrontends(
+							workspace,
+							backendAppName,
+							{ silent: true },
 						);
-
-						for (const frontend of affectedFrontends) {
-							try {
-								const results = await generateClientForFrontend(
-									workspace,
-									frontend,
+						for (const result of results) {
+							if (result.success) {
+								logger.log(
+									`   📦 Copied client to ${result.frontendApp} (${result.endpointCount} endpoints)`,
 								);
-								for (const result of results) {
-									if (result.generated) {
-										logger.log(
-											`   📦 Regenerated client for ${result.frontendApp} (${result.endpointCount} endpoints)`,
-										);
-									}
-								}
-							} catch (error) {
+							} else if (result.error) {
 								logger.error(
-									`   ❌ Failed to regenerate client for ${frontend}: ${(error as Error).message}`,
+									`   ❌ Failed to copy client to ${result.frontendApp}: ${result.error}`,
 								);
 							}
 						}
-					}, 500); // 500ms debounce
-				});
-			}
+					} catch (error) {
+						logger.error(
+							`   ❌ Failed to copy clients: ${(error as Error).message}`,
+						);
+					}
+				}, 200); // 200ms debounce
+			};
+
+			openApiWatcher.on('change', handleChange);
+			openApiWatcher.on('add', handleChange);
 		}
 	}
 
@@ -1180,9 +1143,9 @@ async function workspaceDevCommand(
 
 		logger.log('\n🛑 Shutting down workspace...');
 
-		// Close endpoint watcher
-		if (endpointWatcher) {
-			endpointWatcher.close().catch(() => {});
+		// Close OpenAPI watcher
+		if (openApiWatcher) {
+			openApiWatcher.close().catch(() => {});
 		}
 
 		// Kill turbo process
@@ -1214,8 +1177,8 @@ async function workspaceDevCommand(
 
 		turboProcess.on('exit', (code) => {
 			// Close watcher on exit
-			if (endpointWatcher) {
-				endpointWatcher.close().catch(() => {});
+			if (openApiWatcher) {
+				openApiWatcher.close().catch(() => {});
 			}
 
 			if (code !== null && code !== 0) {
@@ -1294,11 +1257,12 @@ function generateCredentialsInjection(secretsJsonPath: string): string {
 	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');
 }

package/src/generators/OpenApiTsGenerator.ts

@@ -722,7 +722,6 @@ export function createApi(options: CreateApiOptions) {
 `;
 
 		return `// Auto-generated by @geekmidas/cli - DO NOT EDIT
-// Generated: ${new Date().toISOString()}
 
 // ============================================================
 // Security Scheme Type

package/src/init/generators/ui.ts

@@ -317,7 +317,7 @@ export { Button, buttonVariants };
 
 	// src/components/ui/button/button.stories.tsx
 	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',
@@ -488,7 +488,7 @@ export { Card, CardHeader, CardFooter, CardTitle, CardDescription, CardContent }
 
 	// src/components/ui/input/input.stories.tsx
 	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',
@@ -544,7 +544,7 @@ export const WithValue: Story = {
 
 	// src/components/ui/card/card.stories.tsx
 	const cardStories = `import type { Meta, StoryObj } from '@storybook/react';
-import { Button } from '../button';
+import { Button } from '~/components/ui/button';
 import {
   Card,
   CardContent,
@@ -552,8 +552,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',
@@ -635,8 +635,8 @@ export { Label };
 
 	// src/components/ui/label/label.stories.tsx
 	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',
@@ -715,7 +715,7 @@ export { Badge, badgeVariants };
 
 	// src/components/ui/badge/badge.stories.tsx
 	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',
@@ -795,7 +795,7 @@ export { Separator };
 
 	// src/components/ui/separator/separator.stories.tsx
 	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',
@@ -904,11 +904,11 @@ export { Tabs, TabsList, TabsTrigger, TabsContent };
 
 	// src/components/ui/tabs/tabs.stories.tsx
 	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',
@@ -1012,8 +1012,8 @@ export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };
 
 	// src/components/ui/tooltip/tooltip.stories.tsx
 	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',
@@ -1217,10 +1217,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',

package/src/openapi.ts

@@ -27,8 +27,9 @@ export function resolveOpenApiConfig(
 	}
 
 	if (config.openapi === true || config.openapi === undefined) {
+		// Enable by default when not explicitly set (undefined) or explicitly true
 		return {
-			enabled: config.openapi === true,
+			enabled: true,
 			title: 'API Documentation',
 			version: '1.0.0',
 			description: 'Auto-generated API documentation from endpoints',