@ooneex/cli 1.17.10 → 1.18.0

package/dist/index.js

@@ -5637,17 +5637,12 @@ class MakeModuleCommand {
     const tsconfig = JSON.parse(content);
     tsconfig.compilerOptions ??= {};
     tsconfig.compilerOptions.paths ??= {};
-    tsconfig.compilerOptions.paths[`@${kebabName}/*`] = [`../${kebabName}/src/*`];
+    tsconfig.compilerOptions.paths[`@module/${kebabName}/*`] = [`../${kebabName}/src/*`];
     await Bun.write(tsconfigPath, `${JSON.stringify(tsconfig, null, 2)}
 `);
   }
   async run(options) {
-    const {
-      cwd = process.cwd(),
-      silent = false,
-      skipMigrations = false,
-      skipSeeds = false
-    } = options;
+    const { cwd = process.cwd(), silent = false, skipMigrations = false, skipSeeds = false } = options;
     let { name } = options;
     if (!name) {
       name = await askName({ message: "Enter module name" });
@@ -5680,6 +5675,13 @@ class MakeModuleCommand {
         await this.addPathAlias(appTsconfigPath, kebabName);
       }
     }
+    if (kebabName !== "app" && kebabName !== "shared") {
+      const sharedModulePath = join5(cwd, "modules", "shared");
+      if (await Bun.file(join5(sharedModulePath, "tsconfig.json")).exists()) {
+        const moduleTsconfigPath = join5(moduleDir, "tsconfig.json");
+        await this.addPathAlias(moduleTsconfigPath, "shared");
+      }
+    }
     const commitlintPath = join5(cwd, ".commitlintrc.ts");
     if (await Bun.file(commitlintPath).exists()) {
       await this.addModuleScope(commitlintPath, kebabName);
@@ -6186,7 +6188,7 @@ import { TypeormDatabase, DatabaseException, decorator } from "@ooneex/database"
 import { AppModule } from "@/AppModule";
 
 @decorator.database()
-export class AppDatabase extends TypeormDatabase {
+export class SharedDatabase extends TypeormDatabase {
   constructor(@inject(AppEnv) private readonly env: AppEnv) {
     super();
   }
@@ -6614,7 +6616,7 @@ import { CorsMiddleware } from "@ooneex/middleware";
 import { UpstashRedisRateLimiter } from "@ooneex/rate-limit";
 import { BunnyStorage } from "@ooneex/storage";
 import { AppModule } from "./AppModule";
-import { AppDatabase } from "./databases/AppDatabase";
+import { SharedDatabase } from "@module/shared/databases/SharedDatabase";
 
 const app = new App({
   routing: {
@@ -6631,7 +6633,7 @@ const app = new App({
   cors: CorsMiddleware,
   cronJobs: AppModule.cronJobs,
   events: AppModule.events,
-  database: AppDatabase,
+  database: SharedDatabase,
 });
 
 await app.run();
@@ -7015,8 +7017,15 @@ class MakeAppCommand {
     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", "databases", "AppDatabase.ts"), app_database_default);
     await Bun.write(join9(destination, "modules", "app", "src", "index.ts"), index_ts_default);
+    await makeModuleCommand.run({
+      name: "shared",
+      cwd: destination,
+      silent: true,
+      skipMigrations: true,
+      skipSeeds: true
+    });
+    await Bun.write(join9(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);
@@ -11214,9 +11223,20 @@ import { seedCreate } from "@ooneex/seeds";
 // src/templates/module/seed.run.txt
 var seed_run_default = `#!/usr/bin/env bun
 
+import { SharedDatabase } from "@module/shared/databases/SharedDatabase";
+import { AppEnv } from "@ooneex/app-env";
+import { container } from "@ooneex/container";
 import { run } from "@ooneex/seeds";
 import "@/seeds/seeds";
 
+if (!container.has(AppEnv)) {
+  container.add(AppEnv);
+}
+if (!container.has(SharedDatabase)) {
+  container.add(SharedDatabase);
+}
+container.addConstant("database", container.get(SharedDatabase));
+
 await run();
 `;
 
@@ -11538,7 +11558,7 @@ class MigrationUpCommand {
       logger.warn("No modules with migrations found", undefined, {
         showTimestamp: false,
         showArrow: false,
-        useSymbol: true
+        useSymbol: false
       });
       return;
     }
@@ -11557,7 +11577,7 @@ class MigrationUpCommand {
       logger.warn("No modules with migrations found", undefined, {
         showTimestamp: false,
         showArrow: false,
-        useSymbol: true
+        useSymbol: false
       });
       return;
     }
@@ -11566,7 +11586,7 @@ class MigrationUpCommand {
       logger.info(`Running migrations for ${name}...`, undefined, {
         showTimestamp: false,
         showArrow: false,
-        useSymbol: true
+        useSymbol: false
       });
       const proc = Bun.spawn(["bun", "run", migrationUpPath], {
         cwd: dir,
@@ -11578,13 +11598,13 @@ class MigrationUpCommand {
         logger.success(`Migrations completed for ${name}`, undefined, {
           showTimestamp: false,
           showArrow: false,
-          useSymbol: true
+          useSymbol: false
         });
       } else {
         logger.error(`Migrations failed for ${name} (exit code: ${exitCode})`, undefined, {
           showTimestamp: false,
           showArrow: false,
-          useSymbol: true
+          useSymbol: false
         });
       }
     }
@@ -11612,7 +11632,7 @@ class SeedRunCommand {
       logger.warn("No modules with seeds found", undefined, {
         showTimestamp: false,
         showArrow: false,
-        useSymbol: true
+        useSymbol: false
       });
       return;
     }
@@ -11631,7 +11651,7 @@ class SeedRunCommand {
       logger.warn("No modules with seeds found", undefined, {
         showTimestamp: false,
         showArrow: false,
-        useSymbol: true
+        useSymbol: false
       });
       return;
     }
@@ -11640,7 +11660,7 @@ class SeedRunCommand {
       logger.info(`Running seeds for ${name}...`, undefined, {
         showTimestamp: false,
         showArrow: false,
-        useSymbol: true
+        useSymbol: false
       });
       const proc = Bun.spawn(["bun", "run", seedRunPath], {
         cwd: dir,
@@ -11652,13 +11672,13 @@ class SeedRunCommand {
         logger.success(`Seeds completed for ${name}`, undefined, {
           showTimestamp: false,
           showArrow: false,
-          useSymbol: true
+          useSymbol: false
         });
       } else {
         logger.error(`Seeds failed for ${name} (exit code: ${exitCode})`, undefined, {
           showTimestamp: false,
           showArrow: false,
-          useSymbol: true
+          useSymbol: false
         });
       }
     }
@@ -11670,4 +11690,4 @@ SeedRunCommand = __legacyDecorateClassTS([
 // src/index.ts
 await run();
 
-//# debugId=1A49A16C5C4E6AB364756E2164756E21
+//# debugId=A91F5C1501E1122C64756E2164756E21