Merge pull request #469 from dodok8/fix/465

fix: fedify init notice message deosn't show properly

Author: dahlia

packages/cli/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[]) {

packages/cli/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,
   }),

packages/cli/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 }: {

packages/cli/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 {

packages/cli/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),

packages/cli/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, {