@geekmidas/cli 0.0.26 → 0.2.0

package/dist/providerResolver-DgvzNfP4.cjs

@@ -0,0 +1,114 @@
+
+//#region src/build/providerResolver.ts
+/**
+* Resolves provider configuration from the new simplified system
+* to the internal legacy format for backward compatibility
+*/
+function resolveProviders(config, options) {
+	const providers = [];
+	let enableOpenApi = options.enableOpenApi || false;
+	if (options.providers) return {
+		providers: options.providers,
+		enableOpenApi
+	};
+	if (options.provider) {
+		const resolvedProviders = resolveMainProvider(options.provider, config.providers);
+		providers.push(...resolvedProviders.providers);
+		enableOpenApi = resolvedProviders.enableOpenApi || enableOpenApi;
+	} else if (config.providers) {
+		const resolvedProviders = resolveAllConfiguredProviders(config.providers);
+		providers.push(...resolvedProviders.providers);
+		enableOpenApi = resolvedProviders.enableOpenApi || enableOpenApi;
+	} else providers.push("aws-apigatewayv2", "aws-lambda");
+	return {
+		providers: [...new Set(providers)],
+		enableOpenApi
+	};
+}
+function resolveMainProvider(mainProvider, providersConfig) {
+	const providers = [];
+	let enableOpenApi = false;
+	if (mainProvider === "aws") {
+		const awsConfig = providersConfig?.aws;
+		if (awsConfig?.apiGateway) {
+			if (isEnabled(awsConfig.apiGateway.v1)) providers.push("aws-apigatewayv1");
+			if (isEnabled(awsConfig.apiGateway.v2)) providers.push("aws-apigatewayv2");
+		} else providers.push("aws-apigatewayv2");
+		if (awsConfig?.lambda) {
+			if (isEnabled(awsConfig.lambda.functions) || isEnabled(awsConfig.lambda.crons)) providers.push("aws-lambda");
+		} else providers.push("aws-lambda");
+	} else if (mainProvider === "server") {
+		providers.push("server");
+		const serverConfig = providersConfig?.server;
+		if (typeof serverConfig === "object" && serverConfig?.enableOpenApi) enableOpenApi = true;
+	}
+	return {
+		providers,
+		enableOpenApi
+	};
+}
+function resolveAllConfiguredProviders(providersConfig) {
+	const providers = [];
+	let enableOpenApi = false;
+	if (providersConfig.aws) {
+		const awsProviders = resolveMainProvider("aws", providersConfig);
+		providers.push(...awsProviders.providers);
+	}
+	if (providersConfig.server && isEnabled(providersConfig.server)) {
+		providers.push("server");
+		if (typeof providersConfig.server === "object" && providersConfig.server.enableOpenApi) enableOpenApi = true;
+	}
+	return {
+		providers,
+		enableOpenApi
+	};
+}
+function isEnabled(config) {
+	if (config === void 0) return false;
+	if (typeof config === "boolean") return config;
+	return config.enabled !== false;
+}
+/**
+* Gets configuration for a specific AWS service
+*/
+function getAWSServiceConfig(config, service, subService) {
+	const awsConfig = config.providers?.aws;
+	if (!awsConfig) return void 0;
+	if (service === "apiGateway" && awsConfig.apiGateway) {
+		const apiConfig = subService ? awsConfig.apiGateway[subService] : void 0;
+		return typeof apiConfig === "object" ? apiConfig : void 0;
+	}
+	if (service === "lambda" && awsConfig.lambda) {
+		const lambdaConfig = subService ? awsConfig.lambda[subService] : void 0;
+		return typeof lambdaConfig === "object" ? lambdaConfig : void 0;
+	}
+	return void 0;
+}
+/**
+* Gets server configuration
+*/
+function getServerConfig(config) {
+	const serverConfig = config.providers?.server;
+	return typeof serverConfig === "object" ? serverConfig : void 0;
+}
+
+//#endregion
+Object.defineProperty(exports, 'getAWSServiceConfig', {
+  enumerable: true,
+  get: function () {
+    return getAWSServiceConfig;
+  }
+});
+Object.defineProperty(exports, 'getServerConfig', {
+  enumerable: true,
+  get: function () {
+    return getServerConfig;
+  }
+});
+Object.defineProperty(exports, 'resolveProviders', {
+  enumerable: true,
+  get: function () {
+    return resolveProviders;
+  }
+});
+//# sourceMappingURL=providerResolver-DgvzNfP4.cjs.map

package/dist/providerResolver-DgvzNfP4.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"providerResolver-DgvzNfP4.cjs","names":["config: GkmConfig","options: BuildOptions","providers: LegacyProvider[]","mainProvider: MainProvider","providersConfig?: ProvidersConfig","providersConfig: ProvidersConfig","config:\n    | boolean\n    | AWSApiGatewayConfig\n    | AWSLambdaConfig\n    | ServerConfig\n    | undefined","service: 'apiGateway' | 'lambda'","subService?: 'v1' | 'v2' | 'functions' | 'crons'"],"sources":["../src/build/providerResolver.ts"],"sourcesContent":["import type {\n  AWSApiGatewayConfig,\n  AWSLambdaConfig,\n  BuildOptions,\n  GkmConfig,\n  LegacyProvider,\n  MainProvider,\n  ProvidersConfig,\n  ServerConfig,\n} from '../types';\n\nexport interface ResolvedProviders {\n  providers: LegacyProvider[];\n  enableOpenApi: boolean;\n}\n\n/**\n * Resolves provider configuration from the new simplified system\n * to the internal legacy format for backward compatibility\n */\nexport function resolveProviders(\n  config: GkmConfig,\n  options: BuildOptions,\n): ResolvedProviders {\n  const providers: LegacyProvider[] = [];\n  let enableOpenApi = options.enableOpenApi || false;\n\n  // Handle legacy providers option (deprecated)\n  if (options.providers) {\n    return {\n      providers: options.providers,\n      enableOpenApi,\n    };\n  }\n\n  // Handle new provider option\n  if (options.provider) {\n    const resolvedProviders = resolveMainProvider(\n      options.provider,\n      config.providers,\n    );\n    providers.push(...resolvedProviders.providers);\n    enableOpenApi = resolvedProviders.enableOpenApi || enableOpenApi;\n  }\n  // Default: build all configured providers\n  else if (config.providers) {\n    const resolvedProviders = resolveAllConfiguredProviders(config.providers);\n    providers.push(...resolvedProviders.providers);\n    enableOpenApi = resolvedProviders.enableOpenApi || enableOpenApi;\n  }\n  // Fallback: use default AWS configuration\n  else {\n    providers.push('aws-apigatewayv2', 'aws-lambda');\n  }\n\n  return {\n    providers: [...new Set(providers)], // Remove duplicates\n    enableOpenApi,\n  };\n}\n\nfunction resolveMainProvider(\n  mainProvider: MainProvider,\n  providersConfig?: ProvidersConfig,\n): ResolvedProviders {\n  const providers: LegacyProvider[] = [];\n  let enableOpenApi = false;\n\n  if (mainProvider === 'aws') {\n    const awsConfig = providersConfig?.aws;\n\n    // Resolve API Gateway providers\n    if (awsConfig?.apiGateway) {\n      if (isEnabled(awsConfig.apiGateway.v1)) {\n        providers.push('aws-apigatewayv1');\n      }\n      if (isEnabled(awsConfig.apiGateway.v2)) {\n        providers.push('aws-apigatewayv2');\n      }\n    } else {\n      // Default: enable v2 if no specific config\n      providers.push('aws-apigatewayv2');\n    }\n\n    // Resolve Lambda providers\n    if (awsConfig?.lambda) {\n      if (\n        isEnabled(awsConfig.lambda.functions) ||\n        isEnabled(awsConfig.lambda.crons)\n      ) {\n        providers.push('aws-lambda');\n      }\n    } else {\n      // Default: enable lambda if no specific config\n      providers.push('aws-lambda');\n    }\n  } else if (mainProvider === 'server') {\n    providers.push('server');\n    const serverConfig = providersConfig?.server;\n\n    if (typeof serverConfig === 'object' && serverConfig?.enableOpenApi) {\n      enableOpenApi = true;\n    }\n  }\n\n  return { providers, enableOpenApi };\n}\n\nfunction resolveAllConfiguredProviders(\n  providersConfig: ProvidersConfig,\n): ResolvedProviders {\n  const providers: LegacyProvider[] = [];\n  let enableOpenApi = false;\n\n  // AWS providers\n  if (providersConfig.aws) {\n    const awsProviders = resolveMainProvider('aws', providersConfig);\n    providers.push(...awsProviders.providers);\n  }\n\n  // Server provider\n  if (providersConfig.server && isEnabled(providersConfig.server)) {\n    providers.push('server');\n    if (\n      typeof providersConfig.server === 'object' &&\n      providersConfig.server.enableOpenApi\n    ) {\n      enableOpenApi = true;\n    }\n  }\n\n  return { providers, enableOpenApi };\n}\n\nfunction isEnabled(\n  config:\n    | boolean\n    | AWSApiGatewayConfig\n    | AWSLambdaConfig\n    | ServerConfig\n    | undefined,\n): boolean {\n  if (config === undefined) return false;\n  if (typeof config === 'boolean') return config;\n  return config.enabled !== false; // Default to true if enabled is not explicitly false\n}\n\n/**\n * Gets configuration for a specific AWS service\n */\nexport function getAWSServiceConfig<\n  T extends AWSApiGatewayConfig | AWSLambdaConfig,\n>(\n  config: GkmConfig,\n  service: 'apiGateway' | 'lambda',\n  subService?: 'v1' | 'v2' | 'functions' | 'crons',\n): T | undefined {\n  const awsConfig = config.providers?.aws;\n  if (!awsConfig) return undefined;\n\n  if (service === 'apiGateway' && awsConfig.apiGateway) {\n    const apiConfig = subService\n      ? awsConfig.apiGateway[subService as 'v1' | 'v2']\n      : undefined;\n    return typeof apiConfig === 'object' ? (apiConfig as T) : undefined;\n  }\n\n  if (service === 'lambda' && awsConfig.lambda) {\n    const lambdaConfig = subService\n      ? awsConfig.lambda[subService as 'functions' | 'crons']\n      : undefined;\n    return typeof lambdaConfig === 'object' ? (lambdaConfig as T) : undefined;\n  }\n\n  return undefined;\n}\n\n/**\n * Gets server configuration\n */\nexport function getServerConfig(config: GkmConfig): ServerConfig | undefined {\n  const serverConfig = config.providers?.server;\n  return typeof serverConfig === 'object' ? serverConfig : undefined;\n}\n"],"mappings":";;;;;;AAoBA,SAAgB,iBACdA,QACAC,SACmB;CACnB,MAAMC,YAA8B,CAAE;CACtC,IAAI,gBAAgB,QAAQ,iBAAiB;AAG7C,KAAI,QAAQ,UACV,QAAO;EACL,WAAW,QAAQ;EACnB;CACD;AAIH,KAAI,QAAQ,UAAU;EACpB,MAAM,oBAAoB,oBACxB,QAAQ,UACR,OAAO,UACR;AACD,YAAU,KAAK,GAAG,kBAAkB,UAAU;AAC9C,kBAAgB,kBAAkB,iBAAiB;CACpD,WAEQ,OAAO,WAAW;EACzB,MAAM,oBAAoB,8BAA8B,OAAO,UAAU;AACzE,YAAU,KAAK,GAAG,kBAAkB,UAAU;AAC9C,kBAAgB,kBAAkB,iBAAiB;CACpD,MAGC,WAAU,KAAK,oBAAoB,aAAa;AAGlD,QAAO;EACL,WAAW,CAAC,GAAG,IAAI,IAAI,UAAW;EAClC;CACD;AACF;AAED,SAAS,oBACPC,cACAC,iBACmB;CACnB,MAAMF,YAA8B,CAAE;CACtC,IAAI,gBAAgB;AAEpB,KAAI,iBAAiB,OAAO;EAC1B,MAAM,YAAY,iBAAiB;AAGnC,MAAI,WAAW,YAAY;AACzB,OAAI,UAAU,UAAU,WAAW,GAAG,CACpC,WAAU,KAAK,mBAAmB;AAEpC,OAAI,UAAU,UAAU,WAAW,GAAG,CACpC,WAAU,KAAK,mBAAmB;EAErC,MAEC,WAAU,KAAK,mBAAmB;AAIpC,MAAI,WAAW,QACb;OACE,UAAU,UAAU,OAAO,UAAU,IACrC,UAAU,UAAU,OAAO,MAAM,CAEjC,WAAU,KAAK,aAAa;EAC7B,MAGD,WAAU,KAAK,aAAa;CAE/B,WAAU,iBAAiB,UAAU;AACpC,YAAU,KAAK,SAAS;EACxB,MAAM,eAAe,iBAAiB;AAEtC,aAAW,iBAAiB,YAAY,cAAc,cACpD,iBAAgB;CAEnB;AAED,QAAO;EAAE;EAAW;CAAe;AACpC;AAED,SAAS,8BACPG,iBACmB;CACnB,MAAMH,YAA8B,CAAE;CACtC,IAAI,gBAAgB;AAGpB,KAAI,gBAAgB,KAAK;EACvB,MAAM,eAAe,oBAAoB,OAAO,gBAAgB;AAChE,YAAU,KAAK,GAAG,aAAa,UAAU;CAC1C;AAGD,KAAI,gBAAgB,UAAU,UAAU,gBAAgB,OAAO,EAAE;AAC/D,YAAU,KAAK,SAAS;AACxB,aACS,gBAAgB,WAAW,YAClC,gBAAgB,OAAO,cAEvB,iBAAgB;CAEnB;AAED,QAAO;EAAE;EAAW;CAAe;AACpC;AAED,SAAS,UACPI,QAMS;AACT,KAAI,kBAAsB,QAAO;AACjC,YAAW,WAAW,UAAW,QAAO;AACxC,QAAO,OAAO,YAAY;AAC3B;;;;AAKD,SAAgB,oBAGdN,QACAO,SACAC,YACe;CACf,MAAM,YAAY,OAAO,WAAW;AACpC,MAAK,UAAW;AAEhB,KAAI,YAAY,gBAAgB,UAAU,YAAY;EACpD,MAAM,YAAY,aACd,UAAU,WAAW;AAEzB,gBAAc,cAAc,WAAY;CACzC;AAED,KAAI,YAAY,YAAY,UAAU,QAAQ;EAC5C,MAAM,eAAe,aACjB,UAAU,OAAO;AAErB,gBAAc,iBAAiB,WAAY;CAC5C;AAED;AACD;;;;AAKD,SAAgB,gBAAgBR,QAA6C;CAC3E,MAAM,eAAe,OAAO,WAAW;AACvC,eAAc,iBAAiB,WAAW;AAC3C"}

package/examples/cron-example.ts

@@ -0,0 +1,45 @@
+import { cron } from '@geekmidas/constructs/crons';
+
+/**
+ * Example cron that generates a daily report at 9 AM UTC
+ */
+export const dailyReport = cron
+  .schedule('cron(0 9 * * ? *)')
+  .timeout(600000) // 10 minutes
+  .handle(async ({ services, logger }) => {
+    logger.info('Generating daily report');
+
+    const reportDate = new Date().toISOString().split('T')[0];
+
+    // Generate report logic here
+    const reportData = {
+      date: reportDate,
+      totalOrders: 150,
+      totalRevenue: 12500.0,
+      topProducts: [
+        { id: 'prod-1', name: 'Widget A', sales: 45 },
+        { id: 'prod-2', name: 'Widget B', sales: 32 },
+      ],
+    };
+
+    logger.info('Daily report generated', reportData);
+
+    return reportData;
+  });
+
+/**
+ * Example cron that runs every hour
+ */
+export const hourlyCleanup = cron
+  .schedule('rate(1 hour)')
+  .timeout(300000) // 5 minutes
+  .handle(async ({ services, logger }) => {
+    logger.info('Running hourly cleanup');
+
+    // Cleanup logic here
+    const itemsCleaned = 42;
+
+    logger.info(`Cleaned ${itemsCleaned} items`);
+
+    return { itemsCleaned };
+  });

package/examples/function-example.ts

@@ -0,0 +1,40 @@
+import { f } from '@geekmidas/constructs/functions';
+import { z } from 'zod';
+
+/**
+ * Example function that processes an order
+ */
+export const processOrder = f
+  .input(
+    z.object({
+      orderId: z.string(),
+      items: z.array(
+        z.object({
+          id: z.string(),
+          quantity: z.number().int().positive(),
+        }),
+      ),
+    }),
+  )
+  .output(
+    z.object({
+      orderId: z.string(),
+      status: z.enum(['processing', 'completed', 'failed']),
+      processedAt: z.string().datetime(),
+    }),
+  )
+  .timeout(300000) // 5 minutes
+  .handle(async ({ input, services, logger }) => {
+    logger.info(`Processing order ${input.orderId}`);
+
+    // Process order logic here
+    for (const item of input.items) {
+      logger.info(`Processing item ${item.id}, quantity: ${item.quantity}`);
+    }
+
+    return {
+      orderId: input.orderId,
+      status: 'completed' as const,
+      processedAt: new Date().toISOString(),
+    };
+  });

package/examples/gkm.config.json

@@ -0,0 +1,22 @@
+{
+  "routes": "./src/endpoints/**/*.ts",
+  "functions": "./src/functions/**/*.ts",
+  "crons": "./src/crons/**/*.ts",
+  "envParser": "./src/env.ts#envParser",
+  "logger": "./src/logger.ts#logger",
+  "providers": {
+    "aws": {
+      "apiGateway": {
+        "v1": false,
+        "v2": true
+      },
+      "lambda": {
+        "functions": true,
+        "crons": true
+      }
+    },
+    "server": {
+      "enableOpenApi": true
+    }
+  }
+}

package/examples/gkm.minimal.config.json

@@ -0,0 +1,7 @@
+{
+  "routes": "./src/endpoints/**/*.ts",
+  "functions": "./src/functions/**/*.ts",
+  "crons": "./src/crons/**/*.ts",
+  "envParser": "./src/env.ts#envParser",
+  "logger": "./src/logger.ts#logger"
+}

package/examples/gkm.production.config.json

@@ -0,0 +1,27 @@
+{
+  "routes": "./src/endpoints/**/*.ts",
+  "functions": "./src/functions/**/*.ts",
+  "crons": "./src/crons/**/*.ts",
+  "envParser": "./src/env.ts#envParser",
+  "logger": "./src/logger.ts#logger",
+  "providers": {
+    "aws": {
+      "apiGateway": {
+        "v2": {
+          "enabled": true,
+          "outputDir": "dist/api-gateway"
+        }
+      },
+      "lambda": {
+        "functions": {
+          "enabled": true,
+          "outputDir": "dist/functions"
+        },
+        "crons": {
+          "enabled": true,
+          "outputDir": "dist/crons"
+        }
+      }
+    }
+  }
+}

package/examples/logger.ts

@@ -1,4 +1,4 @@
-import { ConsoleLogger } from '@geekmidas/api/logger';
+import { ConsoleLogger } from '@geekmidas/logger/console';
 
 // Create a console logger instance
 export const logger = new ConsoleLogger({

package/package.json

@@ -1,26 +1,50 @@
 {
   "name": "@geekmidas/cli",
-  "version": "0.0.26",
+  "version": "0.2.0",
   "private": false,
   "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs"
+    },
+    "./openapi": {
+      "types": "./dist/openapi.d.ts",
+      "import": "./dist/openapi.mjs",
+      "require": "./dist/openapi.cjs"
+    },
+    "./openapi-react-query": {
+      "types": "./dist/openapi-react-query.d.ts",
+      "import": "./dist/openapi-react-query.mjs",
+      "require": "./dist/openapi-react-query.cjs"
+    }
+  },
   "bin": {
     "gkm": "./dist/index.cjs"
   },
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/",
-    "access": "public"
-  },
   "dependencies": {
-    "commander": "~14.0.0",
-    "lodash.get": "~4.4.2",
-    "lodash.set": "~4.3.2",
-    "fast-glob": "~3.3.3"
-  },
-  "peerDependencies": {
-    "@geekmidas/api": "0.0.51"
+    "@apidevtools/swagger-parser": "^10.1.0",
+    "commander": "^12.1.0",
+    "fast-glob": "^3.3.2",
+    "lodash.kebabcase": "^4.1.1",
+    "openapi-typescript": "^7.4.2",
+    "@geekmidas/constructs": "0.0.1",
+    "@geekmidas/schema": "0.0.1",
+    "@geekmidas/envkit": "0.0.7"
   },
   "devDependencies": {
-    "@types/lodash.get": "~4.4.9",
-    "@types/lodash.set": "~4.3.9"
+    "@types/lodash.kebabcase": "^4.1.9",
+    "typescript": "^5.8.2",
+    "vitest": "^3.2.4",
+    "zod": "^3.23.8",
+    "@geekmidas/testkit": "0.0.16",
+    "@geekmidas/logger": "0.0.1"
+  },
+  "scripts": {
+    "ts": "tsc --noEmit --skipLibCheck src/**/*.ts",
+    "test": "vitest",
+    "test:once": "vitest run",
+    "test:coverage": "vitest run --coverage"
   }
 }

package/src/__tests__/config.spec.ts

@@ -0,0 +1,110 @@
+import { writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { loadConfig } from '../config';
+import { cleanupDir, createTempDir } from './test-helpers';
+
+describe('loadConfig', () => {
+  let tempDir: string;
+  let originalCwd: string;
+
+  beforeEach(async () => {
+    tempDir = await createTempDir();
+    originalCwd = process.cwd();
+    process.chdir(tempDir);
+  });
+
+  afterEach(async () => {
+    process.chdir(originalCwd);
+    await cleanupDir(tempDir);
+  });
+
+  it('should load configuration from gkm.config.ts', async () => {
+    const configContent = `
+export default {
+  routes: './src/endpoints/**/*.ts',
+  functions: './src/functions/**/*.ts',
+  crons: './src/crons/**/*.ts',
+  envParser: './src/config/env',
+  logger: './src/config/logger',
+};
+`;
+    await writeFile(join(tempDir, 'gkm.config.ts'), configContent);
+
+    const config = await loadConfig();
+
+    expect(config).toEqual({
+      routes: './src/endpoints/**/*.ts',
+      functions: './src/functions/**/*.ts',
+      crons: './src/crons/**/*.ts',
+      envParser: './src/config/env',
+      logger: './src/config/logger',
+    });
+  });
+
+  it('should load configuration from gkm.config.js', async () => {
+    const configContent = `
+module.exports = {
+  routes: './api/**/*.js',
+  envParser: './config/environment',
+  logger: './config/logging',
+};
+`;
+    await writeFile(join(tempDir, 'gkm.config.js'), configContent);
+
+    const config = await loadConfig();
+
+    expect(config.routes).toBe('./api/**/*.js');
+    expect(config.envParser).toBe('./config/environment');
+    expect(config.logger).toBe('./config/logging');
+  });
+
+  it('should handle configuration with only envParser override', async () => {
+    const configContent = `
+export default {
+  envParser: './my-env#myEnvParser',
+  logger: './my-logger#myLogger',
+};
+`;
+    await writeFile(join(tempDir, 'gkm.config.ts'), configContent);
+
+    const config = await loadConfig();
+
+    expect(config.envParser).toBe('./my-env#myEnvParser');
+    expect(config.logger).toBe('./my-logger#myLogger');
+  });
+
+  it('should handle malformed config file gracefully', async () => {
+    const invalidConfigContent = `
+export default {
+  routes: './endpoints/**/*.ts'
+  // Missing comma - syntax error
+  functions: './functions/**/*.ts'
+};
+`;
+    await writeFile(join(tempDir, 'gkm.config.ts'), invalidConfigContent);
+
+    // Should fall back to defaults when config file has syntax errors
+    await expect(loadConfig()).rejects.toThrow();
+  });
+
+  it('should prefer .ts config over .js config', async () => {
+    const jsConfigContent = `
+module.exports = {
+  routes: './js-routes/**/*.js',
+};
+`;
+    const tsConfigContent = `
+export default {
+  routes: './ts-routes/**/*.ts',
+};
+`;
+
+    await writeFile(join(tempDir, 'gkm.config.js'), jsConfigContent);
+    await writeFile(join(tempDir, 'gkm.config.ts'), tsConfigContent);
+
+    const config = await loadConfig();
+
+    expect(config.routes).toBe('./ts-routes/**/*.ts');
+  });
+});