@coffre/cli 0.1.4 → 0.1.6

package/README.md

@@ -4,7 +4,7 @@ The `coffre` command: secrets in your shell, and a new deployment.
 
 ```sh
 npx @coffre/cli init --workers my-coffre   # or --node
-npx @coffre/cli setup                      # its database logins, migrations and keys
+npx @coffre/cli setup                      # its database, keys and, on Workers, Cloudflare
 coffre login https://secrets.acme.example
 coffre run market/prod -- node server.js
 ```

package/dist/{keys-RhB7ayOY.js → keys-BCKUEb-Y.js}

@@ -1,9 +1,78 @@
 import { parseArgs } from "node:util";
 import { spawn } from "node:child_process";
-import { openSync } from "node:fs";
+import { existsSync, mkdirSync, openSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
+import { basename, dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
 import { randomBytes } from "node:crypto";
 import { emitKeypressEvents } from "node:readline";
 import tty from "node:tty";
+//#region src/init.ts
+const KINDS = ["workers", "node"];
+/** Where a template lives: in the package when published, else in the repository. */
+function templateDir(kind) {
+	const packed = fileURLToPath(new URL(`./templates/${kind}/`, import.meta.url));
+	if (existsSync(packed)) return packed;
+	return fileURLToPath(new URL(`../../../examples/${kind}/`, import.meta.url));
+}
+/**
+* A template's files, relative and sorted: everything but what its own
+* `.gitignore` names, such as installed packages, local state and secrets.
+* Patterns are file or directory names, `*` standing for any run of
+* characters.
+*/
+function templateFiles(dir) {
+	const ignoreFile = [join(dir, ".gitignore"), join(dir, "gitignore")].find((path) => existsSync(path));
+	const ignored = (ignoreFile === void 0 ? "" : readFileSync(ignoreFile, "utf8")).split("\n").map((line) => line.trim()).filter((line) => line !== "" && !line.startsWith("#")).map((glob) => new RegExp(`^${glob.split("*").map((part) => part.replace(/[.+?^${}()|[\]\\]/g, "\\$&")).join(".*")}$`));
+	const files = [];
+	const walk = (relative) => {
+		for (const entry of readdirSync(join(dir, relative), { withFileTypes: true })) {
+			if (ignored.some((pattern) => pattern.test(entry.name))) continue;
+			const path = relative === "" ? entry.name : `${relative}/${entry.name}`;
+			if (entry.isDirectory()) walk(path);
+			else files.push(path);
+		}
+	};
+	walk("");
+	return files.sort();
+}
+/** The name a template file has in a project. */
+function projectPath(templatePath) {
+	return templatePath === "gitignore" ? ".gitignore" : templatePath;
+}
+/** A package name from a directory's, e.g. `Acme Secrets` → `acme-secrets`. */
+function packageName(dir) {
+	const name = basename(dir).toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^[-._]+|-+$/g, "");
+	return name === "" ? "coffre" : name;
+}
+/** The template's package.json, for this project and this version of coffre. */
+function manifest(source, name, version) {
+	const pkg = JSON.parse(source);
+	pkg.name = name;
+	for (const field of ["dependencies", "devDependencies"]) {
+		const deps = pkg[field];
+		for (const dep of Object.keys(deps ?? {})) if (dep.startsWith("@coffre/")) deps[dep] = version;
+	}
+	return `${JSON.stringify(pkg, null, 2)}\n`;
+}
+/** Whether a directory holds nothing yet, or nothing but `.git`: a repository made first, then cloned. */
+function isEmpty(dir) {
+	return !existsSync(dir) || readdirSync(dir).every((entry) => entry === ".git");
+}
+/** Write a new deployment into `target`, which must be empty (`isEmpty`) or absent. Returns the files written. */
+function init(kind, target, version) {
+	if (!isEmpty(target)) throw new Error(`${target} is not empty; give \`coffre init\` a new directory`);
+	const source = templateDir(kind);
+	const written = [];
+	for (const file of templateFiles(source)) {
+		const path = projectPath(file);
+		const content = readFileSync(join(source, file), "utf8");
+		mkdirSync(dirname(join(target, path)), { recursive: true });
+		writeFileSync(join(target, path), path === "package.json" ? manifest(content, packageName(target), version) : content);
+		written.push(path);
+	}
+	return written;
+}
+//#endregion
 //#region src/clipboard.ts
 const CLEAR_AFTER_MS = 3e4;
 /** The system's clipboard tool, by platform and display server; null for none known. */
@@ -224,6 +293,10 @@ function paragraph(out, text, indent = 2) {
 	const pad = " ".repeat(indent);
 	return wrap(text, Math.max(20, (out.columns || 80) - indent - 1)).map((line) => `${pad}${line}`).join("\n");
 }
+/** "a, b or c". */
+function listed(items, last) {
+	return items.length < 2 ? items.join("") : `${items.slice(0, -1).join(", ")} ${last} ${items.at(-1)}`;
+}
 /** A labelled row: `label` in a column of `column`, `text` wrapped beside it with a hanging indent. */
 function row(out, s, label, text, indent = 4, column = 10) {
 	const lines = wrap(text, Math.max(20, (out.columns || 80) - indent - column - 1));
@@ -257,25 +330,107 @@ function release(keys) {
 	keys.pause();
 	if (keys !== process.stdin) keys.destroy?.();
 }
-/** Every key pressed, in raw mode, until `until` returns true. */
-function readKeys(keys, until) {
+/**
+* Every key pressed, in raw mode, until `until` returns true, or `signal`
+* aborts the reading. Raw mode is on when this returns: a prompt shown after
+* it gets every key, none echoed or edited by the terminal first.
+*/
+function readKeys(keys, until, signal) {
 	emitKeypressEvents(keys);
 	keys.setRawMode?.(true);
 	keys.resume();
 	return new Promise((resolve, reject) => {
 		let busy = Promise.resolve();
+		const stop = () => {
+			keys.off("keypress", onKey);
+			signal?.removeEventListener("abort", stop);
+			keys.setRawMode?.(false);
+			keys.pause();
+			resolve();
+		};
 		const onKey = (sequence, key) => {
 			busy = busy.then(async () => {
-				if (await until(key ?? { sequence }, sequence ?? key?.sequence ?? "")) {
-					keys.off("keypress", onKey);
-					keys.setRawMode?.(false);
-					keys.pause();
-					resolve();
-				}
+				if (await until(key ?? { sequence }, sequence ?? key?.sequence ?? "")) stop();
 			}).catch(reject);
 		};
 		keys.on("keypress", onKey);
+		if (signal?.aborted) stop();
+		else signal?.addEventListener("abort", stop);
+	});
+}
+/** What a typed key does to a line: its new text, or `submit`, or `cancel`. */
+function edit(text, key, sequence) {
+	if (key.ctrl && key.name === "c") return "cancel";
+	if (key.name === "return" || key.name === "enter") return "submit";
+	if (key.name === "backspace") return text.slice(0, -1);
+	if (key.ctrl && key.name === "u") return "";
+	if (!key.ctrl && !key.meta && sequence.length > 0 && !sequence.startsWith("\x1B") && sequence >= " ") return text + sequence;
+	return text;
+}
+/**
+* A question answered by typing, shown as typed, `initial` to start from;
+* `note`, dim under it while it is asked; `check` says why an answer will
+* not do, under it. Once given, the question becomes one line: what was
+* asked, and the answer. Ctrl-C cancels.
+*/
+async function textLine(keys, out, s, question, hint, options = {}) {
+	const columns = Math.max(20, (out.columns || 80) - 1);
+	let typed = options.initial ?? "";
+	let error = null;
+	const draw = () => {
+		const below = [...error === null ? [] : [s.red(error)], ...options.note === void 0 ? [] : wrap(options.note, columns - 4).map(s.dim)].map((line) => `\n${truncate(`    ${line}`, columns)}`);
+		out.write(`\r\x1b[J${below.join("")}${below.length > 0 ? `\x1b[${below.length}A` : ""}\r${truncate(`    ${s.accent("›")} ${typed}`, columns)}`);
+	};
+	let cancelled = false;
+	const answered = readKeys(keys, async (key, sequence) => {
+		const next = edit(typed, key, sequence);
+		if (next === "cancel") cancelled = true;
+		else if (next === "submit") {
+			if (typed.trim() === "") return false;
+			error = await options.check?.(typed.trim()) ?? null;
+			if (error === null) return true;
+		} else {
+			typed = next;
+			error = null;
+		}
+		if (cancelled) return true;
+		draw();
+		return false;
 	});
+	out.write(`${truncate(`  ${s.accent("?")} ${s.bold(question)} ${s.dim(hint)}`, columns)}\n`);
+	draw();
+	await answered;
+	out.write("\r\x1B[J\x1B[1A\x1B[2K");
+	if (cancelled) throw new Cancelled();
+	out.write(`${truncate(`  ${s.green("✓")} ${s.dim(question)}  ${typed.trim()}`, columns)}\n`);
+	return typed.trim();
+}
+/** One of `options`, chosen with the arrows and Enter; then one line, as `textLine` leaves. Ctrl-C cancels. */
+async function select(keys, out, s, question, options) {
+	const columns = Math.max(20, (out.columns || 80) - 1);
+	let at = 0;
+	let drawn = 0;
+	const draw = () => {
+		const lines = [`  ${s.accent("?")} ${s.bold(question)} ${s.dim("↑↓ then Enter")}`, ...options.map((option, i) => i === at ? `    ${s.accent("›")} ${s.accent(option)}` : `      ${option}`)];
+		out.write(`${drawn > 0 ? `\x1b[${drawn}F` : ""}${lines.map((line) => `${truncate(line, columns)}\x1b[K\n`).join("")}`);
+		drawn = lines.length;
+	};
+	let cancelled = false;
+	const chosen = readKeys(keys, (key) => {
+		if (key.ctrl && key.name === "c") cancelled = true;
+		else if (key.name === "return" || key.name === "enter") return true;
+		else if (key.name === "up" || key.name === "k") at = (at - 1 + options.length) % options.length;
+		else if (key.name === "down" || key.name === "j" || key.name === "tab") at = (at + 1) % options.length;
+		if (cancelled) return true;
+		draw();
+		return false;
+	});
+	draw();
+	await chosen;
+	out.write(`\x1b[${drawn}F\x1b[J`);
+	if (cancelled) throw new Cancelled();
+	out.write(`${truncate(`  ${s.green("✓")} ${s.dim(question)}  ${options[at]}`, columns)}\n`);
+	return at;
 }
 var Cancelled = class extends Error {
 	constructor() {
@@ -289,24 +444,24 @@ var Cancelled = class extends Error {
 */
 async function hiddenLine(keys, out, s, question, hint) {
 	const columns = Math.max(20, (out.columns || 80) - 1);
-	out.write(`${truncate(`  ${s.accent("?")} ${s.bold(question)}`, columns)}\n${truncate(`    ${s.dim(hint)}`, columns)}\n`);
 	let typed = "";
 	const draw = () => {
 		const count = typed.length > 0 ? s.dim(`  ${typed.length} characters`) : "";
 		out.write(`\r\x1b[2K${truncate(`    ${s.accent("›")} ${"•".repeat(typed.length)}`, columns - width(count))}${count}`);
 	};
-	draw();
 	let cancelled = false;
-	await readKeys(keys, (key, sequence) => {
-		if (key.ctrl && key.name === "c") cancelled = true;
-		else if (key.name === "return" || key.name === "enter") return true;
-		else if (key.name === "backspace") typed = typed.slice(0, -1);
-		else if (key.ctrl && key.name === "u") typed = "";
-		else if (!key.ctrl && !key.meta && sequence.length > 0 && !sequence.startsWith("\x1B") && sequence >= " ") typed += sequence;
+	const typedIn = readKeys(keys, (key, sequence) => {
+		const next = edit(typed, key, sequence);
+		if (next === "cancel") cancelled = true;
+		else if (next === "submit") return true;
+		else typed = next;
 		if (cancelled) return true;
 		draw();
 		return false;
 	});
+	out.write(`${truncate(`  ${s.accent("?")} ${s.bold(question)}`, columns)}\n${truncate(`    ${s.dim(hint)}`, columns)}\n`);
+	draw();
+	await typedIn;
 	out.write("\r\x1B[2K\x1B[1A\x1B[2K\x1B[1A\x1B[2K");
 	if (cancelled) throw new Cancelled();
 	return typed.trim();
@@ -389,7 +544,7 @@ function render(screen, state, columns, rows, s) {
 		"",
 		`${title}${" ".repeat(Math.max(1, columns - width(title) - width(right) - 2))}${right}`,
 		rule,
-		...state.view === "values" ? wrap("Save each one in your password manager now. They aren't stored anywhere, and won't be shown again.", columns - 4).map((line) => `  ${line}`) : [`  ${s.bold("Where these go")}`],
+		...state.view === "values" ? wrap(screen.intro ?? "Save each one in your password manager now. They aren't stored anywhere, and won't be shown again.", columns - 4).map((line) => `  ${line}`) : [`  ${s.bold("Where these go")}`],
 		""
 	];
 	const body = [];
@@ -723,4 +878,4 @@ async function keys(args) {
 	].join("\n"));
 }
 //#endregion
-export { yes as _, keys as a, Cancelled as c, paragraph as d, release as f, wrap as g, truncate as h, keyValues as i, hiddenLine as l, style as m, jsonWarning as n, needsTerminal as o, row as p, keyGuide as r, showSecrets as s, generateKeys as t, openTerminal as u };
+export { yes as C, isEmpty as E, wrap as S, init as T, select as _, keys as a, truncate as b, Cancelled as c, listed as d, openTerminal as f, row as g, release as h, keyValues as i, edit as l, readKeys as m, jsonWarning as n, needsTerminal as o, paragraph as p, keyGuide as r, showSecrets as s, generateKeys as t, hiddenLine as u, style as v, KINDS as w, width as x, textLine as y };

package/dist/main.js

@@ -1,75 +1,11 @@
 #!/usr/bin/env node
-import { a as keys } from "./keys-RhB7ayOY.js";
+import { T as init, a as keys, w as KINDS } from "./keys-BCKUEb-Y.js";
 import { i as isRole, r as assignableToEnvironment, t as ROLES } from "./access-CO1kGjWW.js";
 import { parseArgs, promisify } from "node:util";
 import { execFile, spawn } from "node:child_process";
-import { chmodSync, existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
+import { chmodSync, existsSync, lstatSync, mkdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { homedir, hostname } from "node:os";
-import { basename, dirname, join, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-//#region src/init.ts
-const KINDS = ["workers", "node"];
-/** Where a template lives: in the package when published, else in the repository. */
-function templateDir(kind) {
-	const packed = fileURLToPath(new URL(`./templates/${kind}/`, import.meta.url));
-	if (existsSync(packed)) return packed;
-	return fileURLToPath(new URL(`../../../examples/${kind}/`, import.meta.url));
-}
-/**
-* A template's files, relative and sorted: everything but what its own
-* `.gitignore` names, such as installed packages, local state and secrets.
-* Patterns are file or directory names, `*` standing for any run of
-* characters.
-*/
-function templateFiles(dir) {
-	const ignoreFile = [join(dir, ".gitignore"), join(dir, "gitignore")].find((path) => existsSync(path));
-	const ignored = (ignoreFile === void 0 ? "" : readFileSync(ignoreFile, "utf8")).split("\n").map((line) => line.trim()).filter((line) => line !== "" && !line.startsWith("#")).map((glob) => new RegExp(`^${glob.split("*").map((part) => part.replace(/[.+?^${}()|[\]\\]/g, "\\$&")).join(".*")}$`));
-	const files = [];
-	const walk = (relative) => {
-		for (const entry of readdirSync(join(dir, relative), { withFileTypes: true })) {
-			if (ignored.some((pattern) => pattern.test(entry.name))) continue;
-			const path = relative === "" ? entry.name : `${relative}/${entry.name}`;
-			if (entry.isDirectory()) walk(path);
-			else files.push(path);
-		}
-	};
-	walk("");
-	return files.sort();
-}
-/** The name a template file has in a project. */
-function projectPath(templatePath) {
-	return templatePath === "gitignore" ? ".gitignore" : templatePath;
-}
-/** A package name from a directory's, e.g. `Acme Secrets` → `acme-secrets`. */
-function packageName(dir) {
-	const name = basename(dir).toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^[-._]+|-+$/g, "");
-	return name === "" ? "coffre" : name;
-}
-/** The template's package.json, for this project and this version of coffre. */
-function manifest(source, name, version) {
-	const pkg = JSON.parse(source);
-	pkg.name = name;
-	for (const field of ["dependencies", "devDependencies"]) {
-		const deps = pkg[field];
-		for (const dep of Object.keys(deps ?? {})) if (dep.startsWith("@coffre/")) deps[dep] = version;
-	}
-	return `${JSON.stringify(pkg, null, 2)}\n`;
-}
-/** Write a new deployment into `target`, which must be empty or absent. Returns the files written. */
-function init(kind, target, version) {
-	if (existsSync(target) && readdirSync(target).length > 0) throw new Error(`${target} is not empty; give \`coffre init\` a new directory`);
-	const source = templateDir(kind);
-	const written = [];
-	for (const file of templateFiles(source)) {
-		const path = projectPath(file);
-		const content = readFileSync(join(source, file), "utf8");
-		mkdirSync(dirname(join(target, path)), { recursive: true });
-		writeFileSync(join(target, path), path === "package.json" ? manifest(content, packageName(target), version) : content);
-		written.push(path);
-	}
-	return written;
-}
-//#endregion
+import { dirname, join, resolve } from "node:path";
 //#region src/instance.ts
 const MODES = ["signin", "cloudflare"];
 function emptyStore() {
@@ -1462,7 +1398,8 @@ const USAGE = `coffre - secrets, with an audit log
     coffre init --node [<dir>]              a Node server, and its vault beside it
     coffre setup [--reset-passwords] [--json]
                                             its database logins, migrations and keys in one go,
-                                            shown once on a screen of their own
+                                            shown once on a screen of their own; on Workers,
+                                            Cloudflare too, and in an empty directory, the deployment
     coffre keys [--json]                    the app key, vault key and vault ID alone, shown the same way
 
   Session
@@ -1516,7 +1453,7 @@ switch (command) {
 		await keys(rest);
 		break;
 	case "setup":
-		await (await import("./setup-3OJc_VCA.js")).setup(rest);
+		await (await import("./setup-D3SXt_P-.js")).setup(rest);
 		break;
 	case "login":
 		await login(rest);