@ooneex/cli 1.20.0 → 1.20.2

package/dist/index.js

@@ -5545,7 +5545,7 @@ var package_default = `{
 
 // src/templates/module/test.txt
 var test_default = `import { describe, expect, test } from "bun:test";
-import { {{NAME}}Module } from "@/{{NAME}}Module";
+import { {{NAME}}Module } from "@module/{{name}}/{{NAME}}Module";
 
 describe("{{NAME}}Module", () => {
   test("should have controllers array", () => {
@@ -5572,15 +5572,7 @@ describe("{{NAME}}Module", () => {
 
 // src/templates/module/tsconfig.txt
 var tsconfig_default = `{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "types": ["@types/bun"],
-    "paths": {
-      "@/*": ["./src/*"]
-    }
-  },
-  "include": ["src/**/*.ts", "src/**/*.tsx", "tests/**/*.ts", "tests/**/*.tsx", "bin/**/*.ts"],
-  "exclude": ["node_modules", "dist"]
+  "extends": "../../tsconfig.json"
 }
 `;
 
@@ -5643,7 +5635,7 @@ class MakeModuleCommand {
       const existing = match[2]?.trim() ?? "";
       const newScope = `"${kebabName}"`;
       if (!existing.includes(newScope)) {
-        const newValue = existing ? `${existing}
+        const newValue = existing ? `${existing}, 
         ${newScope},` : `
         ${newScope},`;
         content = content.replace(regex, `$1${newValue}
@@ -5657,7 +5649,7 @@ class MakeModuleCommand {
     const tsconfig = JSON.parse(content);
     tsconfig.compilerOptions ??= {};
     tsconfig.compilerOptions.paths ??= {};
-    tsconfig.compilerOptions.paths[`@module/${kebabName}/*`] = [`../${kebabName}/src/*`];
+    tsconfig.compilerOptions.paths[`@module/${kebabName}/*`] = [`./modules/${kebabName}/src/*`];
     await Bun.write(tsconfigPath, `${JSON.stringify(tsconfig, null, 2)}
 `);
   }
@@ -5674,7 +5666,7 @@ class MakeModuleCommand {
     const testsDir = join5(moduleDir, "tests");
     const moduleContent = module_default.replace(/{{NAME}}/g, pascalName);
     const packageContent = package_default.replace(/{{NAME}}/g, kebabName);
-    const testContent = test_default.replace(/{{NAME}}/g, pascalName);
+    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"), "");
@@ -5690,10 +5682,10 @@ class MakeModuleCommand {
       if (await Bun.file(appModulePath).exists()) {
         await this.addToAppModule(appModulePath, pascalName, kebabName);
       }
-      const appTsconfigPath = join5(cwd, "modules", "app", "tsconfig.json");
-      if (await Bun.file(appTsconfigPath).exists()) {
-        await this.addPathAlias(appTsconfigPath, kebabName);
-      }
+    }
+    const appTsconfigPath = join5(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");
@@ -5701,12 +5693,6 @@ class MakeModuleCommand {
       if (await Bun.file(sharedModuleFilePath).exists()) {
         await this.addToSharedModule(sharedModuleFilePath, pascalName, kebabName);
       }
-      const sharedTsconfigPath = join5(sharedModuleDir, "tsconfig.json");
-      if (await Bun.file(sharedTsconfigPath).exists()) {
-        await this.addPathAlias(sharedTsconfigPath, kebabName);
-        const moduleTsconfigPath = join5(moduleDir, "tsconfig.json");
-        await this.addPathAlias(moduleTsconfigPath, "shared");
-      }
     }
     const commitlintPath = join5(cwd, ".commitlintrc.ts");
     if (await Bun.file(commitlintPath).exists()) {
@@ -5928,6 +5914,7 @@ const Configuration: UserConfig = {
       "always",
       [
         "common",
+        "shared",
         "app",
       ],
     ],
@@ -6211,7 +6198,7 @@ var app_database_default = `import { inject } from "@ooneex/container";
 import { AppEnv } from "@ooneex/app-env";
 import { DataSource } from "typeorm";
 import { TypeormDatabase, DatabaseException, decorator } from "@ooneex/database";
-import { SharedModule } from "@/SharedModule";
+import { SharedModule } from "@module/shared/SharedModule";
 
 @decorator.database()
 export class SharedDatabase extends TypeormDatabase {
@@ -6341,6 +6328,8 @@ ARG DATABASE_URL
 
 # Promote build arg to runtime environment variable
 ENV DATABASE_URL=\${DATABASE_URL}
+# Disable HUSKY
+ENV HUSKY=0
 
 # install dependencies into temp directory
 # this will cache them and speed up future builds
@@ -6352,7 +6341,7 @@ RUN cd /temp/dev && bun install --frozen-lockfile
 # install with --production (exclude devDependencies)
 RUN mkdir -p /temp/prod
 COPY package.json bun.lock /temp/prod/
-RUN cd /temp/prod && bun install --frozen-lockfile --production
+RUN cd /temp/prod && bun install --frozen-lockfile --production --ignore-scripts
 
 # copy node_modules from temp directory
 # then copy all (non-ignored) project files into the image
@@ -6888,8 +6877,14 @@ var tsconfig_json_default = `{
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "strictNullChecks": true,
-    "exactOptionalPropertyTypes": false
+    "exactOptionalPropertyTypes": false,
+    "paths": {
+      "@module/app/*": ["./modules/app/src/*"],
+      "@module/shared/*": ["./modules/shared/src/*"]
+    },
+    "types": ["bun"]
   },
+  "include": ["modules/**/*.ts"],
   "exclude": ["node_modules", ".github", ".husky", ".nx", ".zed", ".vscode"]
 }
 `;
@@ -9556,7 +9551,7 @@ import { migrationCreate } from "@ooneex/migrations";
 var migration_up_default = `#!/usr/bin/env bun
 
 import { up } from "@ooneex/migrations";
-import "@/migrations/migrations";
+import "@module/{{name}}/migrations/migrations";
 
 await up({
   databaseUrl: Bun.env.DATABASE_URL,
@@ -9585,7 +9580,7 @@ class MakeMigrationCommand {
     const binMigrationUpPath = join21(process.cwd(), base, "bin", "migration", "up.ts");
     const binMigrationUpFile = Bun.file(binMigrationUpPath);
     if (!await binMigrationUpFile.exists()) {
-      await Bun.write(binMigrationUpPath, migration_up_default);
+      await Bun.write(binMigrationUpPath, migration_up_default.replace(/{{name}}/g, module ?? ""));
     }
     const logger = new TerminalLogger20;
     logger.success(`${filePath} created successfully`, undefined, {
@@ -13318,7 +13313,7 @@ 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";
+import "@module/{{name}}/seeds/seeds";
 
 if (!container.has(AppEnv)) {
   container.add(AppEnv);
@@ -13356,7 +13351,7 @@ class MakeSeedCommand {
     const binSeedRunPath = join30(process.cwd(), base, "bin", "seed", "run.ts");
     const binSeedRunFile = Bun.file(binSeedRunPath);
     if (!await binSeedRunFile.exists()) {
-      await Bun.write(binSeedRunPath, seed_run_default);
+      await Bun.write(binSeedRunPath, seed_run_default.replace(/{{name}}/g, module ?? ""));
     }
     const logger = new TerminalLogger26;
     logger.success(`${filePath} created successfully`, undefined, {
@@ -21244,4 +21239,4 @@ SeedRunCommand = __legacyDecorateClassTS([
 // src/index.ts
 await run();
 
-//# debugId=BC6BC329745A9CA664756E2164756E21
+//# debugId=F644FC22050EAEC964756E2164756E21