@fedify/cli 2.0.0-pr.467.1877 → 2.0.0-pr.469.1873

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/cli",
-  "version": "2.0.0-pr.467.1877+dc12636d",
+  "version": "2.0.0-pr.469.1873+ebbd8642",
   "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-pr.467.1877+dc12636d";
+var version = "2.0.0-pr.469.1873+ebbd8642";
 var license = "MIT";
 var exports = "./src/mod.ts";
 var imports = {

package/dist/init/action/notice.js

@@ -2,7 +2,7 @@
       import { Temporal } from "@js-temporal/polyfill";
     
 import { colors } from "../../utils.js";
-import { message } from "@optique/core";
+import { message, text } from "@optique/core";
 import { print, printError } from "@optique/run";
 import { flow } from "es-toolkit";
 
@@ -45,11 +45,15 @@ function displayFile(path$1, content, emoji = "📄") {
 }
 const noticeConfigEnv = () => printMessage`Note that you probably want to edit the ${".env"} file.
 It currently contains the following values:\n`;
-const noticeEnvKeyValue = ([key, value]) => printMessage`  ${key}=${value}`;
+const noticeEnvKeyValue = ([key, value]) => {
+	printMessage`${text(`  ${key}='${value}'`)}`;
+};
 function noticeHowToRun({ initializer: { instruction, federationFile } }) {
-	printMessage`${instruction}`;
-	printMessage`Start by editing the ${federationFile} file to define your federation!
-`;
+	print(message`
+${instruction}
+    
+Start by editing the ${federationFile} file to define your federation!
+`);
 }
 function noticeErrorWhileAddDeps(command$1) {
 	return (error) => {

package/dist/init/action/patch.js

@@ -31,7 +31,7 @@ const recommendPatchFiles = (data) => pipe(data, set("files", getFiles), set("js
 * @returns A record of file paths to their string content
 */
 const getFiles = (data) => ({
-	[data.initializer.federationFile]: loadFederation({
+	[data.initializer.federationFile.toString()]: loadFederation({
 		imports: getImports(data),
 		...data
 	}),

package/dist/init/lib.js

@@ -2,7 +2,7 @@
       import { Temporal } from "@js-temporal/polyfill";
     
 import deno_default from "../deno.js";
-import { colors, isNotFoundError, runSubCommand } from "../utils.js";
+import { isNotFoundError, runSubCommand } from "../utils.js";
 import kv_default from "./json/kv.js";
 import mq_default from "./json/mq.js";
 import pm_default from "./json/pm.js";
@@ -10,6 +10,7 @@ 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 { commandLine, message } from "@optique/core/message";
 import process from "node:process";
 import { getLogger } from "@logtape/logtape";
 import { entries, evolve, fromEntries, isObject, map, negate, pipe, throwIf, when } from "@fxts/core";
@@ -44,17 +45,17 @@ async function isPackageManagerAvailable(pm) {
 	return false;
 }
 const readTemplate = (templatePath) => readFileSync(join(import.meta.dirname, "templates", ...(templatePath + ".tpl").split("/")), "utf8");
-const getInstruction = (pm) => `
+const getInstruction = (pm) => message`
 To start the server, run the following command:
 
-  ${getDevCommand(pm)}
+  ${commandLine(getDevCommand(pm))}
 
 Then, try look up an actor from your server:
 
-  ${colors.bold(colors.green("fedify lookup http://localhost:8000/users/john"))}
+  ${commandLine("fedify lookup http://localhost:8000/users/john")}
 
 `;
-const getDevCommand = (pm) => colors.bold(colors.green(pm === "deno" ? "deno task dev" : pm === "bun" ? "bun dev" : `${pm} run dev`));
+const getDevCommand = (pm) => pm === "deno" ? "deno task dev" : pm === "bun" ? "bun dev" : `${pm} run dev`;
 async function isCommandAvailable({ checkCommand, outputPattern }) {
 	try {
 		const { stdout } = await runSubCommand(checkCommand, { stdio: [

package/dist/init/webframeworks.js

@@ -4,6 +4,7 @@
 import { replace } from "../utils.js";
 import { PACKAGE_MANAGER } from "./const.js";
 import { PACKAGE_VERSION, getInstruction, getNextInitCommand, getNitroInitCommand, readTemplate } from "./lib.js";
+import { message } from "@optique/core";
 import { pipe } from "@fxts/core";
 
 //#region src/init/webframeworks.ts
@@ -27,7 +28,7 @@ const webFrameworks = {
 				"x-forwarded-fetch": "^0.2.0"
 			},
 			devDependencies: pm === "bun" ? { "@types/bun": "^1.1.6" } : {},
-			federationFile: "src/federation.ts",
+			federationFile: message`src/federation.ts`,
 			loggingFile: "src/logging.ts",
 			files: {
 				"src/app.tsx": pipe("hono/app.tsx", readTemplate, replace(/\/\* hono \*\//, pm === "deno" ? "@hono/hono" : "hono")).replace(/\/\* logger \*\//, projectName),
@@ -73,7 +74,7 @@ const webFrameworks = {
 				"@types/express": "^4.17.21",
 				...pm === "bun" ? { "@types/bun": "^1.1.6" } : {}
 			},
-			federationFile: "src/federation.ts",
+			federationFile: message`src/federation.ts`,
 			loggingFile: "src/logging.ts",
 			files: {
 				"src/app.ts": readTemplate("express/app.ts").replace(/\/\* logger \*\//, projectName),
@@ -102,7 +103,7 @@ const webFrameworks = {
 		init: (_, pm) => ({
 			command: getNitroInitCommand(pm),
 			dependencies: { "@fedify/h3": PACKAGE_VERSION },
-			federationFile: "server/federation.ts",
+			federationFile: message`server/federation.ts`,
 			loggingFile: "server/logging.ts",
 			files: {
 				"server/middleware/federation.ts": readTemplate("nitro/server/middleware/federation.ts"),
@@ -120,7 +121,7 @@ const webFrameworks = {
 			command: getNextInitCommand(pm),
 			dependencies: { "@fedify/next": PACKAGE_VERSION },
 			devDependencies: { "@types/node": "^20.11.2" },
-			federationFile: "federation/index.ts",
+			federationFile: message`federation/index.ts`,
 			loggingFile: "logging.ts",
 			files: { "middleware.ts": readTemplate("next/middleware.ts") },
 			instruction: getInstruction(pm)

package/dist/nodeinfo.js

@@ -3,7 +3,7 @@
     
 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 { argument, command, constant, flag, merge, message, object, option, optional, or, string, text } from "@optique/core";
 import { print, printError } from "@optique/run";
 import process from "node:process";
 import { getNodeInfo } from "@fedify/fedify";
@@ -58,7 +58,7 @@ async function runNodeInfo(command$1) {
 			process.exit(1);
 		}
 		spinner.succeed("NodeInfo document fetched.");
-		console.log(formatObject(nodeInfo$1, void 0, true));
+		print(message`${text(formatObject(nodeInfo$1, void 0, true))}`);
 		return;
 	}
 	const nodeInfo = await getNodeInfo(url, {
@@ -153,15 +153,15 @@ async function runNodeInfo(command$1) {
 	}
 	console.log(layout.join("\n"));
 }
-function indent(text, depth) {
-	return text.replace(/\n/g, "\n" + " ".repeat(depth));
+function indent(text$1, depth) {
+	return text$1.replace(/\n/g, "\n" + " ".repeat(depth));
 }
 const LINK_REGEXP = /<link((?:\s+(?:[-a-z]+)=(?:"[^"]*"|'[^']*'|[^\s]+))*)\s*\/?>/gi;
 const LINK_ATTRS_REGEXP = /(?:\s+([-a-z]+)=("[^"]*"|'[^']*'|[^\s]+))/gi;
 async function getFaviconUrl(url, userAgent) {
 	const response = await fetch(url, { headers: { "User-Agent": userAgent == null ? getUserAgent() : userAgent } });
-	const text = await response.text();
-	for (const match of text.matchAll(LINK_REGEXP)) {
+	const text$1 = await response.text();
+	for (const match of text$1.matchAll(LINK_REGEXP)) {
 		const attrs = {};
 		for (const attrMatch of match[1].matchAll(LINK_ATTRS_REGEXP)) {
 			const [, key, value] = attrMatch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/cli",
-  "version": "2.0.0-pr.467.1877+dc12636d",
+  "version": "2.0.0-pr.469.1873+ebbd8642",
   "description": "CLI toolchain for Fedify and debugging ActivityPub",
   "keywords": [
     "fedify",
@@ -71,10 +71,10 @@
     "ora": "^8.2.0",
     "shiki": "^1.6.4",
     "srvx": "^0.8.7",
-    "@fedify/fedify": "2.0.0-pr.467.1877+dc12636d",
-    "@fedify/sqlite": "2.0.0-pr.467.1877+dc12636d",
-    "@fedify/vocab-runtime": "2.0.0-pr.467.1877+dc12636d",
-    "@fedify/vocab-tools": "2.0.0-pr.467.1877+dc12636d"
+    "@fedify/fedify": "2.0.0-pr.469.1873+ebbd8642",
+    "@fedify/vocab-runtime": "2.0.0-pr.469.1873+ebbd8642",
+    "@fedify/sqlite": "2.0.0-pr.469.1873+ebbd8642",
+    "@fedify/vocab-tools": "2.0.0-pr.469.1873+ebbd8642"
   },
   "devDependencies": {
     "@types/bun": "^1.2.23",

package/src/init/action/notice.ts

@@ -1,4 +1,4 @@
-import { message } from "@optique/core";
+import { message, text } from "@optique/core";
 import { print, printError } from "@optique/run";
 import { flow } from "es-toolkit";
 import { colors, type RequiredNotNull } from "../../utils.ts";
@@ -80,15 +80,18 @@ export const noticeConfigEnv = () =>
   printMessage`Note that you probably want to edit the ${".env"} file.
 It currently contains the following values:\n`;
 
-export const noticeEnvKeyValue = ([key, value]: [string, string]) =>
-  printMessage`  ${key}=${value}`;
+export const noticeEnvKeyValue = ([key, value]: [string, string]) => {
+  printMessage`${text(`  ${key}='${value}'`)}`;
+};
 
 export function noticeHowToRun(
   { initializer: { instruction, federationFile } }: InitCommandData,
 ) {
-  printMessage`${instruction}`;
-  printMessage`Start by editing the ${federationFile} file to define your federation!
-`;
+  print(message`
+${instruction}
+    
+Start by editing the ${federationFile} file to define your federation!
+`);
 }
 
 export function noticeErrorWhileAddDeps(command: string[]) {

package/src/init/action/patch.ts

@@ -53,7 +53,7 @@ export const recommendPatchFiles = (data: InitCommandData) =>
 const getFiles = <
   T extends InitCommandData,
 >(data: T) => ({
-  [data.initializer.federationFile]: loadFederation({
+  [data.initializer.federationFile.toString()]: loadFederation({
     imports: getImports(data),
     ...data,
   }),

package/src/init/lib.ts

@@ -10,13 +10,15 @@ import {
   when,
 } from "@fxts/core";
 import { getLogger } from "@logtape/logtape";
-import { dirname, join as joinPath } from "node:path";
+import type { Message } from "@optique/core";
+import { commandLine, message } from "@optique/core/message";
 import { toMerged } from "es-toolkit";
 import { readFileSync } from "node:fs";
 import { mkdir, readdir, writeFile } from "node:fs/promises";
+import { dirname, join as joinPath } from "node:path";
 import process from "node:process";
 import metadata from "../../deno.json" with { type: "json" };
-import { colors, isNotFoundError, runSubCommand } from "../utils.ts";
+import { isNotFoundError, runSubCommand } from "../utils.ts";
 import kv from "./json/kv.json" with { type: "json" };
 import mq from "./json/mq.json" with { type: "json" };
 import pm from "./json/pm.json" with { type: "json" };
@@ -108,31 +110,20 @@ export const readTemplate: (templatePath: string) => string = (
 
 export const getInstruction: (
   packageManager: PackageManager,
-) => string = (pm) => `
+) => Message = (pm) =>
+  message`
 To start the server, run the following command:
 
-  ${getDevCommand(pm)}
+  ${commandLine(getDevCommand(pm))}
 
 Then, try look up an actor from your server:
 
-  ${
-  colors.bold(colors.green(
-    "fedify lookup http://localhost:8000/users/john",
-  ))
-}
+  ${commandLine("fedify lookup http://localhost:8000/users/john")}
 
 `;
 
 const getDevCommand = (pm: PackageManager) =>
-  colors.bold(
-    colors.green(
-      pm === "deno"
-        ? "deno task dev"
-        : pm === "bun"
-        ? "bun dev"
-        : `${pm} run dev`,
-    ),
-  );
+  pm === "deno" ? "deno task dev" : pm === "bun" ? "bun dev" : `${pm} run dev`;
 
 async function isCommandAvailable(
   { checkCommand, outputPattern }: {

package/src/init/types.ts

@@ -1,3 +1,4 @@
+import type { Message } from "@optique/core";
 import type { RequiredNotNull } from "../utils.ts";
 import type { InitCommand } from "./command.ts";
 import type {
@@ -35,12 +36,12 @@ export interface WebFrameworkInitializer {
   command?: string[];
   dependencies?: object;
   devDependencies?: object;
-  federationFile: string;
+  federationFile: Message;
   loggingFile: string;
   files?: Record<string, string>;
   compilerOptions?: Record<string, string | boolean | number | string[] | null>;
   tasks?: Record<string, string>;
-  instruction: string;
+  instruction: Message;
 }
 
 export interface WebFrameworkDescription {

package/src/init/webframeworks.ts

@@ -1,4 +1,5 @@
 import { pipe } from "@fxts/core";
+import { message } from "@optique/core";
 import { replace } from "../utils.ts";
 import { PACKAGE_MANAGER } from "./const.ts";
 import {
@@ -31,7 +32,7 @@ const webFrameworks: WebFrameworks = {
           "x-forwarded-fetch": "^0.2.0",
         },
       devDependencies: pm === "bun" ? { "@types/bun": "^1.1.6" } : {},
-      federationFile: "src/federation.ts",
+      federationFile: message`src/federation.ts`,
       loggingFile: "src/logging.ts",
       files: {
         "src/app.tsx": pipe(
@@ -87,7 +88,7 @@ const webFrameworks: WebFrameworks = {
         "@types/express": "^4.17.21",
         ...(pm === "bun" ? { "@types/bun": "^1.1.6" } : {}),
       },
-      federationFile: "src/federation.ts",
+      federationFile: message`src/federation.ts`,
       loggingFile: "src/logging.ts",
       files: {
         "src/app.ts": readTemplate("express/app.ts")
@@ -121,7 +122,7 @@ const webFrameworks: WebFrameworks = {
     init: (_, pm) => ({
       command: getNitroInitCommand(pm),
       dependencies: { "@fedify/h3": PACKAGE_VERSION },
-      federationFile: "server/federation.ts",
+      federationFile: message`server/federation.ts`,
       loggingFile: "server/logging.ts",
       files: {
         "server/middleware/federation.ts": readTemplate(
@@ -141,7 +142,7 @@ const webFrameworks: WebFrameworks = {
       command: getNextInitCommand(pm),
       dependencies: { "@fedify/next": PACKAGE_VERSION },
       devDependencies: { "@types/node": "^20.11.2" },
-      federationFile: "federation/index.ts",
+      federationFile: message`federation/index.ts`,
       loggingFile: "logging.ts",
       files: { "middleware.ts": readTemplate("next/middleware.ts") },
       instruction: getInstruction(pm),

package/src/nodeinfo.ts

@@ -16,6 +16,7 @@ import {
   optional,
   or,
   string,
+  text,
 } from "@optique/core";
 import { print, printError } from "@optique/run";
 import type { ChalkInstance } from "chalk";
@@ -111,7 +112,7 @@ export async function runNodeInfo(
     }
     spinner.succeed("NodeInfo document fetched.");
 
-    console.log(formatObject(nodeInfo, undefined, true));
+    print(message`${text(formatObject(nodeInfo, undefined, true))}`);
     return;
   }
   const nodeInfo = await getNodeInfo(url, {