@fedify/cli 2.0.0-dev.1799 → 2.0.0-dev.1801

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/cli",
-  "version": "2.0.0-dev.1799+383e3c21",
+  "version": "2.0.0-dev.1801+bca8ab87",
   "license": "MIT",
   "exports": "./src/mod.ts",
   "imports": {

package/dist/deno.js

@@ -3,7 +3,7 @@
     
 //#region deno.json
 var name = "@fedify/cli";
-var version = "2.0.0-dev.1799+383e3c21";
+var version = "2.0.0-dev.1801+bca8ab87";
 var license = "MIT";
 var exports = "./src/mod.ts";
 var imports = {

package/dist/generate-vocab/action.js

@@ -0,0 +1,20 @@
+
+      import { Temporal } from "@js-temporal/polyfill";
+    
+import { stat } from "node:fs/promises";
+import { printError } from "@optique/run";
+import { generateVocab } from "@fedify/vocab-tools";
+import { message } from "@optique/core/message";
+import process from "node:process";
+
+//#region src/generate-vocab/action.ts
+async function runGenerateVocab({ schemaDir, generatedPath }) {
+	if (!(await stat(schemaDir)).isDirectory()) {
+		printError(message`${schemaDir} is not a directory.`);
+		process.exit(1);
+	}
+	await generateVocab(schemaDir, generatedPath);
+}
+
+//#endregion
+export { runGenerateVocab };

package/dist/generate-vocab/command.js

@@ -0,0 +1,26 @@
+
+      import { Temporal } from "@js-temporal/polyfill";
+    
+import { argument, command, constant, message, object, option, withDefault } from "@optique/core";
+import { path } from "@optique/run";
+
+//#region src/generate-vocab/command.ts
+const schemaDir = withDefault(option("-i", "--input", path({
+	metavar: "DIR",
+	type: "directory",
+	mustExist: true
+}), { description: message`Directory containing schema files.` }), ".");
+const generatedPath = argument(path({
+	metavar: "PATH",
+	type: "file",
+	allowCreate: true
+}), { description: message`Path to output the generated vocabulary classes.  Should end with ${".ts"} suffix.` });
+const generateVocabCommand = command("generate-vocab", object("Generation options", {
+	command: constant("generate-vocab"),
+	schemaDir,
+	generatedPath
+}), { description: message`Generate vocabulary classes from schema files.` });
+var command_default = generateVocabCommand;
+
+//#endregion
+export { command_default as default };

package/dist/generate-vocab/mod.js

@@ -0,0 +1,5 @@
+
+      import { Temporal } from "@js-temporal/polyfill";
+    
+import { runGenerateVocab } from "./action.js";
+import command_default from "./command.js";

package/dist/globals.js

@@ -3,8 +3,8 @@
     
 import { recordingSink } from "./log.js";
 import { message, object, option } from "@optique/core";
-import { configure, getConsoleSink } from "@logtape/logtape";
 import process from "node:process";
+import { configure, getConsoleSink } from "@logtape/logtape";
 import { getFileSink } from "@logtape/file";
 import { AsyncLocalStorage } from "node:async_hooks";
 

package/dist/inbox.js

@@ -10,11 +10,11 @@ import { tableStyle } from "./table.js";
 import { spawnTemporaryServer } from "./tempserver.js";
 import { colors } from "./utils.js";
 import { command, constant, merge, message, multiple, object, option, optional, string, withDefault } from "@optique/core";
+import process from "node:process";
 import { Accept, Activity, Application, Delete, Endpoints, Follow, Image, MemoryKvStore, PUBLIC_COLLECTION, createFederation, generateCryptoKeyPair, getActorHandle, isActor, lookupObject } from "@fedify/fedify";
 import { getLogger } from "@logtape/logtape";
 import Table from "cli-table3";
 import { Hono } from "hono";
-import process from "node:process";
 import ora from "ora";
 import { jsx } from "hono/jsx/jsx-runtime";
 

package/dist/init/ask/dir.js

@@ -4,9 +4,9 @@
 import { getCwd, getOsType, runSubCommand } from "../../utils.js";
 import { isDirectoryEmpty, logger } from "../lib.js";
 import { printError } from "@optique/run";
+import { message } from "@optique/core/message";
 import { identity, pipe, when } from "@fxts/core";
 import { input } from "@inquirer/prompts";
-import { message } from "@optique/core/message";
 import toggle from "inquirer-toggle";
 
 //#region src/init/ask/dir.ts

package/dist/init/ask/pm.js

@@ -5,8 +5,8 @@ import { PACKAGE_MANAGER } from "../const.js";
 import webframeworks_default from "../webframeworks.js";
 import { getInstallUrl, getLabel, isPackageManagerAvailable } from "../lib.js";
 import { print } from "@optique/run";
-import { select } from "@inquirer/prompts";
 import { message } from "@optique/core/message";
+import { select } from "@inquirer/prompts";
 
 //#region src/init/ask/pm.ts
 /**

package/dist/init/lib.js

@@ -10,8 +10,8 @@ import rt_default from "./json/rt.js";
 import webframeworks_default from "./webframeworks.js";
 import { dirname, join } from "node:path";
 import { mkdir, readdir, writeFile } from "node:fs/promises";
-import { getLogger } from "@logtape/logtape";
 import process from "node:process";
+import { getLogger } from "@logtape/logtape";
 import { entries, evolve, fromEntries, isObject, map, negate, pipe, throwIf, when } from "@fxts/core";
 import { toMerged } from "es-toolkit";
 import { readFileSync } from "node:fs";

package/dist/log.js

@@ -3,8 +3,8 @@
     
 import { dirname } from "node:path";
 import { mkdir } from "node:fs/promises";
-import { configure, getConsoleSink } from "@logtape/logtape";
 import process from "node:process";
+import { configure, getConsoleSink } from "@logtape/logtape";
 import { getFileSink } from "@logtape/file";
 import { AsyncLocalStorage } from "node:async_hooks";
 

package/dist/lookup.js

@@ -8,9 +8,9 @@ import { colorEnabled, colors, formatObject } from "./utils.js";
 import { renderImages } from "./imagerenderer.js";
 import { argument, choice, command, constant, flag, float, map, merge, message, multiple, object, option, optionNames, optional, or, string, withDefault } from "@optique/core";
 import { path, print, printError } from "@optique/run";
+import process from "node:process";
 import { Application, Collection, CryptographicKey, Object as Object$1, generateCryptoKeyPair, getAuthenticatedDocumentLoader, lookupObject, respondWithObject, traverseCollection } from "@fedify/fedify";
 import { getLogger } from "@logtape/logtape";
-import process from "node:process";
 import ora from "ora";
 import { createWriteStream } from "node:fs";
 

package/dist/mod.js

@@ -2,6 +2,9 @@
 
       import { Temporal } from "@js-temporal/polyfill";
     
+import { runGenerateVocab } from "./generate-vocab/action.js";
+import command_default from "./generate-vocab/command.js";
+import "./generate-vocab/mod.js";
 import { inboxCommand, runInbox } from "./inbox.js";
 import action_default from "./init/action/mod.js";
 import { initCommand } from "./init/command.js";
@@ -16,7 +19,7 @@ import { or } from "@optique/core";
 import { run } from "@optique/run";
 
 //#region src/mod.ts
-const command$1 = or(initCommand, webFingerCommand, lookupCommand, inboxCommand, nodeInfoCommand, tunnelCommand);
+const command$1 = or(initCommand, webFingerCommand, lookupCommand, inboxCommand, nodeInfoCommand, tunnelCommand, command_default);
 async function main() {
 	const result = run(command$1, {
 		programName: "fedify",
@@ -28,6 +31,7 @@ async function main() {
 	if (result.command === "inbox") runInbox(result);
 	if (result.command === "nodeinfo") runNodeInfo(result);
 	if (result.command === "tunnel") await runTunnel(result);
+	if (result.command === "generate-vocab") await runGenerateVocab(result);
 }
 await main();
 

package/dist/nodeinfo.js

@@ -5,9 +5,9 @@ import { debugOption } from "./globals.js";
 import { colors, formatObject } from "./utils.js";
 import { argument, command, constant, flag, merge, message, object, option, optional, or, string } from "@optique/core";
 import { print, printError } from "@optique/run";
+import process from "node:process";
 import { getNodeInfo } from "@fedify/fedify";
 import { getLogger } from "@logtape/logtape";
-import process from "node:process";
 import ora from "ora";
 import { getUserAgent } from "@fedify/vocab-runtime";
 import os from "node:os";

package/dist/webfinger/action.js

@@ -5,8 +5,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/fedify/webfinger";
 
 //#region src/webfinger/action.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/cli",
-  "version": "2.0.0-dev.1799+383e3c21",
+  "version": "2.0.0-dev.1801+bca8ab87",
   "description": "CLI toolchain for Fedify and debugging ActivityPub",
   "keywords": [
     "fedify",
@@ -61,7 +61,7 @@
     "cli-table3": "^0.6.5",
     "enquirer": "^2.4.1",
     "env-paths": "^3.0.0",
-    "es-toolkit": "1.39.5",
+    "es-toolkit": "1.39.10",
     "fetch-mock": "^12.5.4",
     "hono": "^4.8.3",
     "icojs": "^0.19.5",
@@ -71,13 +71,14 @@
     "ora": "^8.2.0",
     "shiki": "^1.6.4",
     "srvx": "^0.8.7",
-    "@fedify/fedify": "2.0.0-dev.1799+383e3c21",
-    "@fedify/sqlite": "2.0.0-dev.1799+383e3c21",
-    "@fedify/vocab-runtime": "2.0.0-dev.1799+383e3c21"
+    "@fedify/sqlite": "2.0.0-dev.1801+bca8ab87",
+    "@fedify/vocab-tools": "2.0.0-dev.1801+bca8ab87",
+    "@fedify/vocab-runtime": "2.0.0-dev.1801+bca8ab87",
+    "@fedify/fedify": "2.0.0-dev.1801+bca8ab87"
   },
   "devDependencies": {
     "@types/bun": "^1.2.23",
-    "@types/node": "^22.16.0",
+    "@types/node": "^22.17.0",
     "tsdown": "^0.12.9",
     "typescript": "^5.9.2"
   },

package/src/generate-vocab/action.ts

@@ -0,0 +1,17 @@
+import { generateVocab } from "@fedify/vocab-tools";
+import { message } from "@optique/core/message";
+import { printError } from "@optique/run";
+import { stat } from "node:fs/promises";
+import process from "node:process";
+import type { GenerateVocabCommand } from "./command.ts";
+
+export default async function runGenerateVocab(
+  { schemaDir, generatedPath }: GenerateVocabCommand,
+) {
+  if (!(await stat(schemaDir)).isDirectory()) {
+    printError(message`${schemaDir} is not a directory.`);
+    process.exit(1);
+  }
+
+  await generateVocab(schemaDir, generatedPath);
+}

package/src/generate-vocab/command.ts

@@ -0,0 +1,44 @@
+import {
+  argument,
+  command,
+  constant,
+  type InferValue,
+  message,
+  object,
+  option,
+  withDefault,
+} from "@optique/core";
+import { path } from "@optique/run";
+
+const schemaDir = withDefault(
+  option(
+    "-i",
+    "--input",
+    path({ metavar: "DIR", type: "directory", mustExist: true }),
+    { description: message`Directory containing schema files.` },
+  ),
+  ".",
+);
+const generatedPath = argument(
+  path({ metavar: "PATH", type: "file", allowCreate: true }),
+  {
+    description:
+      message`Path to output the generated vocabulary classes.  Should end with ${".ts"} suffix.`,
+  },
+);
+
+const generateVocabCommand = command(
+  "generate-vocab",
+  object("Generation options", {
+    command: constant("generate-vocab"),
+    schemaDir,
+    generatedPath,
+  }),
+  {
+    description: message`Generate vocabulary classes from schema files.`,
+  },
+);
+
+export default generateVocabCommand;
+
+export type GenerateVocabCommand = InferValue<typeof generateVocabCommand>;

package/src/generate-vocab/mod.ts

@@ -0,0 +1,2 @@
+export { default as runGenerateVocab } from "./action.ts";
+export { default as generateVocabCommand } from "./command.ts";

package/src/mod.ts

@@ -1,6 +1,10 @@
 #!/usr/bin/env node
 import { or } from "@optique/core";
 import { run } from "@optique/run";
+import {
+  generateVocabCommand,
+  runGenerateVocab,
+} from "./generate-vocab/mod.ts";
 import { inboxCommand, runInbox } from "./inbox.tsx";
 import { initCommand, runInit } from "./init/mod.ts";
 import { lookupCommand, runLookup } from "./lookup.ts";
@@ -15,6 +19,7 @@ const command = or(
   inboxCommand,
   nodeInfoCommand,
   tunnelCommand,
+  generateVocabCommand,
 );
 
 async function main() {
@@ -40,6 +45,9 @@ async function main() {
   if (result.command === "tunnel") {
     await runTunnel(result);
   }
+  if (result.command === "generate-vocab") {
+    await runGenerateVocab(result);
+  }
 }
 
 await main();