@rebasepro/cli 0.2.1 → 0.2.4

package/README.md

@@ -1,52 +1,56 @@
 ## Rebase CLI
 
-This CLI tool allows you to create new Rebase projects and to deploy them to Rebase Cloud.
-**IMPORTANT**: You should not be using this tool directly, but `rebase` instead.
+Developer tools for scaffolding, running, and managing Rebase projects.
 
-### CLI
+### Installation
 
-You can use the following commands:
+The CLI is bundled with every Rebase project. You can also install it globally:
 
 ```bash
-rebase login
+pnpm add -g @rebasepro/cli
 ```
 
-```bash
-rebase init
-```
+### Commands
+
+| Command | Description |
+|---------|-------------|
+| `rebase init` | Scaffold a new Rebase project |
+| `rebase dev` | Start the development server (backend + frontend) |
+| `rebase build` | Build all workspace packages |
+| `rebase start` | Start the backend server (production) |
+| `rebase schema generate` | Generate Drizzle schema from collection definitions |
+| `rebase schema introspect` | Introspect an existing database to generate collections |
+| `rebase db push` | Apply schema directly to database (development) |
+| `rebase db generate` | Generate SQL migration files |
+| `rebase db migrate` | Run pending migrations |
+| `rebase db studio` | Open Drizzle Studio |
+| `rebase generate-sdk` | Generate a typed JS SDK from collections |
+| `rebase auth reset-password` | Reset a user's password |
+| `rebase doctor` | Detect schema drift between collections, schema, and DB |
+
+### Quick Start
 
 ```bash
-rebase deploy
+rebase init my-app
+cd my-app
+docker compose up -d db
+pnpm run db:push
+pnpm run dev
 ```
 
-### Using different templates
-
-You can initialize a new project using different templates. Please not that these templates can't
-be deployed to Rebase Cloud. For example:
+### Help
 
-For Rebase Cloud
+Run `rebase --help` or `rebase <command> --help` for detailed usage information.
 
-```bash
-rebase init
-```
+### Development
 
-For Rebase PRO:
+For local development of the CLI itself, link the package:
 
 ```bash
-rebase init --pro
+pnpm link --global
 ```
 
-#### To run locally
-
-For development purposes, you can link the package locally.
-
-```bash
-npm link rebase
-```
-
-### Development only
-
-You can change the environment when deploying to Rebase Cloud by defining the --env variable.
+You can change the environment when deploying to Rebase Cloud by defining the `--env` variable.
 Possible values are `prod` (default) and `dev`.
 
 ```bash

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,25 +1,8 @@
 (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")) : typeof define === "function" && define.amd ? define(["exports", "chalk", "arg", "inquirer", "path", "fs", "net", "util", "execa", "fs/promises", "url", "crypto", "@rebasepro/sdk-generator", "child_process"], 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));
+})(this, (function(exports2, chalk, arg, inquirer, path, fs, net, util, execa, promises, url, crypto, sdkGenerator, child_process) {
   "use strict";
   var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
-  function _interopNamespaceDefault(e) {
-    const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
-    if (e) {
-      for (const k in e) {
-        if (k !== "default") {
-          const d = Object.getOwnPropertyDescriptor(e, k);
-          Object.defineProperty(n, k, d.get ? d : {
-            enumerable: true,
-            get: () => e[k]
-          });
-        }
-      }
-    }
-    n.default = e;
-    return Object.freeze(n);
-  }
-  const os__namespace = /* @__PURE__ */ _interopNamespaceDefault(os);
   function detectPackageManager(targetDir) {
     const userAgent = process.env.npm_config_user_agent ?? "";
     if (userAgent.startsWith("npm/")) return "npm";
@@ -154,7 +137,13 @@ ${chalk.bold("Rebase")} — Create a new project 🚀
       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",
@@ -209,7 +198,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 {
@@ -260,23 +249,37 @@ ${chalk.bold("Rebase")} — Create a new project 🚀
     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"));
@@ -290,6 +293,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 +358,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)) {
@@ -367,15 +390,29 @@ ${chalk.bold("Rebase")} — Create a new project 🚀
         `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");
     }
@@ -665,7 +702,7 @@ Expected a default export of EntityCollection[] or an object with named collecti
           env
         });
       }
-    } catch (err) {
+    } catch {
       process.exit(1);
     }
   }
@@ -733,7 +770,7 @@ ${chalk.green.bold("introspect Options")}
           env
         });
       }
-    } catch (err) {
+    } catch {
       process.exit(1);
     }
   }
@@ -953,7 +990,7 @@ ${chalk.green.bold("Examples")}
           });
           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");
@@ -982,7 +1019,7 @@ ${chalk.green.bold("Examples")}
                 });
                 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);
           });
@@ -1177,6 +1214,9 @@ ${chalk.green.bold("Description")}
     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";
@@ -1185,10 +1225,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!);
@@ -1451,66 +1491,22 @@ ${chalk.green.bold("Options")}
 ${chalk.gray("Documentation: https://rebase.pro/docs")}
 `);
   }
-  const TOKEN_DIR = path.join(os__namespace.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.");
-    }
-  }
   exports2.authCommand = authCommand;
   exports2.buildCommand = buildCommand;
   exports2.configureEnvFile = configureEnvFile;
   exports2.createRebaseApp = createRebaseApp;
   exports2.dbCommand = dbCommand;
+  exports2.detectPackageManager = detectPackageManager;
   exports2.devCommand = devCommand;
+  exports2.doctorCommand = doctorCommand;
   exports2.entry = entry;
   exports2.findBackendDir = findBackendDir;
   exports2.findEnvFile = findEnvFile;
   exports2.findFrontendDir = findFrontendDir;
   exports2.findProjectRoot = findProjectRoot;
+  exports2.generateSdkCommand = generateSdkCommand;
   exports2.getActiveBackendPlugin = getActiveBackendPlugin;
-  exports2.getTokens = getTokens;
-  exports2.login = login;
-  exports2.logout = logout;
-  exports2.parseJwt = parseJwt;
-  exports2.refreshCredentials = refreshCredentials;
+  exports2.getPMCommands = getPMCommands;
   exports2.requireBackendDir = requireBackendDir;
   exports2.requireProjectRoot = requireProjectRoot;
   exports2.resolveLocalBin = resolveLocalBin;