@rebasepro/cli 0.2.1 → 0.2.4

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";
@@ -10,7 +11,6 @@ import { fileURLToPath } from "url";
 import crypto from "crypto";
 import { generateSDK } from "@rebasepro/sdk-generator";
 import { execSync, spawn } from "child_process";
-import * as os from "os";
 function detectPackageManager(targetDir) {
   const userAgent = process.env.npm_config_user_agent ?? "";
   if (userAgent.startsWith("npm/")) return "npm";
@@ -145,7 +145,13 @@ async function promptForOptions(rawArgs, pm) {
     type: "input",
     name: "databaseUrl",
     message: "Enter your PostgreSQL database connection string (leave blank to use a local default):",
-    default: ""
+    default: "",
+    validate: (input) => {
+      if (input.trim() && /[\r\n]/.test(input)) {
+        return "Database URL cannot contain newline characters.";
+      }
+      return true;
+    }
   });
   questions.push({
     type: "confirm",
@@ -200,7 +206,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 {
@@ -251,23 +257,37 @@ async function createProject(options) {
   console.log(chalk.bold("Next steps:"));
   console.log("");
   const runDev = pmCommands.run("dev");
+  const runDbPush = pmCommands.run("db:push");
   console.log(`  ${chalk.cyan("cd")} ${options.projectName}`);
   if (!options.installDeps) {
     console.log(`  ${chalk.cyan(installCmd.join(" "))}`);
   }
   console.log("");
   if (options.databaseUrl) {
-    console.log(chalk.gray("  # Your database is configured! Start the dev server:"));
+    if (options.introspect) {
+      console.log(chalk.gray("  # Database has been introspected & collections generated!"));
+      console.log(chalk.gray("  # Start the development server (frontend + backend):"));
+      console.log(`  ${chalk.cyan(runDev.join(" "))}`);
+    } else {
+      console.log(chalk.gray("  # Your custom database is configured in .env."));
+      console.log(chalk.gray("  # If the database is empty, push the Rebase schema to initialize it:"));
+      console.log(`  ${chalk.cyan(runDbPush.join(" "))}`);
+      console.log("");
+      console.log(chalk.gray("  # Then start the development server:"));
+      console.log(`  ${chalk.cyan(runDev.join(" "))}`);
+    }
   } 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("  # 1. Start the PostgreSQL database container:"));
+    console.log(`  ${chalk.cyan("docker compose up -d db")}`);
     console.log("");
-    console.log(chalk.gray("  # Then start the dev server:"));
+    console.log(chalk.gray("  # 2. Push the Rebase schema to initialize database tables:"));
+    console.log(`  ${chalk.cyan(runDbPush.join(" "))}`);
+    console.log("");
+    console.log(chalk.gray("  # 3. Start the development server (frontend + backend):"));
+    console.log(`  ${chalk.cyan(runDev.join(" "))}`);
   }
   console.log("");
-  console.log(`  ${chalk.cyan(runDev.join(" "))}`);
-  console.log("");
   console.log(chalk.gray("This starts both the backend (Hono + PostgreSQL)") + chalk.gray(" and the frontend (Vite + React) concurrently."));
   console.log("");
   console.log(chalk.gray("Docs: https://rebase.pro/docs"));
@@ -281,6 +301,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 +366,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)) {
@@ -358,15 +398,29 @@ function configureEnvFile(targetDirectory, databaseUrl) {
       `JWT_SECRET=${jwtSecret}`
     );
     if (databaseUrl) {
+      if (/[\r\n]/.test(databaseUrl)) {
+        throw new Error("Invalid DATABASE_URL: multiline values are not allowed.");
+      }
       envContent = envContent.replace(
         /^DATABASE_URL=.*$/m,
         `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");
   }
@@ -656,7 +710,7 @@ async function schemaCommand(subcommand, rawArgs) {
         env
       });
     }
-  } catch (err) {
+  } catch {
     process.exit(1);
   }
 }
@@ -724,7 +778,7 @@ async function dbCommand(subcommand, rawArgs) {
         env
       });
     }
-  } catch (err) {
+  } catch {
     process.exit(1);
   }
 }
@@ -944,7 +998,7 @@ async function devCommand(rawArgs) {
         });
         console.log(chalk.green("  ✓ Initial schema and SDK generated successfully.\n"));
       } catch (err) {
-        console.error(chalk.red(`  ✗ Initial schema/SDK generation failed: ${err.message || err}
+        console.error(chalk.red(`  ✗ Initial schema/SDK generation failed: ${err instanceof Error ? err.message : err}
 `));
       }
       const collectionsDir = path.join(projectRoot, "config", "collections");
@@ -973,7 +1027,7 @@ async function devCommand(rawArgs) {
               });
               console.log(chalk.green("  ✓ Schema & SDK regenerated successfully. Hono will reload."));
             } catch (err) {
-              console.error(chalk.red(`  ✗ Failed to regenerate schema/SDK: ${err.message || err}`));
+              console.error(chalk.red(`  ✗ Failed to regenerate schema/SDK: ${err instanceof Error ? err.message : err}`));
             }
           }, 300);
         });
@@ -1168,6 +1222,9 @@ async function resetPassword(rawArgs) {
   if (envFile) {
     env.DOTENV_CONFIG_PATH = envFile;
   }
+  env.REBASE_RESET_EMAIL = email;
+  env.REBASE_RESET_PASSWORD = newPassword || "NewPassword123!";
+  env.REBASE_ENV_FILE_PATH = envFile || path.join(projectRoot, ".env");
   const scriptContent = `
 import { createPostgresDatabaseConnection } from "@rebasepro/server-postgresql";
 import { hashPassword } from "@rebasepro/server-core";
@@ -1176,10 +1233,10 @@ import * as dotenv from "dotenv";
 import path from "path";
 import fs from "fs";
 
-dotenv.config({ path: "${envFile || path.join(projectRoot, ".env")}" });
+dotenv.config({ path: process.env.REBASE_ENV_FILE_PATH });
 
-const email = "${email}";
-const newPassword = "${newPassword || "NewPassword123!"}";
+const email = process.env.REBASE_RESET_EMAIL!;
+const newPassword = process.env.REBASE_RESET_PASSWORD!;
 
 async function resetPassword() {
     const { db } = createPostgresDatabaseConnection(process.env.DATABASE_URL!);
@@ -1442,67 +1499,23 @@ ${chalk.green.bold("Options")}
 ${chalk.gray("Documentation: https://rebase.pro/docs")}
 `);
 }
-const TOKEN_DIR = path.join(os.homedir(), ".rebase");
-function tokenPath(env) {
-  return path.join(TOKEN_DIR, (env === "dev" ? "staging." : "") + "tokens.json");
-}
-async function getTokens(env, _debug) {
-  const fp = tokenPath(env);
-  if (!fs.existsSync(fp)) return null;
-  try {
-    const data = fs.readFileSync(fp, "utf-8");
-    return JSON.parse(data);
-  } catch {
-    return null;
-  }
-}
-function parseJwt(token) {
-  if (!token) throw new Error("No JWT token");
-  const base64Url = token.split(".")[1];
-  const base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/");
-  const buffer = Buffer.from(base64, "base64");
-  return JSON.parse(buffer.toString());
-}
-async function refreshCredentials(env, credentials, _onErr) {
-  if (!credentials) return null;
-  const expiryDate = new Date(credentials["expiry_date"]);
-  if (expiryDate.getTime() > Date.now()) {
-    return credentials;
-  }
-  return null;
-}
-async function login(env, _debug) {
-  console.log(
-    "Interactive login is not yet implemented in @rebasepro/cli.\nPlease authenticate via the Rebase dashboard and copy your tokens to " + tokenPath(env)
-  );
-}
-async function logout(env, _debug) {
-  const fp = tokenPath(env);
-  if (fs.existsSync(fp)) {
-    fs.unlinkSync(fp);
-    console.log("You have been logged out.");
-  } else {
-    console.log("You are not logged in.");
-  }
-}
 export {
   authCommand,
   buildCommand,
   configureEnvFile,
   createRebaseApp,
   dbCommand,
+  detectPackageManager,
   devCommand,
+  doctorCommand,
   entry,
   findBackendDir,
   findEnvFile,
   findFrontendDir,
   findProjectRoot,
+  generateSdkCommand,
   getActiveBackendPlugin,
-  getTokens,
-  login,
-  logout,
-  parseJwt,
-  refreshCredentials,
+  getPMCommands,
   requireBackendDir,
   requireProjectRoot,
   resolveLocalBin,