@rebasepro/cli 0.2.1 → 0.2.3

package/dist/commands/init.d.ts

@@ -13,4 +13,4 @@ export interface InitOptions {
     pmCommands: PMCommands;
 }
 export declare function createRebaseApp(rawArgs: string[]): Promise<void>;
-export declare function configureEnvFile(targetDirectory: string, databaseUrl?: string): void;
+export declare function configureEnvFile(targetDirectory: string, databaseUrl?: string): Promise<void>;

package/dist/index.cjs

@@ -1,6 +1,6 @@
 (function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("chalk"), require("arg"), require("inquirer"), require("path"), require("fs"), require("util"), require("execa"), require("fs/promises"), require("url"), require("crypto"), require("@rebasepro/sdk-generator"), require("child_process"), require("os")) : typeof define === "function" && define.amd ? define(["exports", "chalk", "arg", "inquirer", "path", "fs", "util", "execa", "fs/promises", "url", "crypto", "@rebasepro/sdk-generator", "child_process", "os"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["Rebase CLI"] = {}, global.chalk, global.arg, global.inquirer, global.path, global.fs, global.util, global.execa, global.promises, global.url, global.crypto, global.sdkGenerator, global.child_process, global.os));
-})(this, (function(exports2, chalk, arg, inquirer, path, fs, util, execa, promises, url, crypto, sdkGenerator, child_process, os) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("chalk"), require("arg"), require("inquirer"), require("path"), require("fs"), require("net"), require("util"), require("execa"), require("fs/promises"), require("url"), require("crypto"), require("@rebasepro/sdk-generator"), require("child_process"), require("os")) : typeof define === "function" && define.amd ? define(["exports", "chalk", "arg", "inquirer", "path", "fs", "net", "util", "execa", "fs/promises", "url", "crypto", "@rebasepro/sdk-generator", "child_process", "os"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["Rebase CLI"] = {}, global.chalk, global.arg, global.inquirer, global.path, global.fs, global.net, global.util, global.execa, global.promises, global.url, global.crypto, global.sdkGenerator, global.child_process, global.os));
+})(this, (function(exports2, chalk, arg, inquirer, path, fs, net, util, execa, promises, url, crypto, sdkGenerator, child_process, os) {
   "use strict";
   var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
   function _interopNamespaceDefault(e) {
@@ -209,7 +209,7 @@ ${chalk.bold("Rebase")} — Create a new project 🚀
       process.exit(1);
     }
     await replacePlaceholders(options);
-    configureEnvFile(options.targetDirectory, options.databaseUrl);
+    await configureEnvFile(options.targetDirectory, options.databaseUrl);
     if (options.git) {
       console.log(chalk.gray("  Initializing git repository..."));
       try {
@@ -269,8 +269,8 @@ ${chalk.bold("Rebase")} — Create a new project 🚀
       console.log(chalk.gray("  # Your database is configured! Start the dev server:"));
     } else {
       console.log(chalk.gray("  # A local database configuration has been generated in .env."));
-      console.log(chalk.gray("  # If using the included docker-compose.yml, start it with:"));
-      console.log(`  ${chalk.cyan("docker compose up -d")}`);
+      console.log(chalk.gray("  # If using the included docker-compose.yml, start the database with:"));
+      console.log(`  ${chalk.cyan("docker compose up -d db")}`);
       console.log("");
       console.log(chalk.gray("  # Then start the dev server:"));
     }
@@ -290,6 +290,7 @@ ${chalk.bold("Rebase")} — Create a new project 🚀
       "backend/package.json",
       "config/package.json",
       "frontend/index.html",
+      "pnpm-workspace.yaml",
       "README.md"
     ];
     const packageJsonPath = path.resolve(cliRoot, "package.json");
@@ -354,7 +355,26 @@ ${chalk.bold("Rebase")} — Create a new project 🚀
       fs.writeFileSync(fullPath, content, "utf-8");
     }
   }
-  function configureEnvFile(targetDirectory, databaseUrl) {
+  async function isPortAvailable(port) {
+    return new Promise((resolve) => {
+      const server = net.createServer();
+      server.once("error", () => {
+        resolve(false);
+      });
+      server.once("listening", () => {
+        server.close(() => resolve(true));
+      });
+      server.listen(port);
+    });
+  }
+  async function findAvailablePort(startPort) {
+    let port = startPort;
+    while (!await isPortAvailable(port)) {
+      port++;
+    }
+    return port;
+  }
+  async function configureEnvFile(targetDirectory, databaseUrl) {
     const envExamplePath = path.join(targetDirectory, ".env.example");
     const envPath = path.join(targetDirectory, ".env");
     if (fs.existsSync(envExamplePath) && !fs.existsSync(envPath)) {
@@ -372,10 +392,21 @@ ${chalk.bold("Rebase")} — Create a new project 🚀
           `DATABASE_URL=${databaseUrl}`
         );
       } else {
+        const dbPort = await findAvailablePort(5432);
         envContent = envContent.replace(
           /^DATABASE_URL=.*$/m,
-          `DATABASE_URL=postgresql://rebase:${dbPassword}@localhost:5432/rebase`
+          `DATABASE_URL=postgresql://rebase:${dbPassword}@localhost:${dbPort}/rebase?options=-c%20search_path=public
+DATABASE_PASSWORD=${dbPassword}`
         );
+        const dockerComposePath = path.join(targetDirectory, "docker-compose.yml");
+        if (fs.existsSync(dockerComposePath)) {
+          let dockerComposeContent = fs.readFileSync(dockerComposePath, "utf-8");
+          dockerComposeContent = dockerComposeContent.replace(
+            /-\s*"5432:5432"/g,
+            `- "${dbPort}:5432"`
+          );
+          fs.writeFileSync(dockerComposePath, dockerComposeContent, "utf-8");
+        }
       }
       fs.writeFileSync(envPath, envContent, "utf-8");
     }