@hardfin/cli 0.0.2-dev.17 → 0.0.2-dev.18

package/dist/cli.js

@@ -136,7 +136,7 @@ function writeData(value) {
 		process.stdout.write(value.endsWith("\n") ? value : `${value}\n`);
 		return;
 	}
-	process.stdout.write(`${JSON.stringify(value, null, 2)}\n`);
+	process.stdout.write(`${JSON.stringify(value ?? null, null, 2)}\n`);
 }
 /** writeFailure prints why a command failed on stderr, as text or as JSON. */
 function writeFailure(message, isJSON, errors, requestId) {
@@ -1101,8 +1101,8 @@ function toOpeners(url) {
 	return [["xdg-open", [url]]];
 }
 /** openBrowser asks the desktop to show a URL, and reports whether anything took it. */
-function openBrowser(url) {
-	for (const [command, args] of toOpeners(url)) if (spawnSync(command, args, {
+function openBrowser(url, launch = spawnSync) {
+	for (const [command, args] of toOpeners(url)) if (launch(command, args, {
 		stdio: "ignore",
 		cwd: command.endsWith(".exe") ? "/mnt/c" : void 0,
 		timeout: 1e4
@@ -1272,11 +1272,11 @@ function toClipboardCommand() {
 	return ["xclip", ["-selection", "clipboard"]];
 }
 /** copyToClipboard puts text on the clipboard, and reports whether anything took it. */
-function copyToClipboard(text) {
+function copyToClipboard(text, copy = spawnSync) {
 	const command = toClipboardCommand();
 	if (!command) return false;
 	const [name, args] = command;
-	const result = spawnSync(name, args, { input: text });
+	const result = copy(name, args, { input: text });
 	return result.error === void 0 && result.status === 0;
 }
 //#endregion
@@ -1312,14 +1312,13 @@ function toPastedCallback(pasted) {
 * toPrompt watches the keyboard while the browser is away. Pressing c copies the URL, and
 * pasting a code finishes the sign in on a machine whose browser cannot reach this listener.
 */
-function toPrompt(url) {
+function toPrompt(url, input = process.stdin, copy = copyToClipboard) {
 	let settle = () => {};
 	let fail = () => {};
 	const pasted = new Promise((resolve, reject) => {
 		settle = resolve;
 		fail = reject;
 	});
-	const input = process.stdin;
 	pasted.catch(() => {});
 	if (!input.isTTY) return {
 		pasted,
@@ -1327,6 +1326,7 @@ function toPrompt(url) {
 	};
 	let typed = "";
 	const onData = (chunk) => {
+		const isKeystroke = chunk.length === 1;
 		for (const character of chunk) {
 			if (character === CTRL_C) {
 				fail(/* @__PURE__ */ new Error("sign in was cancelled"));
@@ -1343,8 +1343,8 @@ function toPrompt(url) {
 				process.stderr.write("\b \b");
 				continue;
 			}
-			if ((character === "c" || character === "C") && typed === "") {
-				process.stderr.write(copyToClipboard(url) ? "Copied the URL to your clipboard\n" : "Nothing on this host takes a clipboard\n");
+			if (isKeystroke && (character === "c" || character === "C") && typed === "") {
+				process.stderr.write(copy(url) ? "Copied the URL to your clipboard\n" : "Nothing on this host takes a clipboard\n");
 				continue;
 			}
 			typed += character;
@@ -4963,13 +4963,16 @@ function toRejectedFlag(command, flags) {
 	}
 }
 //#endregion
-//#region src/cli.ts
-const program = new Command();
-program.name("hardfin").description("Call the Hardfin API from a terminal or an agent").version(version$1, "-v, --version").option("--api-url <url>", "The API to call, whose host also holds the authorization server").option("--issuer-url <url>", "The authorization server, when it does not sit at the API's host").showHelpAfterError().enablePositionalOptions();
-for (const command of commands) program.addCommand(toProgram(command), { hidden: command.hidden });
-await program.parseAsync(process.argv);
+//#region src/cli/program.ts
+/** toCli builds the parser from the registry, which is what every surface reads. */
+function toCli(entries = commands) {
+	const program = new Command();
+	program.name("hardfin").description("Call the Hardfin API from a terminal or an agent").version(version$1, "-v, --version").option("--api-url <url>", "The API to call, whose host also holds the authorization server").option("--issuer-url <url>", "The authorization server, when it does not sit at the API's host").showHelpAfterError().enablePositionalOptions();
+	for (const command of entries) program.addCommand(toProgram(program, command), { hidden: command.hidden });
+	return program;
+}
 /** toProgram wires one registry command into the parser. */
-function toProgram(command) {
+function toProgram(root, command) {
 	const program = new Command(command.name).summary(command.summary).description(command.description ?? command.summary);
 	for (const argument of command.arguments) {
 		const name = argument.variadic ? `${argument.name}...` : argument.name;
@@ -4985,16 +4988,16 @@ function toProgram(command) {
 		program.addOption(option);
 	}
 	for (const example of command.examples) program.addHelpText("after", `\n${example.description}:\n  $ ${example.command}`);
-	for (const subcommand of command.subcommands ?? []) program.addCommand(toProgram(subcommand), { hidden: subcommand.hidden });
+	for (const subcommand of command.subcommands ?? []) program.addCommand(toProgram(root, subcommand), { hidden: subcommand.hidden });
 	if (!command.run) return program;
 	program.action(async (...parsed) => {
 		const flags = parsed[parsed.length - 2] ?? {};
 		const args = parsed.slice(0, parsed.length - 2).flatMap(toArgumentList);
-		process.exitCode = await toExitCode(command, args, flags);
+		process.exitCode = await toExitCode(root, command, args, flags);
 	});
 	return program;
 }
-async function toExitCode(command, args, flags) {
+async function toExitCode(root, command, args, flags) {
 	const isJSON = isJSONOutput(flags);
 	const rejected = toRejectedFlag(command, flags);
 	if (rejected) {
@@ -5003,8 +5006,8 @@ async function toExitCode(command, args, flags) {
 	}
 	try {
 		const resolved = toSettings({
-			apiUrl: program.opts()["apiUrl"],
-			issuerUrl: program.opts()["issuerUrl"]
+			apiUrl: root.opts()["apiUrl"],
+			issuerUrl: root.opts()["issuerUrl"]
 		});
 		return await command.run?.({
 			args,
@@ -5026,4 +5029,7 @@ function collect(value, previous) {
 	return [...previous ?? [], value];
 }
 //#endregion
+//#region src/cli.ts
+await toCli().parseAsync(process.argv);
+//#endregion
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hardfin/cli",
-    "version": "0.0.2-dev.17",
+    "version": "0.0.2-dev.18",
     "description": "Command line interface for the Hardfin API",
     "license": "Apache-2.0",
     "author": "Hardfin, Inc.",