bikeshed-now 0.10.0 → 0.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bikeshed-now",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "license": "Apache-2.0",
   "type": "module",
   "description": "Publish and revise documents on a Bikeshed deployment from the terminal.",

package/src/client.mjs

@@ -4,7 +4,14 @@
 import { readFileSync } from "node:fs";
 import { basename } from "node:path";
 
-export const CLIENT_NAME = "bikeshed-cli/0.10.0";
+/**
+ * This package's version, from the package.json npm ships beside `src/`. Read
+ * rather than written here, so `--version` and the client header cannot drift
+ * from what was installed.
+ */
+export const VERSION = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8")).version;
+
+export const CLIENT_NAME = `bikeshed-cli/${VERSION}`;
 
 /**
  * Three surfaces, and the split is deliberate rather than untidy.

package/src/index.mjs

@@ -10,6 +10,7 @@ import { createInterface } from "node:readline/promises";
 import { CONFIG_PATH, readConfig, resolveAuth, writeConfig } from "./config.mjs";
 import {
   CliError,
+  VERSION,
   callTool,
   exchangeCode,
   fetchSkill,
@@ -41,7 +42,7 @@ import {
  * shell without anybody parsing human-readable output.
  */
 
-const USAGE = `bikeshed — publish and revise documents
+const USAGE = `bikeshed ${VERSION} — publish and revise documents
 
   bikeshed login                       sign in through your browser (--paste for a token)
   bikeshed logout                      sign out (revokes a token from browser sign-in)
@@ -92,7 +93,8 @@ Options
   --title <text>         title for publish or fork (fork default: the original's)
   --id <id>              with publish: the address, /d/<id> (default: from the title)
   --folder <id>          destination folder for publish or fork
-  --version <v>          with fork: the version to copy (default: current)
+  --version <v>          with fork: the version to copy (default: current);
+                         on its own, which version of bikeshed this is
   --parent <id>          parent folder for mkdir
   --limit <n>            with list: rows per page (default 20, max 50)
   --cursor <id>          with list: the page after the one that printed it
@@ -181,15 +183,9 @@ function isCi(value) {
 
 async function browserLogin(flags) {
   const interactive = Boolean(process.stdin.isTTY);
+  // Never asked: --origin, BIKESHED_ORIGIN, the last sign-in, then the default,
+  // the same order as every other command. The line below names it.
   let where = resolveAuth(flags).origin;
-  if (interactive && !flags.origin) {
-    const rl = createInterface({ input: process.stdin, output: process.stderr });
-    try {
-      where = (await rl.question(`Deployment [${where}]: `)).trim() || where;
-    } finally {
-      rl.close();
-    }
-  }
   try {
     const url = new URL(where);
     if (url.protocol !== "https:" && url.protocol !== "http:") throw new Error();
@@ -289,16 +285,17 @@ async function browserLogin(flags) {
   );
 }
 
-/** Paste a token made at /account. The flow from before browser sign-in. */
+/**
+ * Paste a token made at /account. The flow from before browser sign-in.
+ *
+ * Only the token is read from stdin. Asking for the deployment first read a
+ * piped token as the address, and printed it back inside the /account link.
+ */
 async function pasteLogin(flags) {
-  const { origin } = resolveAuth(flags);
+  const { origin: where } = resolveAuth(flags);
   const rl = createInterface({ input: process.stdin, output: process.stdout });
   try {
-    const where =
-      flags.origin ||
-      (await rl.question(`Deployment [${origin}]: `)).trim() ||
-      origin;
-    console.log(`\nCreate a token at ${where}/account — choose "Command line".`);
+    console.log(`Create a token at ${where}/account — choose "Command line".`);
     console.log("It is shown once, so copy it now.\n");
     const token = (await rl.question("Token: ")).trim();
     if (!token) fail("no token given");
@@ -847,6 +844,14 @@ async function main() {
   });
 
   const [name, ...rest] = positionals;
+  // On its own, --version is about this program; after `fork` it names the
+  // version of a document to copy, which is why it is not checked first.
+  // Declared as taking a value for fork's sake, it swallows a `--json` that
+  // follows it, so that value is read back as the flag it was.
+  if (!name && !values.help && (values.version !== undefined || values.v)) {
+    out(values.json || values.version === "--json", { version: VERSION }, () => console.log(`bikeshed ${VERSION}`));
+    return;
+  }
   if (values.help || !name) {
     console.log(USAGE);
     return;