Improve CLI robustness and usability

deno.json

@@ -41,9 +41,9 @@
     "@opentelemetry/core": "npm:@opentelemetry/core@^2.5.0",
     "@opentelemetry/sdk-trace-base": "npm:@opentelemetry/sdk-trace-base@^2.5.0",
     "@opentelemetry/semantic-conventions": "npm:@opentelemetry/semantic-conventions@^1.39.0",
-    "@optique/config": "jsr:@optique/config@^0.10.0",
-    "@optique/core": "jsr:@optique/core@^0.10.0",
-    "@optique/run": "jsr:@optique/run@^0.10.0",
+    "@optique/config": "jsr:@optique/config@^0.10.1",
+    "@optique/core": "jsr:@optique/core@^0.10.1",
+    "@optique/run": "jsr:@optique/run@^0.10.1",
     "@std/assert": "jsr:@std/assert@^1.0.13",
     "@std/async": "jsr:@std/async@^1.0.13",
     "@std/encoding": "jsr:@std/encoding@^1.0.10",

packages/cli/package.json

@@ -19,8 +19,8 @@
     "test-init": "deno task test-init",
     "pretest:bun": "pnpm build",
     "test:bun": "bun test",
-    "run": "pnpm build && node dist/mod.js",
-    "runi": "tsdown && node dist/mod.js",
+    "run": "pnpm build && node --disable-warning=ExperimentalWarning dist/mod.js",
+    "runi": "tsdown && node --disable-warning=ExperimentalWarning dist/mod.js",
     "run:bun": "pnpm build && bun dist/mod.js",
     "runi:bun": "tsdown && bun dist/mod.js"
   },
@@ -73,6 +73,7 @@
   },
   "dependencies": {
     "@fedify/fedify": "workspace:*",
+    "@fedify/init": "workspace:*",
     "@fedify/relay": "workspace:*",
     "@fedify/sqlite": "workspace:*",
     "@fedify/vocab": "workspace:*",

packages/cli/src/mod.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node --disable-warning=ExperimentalWarning
 import { runWithConfig } from "@optique/config/run";
 import { merge, message, or } from "@optique/core";
 import { printError } from "@optique/run";
@@ -21,6 +21,7 @@ import { globalOptions } from "./options.ts";
 import { relayCommand, runRelay } from "./relay.ts";
 import { runTunnel, tunnelCommand } from "./tunnel.ts";
 import { runWebFinger, webFingerCommand } from "./webfinger/mod.ts";
+import metadata from "../deno.json" with { type: "json" };
 
 /**
  * Returns the system-wide configuration file paths.
@@ -107,31 +108,40 @@ async function main() {
       mode: "both",
       onShow: () => process.exit(0),
     },
+    version: {
+      mode: "both",
+      value: metadata.version,
+    },
+    completion: {
+      mode: "command",
+      name: "both",
+    },
     onError: () => process.exit(1),
+    colors: process.stdout.isTTY &&
+      (process.env.NO_COLOR == null || process.env.NO_COLOR === ""),
+    maxWidth: process.stdout.columns,
+    showDefault: true,
+    showChoices: true,
   });
   if (result.command === "init") {
     await runInit(result);
-  }
-  if (result.command === "lookup") {
+  } else if (result.command === "lookup") {
     await runLookup(result);
-  }
-  if (result.command === "webfinger") {
+  } else if (result.command === "webfinger") {
     await runWebFinger(result);
-  }
-  if (result.command === "inbox") {
+  } else if (result.command === "inbox") {
     runInbox(result);
-  }
-  if (result.command === "nodeinfo") {
+  } else if (result.command === "nodeinfo") {
     runNodeInfo(result);
-  }
-  if (result.command === "tunnel") {
+  } else if (result.command === "tunnel") {
     await runTunnel(result);
-  }
-  if (result.command === "generate-vocab") {
+  } else if (result.command === "generate-vocab") {
     await runGenerateVocab(result);
-  }
-  if (result.command === "relay") {
+  } else if (result.command === "relay") {
     await runRelay(result);
+  } else {
+    // Make this branch exhaustive for type safety, even though it should never happen:
+    const _exhaustiveCheck: never = result;
   }
 }
 

packages/cli/src/options.ts

@@ -87,7 +87,7 @@ export function createTunnelOption<S extends TunnelConfigSection>(section: S) {
   });
 }
 
-export const debugOption = object("Global options", {
+export const debugOption = object({
   debug: bindConfig(
     option("-d", "--debug", {
       description: message`Enable debug mode.`,

packages/init/src/command.ts

@@ -56,12 +56,6 @@ const messageQueue = optional(option(
   },
 ));
 
-const debugOption = object("Global options", {
-  debug: option("-d", "--debug", {
-    description: message`Enable debug mode.`,
-  }),
-});
-
 export const initOptions = object("Initialization options", {
   dir: optional(argument(path({ metavar: "DIR" }), {
     description:
@@ -74,7 +68,6 @@ export const initOptions = object("Initialization options", {
   dryRun: option("--dry-run", {
     description: message`Perform a trial run with no changes made.`,
   }),
-  debugOption,
 });
 
 export const initCommand = command(
@@ -117,7 +110,6 @@ export const testInitCommand = command(
       packageManager: multiple(packageManager),
       kvStore: multiple(kvStore),
       messageQueue: multiple(messageQueue),
-      debugOption,
     }),
     optional(or(noHydRun, noDryRun)),
   ),

pnpm-workspace.yaml

@@ -51,9 +51,9 @@ catalog:
   "@opentelemetry/sdk-node": ^0.211.0
   "@opentelemetry/sdk-trace-base": ^2.5.0
   "@opentelemetry/semantic-conventions": ^1.39.0
-  "@optique/config": ^0.10.0
-  "@optique/core": ^0.10.0
-  "@optique/run": ^0.10.0
+  "@optique/config": ^0.10.1
+  "@optique/core": ^0.10.1
+  "@optique/run": ^0.10.1
   "@std/assert": "jsr:^1.0.13"
   "@std/async": "jsr:^1.0.13"
   "@std/path": "jsr:^1.0.6"