@rebasepro/cli 0.2.1 → 0.2.3

package/dist/index.es.js

@@ -3,6 +3,7 @@ import arg from "arg";
 import inquirer from "inquirer";
 import path from "path";
 import fs from "fs";
+import net from "net";
 import { promisify } from "util";
 import { execa, execaCommandSync } from "execa";
 import { cp } from "fs/promises";
@@ -200,7 +201,7 @@ async function createProject(options) {
     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 {
@@ -260,8 +261,8 @@ async function createProject(options) {
     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:"));
   }
@@ -281,6 +282,7 @@ async function replacePlaceholders(options) {
     "backend/package.json",
     "config/package.json",
     "frontend/index.html",
+    "pnpm-workspace.yaml",
     "README.md"
   ];
   const packageJsonPath = path.resolve(cliRoot, "package.json");
@@ -345,7 +347,26 @@ async function replacePlaceholders(options) {
     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)) {
@@ -363,10 +384,21 @@ function configureEnvFile(targetDirectory, databaseUrl) {
         `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");
   }