@fedify/cli 2.0.0-pr.479.1903 → 2.0.0-pr.479.1919

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/cli",
-  "version": "2.0.0-pr.479.1903+05f65629",
+  "version": "2.0.0-pr.479.1919+bc910fb5",
   "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.479.1903+05f65629";
+var version = "2.0.0-pr.479.1919+bc910fb5";
 var license = "MIT";
 var exports = "./src/mod.ts";
 var imports = {

package/dist/init/action/configs.js

@@ -9,6 +9,7 @@ import { PACKAGES_PATH } from "./const.js";
 import { getDependencies, getDevDependencies, joinDepsReg } from "./deps.js";
 import { join, relative } from "node:path";
 import { uniq } from "es-toolkit";
+import { realpathSync } from "node:fs";
 import { concat, filter, keys, map, pick, pipe, toArray } from "@fxts/core/index.js";
 
 //#region src/init/action/configs.ts
@@ -30,7 +31,7 @@ const loadDenoConfig = (data) => ({
 	}
 });
 const getUnstable = ({ kv: { denoUnstable: kv = [] }, mq: { denoUnstable: mq = [] } }) => pipe(["temporal"], concat(kv), concat(mq), toArray, uniq);
-const getLinks = ({ kv, mq, initializer, dir }) => pipe({ "@fedify/fedify": "" }, merge(initializer.dependencies), merge(kv.dependencies), merge(mq.dependencies), keys, filter((dep) => dep.includes("@fedify/")), map((dep) => dep.replace("@fedify/", "")), map((dep) => join(PACKAGES_PATH, dep)), map((absolutePath) => relative(dir, absolutePath)), toArray);
+const getLinks = ({ kv, mq, initializer, dir }) => pipe({ "@fedify/fedify": "" }, merge(initializer.dependencies), merge(kv.dependencies), merge(mq.dependencies), keys, filter((dep) => dep.includes("@fedify/")), map((dep) => dep.replace("@fedify/", "")), map((dep) => join(PACKAGES_PATH, dep)), map((absolutePath) => realpathSync(absolutePath)), map((realAbsolutePath) => relative(realpathSync(dir), realAbsolutePath)), toArray);
 /**
 * Loads TypeScript configuration object for Node.js/Bun projects.
 * Uses compiler options from the framework initializer.

package/dist/init/command.js

@@ -3,7 +3,7 @@
     
 import { debugOption } from "../globals.js";
 import { KV_STORE, MESSAGE_QUEUE, PACKAGE_MANAGER, WEB_FRAMEWORK } from "./const.js";
-import { argument, choice, command, constant, message, multiple, object, option, optionNames, optional } from "@optique/core";
+import { argument, choice, command, constant, merge, message, multiple, object, option, optionNames, optional, or } from "@optique/core";
 import { path } from "@optique/run";
 
 //#region src/init/command.ts
@@ -19,7 +19,7 @@ const initCommand = command("init", object("Initialization options", {
 	packageManager,
 	kvStore,
 	messageQueue,
-	dryRun: option("-d", "--dry-run", { description: message`Perform a trial run with no changes made.` }),
+	dryRun: option("--dry-run", { description: message`Perform a trial run with no changes made.` }),
 	debugOption,
 	testMode
 }), {
@@ -30,16 +30,16 @@ By default, it initializes the current directory.  You can specify a different d
 
 Unless you specify all options (${optionNames(["-w", "--web-framework"])}, ${optionNames(["-p", "--package-manager"])}, ${optionNames(["-k", "--kv-store"])}, and ${optionNames(["-m", "--message-queue"])}), it will prompt you to select the options interactively.`
 });
-const testInitCommand = command("test-init", object("Initialization options", {
+const noHydRun = object({ noHydRun: option("--no-hyd-run", { description: message`Log outputs without creating files.` }) });
+const noDryRun = object({ noDryRun: option("--no-dry-run", { description: message`Test with files creations and installations.` }) });
+const testInitCommand = command("test-init", merge(object("Initialization options", {
 	command: constant("test-init"),
 	webFramework: multiple(webFramework),
 	packageManager: multiple(packageManager),
 	kvStore: multiple(kvStore),
 	messageQueue: multiple(messageQueue),
-	hydRun: option("-h", "--hyd-run", { description: message`Test with files creations and installations.` }),
-	dryRun: option("-d", "--dry-run", { description: message`Log outputs without creating files.` }),
 	debugOption
-}), {
+}), optional(or(noHydRun, noDryRun))), {
 	brief: message`Test an initializing command .`,
 	description: message`Test an initializing command on temporary directories.
 

package/dist/init/test/action.js

@@ -3,12 +3,14 @@
     
 import { set } from "../../utils.js";
 import { fillEmptyOptions } from "./fill.js";
-import { isDryRun, isHydRun, runTests } from "./run.js";
+import run_default from "./run.js";
 import { emptyTestDir, genRunId, genTestDirPrefix, logTestDir } from "./utils.js";
 import { pipe, tap, when } from "@fxts/core";
 
 //#region src/init/test/action.ts
-const runTestInit = (options) => pipe(options, set("runId", genRunId), set("testDirPrefix", genTestDirPrefix), tap(emptyTestDir), fillEmptyOptions, tap(when(isHydRun, runTests(false))), tap(when(isDryRun, runTests(true))), tap(logTestDir));
+const runTestInit = (options) => pipe(options, set("runId", genRunId), set("testDirPrefix", genTestDirPrefix), tap(emptyTestDir), fillEmptyOptions, tap(when(isDryRun, run_default(true))), tap(when(isHydRun, run_default(false))), tap(logTestDir));
+const isDryRun = ({ dryRun }) => dryRun;
+const isHydRun = ({ hydRun }) => hydRun;
 var action_default = runTestInit;
 
 //#endregion

package/dist/init/test/fill.js

@@ -2,7 +2,7 @@
       import { Temporal } from "@js-temporal/polyfill";
     
 import { KV_STORE, MESSAGE_QUEUE, PACKAGE_MANAGER, WEB_FRAMEWORK } from "../const.js";
-import { isEmpty, pipe } from "@fxts/core";
+import { isEmpty, omit, pipe } from "@fxts/core";
 
 //#region src/init/test/fill.ts
 const fillEmptyOptions = (options) => pipe(options, fillWebFramework, fillPackageManager, fillKVStore, fillMessageQueue, fillRunMode);
@@ -14,12 +14,18 @@ const fillWebFramework = fillOption("webFramework", WEB_FRAMEWORK);
 const fillPackageManager = fillOption("packageManager", PACKAGE_MANAGER);
 const fillKVStore = fillOption("kvStore", KV_STORE);
 const fillMessageQueue = fillOption("messageQueue", MESSAGE_QUEUE);
-const fillRunMode = (options) => ({
-	...options,
-	...options.hydRun || options.dryRun ? {} : {
-		hydRun: true,
-		dryRun: true
-	}
+const fillRunMode = (options) => pipe(options, (options$1) => "noHydRun" in options$1 ? {
+	...omit(["noHydRun"], options$1),
+	hydRun: !options$1.noHydRun
+} : {
+	...options$1,
+	hydRun: true
+}, (options$1) => "noDryRun" in options$1 ? {
+	...omit(["noDryRun"], options$1),
+	dryRun: !options$1.noDryRun
+} : {
+	...options$1,
+	dryRun: true
 });
 
 //#endregion

package/dist/init/test/lookup.js

@@ -9,6 +9,7 @@ import { values } from "@optique/core";
 import process from "node:process";
 import { spawn } from "node:child_process";
 import { createWriteStream } from "node:fs";
+import { isEmpty } from "@fxts/core/index.js";
 
 //#region src/init/test/lookup.ts
 const HANDLE = "john";
@@ -39,9 +40,9 @@ async function runServerAndLookupUser(dirs) {
 function filterWebFrameworks(dirs) {
 	const wfs = new Set(dirs.map((dir) => dir.split(sep).slice(-4, -3)[0]));
 	const hasBanned = BANNED_WFS.filter((wf) => wfs.has(wf));
-	if (!hasBanned) return dirs;
+	if (isEmpty(hasBanned)) return dirs;
 	const bannedLabels = hasBanned.map((wf) => webframeworks_default[wf]["label"]);
-	printErrorMessage`\n${values(bannedLabels)} is not supported in test mode yet.`;
+	printErrorMessage`\n${values(bannedLabels)} is not supported in lookup test yet.`;
 	return dirs.filter((dir) => !BANNED_WFS.includes(dir.split(sep).slice(-4, -3)[0]));
 }
 /**
@@ -146,9 +147,9 @@ function determinePort(server) {
 			/listening on.*:(\d+)/i,
 			/server.*:(\d+)/i,
 			/port\s*:?\s*(\d+)/i,
-			/https?:localhost:(\d+)/i,
-			/https?:0\.0\.0\.0:(\d+)/i,
-			/https?:127\.0\.0\.1:(\d+)/i,
+			/https?:\/\/localhost:(\d+)/i,
+			/https?:\/\/0\.0\.0\.0:(\d+)/i,
+			/https?:\/\/127\.0\.0\.1:(\d+)/i,
 			/https?:\/\/[^:]+:(\d+)/i
 		];
 		const checkForPort = (data) => {

package/dist/init/test/run.js

@@ -9,11 +9,10 @@ import { optionNames } from "@optique/core";
 import { always, filter, map as map$1, pipe, tap, unless } from "@fxts/core";
 
 //#region src/init/test/run.ts
-const isDryRun = ({ dryRun }) => dryRun;
-const isHydRun = ({ hydRun }) => hydRun;
-const runTests = (dry) => ({ testDirPrefix, dryRun, hydRun,...options }) => pipe(options, printStartMessage, generateTestCases, filter(filterOptions), map$1(create_default(join(testDirPrefix, getMid(dryRun, hydRun, dry)), dry)), Array.fromAsync, unless(always(dry), runServerAndLookupUser));
-const printStartMessage = tap(() => printMessage`\n
-Init Test start!
+const runTests = (dry) => ({ testDirPrefix, dryRun, hydRun,...options }) => pipe(options, printStartMessage(dry), generateTestCases, filter(filterOptions), map$1(create_default(join(testDirPrefix, getMid(dryRun, hydRun, dry)), dry)), Array.fromAsync, unless(always(dry), runServerAndLookupUser));
+var run_default = runTests;
+const printStartMessage = (dry) => tap(() => printMessage`\n
+Init ${dry ? "Dry" : "Hyd"} Test start!
 Options: ${optionNames([
 	"Web Framework",
 	"Package Manager",
@@ -23,4 +22,4 @@ Options: ${optionNames([
 const getMid = (dryRun, hydRun, dry) => dryRun === hydRun ? dry ? "dry" : "hyd" : "";
 
 //#endregion
-export { isDryRun, isHydRun, runTests };
+export { run_default as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/cli",
-  "version": "2.0.0-pr.479.1903+05f65629",
+  "version": "2.0.0-pr.479.1919+bc910fb5",
   "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.479.1903+05f65629",
-    "@fedify/vocab-runtime": "2.0.0-pr.479.1903+05f65629",
-    "@fedify/sqlite": "2.0.0-pr.479.1903+05f65629",
-    "@fedify/vocab-tools": "2.0.0-pr.479.1903+05f65629"
+    "@fedify/fedify": "2.0.0-pr.479.1919+bc910fb5",
+    "@fedify/vocab-tools": "2.0.0-pr.479.1919+bc910fb5",
+    "@fedify/vocab-runtime": "2.0.0-pr.479.1919+bc910fb5",
+    "@fedify/sqlite": "2.0.0-pr.479.1919+bc910fb5"
   },
   "devDependencies": {
     "@types/bun": "^1.2.23",

package/src/init/action/configs.ts

@@ -8,6 +8,7 @@ import {
   toArray,
 } from "@fxts/core/index.js";
 import { uniq } from "es-toolkit";
+import { realpathSync } from "node:fs";
 import { join as joinPath, relative } from "node:path";
 import { merge } from "../../utils.ts";
 import biome from "../json/biome.json" with { type: "json" };
@@ -65,7 +66,8 @@ const getLinks = <
     filter((dep) => dep.includes("@fedify/")),
     map((dep) => dep.replace("@fedify/", "")),
     map((dep) => joinPath(PACKAGES_PATH, dep)),
-    map((absolutePath) => relative(dir, absolutePath)),
+    map((absolutePath) => realpathSync(absolutePath)),
+    map((realAbsolutePath) => relative(realpathSync(dir), realAbsolutePath)),
     toArray,
   );
 

package/src/init/command.ts

@@ -4,12 +4,14 @@ import {
   command,
   constant,
   type InferValue,
+  merge,
   message,
   multiple,
   object,
   option,
   optional,
   optionNames,
+  or,
 } from "@optique/core";
 import { path } from "@optique/run";
 import { debugOption } from "../globals.ts";
@@ -73,7 +75,7 @@ export const initCommand = command(
     packageManager,
     kvStore,
     messageQueue,
-    dryRun: option("-d", "--dry-run", {
+    dryRun: option("--dry-run", {
       description: message`Perform a trial run with no changes made.`,
     }),
     debugOption,
@@ -95,22 +97,29 @@ Unless you specify all options (${optionNames(["-w", "--web-framework"])}, ${
 
 export type InitCommand = InferValue<typeof initCommand>;
 
+const noHydRun = object({
+  noHydRun: option("--no-hyd-run", {
+    description: message`Log outputs without creating files.`,
+  }),
+});
+const noDryRun = object({
+  noDryRun: option("--no-dry-run", {
+    description: message`Test with files creations and installations.`,
+  }),
+});
 export const testInitCommand = command(
   "test-init",
-  object("Initialization options", {
-    command: constant("test-init"),
-    webFramework: multiple(webFramework),
-    packageManager: multiple(packageManager),
-    kvStore: multiple(kvStore),
-    messageQueue: multiple(messageQueue),
-    hydRun: option("-h", "--hyd-run", {
-      description: message`Test with files creations and installations.`,
+  merge(
+    object("Initialization options", {
+      command: constant("test-init"),
+      webFramework: multiple(webFramework),
+      packageManager: multiple(packageManager),
+      kvStore: multiple(kvStore),
+      messageQueue: multiple(messageQueue),
+      debugOption,
     }),
-    dryRun: option("-d", "--dry-run", {
-      description: message`Log outputs without creating files.`,
-    }),
-    debugOption,
-  }),
+    optional(or(noHydRun, noDryRun)),
+  ),
   {
     brief: message`Test an initializing command .`,
     description: message`Test an initializing command on temporary directories.

package/src/init/test/action.ts

@@ -2,7 +2,7 @@ import { pipe, tap, when } from "@fxts/core";
 import { set } from "../../utils.ts";
 import type { TestInitCommand } from "../command.ts";
 import { fillEmptyOptions } from "./fill.ts";
-import { isDryRun, isHydRun, runTests } from "./run.ts";
+import runTests from "./run.ts";
 import {
   emptyTestDir,
   genRunId,
@@ -17,9 +17,12 @@ const runTestInit = (options: TestInitCommand) =>
     set("testDirPrefix", genTestDirPrefix),
     tap(emptyTestDir),
     fillEmptyOptions,
-    tap(when(isHydRun, runTests(false))),
     tap(when(isDryRun, runTests(true))),
+    tap(when(isHydRun, runTests(false))),
     tap(logTestDir),
   );
 
+const isDryRun = <T extends { dryRun: boolean }>({ dryRun }: T) => dryRun;
+const isHydRun = <T extends { hydRun: boolean }>({ hydRun }: T) => hydRun;
+
 export default runTestInit;

package/src/init/test/fill.ts

@@ -1,4 +1,4 @@
-import { isEmpty, pipe } from "@fxts/core";
+import { isEmpty, omit, pipe } from "@fxts/core";
 import type { TestInitCommand } from "../command.ts";
 import {
   KV_STORE,
@@ -54,8 +54,14 @@ const fillKVStore = fillOption("kvStore", KV_STORE);
 const fillMessageQueue = fillOption("messageQueue", MESSAGE_QUEUE);
 
 const fillRunMode = <T extends TestInitCommand>(
-  options: DefineAllOptions<T>,
-): DefineAllOptions<T> => ({
-  ...options,
-  ...(options.hydRun || options.dryRun ? {} : { hydRun: true, dryRun: true }),
-});
+  options: T,
+): DefineAllOptions<T> =>
+  pipe(
+    options,
+    (options) => ("noHydRun" in options
+      ? ({ ...omit(["noHydRun"], options), hydRun: !options.noHydRun })
+      : ({ ...options, hydRun: true })),
+    (options) => ("noDryRun" in options
+      ? ({ ...omit(["noDryRun"], options), dryRun: !options.noDryRun })
+      : ({ ...options, dryRun: true })),
+  ) as DefineAllOptions<T>;

package/src/init/test/lookup.ts

@@ -1,3 +1,4 @@
+import { isEmpty } from "@fxts/core/index.js";
 import { values } from "@optique/core";
 import type { ChildProcessByStdio } from "node:child_process";
 import { spawn } from "node:child_process";
@@ -55,13 +56,13 @@ function filterWebFrameworks(
     dirs.map((dir) => dir.split(sep).slice(-4, -3)[0] as WebFramework),
   );
   const hasBanned = BANNED_WFS.filter((wf) => wfs.has(wf));
-  if (!hasBanned) {
+  if (isEmpty(hasBanned)) {
     return dirs;
   }
   const bannedLabels = hasBanned.map((wf) => webFrameworks[wf]["label"]);
   printErrorMessage`\n${
     values(bannedLabels)
-  } is not supported in test mode yet.`;
+  } is not supported in lookup test yet.`;
   return dirs.filter((dir) =>
     !BANNED_WFS.includes(dir.split(sep).slice(-4, -3)[0] as WebFramework)
   );
@@ -204,9 +205,9 @@ function determinePort(
       /listening on.*:(\d+)/i,
       /server.*:(\d+)/i,
       /port\s*:?\s*(\d+)/i,
-      /https?:localhost:(\d+)/i,
-      /https?:0\.0\.0\.0:(\d+)/i,
-      /https?:127\.0\.0\.1:(\d+)/i,
+      /https?:\/\/localhost:(\d+)/i,
+      /https?:\/\/0\.0\.0\.0:(\d+)/i,
+      /https?:\/\/127\.0\.0\.1:(\d+)/i,
       /https?:\/\/[^:]+:(\d+)/i,
     ];
 

package/src/init/test/run.ts

@@ -6,37 +6,34 @@ import createTestApp, { filterOptions, generateTestCases } from "./create.ts";
 import runServerAndLookupUser from "./lookup.ts";
 import type { InitTestData } from "./types.ts";
 
-export const isDryRun = <T extends { dryRun: boolean }>({ dryRun }: T) =>
-  dryRun;
-export const isHydRun = <T extends { hydRun: boolean }>({ hydRun }: T) =>
-  hydRun;
-
-export const runTests =
+const runTests =
   (dry: boolean) =>
   <T extends InitTestData>({ testDirPrefix, dryRun, hydRun, ...options }: T) =>
     pipe(
       options,
-      printStartMessage,
+      printStartMessage(dry),
       generateTestCases,
       filter(filterOptions),
       map(createTestApp(join(testDirPrefix, getMid(dryRun, hydRun, dry)), dry)),
       Array.fromAsync<string>,
       unless(always(dry), runServerAndLookupUser),
     );
+export default runTests;
 
-const printStartMessage: <T>(t: T) => T = tap(
-  () =>
-    printMessage`\n
-Init Test start!
+const printStartMessage: (dry: boolean) => <T>(t: T) => T = (dry: boolean) =>
+  tap(
+    () =>
+      printMessage`\n
+Init ${dry ? "Dry" : "Hyd"} Test start!
 Options: ${
-      optionNames([
-        "Web Framework",
-        "Package Manager",
-        "KV Store",
-        "Message Queue",
-      ])
-    }`,
-);
+        optionNames([
+          "Web Framework",
+          "Package Manager",
+          "KV Store",
+          "Message Queue",
+        ])
+      }`,
+  );
 
 const getMid = (dryRun: boolean, hydRun: boolean, dry: boolean) =>
   dryRun === hydRun ? dry ? "dry" : "hyd" : "";

package/src/init/test/types.ts

@@ -1,17 +1,10 @@
 import type { TestInitCommand } from "../command.ts";
 
-export interface InitTestData extends AllDefinedTestInitCommand {
+export interface InitTestData extends DefineAllOptions<TestInitCommand> {
   runId: string;
   testDirPrefix: string;
 }
 
-export interface AllDefinedTestInitCommand extends TestInitCommand {
-  webFramework: (TestInitCommand["webFramework"][number] & string)[];
-  packageManager: (TestInitCommand["packageManager"][number] & string)[];
-  kvStore: (TestInitCommand["kvStore"][number] & string)[];
-  messageQueue: (TestInitCommand["messageQueue"][number] & string)[];
-}
-
 export type MultipleOption =
   | "webFramework"
   | "packageManager"
@@ -21,14 +14,14 @@ export type MultipleOption =
 export type DefineOption<T extends TestInitCommand, K extends MultipleOption> =
   & Omit<T, K>
   & {
-    [Key in MultipleOption]: Key extends K ? AllDefinedTestInitCommand[Key]
+    [Key in MultipleOption]: Key extends K ? TestInitCommand[Key] & string[]
       : T[Key];
   };
 
+type NoRunMode = "noHydRun" | "noDryRun";
+type RunMode = "hydRun" | "dryRun";
+
 export type DefineAllOptions<T extends TestInitCommand> =
-  & Omit<T, MultipleOption>
-  & {
-    [K in MultipleOption]: TestInitCommand[K] extends readonly unknown[]
-      ? AllDefinedTestInitCommand[K]
-      : never;
-  };
+  & Omit<T, MultipleOption | NoRunMode>
+  & { [K in MultipleOption]: (TestInitCommand[K][number] & string)[] }
+  & { [R in RunMode]: boolean };