@ooneex/cli 1.21.0 → 1.23.0

package/dist/index.js

@@ -5175,10 +5175,26 @@ _oo_modules() {
   fi
 }
 
+_oo_route_names() {
+  local -a names
+  if [[ -d modules ]]; then
+    names=(\${(@f)"$(command grep -rh 'name:' modules/*/src/controllers/*Controller.ts 2>/dev/null | sed -n 's/.*name: "\\([^"]*\\)".*/\\1/p' | sort -u)"})
+    compadd -a names
+  fi
+}
+
+_oo_controllers() {
+  local -a controllers
+  if [[ -d modules ]]; then
+    controllers=(\${(@f)"$(command grep -rh 'export class' modules/*/src/controllers/*Controller.ts 2>/dev/null | sed -n 's/.*export class \\([^ ]*Controller\\).*/\\1/p' | sort -u)"})
+    compadd -a controllers
+  fi
+}
+
 _oo_custom_commands() {
   local -a cmds
   if [[ -d modules ]]; then
-    cmds=(\${(@f)"$(command grep -rh 'return "' modules/*/src/commands/*Command.ts 2>/dev/null | sed 's/.*return "\\(.*\\)".*/\\1/' | sort -u)"})
+    cmds=(\${(@f)"$(command grep -rh -A1 'getName' modules/*/src/commands/*Command.ts 2>/dev/null | sed -n 's/.*return "\\(.*\\)".*/\\1/p' | sort -u)"})
     compadd -a cmds
   fi
 }
@@ -5194,6 +5210,7 @@ _oo() {
     'help:Show available commands'
     'make\\:ai:Generate a new AI class'
     'make\\:analytics:Generate a new analytics class'
+    'make\\:benchmark:Generate a new benchmark file'
     'make\\:app:Generate a new application'
     'make\\:cache:Generate a new cache class'
     'make\\:claude\\:skill:Generate Claude skills from templates'
@@ -5209,6 +5226,7 @@ _oo() {
     'make\\:migration:Generate a new migration file'
     'migration\\:up:Run migrations for all modules'
     'make\\:module:Generate a new module'
+    'remove\\:module:Remove an existing module'
     'make\\:permission:Generate a new permission class'
     'make\\:pubsub:Generate a new PubSub event class'
     'make\\:release:Release packages with version bump, changelog, and git tag'
@@ -5249,6 +5267,12 @@ _oo() {
           _arguments -s \\
             '1:command name:_oo_custom_commands'
           ;;
+        make:benchmark)
+          _arguments -s \\
+            '--name=[Benchmark name]:name:_oo_route_names' \\
+            '--module=[Module name]:module:_oo_modules' \\
+            '--target=[Target controller name]:target:_oo_controllers'
+          ;;
         make:controller)
           _arguments -s \\
             '--name=[Name of the resource]:name' \\
@@ -5289,6 +5313,10 @@ _oo() {
           _arguments -s \\
             '--name=[Name of the resource]:name'
           ;;
+        remove:module)
+          _arguments -s \\
+            '--name=[Module name]:name:_oo_modules'
+          ;;
         make:docker)
           _arguments -s \\
             '--name=[Docker service name]:name:(clickhouse elasticsearch grafana jaeger keycloak libretranslate maildev memcached minio mongodb mysql nats ooneex-jade postgres prometheus rabbitmq redis temporal vault)' \\
@@ -5329,10 +5357,26 @@ _ooneex_modules() {
   fi
 }
 
+_ooneex_route_names() {
+  local -a names
+  if [[ -d modules ]]; then
+    names=(\${(@f)"$(command grep -rh 'name:' modules/*/src/controllers/*Controller.ts 2>/dev/null | sed -n 's/.*name: "\\([^"]*\\)".*/\\1/p' | sort -u)"})
+    compadd -a names
+  fi
+}
+
+_ooneex_controllers() {
+  local -a controllers
+  if [[ -d modules ]]; then
+    controllers=(\${(@f)"$(command grep -rh 'export class' modules/*/src/controllers/*Controller.ts 2>/dev/null | sed -n 's/.*export class \\([^ ]*Controller\\).*/\\1/p' | sort -u)"})
+    compadd -a controllers
+  fi
+}
+
 _ooneex_custom_commands() {
   local -a cmds
   if [[ -d modules ]]; then
-    cmds=(\${(@f)"$(command grep -rh 'return "' modules/*/src/commands/*Command.ts 2>/dev/null | sed 's/.*return "\\(.*\\)".*/\\1/' | sort -u)"})
+    cmds=(\${(@f)"$(command grep -rh -A1 'getName' modules/*/src/commands/*Command.ts 2>/dev/null | sed -n 's/.*return "\\(.*\\)".*/\\1/p' | sort -u)"})
     compadd -a cmds
   fi
 }
@@ -5348,6 +5392,7 @@ _ooneex() {
     'help:Show available commands'
     'make\\:ai:Generate a new AI class'
     'make\\:analytics:Generate a new analytics class'
+    'make\\:benchmark:Generate a new benchmark file'
     'make\\:app:Generate a new application'
     'make\\:cache:Generate a new cache class'
     'make\\:claude\\:skill:Generate Claude skills from templates'
@@ -5363,6 +5408,7 @@ _ooneex() {
     'make\\:migration:Generate a new migration file'
     'migration\\:up:Run migrations for all modules'
     'make\\:module:Generate a new module'
+    'remove\\:module:Remove an existing module'
     'make\\:permission:Generate a new permission class'
     'make\\:pubsub:Generate a new PubSub event class'
     'make\\:release:Release packages with version bump, changelog, and git tag'
@@ -5403,6 +5449,12 @@ _ooneex() {
           _arguments -s \\
             '1:command name:_ooneex_custom_commands'
           ;;
+        make:benchmark)
+          _arguments -s \\
+            '--name=[Benchmark name]:name:_ooneex_route_names' \\
+            '--module=[Module name]:module:_ooneex_modules' \\
+            '--target=[Target controller name]:target:_ooneex_controllers'
+          ;;
         make:controller)
           _arguments -s \\
             '--name=[Name of the resource]:name' \\
@@ -5443,6 +5495,10 @@ _ooneex() {
           _arguments -s \\
             '--name=[Name of the resource]:name'
           ;;
+        remove:module)
+          _arguments -s \\
+            '--name=[Module name]:name:_ooneex_modules'
+          ;;
         make:docker)
           _arguments -s \\
             '--name=[Docker service name]:name:(clickhouse elasticsearch grafana jaeger keycloak libretranslate maildev memcached minio mongodb mysql nats ooneex-jade postgres prometheus rabbitmq redis temporal vault)' \\
@@ -5598,7 +5654,7 @@ var askName = async (config) => {
 
 // src/templates/ai.test.txt
 var ai_test_default = `import { describe, expect, test } from "bun:test";
-import { {{NAME}}Ai } from "@/ai/{{NAME}}Ai";
+import { {{NAME}}Ai } from "@module/{{MODULE}}/ai/{{NAME}}Ai";
 
 describe("{{NAME}}Ai", () => {
   test("should have class name ending with 'Ai'", () => {
@@ -5867,7 +5923,7 @@ class MakeAiCommand {
     const aiDir = join8(process.cwd(), aiLocalDir);
     const filePath = join8(aiDir, `${name}Ai.ts`);
     await Bun.write(filePath, content);
-    const testContent = ai_test_default.replace(/{{NAME}}/g, name);
+    const testContent = ai_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
     const testsLocalDir = join8(base, "tests", "ai");
     const testsDir = join8(process.cwd(), testsLocalDir);
     const testFilePath = join8(testsDir, `${name}Ai.spec.ts`);
@@ -5900,15 +5956,129 @@ class MakeAiCommand {
 MakeAiCommand = __legacyDecorateClassTS([
   decorator8.command()
 ], MakeAiCommand);
-// src/commands/MakeAnalyticsCommand.ts
+// src/commands/MakeBenchmarkCommand.ts
 import { join as join9 } from "path";
 import { decorator as decorator9 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger8 } from "@ooneex/logger";
+class MakeBenchmarkCommand {
+  getName() {
+    return "make:benchmark";
+  }
+  getDescription() {
+    return "Generate a new benchmark file";
+  }
+  parseController(content) {
+    const methodMatch = content.match(/@Route\.(get|post|patch|put|delete|options|head)\(/);
+    const method = methodMatch?.[1]?.toUpperCase() ?? "GET";
+    const pathMatch = content.match(/@Route\.\w+\("([^"]+)"/);
+    const path = pathMatch?.[1] ?? "/";
+    const nameMatch = content.match(/name:\s*"([^"]+)"/);
+    const name = nameMatch?.[1] ?? "";
+    const descriptionMatch = content.match(/description:\s*"([^"]+)"/);
+    const description = descriptionMatch?.[1] ?? "";
+    const params = this.parseParams(content);
+    const queries = this.parseAssertBlock(content, "queries");
+    const payload = this.parseAssertBlock(content, "payload");
+    return { name, path, method, description, params, queries, payload };
+  }
+  parseParams(content) {
+    const params = {};
+    const paramsMatch = content.match(/params:\s*\{([^}]*Assert[^}]+)\}/);
+    if (paramsMatch?.[1]) {
+      const keys = paramsMatch[1].matchAll(/(\w+):\s*Assert\(/g);
+      for (const match of keys) {
+        if (match[1]) {
+          params[match[1]] = "";
+        }
+      }
+    }
+    return params;
+  }
+  parseAssertBlock(content, block) {
+    const result = {};
+    const regex = new RegExp(`${block}:\\s*Assert\\(\\{([^}]+)\\}\\)`);
+    const match = content.match(regex);
+    if (match?.[1]) {
+      const fields = match[1].matchAll(/(\w+):\s*"(\w+\??(?:\[\])?)"/g);
+      for (const field of fields) {
+        if (field[1] && field[2]) {
+          const type = field[2].replace("?", "").replace("[]", "");
+          result[field[1]] = type === "number" ? 0 : "";
+        }
+      }
+    }
+    return result;
+  }
+  async run(options) {
+    let { name, module, target } = options;
+    if (!name) {
+      name = await askName({ message: "Enter benchmark name" });
+    }
+    if (!target) {
+      target = await askName({ message: "Enter target controller name (e.g., UpdateStatusController)" });
+    }
+    const targetName = target.replace(/Controller$/, "");
+    if (module) {
+      await ensureModule(module);
+    }
+    const base = module ? join9("modules", module) : ".";
+    const controllersLocalDir = join9(base, "src", "controllers");
+    const controllersDir = join9(process.cwd(), controllersLocalDir);
+    const controllerFilePath = join9(controllersDir, `${targetName}Controller.ts`);
+    const controllerFile = Bun.file(controllerFilePath);
+    if (!await controllerFile.exists()) {
+      const logger2 = new TerminalLogger8;
+      logger2.error(`Controller not found: ${controllerFilePath}`, undefined, {
+        showTimestamp: false,
+        showArrow: false,
+        useSymbol: true
+      });
+      return;
+    }
+    const controllerContent = await controllerFile.text();
+    const routeInfo = this.parseController(controllerContent);
+    const benchmark = {
+      name: routeInfo.name,
+      path: routeInfo.path,
+      method: routeInfo.method,
+      description: routeInfo.description
+    };
+    if (Object.keys(routeInfo.params).length > 0) {
+      benchmark.params = routeInfo.params;
+    }
+    if (Object.keys(routeInfo.queries).length > 0) {
+      benchmark.queries = routeInfo.queries;
+    }
+    if (Object.keys(routeInfo.payload).length > 0) {
+      benchmark.payload = routeInfo.payload;
+    }
+    benchmark.connections = 10;
+    benchmark.duration = 10;
+    const jsonContent = JSON.stringify(benchmark, null, 2);
+    const benchmarkFileName = `${routeInfo.name}.${name}.bench.json`;
+    const filePath = join9(controllersDir, benchmarkFileName);
+    await Bun.write(filePath, `${jsonContent}
+`);
+    const logger = new TerminalLogger8;
+    logger.success(`${join9(controllersLocalDir, benchmarkFileName)} created successfully`, undefined, {
+      showTimestamp: false,
+      showArrow: false,
+      useSymbol: true
+    });
+  }
+}
+MakeBenchmarkCommand = __legacyDecorateClassTS([
+  decorator9.command()
+], MakeBenchmarkCommand);
+// src/commands/MakeAnalyticsCommand.ts
+import { join as join10 } from "path";
+import { decorator as decorator10 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger9 } 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";
-import { {{NAME}}Analytics } from "@/analytics/{{NAME}}Analytics";
+import { {{NAME}}Analytics } from "@module/{{MODULE}}/analytics/{{NAME}}Analytics";
 
 describe("{{NAME}}Analytics", () => {
   test("should have class name ending with 'Analytics'", () => {
@@ -5954,28 +6124,28 @@ class MakeAnalyticsCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join9("modules", module) : ".";
-    const analyticsLocalDir = join9(base, "src", "analytics");
-    const analyticsDir = join9(process.cwd(), analyticsLocalDir);
-    const filePath = join9(analyticsDir, `${name}Analytics.ts`);
+    const base = module ? join10("modules", module) : ".";
+    const analyticsLocalDir = join10(base, "src", "analytics");
+    const analyticsDir = join10(process.cwd(), analyticsLocalDir);
+    const filePath = join10(analyticsDir, `${name}Analytics.ts`);
     await Bun.write(filePath, content);
-    const testContent = analytics_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join9(base, "tests", "analytics");
-    const testsDir = join9(process.cwd(), testsLocalDir);
-    const testFilePath = join9(testsDir, `${name}Analytics.spec.ts`);
+    const testContent = analytics_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join10(base, "tests", "analytics");
+    const testsDir = join10(process.cwd(), testsLocalDir);
+    const testFilePath = join10(testsDir, `${name}Analytics.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger8;
-    logger.success(`${join9(analyticsLocalDir, name)}Analytics.ts created successfully`, undefined, {
+    const logger = new TerminalLogger9;
+    logger.success(`${join10(analyticsLocalDir, name)}Analytics.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join9(testsLocalDir, name)}Analytics.spec.ts created successfully`, undefined, {
+    logger.success(`${join10(testsLocalDir, name)}Analytics.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join9(process.cwd(), "package.json");
+    const packageJsonPath = join10(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -5990,12 +6160,12 @@ class MakeAnalyticsCommand {
   }
 }
 MakeAnalyticsCommand = __legacyDecorateClassTS([
-  decorator9.command()
+  decorator10.command()
 ], MakeAnalyticsCommand);
 // src/commands/MakeAppCommand.ts
-import { join as join10 } from "path";
-import { decorator as decorator10 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger9 } from "@ooneex/logger";
+import { join as join11 } from "path";
+import { decorator as decorator11 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger10 } from "@ooneex/logger";
 import { toKebabCase as toKebabCase2, toSnakeCase } from "@ooneex/utils";
 
 // src/prompts/askDestination.ts
@@ -6316,11 +6486,11 @@ var/
 `;
 
 // src/templates/app/app-database.txt
-var app_database_default = `import { inject } from "@ooneex/container";
+var app_database_default = `import { SharedModule } from "@module/shared/SharedModule";
 import { AppEnv } from "@ooneex/app-env";
+import { inject } from "@ooneex/container";
+import { DatabaseException, decorator, TypeormDatabase } from "@ooneex/database";
 import { DataSource } from "typeorm";
-import { TypeormDatabase, DatabaseException, decorator } from "@ooneex/database";
-import { SharedModule } from "@module/shared/SharedModule";
 
 @decorator.database()
 export class SharedDatabase extends TypeormDatabase {
@@ -6329,6 +6499,10 @@ export class SharedDatabase extends TypeormDatabase {
   }
 
   public getSource(): DataSource {
+    if (this.source) {
+      return this.source;
+    }
+
     const url = this.env.DATABASE_URL;
 
     if (!url) {
@@ -6339,13 +6513,21 @@ export class SharedDatabase extends TypeormDatabase {
     }
 
     this.source = new DataSource({
+      type: "postgres",
+      url,
       synchronize: false,
       entities: SharedModule.entities,
+      poolSize: 10,
       extra: {
         max: 10,
+        min: 2,
+        idleTimeoutMillis: 30_000,
+        connectionTimeoutMillis: 5_000,
+        allowExitOnIdle: false,
+        maxLifetimeSeconds: 1_800,
       },
-      url,
-      type: "postgres",
+      logging: ["error", "warn", "migration"],
+      maxQueryExecutionTime: 1_000,
     });
 
     return this.source;
@@ -6702,6 +6884,8 @@ POLAR_ENVIRONMENT=
 # Authentication
 # =============================================================================
 
+# Authentication token for API access
+AUTH_TOKEN=
 # Clerk authentication secret key
 CLERK_SECRET_KEY=
 
@@ -7134,40 +7318,40 @@ class MakeAppCommand {
       destination = await askDestination({ message: "Enter destination path", initial: kebabName });
     }
     const packageContent = package_json_default.replace(/{{NAME}}/g, kebabName);
-    await Bun.write(join10(destination, ".commitlintrc.ts"), _commitlintrc_ts_default);
-    await Bun.write(join10(destination, ".gitignore"), _gitignore_default);
-    await Bun.write(join10(destination, "biome.jsonc"), biome_jsonc_default);
-    await Bun.write(join10(destination, "bunfig.toml"), bunfig_toml_default);
-    await Bun.write(join10(destination, "nx.json"), nx_json_default);
-    await Bun.write(join10(destination, "package.json"), packageContent);
-    await Bun.write(join10(destination, "README.md"), README_md_default.replace(/{{NAME}}/g, kebabName));
-    await Bun.write(join10(destination, "tsconfig.json"), tsconfig_json_default);
-    await Bun.write(join10(destination, ".zed", "settings.json"), zed_settings_json_default);
+    await Bun.write(join11(destination, ".commitlintrc.ts"), _commitlintrc_ts_default);
+    await Bun.write(join11(destination, ".gitignore"), _gitignore_default);
+    await Bun.write(join11(destination, "biome.jsonc"), biome_jsonc_default);
+    await Bun.write(join11(destination, "bunfig.toml"), bunfig_toml_default);
+    await Bun.write(join11(destination, "nx.json"), nx_json_default);
+    await Bun.write(join11(destination, "package.json"), packageContent);
+    await Bun.write(join11(destination, "README.md"), README_md_default.replace(/{{NAME}}/g, kebabName));
+    await Bun.write(join11(destination, "tsconfig.json"), tsconfig_json_default);
+    await Bun.write(join11(destination, ".zed", "settings.json"), zed_settings_json_default);
     const makeModuleCommand = new MakeModuleCommand;
     await makeModuleCommand.run({
       name: "app",
       cwd: destination,
       silent: true
     });
-    const appModulePackagePath = join10(destination, "modules", "app", "package.json");
+    const appModulePackagePath = join11(destination, "modules", "app", "package.json");
     const appModulePackageJson = await Bun.file(appModulePackagePath).json();
     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(join10(destination, "modules", "app", ".env"), envContent);
-    await Bun.write(join10(destination, "modules", "app", ".env.example"), env_default);
-    await Bun.write(join10(destination, "modules", "app", "src", "index.ts"), index_ts_default);
+    await Bun.write(join11(destination, "modules", "app", ".env"), envContent);
+    await Bun.write(join11(destination, "modules", "app", ".env.example"), env_default);
+    await Bun.write(join11(destination, "modules", "app", "src", "index.ts"), index_ts_default);
     await makeModuleCommand.run({
       name: "shared",
       cwd: destination,
       silent: true
     });
-    await Bun.write(join10(destination, "modules", "shared", "src", "databases", "SharedDatabase.ts"), app_database_default);
+    await Bun.write(join11(destination, "modules", "shared", "src", "databases", "SharedDatabase.ts"), app_database_default);
     const snakeName = toSnakeCase(name);
     const dockerComposeContent = docker_compose_yml_default.replace(/{{NAME}}/g, snakeName);
-    await Bun.write(join10(destination, "modules", "app", "docker-compose.yml"), dockerComposeContent);
+    await Bun.write(join11(destination, "modules", "app", "docker-compose.yml"), dockerComposeContent);
     const dockerfileContent = Dockerfile_default.replace(/{{NAME}}/g, snakeName);
-    await Bun.write(join10(destination, "modules", "app", "Dockerfile"), dockerfileContent);
-    await Bun.write(join10(destination, "modules", "app", "var", ".gitkeep"), "");
+    await Bun.write(join11(destination, "modules", "app", "Dockerfile"), dockerfileContent);
+    await Bun.write(join11(destination, "modules", "app", "var", ".gitkeep"), "");
     const gitInit = Bun.spawn(["git", "init"], { cwd: destination, stdout: "ignore", stderr: "inherit" });
     await gitInit.exited;
     const addDeps = Bun.spawn([
@@ -7229,9 +7413,9 @@ class MakeAppCommand {
     await addDevDeps.exited;
     const huskyInit = Bun.spawn(["bunx", "husky", "init"], { cwd: destination, stdout: "ignore", stderr: "inherit" });
     await huskyInit.exited;
-    await Bun.write(join10(destination, ".husky", "pre-commit"), "lint-staged");
-    await Bun.write(join10(destination, ".husky", "commit-msg"), `bunx commitlint --edit "$1"`);
-    const logger = new TerminalLogger9;
+    await Bun.write(join11(destination, ".husky", "pre-commit"), "lint-staged");
+    await Bun.write(join11(destination, ".husky", "commit-msg"), `bunx commitlint --edit "$1"`);
+    const logger = new TerminalLogger10;
     logger.success(`${kebabName} created successfully at ${destination}`, undefined, {
       showTimestamp: false,
       showArrow: false,
@@ -7240,17 +7424,17 @@ class MakeAppCommand {
   }
 }
 MakeAppCommand = __legacyDecorateClassTS([
-  decorator10.command()
+  decorator11.command()
 ], MakeAppCommand);
 // src/commands/MakeCacheCommand.ts
-import { join as join11 } from "path";
-import { decorator as decorator11 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger10 } from "@ooneex/logger";
+import { join as join12 } from "path";
+import { decorator as decorator12 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger11 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase4 } from "@ooneex/utils";
 
 // src/templates/cache.test.txt
 var cache_test_default = `import { describe, expect, test } from "bun:test";
-import { {{NAME}}Cache } from "@/cache/{{NAME}}Cache";
+import { {{NAME}}Cache } from "@module/{{MODULE}}/cache/{{NAME}}Cache";
 
 describe("{{NAME}}Cache", () => {
   test("should have class name ending with 'Cache'", () => {
@@ -7321,28 +7505,28 @@ class MakeCacheCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join11("modules", module) : ".";
-    const cacheLocalDir = join11(base, "src", "cache");
-    const cacheDir = join11(process.cwd(), cacheLocalDir);
-    const filePath = join11(cacheDir, `${name}Cache.ts`);
+    const base = module ? join12("modules", module) : ".";
+    const cacheLocalDir = join12(base, "src", "cache");
+    const cacheDir = join12(process.cwd(), cacheLocalDir);
+    const filePath = join12(cacheDir, `${name}Cache.ts`);
     await Bun.write(filePath, content);
-    const testContent = cache_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join11(base, "tests", "cache");
-    const testsDir = join11(process.cwd(), testsLocalDir);
-    const testFilePath = join11(testsDir, `${name}Cache.spec.ts`);
+    const testContent = cache_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join12(base, "tests", "cache");
+    const testsDir = join12(process.cwd(), testsLocalDir);
+    const testFilePath = join12(testsDir, `${name}Cache.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger10;
-    logger.success(`${join11(cacheLocalDir, name)}Cache.ts created successfully`, undefined, {
+    const logger = new TerminalLogger11;
+    logger.success(`${join12(cacheLocalDir, name)}Cache.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join11(testsLocalDir, name)}Cache.spec.ts created successfully`, undefined, {
+    logger.success(`${join12(testsLocalDir, name)}Cache.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 ?? {};
@@ -7357,12 +7541,12 @@ class MakeCacheCommand {
   }
 }
 MakeCacheCommand = __legacyDecorateClassTS([
-  decorator11.command()
+  decorator12.command()
 ], MakeCacheCommand);
 // src/commands/MakeClaudeSkillCommand.ts
-import { join as join12 } from "path";
-import { decorator as decorator12 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger11 } from "@ooneex/logger";
+import { join as join13 } from "path";
+import { decorator as decorator13 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger12 } from "@ooneex/logger";
 
 // src/templates/claude/skills/commit.md.txt
 var commit_md_default = `---
@@ -7598,7 +7782,7 @@ var make_middleware_md_default = '---\nname: make:middleware\ndescription: Gener
 var make_migration_md_default = '---\nname: make:migration\ndescription: Generate a new database migration file with its test file, then complete the generated code. Use when creating a new database migration for schema changes using @ooneex/migrations.\n---\n\n# Make Migration\n\nGenerate a new migration file and its test file using the `make:migration` CLI command, then complete the generated code with proper implementation.\n\n## Coding Conventions\n\n- Always explicitly show visibility on class methods and properties (`private`, `public`, `protected`)\n- Always use arrow functions when possible, but NOT for class methods (class methods use regular method syntax)\n- End type names with the `Type` suffix (e.g., `ExceptionStackFrameType`, `ServiceDataType`)\n- Start interface names with the `I` prefix (e.g., `IException`, `IService`, `IAiChat`)\n- For Entity class, if property is optional, add `null` to its type.\n- For dependencies, use `inject` from `@ooneex/container`. For example:\n\n```typescript\nimport { inject } from "@ooneex/container";\nimport { decorator, type ISeed } from "@ooneex/seeds";\n\n@decorator.seed()\nexport class BookSeed implements ISeed {\n  constructor(\n    @inject(BookRepository)\n    private readonly repository: BookRepository,\n  ) {}\n}\n```\n\n## Important\n\nAll commands must be run from the root of the project (not from within a package or module directory).\n\n## Steps\n\n### 1. Run the generator\n\nRun the following command to scaffold the migration file and test files:\n\n```bash\nbunx @ooneex/cli@latest make:migration --module=<module>\n```\n\nThe `--module` option is optional \u2014 if provided, files are generated under `modules/<module>/` instead of the project root. The command will generate:\n- `src/migrations/Migration<version>.ts` - The migration class file (or `modules/<module>/src/migrations/Migration<version>.ts` with `--module`)\n- `tests/migrations/Migration<version>.spec.ts` - The test file (or `modules/<module>/tests/migrations/Migration<version>.spec.ts` with `--module`)\n\nIt will also:\n- Generate a `migrations.ts` root export file in the migrations directory\n\n### 2. Read the generated files\n\nRead both generated files to understand the scaffolded code.\n\n### 3. Complete the migration\n\nEdit `src/migrations/Migration<version>.ts` to implement:\n\n- The `up` method with the schema changes (create tables, add columns, create indexes, etc.)\n- The `down` method with the reverse operations to undo the migration\n\n### 4. Complete the test file\n\nEdit `tests/migrations/Migration<version>.spec.ts` to add meaningful tests beyond the scaffolded ones:\n\n- Keep the existing scaffolded tests (class name, up, down, getVersion, getDependencies methods)\n- Add tests relevant to the specific migration behavior\n\nThe generated test structure follows this pattern:\n\n```typescript\nimport { describe, expect, test } from "bun:test";\nimport { Migration<version> } from "@/migrations/Migration<version>";\n\ndescribe("Migration<version>", () => {\n  test("should have class name starting with \'Migration\'", () => {\n    expect(Migration<version>.name.startsWith("Migration")).toBe(true);\n  });\n\n  test("should have \'up\' method", () => {\n    expect(Migration<version>.prototype.up).toBeDefined();\n    expect(typeof Migration<version>.prototype.up).toBe("function");\n  });\n\n  test("should have \'down\' method", () => {\n    expect(Migration<version>.prototype.down).toBeDefined();\n    expect(typeof Migration<version>.prototype.down).toBe("function");\n  });\n\n  test("should have \'getVersion\' method", () => {\n    expect(Migration<version>.prototype.getVersion).toBeDefined();\n    expect(typeof Migration<version>.prototype.getVersion).toBe("function");\n  });\n\n  test("should have \'getDependencies\' method", () => {\n    expect(Migration<version>.prototype.getDependencies).toBeDefined();\n    expect(typeof Migration<version>.prototype.getDependencies).toBe("function");\n  });\n});\n```\n\n### 5. Lint and format\n\nRun linting and formatting on the generated files:\n\n```bash\nbunx biome check --fix src/migrations/Migration<version>.ts tests/migrations/Migration<version>.spec.ts\n```\n';
 
 // src/templates/claude/skills/make.permission.md.txt
-var make_permission_md_default = '---\nname: make:permission\ndescription: Generate a new permission class with its test file, then complete the generated code. Use when creating a new permission that extends Permission from @ooneex/permission.\n---\n\n# Make Permission Class\n\nGenerate a new permission class and its test file using the `make:permission` CLI command, then complete the generated code with proper implementation.\n\n## Coding Conventions\n\n- Always explicitly show visibility on class methods and properties (`private`, `public`, `protected`)\n- Always use arrow functions when possible, but NOT for class methods (class methods use regular method syntax)\n- End type names with the `Type` suffix (e.g., `ExceptionStackFrameType`, `ServiceDataType`)\n- Start interface names with the `I` prefix (e.g., `IException`, `IService`, `IAiChat`)\n- For Entity class, if property is optional, add `null` to its type.\n- For dependencies, use `inject` from `@ooneex/container`. For example:\n\n```typescript\nimport { inject } from "@ooneex/container";\nimport { decorator, type ISeed } from "@ooneex/seeds";\n\n@decorator.seed()\nexport class BookSeed implements ISeed {\n  constructor(\n    @inject(BookRepository)\n    private readonly repository: BookRepository,\n  ) {}\n}\n```\n\n## Important\n\nAll commands must be run from the root of the project (not from within a package or module directory).\n\n## Steps\n\n### 1. Run the generator\n\nRun the following command to scaffold the permission class and test files:\n\n```bash\nbunx @ooneex/cli@latest make:permission --name=<name> --module=<module>\n```\n\nWhere `<name>` is the name provided by the user. The `--module` option is optional \u2014 if provided, files are generated under `modules/<module>/` instead of the project root. The command will generate:\n- `src/permissions/<Name>Permission.ts` - The permission class file (or `modules/<module>/src/permissions/<Name>Permission.ts` with `--module`)\n- `tests/permissions/<Name>Permission.spec.ts` - The test file (or `modules/<module>/tests/permissions/<Name>Permission.spec.ts` with `--module`)\n\n### 2. Read the generated files\n\nRead both generated files to understand the scaffolded code.\n\n### 3. Complete the permission class\n\nEdit `src/permissions/<Name>Permission.ts` to complete the implementation:\n\n- Implement the `allow()` method with permission rules using `this.ability.can()`\n- Implement the `setUserPermissions()` method with role-based permission logic\n- Define which actions (read, create, update, delete, manage) are allowed on which entities\n\nThe generated class structure follows this pattern:\n\n```typescript\nimport { decorator, Permission } from "@ooneex/permission";\nimport type { IUser } from "@ooneex/user";\n\n@decorator.permission()\nexport class <Name>Permission extends Permission {\n  public allow(): this {\n    // Example: Add permissions using this.ability.can()\n    // this.ability.can("read", "YourEntity");\n    // this.ability.can(["read", "update"], "YourEntity", { userId: user.id });\n\n    return this;\n  }\n\n  public setUserPermissions(user: IUser | null): this {\n    if (!user) {\n      return this;\n    }\n\n    // Example: Grant full access to admins\n    // const { roles } = user;\n    // if (roles.includes(ERole.ADMIN)) {\n    //   this.ability.can("manage", "all");\n    //   return this;\n    // }\n\n    // Example: Grant specific permissions based on roles\n    // for (const role of roles) {\n    //   if (role === ERole.USER) {\n    //     this.ability.can(["read", "update"], "YourEntity", { userId: user.id });\n    //   }\n    //\n    //   if (role === ERole.GUEST) {\n    //     this.ability.can("read", "YourEntity", { public: true });\n    //   }\n    // }\n\n    return this;\n  }\n}\n```\n\n### 4. Complete the test file\n\nEdit `tests/permissions/<Name>Permission.spec.ts` to add meaningful tests beyond the scaffolded ones:\n\n- Keep the existing scaffolded tests (class name, extends Permission, allow, setUserPermissions methods)\n- Add tests relevant to the specific permission rules\n\nThe generated test structure follows this pattern:\n\n```typescript\nimport { describe, expect, test } from "bun:test";\nimport { Permission } from "@ooneex/permission";\nimport { <Name>Permission } from "@/permissions/<Name>Permission";\n\ndescribe("<Name>Permission", () => {\n  test("should have class name ending with \'Permission\'", () => {\n    expect(<Name>Permission.name.endsWith("Permission")).toBe(true);\n  });\n\n  test("should extend Permission", () => {\n    const permission = new <Name>Permission();\n    expect(permission).toBeInstanceOf(Permission);\n  });\n\n  test("should have \'allow\' method", () => {\n    expect(<Name>Permission.prototype.allow).toBeDefined();\n    expect(typeof <Name>Permission.prototype.allow).toBe("function");\n  });\n\n  test("should have \'setUserPermissions\' method", () => {\n    expect(<Name>Permission.prototype.setUserPermissions).toBeDefined();\n    expect(typeof <Name>Permission.prototype.setUserPermissions).toBe("function");\n  });\n});\n```\n\n### 5. Register the permission in the module\n\nThe permission class is standalone and does not need to be registered in a module.\n\n### 6. Lint and format\n\nRun linting and formatting on the generated files:\n\n```bash\nbunx biome check --fix src/permissions/<Name>Permission.ts tests/permissions/<Name>Permission.spec.ts\n```\n';
+var make_permission_md_default = '---\nname: make:permission\ndescription: Generate a new permission class with its test file, then complete the generated code. Use when creating a new permission that extends Permission from @ooneex/permission.\n---\n\n# Make Permission Class\n\nGenerate a new permission class and its test file using the `make:permission` CLI command, then complete the generated code with proper implementation.\n\n## Coding Conventions\n\n- Always explicitly show visibility on class methods and properties (`private`, `public`, `protected`)\n- Always use arrow functions when possible, but NOT for class methods (class methods use regular method syntax)\n- End type names with the `Type` suffix (e.g., `ExceptionStackFrameType`, `ServiceDataType`)\n- Start interface names with the `I` prefix (e.g., `IException`, `IService`, `IAiChat`)\n- For Entity class, if property is optional, add `null` to its type.\n- For dependencies, use `inject` from `@ooneex/container`. For example:\n\n```typescript\nimport { inject } from "@ooneex/container";\nimport { decorator, type ISeed } from "@ooneex/seeds";\n\n@decorator.seed()\nexport class BookSeed implements ISeed {\n  constructor(\n    @inject(BookRepository)\n    private readonly repository: BookRepository,\n  ) {}\n}\n```\n\n## Important\n\nAll commands must be run from the root of the project (not from within a package or module directory).\n\n## Steps\n\n### 1. Run the generator\n\nRun the following command to scaffold the permission class and test files:\n\n```bash\nbunx @ooneex/cli@latest make:permission --name=<name> --module=<module>\n```\n\nWhere `<name>` is the name provided by the user. The `--module` option is optional \u2014 if provided, files are generated under `modules/<module>/` instead of the project root. The command will generate:\n- `src/permissions/<Name>Permission.ts` - The permission class file (or `modules/<module>/src/permissions/<Name>Permission.ts` with `--module`)\n- `tests/permissions/<Name>Permission.spec.ts` - The test file (or `modules/<module>/tests/permissions/<Name>Permission.spec.ts` with `--module`)\n\n### 2. Read the generated files\n\nRead both generated files to understand the scaffolded code.\n\n### 3. Complete the permission class\n\nEdit `src/permissions/<Name>Permission.ts` to complete the implementation:\n\n- Implement the `allow()` method with permission rules using `this.ability.can()`\n- Implement the `setUserPermissions()` method with role-based permission logic\n- Define which actions (read, create, update, delete, manage) are allowed on which entities\n\nThe generated class structure follows this pattern:\n\n```typescript\nimport type { ContextType } from "@ooneex/controller";\nimport { decorator, Permission } from "@ooneex/permission";\n\n@decorator.permission()\nexport class <Name>Permission extends Permission {\n  public allow(): this {\n    // Example: Add permissions using this.ability.can()\n    // this.ability.can("read", "YourEntity");\n    // this.ability.can(["read", "update"], "YourEntity", { userId: user.id });\n\n    return this;\n  }\n\n  public setUserPermissions(context: ContextType): this {\n    // Example: Grant full access to admins\n    // const { user } = context;\n    //\n    // if (!user) {\n    //   return this;\n    // }\n    //\n    // const { roles } = user;\n    // if (roles.includes(ERole.ADMIN)) {\n    //   this.ability.can("manage", "all");\n    //   return this;\n    // }\n\n    // Example: Grant specific permissions based on roles\n    // const { user } = context;\n    //\n    // if (user) {\n    //   for (const role of user.roles) {\n    //     if (role === ERole.USER) {\n    //       this.ability.can(["read", "update"], "YourEntity", { userId: user.id });\n    //     }\n    //\n    //     if (role === ERole.GUEST) {\n    //       this.ability.can("read", "YourEntity", { public: true });\n    //     }\n    //   }\n    // }\n\n    return this;\n  }\n\n  public check(context: ContextType): boolean {\n    return true;\n  }\n}\n```\n\n### 4. Complete the test file\n\nEdit `tests/permissions/<Name>Permission.spec.ts` to add meaningful tests beyond the scaffolded ones:\n\n- Keep the existing scaffolded tests (class name, extends Permission, allow, setUserPermissions methods)\n- Add tests relevant to the specific permission rules\n\nThe generated test structure follows this pattern:\n\n```typescript\nimport { describe, expect, test } from "bun:test";\nimport { Permission } from "@ooneex/permission";\nimport { <Name>Permission } from "@/permissions/<Name>Permission";\n\ndescribe("<Name>Permission", () => {\n  test("should have class name ending with \'Permission\'", () => {\n    expect(<Name>Permission.name.endsWith("Permission")).toBe(true);\n  });\n\n  test("should extend Permission", () => {\n    const permission = new <Name>Permission();\n    expect(permission).toBeInstanceOf(Permission);\n  });\n\n  test("should have \'allow\' method", () => {\n    expect(<Name>Permission.prototype.allow).toBeDefined();\n    expect(typeof <Name>Permission.prototype.allow).toBe("function");\n  });\n\n  test("should have \'setUserPermissions\' method", () => {\n    expect(<Name>Permission.prototype.setUserPermissions).toBeDefined();\n    expect(typeof <Name>Permission.prototype.setUserPermissions).toBe("function");\n  });\n});\n```\n\n### 5. Register the permission in the module\n\nThe permission class is standalone and does not need to be registered in a module.\n\n### 6. Lint and format\n\nRun linting and formatting on the generated files:\n\n```bash\nbunx biome check --fix src/permissions/<Name>Permission.ts tests/permissions/<Name>Permission.spec.ts\n```\n';
 
 // src/templates/claude/skills/make.pubsub.md.txt
 var make_pubsub_md_default = '---\nname: make:pubsub\ndescription: Generate a new PubSub event class with its test file, then complete the generated code. Use when creating a new publish/subscribe event that extends PubSub from @ooneex/pub-sub.\n---\n\n# Make PubSub Event Class\n\nGenerate a new PubSub event class and its test file using the `make:pubsub` CLI command, then complete the generated code with proper implementation.\n\n## Coding Conventions\n\n- Always explicitly show visibility on class methods and properties (`private`, `public`, `protected`)\n- Always use arrow functions when possible, but NOT for class methods (class methods use regular method syntax)\n- End type names with the `Type` suffix (e.g., `ExceptionStackFrameType`, `ServiceDataType`)\n- Start interface names with the `I` prefix (e.g., `IException`, `IService`, `IAiChat`)\n- For Entity class, if property is optional, add `null` to its type.\n- For dependencies, use `inject` from `@ooneex/container`. For example:\n\n```typescript\nimport { inject } from "@ooneex/container";\nimport { decorator, type ISeed } from "@ooneex/seeds";\n\n@decorator.seed()\nexport class BookSeed implements ISeed {\n  constructor(\n    @inject(BookRepository)\n    private readonly repository: BookRepository,\n  ) {}\n}\n```\n\n## Important\n\nAll commands must be run from the root of the project (not from within a package or module directory).\n\n## Steps\n\n### 1. Run the generator\n\nRun the following command to scaffold the PubSub event class and test files:\n\n```bash\nbunx @ooneex/cli@latest make:pubsub --name=<name> --module=<module> --channel=<channel>\n```\n\nWhere `<name>` is the name provided by the user. The `--module` option is optional \u2014 if provided, files are generated under `modules/<module>/` instead of the project root. The `--channel` option is optional \u2014 if omitted, it defaults to the kebab-case form of the name (e.g., `UserCreated` becomes `user-created`). The command will generate:\n- `src/events/<Name>Event.ts` - The event class file (or `modules/<module>/src/events/<Name>Event.ts` with `--module`)\n- `tests/events/<Name>Event.spec.ts` - The test file (or `modules/<module>/tests/events/<Name>Event.spec.ts` with `--module`)\n\n### 2. Read the generated files\n\nRead both generated files to understand the scaffolded code.\n\n### 3. Complete the PubSub event class\n\nEdit `src/events/<Name>Event.ts` to complete the implementation:\n\n- Define a proper data type instead of `Record<string, ScalarType>` for the event payload\n- Implement the `handler()` method with actual event handling logic\n- Set the appropriate channel name in `getChannel()`\n\nThe generated class structure follows this pattern:\n\n```typescript\nimport { inject } from "@ooneex/container";\nimport type { ScalarType } from "@ooneex/types";\nimport { decorator, PubSub, RedisPubSub } from "@ooneex/pub-sub";\n\n@decorator.pubSub()\nexport class <Name>Event<Data extends Record<string, ScalarType> = Record<string, ScalarType>> extends PubSub<Data> {\n  constructor(\n    @inject(RedisPubSub)\n    client: RedisPubSub<Data>,\n  ) {\n    super(client);\n  }\n\n  public getChannel(): string {\n    return "<channel>";\n  }\n\n  public async handler(context: { data: Data; channel: string }): Promise<void> {\n    console.log(context);\n    // TODO: Implement handler logic here\n  }\n}\n```\n\n### 4. Complete the test file\n\nEdit `tests/events/<Name>Event.spec.ts` to add meaningful tests beyond the scaffolded ones:\n\n- Keep the existing scaffolded tests (class name, getChannel, handler, publish, subscribe, unsubscribe, unsubscribeAll methods)\n- Add tests relevant to the specific event behavior\n\nThe generated test structure follows this pattern:\n\n```typescript\nimport { describe, expect, test } from "bun:test";\nimport { <Name>PubSub } from "@/pubsub/<Name>PubSub";\n\ndescribe("<Name>PubSub", () => {\n  test("should have class name ending with \'PubSub\'", () => {\n    expect(<Name>PubSub.name.endsWith("PubSub")).toBe(true);\n  });\n\n  test("should have \'getChannel\' method", () => {\n    expect(<Name>PubSub.prototype.getChannel).toBeDefined();\n    expect(typeof <Name>PubSub.prototype.getChannel).toBe("function");\n  });\n\n  test("should have \'handler\' method", () => {\n    expect(<Name>PubSub.prototype.handler).toBeDefined();\n    expect(typeof <Name>PubSub.prototype.handler).toBe("function");\n  });\n\n  test("should have \'publish\' method", () => {\n    expect(<Name>PubSub.prototype.publish).toBeDefined();\n    expect(typeof <Name>PubSub.prototype.publish).toBe("function");\n  });\n\n  test("should have \'subscribe\' method", () => {\n    expect(<Name>PubSub.prototype.subscribe).toBeDefined();\n    expect(typeof <Name>PubSub.prototype.subscribe).toBe("function");\n  });\n\n  test("should have \'unsubscribe\' method", () => {\n    expect(<Name>PubSub.prototype.unsubscribe).toBeDefined();\n    expect(typeof <Name>PubSub.prototype.unsubscribe).toBe("function");\n  });\n\n  test("should have \'unsubscribeAll\' method", () => {\n    expect(<Name>PubSub.prototype.unsubscribeAll).toBeDefined();\n    expect(typeof <Name>PubSub.prototype.unsubscribeAll).toBe("function");\n  });\n});\n```\n\n### 5. Register the event in the module\n\nAdd the new event to the module\'s `events` array in `src/<PascalModuleName>Module.ts` (e.g., `src/BookModule.ts` for the `book` module):\n\n```typescript\nimport type { ModuleType } from "@ooneex/module";\nimport { <Name>Event } from "./events/<Name>Event";\n\nexport const <PascalModuleName>Module: ModuleType = {\n  controllers: [],\n  entities: [],\n  middlewares: [],\n  cronJobs: [],\n  events: [<Name>Event],\n};\n```\n\nThe module file uses PascalCase naming: `<PascalModuleName>Module.ts` with export `<PascalModuleName>Module`.\n\nIf the module already has other events registered, append the new event to the existing `events` array and add the import alongside existing imports.\n\n### 6. Lint and format\n\nRun linting and formatting on the generated files:\n\n```bash\nbunx biome check --fix src/events/<Name>Event.ts tests/events/<Name>Event.spec.ts\n```\n';
@@ -7653,14 +7837,14 @@ class MakeClaudeSkillCommand {
     return "Generate Claude skills from templates";
   }
   async run() {
-    const skillsLocalDir = join12(".claude", "skills");
-    const skillsDir = join12(process.cwd(), skillsLocalDir);
-    const logger = new TerminalLogger11;
+    const skillsLocalDir = join13(".claude", "skills");
+    const skillsDir = join13(process.cwd(), skillsLocalDir);
+    const logger = new TerminalLogger12;
     for (const [skillName, content] of Object.entries(skills)) {
       const dirName = skillName.replace(/\./g, "-");
-      const filePath = join12(skillsDir, dirName, "SKILL.md");
+      const filePath = join13(skillsDir, dirName, "SKILL.md");
       await Bun.write(filePath, content);
-      logger.success(`${join12(skillsLocalDir, dirName, "SKILL.md")} created successfully`, undefined, {
+      logger.success(`${join13(skillsLocalDir, dirName, "SKILL.md")} created successfully`, undefined, {
         showTimestamp: false,
         showArrow: false,
         useSymbol: true
@@ -7669,12 +7853,12 @@ class MakeClaudeSkillCommand {
   }
 }
 MakeClaudeSkillCommand = __legacyDecorateClassTS([
-  decorator12.command()
+  decorator13.command()
 ], MakeClaudeSkillCommand);
 // src/commands/MakeCommandCommand.ts
-import { join as join13 } from "path";
-import { commandCreate, decorator as decorator13 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger12 } from "@ooneex/logger";
+import { join as join14 } from "path";
+import { commandCreate, decorator as decorator14 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger13 } from "@ooneex/logger";
 
 // src/templates/module/command.run.txt
 var command_run_default = `#!/usr/bin/env bun
@@ -7701,18 +7885,18 @@ class MakeCommandCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join13("modules", module) : ".";
+    const base = module ? join14("modules", module) : ".";
     const { commandPath: filePath, testPath } = await commandCreate({
       name,
-      commandDir: join13(base, "src", "commands"),
-      testsDir: join13(base, "tests", "commands")
+      commandDir: join14(base, "src", "commands"),
+      testsDir: join14(base, "tests", "commands")
     });
-    const binCommandRunPath = join13(process.cwd(), base, "bin", "command", "run.ts");
+    const binCommandRunPath = join14(process.cwd(), base, "bin", "command", "run.ts");
     const binCommandRunFile = Bun.file(binCommandRunPath);
     if (!await binCommandRunFile.exists()) {
       await Bun.write(binCommandRunPath, command_run_default.replace(/{{name}}/g, module ?? ""));
     }
-    const logger = new TerminalLogger12;
+    const logger = new TerminalLogger13;
     logger.success(`${filePath} created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
@@ -7726,12 +7910,12 @@ class MakeCommandCommand {
   }
 }
 MakeCommandCommand = __legacyDecorateClassTS([
-  decorator13.command()
+  decorator14.command()
 ], MakeCommandCommand);
 // src/commands/MakeControllerCommand.ts
-import { basename, join as join14 } from "path";
-import { decorator as decorator14 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger13 } from "@ooneex/logger";
+import { basename, join as join15 } from "path";
+import { decorator as decorator15 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger14 } from "@ooneex/logger";
 import { toKebabCase as toKebabCase3, toPascalCase as toPascalCase5, trim } from "@ooneex/utils";
 
 // src/prompts/askConfirm.ts
@@ -8030,7 +8214,7 @@ export class {{NAME}}Controller {
 
 // src/templates/controller.test.txt
 var controller_test_default = `import { describe, expect, test } from "bun:test";
-import { {{NAME}}Controller } from "@/controllers/{{NAME}}Controller";
+import { {{NAME}}Controller } from "@module/{{MODULE}}/controllers/{{NAME}}Controller";
 
 describe("{{NAME}}Controller", () => {
   test("should have class name ending with 'Controller'", () => {
@@ -8151,33 +8335,33 @@ class MakeControllerCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join14("modules", module) : ".";
-    const controllersLocalDir = join14(base, "src", "controllers");
-    const controllersDir = join14(process.cwd(), controllersLocalDir);
-    const filePath = join14(controllersDir, `${name}Controller.ts`);
+    const base = module ? join15("modules", module) : ".";
+    const controllersLocalDir = join15(base, "src", "controllers");
+    const controllersDir = join15(process.cwd(), controllersLocalDir);
+    const filePath = join15(controllersDir, `${name}Controller.ts`);
     await Bun.write(filePath, content);
-    const testContent = controller_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join14(base, "tests", "controllers");
-    const testsDir = join14(process.cwd(), testsLocalDir);
-    const testFilePath = join14(testsDir, `${name}Controller.spec.ts`);
+    const testContent = controller_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join15(base, "tests", "controllers");
+    const testsDir = join15(process.cwd(), testsLocalDir);
+    const testFilePath = join15(testsDir, `${name}Controller.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const modulePascalName = module ? toPascalCase5(module) : toPascalCase5(basename(process.cwd()));
-    const modulePath = join14(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
+    const modulePath = join15(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
     if (await Bun.file(modulePath).exists()) {
       await this.addToModule(modulePath, name);
     }
-    const logger = new TerminalLogger13;
-    logger.success(`${join14(controllersLocalDir, name)}Controller.ts created successfully`, undefined, {
+    const logger = new TerminalLogger14;
+    logger.success(`${join15(controllersLocalDir, name)}Controller.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join14(testsLocalDir, name)}Controller.spec.ts created successfully`, undefined, {
+    logger.success(`${join15(testsLocalDir, name)}Controller.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 ?? {};
@@ -8192,17 +8376,17 @@ class MakeControllerCommand {
   }
 }
 MakeControllerCommand = __legacyDecorateClassTS([
-  decorator14.command()
+  decorator15.command()
 ], MakeControllerCommand);
 // src/commands/MakeCronCommand.ts
-import { basename as basename2, join as join15 } from "path";
-import { decorator as decorator15 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger14 } from "@ooneex/logger";
+import { basename as basename2, join as join16 } from "path";
+import { decorator as decorator16 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger15 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase6 } from "@ooneex/utils";
 
 // src/templates/cron.test.txt
 var cron_test_default = `import { describe, expect, test } from "bun:test";
-import { {{NAME}}Cron } from "@/cron/{{NAME}}Cron";
+import { {{NAME}}Cron } from "@module/{{MODULE}}/cron/{{NAME}}Cron";
 
 describe("{{NAME}}Cron", () => {
   test("should have class name ending with 'Cron'", () => {
@@ -8286,33 +8470,33 @@ class MakeCronCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join15("modules", module) : ".";
-    const cronLocalDir = join15(base, "src", "crons");
-    const cronDir = join15(process.cwd(), cronLocalDir);
-    const filePath = join15(cronDir, `${name}Cron.ts`);
+    const base = module ? join16("modules", module) : ".";
+    const cronLocalDir = join16(base, "src", "crons");
+    const cronDir = join16(process.cwd(), cronLocalDir);
+    const filePath = join16(cronDir, `${name}Cron.ts`);
     await Bun.write(filePath, content);
-    const testContent = cron_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join15(base, "tests", "crons");
-    const testsDir = join15(process.cwd(), testsLocalDir);
-    const testFilePath = join15(testsDir, `${name}Cron.spec.ts`);
+    const testContent = cron_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join16(base, "tests", "crons");
+    const testsDir = join16(process.cwd(), testsLocalDir);
+    const testFilePath = join16(testsDir, `${name}Cron.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const modulePascalName = module ? toPascalCase6(module) : toPascalCase6(basename2(process.cwd()));
-    const modulePath = join15(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
+    const modulePath = join16(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
     if (await Bun.file(modulePath).exists()) {
       await this.addToModule(modulePath, name);
     }
-    const logger = new TerminalLogger14;
-    logger.success(`${join15(cronLocalDir, name)}Cron.ts created successfully`, undefined, {
+    const logger = new TerminalLogger15;
+    logger.success(`${join16(cronLocalDir, name)}Cron.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join15(testsLocalDir, name)}Cron.spec.ts created successfully`, undefined, {
+    logger.success(`${join16(testsLocalDir, name)}Cron.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 ?? {};
@@ -8327,17 +8511,17 @@ class MakeCronCommand {
   }
 }
 MakeCronCommand = __legacyDecorateClassTS([
-  decorator15.command()
+  decorator16.command()
 ], MakeCronCommand);
 // src/commands/MakeDatabaseCommand.ts
-import { join as join16 } from "path";
-import { decorator as decorator16 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger15 } from "@ooneex/logger";
+import { join as join17 } from "path";
+import { decorator as decorator17 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger16 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase7 } from "@ooneex/utils";
 
 // src/templates/database.test.txt
 var database_test_default = `import { describe, expect, test } from "bun:test";
-import { {{NAME}}Database } from "@/databases/{{NAME}}Database";
+import { {{NAME}}Database } from "@module/{{MODULE}}/databases/{{NAME}}Database";
 
 describe("{{NAME}}Database", () => {
   test("should have class name ending with 'Database'", () => {
@@ -8395,28 +8579,28 @@ class MakeDatabaseCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join16("modules", module) : ".";
-    const databaseLocalDir = join16(base, "src", "databases");
-    const databaseDir = join16(process.cwd(), databaseLocalDir);
-    const filePath = join16(databaseDir, `${name}Database.ts`);
+    const base = module ? join17("modules", module) : ".";
+    const databaseLocalDir = join17(base, "src", "databases");
+    const databaseDir = join17(process.cwd(), databaseLocalDir);
+    const filePath = join17(databaseDir, `${name}Database.ts`);
     await Bun.write(filePath, content);
-    const testContent = database_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join16(base, "tests", "databases");
-    const testsDir = join16(process.cwd(), testsLocalDir);
-    const testFilePath = join16(testsDir, `${name}Database.spec.ts`);
+    const testContent = database_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join17(base, "tests", "databases");
+    const testsDir = join17(process.cwd(), testsLocalDir);
+    const testFilePath = join17(testsDir, `${name}Database.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger15;
-    logger.success(`${join16(databaseLocalDir, name)}Database.ts created successfully`, undefined, {
+    const logger = new TerminalLogger16;
+    logger.success(`${join17(databaseLocalDir, name)}Database.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join16(testsLocalDir, name)}Database.spec.ts created successfully`, undefined, {
+    logger.success(`${join17(testsLocalDir, name)}Database.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 ?? {};
@@ -8431,12 +8615,12 @@ class MakeDatabaseCommand {
   }
 }
 MakeDatabaseCommand = __legacyDecorateClassTS([
-  decorator16.command()
+  decorator17.command()
 ], MakeDatabaseCommand);
 // src/commands/MakeDockerCommand.ts
-import { join as join17 } from "path";
-import { decorator as decorator17 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger16 } from "@ooneex/logger";
+import { join as join18 } from "path";
+import { decorator as decorator18 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger17 } from "@ooneex/logger";
 var {YAML } = globalThis.Bun;
 
 // src/prompts/askDockerService.ts
@@ -8929,9 +9113,9 @@ class MakeDockerCommand {
       name = await askDockerService({ message: "Select docker service" });
     }
     const templateContent = templates[name];
-    const base = join17("modules", "app");
-    const composePath = join17(process.cwd(), base, "docker-compose.yml");
-    const logger = new TerminalLogger16;
+    const base = join18("modules", "app");
+    const composePath = join18(process.cwd(), base, "docker-compose.yml");
+    const logger = new TerminalLogger17;
     const composeFile = Bun.file(composePath);
     if (await composeFile.exists()) {
       const existingContent = await composeFile.text();
@@ -8990,7 +9174,7 @@ volumes:
     } else {
       await Bun.write(composePath, templateContent);
     }
-    const packageJsonPath = join17(process.cwd(), base, "package.json");
+    const packageJsonPath = join18(process.cwd(), base, "package.json");
     const packageJsonFile = Bun.file(packageJsonPath);
     if (await packageJsonFile.exists()) {
       const packageJson = await packageJsonFile.json();
@@ -9011,18 +9195,18 @@ volumes:
   }
 }
 MakeDockerCommand = __legacyDecorateClassTS([
-  decorator17.command()
+  decorator18.command()
 ], MakeDockerCommand);
 // src/commands/MakeEntityCommand.ts
 var import_pluralize = __toESM(require_pluralize(), 1);
-import { basename as basename3, join as join18 } from "path";
-import { decorator as decorator18 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger17 } from "@ooneex/logger";
+import { basename as basename3, join as join19 } from "path";
+import { decorator as decorator19 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger18 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase8, toSnakeCase as toSnakeCase2 } from "@ooneex/utils";
 
 // src/templates/entity.test.txt
 var entity_test_default = `import { describe, expect, test } from "bun:test";
-import { {{NAME}}Entity } from "@/entities/{{NAME}}Entity";
+import { {{NAME}}Entity } from "@module/{{MODULE}}/entities/{{NAME}}Entity";
 
 describe("{{NAME}}Entity", () => {
   test("should have class name ending with 'Entity'", () => {
@@ -9181,28 +9365,28 @@ class MakeEntityCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join18("modules", module) : ".";
-    const entitiesLocalDir = join18(base, "src", "entities");
-    const entitiesDir = join18(process.cwd(), entitiesLocalDir);
-    const filePath = join18(entitiesDir, `${name}Entity.ts`);
+    const base = module ? join19("modules", module) : ".";
+    const entitiesLocalDir = join19(base, "src", "entities");
+    const entitiesDir = join19(process.cwd(), entitiesLocalDir);
+    const filePath = join19(entitiesDir, `${name}Entity.ts`);
     await Bun.write(filePath, content);
-    const testContent = entity_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join18(base, "tests", "entities");
-    const testsDir = join18(process.cwd(), testsLocalDir);
-    const testFilePath = join18(testsDir, `${name}Entity.spec.ts`);
+    const testContent = entity_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join19(base, "tests", "entities");
+    const testsDir = join19(process.cwd(), testsLocalDir);
+    const testFilePath = join19(testsDir, `${name}Entity.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const modulePascalName = module ? toPascalCase8(module) : toPascalCase8(basename3(process.cwd()));
-    const modulePath = join18(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
+    const modulePath = join19(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
     if (await Bun.file(modulePath).exists()) {
       await this.addToModule(modulePath, name);
     }
-    const logger = new TerminalLogger17;
-    logger.success(`${join18(entitiesLocalDir, name)}Entity.ts created successfully`, undefined, {
+    const logger = new TerminalLogger18;
+    logger.success(`${join19(entitiesLocalDir, name)}Entity.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join18(testsLocalDir, name)}Entity.spec.ts created successfully`, undefined, {
+    logger.success(`${join19(testsLocalDir, name)}Entity.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
@@ -9210,17 +9394,17 @@ class MakeEntityCommand {
   }
 }
 MakeEntityCommand = __legacyDecorateClassTS([
-  decorator18.command()
+  decorator19.command()
 ], MakeEntityCommand);
 // src/commands/MakeLoggerCommand.ts
-import { join as join19 } from "path";
-import { decorator as decorator19 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger18 } from "@ooneex/logger";
+import { join as join20 } from "path";
+import { decorator as decorator20 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger19 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase9 } from "@ooneex/utils";
 
 // src/templates/logger.test.txt
 var logger_test_default = `import { describe, expect, test } from "bun:test";
-import { {{NAME}}Logger } from "@/loggers/{{NAME}}Logger";
+import { {{NAME}}Logger } from "@module/{{MODULE}}/loggers/{{NAME}}Logger";
 
 describe("{{NAME}}Logger", () => {
   test("should have class name ending with 'Logger'", () => {
@@ -9320,28 +9504,28 @@ class MakeLoggerCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join19("modules", module) : ".";
-    const loggerLocalDir = join19(base, "src", "loggers");
-    const loggerDir = join19(process.cwd(), loggerLocalDir);
-    const filePath = join19(loggerDir, `${name}Logger.ts`);
+    const base = module ? join20("modules", module) : ".";
+    const loggerLocalDir = join20(base, "src", "loggers");
+    const loggerDir = join20(process.cwd(), loggerLocalDir);
+    const filePath = join20(loggerDir, `${name}Logger.ts`);
     await Bun.write(filePath, content);
-    const testContent = logger_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join19(base, "tests", "loggers");
-    const testsDir = join19(process.cwd(), testsLocalDir);
-    const testFilePath = join19(testsDir, `${name}Logger.spec.ts`);
+    const testContent = logger_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join20(base, "tests", "loggers");
+    const testsDir = join20(process.cwd(), testsLocalDir);
+    const testFilePath = join20(testsDir, `${name}Logger.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger18;
-    logger.success(`${join19(loggerLocalDir, name)}Logger.ts created successfully`, undefined, {
+    const logger = new TerminalLogger19;
+    logger.success(`${join20(loggerLocalDir, name)}Logger.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join19(testsLocalDir, name)}Logger.spec.ts created successfully`, undefined, {
+    logger.success(`${join20(testsLocalDir, name)}Logger.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 ?? {};
@@ -9356,17 +9540,17 @@ class MakeLoggerCommand {
   }
 }
 MakeLoggerCommand = __legacyDecorateClassTS([
-  decorator19.command()
+  decorator20.command()
 ], MakeLoggerCommand);
 // src/commands/MakeMailerCommand.ts
-import { join as join20 } from "path";
-import { decorator as decorator20 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger19 } from "@ooneex/logger";
+import { join as join21 } from "path";
+import { decorator as decorator21 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger20 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase10 } from "@ooneex/utils";
 
 // src/templates/mailer/mailer.test.txt
 var mailer_test_default = `import { describe, expect, test } from "bun:test";
-import { {{NAME}}Mailer } from "@/mailers/{{NAME}}Mailer";
+import { {{NAME}}Mailer } from "@module/{{MODULE}}/mailers/{{NAME}}Mailer";
 
 describe("{{NAME}}Mailer", () => {
   test("should have class name ending with 'Mailer'", () => {
@@ -9409,7 +9593,7 @@ export class {{NAME}}Mailer implements IMailer {
 
 // src/templates/mailer/mailer-template.test.txt
 var mailer_template_test_default = `import { describe, expect, test } from "bun:test";
-import { {{NAME}}MailerTemplate } from "@/mailers/{{NAME}}MailerTemplate";
+import { {{NAME}}MailerTemplate } from "@module/{{MODULE}}/mailers/{{NAME}}MailerTemplate";
 
 describe("{{NAME}}MailerTemplate", () => {
   test("should have function name ending with 'MailerTemplate'", () => {
@@ -9459,43 +9643,43 @@ class MakeMailerCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join20("modules", module) : ".";
-    const mailerLocalDir = join20(base, "src", "mailers");
-    const mailerDir = join20(process.cwd(), mailerLocalDir);
-    const mailerFilePath = join20(mailerDir, `${name}Mailer.ts`);
-    const templateFilePath = join20(mailerDir, `${name}MailerTemplate.tsx`);
+    const base = module ? join21("modules", module) : ".";
+    const mailerLocalDir = join21(base, "src", "mailers");
+    const mailerDir = join21(process.cwd(), mailerLocalDir);
+    const mailerFilePath = join21(mailerDir, `${name}Mailer.ts`);
+    const templateFilePath = join21(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 = join20(base, "tests", "mailers");
-    const testsDir = join20(process.cwd(), testsLocalDir);
-    const mailerTestFilePath = join20(testsDir, `${name}Mailer.spec.ts`);
-    const templateTestFilePath = join20(testsDir, `${name}MailerTemplate.spec.ts`);
+    const mailerTestContent = mailer_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const templateTestContent = mailer_template_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join21(base, "tests", "mailers");
+    const testsDir = join21(process.cwd(), testsLocalDir);
+    const mailerTestFilePath = join21(testsDir, `${name}Mailer.spec.ts`);
+    const templateTestFilePath = join21(testsDir, `${name}MailerTemplate.spec.ts`);
     await Bun.write(mailerTestFilePath, mailerTestContent);
     await Bun.write(templateTestFilePath, templateTestContent);
-    const logger = new TerminalLogger19;
-    logger.success(`${join20(mailerLocalDir, name)}Mailer.ts created successfully`, undefined, {
+    const logger = new TerminalLogger20;
+    logger.success(`${join21(mailerLocalDir, name)}Mailer.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join20(mailerLocalDir, name)}MailerTemplate.tsx created successfully`, undefined, {
+    logger.success(`${join21(mailerLocalDir, name)}MailerTemplate.tsx created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join20(testsLocalDir, name)}Mailer.spec.ts created successfully`, undefined, {
+    logger.success(`${join21(testsLocalDir, name)}Mailer.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join20(testsLocalDir, name)}MailerTemplate.spec.ts created successfully`, undefined, {
+    logger.success(`${join21(testsLocalDir, name)}MailerTemplate.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join20(process.cwd(), "package.json");
+    const packageJsonPath = join21(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -9510,12 +9694,12 @@ class MakeMailerCommand {
   }
 }
 MakeMailerCommand = __legacyDecorateClassTS([
-  decorator20.command()
+  decorator21.command()
 ], MakeMailerCommand);
 // src/commands/MakeMiddlewareCommand.ts
-import { basename as basename4, join as join21 } from "path";
-import { decorator as decorator21 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger20 } from "@ooneex/logger";
+import { basename as basename4, join as join22 } from "path";
+import { decorator as decorator22 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger21 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase11 } from "@ooneex/utils";
 
 // src/templates/middleware.socket.txt
@@ -9535,7 +9719,7 @@ export class {{NAME}}Middleware implements IMiddleware {
 
 // src/templates/middleware.test.txt
 var middleware_test_default = `import { describe, expect, test } from "bun:test";
-import { {{NAME}}Middleware } from "@/middlewares/{{NAME}}Middleware";
+import { {{NAME}}Middleware } from "@module/{{MODULE}}/middlewares/{{NAME}}Middleware";
 
 describe("{{NAME}}Middleware", () => {
   test("should have class name ending with 'Middleware'", () => {
@@ -9604,33 +9788,33 @@ class MakeMiddlewareCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join21("modules", module) : ".";
-    const middlewareLocalDir = join21(base, "src", "middlewares");
-    const middlewareDir = join21(process.cwd(), middlewareLocalDir);
-    const filePath = join21(middlewareDir, `${name}Middleware.ts`);
+    const base = module ? join22("modules", module) : ".";
+    const middlewareLocalDir = join22(base, "src", "middlewares");
+    const middlewareDir = join22(process.cwd(), middlewareLocalDir);
+    const filePath = join22(middlewareDir, `${name}Middleware.ts`);
     await Bun.write(filePath, content);
-    const testContent = middleware_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join21(base, "tests", "middlewares");
-    const testsDir = join21(process.cwd(), testsLocalDir);
-    const testFilePath = join21(testsDir, `${name}Middleware.spec.ts`);
+    const testContent = middleware_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join22(base, "tests", "middlewares");
+    const testsDir = join22(process.cwd(), testsLocalDir);
+    const testFilePath = join22(testsDir, `${name}Middleware.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const modulePascalName = module ? toPascalCase11(module) : toPascalCase11(basename4(process.cwd()));
-    const modulePath = join21(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
+    const modulePath = join22(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
     if (await Bun.file(modulePath).exists()) {
       await this.addToModule(modulePath, name);
     }
-    const logger = new TerminalLogger20;
-    logger.success(`${join21(middlewareLocalDir, name)}Middleware.ts created successfully`, undefined, {
+    const logger = new TerminalLogger21;
+    logger.success(`${join22(middlewareLocalDir, name)}Middleware.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join21(testsLocalDir, name)}Middleware.spec.ts created successfully`, undefined, {
+    logger.success(`${join22(testsLocalDir, name)}Middleware.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 ?? {};
@@ -9645,12 +9829,12 @@ class MakeMiddlewareCommand {
   }
 }
 MakeMiddlewareCommand = __legacyDecorateClassTS([
-  decorator21.command()
+  decorator22.command()
 ], MakeMiddlewareCommand);
 // src/commands/MakeMigrationCommand.ts
-import { join as join22 } from "path";
-import { decorator as decorator22 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger21 } from "@ooneex/logger";
+import { join as join23 } from "path";
+import { decorator as decorator23 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger22 } from "@ooneex/logger";
 import { migrationCreate } from "@ooneex/migrations";
 
 // src/templates/module/migration.up.txt
@@ -9678,17 +9862,18 @@ class MakeMigrationCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join22("modules", module) : ".";
+    const base = module ? join23("modules", module) : ".";
     const { migrationPath: filePath } = await migrationCreate({
-      migrationsDir: join22(base, "src", "migrations"),
-      testsDir: join22(base, "tests", "migrations")
+      migrationsDir: join23(base, "src", "migrations"),
+      testsDir: join23(base, "tests", "migrations"),
+      module: module ?? ""
     });
-    const binMigrationUpPath = join22(process.cwd(), base, "bin", "migration", "up.ts");
+    const binMigrationUpPath = join23(process.cwd(), base, "bin", "migration", "up.ts");
     const binMigrationUpFile = Bun.file(binMigrationUpPath);
     if (!await binMigrationUpFile.exists()) {
       await Bun.write(binMigrationUpPath, migration_up_default.replace(/{{name}}/g, module ?? ""));
     }
-    const logger = new TerminalLogger21;
+    const logger = new TerminalLogger22;
     logger.success(`${filePath} created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
@@ -9697,18 +9882,18 @@ class MakeMigrationCommand {
   }
 }
 MakeMigrationCommand = __legacyDecorateClassTS([
-  decorator22.command()
+  decorator23.command()
 ], MakeMigrationCommand);
 // src/commands/MakePermissionCommand.ts
-import { join as join23 } from "path";
-import { decorator as decorator23 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger22 } from "@ooneex/logger";
+import { join as join24 } from "path";
+import { decorator as decorator24 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger23 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase12 } from "@ooneex/utils";
 
 // src/templates/permission.test.txt
 var permission_test_default = `import { describe, expect, test } from "bun:test";
 import { Permission } from "@ooneex/permission";
-import { {{NAME}}Permission } from "@/permissions/{{NAME}}Permission";
+import { {{NAME}}Permission } from "@module/{{MODULE}}/permissions/{{NAME}}Permission";
 
 describe("{{NAME}}Permission", () => {
   test("should have class name ending with 'Permission'", () => {
@@ -9730,12 +9915,17 @@ describe("{{NAME}}Permission", () => {
     expect(typeof {{NAME}}Permission.prototype.setUserPermissions).toBe("function");
   });
 
+  test("should have 'check' method", () => {
+    expect({{NAME}}Permission.prototype.check).toBeDefined();
+    expect(typeof {{NAME}}Permission.prototype.check).toBe("function");
+  });
+
 });
 `;
 
 // src/templates/permission.txt
-var permission_default = `import { decorator, Permission } from "@ooneex/permission";
-import type { IUser } from "@ooneex/user";
+var permission_default = `import type { ContextType } from "@ooneex/controller";
+import { decorator, Permission } from "@ooneex/permission";
 
 @decorator.permission()
 export class {{NAME}}Permission extends Permission {
@@ -9747,12 +9937,14 @@ export class {{NAME}}Permission extends Permission {
     return this;
   }
 
-  public setUserPermissions(user: IUser | null): this {
-    if (!user) {
-      return this;
-    }
-
+  public setUserPermissions(context: ContextType): this {
     // Example: Grant full access to admins
+    // const { user } = context;
+    //
+    // if (!user) {
+    //   return this;
+    // }
+    //
     // const { roles } = user;
     // if (roles.includes(ERole.ADMIN)) {
     //   this.ability.can("manage", "all");
@@ -9760,18 +9952,58 @@ export class {{NAME}}Permission extends Permission {
     // }
 
     // Example: Grant specific permissions based on roles
-    // for (const role of roles) {
-    //   if (role === ERole.USER) {
-    //     this.ability.can(["read", "update"], "YourEntity", { userId: user.id });
-    //   }
+    // const { user } = context;
+    //
+    // if (user) {
+    //   for (const role of user.roles) {
+    //     if (role === ERole.USER) {
+    //       this.ability.can(["read", "update"], "YourEntity", { userId: user.id });
+    //     }
     //
-    //   if (role === ERole.GUEST) {
-    //     this.ability.can("read", "YourEntity", { public: true });
+    //     if (role === ERole.GUEST) {
+    //       this.ability.can("read", "YourEntity", { public: true });
+    //     }
     //   }
     // }
 
     return this;
   }
+
+  public check(context: ContextType): boolean {
+    // Example 1: Restrict access based on IP or request method
+    // const { ip, method } = context;
+    //
+    // if (!ip) {
+    //   return false;
+    // }
+    //
+    // if (method === "DELETE") {
+    //   return false;
+    // }
+
+    // Example 2: Restrict access based on route roles
+    // const { route } = context;
+    //
+    // if (route?.roles && route.roles.length > 0) {
+    //   return false;
+    // }
+
+    // Example 3: Restrict access based on request header
+    // const { header } = context;
+    //
+    // if (!header.get("Authorization")) {
+    //   return false;
+    // }
+
+    // Example 4: Restrict access based on rate limiter
+    // const { rateLimiter } = context;
+    //
+    // if (rateLimiter) {
+    //   return false;
+    // }
+
+    return true;
+  }
 }
 `;
 
@@ -9793,28 +10025,28 @@ class MakePermissionCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join23("modules", module) : ".";
-    const permissionLocalDir = join23(base, "src", "permissions");
-    const permissionDir = join23(process.cwd(), permissionLocalDir);
-    const filePath = join23(permissionDir, `${name}Permission.ts`);
+    const base = module ? join24("modules", module) : ".";
+    const permissionLocalDir = join24(base, "src", "permissions");
+    const permissionDir = join24(process.cwd(), permissionLocalDir);
+    const filePath = join24(permissionDir, `${name}Permission.ts`);
     await Bun.write(filePath, content);
-    const testContent = permission_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join23(base, "tests", "permissions");
-    const testsDir = join23(process.cwd(), testsLocalDir);
-    const testFilePath = join23(testsDir, `${name}Permission.spec.ts`);
+    const testContent = permission_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join24(base, "tests", "permissions");
+    const testsDir = join24(process.cwd(), testsLocalDir);
+    const testFilePath = join24(testsDir, `${name}Permission.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger22;
-    logger.success(`${join23(permissionLocalDir, name)}Permission.ts created successfully`, undefined, {
+    const logger = new TerminalLogger23;
+    logger.success(`${join24(permissionLocalDir, name)}Permission.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join23(testsLocalDir, name)}Permission.spec.ts created successfully`, undefined, {
+    logger.success(`${join24(testsLocalDir, name)}Permission.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join23(process.cwd(), "package.json");
+    const packageJsonPath = join24(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -9829,17 +10061,17 @@ class MakePermissionCommand {
   }
 }
 MakePermissionCommand = __legacyDecorateClassTS([
-  decorator23.command()
+  decorator24.command()
 ], MakePermissionCommand);
 // src/commands/MakePubSubCommand.ts
-import { basename as basename5, join as join24 } from "path";
-import { decorator as decorator24 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger23 } from "@ooneex/logger";
+import { basename as basename5, join as join25 } from "path";
+import { decorator as decorator25 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger24 } from "@ooneex/logger";
 import { toKebabCase as toKebabCase4, toPascalCase as toPascalCase13 } from "@ooneex/utils";
 
 // src/templates/pubsub.test.txt
 var pubsub_test_default = `import { describe, expect, test } from "bun:test";
-import { {{NAME}}PubSub } from "@/pubsub/{{NAME}}PubSub";
+import { {{NAME}}PubSub } from "@module/{{MODULE}}/pubsub/{{NAME}}PubSub";
 
 describe("{{NAME}}PubSub", () => {
   test("should have class name ending with 'PubSub'", () => {
@@ -9942,33 +10174,33 @@ class MakePubSubCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join24("modules", module) : ".";
-    const pubSubLocalDir = join24(base, "src", "events");
-    const pubSubDir = join24(process.cwd(), pubSubLocalDir);
-    const filePath = join24(pubSubDir, `${name}Event.ts`);
+    const base = module ? join25("modules", module) : ".";
+    const pubSubLocalDir = join25(base, "src", "events");
+    const pubSubDir = join25(process.cwd(), pubSubLocalDir);
+    const filePath = join25(pubSubDir, `${name}Event.ts`);
     await Bun.write(filePath, content);
-    const testContent = pubsub_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join24(base, "tests", "events");
-    const testsDir = join24(process.cwd(), testsLocalDir);
-    const testFilePath = join24(testsDir, `${name}Event.spec.ts`);
+    const testContent = pubsub_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join25(base, "tests", "events");
+    const testsDir = join25(process.cwd(), testsLocalDir);
+    const testFilePath = join25(testsDir, `${name}Event.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const modulePascalName = module ? toPascalCase13(module) : toPascalCase13(basename5(process.cwd()));
-    const modulePath = join24(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
+    const modulePath = join25(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
     if (await Bun.file(modulePath).exists()) {
       await this.addToModule(modulePath, name);
     }
-    const logger = new TerminalLogger23;
-    logger.success(`${join24(pubSubLocalDir, name)}Event.ts created successfully`, undefined, {
+    const logger = new TerminalLogger24;
+    logger.success(`${join25(pubSubLocalDir, name)}Event.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join24(testsLocalDir, name)}Event.spec.ts created successfully`, undefined, {
+    logger.success(`${join25(testsLocalDir, name)}Event.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join24(process.cwd(), "package.json");
+    const packageJsonPath = join25(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -9983,13 +10215,13 @@ class MakePubSubCommand {
   }
 }
 MakePubSubCommand = __legacyDecorateClassTS([
-  decorator24.command()
+  decorator25.command()
 ], MakePubSubCommand);
 // src/commands/MakeReleaseCommand.ts
 import { readdir } from "fs/promises";
-import { join as join25 } from "path";
-import { decorator as decorator25 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger24 } from "@ooneex/logger";
+import { join as join26 } from "path";
+import { decorator as decorator26 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger25 } from "@ooneex/logger";
 var {$ } = globalThis.Bun;
 var COMMIT_TYPE_TO_CATEGORY = {
   feat: "Added",
@@ -10012,7 +10244,7 @@ class MakeReleaseCommand {
     return "Release packages with version bump, changelog, and git tag";
   }
   async run() {
-    const logger = new TerminalLogger24;
+    const logger = new TerminalLogger25;
     const cwd = process.cwd();
     const dirs = [];
     for (const { name, type } of [
@@ -10020,8 +10252,8 @@ class MakeReleaseCommand {
       { name: "modules", type: "module" }
     ]) {
       try {
-        const entries = await readdir(join25(cwd, name), { withFileTypes: true });
-        dirs.push(...entries.filter((d) => d.isDirectory()).map((d) => ({ base: join25(name, d.name), type })));
+        const entries = await readdir(join26(cwd, name), { withFileTypes: true });
+        dirs.push(...entries.filter((d) => d.isDirectory()).map((d) => ({ base: join26(name, d.name), type })));
       } catch {}
     }
     const logOptions = { showTimestamp: false, showArrow: false, useSymbol: true };
@@ -10031,8 +10263,8 @@ class MakeReleaseCommand {
     }
     let releasedCount = 0;
     for (const dir of dirs) {
-      const fullDir = join25(cwd, dir.base);
-      const pkgJsonPath = join25(fullDir, "package.json");
+      const fullDir = join26(cwd, dir.base);
+      const pkgJsonPath = join26(fullDir, "package.json");
       const pkgJsonFile = Bun.file(pkgJsonPath);
       if (!await pkgJsonFile.exists()) {
         continue;
@@ -10050,7 +10282,7 @@ class MakeReleaseCommand {
       await Bun.write(pkgJsonPath, `${JSON.stringify(pkgJson, null, 2)}
 `);
       await this.updateChangelog(fullDir, newVersion, tag, commits);
-      await this.gitAdd(join25(dir.base, "package.json"), join25(dir.base, "CHANGELOG.md"));
+      await this.gitAdd(join26(dir.base, "package.json"), join26(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);
@@ -10151,7 +10383,7 @@ class MakeReleaseCommand {
     }
   }
   async updateChangelog(dir, version, tag, commits) {
-    const changelogPath = join25(dir, "CHANGELOG.md");
+    const changelogPath = join26(dir, "CHANGELOG.md");
     const today = new Date().toISOString().split("T")[0];
     const repoUrl = await this.getRepoUrl();
     const grouped = new Map;
@@ -10228,17 +10460,17 @@ ${section}
   }
 }
 MakeReleaseCommand = __legacyDecorateClassTS([
-  decorator25.command()
+  decorator26.command()
 ], MakeReleaseCommand);
 // src/commands/MakeRepositoryCommand.ts
-import { join as join26 } from "path";
-import { decorator as decorator26 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger25 } from "@ooneex/logger";
+import { join as join27 } from "path";
+import { decorator as decorator27 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger26 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase14 } from "@ooneex/utils";
 
 // src/templates/repository.test.txt
 var repository_test_default = `import { describe, expect, test } from "bun:test";
-import { {{NAME}}Repository } from "@/repositories/{{NAME}}Repository";
+import { {{NAME}}Repository } from "@module/{{MODULE}}/repositories/{{NAME}}Repository";
 
 describe("{{NAME}}Repository", () => {
   test("should have class name ending with 'Repository'", () => {
@@ -10447,28 +10679,28 @@ class MakeRepositoryCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join26("modules", module) : ".";
-    const repositoriesLocalDir = join26(base, "src", "repositories");
-    const repositoriesDir = join26(process.cwd(), repositoriesLocalDir);
-    const filePath = join26(repositoriesDir, `${name}Repository.ts`);
+    const base = module ? join27("modules", module) : ".";
+    const repositoriesLocalDir = join27(base, "src", "repositories");
+    const repositoriesDir = join27(process.cwd(), repositoriesLocalDir);
+    const filePath = join27(repositoriesDir, `${name}Repository.ts`);
     await Bun.write(filePath, content);
-    const testContent = repository_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join26(base, "tests", "repositories");
-    const testsDir = join26(process.cwd(), testsLocalDir);
-    const testFilePath = join26(testsDir, `${name}Repository.spec.ts`);
+    const testContent = repository_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join27(base, "tests", "repositories");
+    const testsDir = join27(process.cwd(), testsLocalDir);
+    const testFilePath = join27(testsDir, `${name}Repository.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger25;
-    logger.success(`${join26(repositoriesLocalDir, name)}Repository.ts created successfully`, undefined, {
+    const logger = new TerminalLogger26;
+    logger.success(`${join27(repositoriesLocalDir, name)}Repository.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join26(testsLocalDir, name)}Repository.spec.ts created successfully`, undefined, {
+    logger.success(`${join27(testsLocalDir, name)}Repository.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 ?? {};
@@ -10483,11 +10715,11 @@ class MakeRepositoryCommand {
   }
 }
 MakeRepositoryCommand = __legacyDecorateClassTS([
-  decorator26.command()
+  decorator27.command()
 ], MakeRepositoryCommand);
 // src/commands/MakeResourceBookCommand.ts
-import { join as join28 } from "path";
-import { decorator as decorator28 } from "@ooneex/command";
+import { join as join29 } from "path";
+import { decorator as decorator29 } from "@ooneex/command";
 var {Glob } = globalThis.Bun;
 
 // src/templates/resources/book/BookEntity.txt
@@ -11183,14 +11415,14 @@ export class UpdateBookService implements IService {
 `;
 
 // src/commands/MakeServiceCommand.ts
-import { join as join27 } from "path";
-import { decorator as decorator27 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger26 } from "@ooneex/logger";
+import { join as join28 } from "path";
+import { decorator as decorator28 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger27 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase15 } from "@ooneex/utils";
 
 // src/templates/service.test.txt
 var service_test_default = `import { describe, expect, test } from "bun:test";
-import { {{NAME}}Service } from "@/services/{{NAME}}Service";
+import { {{NAME}}Service } from "@module/{{MODULE}}/services/{{NAME}}Service";
 
 describe("{{NAME}}Service", () => {
   test("should have class name ending with 'Service'", () => {
@@ -11237,28 +11469,28 @@ class MakeServiceCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join27("modules", module) : ".";
-    const serviceLocalDir = join27(base, "src", "services");
-    const serviceDir = join27(process.cwd(), serviceLocalDir);
-    const filePath = join27(serviceDir, `${name}Service.ts`);
+    const base = module ? join28("modules", module) : ".";
+    const serviceLocalDir = join28(base, "src", "services");
+    const serviceDir = join28(process.cwd(), serviceLocalDir);
+    const filePath = join28(serviceDir, `${name}Service.ts`);
     await Bun.write(filePath, content);
-    const testContent = service_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join27(base, "tests", "services");
-    const testsDir = join27(process.cwd(), testsLocalDir);
-    const testFilePath = join27(testsDir, `${name}Service.spec.ts`);
+    const testContent = service_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join28(base, "tests", "services");
+    const testsDir = join28(process.cwd(), testsLocalDir);
+    const testFilePath = join28(testsDir, `${name}Service.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger26;
-    logger.success(`${join27(serviceLocalDir, name)}Service.ts created successfully`, undefined, {
+    const logger = new TerminalLogger27;
+    logger.success(`${join28(serviceLocalDir, name)}Service.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join27(testsLocalDir, name)}Service.spec.ts created successfully`, undefined, {
+    logger.success(`${join28(testsLocalDir, name)}Service.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join27(process.cwd(), "package.json");
+    const packageJsonPath = join28(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -11273,7 +11505,7 @@ class MakeServiceCommand {
   }
 }
 MakeServiceCommand = __legacyDecorateClassTS([
-  decorator27.command()
+  decorator28.command()
 ], MakeServiceCommand);
 
 // src/commands/MakeResourceBookCommand.ts
@@ -11286,7 +11518,7 @@ class MakeResourceBookCommand {
   }
   async run() {
     const module = "book";
-    const base = join28("modules", module);
+    const base = join29("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
     await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
@@ -11306,26 +11538,26 @@ class MakeResourceBookCommand {
     for (const controller of controllers) {
       await makeControllerCommand.run({ ...controller, module, isSocket: false });
     }
-    const controllersDir = join28(process.cwd(), base, "src", "controllers");
-    await Bun.write(join28(controllersDir, "CreateBookController.ts"), CreateBookController_default);
-    await Bun.write(join28(controllersDir, "GetBookController.ts"), GetBookController_default);
-    await Bun.write(join28(controllersDir, "ListBooksController.ts"), ListBooksController_default);
-    await Bun.write(join28(controllersDir, "UpdateBookController.ts"), UpdateBookController_default);
-    await Bun.write(join28(controllersDir, "DeleteBookController.ts"), DeleteBookController_default);
+    const controllersDir = join29(process.cwd(), base, "src", "controllers");
+    await Bun.write(join29(controllersDir, "CreateBookController.ts"), CreateBookController_default);
+    await Bun.write(join29(controllersDir, "GetBookController.ts"), GetBookController_default);
+    await Bun.write(join29(controllersDir, "ListBooksController.ts"), ListBooksController_default);
+    await Bun.write(join29(controllersDir, "UpdateBookController.ts"), UpdateBookController_default);
+    await Bun.write(join29(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 = join28(process.cwd(), base, "src", "services");
-    await Bun.write(join28(servicesDir, "CreateBookService.ts"), CreateBookService_default);
-    await Bun.write(join28(servicesDir, "GetBookService.ts"), GetBookService_default);
-    await Bun.write(join28(servicesDir, "ListBooksService.ts"), ListBooksService_default);
-    await Bun.write(join28(servicesDir, "UpdateBookService.ts"), UpdateBookService_default);
-    await Bun.write(join28(servicesDir, "DeleteBookService.ts"), DeleteBookService_default);
-    const entityPath = join28(process.cwd(), base, "src", "entities", "BookEntity.ts");
+    const servicesDir = join29(process.cwd(), base, "src", "services");
+    await Bun.write(join29(servicesDir, "CreateBookService.ts"), CreateBookService_default);
+    await Bun.write(join29(servicesDir, "GetBookService.ts"), GetBookService_default);
+    await Bun.write(join29(servicesDir, "ListBooksService.ts"), ListBooksService_default);
+    await Bun.write(join29(servicesDir, "UpdateBookService.ts"), UpdateBookService_default);
+    await Bun.write(join29(servicesDir, "DeleteBookService.ts"), DeleteBookService_default);
+    const entityPath = join29(process.cwd(), base, "src", "entities", "BookEntity.ts");
     await Bun.write(entityPath, BookEntity_default);
-    const migrationsDir = join28(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join29(process.cwd(), base, "src", "migrations");
     const glob = new Glob("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -11333,18 +11565,18 @@ 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(join28(migrationsDir, file), content);
+      await Bun.write(join29(migrationsDir, file), content);
     }
-    const repositoryPath = join28(process.cwd(), base, "src", "repositories", "BookRepository.ts");
+    const repositoryPath = join29(process.cwd(), base, "src", "repositories", "BookRepository.ts");
     await Bun.write(repositoryPath, BookRepository_default);
   }
 }
 MakeResourceBookCommand = __legacyDecorateClassTS([
-  decorator28.command()
+  decorator29.command()
 ], MakeResourceBookCommand);
 // src/commands/MakeResourceCalendarEventCommand.ts
-import { join as join29 } from "path";
-import { decorator as decorator29 } from "@ooneex/command";
+import { join as join30 } from "path";
+import { decorator as decorator30 } from "@ooneex/command";
 var {Glob: Glob2 } = globalThis.Bun;
 
 // src/templates/resources/calendar-event/CalendarEventEntity.txt
@@ -12036,7 +12268,7 @@ class MakeResourceCalendarEventCommand {
   }
   async run() {
     const module = "calendar-event";
-    const base = join29("modules", module);
+    const base = join30("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
     await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
@@ -12071,12 +12303,12 @@ class MakeResourceCalendarEventCommand {
     for (const controller of controllers) {
       await makeControllerCommand.run({ ...controller, module, isSocket: false });
     }
-    const controllersDir = join29(process.cwd(), base, "src", "controllers");
-    await Bun.write(join29(controllersDir, "CreateCalendarEventController.ts"), CreateCalendarEventController_default);
-    await Bun.write(join29(controllersDir, "GetCalendarEventController.ts"), GetCalendarEventController_default);
-    await Bun.write(join29(controllersDir, "ListCalendarEventsController.ts"), ListCalendarEventsController_default);
-    await Bun.write(join29(controllersDir, "UpdateCalendarEventController.ts"), UpdateCalendarEventController_default);
-    await Bun.write(join29(controllersDir, "DeleteCalendarEventController.ts"), DeleteCalendarEventController_default);
+    const controllersDir = join30(process.cwd(), base, "src", "controllers");
+    await Bun.write(join30(controllersDir, "CreateCalendarEventController.ts"), CreateCalendarEventController_default);
+    await Bun.write(join30(controllersDir, "GetCalendarEventController.ts"), GetCalendarEventController_default);
+    await Bun.write(join30(controllersDir, "ListCalendarEventsController.ts"), ListCalendarEventsController_default);
+    await Bun.write(join30(controllersDir, "UpdateCalendarEventController.ts"), UpdateCalendarEventController_default);
+    await Bun.write(join30(controllersDir, "DeleteCalendarEventController.ts"), DeleteCalendarEventController_default);
     const makeServiceCommand = new MakeServiceCommand;
     const services = [
       "CreateCalendarEvent",
@@ -12088,15 +12320,15 @@ class MakeResourceCalendarEventCommand {
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join29(process.cwd(), base, "src", "services");
-    await Bun.write(join29(servicesDir, "CreateCalendarEventService.ts"), CreateCalendarEventService_default);
-    await Bun.write(join29(servicesDir, "GetCalendarEventService.ts"), GetCalendarEventService_default);
-    await Bun.write(join29(servicesDir, "ListCalendarEventsService.ts"), ListCalendarEventsService_default);
-    await Bun.write(join29(servicesDir, "UpdateCalendarEventService.ts"), UpdateCalendarEventService_default);
-    await Bun.write(join29(servicesDir, "DeleteCalendarEventService.ts"), DeleteCalendarEventService_default);
-    const entityPath = join29(process.cwd(), base, "src", "entities", "CalendarEventEntity.ts");
+    const servicesDir = join30(process.cwd(), base, "src", "services");
+    await Bun.write(join30(servicesDir, "CreateCalendarEventService.ts"), CreateCalendarEventService_default);
+    await Bun.write(join30(servicesDir, "GetCalendarEventService.ts"), GetCalendarEventService_default);
+    await Bun.write(join30(servicesDir, "ListCalendarEventsService.ts"), ListCalendarEventsService_default);
+    await Bun.write(join30(servicesDir, "UpdateCalendarEventService.ts"), UpdateCalendarEventService_default);
+    await Bun.write(join30(servicesDir, "DeleteCalendarEventService.ts"), DeleteCalendarEventService_default);
+    const entityPath = join30(process.cwd(), base, "src", "entities", "CalendarEventEntity.ts");
     await Bun.write(entityPath, CalendarEventEntity_default);
-    const migrationsDir = join29(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join30(process.cwd(), base, "src", "migrations");
     const glob = new Glob2("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -12104,18 +12336,18 @@ class MakeResourceCalendarEventCommand {
       const name = file.replace(/\.ts$/, "");
       const version = name.replace("Migration", "");
       const content = CalendarEventMigration_default.replaceAll("{{ name }}", name).replaceAll("{{ version }}", version);
-      await Bun.write(join29(migrationsDir, file), content);
+      await Bun.write(join30(migrationsDir, file), content);
     }
-    const repositoryPath = join29(process.cwd(), base, "src", "repositories", "CalendarEventRepository.ts");
+    const repositoryPath = join30(process.cwd(), base, "src", "repositories", "CalendarEventRepository.ts");
     await Bun.write(repositoryPath, CalendarEventRepository_default);
   }
 }
 MakeResourceCalendarEventCommand = __legacyDecorateClassTS([
-  decorator29.command()
+  decorator30.command()
 ], MakeResourceCalendarEventCommand);
 // src/commands/MakeResourceCategoryCommand.ts
-import { join as join30 } from "path";
-import { decorator as decorator30 } from "@ooneex/command";
+import { join as join31 } from "path";
+import { decorator as decorator31 } from "@ooneex/command";
 var {Glob: Glob3 } = globalThis.Bun;
 
 // src/templates/resources/category/CategoryEntity.txt
@@ -12706,7 +12938,7 @@ class MakeResourceCategoryCommand {
   }
   async run() {
     const module = "category";
-    const base = join30("modules", module);
+    const base = join31("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
     await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
@@ -12741,26 +12973,26 @@ class MakeResourceCategoryCommand {
     for (const controller of controllers) {
       await makeControllerCommand.run({ ...controller, module, isSocket: false });
     }
-    const controllersDir = join30(process.cwd(), base, "src", "controllers");
-    await Bun.write(join30(controllersDir, "CreateCategoryController.ts"), CreateCategoryController_default);
-    await Bun.write(join30(controllersDir, "GetCategoryController.ts"), GetCategoryController_default);
-    await Bun.write(join30(controllersDir, "ListCategoriesController.ts"), ListCategoriesController_default);
-    await Bun.write(join30(controllersDir, "UpdateCategoryController.ts"), UpdateCategoryController_default);
-    await Bun.write(join30(controllersDir, "DeleteCategoryController.ts"), DeleteCategoryController_default);
+    const controllersDir = join31(process.cwd(), base, "src", "controllers");
+    await Bun.write(join31(controllersDir, "CreateCategoryController.ts"), CreateCategoryController_default);
+    await Bun.write(join31(controllersDir, "GetCategoryController.ts"), GetCategoryController_default);
+    await Bun.write(join31(controllersDir, "ListCategoriesController.ts"), ListCategoriesController_default);
+    await Bun.write(join31(controllersDir, "UpdateCategoryController.ts"), UpdateCategoryController_default);
+    await Bun.write(join31(controllersDir, "DeleteCategoryController.ts"), DeleteCategoryController_default);
     const makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateCategory", "GetCategory", "ListCategories", "UpdateCategory", "DeleteCategory"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join30(process.cwd(), base, "src", "services");
-    await Bun.write(join30(servicesDir, "CreateCategoryService.ts"), CreateCategoryService_default);
-    await Bun.write(join30(servicesDir, "GetCategoryService.ts"), GetCategoryService_default);
-    await Bun.write(join30(servicesDir, "ListCategoriesService.ts"), ListCategoriesService_default);
-    await Bun.write(join30(servicesDir, "UpdateCategoryService.ts"), UpdateCategoryService_default);
-    await Bun.write(join30(servicesDir, "DeleteCategoryService.ts"), DeleteCategoryService_default);
-    const entityPath = join30(process.cwd(), base, "src", "entities", "CategoryEntity.ts");
+    const servicesDir = join31(process.cwd(), base, "src", "services");
+    await Bun.write(join31(servicesDir, "CreateCategoryService.ts"), CreateCategoryService_default);
+    await Bun.write(join31(servicesDir, "GetCategoryService.ts"), GetCategoryService_default);
+    await Bun.write(join31(servicesDir, "ListCategoriesService.ts"), ListCategoriesService_default);
+    await Bun.write(join31(servicesDir, "UpdateCategoryService.ts"), UpdateCategoryService_default);
+    await Bun.write(join31(servicesDir, "DeleteCategoryService.ts"), DeleteCategoryService_default);
+    const entityPath = join31(process.cwd(), base, "src", "entities", "CategoryEntity.ts");
     await Bun.write(entityPath, CategoryEntity_default);
-    const migrationsDir = join30(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join31(process.cwd(), base, "src", "migrations");
     const glob = new Glob3("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -12768,18 +13000,18 @@ class MakeResourceCategoryCommand {
       const name = file.replace(/\.ts$/, "");
       const version = name.replace("Migration", "");
       const content = CategoryMigration_default.replaceAll("{{ name }}", name).replaceAll("{{ version }}", version);
-      await Bun.write(join30(migrationsDir, file), content);
+      await Bun.write(join31(migrationsDir, file), content);
     }
-    const repositoryPath = join30(process.cwd(), base, "src", "repositories", "CategoryRepository.ts");
+    const repositoryPath = join31(process.cwd(), base, "src", "repositories", "CategoryRepository.ts");
     await Bun.write(repositoryPath, CategoryRepository_default);
   }
 }
 MakeResourceCategoryCommand = __legacyDecorateClassTS([
-  decorator30.command()
+  decorator31.command()
 ], MakeResourceCategoryCommand);
 // src/commands/MakeResourceColorCommand.ts
-import { join as join32 } from "path";
-import { decorator as decorator32 } from "@ooneex/command";
+import { join as join33 } from "path";
+import { decorator as decorator33 } from "@ooneex/command";
 var {Glob: Glob4 } = globalThis.Bun;
 
 // src/templates/resources/color/ColorEntity.txt
@@ -13571,9 +13803,9 @@ export class UpdateColorService implements IService {
 `;
 
 // src/commands/MakeSeedCommand.ts
-import { join as join31 } from "path";
-import { decorator as decorator31 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger27 } from "@ooneex/logger";
+import { join as join32 } from "path";
+import { decorator as decorator32 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger28 } from "@ooneex/logger";
 import { seedCreate } from "@ooneex/seeds";
 
 // src/templates/module/seed.run.txt
@@ -13612,18 +13844,19 @@ class MakeSeedCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join31("modules", module) : ".";
+    const base = module ? join32("modules", module) : ".";
     const { seedPath: filePath, dataPath } = await seedCreate({
       name,
-      seedsDir: join31(base, "src", "seeds"),
-      testsDir: join31(base, "tests", "seeds")
+      seedsDir: join32(base, "src", "seeds"),
+      testsDir: join32(base, "tests", "seeds"),
+      module: module ?? ""
     });
-    const binSeedRunPath = join31(process.cwd(), base, "bin", "seed", "run.ts");
+    const binSeedRunPath = join32(process.cwd(), base, "bin", "seed", "run.ts");
     const binSeedRunFile = Bun.file(binSeedRunPath);
     if (!await binSeedRunFile.exists()) {
       await Bun.write(binSeedRunPath, seed_run_default.replace(/{{name}}/g, module ?? ""));
     }
-    const logger = new TerminalLogger27;
+    const logger = new TerminalLogger28;
     logger.success(`${filePath} created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
@@ -13637,7 +13870,7 @@ class MakeSeedCommand {
   }
 }
 MakeSeedCommand = __legacyDecorateClassTS([
-  decorator31.command()
+  decorator32.command()
 ], MakeSeedCommand);
 
 // src/commands/MakeResourceColorCommand.ts
@@ -13650,7 +13883,7 @@ class MakeResourceColorCommand {
   }
   async run() {
     const module = "color";
-    const base = join32("modules", module);
+    const base = join33("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
     await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
@@ -13673,26 +13906,26 @@ class MakeResourceColorCommand {
     for (const controller of controllers) {
       await makeControllerCommand.run({ ...controller, module, isSocket: false });
     }
-    const controllersDir = join32(process.cwd(), base, "src", "controllers");
-    await Bun.write(join32(controllersDir, "CreateColorController.ts"), CreateColorController_default);
-    await Bun.write(join32(controllersDir, "GetColorController.ts"), GetColorController_default);
-    await Bun.write(join32(controllersDir, "ListColorsController.ts"), ListColorsController_default);
-    await Bun.write(join32(controllersDir, "UpdateColorController.ts"), UpdateColorController_default);
-    await Bun.write(join32(controllersDir, "DeleteColorController.ts"), DeleteColorController_default);
+    const controllersDir = join33(process.cwd(), base, "src", "controllers");
+    await Bun.write(join33(controllersDir, "CreateColorController.ts"), CreateColorController_default);
+    await Bun.write(join33(controllersDir, "GetColorController.ts"), GetColorController_default);
+    await Bun.write(join33(controllersDir, "ListColorsController.ts"), ListColorsController_default);
+    await Bun.write(join33(controllersDir, "UpdateColorController.ts"), UpdateColorController_default);
+    await Bun.write(join33(controllersDir, "DeleteColorController.ts"), DeleteColorController_default);
     const makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateColor", "GetColor", "ListColors", "UpdateColor", "DeleteColor"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join32(process.cwd(), base, "src", "services");
-    await Bun.write(join32(servicesDir, "CreateColorService.ts"), CreateColorService_default);
-    await Bun.write(join32(servicesDir, "GetColorService.ts"), GetColorService_default);
-    await Bun.write(join32(servicesDir, "ListColorsService.ts"), ListColorsService_default);
-    await Bun.write(join32(servicesDir, "UpdateColorService.ts"), UpdateColorService_default);
-    await Bun.write(join32(servicesDir, "DeleteColorService.ts"), DeleteColorService_default);
-    const entityPath = join32(process.cwd(), base, "src", "entities", "ColorEntity.ts");
+    const servicesDir = join33(process.cwd(), base, "src", "services");
+    await Bun.write(join33(servicesDir, "CreateColorService.ts"), CreateColorService_default);
+    await Bun.write(join33(servicesDir, "GetColorService.ts"), GetColorService_default);
+    await Bun.write(join33(servicesDir, "ListColorsService.ts"), ListColorsService_default);
+    await Bun.write(join33(servicesDir, "UpdateColorService.ts"), UpdateColorService_default);
+    await Bun.write(join33(servicesDir, "DeleteColorService.ts"), DeleteColorService_default);
+    const entityPath = join33(process.cwd(), base, "src", "entities", "ColorEntity.ts");
     await Bun.write(entityPath, ColorEntity_default);
-    const migrationsDir = join32(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join33(process.cwd(), base, "src", "migrations");
     const glob = new Glob4("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -13700,23 +13933,23 @@ class MakeResourceColorCommand {
       const name = file.replace(/\.ts$/, "");
       const version = name.replace("Migration", "");
       const content = ColorMigration_default.replaceAll("{{ name }}", name).replaceAll("{{ version }}", version);
-      await Bun.write(join32(migrationsDir, file), content);
+      await Bun.write(join33(migrationsDir, file), content);
     }
-    const repositoryPath = join32(process.cwd(), base, "src", "repositories", "ColorRepository.ts");
+    const repositoryPath = join33(process.cwd(), base, "src", "repositories", "ColorRepository.ts");
     await Bun.write(repositoryPath, ColorRepository_default);
     const makeSeedCommand = new MakeSeedCommand;
     await makeSeedCommand.run({ name: "Color", module });
-    const seedsDir = join32(process.cwd(), base, "src", "seeds");
-    await Bun.write(join32(seedsDir, "ColorSeed.ts"), ColorSeed_default);
-    await Bun.write(join32(seedsDir, "color-seed.yml"), color_seed_default);
+    const seedsDir = join33(process.cwd(), base, "src", "seeds");
+    await Bun.write(join33(seedsDir, "ColorSeed.ts"), ColorSeed_default);
+    await Bun.write(join33(seedsDir, "color-seed.yml"), color_seed_default);
   }
 }
 MakeResourceColorCommand = __legacyDecorateClassTS([
-  decorator32.command()
+  decorator33.command()
 ], MakeResourceColorCommand);
 // src/commands/MakeResourceDiscountCommand.ts
-import { join as join33 } from "path";
-import { decorator as decorator33 } from "@ooneex/command";
+import { join as join34 } from "path";
+import { decorator as decorator34 } from "@ooneex/command";
 var {Glob: Glob5 } = globalThis.Bun;
 
 // src/templates/resources/discount/controllers/CreateDiscountController.txt
@@ -14359,7 +14592,7 @@ class MakeResourceDiscountCommand {
   }
   async run() {
     const module = "discount";
-    const base = join33("modules", module);
+    const base = join34("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
     await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
@@ -14394,26 +14627,26 @@ class MakeResourceDiscountCommand {
     for (const controller of controllers) {
       await makeControllerCommand.run({ ...controller, module, isSocket: false });
     }
-    const controllersDir = join33(process.cwd(), base, "src", "controllers");
-    await Bun.write(join33(controllersDir, "CreateDiscountController.ts"), CreateDiscountController_default);
-    await Bun.write(join33(controllersDir, "GetDiscountController.ts"), GetDiscountController_default);
-    await Bun.write(join33(controllersDir, "ListDiscountsController.ts"), ListDiscountsController_default);
-    await Bun.write(join33(controllersDir, "UpdateDiscountController.ts"), UpdateDiscountController_default);
-    await Bun.write(join33(controllersDir, "DeleteDiscountController.ts"), DeleteDiscountController_default);
+    const controllersDir = join34(process.cwd(), base, "src", "controllers");
+    await Bun.write(join34(controllersDir, "CreateDiscountController.ts"), CreateDiscountController_default);
+    await Bun.write(join34(controllersDir, "GetDiscountController.ts"), GetDiscountController_default);
+    await Bun.write(join34(controllersDir, "ListDiscountsController.ts"), ListDiscountsController_default);
+    await Bun.write(join34(controllersDir, "UpdateDiscountController.ts"), UpdateDiscountController_default);
+    await Bun.write(join34(controllersDir, "DeleteDiscountController.ts"), DeleteDiscountController_default);
     const makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateDiscount", "GetDiscount", "ListDiscounts", "UpdateDiscount", "DeleteDiscount"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join33(process.cwd(), base, "src", "services");
-    await Bun.write(join33(servicesDir, "CreateDiscountService.ts"), CreateDiscountService_default);
-    await Bun.write(join33(servicesDir, "GetDiscountService.ts"), GetDiscountService_default);
-    await Bun.write(join33(servicesDir, "ListDiscountsService.ts"), ListDiscountsService_default);
-    await Bun.write(join33(servicesDir, "UpdateDiscountService.ts"), UpdateDiscountService_default);
-    await Bun.write(join33(servicesDir, "DeleteDiscountService.ts"), DeleteDiscountService_default);
-    const entityPath = join33(process.cwd(), base, "src", "entities", "DiscountEntity.ts");
+    const servicesDir = join34(process.cwd(), base, "src", "services");
+    await Bun.write(join34(servicesDir, "CreateDiscountService.ts"), CreateDiscountService_default);
+    await Bun.write(join34(servicesDir, "GetDiscountService.ts"), GetDiscountService_default);
+    await Bun.write(join34(servicesDir, "ListDiscountsService.ts"), ListDiscountsService_default);
+    await Bun.write(join34(servicesDir, "UpdateDiscountService.ts"), UpdateDiscountService_default);
+    await Bun.write(join34(servicesDir, "DeleteDiscountService.ts"), DeleteDiscountService_default);
+    const entityPath = join34(process.cwd(), base, "src", "entities", "DiscountEntity.ts");
     await Bun.write(entityPath, DiscountEntity_default);
-    const migrationsDir = join33(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join34(process.cwd(), base, "src", "migrations");
     const glob = new Glob5("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -14421,18 +14654,18 @@ class MakeResourceDiscountCommand {
       const name = file.replace(/\.ts$/, "");
       const version = name.replace("Migration", "");
       const content = DiscountMigration_default.replaceAll("{{ name }}", name).replaceAll("{{ version }}", version);
-      await Bun.write(join33(migrationsDir, file), content);
+      await Bun.write(join34(migrationsDir, file), content);
     }
-    const repositoryPath = join33(process.cwd(), base, "src", "repositories", "DiscountRepository.ts");
+    const repositoryPath = join34(process.cwd(), base, "src", "repositories", "DiscountRepository.ts");
     await Bun.write(repositoryPath, DiscountRepository_default);
   }
 }
 MakeResourceDiscountCommand = __legacyDecorateClassTS([
-  decorator33.command()
+  decorator34.command()
 ], MakeResourceDiscountCommand);
 // src/commands/MakeResourceFolderCommand.ts
-import { join as join34 } from "path";
-import { decorator as decorator34 } from "@ooneex/command";
+import { join as join35 } from "path";
+import { decorator as decorator35 } from "@ooneex/command";
 var {Glob: Glob6 } = globalThis.Bun;
 
 // src/templates/resources/folder/controllers/CreateFolderController.txt
@@ -15059,7 +15292,7 @@ class MakeResourceFolderCommand {
   }
   async run() {
     const module = "folder";
-    const base = join34("modules", module);
+    const base = join35("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
     await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
@@ -15094,26 +15327,26 @@ class MakeResourceFolderCommand {
     for (const controller of controllers) {
       await makeControllerCommand.run({ ...controller, module, isSocket: false });
     }
-    const controllersDir = join34(process.cwd(), base, "src", "controllers");
-    await Bun.write(join34(controllersDir, "CreateFolderController.ts"), CreateFolderController_default);
-    await Bun.write(join34(controllersDir, "GetFolderController.ts"), GetFolderController_default);
-    await Bun.write(join34(controllersDir, "ListFoldersController.ts"), ListFoldersController_default);
-    await Bun.write(join34(controllersDir, "UpdateFolderController.ts"), UpdateFolderController_default);
-    await Bun.write(join34(controllersDir, "DeleteFolderController.ts"), DeleteFolderController_default);
+    const controllersDir = join35(process.cwd(), base, "src", "controllers");
+    await Bun.write(join35(controllersDir, "CreateFolderController.ts"), CreateFolderController_default);
+    await Bun.write(join35(controllersDir, "GetFolderController.ts"), GetFolderController_default);
+    await Bun.write(join35(controllersDir, "ListFoldersController.ts"), ListFoldersController_default);
+    await Bun.write(join35(controllersDir, "UpdateFolderController.ts"), UpdateFolderController_default);
+    await Bun.write(join35(controllersDir, "DeleteFolderController.ts"), DeleteFolderController_default);
     const makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateFolder", "GetFolder", "ListFolders", "UpdateFolder", "DeleteFolder"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join34(process.cwd(), base, "src", "services");
-    await Bun.write(join34(servicesDir, "CreateFolderService.ts"), CreateFolderService_default);
-    await Bun.write(join34(servicesDir, "GetFolderService.ts"), GetFolderService_default);
-    await Bun.write(join34(servicesDir, "ListFoldersService.ts"), ListFoldersService_default);
-    await Bun.write(join34(servicesDir, "UpdateFolderService.ts"), UpdateFolderService_default);
-    await Bun.write(join34(servicesDir, "DeleteFolderService.ts"), DeleteFolderService_default);
-    const entityPath = join34(process.cwd(), base, "src", "entities", "FolderEntity.ts");
+    const servicesDir = join35(process.cwd(), base, "src", "services");
+    await Bun.write(join35(servicesDir, "CreateFolderService.ts"), CreateFolderService_default);
+    await Bun.write(join35(servicesDir, "GetFolderService.ts"), GetFolderService_default);
+    await Bun.write(join35(servicesDir, "ListFoldersService.ts"), ListFoldersService_default);
+    await Bun.write(join35(servicesDir, "UpdateFolderService.ts"), UpdateFolderService_default);
+    await Bun.write(join35(servicesDir, "DeleteFolderService.ts"), DeleteFolderService_default);
+    const entityPath = join35(process.cwd(), base, "src", "entities", "FolderEntity.ts");
     await Bun.write(entityPath, FolderEntity_default);
-    const migrationsDir = join34(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join35(process.cwd(), base, "src", "migrations");
     const glob = new Glob6("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -15121,18 +15354,18 @@ class MakeResourceFolderCommand {
       const name = file.replace(/\.ts$/, "");
       const version = name.replace("Migration", "");
       const content = FolderMigration_default.replaceAll("{{ name }}", name).replaceAll("{{ version }}", version);
-      await Bun.write(join34(migrationsDir, file), content);
+      await Bun.write(join35(migrationsDir, file), content);
     }
-    const repositoryPath = join34(process.cwd(), base, "src", "repositories", "FolderRepository.ts");
+    const repositoryPath = join35(process.cwd(), base, "src", "repositories", "FolderRepository.ts");
     await Bun.write(repositoryPath, FolderRepository_default);
   }
 }
 MakeResourceFolderCommand = __legacyDecorateClassTS([
-  decorator34.command()
+  decorator35.command()
 ], MakeResourceFolderCommand);
 // src/commands/MakeResourceImageCommand.ts
-import { join as join35 } from "path";
-import { decorator as decorator35 } from "@ooneex/command";
+import { join as join36 } from "path";
+import { decorator as decorator36 } from "@ooneex/command";
 var {Glob: Glob7 } = globalThis.Bun;
 
 // src/templates/resources/image/controllers/CreateImageController.txt
@@ -15798,7 +16031,7 @@ class MakeResourceImageCommand {
   }
   async run() {
     const module = "image";
-    const base = join35("modules", module);
+    const base = join36("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
     await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
@@ -15833,26 +16066,26 @@ class MakeResourceImageCommand {
     for (const controller of controllers) {
       await makeControllerCommand.run({ ...controller, module, isSocket: false });
     }
-    const controllersDir = join35(process.cwd(), base, "src", "controllers");
-    await Bun.write(join35(controllersDir, "CreateImageController.ts"), CreateImageController_default);
-    await Bun.write(join35(controllersDir, "GetImageController.ts"), GetImageController_default);
-    await Bun.write(join35(controllersDir, "ListImagesController.ts"), ListImagesController_default);
-    await Bun.write(join35(controllersDir, "UpdateImageController.ts"), UpdateImageController_default);
-    await Bun.write(join35(controllersDir, "DeleteImageController.ts"), DeleteImageController_default);
+    const controllersDir = join36(process.cwd(), base, "src", "controllers");
+    await Bun.write(join36(controllersDir, "CreateImageController.ts"), CreateImageController_default);
+    await Bun.write(join36(controllersDir, "GetImageController.ts"), GetImageController_default);
+    await Bun.write(join36(controllersDir, "ListImagesController.ts"), ListImagesController_default);
+    await Bun.write(join36(controllersDir, "UpdateImageController.ts"), UpdateImageController_default);
+    await Bun.write(join36(controllersDir, "DeleteImageController.ts"), DeleteImageController_default);
     const makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateImage", "GetImage", "ListImages", "UpdateImage", "DeleteImage"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join35(process.cwd(), base, "src", "services");
-    await Bun.write(join35(servicesDir, "CreateImageService.ts"), CreateImageService_default);
-    await Bun.write(join35(servicesDir, "GetImageService.ts"), GetImageService_default);
-    await Bun.write(join35(servicesDir, "ListImagesService.ts"), ListImagesService_default);
-    await Bun.write(join35(servicesDir, "UpdateImageService.ts"), UpdateImageService_default);
-    await Bun.write(join35(servicesDir, "DeleteImageService.ts"), DeleteImageService_default);
-    const entityPath = join35(process.cwd(), base, "src", "entities", "ImageEntity.ts");
+    const servicesDir = join36(process.cwd(), base, "src", "services");
+    await Bun.write(join36(servicesDir, "CreateImageService.ts"), CreateImageService_default);
+    await Bun.write(join36(servicesDir, "GetImageService.ts"), GetImageService_default);
+    await Bun.write(join36(servicesDir, "ListImagesService.ts"), ListImagesService_default);
+    await Bun.write(join36(servicesDir, "UpdateImageService.ts"), UpdateImageService_default);
+    await Bun.write(join36(servicesDir, "DeleteImageService.ts"), DeleteImageService_default);
+    const entityPath = join36(process.cwd(), base, "src", "entities", "ImageEntity.ts");
     await Bun.write(entityPath, ImageEntity_default);
-    const migrationsDir = join35(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join36(process.cwd(), base, "src", "migrations");
     const glob = new Glob7("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -15860,18 +16093,18 @@ class MakeResourceImageCommand {
       const name = file.replace(/\.ts$/, "");
       const version = name.replace("Migration", "");
       const content = ImageMigration_default.replaceAll("{{ name }}", name).replaceAll("{{ version }}", version);
-      await Bun.write(join35(migrationsDir, file), content);
+      await Bun.write(join36(migrationsDir, file), content);
     }
-    const repositoryPath = join35(process.cwd(), base, "src", "repositories", "ImageRepository.ts");
+    const repositoryPath = join36(process.cwd(), base, "src", "repositories", "ImageRepository.ts");
     await Bun.write(repositoryPath, ImageRepository_default);
   }
 }
 MakeResourceImageCommand = __legacyDecorateClassTS([
-  decorator35.command()
+  decorator36.command()
 ], MakeResourceImageCommand);
 // src/commands/MakeResourceNoteCommand.ts
-import { join as join36 } from "path";
-import { decorator as decorator36 } from "@ooneex/command";
+import { join as join37 } from "path";
+import { decorator as decorator37 } from "@ooneex/command";
 var {Glob: Glob8 } = globalThis.Bun;
 
 // src/templates/resources/note/controllers/CreateNoteController.txt
@@ -16576,7 +16809,7 @@ class MakeResourceNoteCommand {
   }
   async run() {
     const module = "note";
-    const base = join36("modules", module);
+    const base = join37("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
     await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
@@ -16611,26 +16844,26 @@ class MakeResourceNoteCommand {
     for (const controller of controllers) {
       await makeControllerCommand.run({ ...controller, module, isSocket: false });
     }
-    const controllersDir = join36(process.cwd(), base, "src", "controllers");
-    await Bun.write(join36(controllersDir, "CreateNoteController.ts"), CreateNoteController_default);
-    await Bun.write(join36(controllersDir, "GetNoteController.ts"), GetNoteController_default);
-    await Bun.write(join36(controllersDir, "ListNotesController.ts"), ListNotesController_default);
-    await Bun.write(join36(controllersDir, "UpdateNoteController.ts"), UpdateNoteController_default);
-    await Bun.write(join36(controllersDir, "DeleteNoteController.ts"), DeleteNoteController_default);
+    const controllersDir = join37(process.cwd(), base, "src", "controllers");
+    await Bun.write(join37(controllersDir, "CreateNoteController.ts"), CreateNoteController_default);
+    await Bun.write(join37(controllersDir, "GetNoteController.ts"), GetNoteController_default);
+    await Bun.write(join37(controllersDir, "ListNotesController.ts"), ListNotesController_default);
+    await Bun.write(join37(controllersDir, "UpdateNoteController.ts"), UpdateNoteController_default);
+    await Bun.write(join37(controllersDir, "DeleteNoteController.ts"), DeleteNoteController_default);
     const makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateNote", "GetNote", "ListNotes", "UpdateNote", "DeleteNote"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join36(process.cwd(), base, "src", "services");
-    await Bun.write(join36(servicesDir, "CreateNoteService.ts"), CreateNoteService_default);
-    await Bun.write(join36(servicesDir, "GetNoteService.ts"), GetNoteService_default);
-    await Bun.write(join36(servicesDir, "ListNotesService.ts"), ListNotesService_default);
-    await Bun.write(join36(servicesDir, "UpdateNoteService.ts"), UpdateNoteService_default);
-    await Bun.write(join36(servicesDir, "DeleteNoteService.ts"), DeleteNoteService_default);
-    const entityPath = join36(process.cwd(), base, "src", "entities", "NoteEntity.ts");
+    const servicesDir = join37(process.cwd(), base, "src", "services");
+    await Bun.write(join37(servicesDir, "CreateNoteService.ts"), CreateNoteService_default);
+    await Bun.write(join37(servicesDir, "GetNoteService.ts"), GetNoteService_default);
+    await Bun.write(join37(servicesDir, "ListNotesService.ts"), ListNotesService_default);
+    await Bun.write(join37(servicesDir, "UpdateNoteService.ts"), UpdateNoteService_default);
+    await Bun.write(join37(servicesDir, "DeleteNoteService.ts"), DeleteNoteService_default);
+    const entityPath = join37(process.cwd(), base, "src", "entities", "NoteEntity.ts");
     await Bun.write(entityPath, NoteEntity_default);
-    const migrationsDir = join36(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join37(process.cwd(), base, "src", "migrations");
     const glob = new Glob8("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -16638,18 +16871,18 @@ class MakeResourceNoteCommand {
       const name = file.replace(/\.ts$/, "");
       const version = name.replace("Migration", "");
       const content = NoteMigration_default.replaceAll("{{ name }}", name).replaceAll("{{ version }}", version);
-      await Bun.write(join36(migrationsDir, file), content);
+      await Bun.write(join37(migrationsDir, file), content);
     }
-    const repositoryPath = join36(process.cwd(), base, "src", "repositories", "NoteRepository.ts");
+    const repositoryPath = join37(process.cwd(), base, "src", "repositories", "NoteRepository.ts");
     await Bun.write(repositoryPath, NoteRepository_default);
   }
 }
 MakeResourceNoteCommand = __legacyDecorateClassTS([
-  decorator36.command()
+  decorator37.command()
 ], MakeResourceNoteCommand);
 // src/commands/MakeResourceStatusCommand.ts
-import { join as join37 } from "path";
-import { decorator as decorator37 } from "@ooneex/command";
+import { join as join38 } from "path";
+import { decorator as decorator38 } from "@ooneex/command";
 var {Glob: Glob9 } = globalThis.Bun;
 
 // src/templates/resources/status/controllers/CreateStatusController.txt
@@ -17510,7 +17743,7 @@ class MakeResourceStatusCommand {
   }
   async run() {
     const module = "status";
-    const base = join37("modules", module);
+    const base = join38("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
     await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
@@ -17545,26 +17778,26 @@ class MakeResourceStatusCommand {
     for (const controller of controllers) {
       await makeControllerCommand.run({ ...controller, module, isSocket: false });
     }
-    const controllersDir = join37(process.cwd(), base, "src", "controllers");
-    await Bun.write(join37(controllersDir, "CreateStatusController.ts"), CreateStatusController_default);
-    await Bun.write(join37(controllersDir, "GetStatusController.ts"), GetStatusController_default);
-    await Bun.write(join37(controllersDir, "ListStatusesController.ts"), ListStatusesController_default);
-    await Bun.write(join37(controllersDir, "UpdateStatusController.ts"), UpdateStatusController_default);
-    await Bun.write(join37(controllersDir, "DeleteStatusController.ts"), DeleteStatusController_default);
+    const controllersDir = join38(process.cwd(), base, "src", "controllers");
+    await Bun.write(join38(controllersDir, "CreateStatusController.ts"), CreateStatusController_default);
+    await Bun.write(join38(controllersDir, "GetStatusController.ts"), GetStatusController_default);
+    await Bun.write(join38(controllersDir, "ListStatusesController.ts"), ListStatusesController_default);
+    await Bun.write(join38(controllersDir, "UpdateStatusController.ts"), UpdateStatusController_default);
+    await Bun.write(join38(controllersDir, "DeleteStatusController.ts"), DeleteStatusController_default);
     const makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateStatus", "GetStatus", "ListStatuses", "UpdateStatus", "DeleteStatus"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join37(process.cwd(), base, "src", "services");
-    await Bun.write(join37(servicesDir, "CreateStatusService.ts"), CreateStatusService_default);
-    await Bun.write(join37(servicesDir, "GetStatusService.ts"), GetStatusService_default);
-    await Bun.write(join37(servicesDir, "ListStatusesService.ts"), ListStatusesService_default);
-    await Bun.write(join37(servicesDir, "UpdateStatusService.ts"), UpdateStatusService_default);
-    await Bun.write(join37(servicesDir, "DeleteStatusService.ts"), DeleteStatusService_default);
-    const entityPath = join37(process.cwd(), base, "src", "entities", "StatusEntity.ts");
+    const servicesDir = join38(process.cwd(), base, "src", "services");
+    await Bun.write(join38(servicesDir, "CreateStatusService.ts"), CreateStatusService_default);
+    await Bun.write(join38(servicesDir, "GetStatusService.ts"), GetStatusService_default);
+    await Bun.write(join38(servicesDir, "ListStatusesService.ts"), ListStatusesService_default);
+    await Bun.write(join38(servicesDir, "UpdateStatusService.ts"), UpdateStatusService_default);
+    await Bun.write(join38(servicesDir, "DeleteStatusService.ts"), DeleteStatusService_default);
+    const entityPath = join38(process.cwd(), base, "src", "entities", "StatusEntity.ts");
     await Bun.write(entityPath, StatusEntity_default);
-    const migrationsDir = join37(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join38(process.cwd(), base, "src", "migrations");
     const glob = new Glob9("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -17572,23 +17805,23 @@ class MakeResourceStatusCommand {
       const name = file.replace(/\.ts$/, "");
       const version = name.replace("Migration", "");
       const content = StatusMigration_default.replaceAll("{{ name }}", name).replaceAll("{{ version }}", version);
-      await Bun.write(join37(migrationsDir, file), content);
+      await Bun.write(join38(migrationsDir, file), content);
     }
-    const repositoryPath = join37(process.cwd(), base, "src", "repositories", "StatusRepository.ts");
+    const repositoryPath = join38(process.cwd(), base, "src", "repositories", "StatusRepository.ts");
     await Bun.write(repositoryPath, StatusRepository_default);
     const makeSeedCommand = new MakeSeedCommand;
     await makeSeedCommand.run({ name: "Status", module });
-    const seedsDir = join37(process.cwd(), base, "src", "seeds");
-    await Bun.write(join37(seedsDir, "StatusSeed.ts"), StatusSeed_default);
-    await Bun.write(join37(seedsDir, "status-seed.yml"), status_seed_default);
+    const seedsDir = join38(process.cwd(), base, "src", "seeds");
+    await Bun.write(join38(seedsDir, "StatusSeed.ts"), StatusSeed_default);
+    await Bun.write(join38(seedsDir, "status-seed.yml"), status_seed_default);
   }
 }
 MakeResourceStatusCommand = __legacyDecorateClassTS([
-  decorator37.command()
+  decorator38.command()
 ], MakeResourceStatusCommand);
 // src/commands/MakeResourceTagCommand.ts
-import { join as join38 } from "path";
-import { decorator as decorator38 } from "@ooneex/command";
+import { join as join39 } from "path";
+import { decorator as decorator39 } from "@ooneex/command";
 var {Glob: Glob10 } = globalThis.Bun;
 
 // src/templates/resources/tag/controllers/CreateTagController.txt
@@ -18179,7 +18412,7 @@ class MakeResourceTagCommand {
   }
   async run() {
     const module = "tag";
-    const base = join38("modules", module);
+    const base = join39("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
     await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
@@ -18214,26 +18447,26 @@ class MakeResourceTagCommand {
     for (const controller of controllers) {
       await makeControllerCommand.run({ ...controller, module, isSocket: false });
     }
-    const controllersDir = join38(process.cwd(), base, "src", "controllers");
-    await Bun.write(join38(controllersDir, "CreateTagController.ts"), CreateTagController_default);
-    await Bun.write(join38(controllersDir, "GetTagController.ts"), GetTagController_default);
-    await Bun.write(join38(controllersDir, "ListTagsController.ts"), ListTagsController_default);
-    await Bun.write(join38(controllersDir, "UpdateTagController.ts"), UpdateTagController_default);
-    await Bun.write(join38(controllersDir, "DeleteTagController.ts"), DeleteTagController_default);
+    const controllersDir = join39(process.cwd(), base, "src", "controllers");
+    await Bun.write(join39(controllersDir, "CreateTagController.ts"), CreateTagController_default);
+    await Bun.write(join39(controllersDir, "GetTagController.ts"), GetTagController_default);
+    await Bun.write(join39(controllersDir, "ListTagsController.ts"), ListTagsController_default);
+    await Bun.write(join39(controllersDir, "UpdateTagController.ts"), UpdateTagController_default);
+    await Bun.write(join39(controllersDir, "DeleteTagController.ts"), DeleteTagController_default);
     const makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateTag", "GetTag", "ListTags", "UpdateTag", "DeleteTag"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join38(process.cwd(), base, "src", "services");
-    await Bun.write(join38(servicesDir, "CreateTagService.ts"), CreateTagService_default);
-    await Bun.write(join38(servicesDir, "GetTagService.ts"), GetTagService_default);
-    await Bun.write(join38(servicesDir, "ListTagsService.ts"), ListTagsService_default);
-    await Bun.write(join38(servicesDir, "UpdateTagService.ts"), UpdateTagService_default);
-    await Bun.write(join38(servicesDir, "DeleteTagService.ts"), DeleteTagService_default);
-    const entityPath = join38(process.cwd(), base, "src", "entities", "TagEntity.ts");
+    const servicesDir = join39(process.cwd(), base, "src", "services");
+    await Bun.write(join39(servicesDir, "CreateTagService.ts"), CreateTagService_default);
+    await Bun.write(join39(servicesDir, "GetTagService.ts"), GetTagService_default);
+    await Bun.write(join39(servicesDir, "ListTagsService.ts"), ListTagsService_default);
+    await Bun.write(join39(servicesDir, "UpdateTagService.ts"), UpdateTagService_default);
+    await Bun.write(join39(servicesDir, "DeleteTagService.ts"), DeleteTagService_default);
+    const entityPath = join39(process.cwd(), base, "src", "entities", "TagEntity.ts");
     await Bun.write(entityPath, TagEntity_default);
-    const migrationsDir = join38(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join39(process.cwd(), base, "src", "migrations");
     const glob = new Glob10("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -18241,18 +18474,18 @@ class MakeResourceTagCommand {
       const name = file.replace(/\.ts$/, "");
       const version = name.replace("Migration", "");
       const content = TagMigration_default.replaceAll("{{ name }}", name).replaceAll("{{ version }}", version);
-      await Bun.write(join38(migrationsDir, file), content);
+      await Bun.write(join39(migrationsDir, file), content);
     }
-    const repositoryPath = join38(process.cwd(), base, "src", "repositories", "TagRepository.ts");
+    const repositoryPath = join39(process.cwd(), base, "src", "repositories", "TagRepository.ts");
     await Bun.write(repositoryPath, TagRepository_default);
   }
 }
 MakeResourceTagCommand = __legacyDecorateClassTS([
-  decorator38.command()
+  decorator39.command()
 ], MakeResourceTagCommand);
 // src/commands/MakeResourceTaskCommand.ts
-import { join as join39 } from "path";
-import { decorator as decorator39 } from "@ooneex/command";
+import { join as join40 } from "path";
+import { decorator as decorator40 } from "@ooneex/command";
 var {Glob: Glob11 } = globalThis.Bun;
 
 // src/templates/resources/task/controllers/CreateTaskController.txt
@@ -18925,7 +19158,7 @@ class MakeResourceTaskCommand {
   }
   async run() {
     const module = "task";
-    const base = join39("modules", module);
+    const base = join40("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
     await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
@@ -18960,26 +19193,26 @@ class MakeResourceTaskCommand {
     for (const controller of controllers) {
       await makeControllerCommand.run({ ...controller, module, isSocket: false });
     }
-    const controllersDir = join39(process.cwd(), base, "src", "controllers");
-    await Bun.write(join39(controllersDir, "CreateTaskController.ts"), CreateTaskController_default);
-    await Bun.write(join39(controllersDir, "GetTaskController.ts"), GetTaskController_default);
-    await Bun.write(join39(controllersDir, "ListTasksController.ts"), ListTasksController_default);
-    await Bun.write(join39(controllersDir, "UpdateTaskController.ts"), UpdateTaskController_default);
-    await Bun.write(join39(controllersDir, "DeleteTaskController.ts"), DeleteTaskController_default);
+    const controllersDir = join40(process.cwd(), base, "src", "controllers");
+    await Bun.write(join40(controllersDir, "CreateTaskController.ts"), CreateTaskController_default);
+    await Bun.write(join40(controllersDir, "GetTaskController.ts"), GetTaskController_default);
+    await Bun.write(join40(controllersDir, "ListTasksController.ts"), ListTasksController_default);
+    await Bun.write(join40(controllersDir, "UpdateTaskController.ts"), UpdateTaskController_default);
+    await Bun.write(join40(controllersDir, "DeleteTaskController.ts"), DeleteTaskController_default);
     const makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateTask", "GetTask", "ListTasks", "UpdateTask", "DeleteTask"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join39(process.cwd(), base, "src", "services");
-    await Bun.write(join39(servicesDir, "CreateTaskService.ts"), CreateTaskService_default);
-    await Bun.write(join39(servicesDir, "GetTaskService.ts"), GetTaskService_default);
-    await Bun.write(join39(servicesDir, "ListTasksService.ts"), ListTasksService_default);
-    await Bun.write(join39(servicesDir, "UpdateTaskService.ts"), UpdateTaskService_default);
-    await Bun.write(join39(servicesDir, "DeleteTaskService.ts"), DeleteTaskService_default);
-    const entityPath = join39(process.cwd(), base, "src", "entities", "TaskEntity.ts");
+    const servicesDir = join40(process.cwd(), base, "src", "services");
+    await Bun.write(join40(servicesDir, "CreateTaskService.ts"), CreateTaskService_default);
+    await Bun.write(join40(servicesDir, "GetTaskService.ts"), GetTaskService_default);
+    await Bun.write(join40(servicesDir, "ListTasksService.ts"), ListTasksService_default);
+    await Bun.write(join40(servicesDir, "UpdateTaskService.ts"), UpdateTaskService_default);
+    await Bun.write(join40(servicesDir, "DeleteTaskService.ts"), DeleteTaskService_default);
+    const entityPath = join40(process.cwd(), base, "src", "entities", "TaskEntity.ts");
     await Bun.write(entityPath, TaskEntity_default);
-    const migrationsDir = join39(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join40(process.cwd(), base, "src", "migrations");
     const glob = new Glob11("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -18987,18 +19220,18 @@ class MakeResourceTaskCommand {
       const name = file.replace(/\.ts$/, "");
       const version = name.replace("Migration", "");
       const content = TaskMigration_default.replaceAll("{{ name }}", name).replaceAll("{{ version }}", version);
-      await Bun.write(join39(migrationsDir, file), content);
+      await Bun.write(join40(migrationsDir, file), content);
     }
-    const repositoryPath = join39(process.cwd(), base, "src", "repositories", "TaskRepository.ts");
+    const repositoryPath = join40(process.cwd(), base, "src", "repositories", "TaskRepository.ts");
     await Bun.write(repositoryPath, TaskRepository_default);
   }
 }
 MakeResourceTaskCommand = __legacyDecorateClassTS([
-  decorator39.command()
+  decorator40.command()
 ], MakeResourceTaskCommand);
 // src/commands/MakeResourceTopicCommand.ts
-import { join as join40 } from "path";
-import { decorator as decorator40 } from "@ooneex/command";
+import { join as join41 } from "path";
+import { decorator as decorator41 } from "@ooneex/command";
 var {Glob: Glob12 } = globalThis.Bun;
 
 // src/templates/resources/topic/controllers/CreateTopicController.txt
@@ -19589,7 +19822,7 @@ class MakeResourceTopicCommand {
   }
   async run() {
     const module = "topic";
-    const base = join40("modules", module);
+    const base = join41("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
     await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
@@ -19624,26 +19857,26 @@ class MakeResourceTopicCommand {
     for (const controller of controllers) {
       await makeControllerCommand.run({ ...controller, module, isSocket: false });
     }
-    const controllersDir = join40(process.cwd(), base, "src", "controllers");
-    await Bun.write(join40(controllersDir, "CreateTopicController.ts"), CreateTopicController_default);
-    await Bun.write(join40(controllersDir, "GetTopicController.ts"), GetTopicController_default);
-    await Bun.write(join40(controllersDir, "ListTopicsController.ts"), ListTopicsController_default);
-    await Bun.write(join40(controllersDir, "UpdateTopicController.ts"), UpdateTopicController_default);
-    await Bun.write(join40(controllersDir, "DeleteTopicController.ts"), DeleteTopicController_default);
+    const controllersDir = join41(process.cwd(), base, "src", "controllers");
+    await Bun.write(join41(controllersDir, "CreateTopicController.ts"), CreateTopicController_default);
+    await Bun.write(join41(controllersDir, "GetTopicController.ts"), GetTopicController_default);
+    await Bun.write(join41(controllersDir, "ListTopicsController.ts"), ListTopicsController_default);
+    await Bun.write(join41(controllersDir, "UpdateTopicController.ts"), UpdateTopicController_default);
+    await Bun.write(join41(controllersDir, "DeleteTopicController.ts"), DeleteTopicController_default);
     const makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateTopic", "GetTopic", "ListTopics", "UpdateTopic", "DeleteTopic"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join40(process.cwd(), base, "src", "services");
-    await Bun.write(join40(servicesDir, "CreateTopicService.ts"), CreateTopicService_default);
-    await Bun.write(join40(servicesDir, "GetTopicService.ts"), GetTopicService_default);
-    await Bun.write(join40(servicesDir, "ListTopicsService.ts"), ListTopicsService_default);
-    await Bun.write(join40(servicesDir, "UpdateTopicService.ts"), UpdateTopicService_default);
-    await Bun.write(join40(servicesDir, "DeleteTopicService.ts"), DeleteTopicService_default);
-    const entityPath = join40(process.cwd(), base, "src", "entities", "TopicEntity.ts");
+    const servicesDir = join41(process.cwd(), base, "src", "services");
+    await Bun.write(join41(servicesDir, "CreateTopicService.ts"), CreateTopicService_default);
+    await Bun.write(join41(servicesDir, "GetTopicService.ts"), GetTopicService_default);
+    await Bun.write(join41(servicesDir, "ListTopicsService.ts"), ListTopicsService_default);
+    await Bun.write(join41(servicesDir, "UpdateTopicService.ts"), UpdateTopicService_default);
+    await Bun.write(join41(servicesDir, "DeleteTopicService.ts"), DeleteTopicService_default);
+    const entityPath = join41(process.cwd(), base, "src", "entities", "TopicEntity.ts");
     await Bun.write(entityPath, TopicEntity_default);
-    const migrationsDir = join40(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join41(process.cwd(), base, "src", "migrations");
     const glob = new Glob12("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -19651,18 +19884,18 @@ class MakeResourceTopicCommand {
       const name = file.replace(/\.ts$/, "");
       const version = name.replace("Migration", "");
       const content = TopicMigration_default.replaceAll("{{ name }}", name).replaceAll("{{ version }}", version);
-      await Bun.write(join40(migrationsDir, file), content);
+      await Bun.write(join41(migrationsDir, file), content);
     }
-    const repositoryPath = join40(process.cwd(), base, "src", "repositories", "TopicRepository.ts");
+    const repositoryPath = join41(process.cwd(), base, "src", "repositories", "TopicRepository.ts");
     await Bun.write(repositoryPath, TopicRepository_default);
   }
 }
 MakeResourceTopicCommand = __legacyDecorateClassTS([
-  decorator40.command()
+  decorator41.command()
 ], MakeResourceTopicCommand);
 // src/commands/MakeResourceUserCommand.ts
-import { join as join41 } from "path";
-import { decorator as decorator41 } from "@ooneex/command";
+import { join as join42 } from "path";
+import { decorator as decorator42 } from "@ooneex/command";
 var {Glob: Glob13 } = globalThis.Bun;
 
 // src/templates/resources/user/controllers/BanUserController.txt
@@ -20483,7 +20716,7 @@ class MakeResourceUserCommand {
   }
   async run() {
     const module = "user";
-    const base = join41("modules", module);
+    const base = join42("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
     await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
@@ -20534,14 +20767,14 @@ class MakeResourceUserCommand {
     for (const controller of controllers) {
       await makeControllerCommand.run({ ...controller, module, isSocket: false });
     }
-    const controllersDir = join41(process.cwd(), base, "src", "controllers");
-    await Bun.write(join41(controllersDir, "BanUserController.ts"), BanUserController_default);
-    await Bun.write(join41(controllersDir, "LockUserController.ts"), LockUserController_default);
-    await Bun.write(join41(controllersDir, "SignOutController.ts"), SignOutController_default);
-    await Bun.write(join41(controllersDir, "UpdateUserProfileController.ts"), UpdateUserProfileController_default);
-    await Bun.write(join41(controllersDir, "UpdateUserProfileImageController.ts"), UpdateUserProfileImageController_default);
-    await Bun.write(join41(controllersDir, "DeleteUserProfileImageController.ts"), DeleteUserProfileImageController_default);
-    await Bun.write(join41(controllersDir, "UpdateUserRolesController.ts"), UpdateUserRolesController_default);
+    const controllersDir = join42(process.cwd(), base, "src", "controllers");
+    await Bun.write(join42(controllersDir, "BanUserController.ts"), BanUserController_default);
+    await Bun.write(join42(controllersDir, "LockUserController.ts"), LockUserController_default);
+    await Bun.write(join42(controllersDir, "SignOutController.ts"), SignOutController_default);
+    await Bun.write(join42(controllersDir, "UpdateUserProfileController.ts"), UpdateUserProfileController_default);
+    await Bun.write(join42(controllersDir, "UpdateUserProfileImageController.ts"), UpdateUserProfileImageController_default);
+    await Bun.write(join42(controllersDir, "DeleteUserProfileImageController.ts"), DeleteUserProfileImageController_default);
+    await Bun.write(join42(controllersDir, "UpdateUserRolesController.ts"), UpdateUserRolesController_default);
     const makeServiceCommand = new MakeServiceCommand;
     const services = [
       "BanUser",
@@ -20555,17 +20788,17 @@ class MakeResourceUserCommand {
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join41(process.cwd(), base, "src", "services");
-    await Bun.write(join41(servicesDir, "BanUserService.ts"), BanUserService_default);
-    await Bun.write(join41(servicesDir, "LockUserService.ts"), LockUserService_default);
-    await Bun.write(join41(servicesDir, "SignOutService.ts"), SignOutService_default);
-    await Bun.write(join41(servicesDir, "UpdateUserProfileService.ts"), UpdateUserProfileService_default);
-    await Bun.write(join41(servicesDir, "UpdateUserProfileImageService.ts"), UpdateUserProfileImageService_default);
-    await Bun.write(join41(servicesDir, "DeleteUserProfileImageService.ts"), DeleteUserProfileImageService_default);
-    await Bun.write(join41(servicesDir, "UpdateUserRolesService.ts"), UpdateUserRolesService_default);
-    const entityPath = join41(process.cwd(), base, "src", "entities", "UserEntity.ts");
+    const servicesDir = join42(process.cwd(), base, "src", "services");
+    await Bun.write(join42(servicesDir, "BanUserService.ts"), BanUserService_default);
+    await Bun.write(join42(servicesDir, "LockUserService.ts"), LockUserService_default);
+    await Bun.write(join42(servicesDir, "SignOutService.ts"), SignOutService_default);
+    await Bun.write(join42(servicesDir, "UpdateUserProfileService.ts"), UpdateUserProfileService_default);
+    await Bun.write(join42(servicesDir, "UpdateUserProfileImageService.ts"), UpdateUserProfileImageService_default);
+    await Bun.write(join42(servicesDir, "DeleteUserProfileImageService.ts"), DeleteUserProfileImageService_default);
+    await Bun.write(join42(servicesDir, "UpdateUserRolesService.ts"), UpdateUserRolesService_default);
+    const entityPath = join42(process.cwd(), base, "src", "entities", "UserEntity.ts");
     await Bun.write(entityPath, UserEntity_default);
-    const migrationsDir = join41(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join42(process.cwd(), base, "src", "migrations");
     const glob = new Glob13("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -20573,18 +20806,18 @@ class MakeResourceUserCommand {
       const name = file.replace(/\.ts$/, "");
       const version = name.replace("Migration", "");
       const content = UserMigration_default.replaceAll("{{ name }}", name).replaceAll("{{ version }}", version);
-      await Bun.write(join41(migrationsDir, file), content);
+      await Bun.write(join42(migrationsDir, file), content);
     }
-    const repositoryPath = join41(process.cwd(), base, "src", "repositories", "UserRepository.ts");
+    const repositoryPath = join42(process.cwd(), base, "src", "repositories", "UserRepository.ts");
     await Bun.write(repositoryPath, UserRepository_default);
   }
 }
 MakeResourceUserCommand = __legacyDecorateClassTS([
-  decorator41.command()
+  decorator42.command()
 ], MakeResourceUserCommand);
 // src/commands/MakeResourceVideoCommand.ts
-import { join as join42 } from "path";
-import { decorator as decorator42 } from "@ooneex/command";
+import { join as join43 } from "path";
+import { decorator as decorator43 } from "@ooneex/command";
 var {Glob: Glob14 } = globalThis.Bun;
 
 // src/templates/resources/video/controllers/CreateVideoController.txt
@@ -21263,7 +21496,7 @@ class MakeResourceVideoCommand {
   }
   async run() {
     const module = "video";
-    const base = join42("modules", module);
+    const base = join43("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
     await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
@@ -21298,26 +21531,26 @@ class MakeResourceVideoCommand {
     for (const controller of controllers) {
       await makeControllerCommand.run({ ...controller, module, isSocket: false });
     }
-    const controllersDir = join42(process.cwd(), base, "src", "controllers");
-    await Bun.write(join42(controllersDir, "CreateVideoController.ts"), CreateVideoController_default);
-    await Bun.write(join42(controllersDir, "GetVideoController.ts"), GetVideoController_default);
-    await Bun.write(join42(controllersDir, "ListVideosController.ts"), ListVideosController_default);
-    await Bun.write(join42(controllersDir, "UpdateVideoController.ts"), UpdateVideoController_default);
-    await Bun.write(join42(controllersDir, "DeleteVideoController.ts"), DeleteVideoController_default);
+    const controllersDir = join43(process.cwd(), base, "src", "controllers");
+    await Bun.write(join43(controllersDir, "CreateVideoController.ts"), CreateVideoController_default);
+    await Bun.write(join43(controllersDir, "GetVideoController.ts"), GetVideoController_default);
+    await Bun.write(join43(controllersDir, "ListVideosController.ts"), ListVideosController_default);
+    await Bun.write(join43(controllersDir, "UpdateVideoController.ts"), UpdateVideoController_default);
+    await Bun.write(join43(controllersDir, "DeleteVideoController.ts"), DeleteVideoController_default);
     const makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateVideo", "GetVideo", "ListVideos", "UpdateVideo", "DeleteVideo"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join42(process.cwd(), base, "src", "services");
-    await Bun.write(join42(servicesDir, "CreateVideoService.ts"), CreateVideoService_default);
-    await Bun.write(join42(servicesDir, "GetVideoService.ts"), GetVideoService_default);
-    await Bun.write(join42(servicesDir, "ListVideosService.ts"), ListVideosService_default);
-    await Bun.write(join42(servicesDir, "UpdateVideoService.ts"), UpdateVideoService_default);
-    await Bun.write(join42(servicesDir, "DeleteVideoService.ts"), DeleteVideoService_default);
-    const entityPath = join42(process.cwd(), base, "src", "entities", "VideoEntity.ts");
+    const servicesDir = join43(process.cwd(), base, "src", "services");
+    await Bun.write(join43(servicesDir, "CreateVideoService.ts"), CreateVideoService_default);
+    await Bun.write(join43(servicesDir, "GetVideoService.ts"), GetVideoService_default);
+    await Bun.write(join43(servicesDir, "ListVideosService.ts"), ListVideosService_default);
+    await Bun.write(join43(servicesDir, "UpdateVideoService.ts"), UpdateVideoService_default);
+    await Bun.write(join43(servicesDir, "DeleteVideoService.ts"), DeleteVideoService_default);
+    const entityPath = join43(process.cwd(), base, "src", "entities", "VideoEntity.ts");
     await Bun.write(entityPath, VideoEntity_default);
-    const migrationsDir = join42(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join43(process.cwd(), base, "src", "migrations");
     const glob = new Glob14("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -21325,24 +21558,24 @@ class MakeResourceVideoCommand {
       const name = file.replace(/\.ts$/, "");
       const version = name.replace("Migration", "");
       const content = VideoMigration_default.replaceAll("{{ name }}", name).replaceAll("{{ version }}", version);
-      await Bun.write(join42(migrationsDir, file), content);
+      await Bun.write(join43(migrationsDir, file), content);
     }
-    const repositoryPath = join42(process.cwd(), base, "src", "repositories", "VideoRepository.ts");
+    const repositoryPath = join43(process.cwd(), base, "src", "repositories", "VideoRepository.ts");
     await Bun.write(repositoryPath, VideoRepository_default);
   }
 }
 MakeResourceVideoCommand = __legacyDecorateClassTS([
-  decorator42.command()
+  decorator43.command()
 ], MakeResourceVideoCommand);
 // src/commands/MakeStorageCommand.ts
-import { join as join43 } from "path";
-import { decorator as decorator43 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger28 } from "@ooneex/logger";
+import { join as join44 } from "path";
+import { decorator as decorator44 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger29 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase16, toSnakeCase as toSnakeCase3 } from "@ooneex/utils";
 
 // src/templates/storage.test.txt
 var storage_test_default = `import { describe, expect, test } from "bun:test";
-import { {{NAME}}StorageAdapter } from "@/storage/{{NAME}}StorageAdapter";
+import { {{NAME}}StorageAdapter } from "@module/{{MODULE}}/storage/{{NAME}}StorageAdapter";
 
 describe("{{NAME}}StorageAdapter", () => {
   test("should have class name ending with 'StorageAdapter'", () => {
@@ -21437,28 +21670,28 @@ class MakeStorageCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join43("modules", module) : ".";
-    const storageLocalDir = join43(base, "src", "storage");
-    const storageDir = join43(process.cwd(), storageLocalDir);
-    const filePath = join43(storageDir, `${name}Storage.ts`);
+    const base = module ? join44("modules", module) : ".";
+    const storageLocalDir = join44(base, "src", "storage");
+    const storageDir = join44(process.cwd(), storageLocalDir);
+    const filePath = join44(storageDir, `${name}Storage.ts`);
     await Bun.write(filePath, content);
-    const testContent = storage_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join43(base, "tests", "storage");
-    const testsDir = join43(process.cwd(), testsLocalDir);
-    const testFilePath = join43(testsDir, `${name}Storage.spec.ts`);
+    const testContent = storage_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join44(base, "tests", "storage");
+    const testsDir = join44(process.cwd(), testsLocalDir);
+    const testFilePath = join44(testsDir, `${name}Storage.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger28;
-    logger.success(`${join43(storageLocalDir, name)}Storage.ts created successfully`, undefined, {
+    const logger = new TerminalLogger29;
+    logger.success(`${join44(storageLocalDir, name)}Storage.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join43(testsLocalDir, name)}Storage.spec.ts created successfully`, undefined, {
+    logger.success(`${join44(testsLocalDir, name)}Storage.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join43(process.cwd(), "package.json");
+    const packageJsonPath = join44(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -21473,17 +21706,17 @@ class MakeStorageCommand {
   }
 }
 MakeStorageCommand = __legacyDecorateClassTS([
-  decorator43.command()
+  decorator44.command()
 ], MakeStorageCommand);
 // src/commands/MakeVectorDatabaseCommand.ts
-import { join as join44 } from "path";
-import { decorator as decorator44 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger29 } from "@ooneex/logger";
+import { join as join45 } from "path";
+import { decorator as decorator45 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger30 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase17 } from "@ooneex/utils";
 
 // src/templates/vector-database.test.txt
 var vector_database_test_default = `import { describe, expect, test } from "bun:test";
-import { {{NAME}}VectorDatabase } from "@/databases/{{NAME}}VectorDatabase";
+import { {{NAME}}VectorDatabase } from "@module/{{MODULE}}/databases/{{NAME}}VectorDatabase";
 
 describe("{{NAME}}VectorDatabase", () => {
   test("should have class name ending with 'VectorDatabase'", () => {
@@ -21552,28 +21785,28 @@ class MakeVectorDatabaseCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join44("modules", module) : ".";
-    const vectorDatabaseLocalDir = join44(base, "src", "databases");
-    const vectorDatabaseDir = join44(process.cwd(), vectorDatabaseLocalDir);
-    const filePath = join44(vectorDatabaseDir, `${name}VectorDatabase.ts`);
+    const base = module ? join45("modules", module) : ".";
+    const vectorDatabaseLocalDir = join45(base, "src", "databases");
+    const vectorDatabaseDir = join45(process.cwd(), vectorDatabaseLocalDir);
+    const filePath = join45(vectorDatabaseDir, `${name}VectorDatabase.ts`);
     await Bun.write(filePath, content);
-    const testContent = vector_database_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join44(base, "tests", "databases");
-    const testsDir = join44(process.cwd(), testsLocalDir);
-    const testFilePath = join44(testsDir, `${name}VectorDatabase.spec.ts`);
+    const testContent = vector_database_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join45(base, "tests", "databases");
+    const testsDir = join45(process.cwd(), testsLocalDir);
+    const testFilePath = join45(testsDir, `${name}VectorDatabase.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger29;
-    logger.success(`${join44(vectorDatabaseLocalDir, name)}VectorDatabase.ts created successfully`, undefined, {
+    const logger = new TerminalLogger30;
+    logger.success(`${join45(vectorDatabaseLocalDir, name)}VectorDatabase.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join44(testsLocalDir, name)}VectorDatabase.spec.ts created successfully`, undefined, {
+    logger.success(`${join45(testsLocalDir, name)}VectorDatabase.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join44(process.cwd(), "package.json");
+    const packageJsonPath = join45(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -21588,13 +21821,13 @@ class MakeVectorDatabaseCommand {
   }
 }
 MakeVectorDatabaseCommand = __legacyDecorateClassTS([
-  decorator44.command()
+  decorator45.command()
 ], MakeVectorDatabaseCommand);
 // src/commands/MigrationUpCommand.ts
 import { existsSync as existsSync2 } from "fs";
-import { join as join45 } from "path";
-import { decorator as decorator45 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger30 } from "@ooneex/logger";
+import { join as join46 } from "path";
+import { decorator as decorator46 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger31 } from "@ooneex/logger";
 class MigrationUpCommand {
   getName() {
     return "migration:up";
@@ -21603,8 +21836,8 @@ class MigrationUpCommand {
     return "Run migrations for all modules";
   }
   async run(options) {
-    const logger = new TerminalLogger30;
-    const modulesDir = join45(process.cwd(), "modules");
+    const logger = new TerminalLogger31;
+    const modulesDir = join46(process.cwd(), "modules");
     if (!existsSync2(modulesDir)) {
       logger.warn("No modules with migrations found", undefined, {
         showTimestamp: false,
@@ -21617,10 +21850,10 @@ class MigrationUpCommand {
     const modules = [];
     for await (const match of glob.scan({ cwd: modulesDir, onlyFiles: true })) {
       const entry = match.replace("/package.json", "");
-      const moduleDir = join45(modulesDir, entry);
-      const migrationUpFile = Bun.file(join45(moduleDir, "bin", "migration", "up.ts"));
+      const moduleDir = join46(modulesDir, entry);
+      const migrationUpFile = Bun.file(join46(moduleDir, "bin", "migration", "up.ts"));
       if (await migrationUpFile.exists()) {
-        const packageJson = await Bun.file(join45(modulesDir, match)).json();
+        const packageJson = await Bun.file(join46(modulesDir, match)).json();
         modules.push({ name: packageJson.name ?? entry, dir: moduleDir });
       }
     }
@@ -21633,7 +21866,7 @@ class MigrationUpCommand {
       return;
     }
     for (const { name, dir } of modules) {
-      const migrationUpPath = join45(dir, "bin", "migration", "up.ts");
+      const migrationUpPath = join46(dir, "bin", "migration", "up.ts");
       logger.info(`Running migrations for ${name}...`, undefined, {
         showTimestamp: false,
         showArrow: false,
@@ -21666,13 +21899,140 @@ class MigrationUpCommand {
   }
 }
 MigrationUpCommand = __legacyDecorateClassTS([
-  decorator45.command()
+  decorator46.command()
 ], MigrationUpCommand);
+// src/commands/RemoveModuleCommand.ts
+import { rmdir } from "fs/promises";
+import { join as join47 } from "path";
+import { decorator as decorator47 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger32 } from "@ooneex/logger";
+import { toKebabCase as toKebabCase5, toPascalCase as toPascalCase18 } from "@ooneex/utils";
+class RemoveModuleCommand {
+  getName() {
+    return "remove:module";
+  }
+  getDescription() {
+    return "Remove an existing module";
+  }
+  async removeFromAppModule(appModulePath, pascalName, kebabName) {
+    if (!await Bun.file(appModulePath).exists())
+      return;
+    let content = await Bun.file(appModulePath).text();
+    const moduleName = `${pascalName}Module`;
+    const importPath = `@module/${kebabName}/${moduleName}`;
+    const importRegex = new RegExp(`import\\s*\\{\\s*${moduleName}\\s*\\}\\s*from\\s*"${importPath.replace(/\//g, "\\/")}";\\s*\\n`, "g");
+    content = content.replace(importRegex, "");
+    const fields = ["controllers", "middlewares", "cronJobs", "events"];
+    for (const field of fields) {
+      const spread = `...${moduleName}.${field}`;
+      content = content.replace(new RegExp(`,\\s*${spread.replace(/\./g, "\\.")}`, "g"), "");
+      content = content.replace(new RegExp(`${spread.replace(/\./g, "\\.")}\\s*,\\s*`, "g"), "");
+      content = content.replace(new RegExp(`${spread.replace(/\./g, "\\.")}`, "g"), "");
+    }
+    await Bun.write(appModulePath, content);
+  }
+  async removeFromSharedModule(sharedModulePath, pascalName, kebabName) {
+    if (!await Bun.file(sharedModulePath).exists())
+      return;
+    let content = await Bun.file(sharedModulePath).text();
+    const moduleName = `${pascalName}Module`;
+    const importPath = `@module/${kebabName}/${moduleName}`;
+    const importRegex = new RegExp(`import\\s*\\{\\s*${moduleName}\\s*\\}\\s*from\\s*"${importPath.replace(/\//g, "\\/")}";\\s*\\n`, "g");
+    content = content.replace(importRegex, "");
+    const spread = `...${moduleName}.entities`;
+    content = content.replace(new RegExp(`,\\s*${spread.replace(/\./g, "\\.")}`, "g"), "");
+    content = content.replace(new RegExp(`${spread.replace(/\./g, "\\.")}\\s*,\\s*`, "g"), "");
+    content = content.replace(new RegExp(`${spread.replace(/\./g, "\\.")}`, "g"), "");
+    await Bun.write(sharedModulePath, content);
+  }
+  async removeModuleScope(commitlintPath, kebabName) {
+    if (!await Bun.file(commitlintPath).exists())
+      return;
+    let content = await Bun.file(commitlintPath).text();
+    const scope = `"${kebabName}"`;
+    content = content.replace(new RegExp(`\\s*${scope.replace(/"/g, "\\\"")}\\s*,?`, "g"), "");
+    content = content.replace(/,\s*,/g, ",");
+    content = content.replace(/,(\s*\])/g, "$1");
+    await Bun.write(commitlintPath, content);
+  }
+  async removePathAlias(tsconfigPath, kebabName) {
+    if (!await Bun.file(tsconfigPath).exists())
+      return;
+    const content = await Bun.file(tsconfigPath).text();
+    const tsconfig = JSON.parse(content);
+    if (tsconfig.compilerOptions?.paths) {
+      delete tsconfig.compilerOptions.paths[`@module/${kebabName}/*`];
+    }
+    await Bun.write(tsconfigPath, `${JSON.stringify(tsconfig, null, 2)}
+`);
+  }
+  async run(options) {
+    const { cwd = process.cwd(), silent = false } = options;
+    let { name } = options;
+    if (!name) {
+      name = await askName({ message: "Enter module name to remove" });
+    }
+    const pascalName = toPascalCase18(name).replace(/Module$/, "");
+    const kebabName = toKebabCase5(pascalName);
+    if (kebabName === "app" || kebabName === "shared") {
+      if (!silent) {
+        const logger = new TerminalLogger32;
+        logger.error(`Cannot remove the "${kebabName}" module`, undefined, {
+          showTimestamp: false,
+          showArrow: false,
+          useSymbol: true
+        });
+      }
+      return;
+    }
+    const moduleDir = join47(cwd, "modules", kebabName);
+    const moduleDirExists = await Bun.file(join47(moduleDir, "package.json")).exists();
+    if (!moduleDirExists) {
+      if (!silent) {
+        const logger = new TerminalLogger32;
+        logger.error(`Module "${kebabName}" does not exist`, undefined, {
+          showTimestamp: false,
+          showArrow: false,
+          useSymbol: true
+        });
+      }
+      return;
+    }
+    if (!silent) {
+      const confirmed = await askConfirm({
+        message: `Are you sure you want to remove the "${kebabName}" module?`,
+        initial: false
+      });
+      if (!confirmed)
+        return;
+    }
+    const appModulePath = join47(cwd, "modules", "app", "src", "AppModule.ts");
+    await this.removeFromAppModule(appModulePath, pascalName, kebabName);
+    const sharedModulePath = join47(cwd, "modules", "shared", "src", "SharedModule.ts");
+    await this.removeFromSharedModule(sharedModulePath, pascalName, kebabName);
+    const appTsconfigPath = join47(cwd, "tsconfig.json");
+    await this.removePathAlias(appTsconfigPath, kebabName);
+    const commitlintPath = join47(cwd, ".commitlintrc.ts");
+    await this.removeModuleScope(commitlintPath, kebabName);
+    await rmdir(moduleDir, { recursive: true });
+    if (!silent) {
+      const logger = new TerminalLogger32;
+      logger.success(`modules/${kebabName} removed successfully`, undefined, {
+        showTimestamp: false,
+        showArrow: false,
+        useSymbol: true
+      });
+    }
+  }
+}
+RemoveModuleCommand = __legacyDecorateClassTS([
+  decorator47.command()
+], RemoveModuleCommand);
 // src/commands/SeedRunCommand.ts
 import { existsSync as existsSync3 } from "fs";
-import { join as join46 } from "path";
-import { decorator as decorator46 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger31 } from "@ooneex/logger";
+import { join as join48 } from "path";
+import { decorator as decorator48 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger33 } from "@ooneex/logger";
 class SeedRunCommand {
   getName() {
     return "seed:run";
@@ -21681,8 +22041,8 @@ class SeedRunCommand {
     return "Run seeds for all modules";
   }
   async run(options) {
-    const logger = new TerminalLogger31;
-    const modulesDir = join46(process.cwd(), "modules");
+    const logger = new TerminalLogger33;
+    const modulesDir = join48(process.cwd(), "modules");
     if (!existsSync3(modulesDir)) {
       logger.warn("No modules with seeds found", undefined, {
         showTimestamp: false,
@@ -21695,10 +22055,10 @@ class SeedRunCommand {
     const modules = [];
     for await (const match of glob.scan({ cwd: modulesDir, onlyFiles: true })) {
       const entry = match.replace("/package.json", "");
-      const moduleDir = join46(modulesDir, entry);
-      const seedRunFile = Bun.file(join46(moduleDir, "bin", "seed", "run.ts"));
+      const moduleDir = join48(modulesDir, entry);
+      const seedRunFile = Bun.file(join48(moduleDir, "bin", "seed", "run.ts"));
       if (await seedRunFile.exists()) {
-        const packageJson = await Bun.file(join46(modulesDir, match)).json();
+        const packageJson = await Bun.file(join48(modulesDir, match)).json();
         modules.push({ name: packageJson.name ?? entry, dir: moduleDir });
       }
     }
@@ -21711,7 +22071,7 @@ class SeedRunCommand {
       return;
     }
     for (const { name, dir } of modules) {
-      const seedRunPath = join46(dir, "bin", "seed", "run.ts");
+      const seedRunPath = join48(dir, "bin", "seed", "run.ts");
       logger.info(`Running seeds for ${name}...`, undefined, {
         showTimestamp: false,
         showArrow: false,
@@ -21744,9 +22104,9 @@ class SeedRunCommand {
   }
 }
 SeedRunCommand = __legacyDecorateClassTS([
-  decorator46.command()
+  decorator48.command()
 ], SeedRunCommand);
 // src/index.ts
 await run();
 
-//# debugId=B64B6C8BCD62B27464756E2164756E21
+//# debugId=6B8391ED70E28F2564756E2164756E21