@ooneex/cli 1.13.3 → 1.15.0

package/dist/index.js

@@ -4876,7 +4876,7 @@ var require_pluralize = __commonJS((exports, module) => {
 });
 
 // src/index.ts
-import { commandRun } from "@ooneex/command";
+import { run } from "@ooneex/command";
 
 // src/commands/CompletionZshCommand.ts
 import { homedir } from "os";
@@ -5184,10 +5184,10 @@ CompletionZshCommand = __legacyDecorateClassTS([
   decorator.command()
 ], CompletionZshCommand);
 // src/commands/MakeAiCommand.ts
-import { join as join2 } from "path";
-import { decorator as decorator2 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger2 } from "@ooneex/logger";
-import { toPascalCase } from "@ooneex/utils";
+import { join as join4 } from "path";
+import { decorator as decorator3 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger3 } from "@ooneex/logger";
+import { toPascalCase as toPascalCase2 } from "@ooneex/utils";
 
 // src/prompts/askName.ts
 var import_enquirer = __toESM(require_enquirer(), 1);
@@ -5282,6 +5282,234 @@ export class {{NAME}}Ai implements IAiChat<OpenAiConfigType> {
 }
 `;
 
+// src/utils.ts
+import { join as join3 } from "path";
+
+// src/commands/MakeModuleCommand.ts
+import { join as join2 } from "path";
+import { decorator as decorator2 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger2 } from "@ooneex/logger";
+import { toKebabCase, toPascalCase } from "@ooneex/utils";
+
+// src/templates/module/command.run.txt
+var command_run_default = `#!/usr/bin/env bun
+
+import { run } from "@ooneex/command";
+import "@/commands/commands";
+
+await run();
+`;
+
+// src/templates/module/module.txt
+var module_default = `import type { ModuleType } from "@ooneex/module";
+
+export const {{NAME}}Module: ModuleType = {
+  controllers: [],
+  entities: [],
+  middlewares: [],
+  cronJobs: [],
+  events: [],
+};
+`;
+
+// src/templates/module/package.txt
+var package_default = `{
+  "name": "@module/{{NAME}}",
+  "description": "",
+  "version": "0.0.1",
+  "scripts": {
+    "test": "bun test tests",
+    "lint": "tsgo --noEmit && bunx biome lint"
+  }
+}
+`;
+
+// src/templates/module/test.txt
+var test_default = `import { describe, expect, test } from "bun:test";
+import { {{NAME}}Module } from "@/{{NAME}}Module";
+
+describe("{{NAME}}Module", () => {
+  test("should have controllers array", () => {
+    expect(Array.isArray({{NAME}}Module.controllers)).toBe(true);
+  });
+
+  test("should have entities array", () => {
+    expect(Array.isArray({{NAME}}Module.entities)).toBe(true);
+  });
+
+  test("should have middlewares array", () => {
+    expect(Array.isArray({{NAME}}Module.middlewares)).toBe(true);
+  });
+
+  test("should have cronJobs array", () => {
+    expect(Array.isArray({{NAME}}Module.cronJobs)).toBe(true);
+  });
+
+  test("should have events array", () => {
+    expect(Array.isArray({{NAME}}Module.events)).toBe(true);
+  });
+});
+`;
+
+// src/templates/module/tsconfig.txt
+var tsconfig_default = `{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "types": ["@types/bun"],
+    "paths": {
+      "@/*": ["./src/*"]
+    }
+  },
+  "include": ["src/**/*.ts", "src/**/*.tsx", "tests/**/*.ts", "tests/**/*.tsx", "bin/**/*.ts"],
+  "exclude": ["node_modules", "dist"]
+}
+`;
+
+// src/commands/MakeModuleCommand.ts
+class MakeModuleCommand {
+  getName() {
+    return "make:module";
+  }
+  getDescription() {
+    return "Generate a new module";
+  }
+  async addToAppModule(appModulePath, pascalName, kebabName) {
+    let content = await Bun.file(appModulePath).text();
+    const moduleName = `${pascalName}Module`;
+    const importPath = `@${kebabName}/${moduleName}`;
+    const importLine = `import { ${moduleName} } from "${importPath}";
+`;
+    const lastImportIndex = content.lastIndexOf("import ");
+    const lineEnd = content.indexOf(`
+`, lastImportIndex);
+    content = `${content.slice(0, lineEnd + 1)}${importLine}${content.slice(lineEnd + 1)}`;
+    const fields = ["controllers", "entities", "middlewares", "cronJobs", "events"];
+    for (const field of fields) {
+      const regex = new RegExp(`(${field}:\\s*\\[)([^\\]]*)`, "s");
+      const match = content.match(regex);
+      if (match) {
+        const existing = match[2]?.trim();
+        const spread = `...${moduleName}.${field}`;
+        const newValue = existing ? `${existing}, ${spread}` : spread;
+        content = content.replace(regex, `$1${newValue}`);
+      }
+    }
+    await Bun.write(appModulePath, content);
+  }
+  async addModuleScope(commitlintPath, kebabName) {
+    let content = await Bun.file(commitlintPath).text();
+    const regex = /("scope-enum":\s*\[\s*RuleConfigSeverity\.Error,\s*"always",\s*\[)([\s\S]*?)(\])/;
+    const match = content.match(regex);
+    if (match) {
+      const existing = match[2]?.trim() ?? "";
+      const newScope = `"${kebabName}"`;
+      if (!existing.includes(newScope)) {
+        const newValue = existing ? `${existing}
+        ${newScope},` : `
+        ${newScope},`;
+        content = content.replace(regex, `$1${newValue}
+      $3`);
+        await Bun.write(commitlintPath, content);
+      }
+    }
+  }
+  async addPathAlias(tsconfigPath, kebabName) {
+    const content = await Bun.file(tsconfigPath).text();
+    const tsconfig = JSON.parse(content);
+    tsconfig.compilerOptions ??= {};
+    tsconfig.compilerOptions.paths ??= {};
+    tsconfig.compilerOptions.paths[`@${kebabName}/*`] = [`../${kebabName}/src/*`];
+    await Bun.write(tsconfigPath, `${JSON.stringify(tsconfig, null, 2)}
+`);
+  }
+  async run(options) {
+    const {
+      cwd = process.cwd(),
+      silent = false,
+      skipMigrations = false,
+      skipSeeds = false,
+      skipCommands = false
+    } = options;
+    let { name } = options;
+    if (!name) {
+      name = await askName({ message: "Enter module name" });
+    }
+    const pascalName = toPascalCase(name).replace(/Module$/, "");
+    const kebabName = toKebabCase(pascalName);
+    const moduleDir = join2(cwd, "modules", kebabName);
+    const srcDir = join2(moduleDir, "src");
+    const testsDir = join2(moduleDir, "tests");
+    const moduleContent = module_default.replace(/{{NAME}}/g, pascalName);
+    const packageContent = package_default.replace(/{{NAME}}/g, kebabName);
+    const testContent = test_default.replace(/{{NAME}}/g, pascalName);
+    await Bun.write(join2(srcDir, `${pascalName}Module.ts`), moduleContent);
+    if (!skipMigrations) {
+      await Bun.write(join2(srcDir, "migrations", "migrations.ts"), "");
+    }
+    if (!skipSeeds) {
+      await Bun.write(join2(srcDir, "seeds", "seeds.ts"), "");
+    }
+    if (!skipCommands) {
+      await Bun.write(join2(srcDir, "commands", "commands.ts"), "");
+      const binCommandRunPath = join2(moduleDir, "bin", "command", "run.ts");
+      const binCommandRunFile = Bun.file(binCommandRunPath);
+      if (!await binCommandRunFile.exists()) {
+        await Bun.write(binCommandRunPath, command_run_default);
+      }
+    }
+    await Bun.write(join2(moduleDir, "package.json"), packageContent);
+    await Bun.write(join2(moduleDir, "tsconfig.json"), tsconfig_default);
+    await Bun.write(join2(testsDir, `${pascalName}Module.spec.ts`), testContent);
+    if (kebabName !== "app") {
+      const appModulePath = join2(cwd, "modules", "app", "src", "AppModule.ts");
+      if (await Bun.file(appModulePath).exists()) {
+        await this.addToAppModule(appModulePath, pascalName, kebabName);
+      }
+      const appTsconfigPath = join2(cwd, "modules", "app", "tsconfig.json");
+      if (await Bun.file(appTsconfigPath).exists()) {
+        await this.addPathAlias(appTsconfigPath, kebabName);
+      }
+    }
+    const commitlintPath = join2(cwd, ".commitlintrc.ts");
+    if (await Bun.file(commitlintPath).exists()) {
+      await this.addModuleScope(commitlintPath, kebabName);
+    }
+    if (!silent) {
+      const logger = new TerminalLogger2;
+      logger.success(`modules/${kebabName} created successfully`, undefined, {
+        showTimestamp: false,
+        showArrow: false,
+        useSymbol: true
+      });
+    }
+    const packageJsonPath = join2(process.cwd(), "package.json");
+    const packageJson = await Bun.file(packageJsonPath).json();
+    const deps = packageJson.dependencies ?? {};
+    const devDeps = packageJson.devDependencies ?? {};
+    if (!deps["@ooneex/module"] && !devDeps["@ooneex/module"]) {
+      const install = Bun.spawn(["bun", "add", "@ooneex/module"], {
+        cwd: process.cwd(),
+        stdout: "ignore",
+        stderr: "inherit"
+      });
+      await install.exited;
+    }
+  }
+}
+MakeModuleCommand = __legacyDecorateClassTS([
+  decorator2.command()
+], MakeModuleCommand);
+
+// src/utils.ts
+var ensureModule = async (module) => {
+  const moduleDir = join3(process.cwd(), "modules", module);
+  const moduleDirExists = await Bun.file(join3(moduleDir, "package.json")).exists();
+  if (!moduleDirExists) {
+    const makeModule = new MakeModuleCommand;
+    await makeModule.run({ name: module, cwd: process.cwd(), silent: true });
+  }
+};
+
 // src/commands/MakeAiCommand.ts
 class MakeAiCommand {
   getName() {
@@ -5295,30 +5523,33 @@ class MakeAiCommand {
     if (!name) {
       name = await askName({ message: "Enter name" });
     }
-    name = toPascalCase(name).replace(/Ai$/, "");
+    name = toPascalCase2(name).replace(/Ai$/, "");
+    if (module) {
+      await ensureModule(module);
+    }
     const content = ai_default.replace(/{{NAME}}/g, name);
-    const base = module ? join2("modules", module) : ".";
-    const aiLocalDir = join2(base, "src", "ai");
-    const aiDir = join2(process.cwd(), aiLocalDir);
-    const filePath = join2(aiDir, `${name}Ai.ts`);
+    const base = module ? join4("modules", module) : ".";
+    const aiLocalDir = join4(base, "src", "ai");
+    const aiDir = join4(process.cwd(), aiLocalDir);
+    const filePath = join4(aiDir, `${name}Ai.ts`);
     await Bun.write(filePath, content);
     const testContent = ai_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join2(base, "tests", "ai");
-    const testsDir = join2(process.cwd(), testsLocalDir);
-    const testFilePath = join2(testsDir, `${name}Ai.spec.ts`);
+    const testsLocalDir = join4(base, "tests", "ai");
+    const testsDir = join4(process.cwd(), testsLocalDir);
+    const testFilePath = join4(testsDir, `${name}Ai.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger2;
-    logger.success(`${join2(aiLocalDir, name)}Ai.ts created successfully`, undefined, {
+    const logger = new TerminalLogger3;
+    logger.success(`${join4(aiLocalDir, name)}Ai.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join2(testsLocalDir, name)}Ai.spec.ts created successfully`, undefined, {
+    logger.success(`${join4(testsLocalDir, name)}Ai.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join2(process.cwd(), "package.json");
+    const packageJsonPath = join4(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -5333,13 +5564,13 @@ class MakeAiCommand {
   }
 }
 MakeAiCommand = __legacyDecorateClassTS([
-  decorator2.command()
+  decorator3.command()
 ], MakeAiCommand);
 // src/commands/MakeAnalyticsCommand.ts
-import { join as join3 } from "path";
-import { decorator as decorator3 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger3 } from "@ooneex/logger";
-import { toPascalCase as toPascalCase2 } from "@ooneex/utils";
+import { join as join5 } from "path";
+import { decorator as decorator4 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger4 } from "@ooneex/logger";
+import { toPascalCase as toPascalCase3 } from "@ooneex/utils";
 
 // src/templates/analytics.test.txt
 var analytics_test_default = `import { describe, expect, test } from "bun:test";
@@ -5384,30 +5615,33 @@ class MakeAnalyticsCommand {
     if (!name) {
       name = await askName({ message: "Enter analytics name" });
     }
-    name = toPascalCase2(name).replace(/Analytics$/, "");
+    name = toPascalCase3(name).replace(/Analytics$/, "");
     const content = analytics_default.replace(/{{NAME}}/g, name);
-    const base = module ? join3("modules", module) : ".";
-    const analyticsLocalDir = join3(base, "src", "analytics");
-    const analyticsDir = join3(process.cwd(), analyticsLocalDir);
-    const filePath = join3(analyticsDir, `${name}Analytics.ts`);
+    if (module) {
+      await ensureModule(module);
+    }
+    const base = module ? join5("modules", module) : ".";
+    const analyticsLocalDir = join5(base, "src", "analytics");
+    const analyticsDir = join5(process.cwd(), analyticsLocalDir);
+    const filePath = join5(analyticsDir, `${name}Analytics.ts`);
     await Bun.write(filePath, content);
     const testContent = analytics_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join3(base, "tests", "analytics");
-    const testsDir = join3(process.cwd(), testsLocalDir);
-    const testFilePath = join3(testsDir, `${name}Analytics.spec.ts`);
+    const testsLocalDir = join5(base, "tests", "analytics");
+    const testsDir = join5(process.cwd(), testsLocalDir);
+    const testFilePath = join5(testsDir, `${name}Analytics.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger3;
-    logger.success(`${join3(analyticsLocalDir, name)}Analytics.ts created successfully`, undefined, {
+    const logger = new TerminalLogger4;
+    logger.success(`${join5(analyticsLocalDir, name)}Analytics.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join3(testsLocalDir, name)}Analytics.spec.ts created successfully`, undefined, {
+    logger.success(`${join5(testsLocalDir, name)}Analytics.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join3(process.cwd(), "package.json");
+    const packageJsonPath = join5(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -5422,10 +5656,10 @@ class MakeAnalyticsCommand {
   }
 }
 MakeAnalyticsCommand = __legacyDecorateClassTS([
-  decorator3.command()
+  decorator4.command()
 ], MakeAnalyticsCommand);
 // src/commands/MakeAppCommand.ts
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 import { decorator as decorator6 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger6 } from "@ooneex/logger";
 import { toKebabCase as toKebabCase3, toSnakeCase } from "@ooneex/utils";
@@ -6193,7 +6427,7 @@ const app = new App({
     prefix: "api",
   },
   check: {
-    health: "/api/v1/healthcheck",
+    health: "/v1/health-check",
   },
   loggers: [BetterstackLogger, TerminalLogger],
   onException: BetterstackExceptionLogger,
@@ -6562,10 +6796,10 @@ var zed_settings_json_default = `{
 `;
 
 // src/commands/MakeControllerCommand.ts
-import { basename, join as join4 } from "path";
-import { decorator as decorator4 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger4 } from "@ooneex/logger";
-import { toKebabCase, toPascalCase as toPascalCase3, trim } from "@ooneex/utils";
+import { basename, join as join6 } from "path";
+import { decorator as decorator5 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger5 } from "@ooneex/logger";
+import { toKebabCase as toKebabCase2, toPascalCase as toPascalCase4, trim } from "@ooneex/utils";
 
 // src/prompts/askConfirm.ts
 var import_enquirer3 = __toESM(require_enquirer(), 1);
@@ -6908,326 +7142,114 @@ export type {{TYPE_NAME}}RouteType = {
   payload: Assert({
 
   }),
-  queries: Assert({
-
-  }),
-  response: Assert({
-
-  }),
-  roles: [ERole.USER],
-})
-export class {{NAME}}Controller {
-  public async index(context: ContextType<{{TYPE_NAME}}RouteType>) {
-    // const { id } = context.params;
-
-    return context.response.json({
-
-    });
-  }
-}
-`;
-
-// src/commands/MakeControllerCommand.ts
-class MakeControllerCommand {
-  getName() {
-    return "make:controller";
-  }
-  getDescription() {
-    return "Generate a new controller class";
-  }
-  async addToModule(modulePath, controllerName) {
-    let content = await Bun.file(modulePath).text();
-    const className = `${controllerName}Controller`;
-    const importLine = `import { ${className} } from "./controllers/${className}";
-`;
-    const lastImportIndex = content.lastIndexOf("import ");
-    const lineEnd = content.indexOf(`
-`, lastImportIndex);
-    content = `${content.slice(0, lineEnd + 1)}${importLine}${content.slice(lineEnd + 1)}`;
-    const regex = /(controllers:\s*\[)([^\]]*)/s;
-    const match = content.match(regex);
-    if (match) {
-      const existing = match[2]?.trim();
-      const newValue = existing ? `${existing}, ${className}` : className;
-      content = content.replace(regex, `$1${newValue}`);
-    }
-    await Bun.write(modulePath, content);
-  }
-  async run(options) {
-    let { name, module, isSocket } = options;
-    if (!name) {
-      name = await askName({ message: "Enter controller name" });
-    }
-    if (isSocket === undefined) {
-      isSocket = await askConfirm({ message: "Is this a socket controller?" });
-    }
-    name = toPascalCase3(name).replace(/Controller$/, "");
-    const { route = {} } = options;
-    const selectedTemplate = isSocket ? controller_socket_default : controller_default;
-    let content = selectedTemplate.replaceAll("{{NAME}}", name);
-    if (!route.name) {
-      route.name = await askRouteName({ message: "Enter route name (e.g., api.user.create)" });
-    }
-    const routeTypeName = toPascalCase3(route.name);
-    content = content.replaceAll("{{ROUTE_NAME}}", route.name).replaceAll("{{TYPE_NAME}}", routeTypeName);
-    if (!route.path) {
-      route.path = await askRoutePath({ message: "Enter route path", initial: "/" });
-    }
-    const routePath = `/${toKebabCase(trim(route.path, "/"))}`;
-    content = content.replaceAll("{{ROUTE_PATH}}", routePath);
-    if (!isSocket && !route.method) {
-      route.method = await askRouteMethod({ message: "Enter route method" });
-    }
-    if (!isSocket && route.method) {
-      content = content.replaceAll("{{ROUTE_METHOD}}", route.method.toLowerCase());
-    }
-    const base = module ? join4("modules", module) : ".";
-    const controllersLocalDir = join4(base, "src", "controllers");
-    const controllersDir = join4(process.cwd(), controllersLocalDir);
-    const filePath = join4(controllersDir, `${name}Controller.ts`);
-    await Bun.write(filePath, content);
-    const testContent = controller_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join4(base, "tests", "controllers");
-    const testsDir = join4(process.cwd(), testsLocalDir);
-    const testFilePath = join4(testsDir, `${name}Controller.spec.ts`);
-    await Bun.write(testFilePath, testContent);
-    const modulePascalName = module ? toPascalCase3(module) : toPascalCase3(basename(process.cwd()));
-    const modulePath = join4(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
-    if (await Bun.file(modulePath).exists()) {
-      await this.addToModule(modulePath, name);
-    }
-    const logger = new TerminalLogger4;
-    logger.success(`${join4(controllersLocalDir, name)}Controller.ts created successfully`, undefined, {
-      showTimestamp: false,
-      showArrow: false,
-      useSymbol: true
-    });
-    logger.success(`${join4(testsLocalDir, name)}Controller.spec.ts created successfully`, undefined, {
-      showTimestamp: false,
-      showArrow: false,
-      useSymbol: true
-    });
-    const packageJsonPath = join4(process.cwd(), "package.json");
-    const packageJson = await Bun.file(packageJsonPath).json();
-    const deps = packageJson.dependencies ?? {};
-    const devDeps = packageJson.devDependencies ?? {};
-    if (!deps["@ooneex/controller"] && !devDeps["@ooneex/controller"]) {
-      const install = Bun.spawn(["bun", "add", "@ooneex/controller"], {
-        cwd: process.cwd(),
-        stdout: "ignore",
-        stderr: "inherit"
-      });
-      await install.exited;
-    }
-  }
-}
-MakeControllerCommand = __legacyDecorateClassTS([
-  decorator4.command()
-], MakeControllerCommand);
-
-// src/commands/MakeModuleCommand.ts
-import { join as join5 } from "path";
-import { decorator as decorator5 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger5 } from "@ooneex/logger";
-import { toKebabCase as toKebabCase2, toPascalCase as toPascalCase4 } from "@ooneex/utils";
-
-// src/templates/module/command.run.txt
-var command_run_default = `#!/usr/bin/env bun
-
-import { commandRun } from "@ooneex/cli";
-import "@/commands/commands";
-
-await commandRun();
-`;
-
-// src/templates/module/module.txt
-var module_default = `import type { ModuleType } from "@ooneex/module";
-
-export const {{NAME}}Module: ModuleType = {
-  controllers: [],
-  entities: [],
-  middlewares: [],
-  cronJobs: [],
-  events: [],
-};
-`;
-
-// src/templates/module/package.txt
-var package_default = `{
-  "name": "@module/{{NAME}}",
-  "description": "",
-  "version": "0.0.1",
-  "scripts": {
-    "test": "bun test tests",
-    "lint": "tsgo --noEmit && bunx biome lint"
-  }
-}
-`;
-
-// src/templates/module/test.txt
-var test_default = `import { describe, expect, test } from "bun:test";
-import { {{NAME}}Module } from "@/{{NAME}}Module";
-
-describe("{{NAME}}Module", () => {
-  test("should have controllers array", () => {
-    expect(Array.isArray({{NAME}}Module.controllers)).toBe(true);
-  });
-
-  test("should have entities array", () => {
-    expect(Array.isArray({{NAME}}Module.entities)).toBe(true);
-  });
-
-  test("should have middlewares array", () => {
-    expect(Array.isArray({{NAME}}Module.middlewares)).toBe(true);
-  });
+  queries: Assert({
 
-  test("should have cronJobs array", () => {
-    expect(Array.isArray({{NAME}}Module.cronJobs)).toBe(true);
-  });
+  }),
+  response: Assert({
 
-  test("should have events array", () => {
-    expect(Array.isArray({{NAME}}Module.events)).toBe(true);
-  });
-});
-`;
+  }),
+  roles: [ERole.USER],
+})
+export class {{NAME}}Controller {
+  public async index(context: ContextType<{{TYPE_NAME}}RouteType>) {
+    // const { id } = context.params;
 
-// src/templates/module/tsconfig.txt
-var tsconfig_default = `{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "types": ["@types/bun"],
-    "paths": {
-      "@/*": ["./src/*"]
-    }
-  },
-  "include": ["src/**/*.ts", "src/**/*.tsx", "tests/**/*.ts", "tests/**/*.tsx", "bin/**/*.ts"],
-  "exclude": ["node_modules", "dist"]
+    return context.response.json({
+
+    });
+  }
 }
 `;
 
-// src/commands/MakeModuleCommand.ts
-class MakeModuleCommand {
+// src/commands/MakeControllerCommand.ts
+class MakeControllerCommand {
   getName() {
-    return "make:module";
+    return "make:controller";
   }
   getDescription() {
-    return "Generate a new module";
+    return "Generate a new controller class";
   }
-  async addToAppModule(appModulePath, pascalName, kebabName) {
-    let content = await Bun.file(appModulePath).text();
-    const moduleName = `${pascalName}Module`;
-    const importPath = `@${kebabName}/${moduleName}`;
-    const importLine = `import { ${moduleName} } from "${importPath}";
+  async addToModule(modulePath, controllerName) {
+    let content = await Bun.file(modulePath).text();
+    const className = `${controllerName}Controller`;
+    const importLine = `import { ${className} } from "./controllers/${className}";
 `;
     const lastImportIndex = content.lastIndexOf("import ");
     const lineEnd = content.indexOf(`
 `, lastImportIndex);
     content = `${content.slice(0, lineEnd + 1)}${importLine}${content.slice(lineEnd + 1)}`;
-    const fields = ["controllers", "entities", "middlewares", "cronJobs", "events"];
-    for (const field of fields) {
-      const regex = new RegExp(`(${field}:\\s*\\[)([^\\]]*)`, "s");
-      const match = content.match(regex);
-      if (match) {
-        const existing = match[2]?.trim();
-        const spread = `...${moduleName}.${field}`;
-        const newValue = existing ? `${existing}, ${spread}` : spread;
-        content = content.replace(regex, `$1${newValue}`);
-      }
-    }
-    await Bun.write(appModulePath, content);
-  }
-  async addModuleScope(commitlintPath, kebabName) {
-    let content = await Bun.file(commitlintPath).text();
-    const regex = /("scope-enum":\s*\[\s*RuleConfigSeverity\.Error,\s*"always",\s*\[)([\s\S]*?)(\])/;
+    const regex = /(controllers:\s*\[)([^\]]*)/s;
     const match = content.match(regex);
     if (match) {
-      const existing = match[2]?.trim() ?? "";
-      const newScope = `"${kebabName}"`;
-      if (!existing.includes(newScope)) {
-        const newValue = existing ? `${existing}
-        ${newScope},` : `
-        ${newScope},`;
-        content = content.replace(regex, `$1${newValue}
-      $3`);
-        await Bun.write(commitlintPath, content);
-      }
+      const existing = match[2]?.trim();
+      const newValue = existing ? `${existing}, ${className}` : className;
+      content = content.replace(regex, `$1${newValue}`);
     }
-  }
-  async addPathAlias(tsconfigPath, kebabName) {
-    const content = await Bun.file(tsconfigPath).text();
-    const tsconfig = JSON.parse(content);
-    tsconfig.compilerOptions ??= {};
-    tsconfig.compilerOptions.paths ??= {};
-    tsconfig.compilerOptions.paths[`@${kebabName}/*`] = [`../${kebabName}/src/*`];
-    await Bun.write(tsconfigPath, `${JSON.stringify(tsconfig, null, 2)}
-`);
+    await Bun.write(modulePath, content);
   }
   async run(options) {
-    const {
-      cwd = process.cwd(),
-      silent = false,
-      skipMigrations = false,
-      skipSeeds = false,
-      skipCommands = false
-    } = options;
-    let { name } = options;
+    let { name, module, isSocket } = options;
     if (!name) {
-      name = await askName({ message: "Enter module name" });
+      name = await askName({ message: "Enter controller name" });
     }
-    const pascalName = toPascalCase4(name).replace(/Module$/, "");
-    const kebabName = toKebabCase2(pascalName);
-    const moduleDir = join5(cwd, "modules", kebabName);
-    const srcDir = join5(moduleDir, "src");
-    const testsDir = join5(moduleDir, "tests");
-    const moduleContent = module_default.replace(/{{NAME}}/g, pascalName);
-    const packageContent = package_default.replace(/{{NAME}}/g, kebabName);
-    const testContent = test_default.replace(/{{NAME}}/g, pascalName);
-    await Bun.write(join5(srcDir, `${pascalName}Module.ts`), moduleContent);
-    if (!skipMigrations) {
-      await Bun.write(join5(srcDir, "migrations", "migrations.ts"), "");
+    if (isSocket === undefined) {
+      isSocket = await askConfirm({ message: "Is this a socket controller?" });
     }
-    if (!skipSeeds) {
-      await Bun.write(join5(srcDir, "seeds", "seeds.ts"), "");
+    name = toPascalCase4(name).replace(/Controller$/, "");
+    const { route = {} } = options;
+    const selectedTemplate = isSocket ? controller_socket_default : controller_default;
+    let content = selectedTemplate.replaceAll("{{NAME}}", name);
+    if (!route.name) {
+      route.name = await askRouteName({ message: "Enter route name (e.g., api.user.create)" });
     }
-    if (!skipCommands) {
-      await Bun.write(join5(srcDir, "commands", "commands.ts"), "");
-      const binCommandRunPath = join5(moduleDir, "bin", "command", "run.ts");
-      const binCommandRunFile = Bun.file(binCommandRunPath);
-      if (!await binCommandRunFile.exists()) {
-        await Bun.write(binCommandRunPath, command_run_default);
-      }
+    const routeTypeName = toPascalCase4(route.name);
+    content = content.replaceAll("{{ROUTE_NAME}}", route.name).replaceAll("{{TYPE_NAME}}", routeTypeName);
+    if (!route.path) {
+      route.path = await askRoutePath({ message: "Enter route path", initial: "/" });
     }
-    await Bun.write(join5(moduleDir, "package.json"), packageContent);
-    await Bun.write(join5(moduleDir, "tsconfig.json"), tsconfig_default);
-    await Bun.write(join5(testsDir, `${pascalName}Module.spec.ts`), testContent);
-    if (kebabName !== "app") {
-      const appModulePath = join5(cwd, "modules", "app", "src", "AppModule.ts");
-      if (await Bun.file(appModulePath).exists()) {
-        await this.addToAppModule(appModulePath, pascalName, kebabName);
-      }
-      const appTsconfigPath = join5(cwd, "modules", "app", "tsconfig.json");
-      if (await Bun.file(appTsconfigPath).exists()) {
-        await this.addPathAlias(appTsconfigPath, kebabName);
-      }
+    const routePath = `/${toKebabCase2(trim(route.path, "/"))}`;
+    content = content.replaceAll("{{ROUTE_PATH}}", routePath);
+    if (!isSocket && !route.method) {
+      route.method = await askRouteMethod({ message: "Enter route method" });
     }
-    const commitlintPath = join5(cwd, ".commitlintrc.ts");
-    if (await Bun.file(commitlintPath).exists()) {
-      await this.addModuleScope(commitlintPath, kebabName);
+    if (!isSocket && route.method) {
+      content = content.replaceAll("{{ROUTE_METHOD}}", route.method.toLowerCase());
     }
-    if (!silent) {
-      const logger = new TerminalLogger5;
-      logger.success(`modules/${kebabName} created successfully`, undefined, {
-        showTimestamp: false,
-        showArrow: false,
-        useSymbol: true
-      });
+    if (module) {
+      await ensureModule(module);
     }
-    const packageJsonPath = join5(process.cwd(), "package.json");
+    const base = module ? join6("modules", module) : ".";
+    const controllersLocalDir = join6(base, "src", "controllers");
+    const controllersDir = join6(process.cwd(), controllersLocalDir);
+    const filePath = join6(controllersDir, `${name}Controller.ts`);
+    await Bun.write(filePath, content);
+    const testContent = controller_test_default.replace(/{{NAME}}/g, name);
+    const testsLocalDir = join6(base, "tests", "controllers");
+    const testsDir = join6(process.cwd(), testsLocalDir);
+    const testFilePath = join6(testsDir, `${name}Controller.spec.ts`);
+    await Bun.write(testFilePath, testContent);
+    const modulePascalName = module ? toPascalCase4(module) : toPascalCase4(basename(process.cwd()));
+    const modulePath = join6(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
+    if (await Bun.file(modulePath).exists()) {
+      await this.addToModule(modulePath, name);
+    }
+    const logger = new TerminalLogger5;
+    logger.success(`${join6(controllersLocalDir, name)}Controller.ts created successfully`, undefined, {
+      showTimestamp: false,
+      showArrow: false,
+      useSymbol: true
+    });
+    logger.success(`${join6(testsLocalDir, name)}Controller.spec.ts created successfully`, undefined, {
+      showTimestamp: false,
+      showArrow: false,
+      useSymbol: true
+    });
+    const packageJsonPath = join6(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
-    if (!deps["@ooneex/module"] && !devDeps["@ooneex/module"]) {
-      const install = Bun.spawn(["bun", "add", "@ooneex/module"], {
+    if (!deps["@ooneex/controller"] && !devDeps["@ooneex/controller"]) {
+      const install = Bun.spawn(["bun", "add", "@ooneex/controller"], {
         cwd: process.cwd(),
         stdout: "ignore",
         stderr: "inherit"
@@ -7236,9 +7258,9 @@ class MakeModuleCommand {
     }
   }
 }
-MakeModuleCommand = __legacyDecorateClassTS([
+MakeControllerCommand = __legacyDecorateClassTS([
   decorator5.command()
-], MakeModuleCommand);
+], MakeControllerCommand);
 
 // src/commands/MakeAppCommand.ts
 class MakeAppCommand {
@@ -7258,15 +7280,15 @@ class MakeAppCommand {
       destination = await askDestination({ message: "Enter destination path", initial: kebabName });
     }
     const packageContent = package_json_default.replace(/{{NAME}}/g, kebabName);
-    await Bun.write(join6(destination, ".commitlintrc.ts"), _commitlintrc_ts_default);
-    await Bun.write(join6(destination, ".gitignore"), _gitignore_default);
-    await Bun.write(join6(destination, "biome.jsonc"), biome_jsonc_default);
-    await Bun.write(join6(destination, "bunfig.toml"), bunfig_toml_default);
-    await Bun.write(join6(destination, "nx.json"), nx_json_default);
-    await Bun.write(join6(destination, "package.json"), packageContent);
-    await Bun.write(join6(destination, "README.md"), README_md_default.replace(/{{NAME}}/g, kebabName));
-    await Bun.write(join6(destination, "tsconfig.json"), tsconfig_json_default);
-    await Bun.write(join6(destination, ".zed", "settings.json"), zed_settings_json_default);
+    await Bun.write(join7(destination, ".commitlintrc.ts"), _commitlintrc_ts_default);
+    await Bun.write(join7(destination, ".gitignore"), _gitignore_default);
+    await Bun.write(join7(destination, "biome.jsonc"), biome_jsonc_default);
+    await Bun.write(join7(destination, "bunfig.toml"), bunfig_toml_default);
+    await Bun.write(join7(destination, "nx.json"), nx_json_default);
+    await Bun.write(join7(destination, "package.json"), packageContent);
+    await Bun.write(join7(destination, "README.md"), README_md_default.replace(/{{NAME}}/g, kebabName));
+    await Bun.write(join7(destination, "tsconfig.json"), tsconfig_json_default);
+    await Bun.write(join7(destination, ".zed", "settings.json"), zed_settings_json_default);
     const makeModuleCommand = new MakeModuleCommand;
     await makeModuleCommand.run({
       name: "app",
@@ -7275,22 +7297,22 @@ class MakeAppCommand {
       skipMigrations: true,
       skipSeeds: true
     });
-    const appModulePackagePath = join6(destination, "modules", "app", "package.json");
+    const appModulePackagePath = join7(destination, "modules", "app", "package.json");
     const appModulePackageJson = await Bun.file(appModulePackagePath).json();
     appModulePackageJson.scripts.dev = "bun --hot run ./src/index.ts";
     appModulePackageJson.scripts.build = "bun build ./src/index.ts --outdir ./dist --target bun";
     await Bun.write(appModulePackagePath, JSON.stringify(appModulePackageJson, null, 2));
     const envContent = env_default.replace(/^DATABASE_URL=/m, 'DATABASE_URL="postgresql://ooneex:ooneex@localhost:5432/ooneex"').replace(/^CACHE_REDIS_URL=/m, 'CACHE_REDIS_URL="redis://localhost:6379"').replace(/^PUBSUB_REDIS_URL=/m, 'PUBSUB_REDIS_URL="redis://localhost:6379"').replace(/^RATE_LIMIT_REDIS_URL=/m, 'RATE_LIMIT_REDIS_URL="redis://localhost:6379"').replace(/^DATABASE_REDIS_URL=/m, 'DATABASE_REDIS_URL="redis://localhost:6379"');
-    await Bun.write(join6(destination, "modules", "app", ".env"), envContent);
-    await Bun.write(join6(destination, "modules", "app", ".env.example"), env_default);
-    await Bun.write(join6(destination, "modules", "app", "src", "databases", "AppDatabase.ts"), app_database_default);
-    await Bun.write(join6(destination, "modules", "app", "src", "index.ts"), index_ts_default);
+    await Bun.write(join7(destination, "modules", "app", ".env"), envContent);
+    await Bun.write(join7(destination, "modules", "app", ".env.example"), env_default);
+    await Bun.write(join7(destination, "modules", "app", "src", "databases", "AppDatabase.ts"), app_database_default);
+    await Bun.write(join7(destination, "modules", "app", "src", "index.ts"), index_ts_default);
     const snakeName = toSnakeCase(name);
     const dockerComposeContent = docker_compose_yml_default.replace(/{{NAME}}/g, snakeName);
-    await Bun.write(join6(destination, "modules", "app", "docker-compose.yml"), dockerComposeContent);
+    await Bun.write(join7(destination, "modules", "app", "docker-compose.yml"), dockerComposeContent);
     const dockerfileContent = Dockerfile_default.replace(/{{NAME}}/g, snakeName);
-    await Bun.write(join6(destination, "modules", "app", "Dockerfile"), dockerfileContent);
-    await Bun.write(join6(destination, "modules", "app", "var", ".gitkeep"), "");
+    await Bun.write(join7(destination, "modules", "app", "Dockerfile"), dockerfileContent);
+    await Bun.write(join7(destination, "modules", "app", "var", ".gitkeep"), "");
     const makeControllerCommand = new MakeControllerCommand;
     await makeControllerCommand.run({
       name: "HealthCheck",
@@ -7340,6 +7362,7 @@ class MakeAppCommand {
       "bun",
       "add",
       "-D",
+      "@ooneex/command",
       "@biomejs/biome",
       "@commitlint/cli",
       "@commitlint/config-conventional",
@@ -7359,8 +7382,8 @@ class MakeAppCommand {
     await addDevDeps.exited;
     const huskyInit = Bun.spawn(["bunx", "husky", "init"], { cwd: destination, stdout: "ignore", stderr: "inherit" });
     await huskyInit.exited;
-    await Bun.write(join6(destination, ".husky", "pre-commit"), "lint-staged");
-    await Bun.write(join6(destination, ".husky", "commit-msg"), `bunx commitlint --edit "$1"`);
+    await Bun.write(join7(destination, ".husky", "pre-commit"), "lint-staged");
+    await Bun.write(join7(destination, ".husky", "commit-msg"), `bunx commitlint --edit "$1"`);
     const logger = new TerminalLogger6;
     logger.success(`${kebabName} created successfully at ${destination}`, undefined, {
       showTimestamp: false,
@@ -7373,7 +7396,7 @@ MakeAppCommand = __legacyDecorateClassTS([
   decorator6.command()
 ], MakeAppCommand);
 // src/commands/MakeCacheCommand.ts
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 import { decorator as decorator7 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger7 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase5 } from "@ooneex/utils";
@@ -7448,28 +7471,31 @@ class MakeCacheCommand {
     }
     name = toPascalCase5(name).replace(/Cache$/, "");
     const content = cache_default.replace(/{{NAME}}/g, name);
-    const base = module ? join7("modules", module) : ".";
-    const cacheLocalDir = join7(base, "src", "cache");
-    const cacheDir = join7(process.cwd(), cacheLocalDir);
-    const filePath = join7(cacheDir, `${name}Cache.ts`);
+    if (module) {
+      await ensureModule(module);
+    }
+    const base = module ? join8("modules", module) : ".";
+    const cacheLocalDir = join8(base, "src", "cache");
+    const cacheDir = join8(process.cwd(), cacheLocalDir);
+    const filePath = join8(cacheDir, `${name}Cache.ts`);
     await Bun.write(filePath, content);
     const testContent = cache_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join7(base, "tests", "cache");
-    const testsDir = join7(process.cwd(), testsLocalDir);
-    const testFilePath = join7(testsDir, `${name}Cache.spec.ts`);
+    const testsLocalDir = join8(base, "tests", "cache");
+    const testsDir = join8(process.cwd(), testsLocalDir);
+    const testFilePath = join8(testsDir, `${name}Cache.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const logger = new TerminalLogger7;
-    logger.success(`${join7(cacheLocalDir, name)}Cache.ts created successfully`, undefined, {
+    logger.success(`${join8(cacheLocalDir, name)}Cache.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join7(testsLocalDir, name)}Cache.spec.ts created successfully`, undefined, {
+    logger.success(`${join8(testsLocalDir, name)}Cache.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join7(process.cwd(), "package.json");
+    const packageJsonPath = join8(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -7487,7 +7513,7 @@ MakeCacheCommand = __legacyDecorateClassTS([
   decorator7.command()
 ], MakeCacheCommand);
 // src/commands/MakeClaudeSkillCommand.ts
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 import { decorator as decorator8 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger8 } from "@ooneex/logger";
 
@@ -7776,14 +7802,14 @@ class MakeClaudeSkillCommand {
     return "Generate Claude skills from templates";
   }
   async run() {
-    const skillsLocalDir = join8(".claude", "skills");
-    const skillsDir = join8(process.cwd(), skillsLocalDir);
+    const skillsLocalDir = join9(".claude", "skills");
+    const skillsDir = join9(process.cwd(), skillsLocalDir);
     const logger = new TerminalLogger8;
     for (const [skillName, content] of Object.entries(skills)) {
       const dirName = skillName.replace(/\./g, "-");
-      const filePath = join8(skillsDir, dirName, "SKILL.md");
+      const filePath = join9(skillsDir, dirName, "SKILL.md");
       await Bun.write(filePath, content);
-      logger.success(`${join8(skillsLocalDir, dirName, "SKILL.md")} created successfully`, undefined, {
+      logger.success(`${join9(skillsLocalDir, dirName, "SKILL.md")} created successfully`, undefined, {
         showTimestamp: false,
         showArrow: false,
         useSymbol: true
@@ -7795,7 +7821,7 @@ MakeClaudeSkillCommand = __legacyDecorateClassTS([
   decorator8.command()
 ], MakeClaudeSkillCommand);
 // src/commands/MakeCommandCommand.ts
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 import { commandCreate, decorator as decorator9 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger9 } from "@ooneex/logger";
 class MakeCommandCommand {
@@ -7810,14 +7836,17 @@ class MakeCommandCommand {
     if (!name) {
       name = await askName({ message: "Enter name" });
     }
-    const base = module ? join9("modules", module) : ".";
+    if (module) {
+      await ensureModule(module);
+    }
+    const base = module ? join10("modules", module) : ".";
     const { commandPath, testPath } = await commandCreate({
       name,
-      commandDir: join9(base, "src", "commands"),
-      testsDir: join9(base, "tests", "commands")
+      commandDir: join10(base, "src", "commands"),
+      testsDir: join10(base, "tests", "commands")
     });
     if (module && module !== "app") {
-      const appCommandsRootPath = join9(process.cwd(), "modules", "app", "src", "commands", "commands.ts");
+      const appCommandsRootPath = join10(process.cwd(), "modules", "app", "src", "commands", "commands.ts");
       const appCommandsRootFile = Bun.file(appCommandsRootPath);
       const importLine = `import "@${module}/commands/commands";`;
       if (await appCommandsRootFile.exists()) {
@@ -7832,12 +7861,12 @@ ${importLine}
 `);
       }
     }
-    const binCommandRunPath = join9(process.cwd(), "modules", "app", "bin", "command", "run.ts");
+    const binCommandRunPath = join10(process.cwd(), "modules", "app", "bin", "command", "run.ts");
     const binCommandRunFile = Bun.file(binCommandRunPath);
     if (!await binCommandRunFile.exists()) {
       await Bun.write(binCommandRunPath, command_run_default);
     }
-    const packageJsonPath = join9(process.cwd(), "modules", "app", "package.json");
+    const packageJsonPath = join10(process.cwd(), "modules", "app", "package.json");
     const packageJsonFile = Bun.file(packageJsonPath);
     if (await packageJsonFile.exists()) {
       const packageJson = await packageJsonFile.json();
@@ -7867,7 +7896,7 @@ MakeCommandCommand = __legacyDecorateClassTS([
   decorator9.command()
 ], MakeCommandCommand);
 // src/commands/MakeCronCommand.ts
-import { basename as basename2, join as join10 } from "path";
+import { basename as basename2, join as join11 } from "path";
 import { decorator as decorator10 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger10 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase6 } from "@ooneex/utils";
@@ -7955,33 +7984,36 @@ class MakeCronCommand {
     }
     name = toPascalCase6(name).replace(/Cron$/, "");
     const content = cron_default.replace(/{{NAME}}/g, name);
-    const base = module ? join10("modules", module) : ".";
-    const cronLocalDir = join10(base, "src", "crons");
-    const cronDir = join10(process.cwd(), cronLocalDir);
-    const filePath = join10(cronDir, `${name}Cron.ts`);
+    if (module) {
+      await ensureModule(module);
+    }
+    const base = module ? join11("modules", module) : ".";
+    const cronLocalDir = join11(base, "src", "crons");
+    const cronDir = join11(process.cwd(), cronLocalDir);
+    const filePath = join11(cronDir, `${name}Cron.ts`);
     await Bun.write(filePath, content);
     const testContent = cron_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join10(base, "tests", "crons");
-    const testsDir = join10(process.cwd(), testsLocalDir);
-    const testFilePath = join10(testsDir, `${name}Cron.spec.ts`);
+    const testsLocalDir = join11(base, "tests", "crons");
+    const testsDir = join11(process.cwd(), testsLocalDir);
+    const testFilePath = join11(testsDir, `${name}Cron.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const modulePascalName = module ? toPascalCase6(module) : toPascalCase6(basename2(process.cwd()));
-    const modulePath = join10(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
+    const modulePath = join11(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
     if (await Bun.file(modulePath).exists()) {
       await this.addToModule(modulePath, name);
     }
     const logger = new TerminalLogger10;
-    logger.success(`${join10(cronLocalDir, name)}Cron.ts created successfully`, undefined, {
+    logger.success(`${join11(cronLocalDir, name)}Cron.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join10(testsLocalDir, name)}Cron.spec.ts created successfully`, undefined, {
+    logger.success(`${join11(testsLocalDir, name)}Cron.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join10(process.cwd(), "package.json");
+    const packageJsonPath = join11(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -7999,7 +8031,7 @@ MakeCronCommand = __legacyDecorateClassTS([
   decorator10.command()
 ], MakeCronCommand);
 // src/commands/MakeDatabaseCommand.ts
-import { join as join11 } from "path";
+import { join as join12 } from "path";
 import { decorator as decorator11 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger11 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase7 } from "@ooneex/utils";
@@ -8061,28 +8093,31 @@ class MakeDatabaseCommand {
     }
     name = toPascalCase7(name).replace(/DatabaseAdapter$/, "").replace(/Database$/, "");
     const content = database_default.replace(/{{NAME}}/g, name);
-    const base = module ? join11("modules", module) : ".";
-    const databaseLocalDir = join11(base, "src", "databases");
-    const databaseDir = join11(process.cwd(), databaseLocalDir);
-    const filePath = join11(databaseDir, `${name}Database.ts`);
+    if (module) {
+      await ensureModule(module);
+    }
+    const base = module ? join12("modules", module) : ".";
+    const databaseLocalDir = join12(base, "src", "databases");
+    const databaseDir = join12(process.cwd(), databaseLocalDir);
+    const filePath = join12(databaseDir, `${name}Database.ts`);
     await Bun.write(filePath, content);
     const testContent = database_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join11(base, "tests", "databases");
-    const testsDir = join11(process.cwd(), testsLocalDir);
-    const testFilePath = join11(testsDir, `${name}Database.spec.ts`);
+    const testsLocalDir = join12(base, "tests", "databases");
+    const testsDir = join12(process.cwd(), testsLocalDir);
+    const testFilePath = join12(testsDir, `${name}Database.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const logger = new TerminalLogger11;
-    logger.success(`${join11(databaseLocalDir, name)}Database.ts created successfully`, undefined, {
+    logger.success(`${join12(databaseLocalDir, name)}Database.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join11(testsLocalDir, name)}Database.spec.ts created successfully`, undefined, {
+    logger.success(`${join12(testsLocalDir, name)}Database.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join11(process.cwd(), "package.json");
+    const packageJsonPath = join12(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -8100,7 +8135,7 @@ MakeDatabaseCommand = __legacyDecorateClassTS([
   decorator11.command()
 ], MakeDatabaseCommand);
 // src/commands/MakeDockerCommand.ts
-import { join as join12 } from "path";
+import { join as join13 } from "path";
 import { decorator as decorator12 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger12 } from "@ooneex/logger";
 var {YAML } = globalThis.Bun;
@@ -8595,8 +8630,8 @@ class MakeDockerCommand {
       name = await askDockerService({ message: "Select docker service" });
     }
     const templateContent = templates[name];
-    const base = join12("modules", "app");
-    const composePath = join12(process.cwd(), base, "docker-compose.yml");
+    const base = join13("modules", "app");
+    const composePath = join13(process.cwd(), base, "docker-compose.yml");
     const logger = new TerminalLogger12;
     const composeFile = Bun.file(composePath);
     if (await composeFile.exists()) {
@@ -8656,7 +8691,7 @@ volumes:
     } else {
       await Bun.write(composePath, templateContent);
     }
-    const packageJsonPath = join12(process.cwd(), base, "package.json");
+    const packageJsonPath = join13(process.cwd(), base, "package.json");
     const packageJsonFile = Bun.file(packageJsonPath);
     if (await packageJsonFile.exists()) {
       const packageJson = await packageJsonFile.json();
@@ -8681,7 +8716,7 @@ MakeDockerCommand = __legacyDecorateClassTS([
 ], MakeDockerCommand);
 // src/commands/MakeEntityCommand.ts
 var import_pluralize = __toESM(require_pluralize(), 1);
-import { basename as basename3, join as join13 } from "path";
+import { basename as basename3, join as join14 } from "path";
 import { decorator as decorator13 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger13 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase8, toSnakeCase as toSnakeCase2 } from "@ooneex/utils";
@@ -8844,28 +8879,31 @@ class MakeEntityCommand {
       tableName = toSnakeCase2(import_pluralize.default(name));
     }
     const content = entity_default.replace(/{{NAME}}/g, name).replace(/{{TABLE_NAME}}/g, tableName);
-    const base = module ? join13("modules", module) : ".";
-    const entitiesLocalDir = join13(base, "src", "entities");
-    const entitiesDir = join13(process.cwd(), entitiesLocalDir);
-    const filePath = join13(entitiesDir, `${name}Entity.ts`);
+    if (module) {
+      await ensureModule(module);
+    }
+    const base = module ? join14("modules", module) : ".";
+    const entitiesLocalDir = join14(base, "src", "entities");
+    const entitiesDir = join14(process.cwd(), entitiesLocalDir);
+    const filePath = join14(entitiesDir, `${name}Entity.ts`);
     await Bun.write(filePath, content);
     const testContent = entity_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join13(base, "tests", "entities");
-    const testsDir = join13(process.cwd(), testsLocalDir);
-    const testFilePath = join13(testsDir, `${name}Entity.spec.ts`);
+    const testsLocalDir = join14(base, "tests", "entities");
+    const testsDir = join14(process.cwd(), testsLocalDir);
+    const testFilePath = join14(testsDir, `${name}Entity.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const modulePascalName = module ? toPascalCase8(module) : toPascalCase8(basename3(process.cwd()));
-    const modulePath = join13(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
+    const modulePath = join14(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
     if (await Bun.file(modulePath).exists()) {
       await this.addToModule(modulePath, name);
     }
     const logger = new TerminalLogger13;
-    logger.success(`${join13(entitiesLocalDir, name)}Entity.ts created successfully`, undefined, {
+    logger.success(`${join14(entitiesLocalDir, name)}Entity.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join13(testsLocalDir, name)}Entity.spec.ts created successfully`, undefined, {
+    logger.success(`${join14(testsLocalDir, name)}Entity.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
@@ -8876,7 +8914,7 @@ MakeEntityCommand = __legacyDecorateClassTS([
   decorator13.command()
 ], MakeEntityCommand);
 // src/commands/MakeLoggerCommand.ts
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 import { decorator as decorator14 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger14 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase9 } from "@ooneex/utils";
@@ -8980,28 +9018,31 @@ class MakeLoggerCommand {
     }
     name = toPascalCase9(name).replace(/Logger$/, "");
     const content = logger_default.replace(/{{NAME}}/g, name);
-    const base = module ? join14("modules", module) : ".";
-    const loggerLocalDir = join14(base, "src", "loggers");
-    const loggerDir = join14(process.cwd(), loggerLocalDir);
-    const filePath = join14(loggerDir, `${name}Logger.ts`);
+    if (module) {
+      await ensureModule(module);
+    }
+    const base = module ? join15("modules", module) : ".";
+    const loggerLocalDir = join15(base, "src", "loggers");
+    const loggerDir = join15(process.cwd(), loggerLocalDir);
+    const filePath = join15(loggerDir, `${name}Logger.ts`);
     await Bun.write(filePath, content);
     const testContent = logger_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join14(base, "tests", "loggers");
-    const testsDir = join14(process.cwd(), testsLocalDir);
-    const testFilePath = join14(testsDir, `${name}Logger.spec.ts`);
+    const testsLocalDir = join15(base, "tests", "loggers");
+    const testsDir = join15(process.cwd(), testsLocalDir);
+    const testFilePath = join15(testsDir, `${name}Logger.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const logger = new TerminalLogger14;
-    logger.success(`${join14(loggerLocalDir, name)}Logger.ts created successfully`, undefined, {
+    logger.success(`${join15(loggerLocalDir, name)}Logger.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join14(testsLocalDir, name)}Logger.spec.ts created successfully`, undefined, {
+    logger.success(`${join15(testsLocalDir, name)}Logger.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join14(process.cwd(), "package.json");
+    const packageJsonPath = join15(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -9019,7 +9060,7 @@ MakeLoggerCommand = __legacyDecorateClassTS([
   decorator14.command()
 ], MakeLoggerCommand);
 // src/commands/MakeMailerCommand.ts
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 import { decorator as decorator15 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger15 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase10 } from "@ooneex/utils";
@@ -9116,43 +9157,46 @@ class MakeMailerCommand {
     name = toPascalCase10(name).replace(/Mailer$/, "");
     const mailerContent = mailer_default.replace(/{{NAME}}/g, name);
     const templateContent = mailer_template_default.replace(/{{NAME}}/g, name);
-    const base = module ? join15("modules", module) : ".";
-    const mailerLocalDir = join15(base, "src", "mailers");
-    const mailerDir = join15(process.cwd(), mailerLocalDir);
-    const mailerFilePath = join15(mailerDir, `${name}Mailer.ts`);
-    const templateFilePath = join15(mailerDir, `${name}MailerTemplate.tsx`);
+    if (module) {
+      await ensureModule(module);
+    }
+    const base = module ? join16("modules", module) : ".";
+    const mailerLocalDir = join16(base, "src", "mailers");
+    const mailerDir = join16(process.cwd(), mailerLocalDir);
+    const mailerFilePath = join16(mailerDir, `${name}Mailer.ts`);
+    const templateFilePath = join16(mailerDir, `${name}MailerTemplate.tsx`);
     await Bun.write(mailerFilePath, mailerContent);
     await Bun.write(templateFilePath, templateContent);
     const mailerTestContent = mailer_test_default.replace(/{{NAME}}/g, name);
     const templateTestContent = mailer_template_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join15(base, "tests", "mailers");
-    const testsDir = join15(process.cwd(), testsLocalDir);
-    const mailerTestFilePath = join15(testsDir, `${name}Mailer.spec.ts`);
-    const templateTestFilePath = join15(testsDir, `${name}MailerTemplate.spec.ts`);
+    const testsLocalDir = join16(base, "tests", "mailers");
+    const testsDir = join16(process.cwd(), testsLocalDir);
+    const mailerTestFilePath = join16(testsDir, `${name}Mailer.spec.ts`);
+    const templateTestFilePath = join16(testsDir, `${name}MailerTemplate.spec.ts`);
     await Bun.write(mailerTestFilePath, mailerTestContent);
     await Bun.write(templateTestFilePath, templateTestContent);
     const logger = new TerminalLogger15;
-    logger.success(`${join15(mailerLocalDir, name)}Mailer.ts created successfully`, undefined, {
+    logger.success(`${join16(mailerLocalDir, name)}Mailer.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join15(mailerLocalDir, name)}MailerTemplate.tsx created successfully`, undefined, {
+    logger.success(`${join16(mailerLocalDir, name)}MailerTemplate.tsx created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join15(testsLocalDir, name)}Mailer.spec.ts created successfully`, undefined, {
+    logger.success(`${join16(testsLocalDir, name)}Mailer.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join15(testsLocalDir, name)}MailerTemplate.spec.ts created successfully`, undefined, {
+    logger.success(`${join16(testsLocalDir, name)}MailerTemplate.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join15(process.cwd(), "package.json");
+    const packageJsonPath = join16(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -9170,7 +9214,7 @@ MakeMailerCommand = __legacyDecorateClassTS([
   decorator15.command()
 ], MakeMailerCommand);
 // src/commands/MakeMiddlewareCommand.ts
-import { basename as basename4, join as join16 } from "path";
+import { basename as basename4, join as join17 } from "path";
 import { decorator as decorator16 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger16 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase11 } from "@ooneex/utils";
@@ -9258,33 +9302,36 @@ class MakeMiddlewareCommand {
     name = toPascalCase11(name).replace(/Middleware$/, "");
     const selectedTemplate = isSocket ? middleware_socket_default : middleware_default;
     const content = selectedTemplate.replace(/{{NAME}}/g, name);
-    const base = module ? join16("modules", module) : ".";
-    const middlewareLocalDir = join16(base, "src", "middlewares");
-    const middlewareDir = join16(process.cwd(), middlewareLocalDir);
-    const filePath = join16(middlewareDir, `${name}Middleware.ts`);
+    if (module) {
+      await ensureModule(module);
+    }
+    const base = module ? join17("modules", module) : ".";
+    const middlewareLocalDir = join17(base, "src", "middlewares");
+    const middlewareDir = join17(process.cwd(), middlewareLocalDir);
+    const filePath = join17(middlewareDir, `${name}Middleware.ts`);
     await Bun.write(filePath, content);
     const testContent = middleware_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join16(base, "tests", "middlewares");
-    const testsDir = join16(process.cwd(), testsLocalDir);
-    const testFilePath = join16(testsDir, `${name}Middleware.spec.ts`);
+    const testsLocalDir = join17(base, "tests", "middlewares");
+    const testsDir = join17(process.cwd(), testsLocalDir);
+    const testFilePath = join17(testsDir, `${name}Middleware.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const modulePascalName = module ? toPascalCase11(module) : toPascalCase11(basename4(process.cwd()));
-    const modulePath = join16(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
+    const modulePath = join17(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
     if (await Bun.file(modulePath).exists()) {
       await this.addToModule(modulePath, name);
     }
     const logger = new TerminalLogger16;
-    logger.success(`${join16(middlewareLocalDir, name)}Middleware.ts created successfully`, undefined, {
+    logger.success(`${join17(middlewareLocalDir, name)}Middleware.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join16(testsLocalDir, name)}Middleware.spec.ts created successfully`, undefined, {
+    logger.success(`${join17(testsLocalDir, name)}Middleware.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join16(process.cwd(), "package.json");
+    const packageJsonPath = join17(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -9302,7 +9349,7 @@ MakeMiddlewareCommand = __legacyDecorateClassTS([
   decorator16.command()
 ], MakeMiddlewareCommand);
 // src/commands/MakeMigrationCommand.ts
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 import { decorator as decorator17 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger17 } from "@ooneex/logger";
 import { migrationCreate } from "@ooneex/migrations";
@@ -9329,17 +9376,20 @@ class MakeMigrationCommand {
   }
   async run(options) {
     const { module } = options;
-    const base = module ? join17("modules", module) : ".";
+    if (module) {
+      await ensureModule(module);
+    }
+    const base = module ? join18("modules", module) : ".";
     const { migrationPath: filePath } = await migrationCreate({
-      migrationsDir: join17(base, "src", "migrations"),
-      testsDir: join17(base, "tests", "migrations")
+      migrationsDir: join18(base, "src", "migrations"),
+      testsDir: join18(base, "tests", "migrations")
     });
-    const binMigrationUpPath = join17(process.cwd(), base, "bin", "migration", "up.ts");
+    const binMigrationUpPath = join18(process.cwd(), base, "bin", "migration", "up.ts");
     const binMigrationUpFile = Bun.file(binMigrationUpPath);
     if (!await binMigrationUpFile.exists()) {
       await Bun.write(binMigrationUpPath, migration_up_default);
     }
-    const packageJsonPath = join17(process.cwd(), "package.json");
+    const packageJsonPath = join18(process.cwd(), "package.json");
     const packageJsonFile = Bun.file(packageJsonPath);
     if (await packageJsonFile.exists()) {
       const packageJson = await packageJsonFile.json();
@@ -9375,7 +9425,7 @@ MakeMigrationCommand = __legacyDecorateClassTS([
   decorator17.command()
 ], MakeMigrationCommand);
 // src/commands/MakePermissionCommand.ts
-import { join as join18 } from "path";
+import { join as join19 } from "path";
 import { decorator as decorator18 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger18 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase12 } from "@ooneex/utils";
@@ -9465,28 +9515,31 @@ class MakePermissionCommand {
     }
     name = toPascalCase12(name).replace(/Permission$/, "");
     const content = permission_default.replace(/{{NAME}}/g, name);
-    const base = module ? join18("modules", module) : ".";
-    const permissionLocalDir = join18(base, "src", "permissions");
-    const permissionDir = join18(process.cwd(), permissionLocalDir);
-    const filePath = join18(permissionDir, `${name}Permission.ts`);
+    if (module) {
+      await ensureModule(module);
+    }
+    const base = module ? join19("modules", module) : ".";
+    const permissionLocalDir = join19(base, "src", "permissions");
+    const permissionDir = join19(process.cwd(), permissionLocalDir);
+    const filePath = join19(permissionDir, `${name}Permission.ts`);
     await Bun.write(filePath, content);
     const testContent = permission_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join18(base, "tests", "permissions");
-    const testsDir = join18(process.cwd(), testsLocalDir);
-    const testFilePath = join18(testsDir, `${name}Permission.spec.ts`);
+    const testsLocalDir = join19(base, "tests", "permissions");
+    const testsDir = join19(process.cwd(), testsLocalDir);
+    const testFilePath = join19(testsDir, `${name}Permission.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const logger = new TerminalLogger18;
-    logger.success(`${join18(permissionLocalDir, name)}Permission.ts created successfully`, undefined, {
+    logger.success(`${join19(permissionLocalDir, name)}Permission.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join18(testsLocalDir, name)}Permission.spec.ts created successfully`, undefined, {
+    logger.success(`${join19(testsLocalDir, name)}Permission.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join18(process.cwd(), "package.json");
+    const packageJsonPath = join19(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -9504,7 +9557,7 @@ MakePermissionCommand = __legacyDecorateClassTS([
   decorator18.command()
 ], MakePermissionCommand);
 // src/commands/MakePubSubCommand.ts
-import { basename as basename5, join as join19 } from "path";
+import { basename as basename5, join as join20 } from "path";
 import { decorator as decorator19 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger19 } from "@ooneex/logger";
 import { toKebabCase as toKebabCase4, toPascalCase as toPascalCase13 } from "@ooneex/utils";
@@ -9611,33 +9664,36 @@ class MakePubSubCommand {
       channel = toKebabCase4(name);
     }
     const content = pubsub_default.replace(/{{NAME}}/g, name).replace(/{{CHANNEL}}/g, channel);
-    const base = module ? join19("modules", module) : ".";
-    const pubSubLocalDir = join19(base, "src", "events");
-    const pubSubDir = join19(process.cwd(), pubSubLocalDir);
-    const filePath = join19(pubSubDir, `${name}Event.ts`);
+    if (module) {
+      await ensureModule(module);
+    }
+    const base = module ? join20("modules", module) : ".";
+    const pubSubLocalDir = join20(base, "src", "events");
+    const pubSubDir = join20(process.cwd(), pubSubLocalDir);
+    const filePath = join20(pubSubDir, `${name}Event.ts`);
     await Bun.write(filePath, content);
     const testContent = pubsub_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join19(base, "tests", "events");
-    const testsDir = join19(process.cwd(), testsLocalDir);
-    const testFilePath = join19(testsDir, `${name}Event.spec.ts`);
+    const testsLocalDir = join20(base, "tests", "events");
+    const testsDir = join20(process.cwd(), testsLocalDir);
+    const testFilePath = join20(testsDir, `${name}Event.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const modulePascalName = module ? toPascalCase13(module) : toPascalCase13(basename5(process.cwd()));
-    const modulePath = join19(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
+    const modulePath = join20(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
     if (await Bun.file(modulePath).exists()) {
       await this.addToModule(modulePath, name);
     }
     const logger = new TerminalLogger19;
-    logger.success(`${join19(pubSubLocalDir, name)}Event.ts created successfully`, undefined, {
+    logger.success(`${join20(pubSubLocalDir, name)}Event.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join19(testsLocalDir, name)}Event.spec.ts created successfully`, undefined, {
+    logger.success(`${join20(testsLocalDir, name)}Event.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join19(process.cwd(), "package.json");
+    const packageJsonPath = join20(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -9656,7 +9712,7 @@ MakePubSubCommand = __legacyDecorateClassTS([
 ], MakePubSubCommand);
 // src/commands/MakeReleaseCommand.ts
 import { readdir } from "fs/promises";
-import { join as join20 } from "path";
+import { join as join21 } from "path";
 import { decorator as decorator20 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger20 } from "@ooneex/logger";
 var {$ } = globalThis.Bun;
@@ -9689,8 +9745,8 @@ class MakeReleaseCommand {
       { name: "modules", type: "module" }
     ]) {
       try {
-        const entries = await readdir(join20(cwd, name), { withFileTypes: true });
-        dirs.push(...entries.filter((d) => d.isDirectory()).map((d) => ({ base: join20(name, d.name), type })));
+        const entries = await readdir(join21(cwd, name), { withFileTypes: true });
+        dirs.push(...entries.filter((d) => d.isDirectory()).map((d) => ({ base: join21(name, d.name), type })));
       } catch {}
     }
     const logOptions = { showTimestamp: false, showArrow: false, useSymbol: true };
@@ -9700,8 +9756,8 @@ class MakeReleaseCommand {
     }
     let releasedCount = 0;
     for (const dir of dirs) {
-      const fullDir = join20(cwd, dir.base);
-      const pkgJsonPath = join20(fullDir, "package.json");
+      const fullDir = join21(cwd, dir.base);
+      const pkgJsonPath = join21(fullDir, "package.json");
       const pkgJsonFile = Bun.file(pkgJsonPath);
       if (!await pkgJsonFile.exists()) {
         continue;
@@ -9719,7 +9775,7 @@ class MakeReleaseCommand {
       await Bun.write(pkgJsonPath, `${JSON.stringify(pkgJson, null, 2)}
 `);
       await this.updateChangelog(fullDir, newVersion, tag, commits);
-      await this.gitAdd(join20(dir.base, "package.json"), join20(dir.base, "CHANGELOG.md"));
+      await this.gitAdd(join21(dir.base, "package.json"), join21(dir.base, "CHANGELOG.md"));
       await this.gitCommit(`chore(release): ${pkgJson.name}@${newVersion}`);
       await this.gitTag(tag, `chore(release): ${pkgJson.name}@${newVersion}`);
       logger.success(`${pkgJson.name}@${newVersion} released (${bumpType} bump, ${commits.length} commit(s))`, undefined, logOptions);
@@ -9816,7 +9872,7 @@ class MakeReleaseCommand {
     }
   }
   async updateChangelog(dir, version, tag, commits) {
-    const changelogPath = join20(dir, "CHANGELOG.md");
+    const changelogPath = join21(dir, "CHANGELOG.md");
     const today = new Date().toISOString().split("T")[0];
     const repoUrl = await this.getRepoUrl();
     const grouped = new Map;
@@ -9890,7 +9946,7 @@ MakeReleaseCommand = __legacyDecorateClassTS([
   decorator20.command()
 ], MakeReleaseCommand);
 // src/commands/MakeRepositoryCommand.ts
-import { join as join21 } from "path";
+import { join as join22 } from "path";
 import { decorator as decorator21 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger21 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase14 } from "@ooneex/utils";
@@ -10103,28 +10159,31 @@ class MakeRepositoryCommand {
     }
     name = toPascalCase14(name).replace(/Repository$/, "");
     const content = repository_default.replace(/{{NAME}}/g, name);
-    const base = module ? join21("modules", module) : ".";
-    const repositoriesLocalDir = join21(base, "src", "repositories");
-    const repositoriesDir = join21(process.cwd(), repositoriesLocalDir);
-    const filePath = join21(repositoriesDir, `${name}Repository.ts`);
+    if (module) {
+      await ensureModule(module);
+    }
+    const base = module ? join22("modules", module) : ".";
+    const repositoriesLocalDir = join22(base, "src", "repositories");
+    const repositoriesDir = join22(process.cwd(), repositoriesLocalDir);
+    const filePath = join22(repositoriesDir, `${name}Repository.ts`);
     await Bun.write(filePath, content);
     const testContent = repository_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join21(base, "tests", "repositories");
-    const testsDir = join21(process.cwd(), testsLocalDir);
-    const testFilePath = join21(testsDir, `${name}Repository.spec.ts`);
+    const testsLocalDir = join22(base, "tests", "repositories");
+    const testsDir = join22(process.cwd(), testsLocalDir);
+    const testFilePath = join22(testsDir, `${name}Repository.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const logger = new TerminalLogger21;
-    logger.success(`${join21(repositoriesLocalDir, name)}Repository.ts created successfully`, undefined, {
+    logger.success(`${join22(repositoriesLocalDir, name)}Repository.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join21(testsLocalDir, name)}Repository.spec.ts created successfully`, undefined, {
+    logger.success(`${join22(testsLocalDir, name)}Repository.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join21(process.cwd(), "package.json");
+    const packageJsonPath = join22(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -10142,7 +10201,7 @@ MakeRepositoryCommand = __legacyDecorateClassTS([
   decorator21.command()
 ], MakeRepositoryCommand);
 // src/commands/MakeResourceBookCommand.ts
-import { join as join23 } from "path";
+import { join as join24 } from "path";
 import { decorator as decorator23 } from "@ooneex/command";
 var {Glob } = globalThis.Bun;
 
@@ -10839,7 +10898,7 @@ export class UpdateBookService implements IService {
 `;
 
 // src/commands/MakeServiceCommand.ts
-import { join as join22 } from "path";
+import { join as join23 } from "path";
 import { decorator as decorator22 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger22 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase15 } from "@ooneex/utils";
@@ -10890,28 +10949,31 @@ class MakeServiceCommand {
     }
     name = toPascalCase15(name).replace(/Service$/, "");
     const content = service_default.replace(/{{NAME}}/g, name);
-    const base = module ? join22("modules", module) : ".";
-    const serviceLocalDir = join22(base, "src", "services");
-    const serviceDir = join22(process.cwd(), serviceLocalDir);
-    const filePath = join22(serviceDir, `${name}Service.ts`);
+    if (module) {
+      await ensureModule(module);
+    }
+    const base = module ? join23("modules", module) : ".";
+    const serviceLocalDir = join23(base, "src", "services");
+    const serviceDir = join23(process.cwd(), serviceLocalDir);
+    const filePath = join23(serviceDir, `${name}Service.ts`);
     await Bun.write(filePath, content);
     const testContent = service_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join22(base, "tests", "services");
-    const testsDir = join22(process.cwd(), testsLocalDir);
-    const testFilePath = join22(testsDir, `${name}Service.spec.ts`);
+    const testsLocalDir = join23(base, "tests", "services");
+    const testsDir = join23(process.cwd(), testsLocalDir);
+    const testFilePath = join23(testsDir, `${name}Service.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const logger = new TerminalLogger22;
-    logger.success(`${join22(serviceLocalDir, name)}Service.ts created successfully`, undefined, {
+    logger.success(`${join23(serviceLocalDir, name)}Service.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join22(testsLocalDir, name)}Service.spec.ts created successfully`, undefined, {
+    logger.success(`${join23(testsLocalDir, name)}Service.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join22(process.cwd(), "package.json");
+    const packageJsonPath = join23(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -10939,7 +11001,7 @@ class MakeResourceBookCommand {
   }
   async run() {
     const module = "book";
-    const base = join23("modules", module);
+    const base = join24("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
     await makeModuleCommand.run({ name: module, silent: true, skipMigrations: false, skipSeeds: true });
     const makeEntityCommand = new MakeEntityCommand;
@@ -10959,26 +11021,26 @@ class MakeResourceBookCommand {
     for (const controller of controllers) {
       await makeControllerCommand.run({ ...controller, module, isSocket: false });
     }
-    const controllersDir = join23(process.cwd(), base, "src", "controllers");
-    await Bun.write(join23(controllersDir, "CreateBookController.ts"), CreateBookController_default);
-    await Bun.write(join23(controllersDir, "GetBookController.ts"), GetBookController_default);
-    await Bun.write(join23(controllersDir, "ListBooksController.ts"), ListBooksController_default);
-    await Bun.write(join23(controllersDir, "UpdateBookController.ts"), UpdateBookController_default);
-    await Bun.write(join23(controllersDir, "DeleteBookController.ts"), DeleteBookController_default);
+    const controllersDir = join24(process.cwd(), base, "src", "controllers");
+    await Bun.write(join24(controllersDir, "CreateBookController.ts"), CreateBookController_default);
+    await Bun.write(join24(controllersDir, "GetBookController.ts"), GetBookController_default);
+    await Bun.write(join24(controllersDir, "ListBooksController.ts"), ListBooksController_default);
+    await Bun.write(join24(controllersDir, "UpdateBookController.ts"), UpdateBookController_default);
+    await Bun.write(join24(controllersDir, "DeleteBookController.ts"), DeleteBookController_default);
     const makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateBook", "GetBook", "ListBooks", "UpdateBook", "DeleteBook"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join23(process.cwd(), base, "src", "services");
-    await Bun.write(join23(servicesDir, "CreateBookService.ts"), CreateBookService_default);
-    await Bun.write(join23(servicesDir, "GetBookService.ts"), GetBookService_default);
-    await Bun.write(join23(servicesDir, "ListBooksService.ts"), ListBooksService_default);
-    await Bun.write(join23(servicesDir, "UpdateBookService.ts"), UpdateBookService_default);
-    await Bun.write(join23(servicesDir, "DeleteBookService.ts"), DeleteBookService_default);
-    const entityPath = join23(process.cwd(), base, "src", "entities", "BookEntity.ts");
+    const servicesDir = join24(process.cwd(), base, "src", "services");
+    await Bun.write(join24(servicesDir, "CreateBookService.ts"), CreateBookService_default);
+    await Bun.write(join24(servicesDir, "GetBookService.ts"), GetBookService_default);
+    await Bun.write(join24(servicesDir, "ListBooksService.ts"), ListBooksService_default);
+    await Bun.write(join24(servicesDir, "UpdateBookService.ts"), UpdateBookService_default);
+    await Bun.write(join24(servicesDir, "DeleteBookService.ts"), DeleteBookService_default);
+    const entityPath = join24(process.cwd(), base, "src", "entities", "BookEntity.ts");
     await Bun.write(entityPath, BookEntity_default);
-    const migrationsDir = join23(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join24(process.cwd(), base, "src", "migrations");
     const glob = new Glob("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -10986,9 +11048,9 @@ class MakeResourceBookCommand {
       const name = file.replace(/\.ts$/, "");
       const version = name.replace("Migration", "");
       const content = BookMigration_default.replaceAll("{{ name }}", name).replaceAll("{{ version }}", version);
-      await Bun.write(join23(migrationsDir, file), content);
+      await Bun.write(join24(migrationsDir, file), content);
     }
-    const repositoryPath = join23(process.cwd(), base, "src", "repositories", "BookRepository.ts");
+    const repositoryPath = join24(process.cwd(), base, "src", "repositories", "BookRepository.ts");
     await Bun.write(repositoryPath, BookRepository_default);
   }
 }
@@ -10996,7 +11058,7 @@ MakeResourceBookCommand = __legacyDecorateClassTS([
   decorator23.command()
 ], MakeResourceBookCommand);
 // src/commands/MakeSeedCommand.ts
-import { join as join24 } from "path";
+import { join as join25 } from "path";
 import { decorator as decorator24 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger23 } from "@ooneex/logger";
 import { seedCreate } from "@ooneex/seeds";
@@ -11023,18 +11085,21 @@ class MakeSeedCommand {
     if (!name) {
       name = await askName({ message: "Enter seed name" });
     }
-    const base = module ? join24("modules", module) : ".";
+    if (module) {
+      await ensureModule(module);
+    }
+    const base = module ? join25("modules", module) : ".";
     const { seedPath: filePath } = await seedCreate({
       name,
-      seedsDir: join24(base, "src", "seeds"),
-      testsDir: join24(base, "tests", "seeds")
+      seedsDir: join25(base, "src", "seeds"),
+      testsDir: join25(base, "tests", "seeds")
     });
-    const binSeedRunPath = join24(process.cwd(), base, "bin", "seed", "run.ts");
+    const binSeedRunPath = join25(process.cwd(), base, "bin", "seed", "run.ts");
     const binSeedRunFile = Bun.file(binSeedRunPath);
     if (!await binSeedRunFile.exists()) {
       await Bun.write(binSeedRunPath, seed_run_default);
     }
-    const packageJsonPath = join24(process.cwd(), "package.json");
+    const packageJsonPath = join25(process.cwd(), "package.json");
     const packageJsonFile = Bun.file(packageJsonPath);
     if (await packageJsonFile.exists()) {
       const packageJson = await packageJsonFile.json();
@@ -11070,7 +11135,7 @@ MakeSeedCommand = __legacyDecorateClassTS([
   decorator24.command()
 ], MakeSeedCommand);
 // src/commands/MakeStorageCommand.ts
-import { join as join25 } from "path";
+import { join as join26 } from "path";
 import { decorator as decorator25 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger24 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase16, toSnakeCase as toSnakeCase3 } from "@ooneex/utils";
@@ -11169,28 +11234,31 @@ class MakeStorageCommand {
     name = toPascalCase16(name).replace(/Storage$/, "");
     const nameUpper = toSnakeCase3(name).toUpperCase();
     const content = storage_default.replace(/{{NAME}}/g, name).replace(/{{NAME_UPPER}}/g, nameUpper);
-    const base = module ? join25("modules", module) : ".";
-    const storageLocalDir = join25(base, "src", "storage");
-    const storageDir = join25(process.cwd(), storageLocalDir);
-    const filePath = join25(storageDir, `${name}Storage.ts`);
+    if (module) {
+      await ensureModule(module);
+    }
+    const base = module ? join26("modules", module) : ".";
+    const storageLocalDir = join26(base, "src", "storage");
+    const storageDir = join26(process.cwd(), storageLocalDir);
+    const filePath = join26(storageDir, `${name}Storage.ts`);
     await Bun.write(filePath, content);
     const testContent = storage_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join25(base, "tests", "storage");
-    const testsDir = join25(process.cwd(), testsLocalDir);
-    const testFilePath = join25(testsDir, `${name}Storage.spec.ts`);
+    const testsLocalDir = join26(base, "tests", "storage");
+    const testsDir = join26(process.cwd(), testsLocalDir);
+    const testFilePath = join26(testsDir, `${name}Storage.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const logger = new TerminalLogger24;
-    logger.success(`${join25(storageLocalDir, name)}Storage.ts created successfully`, undefined, {
+    logger.success(`${join26(storageLocalDir, name)}Storage.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join25(testsLocalDir, name)}Storage.spec.ts created successfully`, undefined, {
+    logger.success(`${join26(testsLocalDir, name)}Storage.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join25(process.cwd(), "package.json");
+    const packageJsonPath = join26(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -11208,7 +11276,7 @@ MakeStorageCommand = __legacyDecorateClassTS([
   decorator25.command()
 ], MakeStorageCommand);
 // src/commands/MakeVectorDatabaseCommand.ts
-import { join as join26 } from "path";
+import { join as join27 } from "path";
 import { decorator as decorator26 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger25 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase17 } from "@ooneex/utils";
@@ -11281,28 +11349,31 @@ class MakeVectorDatabaseCommand {
     }
     name = toPascalCase17(name).replace(/VectorDatabase$/, "").replace(/Database$/, "");
     const content = vector_database_default.replace(/{{NAME}}/g, name);
-    const base = module ? join26("modules", module) : ".";
-    const vectorDatabaseLocalDir = join26(base, "src", "databases");
-    const vectorDatabaseDir = join26(process.cwd(), vectorDatabaseLocalDir);
-    const filePath = join26(vectorDatabaseDir, `${name}VectorDatabase.ts`);
+    if (module) {
+      await ensureModule(module);
+    }
+    const base = module ? join27("modules", module) : ".";
+    const vectorDatabaseLocalDir = join27(base, "src", "databases");
+    const vectorDatabaseDir = join27(process.cwd(), vectorDatabaseLocalDir);
+    const filePath = join27(vectorDatabaseDir, `${name}VectorDatabase.ts`);
     await Bun.write(filePath, content);
     const testContent = vector_database_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join26(base, "tests", "databases");
-    const testsDir = join26(process.cwd(), testsLocalDir);
-    const testFilePath = join26(testsDir, `${name}VectorDatabase.spec.ts`);
+    const testsLocalDir = join27(base, "tests", "databases");
+    const testsDir = join27(process.cwd(), testsLocalDir);
+    const testFilePath = join27(testsDir, `${name}VectorDatabase.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const logger = new TerminalLogger25;
-    logger.success(`${join26(vectorDatabaseLocalDir, name)}VectorDatabase.ts created successfully`, undefined, {
+    logger.success(`${join27(vectorDatabaseLocalDir, name)}VectorDatabase.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join26(testsLocalDir, name)}VectorDatabase.spec.ts created successfully`, undefined, {
+    logger.success(`${join27(testsLocalDir, name)}VectorDatabase.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join26(process.cwd(), "package.json");
+    const packageJsonPath = join27(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -11320,6 +11391,6 @@ MakeVectorDatabaseCommand = __legacyDecorateClassTS([
   decorator26.command()
 ], MakeVectorDatabaseCommand);
 // src/index.ts
-await commandRun();
+await run();
 
-//# debugId=BB30E412412C23B564756E2164756E21
+//# debugId=4DF42F0F6B5FA95F64756E2164756E21