@fedify/init 2.0.8 → 2.0.10

package/dist/test/action.js

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

package/dist/test/create.js

@@ -1,28 +1,26 @@
 import { CommandError, printErrorMessage, printMessage, product, runSubCommand } from "../utils.js";
 import pm_default from "../json/pm.js";
 import { kvStores, messageQueues } from "../lib.js";
-import webframeworks_default from "../webframeworks.js";
+import webFrameworks from "../webframeworks.js";
 import { filter, isEmpty, pipe, toArray } from "@fxts/core";
 import process from "node:process";
 import { values } from "@optique/core";
 import { appendFile, mkdir } from "node:fs/promises";
 import { join as join$1, sep } from "node:path";
-
 //#region src/test/create.ts
 const BANNED_PMS = ["bun", "yarn"];
 const createTestApp = (testDirPrefix, dry) => async (options) => {
 	const testDir = join$1(testDirPrefix, ...options);
 	const vals = values(testDir.split(sep).slice(-4));
 	try {
-		const result = await runSubCommand(toArray(genInitCommand(testDir, dry, options)), {
+		await saveOutputs(testDir, await runSubCommand(toArray(genInitCommand(testDir, dry, options)), {
 			cwd: join$1(import.meta.dirname, "../.."),
 			stdio: [
 				"ignore",
 				"pipe",
 				"pipe"
 			]
-		});
-		await saveOutputs(testDir, result);
+		}));
 		printMessage`  Pass: ${vals}`;
 		return testDir;
 	} catch (error) {
@@ -30,18 +28,14 @@ const createTestApp = (testDirPrefix, dry) => async (options) => {
 			stdout: error.stdout,
 			stderr: error.stderr
 		});
-		else {
-			const errorMessage = error instanceof Error ? error.message : String(error);
-			await saveOutputs(testDir, {
-				stdout: "",
-				stderr: errorMessage
-			});
-		}
+		else await saveOutputs(testDir, {
+			stdout: "",
+			stderr: error instanceof Error ? error.message : String(error)
+		});
 		printMessage`  Fail: ${vals}`;
 		return "";
 	}
 };
-var create_default = createTestApp;
 function* genInitCommand(testDir, dry, [webFramework, packageManager, kvStore, messageQueue]) {
 	yield "deno";
 	yield "run";
@@ -69,8 +63,8 @@ const generateTestCases = ({ webFramework, packageManager, kvStore, messageQueue
 	]);
 	return product(webFramework, pms, kvStore, messageQueue);
 };
-const filterPackageManager = (pm) => pipe(pm, filter((pm$1) => BANNED_PMS.includes(pm$1) ? printErrorMessage`${pm_default[pm$1]["label"]} is not \
-supported in test mode yet because ${pm_default[pm$1]["label"]} don't \
+const filterPackageManager = (pm) => pipe(pm, filter((pm) => BANNED_PMS.includes(pm) ? printErrorMessage`${pm_default[pm]["label"]} is not \
+supported in test mode yet because ${pm_default[pm]["label"]} don't \
 support local file dependencies properly.` : true), toArray);
 const exitIfCasesEmpty = (cases) => {
 	if (cases.some(isEmpty)) {
@@ -86,11 +80,10 @@ const saveOutputs = async (dirPath, { stdout, stderr }) => {
 function filterOptions(options) {
 	const [wf, pm, kv, mq] = options;
 	return [
-		webframeworks_default[wf].packageManagers,
+		webFrameworks[wf].packageManagers,
 		kvStores[kv].packageManagers,
 		messageQueues[mq].packageManagers
 	].every((pms) => pms.includes(pm));
 }
-
 //#endregion
-export { create_default as default, filterOptions, generateTestCases };
+export { createTestApp as default, filterOptions, generateTestCases };

package/dist/test/db.js

@@ -3,7 +3,6 @@ import { DB_TO_CHECK } from "../const.js";
 import db_to_check_default from "../json/db-to-check.js";
 import { concat, filter, pipe, toArray, uniq } from "@fxts/core";
 import { createConnection } from "node:net";
-
 //#region src/test/db.ts
 /**
 * Checks if a given port is open by attempting a raw TCP connection to
@@ -42,11 +41,9 @@ async function checkRequiredDbs(options) {
 	for (const db of dbs) {
 		const info = db_to_check_default[db];
 		const port = String(info.defaultPort);
-		const running = await isPortOpen(info.defaultPort);
-		if (running) printMessage`  ${info.name} is running on port ${port}.`;
+		if (await isPortOpen(info.defaultPort)) printMessage`  ${info.name} is running on port ${port}.`;
 		else printErrorMessage`${info.name} is not running on port ${port}. Tests requiring ${info.name} may fail. Install: ${info.documentation}`;
 	}
 }
-
 //#endregion
-export { checkRequiredDbs };
+export { checkRequiredDbs };

package/dist/test/fill.js

@@ -1,6 +1,5 @@
 import { KV_STORE, MESSAGE_QUEUE, PACKAGE_MANAGER, WEB_FRAMEWORK } from "../const.js";
 import { isEmpty, omit, pipe } from "@fxts/core";
-
 //#region src/test/fill.ts
 const fillEmptyOptions = (options) => pipe(options, fillWebFramework, fillPackageManager, fillKVStore, fillMessageQueue, fillRunMode);
 const fillOption = (key, allValues) => (options) => ({
@@ -11,19 +10,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) => pipe(options, (options$1) => "noHydRun" in options$1 ? {
-	...omit(["noHydRun"], options$1),
-	hydRun: !options$1.noHydRun
+const fillRunMode = (options) => pipe(options, (options) => "noHydRun" in options ? {
+	...omit(["noHydRun"], options),
+	hydRun: !options.noHydRun
 } : {
-	...options$1,
+	...options,
 	hydRun: true
-}, (options$1) => "noDryRun" in options$1 ? {
-	...omit(["noDryRun"], options$1),
-	dryRun: !options$1.noDryRun
+}, (options) => "noDryRun" in options ? {
+	...omit(["noDryRun"], options),
+	dryRun: !options.noDryRun
 } : {
-	...options$1,
+	...options,
 	dryRun: true
 });
-
 //#endregion
-export { fillEmptyOptions };
+export { fillEmptyOptions };

package/dist/test/lookup.js

@@ -1,13 +1,12 @@
 import { printErrorMessage, printMessage, runSubCommand } from "../utils.js";
 import { getDevCommand } from "../lib.js";
-import webframeworks_default from "../webframeworks.js";
+import webFrameworks from "../webframeworks.js";
 import process from "node:process";
 import { values } from "@optique/core";
 import { spawn } from "node:child_process";
 import { createWriteStream } from "node:fs";
 import { join, sep } from "node:path";
 import { isEmpty } from "@fxts/core/index.js";
-
 //#region src/test/lookup.ts
 const HANDLE = "john";
 const STARTUP_TIMEOUT = 3e4;
@@ -38,8 +37,7 @@ 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 (isEmpty(hasBanned)) return dirs;
-	const bannedLabels = hasBanned.map((wf) => webframeworks_default[wf]["label"]);
-	printErrorMessage`\n${values(bannedLabels)} is not supported in lookup test yet.`;
+	printErrorMessage`\n${values(hasBanned.map((wf) => webFrameworks[wf]["label"]))} is not supported in lookup test yet.`;
 	return dirs.filter((dir) => !BANNED_WFS.includes(dir.split(sep).slice(-4, -3)[0]));
 }
 /**
@@ -53,7 +51,7 @@ async function testApp(dir) {
 		kv,
 		mq
 	])}...`;
-	const result = await serverClosure(dir, getDevCommand(pm), webframeworks_default[wf].defaultPort, sendLookup);
+	const result = await serverClosure(dir, getDevCommand(pm), webFrameworks[wf].defaultPort, sendLookup);
 	printMessage`    Lookup ${result ? "successful" : "failed"} for ${values([
 		wf,
 		pm,
@@ -70,8 +68,7 @@ const sendLookup = async (port) => {
 	const serverUrl = `http://localhost:${port}`;
 	const lookupTarget = `${serverUrl}/users/${HANDLE}`;
 	printMessage`    Waiting for server to start at ${serverUrl}...`;
-	const isReady = await waitForServer(serverUrl, STARTUP_TIMEOUT);
-	if (!isReady) {
+	if (!await waitForServer(serverUrl, STARTUP_TIMEOUT)) {
 		printErrorMessage`Server did not start within \
 ${String(STARTUP_TIMEOUT)}ms`;
 		return false;
@@ -98,8 +95,7 @@ async function waitForServer(url, timeout) {
 	const startTime = Date.now();
 	while (Date.now() - startTime < timeout) {
 		try {
-			const response = await fetch(url, { signal: AbortSignal.timeout(1e3) });
-			if (response.ok) return true;
+			if ((await fetch(url, { signal: AbortSignal.timeout(1e3) })).ok) return true;
 		} catch {}
 		await new Promise((resolve) => setTimeout(resolve, 500));
 	}
@@ -121,12 +117,11 @@ async function serverClosure(dir, cmd, defaultPort, callback) {
 	serverProcess.stdout?.pipe(stdout);
 	serverProcess.stderr?.pipe(stderr);
 	try {
-		const port = await determinePort(serverProcess).catch((err) => {
+		return await callback(await determinePort(serverProcess).catch((err) => {
 			printErrorMessage`Failed to determine server port: ${err.message}`;
 			printErrorMessage`Use default port ${String(defaultPort)} for lookup.`;
 			return defaultPort;
-		});
-		return await callback(port);
+		}));
 	} finally {
 		try {
 			process.kill(-serverProcess.pid, "SIGKILL");
@@ -186,6 +181,5 @@ function determinePort(server) {
 		});
 	});
 }
-
 //#endregion
-export { runServerAndLookupUser };
+export { runServerAndLookupUser as default };

package/dist/test/mod.js

@@ -1,16 +1,14 @@
 import { testInitCommand } from "../command.js";
-import action_default from "./action.js";
+import runTestInit from "./action.js";
 import { run } from "@optique/run";
-
 //#region src/test/mod.ts
 async function main() {
 	console.log("Running test-init command...");
-	const result = run(testInitCommand, {
+	await runTestInit(run(testInitCommand, {
 		programName: "fedify-test-init",
 		help: "both"
-	});
-	await action_default(result);
+	}));
 }
 await main();
-
-//#endregion
+//#endregion
+export {};

package/dist/test/run.js

@@ -1,13 +1,11 @@
 import { printMessage } from "../utils.js";
-import create_default, { filterOptions, generateTestCases } from "./create.js";
-import { runServerAndLookupUser } from "./lookup.js";
+import createTestApp, { filterOptions, generateTestCases } from "./create.js";
+import runServerAndLookupUser from "./lookup.js";
 import { always, filter, map, pipe, tap, unless } from "@fxts/core";
 import { optionNames } from "@optique/core";
 import { join as join$1 } from "node:path";
-
 //#region src/test/run.ts
-const runTests = (dry) => ({ testDirPrefix, dryRun, hydRun,...options }) => pipe(options, printStartMessage(dry), generateTestCases, filter(filterOptions), map(create_default(join$1(testDirPrefix, getMid(dryRun, hydRun, dry)), dry)), Array.fromAsync, unless(always(dry), runServerAndLookupUser));
-var run_default = runTests;
+const runTests = (dry) => ({ testDirPrefix, dryRun, hydRun, ...options }) => pipe(options, printStartMessage(dry), generateTestCases, filter(filterOptions), map(createTestApp(join$1(testDirPrefix, getMid(dryRun, hydRun, dry)), dry)), Array.fromAsync, unless(always(dry), runServerAndLookupUser));
 const printStartMessage = (dry) => tap(() => printMessage`\n
 Init ${dry ? "Dry" : "Hyd"} Test start!
 Options: ${optionNames([
@@ -17,6 +15,5 @@ Options: ${optionNames([
 	"Message Queue"
 ])}`);
 const getMid = (dryRun, hydRun, dry) => dryRun === hydRun ? dry ? "dry" : "hyd" : "";
-
 //#endregion
-export { run_default as default };
+export { runTests as default };

package/dist/test/utils.js

@@ -2,7 +2,6 @@ import { printMessage } from "../utils.js";
 import { rm } from "node:fs/promises";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
-
 //#region src/test/utils.ts
 const genRunId = () => `${Date.now()}-${Math.random().toString(36).slice(2)}`;
 const genTestDirPrefix = ({ runId }) => join(tmpdir(), "fedify-init", runId);
@@ -10,6 +9,5 @@ const emptyTestDir = ({ testDirPrefix }) => rm(testDirPrefix, { recursive: true
 const logTestDir = ({ runId, testDirPrefix }) => printMessage`Test run completed.
 Run ID: ${runId}
 Path: ${testDirPrefix}`;
-
 //#endregion
-export { emptyTestDir, genRunId, genTestDirPrefix, logTestDir };
+export { emptyTestDir, genRunId, genTestDirPrefix, logTestDir };

package/dist/utils.d.ts

@@ -1,5 +1,4 @@
 import { message } from "@optique/core";
-import "chalk";
 import { toMerged } from "es-toolkit";
 import { spawn } from "node:child_process";
 

package/dist/utils.js

@@ -5,13 +5,10 @@ import { message } from "@optique/core";
 import { Chalk } from "chalk";
 import { flow, toMerged } from "es-toolkit";
 import { spawn } from "node:child_process";
-
-//#region src/utils.ts
-const colorEnabled = process.stdout.isTTY && !("NO_COLOR" in process.env && process.env.NO_COLOR !== "");
-const colors = new Chalk(colorEnabled ? {} : { level: 0 });
+const colors = new Chalk(process.stdout.isTTY && !("NO_COLOR" in process.env && process.env.NO_COLOR !== "") ? {} : { level: 0 });
 const isPromise = (value) => value instanceof Promise;
 function set(key, f) {
-	return (obj) => {
+	return ((obj) => {
 		const result = f(obj);
 		if (isPromise(result)) return result.then((value) => ({
 			...obj,
@@ -21,28 +18,28 @@ function set(key, f) {
 			...obj,
 			[key]: result
 		};
-	};
+	});
 }
 const merge$1 = (source = {}) => (target = {}) => toMerged(target, source);
-const replace = (pattern, replacement) => (text$1) => text$1.replace(pattern, replacement);
-const replaceAll = (pattern, replacement) => (text$1) => text$1.replaceAll(pattern, replacement);
+const replace = (pattern, replacement) => (text) => text.replace(pattern, replacement);
+const replaceAll = (pattern, replacement) => (text) => text.replaceAll(pattern, replacement);
 const formatJson = (obj) => JSON.stringify(obj, null, 2) + "\n";
 const notEmpty = (s) => s.length > 0;
 const isNotFoundError = (e) => isObject(e) && "code" in e && e.code === "ENOENT";
 var CommandError = class extends Error {
 	commandLine;
-	constructor(message$1, stdout, stderr, code, command$1) {
-		super(message$1);
+	constructor(message, stdout, stderr, code, command) {
+		super(message);
 		this.stdout = stdout;
 		this.stderr = stderr;
 		this.code = code;
-		this.command = command$1;
+		this.command = command;
 		this.name = "CommandError";
-		this.commandLine = command$1.join(" ");
+		this.commandLine = command.join(" ");
 	}
 };
-const runSubCommand = async (command$1, options) => {
-	const commands = command$1.reduce((acc, cur) => {
+const runSubCommand = async (command, options) => {
+	const commands = command.reduce((acc, cur) => {
 		if (cur === "&&") acc.push([]);
 		else {
 			if (acc.length === 0) acc.push([]);
@@ -67,10 +64,10 @@ const runSubCommand = async (command$1, options) => {
 	}
 	return results;
 };
-const runSingularCommand = (command$1, options) => new Promise((resolve, reject) => {
+const runSingularCommand = (command, options) => new Promise((resolve, reject) => {
 	let stdout = "";
 	let stderr = "";
-	const child = spawn(command$1[0], command$1.slice(1), options);
+	const child = spawn(command[0], command.slice(1), options);
 	child.stdout?.on("data", (data) => {
 		stdout += data.toString();
 	});
@@ -82,7 +79,7 @@ const runSingularCommand = (command$1, options) => new Promise((resolve, reject)
 			stdout: stdout.trim(),
 			stderr: stderr.trim()
 		});
-		else reject(new CommandError(`Command exited with code ${code ?? "unknown"}`, stdout.trim(), stderr.trim(), code ?? -1, command$1));
+		else reject(new CommandError(`Command exited with code ${code ?? "unknown"}`, stdout.trim(), stderr.trim(), code ?? -1, command));
 	});
 	child.on("error", (error) => {
 		reject(error);
@@ -97,6 +94,5 @@ function* product(...[head, ...tail]) {
 }
 const printMessage = flow(message, print);
 const printErrorMessage = flow(message, printError);
-
 //#endregion
-export { CommandError, colors, exit, formatJson, getCwd, getOsType, isNotFoundError, merge$1 as merge, notEmpty, printErrorMessage, printMessage, product, replace, replaceAll, runSubCommand, set };
+export { CommandError, colors, exit, formatJson, getCwd, getOsType, isNotFoundError, merge$1 as merge, notEmpty, printErrorMessage, printMessage, product, replace, replaceAll, runSubCommand, set };

package/dist/webframeworks.js

@@ -2,7 +2,6 @@ import { replace } from "./utils.js";
 import { PACKAGE_VERSION, getInstruction, getNextInitCommand, getNitroInitCommand, packageManagerToRuntime, readTemplate } from "./lib.js";
 import { PACKAGE_MANAGER } from "./const.js";
 import { pipe } from "@fxts/core";
-
 //#region src/webframeworks.ts
 const webFrameworks = {
 	"bare-bones": {
@@ -254,12 +253,10 @@ const webFrameworks = {
 		defaultPort: 3e3
 	}
 };
-var webframeworks_default = webFrameworks;
 const defaultDevDependencies = {
 	"eslint": "^9.0.0",
 	"@fedify/lint": PACKAGE_VERSION
 };
 const defaultDenoDependencies = { "@fedify/lint": PACKAGE_VERSION };
-
 //#endregion
-export { webframeworks_default as default };
+export { webFrameworks as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/init",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "description": "Project initializer for Fedify",
   "keywords": [
     "fedify",
@@ -59,13 +59,15 @@
   },
   "devDependencies": {
     "@types/node": "^22.17.0",
-    "tsdown": "^0.12.9",
-    "typescript": "^5.9.3"
+    "tsdown": "^0.21.6",
+    "typescript": "^5.9.2"
   },
   "scripts": {
     "build:self": "tsdown",
     "build": "pnpm --filter @fedify/init... run build:self",
     "prepublish": "pnpm build",
+    "pretest": "pnpm build",
+    "test": "node --test --experimental-transform-types 'src/**/*.test.ts'",
     "test-init": "deno task test-init"
   }
 }