@rebasepro/cli 0.9.1-canary.7dddf96 → 0.9.1-canary.a57c262

package/dist/commands/init.d.ts

@@ -1,4 +1,6 @@
 import type { PackageManager, PMCommands } from "../utils/package-manager";
+/** Returns an error message, or null when the name is a valid package name. */
+export declare function validateProjectName(name: string): string | null;
 export type TemplatePreset = "blog" | "ecommerce" | "blank";
 /**
  * How much of Rebase to scaffold.

package/dist/index.es.js

@@ -144,6 +144,13 @@ function findParentDir(currentDir, targetName) {
 	return null;
 }
 var cliRoot = findParentDir(__dirname$1, "cli");
+var PROJECT_NAME_RE = /^[a-z0-9][a-z0-9._-]*$/;
+/** Returns an error message, or null when the name is a valid package name. */
+function validateProjectName(name) {
+	if (!name.trim()) return "Project name is required";
+	if (!PROJECT_NAME_RE.test(name)) return "Project name must start with a lowercase letter or number and contain only lowercase letters, numbers, hyphens, dots, or underscores";
+	return null;
+}
 var FLAVOR_CHOICES = [{
 	name: "BaaS + admin  — API plus an admin UI, driven by collections you define (like Payload/Directus)",
 	value: "cms",
@@ -183,11 +190,7 @@ function buildInitQuestions(params) {
 		name: "projectName",
 		message: "Project name:",
 		default: "my-rebase-app",
-		validate: (input) => {
-			if (!input.trim()) return "Project name is required";
-			if (!/^[a-z0-9][a-z0-9._-]*$/.test(input)) return "Project name must start with a lowercase letter or number and contain only lowercase letters, numbers, hyphens, dots, or underscores";
-			return true;
-		}
+		validate: (input) => validateProjectName(input) ?? true
 	});
 	if (!flavorArg) questions.push({
 		type: "select",
@@ -261,6 +264,14 @@ async function promptForOptions(rawArgs, pm) {
 	});
 	const nameArg = args._[0];
 	const isNonInteractive = args["--yes"] || false;
+	if (nameArg) {
+		const resolvedName = path.basename(path.resolve(process.cwd(), nameArg));
+		const nameError = validateProjectName(resolvedName);
+		if (nameError) {
+			console.error(chalk.red(`Invalid project name "${resolvedName}": ${nameError}`));
+			process.exit(1);
+		}
+	}
 	const templateArg = args["--template"];
 	if (templateArg && !PRESET_CHOICES.some((p) => p.value === templateArg)) {
 		console.error(chalk.red(`Unknown template "${templateArg}". Available: ${PRESET_CHOICES.map((p) => p.value).join(", ")}`));
@@ -343,7 +354,14 @@ async function createProject$1(options) {
 		console.error(`${chalk.red.bold("ERROR")} Failed to copy template files: ${err instanceof Error ? err.message : String(err)}`);
 		process.exit(1);
 	}
-	if (options.flavor !== "baas") await applyPreset(options.targetDirectory, options.preset);
+	for (const [from, to] of [["gitignore", ".gitignore"], ["npmrc", ".npmrc"]]) {
+		const shipped = path.join(options.targetDirectory, from);
+		if (fs.existsSync(shipped)) fs.renameSync(shipped, path.join(options.targetDirectory, to));
+	}
+	if (options.flavor !== "baas") {
+		if (options.introspect && options.preset !== "blank") console.log(chalk.gray("  Using the blank template: collections will come from your database."));
+		await applyPreset(options.targetDirectory, options.introspect ? "blank" : options.preset);
+	}
 	await applyFlavor(options.targetDirectory, options.flavor);
 	await replacePlaceholders(options);
 	await configureEnvFile(options.targetDirectory, options.databaseUrl);
@@ -362,6 +380,12 @@ async function createProject$1(options) {
 		"introspect",
 		"--force"
 	]);
+	const generateCmd = pmCommands.exec("rebase", [
+		"schema",
+		"generate",
+		"--collections",
+		"../config/collections"
+	]);
 	if (options.installDeps) {
 		console.log("");
 		console.log(chalk.gray(`  Installing dependencies with ${pm}...`));
@@ -385,10 +409,14 @@ async function createProject$1(options) {
 					cwd: options.targetDirectory,
 					stdio: "inherit"
 				});
+				await execa(generateCmd[0], generateCmd.slice(1), {
+					cwd: options.targetDirectory,
+					stdio: "inherit"
+				});
 				console.log(chalk.green("  Database successfully introspected!"));
 			} catch {
 				console.warn(chalk.yellow("  Warning: Failed to introspect database automatically."));
-				console.warn(chalk.yellow(`  You can run \`${execCmd.join(" ")}\` manually after setup.`));
+				console.warn(chalk.yellow(`  You can run \`${execCmd.join(" ")}\` then \`${generateCmd.join(" ")}\` manually after setup.`));
 			}
 		} else {
 			console.warn(chalk.yellow("  Skipping introspection because dependencies were not installed."));
@@ -635,7 +663,7 @@ async function configureEnvFile(targetDirectory, databaseUrl) {
 			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:${dbPort}/rebase?options=-c%20search_path=public\nDATABASE_PASSWORD=${dbPassword}`);
+			envContent = envContent.replace(/^DATABASE_URL=.*$/m, `DATABASE_URL=postgresql://rebase:${dbPassword}@localhost:${dbPort}/rebase?options=-c%20search_path=public&sslmode=disable\nDATABASE_PASSWORD=${dbPassword}`);
 			const dockerComposePath = path.join(targetDirectory, "docker-compose.yml");
 			if (fs.existsSync(dockerComposePath)) {
 				let dockerComposeContent = fs.readFileSync(dockerComposePath, "utf-8");
@@ -838,13 +866,14 @@ function getActiveBackendPlugin(backendDir) {
 * Resolve the active plugin's CLI script.
 */
 function resolvePluginCliScript(backendDir, pluginName) {
-	const candidates = [
-		path.join(backendDir, "node_modules", pluginName, "src", "cli.ts"),
-		path.join(backendDir, "node_modules", pluginName, "dist", "cli.js"),
-		path.resolve(backendDir, "..", "..", "..", "packages", pluginName.replace("@rebasepro/", ""), "src", "cli.ts"),
-		path.resolve(backendDir, "..", "..", "packages", pluginName.replace("@rebasepro/", ""), "src", "cli.ts"),
-		path.resolve(backendDir, "..", "packages", pluginName.replace("@rebasepro/", ""), "src", "cli.ts")
-	];
+	const candidates = [];
+	let dir = path.resolve(backendDir);
+	const fsRoot = path.parse(dir).root;
+	while (dir !== fsRoot) {
+		candidates.push(path.join(dir, "node_modules", pluginName, "src", "cli.ts"), path.join(dir, "node_modules", pluginName, "dist", "cli.js"));
+		dir = path.dirname(dir);
+	}
+	candidates.push(path.resolve(backendDir, "..", "..", "..", "packages", pluginName.replace("@rebasepro/", ""), "src", "cli.ts"), path.resolve(backendDir, "..", "..", "packages", pluginName.replace("@rebasepro/", ""), "src", "cli.ts"), path.resolve(backendDir, "..", "packages", pluginName.replace("@rebasepro/", ""), "src", "cli.ts"));
 	for (const candidate of candidates) if (fs.existsSync(candidate)) return candidate;
 	return null;
 }
@@ -3993,6 +4022,6 @@ ${chalk.gray("Documentation: https://rebase.pro/docs")}
 `);
 }
 //#endregion
-export { authCommand, buildCommand, buildInitQuestions, cloudCommand, configureEnvFile, createRebaseApp, dbCommand, detectPackageManager, devCommand, doctorCommand, entry, findBackendDir, findEnvFile, findFrontendDir, findProjectRoot, generateSdkCommand, getActiveBackendPlugin, getPMCommands, requireBackendDir, requireProjectRoot, resolveLocalBin, resolvePluginCliScript, resolveTsx, schemaCommand, startCommand, validateTsxInstallation };
+export { authCommand, buildCommand, buildInitQuestions, cloudCommand, configureEnvFile, createRebaseApp, dbCommand, detectPackageManager, devCommand, doctorCommand, entry, findBackendDir, findEnvFile, findFrontendDir, findProjectRoot, generateSdkCommand, getActiveBackendPlugin, getPMCommands, requireBackendDir, requireProjectRoot, resolveLocalBin, resolvePluginCliScript, resolveTsx, schemaCommand, startCommand, validateProjectName, validateTsxInstallation };
 
 //# sourceMappingURL=index.es.js.map