@geekmidas/cli 0.2.4 → 0.4.0

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@geekmidas/cli",
-  "version": "0.2.4",
+  "version": "0.4.0",
+  "description": "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs",
   "private": false,
   "type": "module",
   "exports": {
@@ -44,11 +45,17 @@
     "@geekmidas/testkit": "0.0.17"
   },
   "peerDependencies": {
-    "@geekmidas/constructs": "~0.0.21",
-    "@geekmidas/envkit": "~0.0.8",
+    "@geekmidas/constructs": "~0.1.0",
+    "@geekmidas/envkit": "~0.1.0",
     "@geekmidas/logger": "~0.0.1",
+    "@geekmidas/telescope": "~0.0.1",
     "@geekmidas/schema": "~0.0.2"
   },
+  "peerDependenciesMeta": {
+    "@geekmidas/telescope": {
+      "optional": true
+    }
+  },
   "scripts": {
     "ts": "tsc --noEmit --skipLibCheck src/**/*.ts",
     "test": "vitest",

package/src/__tests__/openapi.spec.ts

@@ -22,9 +22,8 @@ describe('OpenAPI Generation', () => {
     vi.restoreAllMocks();
   });
 
-  describe('openapiCommand', () => {
-    it('should generate OpenAPI spec for endpoints', async () => {
-      // Create endpoint file
+  describe('openapiCommand - TypeScript output (default)', () => {
+    it('should generate TypeScript module by default', async () => {
       await createMockEndpointFile(
         tempDir,
         'getUser.ts',
@@ -33,7 +32,6 @@ describe('OpenAPI Generation', () => {
         'GET',
       );
 
-      // Create config file
       await createTestFile(
         tempDir,
         'gkm.config.json',
@@ -42,56 +40,58 @@ describe('OpenAPI Generation', () => {
         }),
       );
 
-      const outputPath = join(tempDir, 'openapi.json');
-
-      // Mock process.cwd
-      vi.spyOn(process, 'cwd').mockReturnValue(tempDir);
+      const outputPath = join(tempDir, 'openapi.ts');
 
-      await openapiCommand({ output: outputPath });
+      await openapiCommand({ output: outputPath, cwd: tempDir });
 
-      // Verify file was created
       expect(existsSync(outputPath)).toBe(true);
 
-      // Verify content
       const content = await readFile(outputPath, 'utf-8');
-      const spec = JSON.parse(content);
 
-      expect(spec).toHaveProperty('openapi');
-      expect(spec).toHaveProperty('info');
-      expect(spec.info.title).toBe('API Documentation');
-      expect(spec).toHaveProperty('paths');
-      expect(Object.keys(spec.paths).length).toBeGreaterThan(0);
+      expect(content).toContain('// Auto-generated by @geekmidas/cli');
+      expect(content).toContain('export const securitySchemes');
+      expect(content).toContain('export const endpointAuth');
+      expect(content).toContain('export interface paths');
     });
 
-    it('should handle no endpoints found', async () => {
-      // Create config with no matching files
+    it('should include endpoint auth map', async () => {
+      await createMockEndpointFile(
+        tempDir,
+        'getUser.ts',
+        'getUser',
+        '/users/:id',
+        'GET',
+      );
+
       await createTestFile(
         tempDir,
         'gkm.config.json',
         JSON.stringify({
-          routes: [`${tempDir}/nonexistent/**/*.ts`],
+          routes: [`${tempDir}/**/*.ts`],
         }),
       );
 
-      vi.spyOn(process, 'cwd').mockReturnValue(tempDir);
-      const consoleSpy = vi.spyOn(console, 'log');
+      const outputPath = join(tempDir, 'openapi.ts');
 
-      await openapiCommand({ output: join(tempDir, 'openapi.json') });
+      await openapiCommand({ output: outputPath, cwd: tempDir });
 
-      expect(consoleSpy).toHaveBeenCalledWith('No valid endpoints found');
+      const content = await readFile(outputPath, 'utf-8');
+
+      expect(content).toContain('endpointAuth');
+      expect(content).toContain("'GET /users/{id}'");
     });
+  });
 
-    it('should use default output path when not specified', async () => {
-      // Create endpoint file
+  describe('openapiCommand - JSON output (legacy)', () => {
+    it('should generate JSON OpenAPI spec with --json flag', async () => {
       await createMockEndpointFile(
         tempDir,
-        'endpoint.ts',
-        'testEndpoint',
-        '/test',
+        'getUser.ts',
+        'getUser',
+        '/users/:id',
         'GET',
       );
 
-      // Create config
       await createTestFile(
         tempDir,
         'gkm.config.json',
@@ -100,16 +100,43 @@ describe('OpenAPI Generation', () => {
         }),
       );
 
-      vi.spyOn(process, 'cwd').mockReturnValue(tempDir);
+      const outputPath = join(tempDir, 'openapi.json');
+
+      await openapiCommand({ output: outputPath, json: true, cwd: tempDir });
+
+      expect(existsSync(outputPath)).toBe(true);
+
+      const content = await readFile(outputPath, 'utf-8');
+      const spec = JSON.parse(content);
+
+      expect(spec).toHaveProperty('openapi');
+      expect(spec).toHaveProperty('info');
+      expect(spec.info.title).toBe('API Documentation');
+      expect(spec).toHaveProperty('paths');
+      expect(Object.keys(spec.paths).length).toBeGreaterThan(0);
+    });
+
+    it('should handle no endpoints found', async () => {
+      await createTestFile(
+        tempDir,
+        'gkm.config.json',
+        JSON.stringify({
+          routes: [`${tempDir}/nonexistent/**/*.ts`],
+        }),
+      );
+
+      const consoleSpy = vi.spyOn(console, 'log');
 
-      await openapiCommand();
+      await openapiCommand({
+        output: join(tempDir, 'openapi.json'),
+        json: true,
+        cwd: tempDir,
+      });
 
-      // Should create openapi.json in current directory
-      expect(existsSync(join(tempDir, 'openapi.json'))).toBe(true);
+      expect(consoleSpy).toHaveBeenCalledWith('No valid endpoints found');
     });
 
     it('should generate spec with multiple endpoints', async () => {
-      // Create multiple endpoint files
       await createMockEndpointFile(
         tempDir,
         'getUsers.ts',
@@ -132,7 +159,6 @@ describe('OpenAPI Generation', () => {
         'DELETE',
       );
 
-      // Create config
       await createTestFile(
         tempDir,
         'gkm.config.json',
@@ -142,19 +168,16 @@ describe('OpenAPI Generation', () => {
       );
 
       const outputPath = join(tempDir, 'openapi.json');
-      vi.spyOn(process, 'cwd').mockReturnValue(tempDir);
 
-      await openapiCommand({ output: outputPath });
+      await openapiCommand({ output: outputPath, json: true, cwd: tempDir });
 
       const content = await readFile(outputPath, 'utf-8');
       const spec = JSON.parse(content);
 
-      // Should have multiple paths
       expect(Object.keys(spec.paths).length).toBeGreaterThanOrEqual(1);
     });
 
     it('should create output directory if it does not exist', async () => {
-      // Create endpoint file
       await createMockEndpointFile(
         tempDir,
         'endpoint.ts',
@@ -163,7 +186,6 @@ describe('OpenAPI Generation', () => {
         'GET',
       );
 
-      // Create config
       await createTestFile(
         tempDir,
         'gkm.config.json',
@@ -173,15 +195,13 @@ describe('OpenAPI Generation', () => {
       );
 
       const outputPath = join(tempDir, 'nested', 'dir', 'openapi.json');
-      vi.spyOn(process, 'cwd').mockReturnValue(tempDir);
 
-      await openapiCommand({ output: outputPath });
+      await openapiCommand({ output: outputPath, json: true, cwd: tempDir });
 
       expect(existsSync(outputPath)).toBe(true);
     });
 
     it('should include API metadata in spec', async () => {
-      // Create endpoint
       await createMockEndpointFile(
         tempDir,
         'endpoint.ts',
@@ -190,7 +210,6 @@ describe('OpenAPI Generation', () => {
         'GET',
       );
 
-      // Create config
       await createTestFile(
         tempDir,
         'gkm.config.json',
@@ -200,9 +219,8 @@ describe('OpenAPI Generation', () => {
       );
 
       const outputPath = join(tempDir, 'openapi.json');
-      vi.spyOn(process, 'cwd').mockReturnValue(tempDir);
 
-      await openapiCommand({ output: outputPath });
+      await openapiCommand({ output: outputPath, json: true, cwd: tempDir });
 
       const content = await readFile(outputPath, 'utf-8');
       const spec = JSON.parse(content);
@@ -214,7 +232,7 @@ describe('OpenAPI Generation', () => {
       });
     });
 
-    it('should log generation success', async () => {
+    it('should log generation success for JSON', async () => {
       // Create endpoint
       await createMockEndpointFile(
         tempDir,
@@ -234,13 +252,12 @@ describe('OpenAPI Generation', () => {
       );
 
       const outputPath = join(tempDir, 'openapi.json');
-      vi.spyOn(process, 'cwd').mockReturnValue(tempDir);
       const consoleSpy = vi.spyOn(console, 'log');
 
-      await openapiCommand({ output: outputPath });
+      await openapiCommand({ output: outputPath, json: true, cwd: tempDir });
 
       expect(consoleSpy).toHaveBeenCalledWith(
-        expect.stringContaining('OpenAPI spec generated'),
+        expect.stringContaining('OpenAPI JSON spec generated'),
       );
       expect(consoleSpy).toHaveBeenCalledWith(expect.stringContaining('Found'));
       expect(consoleSpy).toHaveBeenCalledWith(
@@ -250,11 +267,9 @@ describe('OpenAPI Generation', () => {
 
     it('should throw error when config loading fails', async () => {
       // No config file created
-      vi.spyOn(process, 'cwd').mockReturnValue(tempDir);
-
-      await expect(openapiCommand()).rejects.toThrow(
-        /OpenAPI generation failed/,
-      );
+      await expect(
+        openapiCommand({ json: true, cwd: tempDir }),
+      ).rejects.toThrow(/OpenAPI generation failed/);
     });
 
     it('should throw error for invalid TypeScript files', async () => {
@@ -274,11 +289,13 @@ describe('OpenAPI Generation', () => {
         }),
       );
 
-      vi.spyOn(process, 'cwd').mockReturnValue(tempDir);
-
       // Should throw error for syntax errors
       await expect(
-        openapiCommand({ output: join(tempDir, 'openapi.json') }),
+        openapiCommand({
+          output: join(tempDir, 'openapi.json'),
+          json: true,
+          cwd: tempDir,
+        }),
       ).rejects.toThrow(/OpenAPI generation failed/);
     });
 
@@ -302,9 +319,8 @@ describe('OpenAPI Generation', () => {
       );
 
       const outputPath = join(tempDir, 'openapi.json');
-      vi.spyOn(process, 'cwd').mockReturnValue(tempDir);
 
-      await openapiCommand({ output: outputPath });
+      await openapiCommand({ output: outputPath, json: true, cwd: tempDir });
 
       const content = await readFile(outputPath, 'utf-8');
 
@@ -348,9 +364,8 @@ export const complexEndpoint = e
       );
 
       const outputPath = join(tempDir, 'openapi.json');
-      vi.spyOn(process, 'cwd').mockReturnValue(tempDir);
 
-      await openapiCommand({ output: outputPath });
+      await openapiCommand({ output: outputPath, json: true, cwd: tempDir });
 
       const content = await readFile(outputPath, 'utf-8');
       const spec = JSON.parse(content);

package/src/build/__tests__/index-new.spec.ts

@@ -82,6 +82,20 @@ export default {
           'utf-8',
         );
         expect(endpointsContent).toContain('HonoEndpoint');
+
+        // Verify server manifest was created at .gkm/manifest/server.ts
+        const manifestPath = join(dir, '.gkm', 'manifest', 'server.ts');
+        const manifestContent = await readFile(manifestPath, 'utf-8');
+
+        // Verify manifest structure
+        expect(manifestContent).toContain('export const manifest = {');
+        expect(manifestContent).toContain('} as const;');
+        expect(manifestContent).toContain('app:');
+        expect(manifestContent).toContain('routes:');
+
+        // Verify derived types are exported
+        expect(manifestContent).toContain('export type Route =');
+        expect(manifestContent).toContain('export type Authorizer =');
       } finally {
         process.chdir(originalCwd);
       }
@@ -202,78 +216,35 @@ export default {
           ),
         ).toContain('AmazonApiGatewayV2Endpoint');
 
-        // Verify unified manifest was created at root .gkm directory
-        const manifestPath = join(dir, '.gkm', 'manifest.json');
-        const manifest = JSON.parse(await readFile(manifestPath, 'utf-8'));
-
-        // Verify manifest structure includes all routes from both providers
-        expect(manifest).toMatchObject({
-          routes: expect.arrayContaining([
-            // Routes from aws-lambda provider
-            expect.objectContaining({
-              path: '/users',
-              method: 'GET',
-              handler: expect.stringContaining(
-                'routes/getUsersEndpoint.handler',
-              ),
-            }),
-            expect.objectContaining({
-              path: '/posts',
-              method: 'POST',
-              handler: expect.stringContaining(
-                'routes/getPostsEndpoint.handler',
-              ),
-            }),
-            // Routes from aws-apigatewayv2 provider
-            expect.objectContaining({
-              path: '/users',
-              method: 'GET',
-              handler: expect.stringContaining('getUsersEndpoint.handler'),
-            }),
-            expect.objectContaining({
-              path: '/posts',
-              method: 'POST',
-              handler: expect.stringContaining('getPostsEndpoint.handler'),
-            }),
-          ]),
-          functions: expect.arrayContaining([
-            expect.objectContaining({
-              name: 'processDataFunction',
-              handler: expect.stringContaining(
-                'functions/processDataFunction.handler',
-              ),
-              timeout: 300,
-            }),
-            expect.objectContaining({
-              name: 'sendEmailFunction',
-              handler: expect.stringContaining(
-                'functions/sendEmailFunction.handler',
-              ),
-              timeout: 30,
-            }),
-          ]),
-          crons: expect.arrayContaining([
-            expect.objectContaining({
-              name: 'dailyCleanupCron',
-              handler: expect.stringContaining(
-                'crons/dailyCleanupCron.handler',
-              ),
-              schedule: 'rate(1 day)',
-            }),
-            expect.objectContaining({
-              name: 'hourlyReportCron',
-              handler: expect.stringContaining(
-                'crons/hourlyReportCron.handler',
-              ),
-              schedule: 'cron(0 * * * ? *)',
-            }),
-          ]),
-        });
-
-        // Verify counts - should have duplicated routes (one for each provider)
-        expect(manifest.routes).toHaveLength(4); // 2 routes x 2 providers
-        expect(manifest.functions).toHaveLength(2);
-        expect(manifest.crons).toHaveLength(2);
+        // Verify AWS manifest was created at .gkm/manifest/aws.ts
+        const manifestPath = join(dir, '.gkm', 'manifest', 'aws.ts');
+        const manifestContent = await readFile(manifestPath, 'utf-8');
+
+        // Verify manifest is TypeScript with as const
+        expect(manifestContent).toContain('export const manifest = {');
+        expect(manifestContent).toContain('} as const;');
+
+        // Verify derived types are exported
+        expect(manifestContent).toContain('export type Route =');
+        expect(manifestContent).toContain('export type Function =');
+        expect(manifestContent).toContain('export type Cron =');
+        expect(manifestContent).toContain('export type Authorizer =');
+
+        // Verify routes are included (JSON.stringify output uses quoted keys/values)
+        expect(manifestContent).toContain('/users');
+        expect(manifestContent).toContain('/posts');
+        expect(manifestContent).toContain('GET');
+        expect(manifestContent).toContain('POST');
+
+        // Verify functions are included
+        expect(manifestContent).toContain('processDataFunction');
+        expect(manifestContent).toContain('sendEmailFunction');
+
+        // Verify crons are included
+        expect(manifestContent).toContain('dailyCleanupCron');
+        expect(manifestContent).toContain('hourlyReportCron');
+        expect(manifestContent).toContain('rate(1 day)');
+        expect(manifestContent).toContain('cron(0 * * * ? *)');
       } finally {
         process.chdir(originalCwd);
       }