@selvajs/cli 4.8.0-beta.8 → 4.8.0

package/src/paths.js

@@ -21,9 +21,52 @@ export function requiredNodeRange() {
 	}
 }
 
-// A deployment directory must contain an .env and an ecosystem.config.cjs.
-// Anything else (selva.config.js, node_modules) is "should be there" but the
-// CLI doesn't require it — `selva init` is allowed to fix a partial install.
+/**
+ * This CLI's own version, written into `.selva-version` so a later `selva
+ * migrate` can tell which scaffold layout it is looking at.
+ *
+ * Read from package.json for the same reason as `requiredNodeRange`: a literal
+ * in code stops tracking the release the moment someone forgets to bump it, and
+ * the marker's whole job is to be accurate about which CLI wrote the directory.
+ */
+export function scaffoldVersion() {
+	try {
+		const here = dirname(fileURLToPath(import.meta.url));
+		const pkg = JSON.parse(readFileSync(join(here, '..', 'package.json'), 'utf8'));
+		return typeof pkg.version === 'string' ? pkg.version : '0.0.0';
+	} catch {
+		return '0.0.0';
+	}
+}
+
+/**
+ * A scaffolding template shipped inside the installed runtime. The CLI cannot
+ * import from `@selvajs/selva` — it is what installs it — so it reads the files
+ * out of node_modules after install.
+ */
+export function runtimeTemplatePath(dir, name) {
+	return join(dir, 'node_modules', '@selvajs', 'selva', 'templates', name);
+}
+
+/**
+ * The `.env` template to merge operator values into: the runtime's `.env.example`
+ * when installed, otherwise the deployment's own `.env` so its comments and
+ * ordering survive a rewrite.
+ *
+ * Returns `''` when neither exists rather than throwing — `mergeEnv` appends
+ * every value to an empty template, so the operator gets a usable file instead
+ * of an ENOENT from a command that was only asked to change one key.
+ */
+export function readEnvTemplate(dir) {
+	const template = runtimeTemplatePath(dir, '.env.example');
+	if (existsSync(template)) return readFileSync(template, 'utf8');
+	const env = join(dir, '.env');
+	if (existsSync(env)) return readFileSync(env, 'utf8');
+	return '';
+}
+
+// Either .env or ecosystem.config.cjs is enough — selva.config.js and
+// node_modules are expected too, but init should still fix a partial install.
 export function isDeploymentDir(dir) {
 	return existsSync(join(dir, '.env')) || existsSync(join(dir, 'ecosystem.config.cjs'));
 }

package/src/prompts.js

@@ -18,9 +18,7 @@ export function collectConfigFromEnv(env = process.env) {
 		'local',
 		'SELVA_AUTH_PROVIDER'
 	);
-	// Default data/storage to auth — matches the prompt's "use same provider
-	// for all three" default. Header-auth has no data layer, so it falls
-	// through to local unless explicitly overridden.
+	// Header-auth has no data layer, so it falls through to local unless overridden.
 	const dataDefault = auth === 'header' ? 'local' : auth;
 	const data = pick(
 		env.SELVA_DATA_PROVIDER,
@@ -72,7 +70,6 @@ export function collectConfigFromEnv(env = process.env) {
 			values.HEADER_AUTH_DISPLAY_NAME_HEADER = env.HEADER_AUTH_DISPLAY_NAME_HEADER;
 	}
 
-	// ── Bootstrap admin ──────────────────────────────────────────────────
 	const adminRequired = auth === 'header' || tenancy === 'multi';
 	const adminEmail = env.BOOTSTRAP_INSTANCE_ADMIN_EMAIL || '';
 	if (adminRequired && !adminEmail) {
@@ -127,15 +124,11 @@ function requireEnv(env, name) {
 	return v;
 }
 
-// Run full interactive prompt sequence; return env vars. Caller decides merge vs fresh.
-// `defaults` pre-populates prompts (cheap re-run).
 export async function collectConfig({ defaults = {}, mode = 'create' } = {}) {
 	const isInit = mode === 'init';
 
 	p.intro(pc.bgCyan(pc.black(isInit ? ' selva init ' : ' Selva — new deployment ')));
 
-	// Brand prompts (SELVA_BRAND_NAME / COPYRIGHT_NAME / TAGLINE / DESCRIPTION)
-
 	const tenancy = await p.select({
 		message: 'Tenancy mode',
 		initialValue: defaults.SELVA_TENANCY ?? 'single',
@@ -169,7 +162,6 @@ export async function collectConfig({ defaults = {}, mode = 'create' } = {}) {
 	});
 	cancelOn(auth);
 
-	// Header-auth: auth-only; user must pick separate data/storage backend.
 	let data;
 	let storage;
 	if (auth === 'header') {
@@ -197,7 +189,6 @@ export async function collectConfig({ defaults = {}, mode = 'create' } = {}) {
 		cancelOn(storageChoice);
 		storage = storageChoice;
 	} else {
-		// Operators usually want same backend for all three; ask once, default the others.
 		const mixProviders = await p.confirm({
 			message: `Use ${pc.cyan(auth)} for data and storage too?`,
 			initialValue: pickSameProviderDefault(defaults, auth)
@@ -281,7 +272,6 @@ export async function collectConfig({ defaults = {}, mode = 'create' } = {}) {
 	}
 
 	if (auth === 'header') {
-		// HEADER_AUTH_DATA_DIR: ask only if data provider isn't local (fallback available).
 		if (data !== 'local') {
 			const dataDir = await p.text({
 				message: 'HEADER_AUTH_DATA_DIR — directory for header-allowlist.json',
@@ -330,7 +320,7 @@ export async function collectConfig({ defaults = {}, mode = 'create' } = {}) {
 			providerValues.HEADER_AUTH_DISPLAY_NAME_HEADER = stringValue(display);
 		}
 
-		// Header-auth: default to loopback (not enforced; Docker networks may override).
+		// Not enforced — a Docker network can still route to the container on another host.
 		const bindLoopback = await p.confirm({
 			message: 'Bind the app to 127.0.0.1 only? (recommended for header-auth)',
 			initialValue: !defaults.HOST || defaults.HOST === '127.0.0.1' || defaults.HOST === 'localhost'
@@ -339,7 +329,6 @@ export async function collectConfig({ defaults = {}, mode = 'create' } = {}) {
 		providerValues.HOST = bindLoopback ? '127.0.0.1' : stringValue(defaults.HOST);
 	}
 
-	// Bootstrap admin (checked only while no admin exists; safe to leave set).
 	if (auth === 'header') {
 		p.note(
 			[
@@ -494,10 +483,11 @@ export async function collectConfig({ defaults = {}, mode = 'create' } = {}) {
 	return values;
 }
 
-// Init: default to "same provider" only if current .env already shows that.
 function pickSameProviderDefault(defaults, auth) {
 	const data = defaults.SELVA_DATA_PROVIDER ?? auth;
 	const storage = defaults.SELVA_STORAGE_PROVIDER ?? auth;
+	// No existing defaults means a fresh `create`, not a re-prompted `init` — default to
+	// "same provider for all three" since there's nothing yet to disagree with auth.
 	if (!defaults.SELVA_DATA_PROVIDER && !defaults.SELVA_STORAGE_PROVIDER) return true;
 	return data === auth && storage === auth;
 }
@@ -527,5 +517,3 @@ function headerAuthSecurityWarning() {
 		pc.dim('See packages/providers/header-auth/README.md for the full deployment checklist.')
 	].join('\n');
 }
-
-export { p as prompts, pc as colors };

package/bin/create.js

@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-import { runCreate } from '../src/commands/create.js';
-
-runCreate(process.argv.slice(2)).catch((err) => {
-	console.error(err instanceof Error ? err.message : err);
-	process.exit(1);
-});