@geekmidas/cli 1.10.33 → 1.10.35

package/src/dev/index.ts

@@ -55,6 +55,7 @@ import type {
 	TelescopeConfig,
 } from '../types';
 import {
+	type FrontendFramework,
 	getAppBuildOrder,
 	getDependencyEnvVars,
 	type NormalizedWorkspace,
@@ -641,13 +642,79 @@ export function checkPortConflicts(
 }
 
 /**
- * Next.js config file patterns to check.
+ * Per-framework validation spec for supported frontend frameworks.
  */
-const NEXTJS_CONFIG_FILES = [
-	'next.config.js',
-	'next.config.ts',
-	'next.config.mjs',
-];
+interface FrontendFrameworkSpec {
+	displayName: string;
+	configFiles: string[];
+	dependency: string;
+	installCommand: string;
+}
+
+const FRONTEND_FRAMEWORKS: Record<FrontendFramework, FrontendFrameworkSpec> = {
+	nextjs: {
+		displayName: 'Next.js',
+		configFiles: [
+			'next.config.js',
+			'next.config.ts',
+			'next.config.mjs',
+			'next.config.cjs',
+		],
+		dependency: 'next',
+		installCommand: 'pnpm add next react react-dom',
+	},
+	remix: {
+		displayName: 'Remix',
+		configFiles: [
+			'remix.config.js',
+			'remix.config.mjs',
+			'remix.config.ts',
+			'vite.config.js',
+			'vite.config.ts',
+			'vite.config.mjs',
+			'vite.config.cjs',
+		],
+		dependency: '@remix-run/dev',
+		installCommand: 'pnpm add -D @remix-run/dev',
+	},
+	vite: {
+		displayName: 'Vite',
+		configFiles: [
+			'vite.config.js',
+			'vite.config.ts',
+			'vite.config.mjs',
+			'vite.config.cjs',
+		],
+		dependency: 'vite',
+		installCommand: 'pnpm add -D vite',
+	},
+};
+
+/**
+ * Auto-detect the frontend framework by scanning package.json deps and config
+ * files. Dependency match wins over config file match because deps are more
+ * distinctive (a Remix app has both vite.config.ts AND @remix-run/dev).
+ */
+function detectFrontendFramework(
+	fullPath: string,
+	deps: Record<string, string>,
+): FrontendFramework | undefined {
+	const order: FrontendFramework[] = ['nextjs', 'remix', 'vite'];
+	for (const name of order) {
+		if (deps[FRONTEND_FRAMEWORKS[name].dependency]) {
+			return name;
+		}
+	}
+	for (const name of order) {
+		const hasConfig = FRONTEND_FRAMEWORKS[name].configFiles.some((file) =>
+			existsSync(join(fullPath, file)),
+		);
+		if (hasConfig) {
+			return name;
+		}
+	}
+	return undefined;
+}
 
 /**
  * Validation result for a frontend app.
@@ -660,59 +727,88 @@ export interface FrontendValidationResult {
 }
 
 /**
- * Validate a frontend (Next.js) app configuration.
- * Checks for Next.js config file and dependency.
+ * Validate a frontend app configuration.
+ *
+ * If `framework` is provided, validates strictly against that framework's
+ * expected config file and dependency. Otherwise auto-detects the framework
+ * from package.json and config files. If no recognized framework is found, the
+ * app is allowed through with a warning provided it has a `dev` script.
+ *
  * @internal Exported for testing
  */
 export async function validateFrontendApp(
 	appName: string,
 	appPath: string,
 	workspaceRoot: string,
+	framework?: FrontendFramework,
 ): Promise<FrontendValidationResult> {
 	const errors: string[] = [];
 	const warnings: string[] = [];
 	const fullPath = join(workspaceRoot, appPath);
 
-	// Check for Next.js config file
-	const hasConfigFile = NEXTJS_CONFIG_FILES.some((file) =>
-		existsSync(join(fullPath, file)),
-	);
-
-	if (!hasConfigFile) {
+	const packageJsonPath = join(fullPath, 'package.json');
+	if (!existsSync(packageJsonPath)) {
 		errors.push(
-			`Next.js config file not found. Expected one of: ${NEXTJS_CONFIG_FILES.join(', ')}`,
+			`package.json not found at ${appPath}. Run: pnpm init in the app directory.`,
 		);
+		return { appName, valid: false, errors, warnings };
 	}
 
-	// Check for package.json
-	const packageJsonPath = join(fullPath, 'package.json');
-	if (existsSync(packageJsonPath)) {
-		try {
-			// eslint-disable-next-line @typescript-eslint/no-require-imports
-			const pkg = require(packageJsonPath);
-			const deps = { ...pkg.dependencies, ...pkg.devDependencies };
+	let pkg: {
+		dependencies?: Record<string, string>;
+		devDependencies?: Record<string, string>;
+		scripts?: Record<string, string>;
+	};
+	try {
+		// eslint-disable-next-line @typescript-eslint/no-require-imports
+		pkg = require(packageJsonPath);
+	} catch {
+		errors.push(`Failed to read package.json at ${packageJsonPath}`);
+		return { appName, valid: false, errors, warnings };
+	}
 
-			if (!deps.next) {
-				errors.push(
-					'Next.js not found in dependencies. Run: pnpm add next react react-dom',
-				);
-			}
+	const deps: Record<string, string> = {
+		...pkg.dependencies,
+		...pkg.devDependencies,
+	};
 
-			// Check for dev script
-			if (!pkg.scripts?.dev) {
-				warnings.push(
-					'No "dev" script found in package.json. Turbo expects a "dev" script to run.',
-				);
-			}
-		} catch {
-			errors.push(`Failed to read package.json at ${packageJsonPath}`);
+	const resolvedFramework =
+		framework ?? detectFrontendFramework(fullPath, deps);
+
+	if (resolvedFramework) {
+		const spec = FRONTEND_FRAMEWORKS[resolvedFramework];
+		const hasConfig = spec.configFiles.some((file) =>
+			existsSync(join(fullPath, file)),
+		);
+		if (!hasConfig) {
+			errors.push(
+				`${spec.displayName} config file not found. Expected one of: ${spec.configFiles.join(', ')}`,
+			);
+		}
+		if (!deps[spec.dependency]) {
+			errors.push(
+				`${spec.displayName} not found in dependencies. Run: ${spec.installCommand}`,
+			);
 		}
 	} else {
-		errors.push(
-			`package.json not found at ${appPath}. Run: pnpm init in the app directory.`,
+		warnings.push(
+			'No recognized frontend framework detected (Next.js, Vite, Remix). ' +
+				'The app will run via its "dev" script. Set `framework` in your app config to enable strict validation.',
 		);
 	}
 
+	if (!pkg.scripts?.dev) {
+		if (resolvedFramework) {
+			warnings.push(
+				'No "dev" script found in package.json. Turbo expects a "dev" script to run.',
+			);
+		} else {
+			errors.push(
+				'No "dev" script found in package.json. Without a recognized framework or a dev script, there is nothing to run.',
+			);
+		}
+	}
+
 	return {
 		appName,
 		valid: errors.length === 0,
@@ -737,6 +833,7 @@ export async function validateFrontendApps(
 				appName,
 				app.path,
 				workspace.root,
+				app.framework as FrontendFramework | undefined,
 			);
 			results.push(result);
 		}

package/src/generators/Generator.ts

@@ -9,6 +9,26 @@ import {
 	type Routes,
 } from '../types';
 
+/**
+ * Zod v4 maintains a process-wide registry of schemas registered via
+ * `.meta({ id })`. When we cache-bust user module imports (by appending a
+ * `?t=timestamp` query), those modules re-execute and try to register the
+ * same ids again, which throws `ID X already exists in the registry`.
+ *
+ * Clearing the registry in the CLI process is safe: the user's running
+ * server lives in a subprocess and has its own isolated registry.
+ *
+ * Exported for tests.
+ */
+export function clearZodGlobalRegistry(): void {
+	const registry = (
+		globalThis as { __zod_globalRegistry?: { clear?: () => void } }
+	).__zod_globalRegistry;
+	if (registry && typeof registry.clear === 'function') {
+		registry.clear();
+	}
+}
+
 export interface GeneratorOptions {
 	provider?: LegacyProvider;
 	[key: string]: any;
@@ -65,6 +85,13 @@ export abstract class ConstructGenerator<T extends Construct, R = void> {
 			absolute: true,
 		});
 
+		// Cache-busted re-imports re-execute user modules, which would try to
+		// re-register Zod schemas with the same `.meta({ id })`. Clear the
+		// global registry once per load to prevent duplicate-id errors.
+		if (bustCache) {
+			clearZodGlobalRegistry();
+		}
+
 		// Load constructs
 		const constructs: GeneratedConstruct<T>[] = [];
 

package/src/generators/__tests__/Generator.bustCache.spec.ts

@@ -0,0 +1,72 @@
+import { writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { itWithDir } from '@geekmidas/testkit/os';
+import { describe, expect, it } from 'vitest';
+import { z } from 'zod/v4';
+import { EndpointGenerator } from '../EndpointGenerator';
+import { clearZodGlobalRegistry } from '../Generator';
+
+describe('clearZodGlobalRegistry', () => {
+	it('removes an id from the global registry so the same id can be re-registered', () => {
+		// Register once — succeeds
+		z.object({ x: z.string() }).meta({ id: 'BustCacheSchema_A' });
+
+		// Re-registering without clearing throws
+		expect(() =>
+			z.object({ y: z.string() }).meta({ id: 'BustCacheSchema_A' }),
+		).toThrow(/already exists in the registry/);
+
+		// After clearing, the id can be registered again
+		clearZodGlobalRegistry();
+		expect(() =>
+			z.object({ z: z.string() }).meta({ id: 'BustCacheSchema_A' }),
+		).not.toThrow();
+	});
+
+	it('is a no-op when the registry has not been initialised', () => {
+		// Temporarily remove the global registry
+		const g = globalThis as { __zod_globalRegistry?: unknown };
+		const saved = g.__zod_globalRegistry;
+		delete g.__zod_globalRegistry;
+
+		try {
+			// Should not throw even though the registry does not exist
+			expect(() => clearZodGlobalRegistry()).not.toThrow();
+		} finally {
+			g.__zod_globalRegistry = saved;
+		}
+	});
+});
+
+describe('Generator.load — bustCache integration smoke test', () => {
+	itWithDir(
+		'loads an endpoint with .meta({ id }) across multiple cache-busted reloads without throwing',
+		async ({ dir }) => {
+			// Mirrors the real scenario: endpoint output schema registers an
+			// id. Reloading on file change must not throw a duplicate-id error.
+			const endpointFile = join(dir, 'getRentalAgreement.ts');
+			await writeFile(
+				endpointFile,
+				`
+import { e } from '@geekmidas/constructs/endpoints';
+import { z } from 'zod/v4';
+
+export const getRentalAgreement = e
+  .get('/rental-agreement')
+  .output(z.object({ content: z.string() }).meta({ id: 'RentalAgreementOutput' }))
+  .handle(async () => ({ content: 'pdf-content' }));
+`,
+			);
+
+			const generator = new EndpointGenerator();
+			const patterns = join(dir, '**/*.ts');
+
+			// Simulates multiple `gkm dev` reloads
+			for (let i = 0; i < 3; i++) {
+				const loaded = await generator.load(patterns, process.cwd(), true);
+				expect(loaded).toHaveLength(1);
+				expect(loaded[0].key).toBe('getRentalAgreement');
+			}
+		},
+	);
+});

package/src/init/versions.ts

@@ -32,7 +32,7 @@ export const GEEKMIDAS_VERSIONS = {
 	'@geekmidas/cache': '~1.1.0',
 	'@geekmidas/client': '~4.0.4',
 	'@geekmidas/cloud': '~1.0.0',
-	'@geekmidas/constructs': '~3.0.8',
+	'@geekmidas/constructs': '~3.0.9',
 	'@geekmidas/db': '~1.0.1',
 	'@geekmidas/emailkit': '~1.0.0',
 	'@geekmidas/envkit': '~1.0.5',
@@ -45,7 +45,7 @@ export const GEEKMIDAS_VERSIONS = {
 	'@geekmidas/storage': '~2.0.2',
 	'@geekmidas/studio': '~1.0.0',
 	'@geekmidas/telescope': '~1.0.0',
-	'@geekmidas/testkit': '~1.0.5',
+	'@geekmidas/testkit': '~1.0.6',
 	'@geekmidas/cli': CLI_VERSION,
 } as const;