@geekmidas/cli 0.37.0 → 0.38.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekmidas/cli",
-  "version": "0.37.0",
+  "version": "0.38.0",
   "description": "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs",
   "private": false,
   "type": "module",
@@ -48,11 +48,11 @@
     "lodash.kebabcase": "^4.1.1",
     "openapi-typescript": "^7.4.2",
     "prompts": "~2.4.2",
+    "@geekmidas/schema": "~0.1.0",
     "@geekmidas/constructs": "~0.6.0",
+    "@geekmidas/envkit": "~0.5.0",
     "@geekmidas/errors": "~0.1.0",
-    "@geekmidas/schema": "~0.1.0",
-    "@geekmidas/logger": "~0.4.0",
-    "@geekmidas/envkit": "~0.5.0"
+    "@geekmidas/logger": "~0.4.0"
   },
   "devDependencies": {
     "@types/lodash.kebabcase": "^4.1.9",

package/src/dev/__tests__/entry-integration.spec.ts

@@ -1,7 +1,7 @@
 import { mkdir, readFile, rm, writeFile } from 'node:fs/promises';
-import { join } from 'node:path';
 import { tmpdir } from 'node:os';
-import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { join } from 'node:path';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { prepareEntryCredentials } from '../index';
 
 describe('prepareEntryCredentials', () => {
@@ -179,6 +179,90 @@ export default defineWorkspace({
 		});
 	});
 
+	describe('with GKM_CONFIG_PATH set (turbo environment)', () => {
+		const originalEnv = process.env.GKM_CONFIG_PATH;
+
+		beforeEach(async () => {
+			// Create workspace structure
+			const gkmConfig = `
+import { defineWorkspace } from '@geekmidas/cli/config';
+
+export default defineWorkspace({
+  name: 'test-workspace',
+  apps: {
+    api: {
+      type: 'backend',
+      path: 'apps/api',
+      port: 3000,
+      routes: './src/endpoints/**/*.ts',
+      envParser: './src/config/env#envParser',
+      logger: './src/config/logger#logger',
+    },
+    auth: {
+      type: 'backend',
+      path: 'apps/auth',
+      port: 3002,
+      envParser: './src/config/env#envParser',
+      logger: './src/config/logger#logger',
+    },
+  },
+  services: {},
+});
+`;
+			await writeFile(join(workspaceDir, 'gkm.config.ts'), gkmConfig);
+
+			// Create apps directories
+			await mkdir(join(workspaceDir, 'apps', 'api', 'src'), {
+				recursive: true,
+			});
+			await mkdir(join(workspaceDir, 'apps', 'auth', 'src'), {
+				recursive: true,
+			});
+
+			// Create package.json files
+			await writeFile(
+				join(workspaceDir, 'apps', 'api', 'package.json'),
+				JSON.stringify({ name: '@test/api', version: '0.0.1' }, null, 2),
+			);
+			await writeFile(
+				join(workspaceDir, 'apps', 'auth', 'package.json'),
+				JSON.stringify({ name: '@test/auth', version: '0.0.1' }, null, 2),
+			);
+
+			// Set GKM_CONFIG_PATH like turbo does
+			process.env.GKM_CONFIG_PATH = join(workspaceDir, 'gkm.config.ts');
+		});
+
+		afterEach(() => {
+			// Restore original env
+			if (originalEnv === undefined) {
+				delete process.env.GKM_CONFIG_PATH;
+			} else {
+				process.env.GKM_CONFIG_PATH = originalEnv;
+			}
+		});
+
+		it('should read port from workspace config when GKM_CONFIG_PATH is set', async () => {
+			const authDir = join(workspaceDir, 'apps', 'auth');
+
+			const result = await prepareEntryCredentials({ cwd: authDir });
+
+			expect(result.resolvedPort).toBe(3002);
+			expect(result.credentials.PORT).toBe('3002');
+			expect(result.appName).toBe('auth');
+		});
+
+		it('should read port 3000 for api when GKM_CONFIG_PATH is set', async () => {
+			const apiDir = join(workspaceDir, 'apps', 'api');
+
+			const result = await prepareEntryCredentials({ cwd: apiDir });
+
+			expect(result.resolvedPort).toBe(3000);
+			expect(result.credentials.PORT).toBe('3000');
+			expect(result.appName).toBe('api');
+		});
+	});
+
 	describe('with secrets', () => {
 		beforeEach(async () => {
 			// Create workspace with secrets

package/src/dev/index.ts

@@ -1344,8 +1344,9 @@ export async function prepareEntryCredentials(options: {
 		workspaceAppPort = appConfig.app.port;
 		secretsRoot = appConfig.workspaceRoot;
 		appName = appConfig.appName;
-	} catch {
+	} catch (error) {
 		// Not in a workspace - use defaults
+		logger.log(`⚠️  Could not load workspace config: ${(error as Error).message}`);
 		secretsRoot = findSecretsRoot(cwd);
 		appName = getAppNameFromCwd(cwd) ?? undefined;
 	}
@@ -1398,8 +1399,11 @@ async function entryDevCommand(options: DevOptions): Promise<void> {
 	}
 
 	// Prepare credentials (loads workspace config, secrets, injects PORT)
+	// Only pass explicitPort if --port was actually specified by the user
 	const { credentials, resolvedPort, secretsJsonPath, appName } =
-		await prepareEntryCredentials({ explicitPort: options.port });
+		await prepareEntryCredentials({
+			explicitPort: options.portExplicit ? options.port : undefined,
+		});
 
 	if (appName) {
 		logger.log(`📦 App: ${appName} (port ${resolvedPort})`);