@geekmidas/cli 0.49.0 → 0.51.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekmidas/cli",
-  "version": "0.49.0",
+  "version": "0.51.0",
   "description": "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs",
   "private": false,
   "type": "module",
@@ -49,8 +49,8 @@
     "openapi-typescript": "^7.4.2",
     "pg": "~8.17.1",
     "prompts": "~2.4.2",
-    "@geekmidas/constructs": "~0.8.0",
     "@geekmidas/envkit": "~0.7.0",
+    "@geekmidas/constructs": "~0.8.0",
     "@geekmidas/errors": "~0.1.0",
     "@geekmidas/logger": "~0.4.0",
     "@geekmidas/schema": "~0.1.0"

package/src/deploy/index.ts

@@ -338,9 +338,11 @@ async function initializePostgresUsers(
 			// Create or update user (handles existing users)
 			await client.query(`
 				DO $$ BEGIN
-					CREATE USER "${user.name}" WITH PASSWORD '${user.password}';
-				EXCEPTION WHEN duplicate_object THEN
-					ALTER USER "${user.name}" WITH PASSWORD '${user.password}';
+					IF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = '${user.name}') THEN
+						CREATE USER "${user.name}" WITH PASSWORD '${user.password}';
+					ELSE
+						ALTER USER "${user.name}" WITH PASSWORD '${user.password}';
+					END IF;
 				END $$;
 			`);
 

package/src/deploy/sniffer-envkit-patch.ts

@@ -22,6 +22,21 @@ if (!globalThis.__envSniffer) {
 	globalThis.__envSniffer = new SnifferEnvironmentParser();
 }
 
+// Type for the config parser returned by create()
+interface ConfigParser<T> {
+	parse(): T;
+	safeParse(): { success: true; data: T } | { success: false; error: Error };
+}
+
+// Type for the env fetcher function
+type EnvFetcher = (name: string) => {
+	string(): { parse(): string; safeParse(): unknown };
+	number(): { parse(): number; safeParse(): unknown };
+	boolean(): { parse(): boolean; safeParse(): unknown };
+	optional(): EnvFetcher;
+	default(value: unknown): EnvFetcher;
+};
+
 /**
  * Patched EnvironmentParser that uses the global sniffer instance.
  *
@@ -30,9 +45,10 @@ if (!globalThis.__envSniffer) {
  * parameter for API compatibility but ignores it since we're sniffing.
  */
 class PatchedEnvironmentParser {
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	create(builder: (get: any) => any) {
-		return globalThis.__envSniffer!.create(builder);
+	create<TReturn extends Record<string, unknown>>(
+		builder: (get: EnvFetcher) => TReturn,
+	): ConfigParser<TReturn> {
+		return globalThis.__envSniffer!.create(builder) as ConfigParser<TReturn>;
 	}
 }
 

package/src/deploy/sniffer-hooks.ts

@@ -7,13 +7,18 @@
  * This file is registered via module.register() from sniffer-loader.ts.
  */
 
+import { existsSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 // Resolve path to the patched envkit module
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-const patchedEnvkitPath = join(__dirname, 'sniffer-envkit-patch.ts');
+
+// Try .mjs first (production dist), then .ts (development)
+const mjsPath = join(__dirname, 'sniffer-envkit-patch.mjs');
+const tsPath = join(__dirname, 'sniffer-envkit-patch.ts');
+const patchedEnvkitPath = existsSync(mjsPath) ? mjsPath : tsPath;
 
 type ResolveContext = {
 	conditions: string[];

package/src/deploy/sniffer-loader.ts

@@ -7,9 +7,10 @@
  * variables an entry app accesses.
  *
  * Usage:
- *   node --import tsx --import ./sniffer-loader.ts ./sniffer-worker.ts /path/to/entry.ts
+ *   node --import tsx --import ./sniffer-loader.mjs ./sniffer-worker.mjs /path/to/entry.ts
  */
 
+import { existsSync } from 'node:fs';
 import { register } from 'node:module';
 import { dirname, join } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
@@ -17,7 +18,11 @@ import { fileURLToPath, pathToFileURL } from 'node:url';
 // Resolve path to the loader hooks module
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-const hooksPath = join(__dirname, 'sniffer-hooks.ts');
+
+// Try .mjs first (production dist), then .ts (development)
+const mjsPath = join(__dirname, 'sniffer-hooks.mjs');
+const tsPath = join(__dirname, 'sniffer-hooks.ts');
+const hooksPath = existsSync(mjsPath) ? mjsPath : tsPath;
 
 // Register the loader hooks
 register(pathToFileURL(hooksPath).href, import.meta.url);

package/src/deploy/sniffer.ts

@@ -1,3 +1,4 @@
+import { existsSync } from 'node:fs';
 import { spawn } from 'node:child_process';
 import { dirname, resolve } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
@@ -7,6 +8,39 @@ import type { NormalizedAppConfig } from '../workspace/types.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
+/**
+ * Resolve the path to a sniffer helper file.
+ * Handles both dev (.ts with tsx) and production (.mjs from dist).
+ *
+ * In production: sniffer.ts is bundled into dist/index.mjs, but sniffer helper
+ * files are output to dist/deploy/ as standalone modules for subprocess loading.
+ *
+ * In development: All files are in src/deploy/ and loaded via tsx.
+ */
+function resolveSnifferFile(baseName: string): string {
+	// Try deploy/ subdirectory first (production: bundled code is at dist/index.mjs,
+	// but sniffer files are at dist/deploy/)
+	const deployMjsPath = resolve(__dirname, 'deploy', `${baseName}.mjs`);
+	if (existsSync(deployMjsPath)) {
+		return deployMjsPath;
+	}
+
+	// Try same directory .mjs (production: if running from dist/deploy/ directly)
+	const mjsPath = resolve(__dirname, `${baseName}.mjs`);
+	if (existsSync(mjsPath)) {
+		return mjsPath;
+	}
+
+	// Try same directory .ts (development with tsx: all files in src/deploy/)
+	const tsPath = resolve(__dirname, `${baseName}.ts`);
+	if (existsSync(tsPath)) {
+		return tsPath;
+	}
+
+	// Fallback to .ts (will error if neither exists)
+	return tsPath;
+}
+
 // Re-export SniffResult for consumers
 export type { SniffResult } from '@geekmidas/envkit/sniffer';
 
@@ -134,8 +168,8 @@ async function sniffEntryFile(
 	workspacePath: string,
 ): Promise<EntrySniffResult> {
 	const fullEntryPath = resolve(workspacePath, appPath, entryPath);
-	const loaderPath = resolve(__dirname, 'sniffer-loader.ts');
-	const workerPath = resolve(__dirname, 'sniffer-worker.ts');
+	const loaderPath = resolveSnifferFile('sniffer-loader');
+	const workerPath = resolveSnifferFile('sniffer-worker');
 
 	return new Promise((resolvePromise) => {
 		const child = spawn(

package/tsdown.config.ts

@@ -7,6 +7,11 @@ export default defineConfig({
 		'src/workspace/index.ts',
 		'src/openapi.ts',
 		'src/openapi-react-query.ts',
+		// Sniffer files need to be standalone for subprocess loading via --import
+		'src/deploy/sniffer-loader.ts',
+		'src/deploy/sniffer-worker.ts',
+		'src/deploy/sniffer-hooks.ts',
+		'src/deploy/sniffer-envkit-patch.ts',
 	],
 	dts: true,
 	format: ['cjs', 'esm'],