@fedify/cli 2.3.0-dev.1347 → 2.3.0-dev.1361

package/dist/options.js

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import { configContext } from "./config.js";
+import { getUserAgent } from "@fedify/vocab-runtime";
 import { choice, constant, flag, map, merge, message, object, option, optional, or, string, withDefault } from "@optique/core";
 import { bindConfig } from "@optique/config";
-import { getUserAgent } from "@fedify/vocab-runtime";
 //#region src/options.ts
 /**
 * Available tunneling services for exposing local servers to the public internet.

package/dist/relay/command.js

@@ -5,7 +5,7 @@ import { command, constant, group, integer, merge, message, multiple, object, op
 import { bindConfig } from "@optique/config";
 import { choice as choice$1 } from "@optique/core/valueparser";
 //#region src/relay/command.ts
-const relayOptions = merge(object("Relay options", {
+const relayCommand = command("relay", merge(object("Relay options", {
 	command: constant("relay"),
 	protocol: bindConfig(option("-p", "--protocol", choice$1(["mastodon", "litepub"], { metavar: "TYPE" }), { description: message`The relay protocol to use. ${value("mastodon")} for Mastodon-compatible relay, ${value("litepub")} for LitePub-compatible relay.` }), {
 		context: configContext,
@@ -40,13 +40,11 @@ const relayOptions = merge(object("Relay options", {
 		key: (config) => config.relay?.rejectFollow ?? [],
 		default: []
 	})
-}), group("Tunnel options", createTunnelOption("relay")));
-const relayMetadata = {
+}), group("Tunnel options", createTunnelOption("relay"))), {
 	brief: message`Run an ephemeral ActivityPub relay server.`,
 	description: message`Spins up an ActivityPub relay server that forwards activities between federated instances. The server can use either Mastodon or LitePub compatible relay protocol.
 
 By default, the server is tunneled to the public internet for external access. Use ${optionName("--no-tunnel")} to run locally only.`
-};
-command("relay", relayOptions, relayMetadata);
+});
 //#endregion
-export { relayMetadata, relayOptions };
+export { relayCommand };

package/dist/relay.js

@@ -6,11 +6,11 @@ import { spawnTemporaryServer } from "./tempserver.js";
 import process from "node:process";
 import { MemoryKvStore } from "@fedify/fedify";
 import { getLogger } from "@logtape/logtape";
+import Table from "cli-table3";
 import ora from "ora";
+import { createRelay } from "@fedify/relay";
 import { SqliteKvStore } from "@fedify/sqlite";
 import { DatabaseSync } from "node:sqlite";
-import Table from "cli-table3";
-import { createRelay } from "@fedify/relay";
 //#region src/relay.ts
 const logger = getLogger([
 	"fedify",

package/dist/runner.js

@@ -1,17 +1,27 @@
 import "@js-temporal/polyfill";
-import { configContext, tryLoadToml } from "./config.js";
-import { globalOptions } from "./options.js";
 import { describeError } from "./utils.js";
-import { activityPubCommands, generatingCommands, networkCommands } from "./commands.js";
 import { version } from "./deno.js";
+import { configContext, tryLoadToml } from "./config.js";
+import { globalOptions } from "./options.js";
+import { benchCommand } from "./bench/command.js";
+import generateVocabCommand from "./generate-vocab/command.js";
+import "./generate-vocab/mod.js";
+import { initCommand } from "./init/mod.js";
+import { nodeInfoCommand } from "./nodeinfo.js";
+import { lookupCommand } from "./lookup.js";
+import { inboxCommand } from "./inbox/command.js";
+import { relayCommand } from "./relay/command.js";
+import { tunnelCommand } from "./tunnel.js";
+import { webFingerCommand } from "./webfinger/command.js";
+import "./webfinger/mod.js";
 import process from "node:process";
-import { command, group, map, merge, message, or } from "@optique/core";
+import { group, merge, message, or } from "@optique/core";
 import { printError, run } from "@optique/run";
 import { merge as merge$1 } from "es-toolkit";
-import { readFileSync } from "node:fs";
 import { homedir } from "node:os";
-import { join } from "node:path";
+import { readFileSync } from "node:fs";
 import { parse } from "smol-toml";
+import { join } from "node:path";
 //#region src/runner.ts
 /**
 * Returns the system-wide configuration file paths.
@@ -31,35 +41,36 @@ function getUserConfigPath() {
 	if (process.platform === "win32") return join(process.env.APPDATA || join(homedir(), "AppData", "Roaming"), "fedify", "config.toml");
 	return join(process.env.XDG_CONFIG_HOME || join(homedir(), ".config"), "fedify", "config.toml");
 }
-const selectedCommand = "__fedifyCliSelectedCommand";
-const selectedRun = "__fedifyCliRunCommand";
-function staticCommandParser(staticCommand) {
-	if (staticCommand.path.length < 1) throw new TypeError("Static command path must not be empty.");
-	let parser = staticCommand.parser;
-	for (let i = staticCommand.path.length - 1; i >= 0; i--) {
-		const name = staticCommand.path[i];
-		if (name == null) throw new TypeError("Static command path contains an empty segment.");
-		parser = command(name, parser, i === staticCommand.path.length - 1 ? staticCommand.metadata : void 0);
+const command$1 = merge(or(group("Generating code", or(initCommand, generateVocabCommand)), group("ActivityPub tools", or(webFingerCommand, lookupCommand, inboxCommand, nodeInfoCommand, relayCommand, benchCommand)), group("Network tools", tunnelCommand)), globalOptions);
+function loadConfig(parsed) {
+	if (parsed.ignoreConfig) return void 0;
+	const system = getSystemConfigPaths().map(tryLoadToml).reduce((acc, config) => merge$1(acc, config), {});
+	const user = tryLoadToml(getUserConfigPath());
+	const project = tryLoadToml(join(process.cwd(), ".fedify.toml"));
+	let custom = {};
+	if (parsed.configPath) try {
+		custom = parse(readFileSync(parsed.configPath, "utf-8"));
+	} catch (error) {
+		printError(message`Could not load config file at ${parsed.configPath}: ${describeError(error)}`);
+		process.exit(1);
 	}
-	const runCommand = staticCommand.run;
-	return map(parser, (value) => ({
-		...value,
-		[selectedCommand]: staticCommand,
-		[selectedRun]: (globalOptions) => runCommand({
-			...value,
-			...globalOptions
-		})
-	}));
-}
-function staticCommandsParser(commands) {
-	const parsers = commands.map(staticCommandParser);
-	if (parsers.length < 1) throw new TypeError("Static command group must not be empty.");
-	return parsers.length === 1 ? parsers[0] : or(...parsers);
-}
-const runnableCommand = merge(or(group("Generating code", staticCommandsParser(generatingCommands)), group("ActivityPub tools", staticCommandsParser(activityPubCommands)), group("Network tools", staticCommandsParser(networkCommands))), globalOptions);
-map(runnableCommand, ({ [selectedCommand]: _selectedCommand, [selectedRun]: _selectedRun, ...value }) => value);
-function getRunOptions(args) {
 	return {
+		config: [
+			system,
+			user,
+			project,
+			custom
+		].reduce((acc, config) => merge$1(acc, config), {}),
+		meta: void 0
+	};
+}
+/**
+* Runs the Fedify CLI with the given command-line arguments.
+* @param args Command-line arguments, usually `process.argv.slice(2)`.
+* @returns The parsed command result from Optique's runner.
+*/
+function runCli(args) {
+	return run(command$1, {
 		contexts: [configContext],
 		contextOptions: { load: loadConfig },
 		programName: "fedify",
@@ -81,41 +92,7 @@ function getRunOptions(args) {
 		maxWidth: process.stdout.columns,
 		showDefault: true,
 		showChoices: true
-	};
-}
-function loadConfig(parsed) {
-	if (parsed.ignoreConfig) return void 0;
-	const system = getSystemConfigPaths().map(tryLoadToml).reduce((acc, config) => merge$1(acc, config), {});
-	const user = tryLoadToml(getUserConfigPath());
-	const project = tryLoadToml(join(process.cwd(), ".fedify.toml"));
-	let custom = {};
-	if (parsed.configPath) try {
-		custom = parse(readFileSync(parsed.configPath, "utf-8"));
-	} catch (error) {
-		printError(message`Could not load config file at ${parsed.configPath}: ${describeError(error)}`);
-		process.exit(1);
-	}
-	return {
-		config: [
-			system,
-			user,
-			project,
-			custom
-		].reduce((acc, config) => merge$1(acc, config), {}),
-		meta: void 0
-	};
-}
-function toCliProgram(parsed) {
-	const { [selectedCommand]: command, [selectedRun]: runCommand, ...value } = parsed;
-	const publicValue = value;
-	return {
-		command,
-		value: publicValue,
-		run: () => runCommand(publicValue)
-	};
-}
-async function parseCliProgram(args) {
-	return toCliProgram(await run(runnableCommand, getRunOptions(args)));
+	});
 }
 //#endregion
-export { parseCliProgram };
+export { runCli };

package/dist/tempserver.js

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import { getLogger } from "@logtape/logtape";
-import { openTunnel } from "@hongminhee/localtunnel";
 import { serve } from "srvx";
+import { openTunnel } from "@hongminhee/localtunnel";
 //#region src/tempserver.ts
 const logger = getLogger([
 	"fedify",

package/dist/tunnel.js

@@ -7,21 +7,19 @@ import { print, printError } from "@optique/run";
 import ora from "ora";
 import { openTunnel } from "@hongminhee/localtunnel";
 //#region src/tunnel.ts
-const tunnelOptions = merge("Tunnel options", object({ command: constant("tunnel") }), object({
+const tunnelCommand = command("tunnel", merge("Tunnel options", object({ command: constant("tunnel") }), object({
 	port: argument(integer({
 		metavar: "PORT",
 		min: 0,
 		max: 65535
 	}), { description: message`The local port number to expose.` }),
 	service: createTunnelServiceOption(["-s", "--service"])
-}));
-const tunnelMetadata = {
+})), {
 	brief: message`Expose a local HTTP server to the public internet using a secure tunnel.`,
 	description: message`Expose a local HTTP server to the public internet using a secure tunnel.
 
 Note that the HTTP requests through the tunnel have X-Forwarded-* headers.`
-};
-command("tunnel", tunnelOptions, tunnelMetadata);
+});
 async function runTunnel(command, deps = {
 	openTunnel,
 	ora,
@@ -51,4 +49,4 @@ async function runTunnel(command, deps = {
 	});
 }
 //#endregion
-export { runTunnel, tunnelMetadata, tunnelOptions };
+export { runTunnel, tunnelCommand };

package/dist/utils.js

@@ -1,14 +1,13 @@
 import "@js-temporal/polyfill";
+import "node:fs/promises";
 import process from "node:process";
-import { message } from "@optique/core";
-import { print, printError } from "@optique/run";
-import { flow } from "es-toolkit";
 import { getActorHandle } from "@fedify/vocab";
 import "@fxts/core";
+import { message } from "@optique/core";
+import { print, printError } from "@optique/run";
 import { Chalk } from "chalk";
 import { highlight } from "cli-highlight";
-import "node:child_process";
-import "node:fs/promises";
+import { flow } from "es-toolkit";
 import util from "node:util";
 //#region src/utils.ts
 const colorEnabled = process.stdout.isTTY && !("NO_COLOR" in process.env && process.env.NO_COLOR !== "");

package/dist/webfinger/action.js

@@ -3,8 +3,8 @@ import { formatObject } from "../utils.js";
 import { NotFoundError, getErrorMessage } from "./error.js";
 import { convertUrlIfHandle } from "./lib.js";
 import { print } from "@optique/run";
-import ora from "ora";
 import { formatMessage, message } from "@optique/core/message";
+import ora from "ora";
 import { lookupWebFinger } from "@fedify/webfinger";
 //#region src/webfinger/action.ts
 async function runWebFinger({ command: _, resources, ...options }) {

package/dist/webfinger/command.js

@@ -14,18 +14,16 @@ const maxRedirection = bindConfig(option("--max-redirection", integer({ min: 0 }
 	key: (config) => config.webfinger?.maxRedirection ?? 5,
 	default: 5
 });
-const webFingerOptions = merge("Network options", object({
+const webFingerCommand = command("webfinger", merge("Network options", object({
 	command: constant("webfinger"),
 	resources: group("Arguments", multiple(argument(string({ metavar: "RESOURCE" }), { description: message`WebFinger resource(s) to look up.` }), { min: 1 })),
 	allowPrivateAddresses,
 	maxRedirection
-}), userAgentOption);
-const webFingerMetadata = {
+}), userAgentOption), {
 	brief: message`Look up WebFinger resources.`,
 	description: message`Look up WebFinger resources.
 
 The argument can be multiple.`
-};
-command("webfinger", webFingerOptions, webFingerMetadata);
+});
 //#endregion
-export { webFingerMetadata, webFingerOptions };
+export { webFingerCommand };

package/dist/webfinger/lib.js

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import { InvalidHandleError } from "./error.js";
-import { getLogger } from "@logtape/logtape";
 import { toAcctUrl } from "@fedify/vocab";
+import { getLogger } from "@logtape/logtape";
 getLogger([
 	"fedify",
 	"cli",

package/dist/webfinger/mod.js

@@ -0,0 +1,4 @@
+import "@js-temporal/polyfill";
+import "./action.js";
+import "./command.js";
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/cli",
-  "version": "2.3.0-dev.1347+35dea445",
+  "version": "2.3.0-dev.1361+15c6e619",
   "type": "module",
   "files": [
     "README.md",
@@ -59,10 +59,9 @@
   "dependencies": {
     "@cfworker/json-schema": "^4.1.1",
     "@fxts/core": "^1.20.0",
-    "@optique/config": "^1.1.0",
-    "@optique/core": "^1.1.0",
-    "@optique/discover": "^1.1.0",
-    "@optique/run": "^1.1.0",
+    "@optique/config": "^1.0.2",
+    "@optique/core": "^1.0.2",
+    "@optique/run": "^1.0.2",
     "@standard-schema/spec": "^1.1.0",
     "@hongminhee/localtunnel": "^0.3.0",
     "@inquirer/prompts": "^7.8.4",
@@ -90,14 +89,14 @@
     "srvx": "^0.8.7",
     "valibot": "^1.4.0",
     "yaml": "^2.9.0",
-    "@fedify/fedify": "2.3.0-dev.1347+35dea445",
-    "@fedify/init": "2.3.0-dev.1347+35dea445",
-    "@fedify/relay": "2.3.0-dev.1347+35dea445",
-    "@fedify/sqlite": "2.3.0-dev.1347+35dea445",
-    "@fedify/vocab": "2.3.0-dev.1347+35dea445",
-    "@fedify/vocab-runtime": "2.3.0-dev.1347+35dea445",
-    "@fedify/vocab-tools": "2.3.0-dev.1347+35dea445",
-    "@fedify/webfinger": "2.3.0-dev.1347+35dea445"
+    "@fedify/fedify": "2.3.0-dev.1361+15c6e619",
+    "@fedify/relay": "2.3.0-dev.1361+15c6e619",
+    "@fedify/init": "2.3.0-dev.1361+15c6e619",
+    "@fedify/vocab": "2.3.0-dev.1361+15c6e619",
+    "@fedify/sqlite": "2.3.0-dev.1361+15c6e619",
+    "@fedify/vocab-runtime": "2.3.0-dev.1361+15c6e619",
+    "@fedify/vocab-tools": "2.3.0-dev.1361+15c6e619",
+    "@fedify/webfinger": "2.3.0-dev.1361+15c6e619"
   },
   "devDependencies": {
     "@types/bun": "^1.2.23",

package/dist/bench/compare/schema.js

@@ -1,16 +0,0 @@
-import "@js-temporal/polyfill";
-//#region src/bench/compare/schema.ts
-/**
-* The embedded JSON Schema (draft 2020-12) for benchmark comparison output.
-*
-* The comparison report embeds the two benchmark reports it compares; this
-* schema validates the comparison envelope and checks that the embedded reports
-* look like current benchmark reports without duplicating the complete report
-* schema in two published files.
-* @since 2.3.0
-* @module
-*/
-/** The hosted URL that serves the comparison report schema. */
-const COMPARE_REPORT_SCHEMA_ID = "https://json-schema.fedify.dev/bench/compare-report-v1.json";
-//#endregion
-export { COMPARE_REPORT_SCHEMA_ID };