@geekmidas/cli 0.0.9 → 0.0.11

package/src/build.ts

@@ -2,8 +2,6 @@ import { mkdir, writeFile } from 'node:fs/promises';
 import { dirname, join, relative } from 'path';
 import { loadConfig } from './config.js';
 import { loadEndpoints } from './loadEndpoints.js';
-import { loadTsConfig, getOutputPath } from './tsconfig.js';
-import { resolveModuleSpecifier } from './helpers/pathResolver.js';
 import type {
   BuildOptions,
   Provider,
@@ -19,14 +17,6 @@ export async function buildCommand(options: BuildOptions): Promise<void> {
   logger.log(`Loading routes from: ${config.routes}`);
   logger.log(`Using envParser: ${config.envParser}`);
 
-  // Load tsconfig if available
-  const tsConfig = config.tsconfig
-    ? loadTsConfig(config.tsconfig)
-    : loadTsConfig();
-  if (tsConfig) {
-    logger.log(`Using TypeScript config from: ${tsConfig.configPath}`);
-  }
-
   // Parse envParser configuration
   const [envParserPath, envParserName] = config.envParser.split('#');
   const envParserImportPattern = !envParserName
@@ -53,7 +43,7 @@ export async function buildCommand(options: BuildOptions): Promise<void> {
 
   const allEndpoints = loadedEndpoints.map(({ name, endpoint, file }) => {
     const routeInfo: RouteInfo = {
-      path: endpoint.route,
+      path: endpoint._path,
       method: endpoint.method,
       handler: '', // Will be filled in later
     };
@@ -90,7 +80,6 @@ export async function buildCommand(options: BuildOptions): Promise<void> {
         envParserImportPattern,
         loggerPath,
         loggerImportPattern,
-        tsConfig,
       );
 
       routes.push({
@@ -111,7 +100,6 @@ export async function buildCommand(options: BuildOptions): Promise<void> {
           routeInfo,
           envParserPath,
           envParserImportPattern,
-          tsConfig,
         );
 
         routes.push({
@@ -152,7 +140,6 @@ async function generateServerFile(
   envParserImportPattern: string,
   loggerPath: string,
   loggerImportPattern: string,
-  tsConfig: ReturnType<typeof loadTsConfig>,
 ): Promise<string> {
   const serverFileName = 'app.ts';
   const serverPath = join(outputDir, serverFileName);
@@ -161,13 +148,8 @@ async function generateServerFile(
   const importsByFile = new Map<string, string[]>();
 
   for (const { file, exportName } of endpoints) {
-    const absoluteFilePath = join(process.cwd(), file);
-    // Use path resolver to handle tsconfig paths
-    const importPath = resolveModuleSpecifier(
-      serverPath,
-      absoluteFilePath,
-      tsConfig,
-    );
+    const relativePath = relative(dirname(serverPath), file);
+    const importPath = relativePath.replace(/\.ts$/, '.js');
 
     if (!importsByFile.has(importPath)) {
       importsByFile.set(importPath, []);
@@ -175,16 +157,8 @@ async function generateServerFile(
     importsByFile.get(importPath)!.push(exportName);
   }
 
-  const relativeEnvParserPath = resolveModuleSpecifier(
-    serverPath,
-    envParserPath,
-    tsConfig,
-  );
-  const relativeLoggerPath = resolveModuleSpecifier(
-    serverPath,
-    loggerPath,
-    tsConfig,
-  );
+  const relativeEnvParserPath = relative(dirname(serverPath), envParserPath);
+  const relativeLoggerPath = relative(dirname(serverPath), loggerPath);
 
   // Generate import statements
   const imports = Array.from(importsByFile.entries())
@@ -198,7 +172,7 @@ async function generateServerFile(
 
   const content = `import { HonoEndpoint } from '@geekmidas/api/hono';
 import { Endpoint } from '@geekmidas/api/server';
-import { HermodServiceDiscovery } from '@geekmidas/api/services';
+import { ServiceDiscovery } from '@geekmidas/api/services';
 import { Hono } from 'hono';
 import ${envParserImportPattern} from '${relativeEnvParserPath}';
 import ${loggerImportPattern} from '${relativeLoggerPath}';
@@ -211,7 +185,7 @@ export function createApp(app?: Hono): Hono {
     ${allExportNames.join(',\n    ')}
   ];
 
-  const serviceDiscovery = HermodServiceDiscovery.getInstance(
+  const serviceDiscovery = ServiceDiscovery.getInstance(
     logger,
     envParser
   );
@@ -237,24 +211,14 @@ async function generateHandlerFile(
   _routeInfo: RouteInfo,
   envParserPath: string,
   envParserImportPattern: string,
-  tsConfig: ReturnType<typeof loadTsConfig>,
 ): Promise<string> {
   const handlerFileName = `${exportName}.ts`;
   const handlerPath = join(outputDir, handlerFileName);
 
-  const absoluteSourcePath = join(process.cwd(), sourceFile);
-  // Use path resolver to handle tsconfig paths
-  const importPath = resolveModuleSpecifier(
-    handlerPath,
-    absoluteSourcePath,
-    tsConfig,
-  );
+  const relativePath = relative(dirname(handlerPath), sourceFile);
+  const importPath = relativePath.replace(/\.ts$/, '.js');
 
-  const relativeEnvParserPath = resolveModuleSpecifier(
-    handlerPath,
-    envParserPath,
-    tsConfig,
-  );
+  const relativeEnvParserPath = relative(dirname(handlerPath), envParserPath);
 
   let content: string;
 

package/src/cli.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import { Command } from 'commander';
+import pkg from '../package.json' assert { type: 'json' };
 import { buildCommand } from './build.js';
 import { openapiCommand } from './openapi.js';
 import type { Provider } from './types.js';
@@ -10,7 +11,7 @@ const program = new Command();
 program
   .name('gkm')
   .description('GeekMidas backend framework CLI')
-  .version('0.0.2')
+  .version(pkg.version)
   .option('--cwd <path>', 'Change working directory');
 
 program

package/src/config.ts

@@ -1,44 +1,22 @@
 import { existsSync } from 'fs';
-import { join, extname } from 'path';
+import { join } from 'path';
 import type { GkmConfig } from './types.js';
 
 export async function loadConfig(): Promise<GkmConfig> {
-  const cwd = process.cwd();
+  const configPath = join(process.cwd(), 'gkm.config.json');
 
-  // Try to find config file with different extensions
-  const configExtensions = ['.ts', '.js', '.json'];
-  let configPath: string | null = null;
-
-  for (const ext of configExtensions) {
-    const path = join(cwd, `gkm.config${ext}`);
-    if (existsSync(path)) {
-      configPath = path;
-      break;
-    }
-  }
-
-  if (!configPath) {
+  if (!existsSync(configPath)) {
     throw new Error(
-      'gkm.config.{ts,js,json} not found. Please create a configuration file.',
+      'gkm.config.json not found. Please create a configuration file.',
     );
   }
 
   try {
-    const ext = extname(configPath);
-
-    // For TypeScript files, ensure tsx can handle them
-    if (ext === '.ts') {
-      // tsx handles TypeScript files automatically
-      const config = await import(configPath);
-      return config.default || config;
-    }
-
-    // For JS and JSON files
     const config = await import(configPath);
     return config.default || config;
   } catch (error) {
     throw new Error(
-      `Failed to load ${configPath}: ${(error as Error).message}`,
+      `Failed to load gkm.config.ts: ${(error as Error).message}`,
     );
   }
 }

package/src/types.ts

@@ -6,7 +6,6 @@ export interface GkmConfig {
   routes: Routes;
   envParser: string;
   logger: string;
-  tsconfig?: string; // Optional path to tsconfig.json
 }
 
 export interface BuildOptions {

package/dist/config-D-b45V57.cjs

@@ -1,41 +0,0 @@
-const require_chunk = require('./chunk-CUT6urMc.cjs');
-const path = require_chunk.__toESM(require("path"));
-const fs = require_chunk.__toESM(require("fs"));
-
-//#region src/config.ts
-async function loadConfig() {
-	const cwd = process.cwd();
-	const configExtensions = [
-		".ts",
-		".js",
-		".json"
-	];
-	let configPath = null;
-	for (const ext of configExtensions) {
-		const path$1 = (0, path.join)(cwd, `gkm.config${ext}`);
-		if ((0, fs.existsSync)(path$1)) {
-			configPath = path$1;
-			break;
-		}
-	}
-	if (!configPath) throw new Error("gkm.config.{ts,js,json} not found. Please create a configuration file.");
-	try {
-		const ext = (0, path.extname)(configPath);
-		if (ext === ".ts") {
-			const config$1 = await import(configPath);
-			return config$1.default || config$1;
-		}
-		const config = await import(configPath);
-		return config.default || config;
-	} catch (error) {
-		throw new Error(`Failed to load ${configPath}: ${error.message}`);
-	}
-}
-
-//#endregion
-Object.defineProperty(exports, 'loadConfig', {
-  enumerable: true,
-  get: function () {
-    return loadConfig;
-  }
-});

package/dist/config-Nd751N3o.mjs

@@ -1,35 +0,0 @@
-import { extname, join } from "path";
-import { existsSync } from "fs";
-
-//#region src/config.ts
-async function loadConfig() {
-	const cwd = process.cwd();
-	const configExtensions = [
-		".ts",
-		".js",
-		".json"
-	];
-	let configPath = null;
-	for (const ext of configExtensions) {
-		const path = join(cwd, `gkm.config${ext}`);
-		if (existsSync(path)) {
-			configPath = path;
-			break;
-		}
-	}
-	if (!configPath) throw new Error("gkm.config.{ts,js,json} not found. Please create a configuration file.");
-	try {
-		const ext = extname(configPath);
-		if (ext === ".ts") {
-			const config$1 = await import(configPath);
-			return config$1.default || config$1;
-		}
-		const config = await import(configPath);
-		return config.default || config;
-	} catch (error) {
-		throw new Error(`Failed to load ${configPath}: ${error.message}`);
-	}
-}
-
-//#endregion
-export { loadConfig };

package/dist/helpers/pathResolver.cjs

@@ -1,6 +0,0 @@
-require('../tsconfig-83amrDAp.cjs');
-const require_pathResolver = require('../pathResolver-B6y4yoWk.cjs');
-
-exports.convertToJsExtension = require_pathResolver.convertToJsExtension;
-exports.resolveImportPath = require_pathResolver.resolveImportPath;
-exports.resolveModuleSpecifier = require_pathResolver.resolveModuleSpecifier;

package/dist/helpers/pathResolver.mjs

@@ -1,4 +0,0 @@
-import "../tsconfig-BtO228Cz.mjs";
-import { convertToJsExtension, resolveImportPath, resolveModuleSpecifier } from "../pathResolver-DaMnbf26.mjs";
-
-export { convertToJsExtension, resolveImportPath, resolveModuleSpecifier };

package/dist/pathResolver-B6y4yoWk.cjs

@@ -1,47 +0,0 @@
-const require_chunk = require('./chunk-CUT6urMc.cjs');
-const require_tsconfig = require('./tsconfig-83amrDAp.cjs');
-const path = require_chunk.__toESM(require("path"));
-
-//#region src/helpers/pathResolver.ts
-/**
-* Resolve import paths considering TypeScript path mappings
-*/
-function resolveImportPath(fromFile, toFile, tsConfig) {
-	const resolvedToFile = tsConfig ? require_tsconfig.resolvePathMapping(toFile, tsConfig) : toFile;
-	const relativePath = (0, path.relative)((0, path.dirname)(fromFile), resolvedToFile);
-	if (!relativePath.startsWith(".")) return `./${relativePath}`;
-	return relativePath;
-}
-/**
-* Convert TypeScript file extensions to JavaScript
-*/
-function convertToJsExtension(filePath) {
-	return filePath.replace(/\.ts$/, ".js");
-}
-/**
-* Resolve module specifier for imports
-*/
-function resolveModuleSpecifier(fromFile, toFile, tsConfig) {
-	const importPath = resolveImportPath(fromFile, toFile, tsConfig);
-	return convertToJsExtension(importPath);
-}
-
-//#endregion
-Object.defineProperty(exports, 'convertToJsExtension', {
-  enumerable: true,
-  get: function () {
-    return convertToJsExtension;
-  }
-});
-Object.defineProperty(exports, 'resolveImportPath', {
-  enumerable: true,
-  get: function () {
-    return resolveImportPath;
-  }
-});
-Object.defineProperty(exports, 'resolveModuleSpecifier', {
-  enumerable: true,
-  get: function () {
-    return resolveModuleSpecifier;
-  }
-});

package/dist/pathResolver-DaMnbf26.mjs

@@ -1,29 +0,0 @@
-import { resolvePathMapping } from "./tsconfig-BtO228Cz.mjs";
-import { dirname, relative } from "path";
-
-//#region src/helpers/pathResolver.ts
-/**
-* Resolve import paths considering TypeScript path mappings
-*/
-function resolveImportPath(fromFile, toFile, tsConfig) {
-	const resolvedToFile = tsConfig ? resolvePathMapping(toFile, tsConfig) : toFile;
-	const relativePath = relative(dirname(fromFile), resolvedToFile);
-	if (!relativePath.startsWith(".")) return `./${relativePath}`;
-	return relativePath;
-}
-/**
-* Convert TypeScript file extensions to JavaScript
-*/
-function convertToJsExtension(filePath) {
-	return filePath.replace(/\.ts$/, ".js");
-}
-/**
-* Resolve module specifier for imports
-*/
-function resolveModuleSpecifier(fromFile, toFile, tsConfig) {
-	const importPath = resolveImportPath(fromFile, toFile, tsConfig);
-	return convertToJsExtension(importPath);
-}
-
-//#endregion
-export { convertToJsExtension, resolveImportPath, resolveModuleSpecifier };

package/dist/tsconfig-83amrDAp.cjs

@@ -1,94 +0,0 @@
-const require_chunk = require('./chunk-CUT6urMc.cjs');
-const path = require_chunk.__toESM(require("path"));
-const fs = require_chunk.__toESM(require("fs"));
-const typescript = require_chunk.__toESM(require("typescript"));
-
-//#region src/tsconfig.ts
-/**
-* Find and parse the nearest tsconfig.json file
-*/
-function loadTsConfig(searchPath = process.cwd()) {
-	const configPath = typescript.default.findConfigFile(searchPath, fs.existsSync);
-	if (!configPath) return null;
-	const configFile = typescript.default.readConfigFile(configPath, typescript.default.sys.readFile);
-	if (configFile.error) throw new Error(`Error reading tsconfig.json: ${typescript.default.flattenDiagnosticMessageText(configFile.error.messageText, "\n")}`);
-	const parsedConfig = typescript.default.parseJsonConfigFileContent(configFile.config, typescript.default.sys, (0, path.dirname)(configPath));
-	if (parsedConfig.errors.length > 0) {
-		const errors = parsedConfig.errors.map((error) => typescript.default.flattenDiagnosticMessageText(error.messageText, "\n")).join("\n");
-		throw new Error(`Error parsing tsconfig.json: ${errors}`);
-	}
-	return {
-		configPath,
-		config: parsedConfig,
-		compilerOptions: parsedConfig.options
-	};
-}
-/**
-* Resolve a module path using TypeScript's module resolution
-*/
-function resolveModulePath(moduleName, containingFile, tsConfig) {
-	const compilerOptions = tsConfig?.compilerOptions || {};
-	const result = typescript.default.resolveModuleName(moduleName, containingFile, compilerOptions, typescript.default.sys);
-	if (result.resolvedModule) return result.resolvedModule.resolvedFileName;
-	return null;
-}
-/**
-* Get the output path for a TypeScript file based on tsconfig
-*/
-function getOutputPath(filePath, tsConfig) {
-	if (!tsConfig) return filePath.replace(/\.ts$/, ".js");
-	const { compilerOptions, configPath } = tsConfig;
-	const configDir = (0, path.dirname)(configPath);
-	if (compilerOptions.outDir) {
-		const rootDir = compilerOptions.rootDir || configDir;
-		const relativePath = filePath.startsWith(rootDir) ? filePath.slice(rootDir.length) : filePath;
-		const outputPath = (0, path.join)(compilerOptions.outDir, relativePath);
-		return outputPath.replace(/\.ts$/, ".js");
-	}
-	return filePath.replace(/\.ts$/, ".js");
-}
-/**
-* Apply path mappings from tsconfig paths
-*/
-function resolvePathMapping(importPath, tsConfig) {
-	if (!tsConfig || !tsConfig.compilerOptions.paths) return importPath;
-	const { paths, baseUrl } = tsConfig.compilerOptions;
-	const configDir = (0, path.dirname)(tsConfig.configPath);
-	const resolvedBaseUrl = baseUrl ? (0, path.resolve)(configDir, baseUrl) : configDir;
-	for (const [pattern, replacements] of Object.entries(paths)) {
-		const regex = new RegExp("^" + pattern.replace("*", "(.*)") + "$");
-		const match = importPath.match(regex);
-		if (match && replacements.length > 0) {
-			const replacement = replacements[0];
-			const resolvedPath = replacement.replace("*", match[1] || "");
-			return (0, path.resolve)(resolvedBaseUrl, resolvedPath);
-		}
-	}
-	return importPath;
-}
-
-//#endregion
-Object.defineProperty(exports, 'getOutputPath', {
-  enumerable: true,
-  get: function () {
-    return getOutputPath;
-  }
-});
-Object.defineProperty(exports, 'loadTsConfig', {
-  enumerable: true,
-  get: function () {
-    return loadTsConfig;
-  }
-});
-Object.defineProperty(exports, 'resolveModulePath', {
-  enumerable: true,
-  get: function () {
-    return resolveModulePath;
-  }
-});
-Object.defineProperty(exports, 'resolvePathMapping', {
-  enumerable: true,
-  get: function () {
-    return resolvePathMapping;
-  }
-});

package/dist/tsconfig-BtO228Cz.mjs

@@ -1,70 +0,0 @@
-import { dirname, join, resolve } from "path";
-import { existsSync } from "fs";
-import ts from "typescript";
-
-//#region src/tsconfig.ts
-/**
-* Find and parse the nearest tsconfig.json file
-*/
-function loadTsConfig(searchPath = process.cwd()) {
-	const configPath = ts.findConfigFile(searchPath, existsSync);
-	if (!configPath) return null;
-	const configFile = ts.readConfigFile(configPath, ts.sys.readFile);
-	if (configFile.error) throw new Error(`Error reading tsconfig.json: ${ts.flattenDiagnosticMessageText(configFile.error.messageText, "\n")}`);
-	const parsedConfig = ts.parseJsonConfigFileContent(configFile.config, ts.sys, dirname(configPath));
-	if (parsedConfig.errors.length > 0) {
-		const errors = parsedConfig.errors.map((error) => ts.flattenDiagnosticMessageText(error.messageText, "\n")).join("\n");
-		throw new Error(`Error parsing tsconfig.json: ${errors}`);
-	}
-	return {
-		configPath,
-		config: parsedConfig,
-		compilerOptions: parsedConfig.options
-	};
-}
-/**
-* Resolve a module path using TypeScript's module resolution
-*/
-function resolveModulePath(moduleName, containingFile, tsConfig) {
-	const compilerOptions = tsConfig?.compilerOptions || {};
-	const result = ts.resolveModuleName(moduleName, containingFile, compilerOptions, ts.sys);
-	if (result.resolvedModule) return result.resolvedModule.resolvedFileName;
-	return null;
-}
-/**
-* Get the output path for a TypeScript file based on tsconfig
-*/
-function getOutputPath(filePath, tsConfig) {
-	if (!tsConfig) return filePath.replace(/\.ts$/, ".js");
-	const { compilerOptions, configPath } = tsConfig;
-	const configDir = dirname(configPath);
-	if (compilerOptions.outDir) {
-		const rootDir = compilerOptions.rootDir || configDir;
-		const relativePath = filePath.startsWith(rootDir) ? filePath.slice(rootDir.length) : filePath;
-		const outputPath = join(compilerOptions.outDir, relativePath);
-		return outputPath.replace(/\.ts$/, ".js");
-	}
-	return filePath.replace(/\.ts$/, ".js");
-}
-/**
-* Apply path mappings from tsconfig paths
-*/
-function resolvePathMapping(importPath, tsConfig) {
-	if (!tsConfig || !tsConfig.compilerOptions.paths) return importPath;
-	const { paths, baseUrl } = tsConfig.compilerOptions;
-	const configDir = dirname(tsConfig.configPath);
-	const resolvedBaseUrl = baseUrl ? resolve(configDir, baseUrl) : configDir;
-	for (const [pattern, replacements] of Object.entries(paths)) {
-		const regex = new RegExp("^" + pattern.replace("*", "(.*)") + "$");
-		const match = importPath.match(regex);
-		if (match && replacements.length > 0) {
-			const replacement = replacements[0];
-			const resolvedPath = replacement.replace("*", match[1] || "");
-			return resolve(resolvedBaseUrl, resolvedPath);
-		}
-	}
-	return importPath;
-}
-
-//#endregion
-export { getOutputPath, loadTsConfig, resolveModulePath, resolvePathMapping };

package/dist/tsconfig.cjs

@@ -1,6 +0,0 @@
-const require_tsconfig = require('./tsconfig-83amrDAp.cjs');
-
-exports.getOutputPath = require_tsconfig.getOutputPath;
-exports.loadTsConfig = require_tsconfig.loadTsConfig;
-exports.resolveModulePath = require_tsconfig.resolveModulePath;
-exports.resolvePathMapping = require_tsconfig.resolvePathMapping;

package/dist/tsconfig.mjs

@@ -1,3 +0,0 @@
-import { getOutputPath, loadTsConfig, resolveModulePath, resolvePathMapping } from "./tsconfig-BtO228Cz.mjs";
-
-export { getOutputPath, loadTsConfig, resolveModulePath, resolvePathMapping };

package/src/helpers/pathResolver.ts

@@ -1,46 +0,0 @@
-import { relative, dirname } from 'path';
-import type { TsConfigResult } from '../tsconfig.js';
-import { resolvePathMapping } from '../tsconfig.js';
-
-/**
- * Resolve import paths considering TypeScript path mappings
- */
-export function resolveImportPath(
-  fromFile: string,
-  toFile: string,
-  tsConfig?: TsConfigResult | null,
-): string {
-  // Apply path mappings if tsconfig is available
-  const resolvedToFile = tsConfig
-    ? resolvePathMapping(toFile, tsConfig)
-    : toFile;
-
-  // Calculate relative path
-  const relativePath = relative(dirname(fromFile), resolvedToFile);
-
-  // Ensure proper relative path format
-  if (!relativePath.startsWith('.')) {
-    return `./${relativePath}`;
-  }
-
-  return relativePath;
-}
-
-/**
- * Convert TypeScript file extensions to JavaScript
- */
-export function convertToJsExtension(filePath: string): string {
-  return filePath.replace(/\.ts$/, '.js');
-}
-
-/**
- * Resolve module specifier for imports
- */
-export function resolveModuleSpecifier(
-  fromFile: string,
-  toFile: string,
-  tsConfig?: TsConfigResult | null,
-): string {
-  const importPath = resolveImportPath(fromFile, toFile, tsConfig);
-  return convertToJsExtension(importPath);
-}