@ooneex/cli 1.20.3 → 1.22.0

package/dist/index.js

@@ -5064,11 +5064,105 @@ class AppStopCommand {
 AppStopCommand = __legacyDecorateClassTS([
   decorator3.command()
 ], AppStopCommand);
-// src/commands/CompletionZshCommand.ts
-import { homedir } from "os";
+// src/commands/CommandRunCommand.ts
+import { existsSync } from "fs";
 import { join as join4 } from "path";
 import { decorator as decorator4 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger4 } from "@ooneex/logger";
+class CommandRunCommand {
+  getName() {
+    return "command:run";
+  }
+  getDescription() {
+    return "Run a custom command from a module";
+  }
+  async run() {
+    const logger = new TerminalLogger4;
+    const commandName = Bun.argv[3];
+    if (!commandName) {
+      logger.error("Command name is required. Usage: ooneex command:run <command-name>", undefined, {
+        showTimestamp: false,
+        showArrow: false,
+        useSymbol: false
+      });
+      return;
+    }
+    const extraArgs = Bun.argv.slice(4);
+    const modulesDir = join4(process.cwd(), "modules");
+    if (!existsSync(modulesDir)) {
+      logger.warn(`Command "${commandName}" not found in any module`, undefined, {
+        showTimestamp: false,
+        showArrow: false,
+        useSymbol: false
+      });
+      return;
+    }
+    const glob = new Bun.Glob("*/package.json");
+    const modules = [];
+    for await (const match of glob.scan({ cwd: modulesDir, onlyFiles: true })) {
+      const entry = match.replace("/package.json", "");
+      const moduleDir = join4(modulesDir, entry);
+      const commandRunFile = Bun.file(join4(moduleDir, "bin", "command", "run.ts"));
+      if (await commandRunFile.exists()) {
+        const packageJson = await Bun.file(join4(modulesDir, match)).json();
+        modules.push({ name: packageJson.name ?? entry, dir: moduleDir });
+      }
+    }
+    if (modules.length === 0) {
+      logger.warn(`Command "${commandName}" not found in any module`, undefined, {
+        showTimestamp: false,
+        showArrow: false,
+        useSymbol: false
+      });
+      return;
+    }
+    for (const { name, dir } of modules) {
+      const commandRunPath = join4(dir, "bin", "command", "run.ts");
+      logger.info(`Running "${commandName}" for ${name}...`, undefined, {
+        showTimestamp: false,
+        showArrow: false,
+        useSymbol: false
+      });
+      const proc = Bun.spawn(["bun", "run", commandRunPath, commandName, ...extraArgs], {
+        cwd: dir,
+        stdout: "pipe",
+        stderr: "pipe"
+      });
+      const [stdout, stderr] = await Promise.all([new Response(proc.stdout).text(), new Response(proc.stderr).text()]);
+      const exitCode = await proc.exited;
+      if (exitCode === 0) {
+        if (stdout)
+          process.stdout.write(stdout);
+        if (stderr)
+          process.stderr.write(stderr);
+        logger.success(`Command "${commandName}" completed for ${name}`, undefined, {
+          showTimestamp: false,
+          showArrow: false,
+          useSymbol: false
+        });
+        return;
+      }
+      logger.warn(`Command "${commandName}" not found in ${name}`, undefined, {
+        showTimestamp: false,
+        showArrow: false,
+        useSymbol: false
+      });
+    }
+    logger.error(`Command "${commandName}" not found in any module`, undefined, {
+      showTimestamp: false,
+      showArrow: false,
+      useSymbol: false
+    });
+  }
+}
+CommandRunCommand = __legacyDecorateClassTS([
+  decorator4.command()
+], CommandRunCommand);
+// src/commands/CompletionZshCommand.ts
+import { homedir } from "os";
+import { join as join5 } from "path";
+import { decorator as decorator5 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger5 } from "@ooneex/logger";
 
 // src/templates/completions/_oo.txt
 var _oo_default = `#compdef oo ooneex
@@ -5081,12 +5175,21 @@ _oo_modules() {
   fi
 }
 
+_oo_custom_commands() {
+  local -a cmds
+  if [[ -d modules ]]; then
+    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
+}
+
 _oo() {
   local -a commands
   commands=(
     'app\\:build:Build the application'
     'app\\:start:Start the application'
     'app\\:stop:Stop the application'
+    'command\\:run:Run a custom command from a module'
     'completion\\:zsh:Install Zsh completion for oo command'
     'help:Show available commands'
     'make\\:ai:Generate a new AI class'
@@ -5106,6 +5209,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'
@@ -5142,6 +5246,10 @@ _oo() {
       ;;
     opts)
       case "$words[1]" in
+        command:run)
+          _arguments -s \\
+            '1:command name:_oo_custom_commands'
+          ;;
         make:controller)
           _arguments -s \\
             '--name=[Name of the resource]:name' \\
@@ -5182,6 +5290,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)' \\
@@ -5197,7 +5309,11 @@ _oo() {
             '--name=[Name of the resource]:name' \\
             '--module=[Module name]:module:_oo_modules'
           ;;
-        app:build|app:start|app:stop|help|make:release|make:resource:book|make:resource:calendar-event|make:resource:category|make:resource:color|make:resource:discount|make:resource:folder|make:resource:image|make:resource:note|make:resource:status|make:resource:tag|make:resource:task|make:resource:topic|make:resource:user|make:resource:video|make:claude:skill|migration:up|seed:run|completion:zsh)
+        migration:up|seed:run)
+          _arguments -s \\
+            '--drop[Drop the database before running]'
+          ;;
+        app:build|app:start|app:stop|help|make:release|make:resource:book|make:resource:calendar-event|make:resource:category|make:resource:color|make:resource:discount|make:resource:folder|make:resource:image|make:resource:note|make:resource:status|make:resource:tag|make:resource:task|make:resource:topic|make:resource:user|make:resource:video|make:claude:skill|completion:zsh)
           ;;
       esac
       ;;
@@ -5218,12 +5334,21 @@ _ooneex_modules() {
   fi
 }
 
+_ooneex_custom_commands() {
+  local -a cmds
+  if [[ -d modules ]]; then
+    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
+}
+
 _ooneex() {
   local -a commands
   commands=(
     'app\\:build:Build the application'
     'app\\:start:Start the application'
     'app\\:stop:Stop the application'
+    'command\\:run:Run a custom command from a module'
     'completion\\:zsh:Install Zsh completion for oo command'
     'help:Show available commands'
     'make\\:ai:Generate a new AI class'
@@ -5243,6 +5368,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'
@@ -5279,6 +5405,10 @@ _ooneex() {
       ;;
     opts)
       case "$words[1]" in
+        command:run)
+          _arguments -s \\
+            '1:command name:_ooneex_custom_commands'
+          ;;
         make:controller)
           _arguments -s \\
             '--name=[Name of the resource]:name' \\
@@ -5319,6 +5449,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)' \\
@@ -5334,7 +5468,11 @@ _ooneex() {
             '--name=[Name of the resource]:name' \\
             '--module=[Module name]:module:_ooneex_modules'
           ;;
-        app:build|app:start|app:stop|help|make:release|make:resource:book|make:resource:calendar-event|make:resource:category|make:resource:color|make:resource:discount|make:resource:folder|make:resource:image|make:resource:note|make:resource:status|make:resource:tag|make:resource:task|make:resource:topic|make:resource:user|make:resource:video|make:claude:skill|migration:up|seed:run|completion:zsh)
+        migration:up|seed:run)
+          _arguments -s \\
+            '--drop[Drop the database before running]'
+          ;;
+        app:build|app:start|app:stop|help|make:release|make:resource:book|make:resource:calendar-event|make:resource:category|make:resource:color|make:resource:discount|make:resource:folder|make:resource:image|make:resource:note|make:resource:status|make:resource:tag|make:resource:task|make:resource:topic|make:resource:user|make:resource:video|make:claude:skill|completion:zsh)
           ;;
       esac
       ;;
@@ -5353,12 +5491,12 @@ class CompletionZshCommand {
     return "Install Zsh completion for oo command";
   }
   async run() {
-    const completionDir = join4(homedir(), ".zsh");
-    const ooFilePath = join4(completionDir, "_oo");
+    const completionDir = join5(homedir(), ".zsh");
+    const ooFilePath = join5(completionDir, "_oo");
     await Bun.write(ooFilePath, _oo_default);
-    const ooneexFilePath = join4(completionDir, "_ooneex");
+    const ooneexFilePath = join5(completionDir, "_ooneex");
     await Bun.write(ooneexFilePath, _ooneex_default);
-    const logger = new TerminalLogger4;
+    const logger = new TerminalLogger5;
     logger.success(`${ooFilePath} created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
@@ -5379,10 +5517,10 @@ class CompletionZshCommand {
   }
 }
 CompletionZshCommand = __legacyDecorateClassTS([
-  decorator4.command()
+  decorator5.command()
 ], CompletionZshCommand);
 // src/commands/HelpCommand.ts
-import { COMMANDS_CONTAINER, decorator as decorator5 } from "@ooneex/command";
+import { COMMANDS_CONTAINER, decorator as decorator6 } from "@ooneex/command";
 class HelpCommand {
   getName() {
     return "help";
@@ -5409,12 +5547,12 @@ class HelpCommand {
   }
 }
 HelpCommand = __legacyDecorateClassTS([
-  decorator5.command()
+  decorator6.command()
 ], HelpCommand);
 // src/commands/MakeAiCommand.ts
-import { join as join7 } from "path";
-import { decorator as decorator7 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger6 } from "@ooneex/logger";
+import { join as join8 } from "path";
+import { decorator as decorator8 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger7 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase2 } from "@ooneex/utils";
 
 // src/prompts/askName.ts
@@ -5470,7 +5608,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'", () => {
@@ -5511,12 +5649,12 @@ export class {{NAME}}Ai implements IAiChat<OpenAiConfigType> {
 `;
 
 // src/utils.ts
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 
 // src/commands/MakeModuleCommand.ts
-import { join as join5 } from "path";
-import { decorator as decorator6 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger5 } from "@ooneex/logger";
+import { join as join6 } from "path";
+import { decorator as decorator7 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger6 } from "@ooneex/logger";
 import { toKebabCase, toPascalCase } from "@ooneex/utils";
 
 // src/templates/module/module.txt
@@ -5640,7 +5778,7 @@ class MakeModuleCommand {
         ${newScope},`;
         content = content.replace(regex, `$1${newValue}
       $3`);
-        await Bun.write(commitlintPath, content);
+        await Bun.write(commitlintPath, content.replace(/,+/g, ","));
       }
     }
   }
@@ -5654,52 +5792,46 @@ class MakeModuleCommand {
 `);
   }
   async run(options) {
-    const { cwd = process.cwd(), silent = false, skipMigrations = false, skipSeeds = false } = options;
+    const { cwd = process.cwd(), silent = false } = options;
     let { name } = options;
     if (!name) {
       name = await askName({ message: "Enter module name" });
     }
     const pascalName = toPascalCase(name).replace(/Module$/, "");
     const kebabName = toKebabCase(pascalName);
-    const moduleDir = join5(cwd, "modules", kebabName);
-    const srcDir = join5(moduleDir, "src");
-    const testsDir = join5(moduleDir, "tests");
+    const moduleDir = join6(cwd, "modules", kebabName);
+    const srcDir = join6(moduleDir, "src");
+    const testsDir = join6(moduleDir, "tests");
     const moduleContent = module_default.replace(/{{NAME}}/g, pascalName);
     const packageContent = package_default.replace(/{{NAME}}/g, kebabName);
     const testContent = test_default.replace(/{{NAME}}/g, pascalName).replace(/{{name}}/g, kebabName);
-    await Bun.write(join5(srcDir, `${pascalName}Module.ts`), moduleContent);
-    if (!skipMigrations) {
-      await Bun.write(join5(srcDir, "migrations", "migrations.ts"), "");
-    }
-    if (!skipSeeds) {
-      await Bun.write(join5(srcDir, "seeds", "seeds.ts"), "");
-    }
-    await Bun.write(join5(moduleDir, "package.json"), packageContent);
-    await Bun.write(join5(moduleDir, "tsconfig.json"), tsconfig_default);
-    await Bun.write(join5(testsDir, `${pascalName}Module.spec.ts`), testContent);
+    await Bun.write(join6(srcDir, `${pascalName}Module.ts`), moduleContent);
+    await Bun.write(join6(moduleDir, "package.json"), packageContent);
+    await Bun.write(join6(moduleDir, "tsconfig.json"), tsconfig_default);
+    await Bun.write(join6(testsDir, `${pascalName}Module.spec.ts`), testContent);
     if (kebabName !== "app") {
-      const appModulePath = join5(cwd, "modules", "app", "src", "AppModule.ts");
+      const appModulePath = join6(cwd, "modules", "app", "src", "AppModule.ts");
       if (await Bun.file(appModulePath).exists()) {
         await this.addToAppModule(appModulePath, pascalName, kebabName);
       }
     }
-    const appTsconfigPath = join5(cwd, "tsconfig.json");
+    const appTsconfigPath = join6(cwd, "tsconfig.json");
     if (await Bun.file(appTsconfigPath).exists()) {
       await this.addPathAlias(appTsconfigPath, kebabName);
     }
     if (kebabName !== "app" && kebabName !== "shared") {
-      const sharedModuleDir = join5(cwd, "modules", "shared");
-      const sharedModuleFilePath = join5(sharedModuleDir, "src", "SharedModule.ts");
+      const sharedModuleDir = join6(cwd, "modules", "shared");
+      const sharedModuleFilePath = join6(sharedModuleDir, "src", "SharedModule.ts");
       if (await Bun.file(sharedModuleFilePath).exists()) {
         await this.addToSharedModule(sharedModuleFilePath, pascalName, kebabName);
       }
     }
-    const commitlintPath = join5(cwd, ".commitlintrc.ts");
+    const commitlintPath = join6(cwd, ".commitlintrc.ts");
     if (await Bun.file(commitlintPath).exists()) {
       await this.addModuleScope(commitlintPath, kebabName);
     }
     if (!silent) {
-      const logger = new TerminalLogger5;
+      const logger = new TerminalLogger6;
       logger.success(`modules/${kebabName} created successfully`, undefined, {
         showTimestamp: false,
         showArrow: false,
@@ -5709,13 +5841,13 @@ class MakeModuleCommand {
   }
 }
 MakeModuleCommand = __legacyDecorateClassTS([
-  decorator6.command()
+  decorator7.command()
 ], MakeModuleCommand);
 
 // src/utils.ts
 var ensureModule = async (module) => {
-  const moduleDir = join6(process.cwd(), "modules", module);
-  const moduleDirExists = await Bun.file(join6(moduleDir, "package.json")).exists();
+  const moduleDir = join7(process.cwd(), "modules", module);
+  const moduleDirExists = await Bun.file(join7(moduleDir, "package.json")).exists();
   if (!moduleDirExists) {
     const makeModule = new MakeModuleCommand;
     await makeModule.run({ name: module, cwd: process.cwd(), silent: true });
@@ -5740,28 +5872,28 @@ class MakeAiCommand {
       await ensureModule(module);
     }
     const content = ai_default.replace(/{{NAME}}/g, name);
-    const base = module ? join7("modules", module) : ".";
-    const aiLocalDir = join7(base, "src", "ai");
-    const aiDir = join7(process.cwd(), aiLocalDir);
-    const filePath = join7(aiDir, `${name}Ai.ts`);
+    const base = module ? join8("modules", module) : ".";
+    const aiLocalDir = join8(base, "src", "ai");
+    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 testsLocalDir = join7(base, "tests", "ai");
-    const testsDir = join7(process.cwd(), testsLocalDir);
-    const testFilePath = join7(testsDir, `${name}Ai.spec.ts`);
+    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`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger6;
-    logger.success(`${join7(aiLocalDir, name)}Ai.ts created successfully`, undefined, {
+    const logger = new TerminalLogger7;
+    logger.success(`${join8(aiLocalDir, name)}Ai.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join7(testsLocalDir, name)}Ai.spec.ts created successfully`, undefined, {
+    logger.success(`${join8(testsLocalDir, name)}Ai.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join7(process.cwd(), "package.json");
+    const packageJsonPath = join8(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -5776,17 +5908,17 @@ class MakeAiCommand {
   }
 }
 MakeAiCommand = __legacyDecorateClassTS([
-  decorator7.command()
+  decorator8.command()
 ], MakeAiCommand);
 // src/commands/MakeAnalyticsCommand.ts
-import { join as join8 } from "path";
-import { decorator as decorator8 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger7 } from "@ooneex/logger";
+import { join as join9 } from "path";
+import { decorator as decorator9 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger8 } 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'", () => {
@@ -5832,28 +5964,28 @@ class MakeAnalyticsCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join8("modules", module) : ".";
-    const analyticsLocalDir = join8(base, "src", "analytics");
-    const analyticsDir = join8(process.cwd(), analyticsLocalDir);
-    const filePath = join8(analyticsDir, `${name}Analytics.ts`);
+    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`);
     await Bun.write(filePath, content);
-    const testContent = analytics_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join8(base, "tests", "analytics");
-    const testsDir = join8(process.cwd(), testsLocalDir);
-    const testFilePath = join8(testsDir, `${name}Analytics.spec.ts`);
+    const testContent = analytics_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join9(base, "tests", "analytics");
+    const testsDir = join9(process.cwd(), testsLocalDir);
+    const testFilePath = join9(testsDir, `${name}Analytics.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger7;
-    logger.success(`${join8(analyticsLocalDir, name)}Analytics.ts created successfully`, undefined, {
+    const logger = new TerminalLogger8;
+    logger.success(`${join9(analyticsLocalDir, name)}Analytics.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join8(testsLocalDir, name)}Analytics.spec.ts created successfully`, undefined, {
+    logger.success(`${join9(testsLocalDir, name)}Analytics.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join8(process.cwd(), "package.json");
+    const packageJsonPath = join9(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -5868,12 +6000,12 @@ class MakeAnalyticsCommand {
   }
 }
 MakeAnalyticsCommand = __legacyDecorateClassTS([
-  decorator8.command()
+  decorator9.command()
 ], MakeAnalyticsCommand);
 // src/commands/MakeAppCommand.ts
-import { join as join9 } from "path";
-import { decorator as decorator9 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger8 } from "@ooneex/logger";
+import { join as join10 } from "path";
+import { decorator as decorator10 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger9 } from "@ooneex/logger";
 import { toKebabCase as toKebabCase2, toSnakeCase } from "@ooneex/utils";
 
 // src/prompts/askDestination.ts
@@ -6194,11 +6326,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 {
@@ -6207,6 +6339,10 @@ export class SharedDatabase extends TypeormDatabase {
   }
 
   public getSource(): DataSource {
+    if (this.source) {
+      return this.source;
+    }
+
     const url = this.env.DATABASE_URL;
 
     if (!url) {
@@ -6217,13 +6353,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;
@@ -7012,44 +7156,40 @@ class MakeAppCommand {
       destination = await askDestination({ message: "Enter destination path", initial: kebabName });
     }
     const packageContent = package_json_default.replace(/{{NAME}}/g, kebabName);
-    await Bun.write(join9(destination, ".commitlintrc.ts"), _commitlintrc_ts_default);
-    await Bun.write(join9(destination, ".gitignore"), _gitignore_default);
-    await Bun.write(join9(destination, "biome.jsonc"), biome_jsonc_default);
-    await Bun.write(join9(destination, "bunfig.toml"), bunfig_toml_default);
-    await Bun.write(join9(destination, "nx.json"), nx_json_default);
-    await Bun.write(join9(destination, "package.json"), packageContent);
-    await Bun.write(join9(destination, "README.md"), README_md_default.replace(/{{NAME}}/g, kebabName));
-    await Bun.write(join9(destination, "tsconfig.json"), tsconfig_json_default);
-    await Bun.write(join9(destination, ".zed", "settings.json"), zed_settings_json_default);
+    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);
     const makeModuleCommand = new MakeModuleCommand;
     await makeModuleCommand.run({
       name: "app",
       cwd: destination,
-      silent: true,
-      skipMigrations: true,
-      skipSeeds: true
+      silent: true
     });
-    const appModulePackagePath = join9(destination, "modules", "app", "package.json");
+    const appModulePackagePath = join10(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(join9(destination, "modules", "app", ".env"), envContent);
-    await Bun.write(join9(destination, "modules", "app", ".env.example"), env_default);
-    await Bun.write(join9(destination, "modules", "app", "src", "index.ts"), index_ts_default);
+    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 makeModuleCommand.run({
       name: "shared",
       cwd: destination,
-      silent: true,
-      skipMigrations: true,
-      skipSeeds: true
+      silent: true
     });
-    await Bun.write(join9(destination, "modules", "shared", "src", "databases", "SharedDatabase.ts"), app_database_default);
+    await Bun.write(join10(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(join9(destination, "modules", "app", "docker-compose.yml"), dockerComposeContent);
+    await Bun.write(join10(destination, "modules", "app", "docker-compose.yml"), dockerComposeContent);
     const dockerfileContent = Dockerfile_default.replace(/{{NAME}}/g, snakeName);
-    await Bun.write(join9(destination, "modules", "app", "Dockerfile"), dockerfileContent);
-    await Bun.write(join9(destination, "modules", "app", "var", ".gitkeep"), "");
+    await Bun.write(join10(destination, "modules", "app", "Dockerfile"), dockerfileContent);
+    await Bun.write(join10(destination, "modules", "app", "var", ".gitkeep"), "");
     const gitInit = Bun.spawn(["git", "init"], { cwd: destination, stdout: "ignore", stderr: "inherit" });
     await gitInit.exited;
     const addDeps = Bun.spawn([
@@ -7111,9 +7251,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(join9(destination, ".husky", "pre-commit"), "lint-staged");
-    await Bun.write(join9(destination, ".husky", "commit-msg"), `bunx commitlint --edit "$1"`);
-    const logger = new TerminalLogger8;
+    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;
     logger.success(`${kebabName} created successfully at ${destination}`, undefined, {
       showTimestamp: false,
       showArrow: false,
@@ -7122,17 +7262,17 @@ class MakeAppCommand {
   }
 }
 MakeAppCommand = __legacyDecorateClassTS([
-  decorator9.command()
+  decorator10.command()
 ], MakeAppCommand);
 // src/commands/MakeCacheCommand.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 { 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'", () => {
@@ -7203,28 +7343,28 @@ class MakeCacheCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join10("modules", module) : ".";
-    const cacheLocalDir = join10(base, "src", "cache");
-    const cacheDir = join10(process.cwd(), cacheLocalDir);
-    const filePath = join10(cacheDir, `${name}Cache.ts`);
+    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`);
     await Bun.write(filePath, content);
-    const testContent = cache_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join10(base, "tests", "cache");
-    const testsDir = join10(process.cwd(), testsLocalDir);
-    const testFilePath = join10(testsDir, `${name}Cache.spec.ts`);
+    const testContent = cache_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join11(base, "tests", "cache");
+    const testsDir = join11(process.cwd(), testsLocalDir);
+    const testFilePath = join11(testsDir, `${name}Cache.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger9;
-    logger.success(`${join10(cacheLocalDir, name)}Cache.ts created successfully`, undefined, {
+    const logger = new TerminalLogger10;
+    logger.success(`${join11(cacheLocalDir, name)}Cache.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join10(testsLocalDir, name)}Cache.spec.ts created successfully`, undefined, {
+    logger.success(`${join11(testsLocalDir, name)}Cache.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join10(process.cwd(), "package.json");
+    const packageJsonPath = join11(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -7239,12 +7379,12 @@ class MakeCacheCommand {
   }
 }
 MakeCacheCommand = __legacyDecorateClassTS([
-  decorator10.command()
+  decorator11.command()
 ], MakeCacheCommand);
 // src/commands/MakeClaudeSkillCommand.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";
 
 // src/templates/claude/skills/commit.md.txt
 var commit_md_default = `---
@@ -7535,14 +7675,14 @@ class MakeClaudeSkillCommand {
     return "Generate Claude skills from templates";
   }
   async run() {
-    const skillsLocalDir = join11(".claude", "skills");
-    const skillsDir = join11(process.cwd(), skillsLocalDir);
-    const logger = new TerminalLogger10;
+    const skillsLocalDir = join12(".claude", "skills");
+    const skillsDir = join12(process.cwd(), skillsLocalDir);
+    const logger = new TerminalLogger11;
     for (const [skillName, content] of Object.entries(skills)) {
       const dirName = skillName.replace(/\./g, "-");
-      const filePath = join11(skillsDir, dirName, "SKILL.md");
+      const filePath = join12(skillsDir, dirName, "SKILL.md");
       await Bun.write(filePath, content);
-      logger.success(`${join11(skillsLocalDir, dirName, "SKILL.md")} created successfully`, undefined, {
+      logger.success(`${join12(skillsLocalDir, dirName, "SKILL.md")} created successfully`, undefined, {
         showTimestamp: false,
         showArrow: false,
         useSymbol: true
@@ -7551,18 +7691,18 @@ class MakeClaudeSkillCommand {
   }
 }
 MakeClaudeSkillCommand = __legacyDecorateClassTS([
-  decorator11.command()
+  decorator12.command()
 ], MakeClaudeSkillCommand);
 // src/commands/MakeCommandCommand.ts
-import { join as join12 } from "path";
-import { commandCreate, decorator as decorator12 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger11 } from "@ooneex/logger";
+import { join as join13 } from "path";
+import { commandCreate, decorator as decorator13 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger12 } from "@ooneex/logger";
 
 // src/templates/module/command.run.txt
 var command_run_default = `#!/usr/bin/env bun
 
 import { run } from "@ooneex/command";
-import "@/commands/commands";
+import "@module/{{name}}/commands/commands";
 
 await run();
 `;
@@ -7583,20 +7723,19 @@ class MakeCommandCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join12("modules", module) : ".";
-    const { commandPath, testPath } = await commandCreate({
+    const base = module ? join13("modules", module) : ".";
+    const { commandPath: filePath, testPath } = await commandCreate({
       name,
-      commandDir: join12(base, "src", "commands"),
-      testsDir: join12(base, "tests", "commands")
+      commandDir: join13(base, "src", "commands"),
+      testsDir: join13(base, "tests", "commands")
     });
-    const binCommandRunPath = join12(process.cwd(), base, "bin", "command", "run.ts");
+    const binCommandRunPath = join13(process.cwd(), base, "bin", "command", "run.ts");
     const binCommandRunFile = Bun.file(binCommandRunPath);
     if (!await binCommandRunFile.exists()) {
-      await Bun.write(binCommandRunPath, command_run_default);
+      await Bun.write(binCommandRunPath, command_run_default.replace(/{{name}}/g, module ?? ""));
     }
-    const packageJsonPath = join12(process.cwd(), base, "package.json");
-    const logger = new TerminalLogger11;
-    logger.success(`${commandPath} created successfully`, undefined, {
+    const logger = new TerminalLogger12;
+    logger.success(`${filePath} created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
@@ -7606,26 +7745,15 @@ class MakeCommandCommand {
       showArrow: false,
       useSymbol: true
     });
-    const pkgJson = await Bun.file(packageJsonPath).json();
-    const deps = pkgJson.dependencies ?? {};
-    const devDeps = pkgJson.devDependencies ?? {};
-    if (!deps["@ooneex/command"] && !devDeps["@ooneex/command"]) {
-      const install = Bun.spawn(["bun", "add", "--dev", "@ooneex/command"], {
-        cwd: process.cwd(),
-        stdout: "ignore",
-        stderr: "inherit"
-      });
-      await install.exited;
-    }
   }
 }
 MakeCommandCommand = __legacyDecorateClassTS([
-  decorator12.command()
+  decorator13.command()
 ], MakeCommandCommand);
 // src/commands/MakeControllerCommand.ts
-import { basename, join as join13 } from "path";
-import { decorator as decorator13 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger12 } from "@ooneex/logger";
+import { basename, join as join14 } from "path";
+import { decorator as decorator14 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger13 } from "@ooneex/logger";
 import { toKebabCase as toKebabCase3, toPascalCase as toPascalCase5, trim } from "@ooneex/utils";
 
 // src/prompts/askConfirm.ts
@@ -7924,7 +8052,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'", () => {
@@ -8045,33 +8173,33 @@ class MakeControllerCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join13("modules", module) : ".";
-    const controllersLocalDir = join13(base, "src", "controllers");
-    const controllersDir = join13(process.cwd(), controllersLocalDir);
-    const filePath = join13(controllersDir, `${name}Controller.ts`);
+    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`);
     await Bun.write(filePath, content);
-    const testContent = controller_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join13(base, "tests", "controllers");
-    const testsDir = join13(process.cwd(), testsLocalDir);
-    const testFilePath = join13(testsDir, `${name}Controller.spec.ts`);
+    const testContent = controller_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join14(base, "tests", "controllers");
+    const testsDir = join14(process.cwd(), testsLocalDir);
+    const testFilePath = join14(testsDir, `${name}Controller.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const modulePascalName = module ? toPascalCase5(module) : toPascalCase5(basename(process.cwd()));
-    const modulePath = join13(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
+    const modulePath = join14(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
     if (await Bun.file(modulePath).exists()) {
       await this.addToModule(modulePath, name);
     }
-    const logger = new TerminalLogger12;
-    logger.success(`${join13(controllersLocalDir, name)}Controller.ts created successfully`, undefined, {
+    const logger = new TerminalLogger13;
+    logger.success(`${join14(controllersLocalDir, name)}Controller.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join13(testsLocalDir, name)}Controller.spec.ts created successfully`, undefined, {
+    logger.success(`${join14(testsLocalDir, name)}Controller.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join13(process.cwd(), "package.json");
+    const packageJsonPath = join14(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -8086,17 +8214,17 @@ class MakeControllerCommand {
   }
 }
 MakeControllerCommand = __legacyDecorateClassTS([
-  decorator13.command()
+  decorator14.command()
 ], MakeControllerCommand);
 // src/commands/MakeCronCommand.ts
-import { basename as basename2, join as join14 } from "path";
-import { decorator as decorator14 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger13 } from "@ooneex/logger";
+import { basename as basename2, join as join15 } from "path";
+import { decorator as decorator15 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger14 } 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'", () => {
@@ -8180,33 +8308,33 @@ class MakeCronCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join14("modules", module) : ".";
-    const cronLocalDir = join14(base, "src", "crons");
-    const cronDir = join14(process.cwd(), cronLocalDir);
-    const filePath = join14(cronDir, `${name}Cron.ts`);
+    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`);
     await Bun.write(filePath, content);
-    const testContent = cron_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join14(base, "tests", "crons");
-    const testsDir = join14(process.cwd(), testsLocalDir);
-    const testFilePath = join14(testsDir, `${name}Cron.spec.ts`);
+    const testContent = cron_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join15(base, "tests", "crons");
+    const testsDir = join15(process.cwd(), testsLocalDir);
+    const testFilePath = join15(testsDir, `${name}Cron.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const modulePascalName = module ? toPascalCase6(module) : toPascalCase6(basename2(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(cronLocalDir, name)}Cron.ts created successfully`, undefined, {
+    const logger = new TerminalLogger14;
+    logger.success(`${join15(cronLocalDir, name)}Cron.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join14(testsLocalDir, name)}Cron.spec.ts created successfully`, undefined, {
+    logger.success(`${join15(testsLocalDir, name)}Cron.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 ?? {};
@@ -8221,17 +8349,17 @@ class MakeCronCommand {
   }
 }
 MakeCronCommand = __legacyDecorateClassTS([
-  decorator14.command()
+  decorator15.command()
 ], MakeCronCommand);
 // src/commands/MakeDatabaseCommand.ts
-import { join as join15 } from "path";
-import { decorator as decorator15 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger14 } from "@ooneex/logger";
+import { join as join16 } from "path";
+import { decorator as decorator16 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger15 } 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'", () => {
@@ -8289,28 +8417,28 @@ class MakeDatabaseCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join15("modules", module) : ".";
-    const databaseLocalDir = join15(base, "src", "databases");
-    const databaseDir = join15(process.cwd(), databaseLocalDir);
-    const filePath = join15(databaseDir, `${name}Database.ts`);
+    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`);
     await Bun.write(filePath, content);
-    const testContent = database_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join15(base, "tests", "databases");
-    const testsDir = join15(process.cwd(), testsLocalDir);
-    const testFilePath = join15(testsDir, `${name}Database.spec.ts`);
+    const testContent = database_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join16(base, "tests", "databases");
+    const testsDir = join16(process.cwd(), testsLocalDir);
+    const testFilePath = join16(testsDir, `${name}Database.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger14;
-    logger.success(`${join15(databaseLocalDir, name)}Database.ts created successfully`, undefined, {
+    const logger = new TerminalLogger15;
+    logger.success(`${join16(databaseLocalDir, name)}Database.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join15(testsLocalDir, name)}Database.spec.ts created successfully`, undefined, {
+    logger.success(`${join16(testsLocalDir, name)}Database.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 ?? {};
@@ -8325,12 +8453,12 @@ class MakeDatabaseCommand {
   }
 }
 MakeDatabaseCommand = __legacyDecorateClassTS([
-  decorator15.command()
+  decorator16.command()
 ], MakeDatabaseCommand);
 // src/commands/MakeDockerCommand.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";
 var {YAML } = globalThis.Bun;
 
 // src/prompts/askDockerService.ts
@@ -8823,9 +8951,9 @@ class MakeDockerCommand {
       name = await askDockerService({ message: "Select docker service" });
     }
     const templateContent = templates[name];
-    const base = join16("modules", "app");
-    const composePath = join16(process.cwd(), base, "docker-compose.yml");
-    const logger = new TerminalLogger15;
+    const base = join17("modules", "app");
+    const composePath = join17(process.cwd(), base, "docker-compose.yml");
+    const logger = new TerminalLogger16;
     const composeFile = Bun.file(composePath);
     if (await composeFile.exists()) {
       const existingContent = await composeFile.text();
@@ -8884,7 +9012,7 @@ volumes:
     } else {
       await Bun.write(composePath, templateContent);
     }
-    const packageJsonPath = join16(process.cwd(), base, "package.json");
+    const packageJsonPath = join17(process.cwd(), base, "package.json");
     const packageJsonFile = Bun.file(packageJsonPath);
     if (await packageJsonFile.exists()) {
       const packageJson = await packageJsonFile.json();
@@ -8905,18 +9033,18 @@ volumes:
   }
 }
 MakeDockerCommand = __legacyDecorateClassTS([
-  decorator16.command()
+  decorator17.command()
 ], MakeDockerCommand);
 // src/commands/MakeEntityCommand.ts
 var import_pluralize = __toESM(require_pluralize(), 1);
-import { basename as basename3, join as join17 } from "path";
-import { decorator as decorator17 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger16 } from "@ooneex/logger";
+import { basename as basename3, join as join18 } from "path";
+import { decorator as decorator18 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger17 } 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'", () => {
@@ -9075,28 +9203,28 @@ class MakeEntityCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join17("modules", module) : ".";
-    const entitiesLocalDir = join17(base, "src", "entities");
-    const entitiesDir = join17(process.cwd(), entitiesLocalDir);
-    const filePath = join17(entitiesDir, `${name}Entity.ts`);
+    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`);
     await Bun.write(filePath, content);
-    const testContent = entity_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join17(base, "tests", "entities");
-    const testsDir = join17(process.cwd(), testsLocalDir);
-    const testFilePath = join17(testsDir, `${name}Entity.spec.ts`);
+    const testContent = entity_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join18(base, "tests", "entities");
+    const testsDir = join18(process.cwd(), testsLocalDir);
+    const testFilePath = join18(testsDir, `${name}Entity.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const modulePascalName = module ? toPascalCase8(module) : toPascalCase8(basename3(process.cwd()));
-    const modulePath = join17(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
+    const modulePath = join18(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
     if (await Bun.file(modulePath).exists()) {
       await this.addToModule(modulePath, name);
     }
-    const logger = new TerminalLogger16;
-    logger.success(`${join17(entitiesLocalDir, name)}Entity.ts created successfully`, undefined, {
+    const logger = new TerminalLogger17;
+    logger.success(`${join18(entitiesLocalDir, name)}Entity.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join17(testsLocalDir, name)}Entity.spec.ts created successfully`, undefined, {
+    logger.success(`${join18(testsLocalDir, name)}Entity.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
@@ -9104,17 +9232,17 @@ class MakeEntityCommand {
   }
 }
 MakeEntityCommand = __legacyDecorateClassTS([
-  decorator17.command()
+  decorator18.command()
 ], MakeEntityCommand);
 // src/commands/MakeLoggerCommand.ts
-import { join as join18 } from "path";
-import { decorator as decorator18 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger17 } from "@ooneex/logger";
+import { join as join19 } from "path";
+import { decorator as decorator19 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger18 } 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'", () => {
@@ -9214,28 +9342,28 @@ class MakeLoggerCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join18("modules", module) : ".";
-    const loggerLocalDir = join18(base, "src", "loggers");
-    const loggerDir = join18(process.cwd(), loggerLocalDir);
-    const filePath = join18(loggerDir, `${name}Logger.ts`);
+    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`);
     await Bun.write(filePath, content);
-    const testContent = logger_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join18(base, "tests", "loggers");
-    const testsDir = join18(process.cwd(), testsLocalDir);
-    const testFilePath = join18(testsDir, `${name}Logger.spec.ts`);
+    const testContent = logger_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join19(base, "tests", "loggers");
+    const testsDir = join19(process.cwd(), testsLocalDir);
+    const testFilePath = join19(testsDir, `${name}Logger.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger17;
-    logger.success(`${join18(loggerLocalDir, name)}Logger.ts created successfully`, undefined, {
+    const logger = new TerminalLogger18;
+    logger.success(`${join19(loggerLocalDir, name)}Logger.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join18(testsLocalDir, name)}Logger.spec.ts created successfully`, undefined, {
+    logger.success(`${join19(testsLocalDir, name)}Logger.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join18(process.cwd(), "package.json");
+    const packageJsonPath = join19(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -9250,17 +9378,17 @@ class MakeLoggerCommand {
   }
 }
 MakeLoggerCommand = __legacyDecorateClassTS([
-  decorator18.command()
+  decorator19.command()
 ], MakeLoggerCommand);
 // src/commands/MakeMailerCommand.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 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'", () => {
@@ -9303,7 +9431,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'", () => {
@@ -9353,43 +9481,43 @@ class MakeMailerCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join19("modules", module) : ".";
-    const mailerLocalDir = join19(base, "src", "mailers");
-    const mailerDir = join19(process.cwd(), mailerLocalDir);
-    const mailerFilePath = join19(mailerDir, `${name}Mailer.ts`);
-    const templateFilePath = join19(mailerDir, `${name}MailerTemplate.tsx`);
+    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`);
     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 = join19(base, "tests", "mailers");
-    const testsDir = join19(process.cwd(), testsLocalDir);
-    const mailerTestFilePath = join19(testsDir, `${name}Mailer.spec.ts`);
-    const templateTestFilePath = join19(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 = 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`);
     await Bun.write(mailerTestFilePath, mailerTestContent);
     await Bun.write(templateTestFilePath, templateTestContent);
-    const logger = new TerminalLogger18;
-    logger.success(`${join19(mailerLocalDir, name)}Mailer.ts created successfully`, undefined, {
+    const logger = new TerminalLogger19;
+    logger.success(`${join20(mailerLocalDir, name)}Mailer.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join19(mailerLocalDir, name)}MailerTemplate.tsx created successfully`, undefined, {
+    logger.success(`${join20(mailerLocalDir, name)}MailerTemplate.tsx created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join19(testsLocalDir, name)}Mailer.spec.ts created successfully`, undefined, {
+    logger.success(`${join20(testsLocalDir, name)}Mailer.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join19(testsLocalDir, name)}MailerTemplate.spec.ts created successfully`, undefined, {
+    logger.success(`${join20(testsLocalDir, name)}MailerTemplate.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 ?? {};
@@ -9404,12 +9532,12 @@ class MakeMailerCommand {
   }
 }
 MakeMailerCommand = __legacyDecorateClassTS([
-  decorator19.command()
+  decorator20.command()
 ], MakeMailerCommand);
 // src/commands/MakeMiddlewareCommand.ts
-import { basename as basename4, join as join20 } from "path";
-import { decorator as decorator20 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger19 } from "@ooneex/logger";
+import { basename as basename4, join as join21 } from "path";
+import { decorator as decorator21 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger20 } from "@ooneex/logger";
 import { toPascalCase as toPascalCase11 } from "@ooneex/utils";
 
 // src/templates/middleware.socket.txt
@@ -9429,7 +9557,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'", () => {
@@ -9498,33 +9626,33 @@ class MakeMiddlewareCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join20("modules", module) : ".";
-    const middlewareLocalDir = join20(base, "src", "middlewares");
-    const middlewareDir = join20(process.cwd(), middlewareLocalDir);
-    const filePath = join20(middlewareDir, `${name}Middleware.ts`);
+    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`);
     await Bun.write(filePath, content);
-    const testContent = middleware_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join20(base, "tests", "middlewares");
-    const testsDir = join20(process.cwd(), testsLocalDir);
-    const testFilePath = join20(testsDir, `${name}Middleware.spec.ts`);
+    const testContent = middleware_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join21(base, "tests", "middlewares");
+    const testsDir = join21(process.cwd(), testsLocalDir);
+    const testFilePath = join21(testsDir, `${name}Middleware.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const modulePascalName = module ? toPascalCase11(module) : toPascalCase11(basename4(process.cwd()));
-    const modulePath = join20(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
+    const modulePath = join21(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
     if (await Bun.file(modulePath).exists()) {
       await this.addToModule(modulePath, name);
     }
-    const logger = new TerminalLogger19;
-    logger.success(`${join20(middlewareLocalDir, name)}Middleware.ts created successfully`, undefined, {
+    const logger = new TerminalLogger20;
+    logger.success(`${join21(middlewareLocalDir, name)}Middleware.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join20(testsLocalDir, name)}Middleware.spec.ts created successfully`, undefined, {
+    logger.success(`${join21(testsLocalDir, name)}Middleware.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 ?? {};
@@ -9539,12 +9667,12 @@ class MakeMiddlewareCommand {
   }
 }
 MakeMiddlewareCommand = __legacyDecorateClassTS([
-  decorator20.command()
+  decorator21.command()
 ], MakeMiddlewareCommand);
 // src/commands/MakeMigrationCommand.ts
-import { join as join21 } from "path";
-import { decorator as decorator21 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger20 } from "@ooneex/logger";
+import { join as join22 } from "path";
+import { decorator as decorator22 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger21 } from "@ooneex/logger";
 import { migrationCreate } from "@ooneex/migrations";
 
 // src/templates/module/migration.up.txt
@@ -9572,17 +9700,17 @@ class MakeMigrationCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join21("modules", module) : ".";
+    const base = module ? join22("modules", module) : ".";
     const { migrationPath: filePath } = await migrationCreate({
-      migrationsDir: join21(base, "src", "migrations"),
-      testsDir: join21(base, "tests", "migrations")
+      migrationsDir: join22(base, "src", "migrations"),
+      testsDir: join22(base, "tests", "migrations")
     });
-    const binMigrationUpPath = join21(process.cwd(), base, "bin", "migration", "up.ts");
+    const binMigrationUpPath = join22(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 TerminalLogger20;
+    const logger = new TerminalLogger21;
     logger.success(`${filePath} created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
@@ -9591,18 +9719,18 @@ class MakeMigrationCommand {
   }
 }
 MakeMigrationCommand = __legacyDecorateClassTS([
-  decorator21.command()
+  decorator22.command()
 ], MakeMigrationCommand);
 // src/commands/MakePermissionCommand.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 { 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'", () => {
@@ -9687,28 +9815,28 @@ class MakePermissionCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join22("modules", module) : ".";
-    const permissionLocalDir = join22(base, "src", "permissions");
-    const permissionDir = join22(process.cwd(), permissionLocalDir);
-    const filePath = join22(permissionDir, `${name}Permission.ts`);
+    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`);
     await Bun.write(filePath, content);
-    const testContent = permission_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join22(base, "tests", "permissions");
-    const testsDir = join22(process.cwd(), testsLocalDir);
-    const testFilePath = join22(testsDir, `${name}Permission.spec.ts`);
+    const testContent = permission_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join23(base, "tests", "permissions");
+    const testsDir = join23(process.cwd(), testsLocalDir);
+    const testFilePath = join23(testsDir, `${name}Permission.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger21;
-    logger.success(`${join22(permissionLocalDir, name)}Permission.ts created successfully`, undefined, {
+    const logger = new TerminalLogger22;
+    logger.success(`${join23(permissionLocalDir, name)}Permission.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join22(testsLocalDir, name)}Permission.spec.ts created successfully`, undefined, {
+    logger.success(`${join23(testsLocalDir, name)}Permission.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join22(process.cwd(), "package.json");
+    const packageJsonPath = join23(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -9723,17 +9851,17 @@ class MakePermissionCommand {
   }
 }
 MakePermissionCommand = __legacyDecorateClassTS([
-  decorator22.command()
+  decorator23.command()
 ], MakePermissionCommand);
 // src/commands/MakePubSubCommand.ts
-import { basename as basename5, join as join23 } from "path";
-import { decorator as decorator23 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger22 } from "@ooneex/logger";
+import { basename as basename5, join as join24 } from "path";
+import { decorator as decorator24 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger23 } 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'", () => {
@@ -9836,33 +9964,33 @@ class MakePubSubCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join23("modules", module) : ".";
-    const pubSubLocalDir = join23(base, "src", "events");
-    const pubSubDir = join23(process.cwd(), pubSubLocalDir);
-    const filePath = join23(pubSubDir, `${name}Event.ts`);
+    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`);
     await Bun.write(filePath, content);
-    const testContent = pubsub_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join23(base, "tests", "events");
-    const testsDir = join23(process.cwd(), testsLocalDir);
-    const testFilePath = join23(testsDir, `${name}Event.spec.ts`);
+    const testContent = pubsub_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join24(base, "tests", "events");
+    const testsDir = join24(process.cwd(), testsLocalDir);
+    const testFilePath = join24(testsDir, `${name}Event.spec.ts`);
     await Bun.write(testFilePath, testContent);
     const modulePascalName = module ? toPascalCase13(module) : toPascalCase13(basename5(process.cwd()));
-    const modulePath = join23(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
+    const modulePath = join24(process.cwd(), base, "src", `${modulePascalName}Module.ts`);
     if (await Bun.file(modulePath).exists()) {
       await this.addToModule(modulePath, name);
     }
-    const logger = new TerminalLogger22;
-    logger.success(`${join23(pubSubLocalDir, name)}Event.ts created successfully`, undefined, {
+    const logger = new TerminalLogger23;
+    logger.success(`${join24(pubSubLocalDir, name)}Event.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join23(testsLocalDir, name)}Event.spec.ts created successfully`, undefined, {
+    logger.success(`${join24(testsLocalDir, name)}Event.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 ?? {};
@@ -9877,13 +10005,13 @@ class MakePubSubCommand {
   }
 }
 MakePubSubCommand = __legacyDecorateClassTS([
-  decorator23.command()
+  decorator24.command()
 ], MakePubSubCommand);
 // src/commands/MakeReleaseCommand.ts
 import { readdir } from "fs/promises";
-import { join as join24 } from "path";
-import { decorator as decorator24 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger23 } from "@ooneex/logger";
+import { join as join25 } from "path";
+import { decorator as decorator25 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger24 } from "@ooneex/logger";
 var {$ } = globalThis.Bun;
 var COMMIT_TYPE_TO_CATEGORY = {
   feat: "Added",
@@ -9906,7 +10034,7 @@ class MakeReleaseCommand {
     return "Release packages with version bump, changelog, and git tag";
   }
   async run() {
-    const logger = new TerminalLogger23;
+    const logger = new TerminalLogger24;
     const cwd = process.cwd();
     const dirs = [];
     for (const { name, type } of [
@@ -9914,8 +10042,8 @@ class MakeReleaseCommand {
       { name: "modules", type: "module" }
     ]) {
       try {
-        const entries = await readdir(join24(cwd, name), { withFileTypes: true });
-        dirs.push(...entries.filter((d) => d.isDirectory()).map((d) => ({ base: join24(name, d.name), type })));
+        const entries = await readdir(join25(cwd, name), { withFileTypes: true });
+        dirs.push(...entries.filter((d) => d.isDirectory()).map((d) => ({ base: join25(name, d.name), type })));
       } catch {}
     }
     const logOptions = { showTimestamp: false, showArrow: false, useSymbol: true };
@@ -9925,8 +10053,8 @@ class MakeReleaseCommand {
     }
     let releasedCount = 0;
     for (const dir of dirs) {
-      const fullDir = join24(cwd, dir.base);
-      const pkgJsonPath = join24(fullDir, "package.json");
+      const fullDir = join25(cwd, dir.base);
+      const pkgJsonPath = join25(fullDir, "package.json");
       const pkgJsonFile = Bun.file(pkgJsonPath);
       if (!await pkgJsonFile.exists()) {
         continue;
@@ -9944,7 +10072,7 @@ class MakeReleaseCommand {
       await Bun.write(pkgJsonPath, `${JSON.stringify(pkgJson, null, 2)}
 `);
       await this.updateChangelog(fullDir, newVersion, tag, commits);
-      await this.gitAdd(join24(dir.base, "package.json"), join24(dir.base, "CHANGELOG.md"));
+      await this.gitAdd(join25(dir.base, "package.json"), join25(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);
@@ -10045,7 +10173,7 @@ class MakeReleaseCommand {
     }
   }
   async updateChangelog(dir, version, tag, commits) {
-    const changelogPath = join24(dir, "CHANGELOG.md");
+    const changelogPath = join25(dir, "CHANGELOG.md");
     const today = new Date().toISOString().split("T")[0];
     const repoUrl = await this.getRepoUrl();
     const grouped = new Map;
@@ -10122,17 +10250,17 @@ ${section}
   }
 }
 MakeReleaseCommand = __legacyDecorateClassTS([
-  decorator24.command()
+  decorator25.command()
 ], MakeReleaseCommand);
 // src/commands/MakeRepositoryCommand.ts
-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";
 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'", () => {
@@ -10341,28 +10469,28 @@ class MakeRepositoryCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join25("modules", module) : ".";
-    const repositoriesLocalDir = join25(base, "src", "repositories");
-    const repositoriesDir = join25(process.cwd(), repositoriesLocalDir);
-    const filePath = join25(repositoriesDir, `${name}Repository.ts`);
+    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`);
     await Bun.write(filePath, content);
-    const testContent = repository_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join25(base, "tests", "repositories");
-    const testsDir = join25(process.cwd(), testsLocalDir);
-    const testFilePath = join25(testsDir, `${name}Repository.spec.ts`);
+    const testContent = repository_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join26(base, "tests", "repositories");
+    const testsDir = join26(process.cwd(), testsLocalDir);
+    const testFilePath = join26(testsDir, `${name}Repository.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger24;
-    logger.success(`${join25(repositoriesLocalDir, name)}Repository.ts created successfully`, undefined, {
+    const logger = new TerminalLogger25;
+    logger.success(`${join26(repositoriesLocalDir, name)}Repository.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join25(testsLocalDir, name)}Repository.spec.ts created successfully`, undefined, {
+    logger.success(`${join26(testsLocalDir, name)}Repository.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join25(process.cwd(), "package.json");
+    const packageJsonPath = join26(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -10377,11 +10505,11 @@ class MakeRepositoryCommand {
   }
 }
 MakeRepositoryCommand = __legacyDecorateClassTS([
-  decorator25.command()
+  decorator26.command()
 ], MakeRepositoryCommand);
 // src/commands/MakeResourceBookCommand.ts
-import { join as join27 } from "path";
-import { decorator as decorator27 } from "@ooneex/command";
+import { join as join28 } from "path";
+import { decorator as decorator28 } from "@ooneex/command";
 var {Glob } = globalThis.Bun;
 
 // src/templates/resources/book/BookEntity.txt
@@ -11077,14 +11205,14 @@ export class UpdateBookService implements IService {
 `;
 
 // src/commands/MakeServiceCommand.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 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'", () => {
@@ -11131,28 +11259,28 @@ class MakeServiceCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join26("modules", module) : ".";
-    const serviceLocalDir = join26(base, "src", "services");
-    const serviceDir = join26(process.cwd(), serviceLocalDir);
-    const filePath = join26(serviceDir, `${name}Service.ts`);
+    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`);
     await Bun.write(filePath, content);
-    const testContent = service_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join26(base, "tests", "services");
-    const testsDir = join26(process.cwd(), testsLocalDir);
-    const testFilePath = join26(testsDir, `${name}Service.spec.ts`);
+    const testContent = service_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join27(base, "tests", "services");
+    const testsDir = join27(process.cwd(), testsLocalDir);
+    const testFilePath = join27(testsDir, `${name}Service.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger25;
-    logger.success(`${join26(serviceLocalDir, name)}Service.ts created successfully`, undefined, {
+    const logger = new TerminalLogger26;
+    logger.success(`${join27(serviceLocalDir, name)}Service.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join26(testsLocalDir, name)}Service.spec.ts created successfully`, undefined, {
+    logger.success(`${join27(testsLocalDir, name)}Service.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 ?? {};
@@ -11167,7 +11295,7 @@ class MakeServiceCommand {
   }
 }
 MakeServiceCommand = __legacyDecorateClassTS([
-  decorator26.command()
+  decorator27.command()
 ], MakeServiceCommand);
 
 // src/commands/MakeResourceBookCommand.ts
@@ -11180,9 +11308,9 @@ class MakeResourceBookCommand {
   }
   async run() {
     const module = "book";
-    const base = join27("modules", module);
+    const base = join28("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
-    await makeModuleCommand.run({ name: module, silent: true, skipMigrations: false, skipSeeds: true });
+    await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
     await makeEntityCommand.run({ name: "Book", module, tableName: "books" });
     const makeMigrationCommand = new MakeMigrationCommand;
@@ -11200,26 +11328,26 @@ class MakeResourceBookCommand {
     for (const controller of controllers) {
       await makeControllerCommand.run({ ...controller, module, isSocket: false });
     }
-    const controllersDir = join27(process.cwd(), base, "src", "controllers");
-    await Bun.write(join27(controllersDir, "CreateBookController.ts"), CreateBookController_default);
-    await Bun.write(join27(controllersDir, "GetBookController.ts"), GetBookController_default);
-    await Bun.write(join27(controllersDir, "ListBooksController.ts"), ListBooksController_default);
-    await Bun.write(join27(controllersDir, "UpdateBookController.ts"), UpdateBookController_default);
-    await Bun.write(join27(controllersDir, "DeleteBookController.ts"), DeleteBookController_default);
+    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 makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateBook", "GetBook", "ListBooks", "UpdateBook", "DeleteBook"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join27(process.cwd(), base, "src", "services");
-    await Bun.write(join27(servicesDir, "CreateBookService.ts"), CreateBookService_default);
-    await Bun.write(join27(servicesDir, "GetBookService.ts"), GetBookService_default);
-    await Bun.write(join27(servicesDir, "ListBooksService.ts"), ListBooksService_default);
-    await Bun.write(join27(servicesDir, "UpdateBookService.ts"), UpdateBookService_default);
-    await Bun.write(join27(servicesDir, "DeleteBookService.ts"), DeleteBookService_default);
-    const entityPath = join27(process.cwd(), base, "src", "entities", "BookEntity.ts");
+    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");
     await Bun.write(entityPath, BookEntity_default);
-    const migrationsDir = join27(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join28(process.cwd(), base, "src", "migrations");
     const glob = new Glob("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -11227,18 +11355,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(join27(migrationsDir, file), content);
+      await Bun.write(join28(migrationsDir, file), content);
     }
-    const repositoryPath = join27(process.cwd(), base, "src", "repositories", "BookRepository.ts");
+    const repositoryPath = join28(process.cwd(), base, "src", "repositories", "BookRepository.ts");
     await Bun.write(repositoryPath, BookRepository_default);
   }
 }
 MakeResourceBookCommand = __legacyDecorateClassTS([
-  decorator27.command()
+  decorator28.command()
 ], MakeResourceBookCommand);
 // src/commands/MakeResourceCalendarEventCommand.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: Glob2 } = globalThis.Bun;
 
 // src/templates/resources/calendar-event/CalendarEventEntity.txt
@@ -11930,9 +12058,9 @@ class MakeResourceCalendarEventCommand {
   }
   async run() {
     const module = "calendar-event";
-    const base = join28("modules", module);
+    const base = join29("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
-    await makeModuleCommand.run({ name: module, silent: true, skipMigrations: false, skipSeeds: true });
+    await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
     await makeEntityCommand.run({ name: "CalendarEvent", module, tableName: "calendar_events" });
     const makeMigrationCommand = new MakeMigrationCommand;
@@ -11965,12 +12093,12 @@ class MakeResourceCalendarEventCommand {
     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, "CreateCalendarEventController.ts"), CreateCalendarEventController_default);
-    await Bun.write(join28(controllersDir, "GetCalendarEventController.ts"), GetCalendarEventController_default);
-    await Bun.write(join28(controllersDir, "ListCalendarEventsController.ts"), ListCalendarEventsController_default);
-    await Bun.write(join28(controllersDir, "UpdateCalendarEventController.ts"), UpdateCalendarEventController_default);
-    await Bun.write(join28(controllersDir, "DeleteCalendarEventController.ts"), DeleteCalendarEventController_default);
+    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 makeServiceCommand = new MakeServiceCommand;
     const services = [
       "CreateCalendarEvent",
@@ -11982,15 +12110,15 @@ class MakeResourceCalendarEventCommand {
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join28(process.cwd(), base, "src", "services");
-    await Bun.write(join28(servicesDir, "CreateCalendarEventService.ts"), CreateCalendarEventService_default);
-    await Bun.write(join28(servicesDir, "GetCalendarEventService.ts"), GetCalendarEventService_default);
-    await Bun.write(join28(servicesDir, "ListCalendarEventsService.ts"), ListCalendarEventsService_default);
-    await Bun.write(join28(servicesDir, "UpdateCalendarEventService.ts"), UpdateCalendarEventService_default);
-    await Bun.write(join28(servicesDir, "DeleteCalendarEventService.ts"), DeleteCalendarEventService_default);
-    const entityPath = join28(process.cwd(), base, "src", "entities", "CalendarEventEntity.ts");
+    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");
     await Bun.write(entityPath, CalendarEventEntity_default);
-    const migrationsDir = join28(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join29(process.cwd(), base, "src", "migrations");
     const glob = new Glob2("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -11998,18 +12126,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(join28(migrationsDir, file), content);
+      await Bun.write(join29(migrationsDir, file), content);
     }
-    const repositoryPath = join28(process.cwd(), base, "src", "repositories", "CalendarEventRepository.ts");
+    const repositoryPath = join29(process.cwd(), base, "src", "repositories", "CalendarEventRepository.ts");
     await Bun.write(repositoryPath, CalendarEventRepository_default);
   }
 }
 MakeResourceCalendarEventCommand = __legacyDecorateClassTS([
-  decorator28.command()
+  decorator29.command()
 ], MakeResourceCalendarEventCommand);
 // src/commands/MakeResourceCategoryCommand.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: Glob3 } = globalThis.Bun;
 
 // src/templates/resources/category/CategoryEntity.txt
@@ -12600,9 +12728,9 @@ class MakeResourceCategoryCommand {
   }
   async run() {
     const module = "category";
-    const base = join29("modules", module);
+    const base = join30("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
-    await makeModuleCommand.run({ name: module, silent: true, skipMigrations: false, skipSeeds: true });
+    await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
     await makeEntityCommand.run({ name: "Category", module, tableName: "categories" });
     const makeMigrationCommand = new MakeMigrationCommand;
@@ -12635,26 +12763,26 @@ class MakeResourceCategoryCommand {
     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, "CreateCategoryController.ts"), CreateCategoryController_default);
-    await Bun.write(join29(controllersDir, "GetCategoryController.ts"), GetCategoryController_default);
-    await Bun.write(join29(controllersDir, "ListCategoriesController.ts"), ListCategoriesController_default);
-    await Bun.write(join29(controllersDir, "UpdateCategoryController.ts"), UpdateCategoryController_default);
-    await Bun.write(join29(controllersDir, "DeleteCategoryController.ts"), DeleteCategoryController_default);
+    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 makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateCategory", "GetCategory", "ListCategories", "UpdateCategory", "DeleteCategory"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join29(process.cwd(), base, "src", "services");
-    await Bun.write(join29(servicesDir, "CreateCategoryService.ts"), CreateCategoryService_default);
-    await Bun.write(join29(servicesDir, "GetCategoryService.ts"), GetCategoryService_default);
-    await Bun.write(join29(servicesDir, "ListCategoriesService.ts"), ListCategoriesService_default);
-    await Bun.write(join29(servicesDir, "UpdateCategoryService.ts"), UpdateCategoryService_default);
-    await Bun.write(join29(servicesDir, "DeleteCategoryService.ts"), DeleteCategoryService_default);
-    const entityPath = join29(process.cwd(), base, "src", "entities", "CategoryEntity.ts");
+    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");
     await Bun.write(entityPath, CategoryEntity_default);
-    const migrationsDir = join29(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join30(process.cwd(), base, "src", "migrations");
     const glob = new Glob3("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -12662,18 +12790,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(join29(migrationsDir, file), content);
+      await Bun.write(join30(migrationsDir, file), content);
     }
-    const repositoryPath = join29(process.cwd(), base, "src", "repositories", "CategoryRepository.ts");
+    const repositoryPath = join30(process.cwd(), base, "src", "repositories", "CategoryRepository.ts");
     await Bun.write(repositoryPath, CategoryRepository_default);
   }
 }
 MakeResourceCategoryCommand = __legacyDecorateClassTS([
-  decorator29.command()
+  decorator30.command()
 ], MakeResourceCategoryCommand);
 // src/commands/MakeResourceColorCommand.ts
-import { join as join31 } from "path";
-import { decorator as decorator31 } from "@ooneex/command";
+import { join as join32 } from "path";
+import { decorator as decorator32 } from "@ooneex/command";
 var {Glob: Glob4 } = globalThis.Bun;
 
 // src/templates/resources/color/ColorEntity.txt
@@ -13111,18 +13239,27 @@ export class UpdateColorController {
 `;
 
 // src/templates/resources/color/seeds/ColorSeed.txt
-var ColorSeed_default = `import { resolve } from "@ooneex/container";
+var ColorSeed_default = `import { inject } from "@ooneex/container";
 import { decorator, type ISeed, type SeedClassType } from "@ooneex/seeds";
+import type { LocaleType } from "@ooneex/translation";
 import { ColorEntity } from "../entities/ColorEntity";
 import { ColorRepository } from "../repositories/ColorRepository";
-import data from "./data.yml";
+import data from "./color-seed.yml";
+
+type ColorSeedDataType = {
+  id: string;
+  name: string;
+  hex: string;
+  description?: string;
+  lang?: LocaleType;
+};
 
 @decorator.seed()
 export class ColorSeed implements ISeed {
-  public async run<T>(): Promise<T> {
-    const repository = resolve(ColorRepository);
+  constructor(@inject(ColorRepository) private readonly repository: ColorRepository) {}
 
-    const entities = (data as Record<string, string>[]).map((item) => {
+  public async run<T>(): Promise<T> {
+    const entities = (data as ColorSeedDataType[]).map((item) => {
       const entity = new ColorEntity();
       entity.id = item.id;
       entity.name = item.name;
@@ -13133,8 +13270,8 @@ export class ColorSeed implements ISeed {
       return entity;
     });
 
-    const result = await repository.createMany(entities);
-    await repository.close();
+    const result = await this.repository.createMany(entities);
+    await this.repository.close();
 
     return result as T;
   }
@@ -13456,9 +13593,9 @@ export class UpdateColorService implements IService {
 `;
 
 // src/commands/MakeSeedCommand.ts
-import { join as join30 } from "path";
-import { decorator as decorator30 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger26 } from "@ooneex/logger";
+import { join as join31 } from "path";
+import { decorator as decorator31 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger27 } from "@ooneex/logger";
 import { seedCreate } from "@ooneex/seeds";
 
 // src/templates/module/seed.run.txt
@@ -13497,18 +13634,18 @@ class MakeSeedCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join30("modules", module) : ".";
+    const base = module ? join31("modules", module) : ".";
     const { seedPath: filePath, dataPath } = await seedCreate({
       name,
-      seedsDir: join30(base, "src", "seeds"),
-      testsDir: join30(base, "tests", "seeds")
+      seedsDir: join31(base, "src", "seeds"),
+      testsDir: join31(base, "tests", "seeds")
     });
-    const binSeedRunPath = join30(process.cwd(), base, "bin", "seed", "run.ts");
+    const binSeedRunPath = join31(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 TerminalLogger26;
+    const logger = new TerminalLogger27;
     logger.success(`${filePath} created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
@@ -13522,7 +13659,7 @@ class MakeSeedCommand {
   }
 }
 MakeSeedCommand = __legacyDecorateClassTS([
-  decorator30.command()
+  decorator31.command()
 ], MakeSeedCommand);
 
 // src/commands/MakeResourceColorCommand.ts
@@ -13535,9 +13672,9 @@ class MakeResourceColorCommand {
   }
   async run() {
     const module = "color";
-    const base = join31("modules", module);
+    const base = join32("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
-    await makeModuleCommand.run({ name: module, silent: true, skipMigrations: false, skipSeeds: true });
+    await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
     await makeEntityCommand.run({ name: "Color", module, tableName: "colors" });
     const makeMigrationCommand = new MakeMigrationCommand;
@@ -13558,26 +13695,26 @@ class MakeResourceColorCommand {
     for (const controller of controllers) {
       await makeControllerCommand.run({ ...controller, module, isSocket: false });
     }
-    const controllersDir = join31(process.cwd(), base, "src", "controllers");
-    await Bun.write(join31(controllersDir, "CreateColorController.ts"), CreateColorController_default);
-    await Bun.write(join31(controllersDir, "GetColorController.ts"), GetColorController_default);
-    await Bun.write(join31(controllersDir, "ListColorsController.ts"), ListColorsController_default);
-    await Bun.write(join31(controllersDir, "UpdateColorController.ts"), UpdateColorController_default);
-    await Bun.write(join31(controllersDir, "DeleteColorController.ts"), DeleteColorController_default);
+    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 makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateColor", "GetColor", "ListColors", "UpdateColor", "DeleteColor"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join31(process.cwd(), base, "src", "services");
-    await Bun.write(join31(servicesDir, "CreateColorService.ts"), CreateColorService_default);
-    await Bun.write(join31(servicesDir, "GetColorService.ts"), GetColorService_default);
-    await Bun.write(join31(servicesDir, "ListColorsService.ts"), ListColorsService_default);
-    await Bun.write(join31(servicesDir, "UpdateColorService.ts"), UpdateColorService_default);
-    await Bun.write(join31(servicesDir, "DeleteColorService.ts"), DeleteColorService_default);
-    const entityPath = join31(process.cwd(), base, "src", "entities", "ColorEntity.ts");
+    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");
     await Bun.write(entityPath, ColorEntity_default);
-    const migrationsDir = join31(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join32(process.cwd(), base, "src", "migrations");
     const glob = new Glob4("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -13585,23 +13722,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(join31(migrationsDir, file), content);
+      await Bun.write(join32(migrationsDir, file), content);
     }
-    const repositoryPath = join31(process.cwd(), base, "src", "repositories", "ColorRepository.ts");
+    const repositoryPath = join32(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 = join31(process.cwd(), base, "src", "seeds");
-    await Bun.write(join31(seedsDir, "ColorSeed.ts"), ColorSeed_default);
-    await Bun.write(join31(seedsDir, "color-seed.yml"), color_seed_default);
+    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);
   }
 }
 MakeResourceColorCommand = __legacyDecorateClassTS([
-  decorator31.command()
+  decorator32.command()
 ], MakeResourceColorCommand);
 // src/commands/MakeResourceDiscountCommand.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: Glob5 } = globalThis.Bun;
 
 // src/templates/resources/discount/controllers/CreateDiscountController.txt
@@ -14244,9 +14381,9 @@ class MakeResourceDiscountCommand {
   }
   async run() {
     const module = "discount";
-    const base = join32("modules", module);
+    const base = join33("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
-    await makeModuleCommand.run({ name: module, silent: true, skipMigrations: false, skipSeeds: true });
+    await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
     await makeEntityCommand.run({ name: "Discount", module, tableName: "discounts" });
     const makeMigrationCommand = new MakeMigrationCommand;
@@ -14279,26 +14416,26 @@ class MakeResourceDiscountCommand {
     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, "CreateDiscountController.ts"), CreateDiscountController_default);
-    await Bun.write(join32(controllersDir, "GetDiscountController.ts"), GetDiscountController_default);
-    await Bun.write(join32(controllersDir, "ListDiscountsController.ts"), ListDiscountsController_default);
-    await Bun.write(join32(controllersDir, "UpdateDiscountController.ts"), UpdateDiscountController_default);
-    await Bun.write(join32(controllersDir, "DeleteDiscountController.ts"), DeleteDiscountController_default);
+    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 makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateDiscount", "GetDiscount", "ListDiscounts", "UpdateDiscount", "DeleteDiscount"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join32(process.cwd(), base, "src", "services");
-    await Bun.write(join32(servicesDir, "CreateDiscountService.ts"), CreateDiscountService_default);
-    await Bun.write(join32(servicesDir, "GetDiscountService.ts"), GetDiscountService_default);
-    await Bun.write(join32(servicesDir, "ListDiscountsService.ts"), ListDiscountsService_default);
-    await Bun.write(join32(servicesDir, "UpdateDiscountService.ts"), UpdateDiscountService_default);
-    await Bun.write(join32(servicesDir, "DeleteDiscountService.ts"), DeleteDiscountService_default);
-    const entityPath = join32(process.cwd(), base, "src", "entities", "DiscountEntity.ts");
+    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");
     await Bun.write(entityPath, DiscountEntity_default);
-    const migrationsDir = join32(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join33(process.cwd(), base, "src", "migrations");
     const glob = new Glob5("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -14306,18 +14443,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(join32(migrationsDir, file), content);
+      await Bun.write(join33(migrationsDir, file), content);
     }
-    const repositoryPath = join32(process.cwd(), base, "src", "repositories", "DiscountRepository.ts");
+    const repositoryPath = join33(process.cwd(), base, "src", "repositories", "DiscountRepository.ts");
     await Bun.write(repositoryPath, DiscountRepository_default);
   }
 }
 MakeResourceDiscountCommand = __legacyDecorateClassTS([
-  decorator32.command()
+  decorator33.command()
 ], MakeResourceDiscountCommand);
 // src/commands/MakeResourceFolderCommand.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: Glob6 } = globalThis.Bun;
 
 // src/templates/resources/folder/controllers/CreateFolderController.txt
@@ -14944,9 +15081,9 @@ class MakeResourceFolderCommand {
   }
   async run() {
     const module = "folder";
-    const base = join33("modules", module);
+    const base = join34("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
-    await makeModuleCommand.run({ name: module, silent: true, skipMigrations: false, skipSeeds: true });
+    await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
     await makeEntityCommand.run({ name: "Folder", module, tableName: "folders" });
     const makeMigrationCommand = new MakeMigrationCommand;
@@ -14979,26 +15116,26 @@ class MakeResourceFolderCommand {
     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, "CreateFolderController.ts"), CreateFolderController_default);
-    await Bun.write(join33(controllersDir, "GetFolderController.ts"), GetFolderController_default);
-    await Bun.write(join33(controllersDir, "ListFoldersController.ts"), ListFoldersController_default);
-    await Bun.write(join33(controllersDir, "UpdateFolderController.ts"), UpdateFolderController_default);
-    await Bun.write(join33(controllersDir, "DeleteFolderController.ts"), DeleteFolderController_default);
+    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 makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateFolder", "GetFolder", "ListFolders", "UpdateFolder", "DeleteFolder"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join33(process.cwd(), base, "src", "services");
-    await Bun.write(join33(servicesDir, "CreateFolderService.ts"), CreateFolderService_default);
-    await Bun.write(join33(servicesDir, "GetFolderService.ts"), GetFolderService_default);
-    await Bun.write(join33(servicesDir, "ListFoldersService.ts"), ListFoldersService_default);
-    await Bun.write(join33(servicesDir, "UpdateFolderService.ts"), UpdateFolderService_default);
-    await Bun.write(join33(servicesDir, "DeleteFolderService.ts"), DeleteFolderService_default);
-    const entityPath = join33(process.cwd(), base, "src", "entities", "FolderEntity.ts");
+    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");
     await Bun.write(entityPath, FolderEntity_default);
-    const migrationsDir = join33(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join34(process.cwd(), base, "src", "migrations");
     const glob = new Glob6("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -15006,18 +15143,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(join33(migrationsDir, file), content);
+      await Bun.write(join34(migrationsDir, file), content);
     }
-    const repositoryPath = join33(process.cwd(), base, "src", "repositories", "FolderRepository.ts");
+    const repositoryPath = join34(process.cwd(), base, "src", "repositories", "FolderRepository.ts");
     await Bun.write(repositoryPath, FolderRepository_default);
   }
 }
 MakeResourceFolderCommand = __legacyDecorateClassTS([
-  decorator33.command()
+  decorator34.command()
 ], MakeResourceFolderCommand);
 // src/commands/MakeResourceImageCommand.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: Glob7 } = globalThis.Bun;
 
 // src/templates/resources/image/controllers/CreateImageController.txt
@@ -15683,9 +15820,9 @@ class MakeResourceImageCommand {
   }
   async run() {
     const module = "image";
-    const base = join34("modules", module);
+    const base = join35("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
-    await makeModuleCommand.run({ name: module, silent: true, skipMigrations: false, skipSeeds: true });
+    await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
     await makeEntityCommand.run({ name: "Image", module, tableName: "images" });
     const makeMigrationCommand = new MakeMigrationCommand;
@@ -15718,26 +15855,26 @@ class MakeResourceImageCommand {
     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, "CreateImageController.ts"), CreateImageController_default);
-    await Bun.write(join34(controllersDir, "GetImageController.ts"), GetImageController_default);
-    await Bun.write(join34(controllersDir, "ListImagesController.ts"), ListImagesController_default);
-    await Bun.write(join34(controllersDir, "UpdateImageController.ts"), UpdateImageController_default);
-    await Bun.write(join34(controllersDir, "DeleteImageController.ts"), DeleteImageController_default);
+    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 makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateImage", "GetImage", "ListImages", "UpdateImage", "DeleteImage"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join34(process.cwd(), base, "src", "services");
-    await Bun.write(join34(servicesDir, "CreateImageService.ts"), CreateImageService_default);
-    await Bun.write(join34(servicesDir, "GetImageService.ts"), GetImageService_default);
-    await Bun.write(join34(servicesDir, "ListImagesService.ts"), ListImagesService_default);
-    await Bun.write(join34(servicesDir, "UpdateImageService.ts"), UpdateImageService_default);
-    await Bun.write(join34(servicesDir, "DeleteImageService.ts"), DeleteImageService_default);
-    const entityPath = join34(process.cwd(), base, "src", "entities", "ImageEntity.ts");
+    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");
     await Bun.write(entityPath, ImageEntity_default);
-    const migrationsDir = join34(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join35(process.cwd(), base, "src", "migrations");
     const glob = new Glob7("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -15745,18 +15882,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(join34(migrationsDir, file), content);
+      await Bun.write(join35(migrationsDir, file), content);
     }
-    const repositoryPath = join34(process.cwd(), base, "src", "repositories", "ImageRepository.ts");
+    const repositoryPath = join35(process.cwd(), base, "src", "repositories", "ImageRepository.ts");
     await Bun.write(repositoryPath, ImageRepository_default);
   }
 }
 MakeResourceImageCommand = __legacyDecorateClassTS([
-  decorator34.command()
+  decorator35.command()
 ], MakeResourceImageCommand);
 // src/commands/MakeResourceNoteCommand.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: Glob8 } = globalThis.Bun;
 
 // src/templates/resources/note/controllers/CreateNoteController.txt
@@ -16461,9 +16598,9 @@ class MakeResourceNoteCommand {
   }
   async run() {
     const module = "note";
-    const base = join35("modules", module);
+    const base = join36("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
-    await makeModuleCommand.run({ name: module, silent: true, skipMigrations: false, skipSeeds: true });
+    await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
     await makeEntityCommand.run({ name: "Note", module, tableName: "notes" });
     const makeMigrationCommand = new MakeMigrationCommand;
@@ -16496,26 +16633,26 @@ class MakeResourceNoteCommand {
     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, "CreateNoteController.ts"), CreateNoteController_default);
-    await Bun.write(join35(controllersDir, "GetNoteController.ts"), GetNoteController_default);
-    await Bun.write(join35(controllersDir, "ListNotesController.ts"), ListNotesController_default);
-    await Bun.write(join35(controllersDir, "UpdateNoteController.ts"), UpdateNoteController_default);
-    await Bun.write(join35(controllersDir, "DeleteNoteController.ts"), DeleteNoteController_default);
+    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 makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateNote", "GetNote", "ListNotes", "UpdateNote", "DeleteNote"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join35(process.cwd(), base, "src", "services");
-    await Bun.write(join35(servicesDir, "CreateNoteService.ts"), CreateNoteService_default);
-    await Bun.write(join35(servicesDir, "GetNoteService.ts"), GetNoteService_default);
-    await Bun.write(join35(servicesDir, "ListNotesService.ts"), ListNotesService_default);
-    await Bun.write(join35(servicesDir, "UpdateNoteService.ts"), UpdateNoteService_default);
-    await Bun.write(join35(servicesDir, "DeleteNoteService.ts"), DeleteNoteService_default);
-    const entityPath = join35(process.cwd(), base, "src", "entities", "NoteEntity.ts");
+    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");
     await Bun.write(entityPath, NoteEntity_default);
-    const migrationsDir = join35(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join36(process.cwd(), base, "src", "migrations");
     const glob = new Glob8("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -16523,18 +16660,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(join35(migrationsDir, file), content);
+      await Bun.write(join36(migrationsDir, file), content);
     }
-    const repositoryPath = join35(process.cwd(), base, "src", "repositories", "NoteRepository.ts");
+    const repositoryPath = join36(process.cwd(), base, "src", "repositories", "NoteRepository.ts");
     await Bun.write(repositoryPath, NoteRepository_default);
   }
 }
 MakeResourceNoteCommand = __legacyDecorateClassTS([
-  decorator35.command()
+  decorator36.command()
 ], MakeResourceNoteCommand);
 // src/commands/MakeResourceStatusCommand.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: Glob9 } = globalThis.Bun;
 
 // src/templates/resources/status/controllers/CreateStatusController.txt
@@ -16968,18 +17105,27 @@ export class StatusRepository {
 `;
 
 // src/templates/resources/status/seeds/StatusSeed.txt
-var StatusSeed_default = `import { resolve } from "@ooneex/container";
+var StatusSeed_default = `import { inject } from "@ooneex/container";
 import { decorator, type ISeed, type SeedClassType } from "@ooneex/seeds";
+import type { LocaleType } from "@ooneex/translation";
 import { StatusEntity } from "../entities/StatusEntity";
 import { StatusRepository } from "../repositories/StatusRepository";
-import data from "./data.yml";
+import data from "./status-seed.yml";
+
+type StatusSeedDataType = {
+  id: string;
+  name: string;
+  color?: string;
+  description?: string;
+  lang?: LocaleType;
+};
 
 @decorator.seed()
 export class StatusSeed implements ISeed {
-  public async run<T>(): Promise<T> {
-    const repository = resolve(StatusRepository);
+  constructor(@inject(StatusRepository) private readonly repository: StatusRepository) {}
 
-    const entities = (data as Record<string, string>[]).map((item) => {
+  public async run<T>(): Promise<T> {
+    const entities = (data as StatusSeedDataType[]).map((item) => {
       const entity = new StatusEntity();
       entity.id = item.id;
       entity.name = item.name;
@@ -16990,8 +17136,8 @@ export class StatusSeed implements ISeed {
       return entity;
     });
 
-    const result = await repository.createMany(entities);
-    await repository.close();
+    const result = await this.repository.createMany(entities);
+    await this.repository.close();
 
     return result as T;
   }
@@ -17386,9 +17532,9 @@ class MakeResourceStatusCommand {
   }
   async run() {
     const module = "status";
-    const base = join36("modules", module);
+    const base = join37("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
-    await makeModuleCommand.run({ name: module, silent: true, skipMigrations: false, skipSeeds: true });
+    await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
     await makeEntityCommand.run({ name: "Status", module, tableName: "statuses" });
     const makeMigrationCommand = new MakeMigrationCommand;
@@ -17421,26 +17567,26 @@ class MakeResourceStatusCommand {
     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, "CreateStatusController.ts"), CreateStatusController_default);
-    await Bun.write(join36(controllersDir, "GetStatusController.ts"), GetStatusController_default);
-    await Bun.write(join36(controllersDir, "ListStatusesController.ts"), ListStatusesController_default);
-    await Bun.write(join36(controllersDir, "UpdateStatusController.ts"), UpdateStatusController_default);
-    await Bun.write(join36(controllersDir, "DeleteStatusController.ts"), DeleteStatusController_default);
+    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 makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateStatus", "GetStatus", "ListStatuses", "UpdateStatus", "DeleteStatus"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join36(process.cwd(), base, "src", "services");
-    await Bun.write(join36(servicesDir, "CreateStatusService.ts"), CreateStatusService_default);
-    await Bun.write(join36(servicesDir, "GetStatusService.ts"), GetStatusService_default);
-    await Bun.write(join36(servicesDir, "ListStatusesService.ts"), ListStatusesService_default);
-    await Bun.write(join36(servicesDir, "UpdateStatusService.ts"), UpdateStatusService_default);
-    await Bun.write(join36(servicesDir, "DeleteStatusService.ts"), DeleteStatusService_default);
-    const entityPath = join36(process.cwd(), base, "src", "entities", "StatusEntity.ts");
+    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");
     await Bun.write(entityPath, StatusEntity_default);
-    const migrationsDir = join36(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join37(process.cwd(), base, "src", "migrations");
     const glob = new Glob9("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -17448,23 +17594,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(join36(migrationsDir, file), content);
+      await Bun.write(join37(migrationsDir, file), content);
     }
-    const repositoryPath = join36(process.cwd(), base, "src", "repositories", "StatusRepository.ts");
+    const repositoryPath = join37(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 = join36(process.cwd(), base, "src", "seeds");
-    await Bun.write(join36(seedsDir, "StatusSeed.ts"), StatusSeed_default);
-    await Bun.write(join36(seedsDir, "status-seed.yml"), status_seed_default);
+    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);
   }
 }
 MakeResourceStatusCommand = __legacyDecorateClassTS([
-  decorator36.command()
+  decorator37.command()
 ], MakeResourceStatusCommand);
 // src/commands/MakeResourceTagCommand.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: Glob10 } = globalThis.Bun;
 
 // src/templates/resources/tag/controllers/CreateTagController.txt
@@ -18055,9 +18201,9 @@ class MakeResourceTagCommand {
   }
   async run() {
     const module = "tag";
-    const base = join37("modules", module);
+    const base = join38("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
-    await makeModuleCommand.run({ name: module, silent: true, skipMigrations: false, skipSeeds: true });
+    await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
     await makeEntityCommand.run({ name: "Tag", module, tableName: "tags" });
     const makeMigrationCommand = new MakeMigrationCommand;
@@ -18090,26 +18236,26 @@ class MakeResourceTagCommand {
     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, "CreateTagController.ts"), CreateTagController_default);
-    await Bun.write(join37(controllersDir, "GetTagController.ts"), GetTagController_default);
-    await Bun.write(join37(controllersDir, "ListTagsController.ts"), ListTagsController_default);
-    await Bun.write(join37(controllersDir, "UpdateTagController.ts"), UpdateTagController_default);
-    await Bun.write(join37(controllersDir, "DeleteTagController.ts"), DeleteTagController_default);
+    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 makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateTag", "GetTag", "ListTags", "UpdateTag", "DeleteTag"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join37(process.cwd(), base, "src", "services");
-    await Bun.write(join37(servicesDir, "CreateTagService.ts"), CreateTagService_default);
-    await Bun.write(join37(servicesDir, "GetTagService.ts"), GetTagService_default);
-    await Bun.write(join37(servicesDir, "ListTagsService.ts"), ListTagsService_default);
-    await Bun.write(join37(servicesDir, "UpdateTagService.ts"), UpdateTagService_default);
-    await Bun.write(join37(servicesDir, "DeleteTagService.ts"), DeleteTagService_default);
-    const entityPath = join37(process.cwd(), base, "src", "entities", "TagEntity.ts");
+    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");
     await Bun.write(entityPath, TagEntity_default);
-    const migrationsDir = join37(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join38(process.cwd(), base, "src", "migrations");
     const glob = new Glob10("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -18117,18 +18263,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(join37(migrationsDir, file), content);
+      await Bun.write(join38(migrationsDir, file), content);
     }
-    const repositoryPath = join37(process.cwd(), base, "src", "repositories", "TagRepository.ts");
+    const repositoryPath = join38(process.cwd(), base, "src", "repositories", "TagRepository.ts");
     await Bun.write(repositoryPath, TagRepository_default);
   }
 }
 MakeResourceTagCommand = __legacyDecorateClassTS([
-  decorator37.command()
+  decorator38.command()
 ], MakeResourceTagCommand);
 // src/commands/MakeResourceTaskCommand.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: Glob11 } = globalThis.Bun;
 
 // src/templates/resources/task/controllers/CreateTaskController.txt
@@ -18801,9 +18947,9 @@ class MakeResourceTaskCommand {
   }
   async run() {
     const module = "task";
-    const base = join38("modules", module);
+    const base = join39("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
-    await makeModuleCommand.run({ name: module, silent: true, skipMigrations: false, skipSeeds: true });
+    await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
     await makeEntityCommand.run({ name: "Task", module, tableName: "tasks" });
     const makeMigrationCommand = new MakeMigrationCommand;
@@ -18836,26 +18982,26 @@ class MakeResourceTaskCommand {
     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, "CreateTaskController.ts"), CreateTaskController_default);
-    await Bun.write(join38(controllersDir, "GetTaskController.ts"), GetTaskController_default);
-    await Bun.write(join38(controllersDir, "ListTasksController.ts"), ListTasksController_default);
-    await Bun.write(join38(controllersDir, "UpdateTaskController.ts"), UpdateTaskController_default);
-    await Bun.write(join38(controllersDir, "DeleteTaskController.ts"), DeleteTaskController_default);
+    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 makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateTask", "GetTask", "ListTasks", "UpdateTask", "DeleteTask"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join38(process.cwd(), base, "src", "services");
-    await Bun.write(join38(servicesDir, "CreateTaskService.ts"), CreateTaskService_default);
-    await Bun.write(join38(servicesDir, "GetTaskService.ts"), GetTaskService_default);
-    await Bun.write(join38(servicesDir, "ListTasksService.ts"), ListTasksService_default);
-    await Bun.write(join38(servicesDir, "UpdateTaskService.ts"), UpdateTaskService_default);
-    await Bun.write(join38(servicesDir, "DeleteTaskService.ts"), DeleteTaskService_default);
-    const entityPath = join38(process.cwd(), base, "src", "entities", "TaskEntity.ts");
+    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");
     await Bun.write(entityPath, TaskEntity_default);
-    const migrationsDir = join38(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join39(process.cwd(), base, "src", "migrations");
     const glob = new Glob11("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -18863,18 +19009,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(join38(migrationsDir, file), content);
+      await Bun.write(join39(migrationsDir, file), content);
     }
-    const repositoryPath = join38(process.cwd(), base, "src", "repositories", "TaskRepository.ts");
+    const repositoryPath = join39(process.cwd(), base, "src", "repositories", "TaskRepository.ts");
     await Bun.write(repositoryPath, TaskRepository_default);
   }
 }
 MakeResourceTaskCommand = __legacyDecorateClassTS([
-  decorator38.command()
+  decorator39.command()
 ], MakeResourceTaskCommand);
 // src/commands/MakeResourceTopicCommand.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: Glob12 } = globalThis.Bun;
 
 // src/templates/resources/topic/controllers/CreateTopicController.txt
@@ -19465,9 +19611,9 @@ class MakeResourceTopicCommand {
   }
   async run() {
     const module = "topic";
-    const base = join39("modules", module);
+    const base = join40("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
-    await makeModuleCommand.run({ name: module, silent: true, skipMigrations: false, skipSeeds: true });
+    await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
     await makeEntityCommand.run({ name: "Topic", module, tableName: "topics" });
     const makeMigrationCommand = new MakeMigrationCommand;
@@ -19500,26 +19646,26 @@ class MakeResourceTopicCommand {
     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, "CreateTopicController.ts"), CreateTopicController_default);
-    await Bun.write(join39(controllersDir, "GetTopicController.ts"), GetTopicController_default);
-    await Bun.write(join39(controllersDir, "ListTopicsController.ts"), ListTopicsController_default);
-    await Bun.write(join39(controllersDir, "UpdateTopicController.ts"), UpdateTopicController_default);
-    await Bun.write(join39(controllersDir, "DeleteTopicController.ts"), DeleteTopicController_default);
+    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 makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateTopic", "GetTopic", "ListTopics", "UpdateTopic", "DeleteTopic"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join39(process.cwd(), base, "src", "services");
-    await Bun.write(join39(servicesDir, "CreateTopicService.ts"), CreateTopicService_default);
-    await Bun.write(join39(servicesDir, "GetTopicService.ts"), GetTopicService_default);
-    await Bun.write(join39(servicesDir, "ListTopicsService.ts"), ListTopicsService_default);
-    await Bun.write(join39(servicesDir, "UpdateTopicService.ts"), UpdateTopicService_default);
-    await Bun.write(join39(servicesDir, "DeleteTopicService.ts"), DeleteTopicService_default);
-    const entityPath = join39(process.cwd(), base, "src", "entities", "TopicEntity.ts");
+    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");
     await Bun.write(entityPath, TopicEntity_default);
-    const migrationsDir = join39(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join40(process.cwd(), base, "src", "migrations");
     const glob = new Glob12("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -19527,18 +19673,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(join39(migrationsDir, file), content);
+      await Bun.write(join40(migrationsDir, file), content);
     }
-    const repositoryPath = join39(process.cwd(), base, "src", "repositories", "TopicRepository.ts");
+    const repositoryPath = join40(process.cwd(), base, "src", "repositories", "TopicRepository.ts");
     await Bun.write(repositoryPath, TopicRepository_default);
   }
 }
 MakeResourceTopicCommand = __legacyDecorateClassTS([
-  decorator39.command()
+  decorator40.command()
 ], MakeResourceTopicCommand);
 // src/commands/MakeResourceUserCommand.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: Glob13 } = globalThis.Bun;
 
 // src/templates/resources/user/controllers/BanUserController.txt
@@ -20359,9 +20505,9 @@ class MakeResourceUserCommand {
   }
   async run() {
     const module = "user";
-    const base = join40("modules", module);
+    const base = join41("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
-    await makeModuleCommand.run({ name: module, silent: true, skipMigrations: false, skipSeeds: true });
+    await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
     await makeEntityCommand.run({ name: "User", module, tableName: "users" });
     const makeMigrationCommand = new MakeMigrationCommand;
@@ -20410,14 +20556,14 @@ class MakeResourceUserCommand {
     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, "BanUserController.ts"), BanUserController_default);
-    await Bun.write(join40(controllersDir, "LockUserController.ts"), LockUserController_default);
-    await Bun.write(join40(controllersDir, "SignOutController.ts"), SignOutController_default);
-    await Bun.write(join40(controllersDir, "UpdateUserProfileController.ts"), UpdateUserProfileController_default);
-    await Bun.write(join40(controllersDir, "UpdateUserProfileImageController.ts"), UpdateUserProfileImageController_default);
-    await Bun.write(join40(controllersDir, "DeleteUserProfileImageController.ts"), DeleteUserProfileImageController_default);
-    await Bun.write(join40(controllersDir, "UpdateUserRolesController.ts"), UpdateUserRolesController_default);
+    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 makeServiceCommand = new MakeServiceCommand;
     const services = [
       "BanUser",
@@ -20431,17 +20577,17 @@ class MakeResourceUserCommand {
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join40(process.cwd(), base, "src", "services");
-    await Bun.write(join40(servicesDir, "BanUserService.ts"), BanUserService_default);
-    await Bun.write(join40(servicesDir, "LockUserService.ts"), LockUserService_default);
-    await Bun.write(join40(servicesDir, "SignOutService.ts"), SignOutService_default);
-    await Bun.write(join40(servicesDir, "UpdateUserProfileService.ts"), UpdateUserProfileService_default);
-    await Bun.write(join40(servicesDir, "UpdateUserProfileImageService.ts"), UpdateUserProfileImageService_default);
-    await Bun.write(join40(servicesDir, "DeleteUserProfileImageService.ts"), DeleteUserProfileImageService_default);
-    await Bun.write(join40(servicesDir, "UpdateUserRolesService.ts"), UpdateUserRolesService_default);
-    const entityPath = join40(process.cwd(), base, "src", "entities", "UserEntity.ts");
+    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");
     await Bun.write(entityPath, UserEntity_default);
-    const migrationsDir = join40(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join41(process.cwd(), base, "src", "migrations");
     const glob = new Glob13("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -20449,18 +20595,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(join40(migrationsDir, file), content);
+      await Bun.write(join41(migrationsDir, file), content);
     }
-    const repositoryPath = join40(process.cwd(), base, "src", "repositories", "UserRepository.ts");
+    const repositoryPath = join41(process.cwd(), base, "src", "repositories", "UserRepository.ts");
     await Bun.write(repositoryPath, UserRepository_default);
   }
 }
 MakeResourceUserCommand = __legacyDecorateClassTS([
-  decorator40.command()
+  decorator41.command()
 ], MakeResourceUserCommand);
 // src/commands/MakeResourceVideoCommand.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: Glob14 } = globalThis.Bun;
 
 // src/templates/resources/video/controllers/CreateVideoController.txt
@@ -21139,9 +21285,9 @@ class MakeResourceVideoCommand {
   }
   async run() {
     const module = "video";
-    const base = join41("modules", module);
+    const base = join42("modules", module);
     const makeModuleCommand = new MakeModuleCommand;
-    await makeModuleCommand.run({ name: module, silent: true, skipMigrations: false, skipSeeds: true });
+    await makeModuleCommand.run({ name: module, silent: true });
     const makeEntityCommand = new MakeEntityCommand;
     await makeEntityCommand.run({ name: "Video", module, tableName: "videos" });
     const makeMigrationCommand = new MakeMigrationCommand;
@@ -21174,26 +21320,26 @@ class MakeResourceVideoCommand {
     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, "CreateVideoController.ts"), CreateVideoController_default);
-    await Bun.write(join41(controllersDir, "GetVideoController.ts"), GetVideoController_default);
-    await Bun.write(join41(controllersDir, "ListVideosController.ts"), ListVideosController_default);
-    await Bun.write(join41(controllersDir, "UpdateVideoController.ts"), UpdateVideoController_default);
-    await Bun.write(join41(controllersDir, "DeleteVideoController.ts"), DeleteVideoController_default);
+    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 makeServiceCommand = new MakeServiceCommand;
     const services = ["CreateVideo", "GetVideo", "ListVideos", "UpdateVideo", "DeleteVideo"];
     for (const name of services) {
       await makeServiceCommand.run({ name, module });
     }
-    const servicesDir = join41(process.cwd(), base, "src", "services");
-    await Bun.write(join41(servicesDir, "CreateVideoService.ts"), CreateVideoService_default);
-    await Bun.write(join41(servicesDir, "GetVideoService.ts"), GetVideoService_default);
-    await Bun.write(join41(servicesDir, "ListVideosService.ts"), ListVideosService_default);
-    await Bun.write(join41(servicesDir, "UpdateVideoService.ts"), UpdateVideoService_default);
-    await Bun.write(join41(servicesDir, "DeleteVideoService.ts"), DeleteVideoService_default);
-    const entityPath = join41(process.cwd(), base, "src", "entities", "VideoEntity.ts");
+    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");
     await Bun.write(entityPath, VideoEntity_default);
-    const migrationsDir = join41(process.cwd(), base, "src", "migrations");
+    const migrationsDir = join42(process.cwd(), base, "src", "migrations");
     const glob = new Glob14("Migration*.ts");
     for await (const file of glob.scan(migrationsDir)) {
       if (file === "migrations.ts")
@@ -21201,24 +21347,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(join41(migrationsDir, file), content);
+      await Bun.write(join42(migrationsDir, file), content);
     }
-    const repositoryPath = join41(process.cwd(), base, "src", "repositories", "VideoRepository.ts");
+    const repositoryPath = join42(process.cwd(), base, "src", "repositories", "VideoRepository.ts");
     await Bun.write(repositoryPath, VideoRepository_default);
   }
 }
 MakeResourceVideoCommand = __legacyDecorateClassTS([
-  decorator41.command()
+  decorator42.command()
 ], MakeResourceVideoCommand);
 // src/commands/MakeStorageCommand.ts
-import { join as join42 } from "path";
-import { decorator as decorator42 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger27 } from "@ooneex/logger";
+import { join as join43 } from "path";
+import { decorator as decorator43 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger28 } 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'", () => {
@@ -21313,28 +21459,28 @@ class MakeStorageCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join42("modules", module) : ".";
-    const storageLocalDir = join42(base, "src", "storage");
-    const storageDir = join42(process.cwd(), storageLocalDir);
-    const filePath = join42(storageDir, `${name}Storage.ts`);
+    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`);
     await Bun.write(filePath, content);
-    const testContent = storage_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join42(base, "tests", "storage");
-    const testsDir = join42(process.cwd(), testsLocalDir);
-    const testFilePath = join42(testsDir, `${name}Storage.spec.ts`);
+    const testContent = storage_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join43(base, "tests", "storage");
+    const testsDir = join43(process.cwd(), testsLocalDir);
+    const testFilePath = join43(testsDir, `${name}Storage.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger27;
-    logger.success(`${join42(storageLocalDir, name)}Storage.ts created successfully`, undefined, {
+    const logger = new TerminalLogger28;
+    logger.success(`${join43(storageLocalDir, name)}Storage.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join42(testsLocalDir, name)}Storage.spec.ts created successfully`, undefined, {
+    logger.success(`${join43(testsLocalDir, name)}Storage.spec.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    const packageJsonPath = join42(process.cwd(), "package.json");
+    const packageJsonPath = join43(process.cwd(), "package.json");
     const packageJson = await Bun.file(packageJsonPath).json();
     const deps = packageJson.dependencies ?? {};
     const devDeps = packageJson.devDependencies ?? {};
@@ -21349,17 +21495,17 @@ class MakeStorageCommand {
   }
 }
 MakeStorageCommand = __legacyDecorateClassTS([
-  decorator42.command()
+  decorator43.command()
 ], MakeStorageCommand);
 // src/commands/MakeVectorDatabaseCommand.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 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'", () => {
@@ -21428,28 +21574,28 @@ class MakeVectorDatabaseCommand {
     if (module) {
       await ensureModule(module);
     }
-    const base = module ? join43("modules", module) : ".";
-    const vectorDatabaseLocalDir = join43(base, "src", "databases");
-    const vectorDatabaseDir = join43(process.cwd(), vectorDatabaseLocalDir);
-    const filePath = join43(vectorDatabaseDir, `${name}VectorDatabase.ts`);
+    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`);
     await Bun.write(filePath, content);
-    const testContent = vector_database_test_default.replace(/{{NAME}}/g, name);
-    const testsLocalDir = join43(base, "tests", "databases");
-    const testsDir = join43(process.cwd(), testsLocalDir);
-    const testFilePath = join43(testsDir, `${name}VectorDatabase.spec.ts`);
+    const testContent = vector_database_test_default.replace(/{{NAME}}/g, name).replace(/{{MODULE}}/g, module ?? "");
+    const testsLocalDir = join44(base, "tests", "databases");
+    const testsDir = join44(process.cwd(), testsLocalDir);
+    const testFilePath = join44(testsDir, `${name}VectorDatabase.spec.ts`);
     await Bun.write(testFilePath, testContent);
-    const logger = new TerminalLogger28;
-    logger.success(`${join43(vectorDatabaseLocalDir, name)}VectorDatabase.ts created successfully`, undefined, {
+    const logger = new TerminalLogger29;
+    logger.success(`${join44(vectorDatabaseLocalDir, name)}VectorDatabase.ts created successfully`, undefined, {
       showTimestamp: false,
       showArrow: false,
       useSymbol: true
     });
-    logger.success(`${join43(testsLocalDir, name)}VectorDatabase.spec.ts created successfully`, undefined, {
+    logger.success(`${join44(testsLocalDir, name)}VectorDatabase.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 ?? {};
@@ -21464,13 +21610,13 @@ class MakeVectorDatabaseCommand {
   }
 }
 MakeVectorDatabaseCommand = __legacyDecorateClassTS([
-  decorator43.command()
+  decorator44.command()
 ], MakeVectorDatabaseCommand);
 // src/commands/MigrationUpCommand.ts
-import { existsSync } from "fs";
-import { join as join44 } from "path";
-import { decorator as decorator44 } from "@ooneex/command";
-import { TerminalLogger as TerminalLogger29 } from "@ooneex/logger";
+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";
 class MigrationUpCommand {
   getName() {
     return "migration:up";
@@ -21478,10 +21624,10 @@ class MigrationUpCommand {
   getDescription() {
     return "Run migrations for all modules";
   }
-  async run() {
-    const logger = new TerminalLogger29;
-    const modulesDir = join44(process.cwd(), "modules");
-    if (!existsSync(modulesDir)) {
+  async run(options) {
+    const logger = new TerminalLogger30;
+    const modulesDir = join45(process.cwd(), "modules");
+    if (!existsSync2(modulesDir)) {
       logger.warn("No modules with migrations found", undefined, {
         showTimestamp: false,
         showArrow: false,
@@ -21493,10 +21639,10 @@ class MigrationUpCommand {
     const modules = [];
     for await (const match of glob.scan({ cwd: modulesDir, onlyFiles: true })) {
       const entry = match.replace("/package.json", "");
-      const moduleDir = join44(modulesDir, entry);
-      const migrationUpFile = Bun.file(join44(moduleDir, "bin", "migration", "up.ts"));
+      const moduleDir = join45(modulesDir, entry);
+      const migrationUpFile = Bun.file(join45(moduleDir, "bin", "migration", "up.ts"));
       if (await migrationUpFile.exists()) {
-        const packageJson = await Bun.file(join44(modulesDir, match)).json();
+        const packageJson = await Bun.file(join45(modulesDir, match)).json();
         modules.push({ name: packageJson.name ?? entry, dir: moduleDir });
       }
     }
@@ -21509,13 +21655,17 @@ class MigrationUpCommand {
       return;
     }
     for (const { name, dir } of modules) {
-      const migrationUpPath = join44(dir, "bin", "migration", "up.ts");
+      const migrationUpPath = join45(dir, "bin", "migration", "up.ts");
       logger.info(`Running migrations for ${name}...`, undefined, {
         showTimestamp: false,
         showArrow: false,
         useSymbol: false
       });
-      const proc = Bun.spawn(["bun", "run", migrationUpPath], {
+      const args = ["bun", "run", migrationUpPath];
+      if (options.drop) {
+        args.push("--drop");
+      }
+      const proc = Bun.spawn(args, {
         cwd: dir,
         stdout: "inherit",
         stderr: "inherit"
@@ -21538,13 +21688,140 @@ class MigrationUpCommand {
   }
 }
 MigrationUpCommand = __legacyDecorateClassTS([
-  decorator44.command()
+  decorator45.command()
 ], MigrationUpCommand);
+// src/commands/RemoveModuleCommand.ts
+import { rmdir } from "fs/promises";
+import { join as join46 } from "path";
+import { decorator as decorator46 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger31 } 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 TerminalLogger31;
+        logger.error(`Cannot remove the "${kebabName}" module`, undefined, {
+          showTimestamp: false,
+          showArrow: false,
+          useSymbol: true
+        });
+      }
+      return;
+    }
+    const moduleDir = join46(cwd, "modules", kebabName);
+    const moduleDirExists = await Bun.file(join46(moduleDir, "package.json")).exists();
+    if (!moduleDirExists) {
+      if (!silent) {
+        const logger = new TerminalLogger31;
+        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 = join46(cwd, "modules", "app", "src", "AppModule.ts");
+    await this.removeFromAppModule(appModulePath, pascalName, kebabName);
+    const sharedModulePath = join46(cwd, "modules", "shared", "src", "SharedModule.ts");
+    await this.removeFromSharedModule(sharedModulePath, pascalName, kebabName);
+    const appTsconfigPath = join46(cwd, "tsconfig.json");
+    await this.removePathAlias(appTsconfigPath, kebabName);
+    const commitlintPath = join46(cwd, ".commitlintrc.ts");
+    await this.removeModuleScope(commitlintPath, kebabName);
+    await rmdir(moduleDir, { recursive: true });
+    if (!silent) {
+      const logger = new TerminalLogger31;
+      logger.success(`modules/${kebabName} removed successfully`, undefined, {
+        showTimestamp: false,
+        showArrow: false,
+        useSymbol: true
+      });
+    }
+  }
+}
+RemoveModuleCommand = __legacyDecorateClassTS([
+  decorator46.command()
+], RemoveModuleCommand);
 // src/commands/SeedRunCommand.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 { existsSync as existsSync3 } from "fs";
+import { join as join47 } from "path";
+import { decorator as decorator47 } from "@ooneex/command";
+import { TerminalLogger as TerminalLogger32 } from "@ooneex/logger";
 class SeedRunCommand {
   getName() {
     return "seed:run";
@@ -21552,10 +21829,10 @@ class SeedRunCommand {
   getDescription() {
     return "Run seeds for all modules";
   }
-  async run() {
-    const logger = new TerminalLogger30;
-    const modulesDir = join45(process.cwd(), "modules");
-    if (!existsSync2(modulesDir)) {
+  async run(options) {
+    const logger = new TerminalLogger32;
+    const modulesDir = join47(process.cwd(), "modules");
+    if (!existsSync3(modulesDir)) {
       logger.warn("No modules with seeds found", undefined, {
         showTimestamp: false,
         showArrow: false,
@@ -21567,10 +21844,10 @@ class SeedRunCommand {
     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 seedRunFile = Bun.file(join45(moduleDir, "bin", "seed", "run.ts"));
+      const moduleDir = join47(modulesDir, entry);
+      const seedRunFile = Bun.file(join47(moduleDir, "bin", "seed", "run.ts"));
       if (await seedRunFile.exists()) {
-        const packageJson = await Bun.file(join45(modulesDir, match)).json();
+        const packageJson = await Bun.file(join47(modulesDir, match)).json();
         modules.push({ name: packageJson.name ?? entry, dir: moduleDir });
       }
     }
@@ -21583,13 +21860,17 @@ class SeedRunCommand {
       return;
     }
     for (const { name, dir } of modules) {
-      const seedRunPath = join45(dir, "bin", "seed", "run.ts");
+      const seedRunPath = join47(dir, "bin", "seed", "run.ts");
       logger.info(`Running seeds for ${name}...`, undefined, {
         showTimestamp: false,
         showArrow: false,
         useSymbol: false
       });
-      const proc = Bun.spawn(["bun", "run", seedRunPath], {
+      const args = ["bun", "run", seedRunPath];
+      if (options.drop) {
+        args.push("--drop");
+      }
+      const proc = Bun.spawn(args, {
         cwd: dir,
         stdout: "inherit",
         stderr: "inherit"
@@ -21612,9 +21893,9 @@ class SeedRunCommand {
   }
 }
 SeedRunCommand = __legacyDecorateClassTS([
-  decorator45.command()
+  decorator47.command()
 ], SeedRunCommand);
 // src/index.ts
 await run();
 
-//# debugId=6FA7C9AF51A6107064756E2164756E21
+//# debugId=1350E81FA9AB75E064756E2164756E21