@ooneex/cli 1.17.6 → 1.17.8

package/dist/index.js

@@ -5519,15 +5519,6 @@ import { decorator as decorator6 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger5 } from "@ooneex/logger";
 import { toKebabCase, toPascalCase } from "@ooneex/utils";
 
-// src/templates/module/command.run.txt
-var command_run_default = `#!/usr/bin/env bun
-
-import { run } from "@ooneex/command";
-import "@/commands/commands";
-
-await run();
-`;
-
 // src/templates/module/module.txt
 var module_default = `import type { ModuleType } from "@ooneex/module";
 
@@ -5679,11 +5670,6 @@ class MakeModuleCommand {
     }
     if (!skipCommands) {
       await Bun.write(join5(srcDir, "commands", "commands.ts"), "");
-      const binCommandRunPath = join5(moduleDir, "bin", "command", "run.ts");
-      const binCommandRunFile = Bun.file(binCommandRunPath);
-      if (!await binCommandRunFile.exists()) {
-        await Bun.write(binCommandRunPath, command_run_default);
-      }
     }
     await Bun.write(join5(moduleDir, "package.json"), packageContent);
     await Bun.write(join5(moduleDir, "tsconfig.json"), tsconfig_default);
@@ -7041,9 +7027,6 @@ class MakeAppCommand {
     });
     const appModulePackagePath = join9(destination, "modules", "app", "package.json");
     const appModulePackageJson = await Bun.file(appModulePackagePath).json();
-    appModulePackageJson.scripts.dev = "docker compose up -d && bun --hot run ./src/index.ts";
-    appModulePackageJson.scripts.stop = "docker compose down";
-    appModulePackageJson.scripts.build = "bun build ./src/index.ts --outdir ./dist --target bun";
     await Bun.write(appModulePackagePath, JSON.stringify(appModulePackageJson, null, 2));
     const envContent = env_default.replace(/^DATABASE_URL=/m, 'DATABASE_URL="postgresql://ooneex:ooneex@localhost:5432/ooneex"').replace(/^CACHE_REDIS_URL=/m, 'CACHE_REDIS_URL="redis://localhost:6379"').replace(/^PUBSUB_REDIS_URL=/m, 'PUBSUB_REDIS_URL="redis://localhost:6379"').replace(/^RATE_LIMIT_REDIS_URL=/m, 'RATE_LIMIT_REDIS_URL="redis://localhost:6379"').replace(/^DATABASE_REDIS_URL=/m, 'DATABASE_REDIS_URL="redis://localhost:6379"');
     await Bun.write(join9(destination, "modules", "app", ".env"), envContent);
@@ -7556,6 +7539,17 @@ MakeClaudeSkillCommand = __legacyDecorateClassTS([
 import { join as join12 } from "path";
 import { commandCreate, decorator as decorator12 } from "@ooneex/command";
 import { TerminalLogger as TerminalLogger11 } 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";
+
+await run();
+`;
+
+// src/commands/MakeCommandCommand.ts
 class MakeCommandCommand {
   getName() {
     return "make:command";
@@ -7566,7 +7560,7 @@ class MakeCommandCommand {
   async run(options) {
     let { name, module } = options;
     if (!name) {
-      name = await askName({ message: "Enter name" });
+      name = await askName({ message: "Enter command name" });
     }
     if (module) {
       await ensureModule(module);
@@ -7577,35 +7571,12 @@ class MakeCommandCommand {
       commandDir: join12(base, "src", "commands"),
       testsDir: join12(base, "tests", "commands")
     });
-    if (module && module !== "app") {
-      const appCommandsRootPath = join12(process.cwd(), "modules", "app", "src", "commands", "commands.ts");
-      const appCommandsRootFile = Bun.file(appCommandsRootPath);
-      const importLine = `import "@${module}/commands/commands";`;
-      if (await appCommandsRootFile.exists()) {
-        const appCommandsContent = await appCommandsRootFile.text();
-        if (!appCommandsContent.includes(importLine)) {
-          await Bun.write(appCommandsRootPath, `${appCommandsContent.trimEnd()}
-${importLine}
-`);
-        }
-      } else {
-        await Bun.write(appCommandsRootPath, `${importLine}
-`);
-      }
-    }
-    const binCommandRunPath = join12(process.cwd(), "modules", "app", "bin", "command", "run.ts");
+    const binCommandRunPath = join12(process.cwd(), base, "bin", "command", "run.ts");
     const binCommandRunFile = Bun.file(binCommandRunPath);
     if (!await binCommandRunFile.exists()) {
       await Bun.write(binCommandRunPath, command_run_default);
     }
-    const packageJsonPath = join12(process.cwd(), "modules", "app", "package.json");
-    const packageJsonFile = Bun.file(packageJsonPath);
-    if (await packageJsonFile.exists()) {
-      const packageJson = await packageJsonFile.json();
-      packageJson.scripts = packageJson.scripts || {};
-      packageJson.scripts.command = "bun ./bin/command/run.ts";
-      await Bun.write(packageJsonPath, JSON.stringify(packageJson, null, 2));
-    }
+    const packageJsonPath = join12(process.cwd(), base, "package.json");
     const logger = new TerminalLogger11;
     logger.success(`${commandPath} created successfully`, undefined, {
       showTimestamp: false,
@@ -7617,11 +7588,17 @@ ${importLine}
       showArrow: false,
       useSymbol: true
     });
-    logger.info("Run 'bun run command' to execute commands", undefined, {
-      showTimestamp: false,
-      showArrow: true,
-      showLevel: false
-    });
+    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([
@@ -9599,7 +9576,7 @@ class MakeMigrationCommand {
     const devDeps = pkgJson.devDependencies ?? {};
     if (!deps["@ooneex/migrations"] && !devDeps["@ooneex/migrations"]) {
       const install = Bun.spawn(["bun", "add", "--dev", "@ooneex/migrations"], {
-        cwd: join21(process.cwd(), base),
+        cwd: process.cwd(),
         stdout: "ignore",
         stderr: "inherit"
       });
@@ -9981,7 +9958,11 @@ class MakeReleaseCommand {
     const shouldPush = await askConfirm({ message: "Push commits and tags to remote?", initial: true });
     if (shouldPush) {
       try {
-        await $`git push && git push --tags`;
+        await this.bunInstall();
+        await this.gitAdd("bun.lock");
+        await this.gitCommit("chore(common): Update bun.lock");
+        logger.success("Updated and committed bun.lock", undefined, logOptions);
+        await this.gitPush();
         logger.success("Pushed commits and tags to remote", undefined, logOptions);
       } catch {
         logger.error("Failed to push to remote", undefined, logOptions);
@@ -10127,6 +10108,12 @@ ${section}
   async gitTag(tag, message) {
     await $`git tag -a ${tag} -m ${message}`;
   }
+  async bunInstall() {
+    await $`bun install`;
+  }
+  async gitPush() {
+    await $`git push && git push --tags`;
+  }
 }
 MakeReleaseCommand = __legacyDecorateClassTS([
   decorator24.command()
@@ -11302,7 +11289,7 @@ class MakeSeedCommand {
     const devDeps = pkgJson.devDependencies ?? {};
     if (!deps["@ooneex/seeds"] && !devDeps["@ooneex/seeds"]) {
       const install = Bun.spawn(["bun", "add", "--dev", "@ooneex/seeds"], {
-        cwd: join28(process.cwd(), base),
+        cwd: process.cwd(),
         stdout: "ignore",
         stderr: "inherit"
       });
@@ -11720,4 +11707,4 @@ SeedRunCommand = __legacyDecorateClassTS([
 // src/index.ts
 await run();
 
-//# debugId=1317A3FF7CEC8E3164756E2164756E21
+//# debugId=8D3710B34E08707064756E2164756E21