@geekmidas/cli 0.36.0 → 0.38.0

package/dist/index.cjs

@@ -27,7 +27,7 @@ const node_module = require_chunk.__toESM(require("node:module"));
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "0.36.0";
+var version = "0.38.0";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -1566,6 +1566,41 @@ await import('${entryPath}');
 	await (0, node_fs_promises.writeFile)(wrapperPath, content);
 }
 /**
+* Prepare credentials for entry dev mode.
+* Loads workspace config, secrets, and injects PORT.
+* @internal Exported for testing
+*/
+async function prepareEntryCredentials(options) {
+	const cwd = options.cwd ?? process.cwd();
+	let workspaceAppPort;
+	let secretsRoot = cwd;
+	let appName;
+	try {
+		const appConfig = await require_config.loadAppConfig(cwd);
+		workspaceAppPort = appConfig.app.port;
+		secretsRoot = appConfig.workspaceRoot;
+		appName = appConfig.appName;
+	} catch (error) {
+		logger$8.log(`⚠️  Could not load workspace config: ${error.message}`);
+		secretsRoot = findSecretsRoot(cwd);
+		appName = require_config.getAppNameFromCwd(cwd) ?? void 0;
+	}
+	const resolvedPort = options.explicitPort ?? workspaceAppPort ?? 3e3;
+	const credentials = await loadSecretsForApp(secretsRoot, appName);
+	credentials.PORT = String(resolvedPort);
+	const secretsDir = (0, node_path.join)(secretsRoot, ".gkm");
+	await (0, node_fs_promises.mkdir)(secretsDir, { recursive: true });
+	const secretsJsonPath = (0, node_path.join)(secretsDir, "dev-secrets.json");
+	await (0, node_fs_promises.writeFile)(secretsJsonPath, JSON.stringify(credentials, null, 2));
+	return {
+		credentials,
+		resolvedPort,
+		secretsJsonPath,
+		appName,
+		secretsRoot
+	};
+}
+/**
 * Run any TypeScript file with secret injection.
 * Does not require gkm.config.ts.
 */
@@ -1576,37 +1611,15 @@ async function entryDevCommand(options) {
 	if (!(0, node_fs.existsSync)(entryPath)) throw new Error(`Entry file not found: ${entryPath}`);
 	const defaultEnv = loadEnvFiles(".env");
 	if (defaultEnv.loaded.length > 0) logger$8.log(`📦 Loaded env: ${defaultEnv.loaded.join(", ")}`);
-	let workspaceAppPort;
-	let secretsRoot = process.cwd();
-	let appName;
-	try {
-		const appConfig = await require_config.loadAppConfig();
-		workspaceAppPort = appConfig.app.port;
-		secretsRoot = appConfig.workspaceRoot;
-		appName = appConfig.appName;
-		logger$8.log(`📦 App: ${appName} (port ${workspaceAppPort})`);
-	} catch {
-		secretsRoot = findSecretsRoot(process.cwd());
-		appName = require_config.getAppNameFromCwd() ?? void 0;
-		if (appName) logger$8.log(`📦 App name: ${appName}`);
-	}
-	const port = options.port ?? workspaceAppPort ?? 3e3;
-	logger$8.log(`🚀 Starting entry file: ${entry} on port ${port}`);
-	const appSecrets = await loadSecretsForApp(secretsRoot, appName);
-	if (Object.keys(appSecrets).length > 0) logger$8.log(`🔐 Loaded ${Object.keys(appSecrets).length} secret(s)`);
-	else logger$8.log(`⚠️  No secrets found in ${secretsRoot}/.gkm/secrets/`);
-	let secretsJsonPath;
-	if (Object.keys(appSecrets).length > 0) {
-		const secretsDir = (0, node_path.join)(secretsRoot, ".gkm");
-		await (0, node_fs_promises.mkdir)(secretsDir, { recursive: true });
-		secretsJsonPath = (0, node_path.join)(secretsDir, "dev-secrets.json");
-		await (0, node_fs_promises.writeFile)(secretsJsonPath, JSON.stringify(appSecrets, null, 2));
-	}
+	const { credentials, resolvedPort, secretsJsonPath, appName } = await prepareEntryCredentials({ explicitPort: options.portExplicit ? options.port : void 0 });
+	if (appName) logger$8.log(`📦 App: ${appName} (port ${resolvedPort})`);
+	logger$8.log(`🚀 Starting entry file: ${entry} on port ${resolvedPort}`);
+	if (Object.keys(credentials).length > 1) logger$8.log(`🔐 Loaded ${Object.keys(credentials).length - 1} secret(s) + PORT`);
 	const wrapperDir = (0, node_path.join)(process.cwd(), ".gkm");
 	await (0, node_fs_promises.mkdir)(wrapperDir, { recursive: true });
 	const wrapperPath = (0, node_path.join)(wrapperDir, "entry-wrapper.ts");
 	await createEntryWrapper(wrapperPath, entryPath, secretsJsonPath);
-	const runner = new EntryRunner(wrapperPath, entryPath, watch, port);
+	const runner = new EntryRunner(wrapperPath, entryPath, watch, resolvedPort);
 	await runner.start();
 	let isShuttingDown = false;
 	const shutdown = () => {
@@ -5408,7 +5421,6 @@ docker/.env
 
 # IDE
 .idea/
-.vscode/
 *.swp
 *.swo
 
@@ -5461,6 +5473,42 @@ export default defineConfig({
   },
 });
 `;
+	const vscodeSettings = {
+		"search.exclude": {
+			"**/.sst": true,
+			"**/.gkm": true,
+			"**/.turbo": true
+		},
+		"editor.formatOnSave": true,
+		"editor.defaultFormatter": "biomejs.biome",
+		"editor.codeActionsOnSave": {
+			"source.fixAll.biome": "always",
+			"source.organizeImports.biome": "always",
+			"source.organizeImports": "always"
+		},
+		"[typescriptreact]": { "editor.defaultFormatter": "biomejs.biome" },
+		"[typescript]": { "editor.defaultFormatter": "biomejs.biome" },
+		"[javascript]": { "editor.defaultFormatter": "biomejs.biome" },
+		"[json]": { "editor.defaultFormatter": "biomejs.biome" },
+		"cSpell.words": [
+			"betterauth",
+			"dokploy",
+			"envkit",
+			"geekmidas",
+			"healthcheck",
+			"kysely",
+			"testkit",
+			"timestamptz",
+			"turborepo",
+			options.name
+		]
+	};
+	const vscodeExtensions = { recommendations: [
+		"biomejs.biome",
+		"streetsidesoftware.code-spell-checker",
+		"dbaeumer.vscode-eslint",
+		"ms-azuretools.vscode-docker"
+	] };
 	const files = [
 		{
 			path: "package.json",
@@ -5489,6 +5537,14 @@ export default defineConfig({
 		{
 			path: ".gitignore",
 			content: gitignore
+		},
+		{
+			path: ".vscode/settings.json",
+			content: `${JSON.stringify(vscodeSettings, null, "	")}\n`
+		},
+		{
+			path: ".vscode/extensions.json",
+			content: `${JSON.stringify(vscodeExtensions, null, "	")}\n`
 		}
 	];
 	if (isFullstack) files.push({