@fedify/init 2.0.25 → 2.0.26-dev.1875

package/dist/action/notice.js

@@ -1,6 +1,6 @@
 import { colors, printMessage } from "../utils.js";
-import { text } from "@optique/core";
 import { flow } from "es-toolkit";
+import { text } from "@optique/core";
 //#region src/action/notice.ts
 function drawDinosaur() {
 	const d = flow(colors.bgBlue, colors.black);

package/dist/ask/dir.js

@@ -28,7 +28,7 @@ const askDir = (cwd) => input({
 });
 const askIfNonEmpty = async (dir) => {
 	if (await isDirectoryEmpty(dir)) return true;
-	if (await askNonEmpty(dir)) return await moveDirToTrash(dir);
+	if (await askNonEmpty(dir)) return await moveOrDeleteDir(dir);
 	return false;
 };
 const askNonEmpty = (dir) => toggle.default({
@@ -36,31 +36,57 @@ const askNonEmpty = (dir) => toggle.default({
 Do you want to use it anyway?`,
 	default: false
 });
-const moveDirToTrash = (dir) => pipe(dir, askMoveToTrash, when(identity, moveToTrash(dir)));
-const askMoveToTrash = (dir) => toggle.default({
+const moveOrDeleteDir = (dir) => pipe(dir, buildMoveOrDelete, (action) => pipe(action.confirm, when(identity, runAction(action.command, action.error))));
+const buildMoveOrDelete = (dir) => pipe(getOsType(), detectSupportedAction, (fn) => {
+	return {
+		confirm: fn.confirmAction(dir),
+		command: fn.actionPlan.command(dir),
+		error: errorMessages[fn.actionPlan.mode](dir)
+	};
+});
+const detectSupportedAction = (os) => {
+	const actionPlan = trashOrDeleteCommands[os] ?? trashOrDeleteCommands.linux;
+	return {
+		confirmAction: actionPlan.mode === "trash" ? moveToTrashConfirm : deletePermanentlyConfirm,
+		actionPlan
+	};
+};
+const moveToTrashConfirm = (dir) => toggle.default({
 	message: `Do you want to move the contents of "${dir}" to the trash?
 If you choose "No", you should choose another directory.`,
 	default: false
 });
-const moveToTrash = (dir) => () => pipe(getOsType(), getTrashCommand, (fn) => fn(dir), (cmd) => runSubCommand(cmd, { stdio: "ignore" }), () => true).catch((e) => {
+const deletePermanentlyConfirm = (dir) => toggle.default({
+	message: `Do you really want to delete all contents of "${dir}" PERMANENTLY?
+If you choose "No", you should choose another directory.`,
+	default: false
+});
+const runAction = (command, error) => () => pipe(command, (cmd) => runSubCommand(cmd, { stdio: "ignore" }), () => true).catch((e) => {
 	logger.error(e);
-	printError(message`Failed to move ${dir} to trash.
-Please move it manually.`);
+	printError(error);
 	return false;
 });
-const getTrashCommand = (os) => trashCommands[os] ?? trashCommands.linux;
-const trashCommands = {
-	darwin: (dir) => ["trash", dir],
-	win32: (dir) => [
-		"powershell",
-		"-Command",
-		getPowershellTrashCommand(dir)
-	],
-	linux: (dir) => [
-		"rm",
-		"-rf",
-		dir
-	]
+const trashOrDeleteCommands = {
+	darwin: {
+		mode: "trash",
+		command: (dir) => ["trash", dir]
+	},
+	win32: {
+		mode: "trash",
+		command: (dir) => [
+			"powershell",
+			"-Command",
+			getPowershellTrashCommand(dir)
+		]
+	},
+	linux: {
+		mode: "permanent",
+		command: (dir) => [
+			"rm",
+			"-rf",
+			dir
+		]
+	}
 };
 const getPowershellTrashCommand = (dir) => [
 	"Add-Type",
@@ -72,5 +98,11 @@ const getPowershellTrashCommand = (dir) => [
 	"'OnlyErrorDialogs',",
 	"'SendToRecycleBin')"
 ].join(" ");
+const errorMessages = {
+	"trash": (dir) => message`Failed to move ${dir} to trash.
+Please move it manually.`,
+	"permanent": (dir) => message`Failed to delete ${dir} permanently.
+Please remove it manually.`
+};
 //#endregion
 export { fillDir as default };

package/dist/deno.js

@@ -1,4 +1,4 @@
 //#region deno.json
-var version = "2.0.25";
+var version = "2.0.26-dev.1875+623710b2";
 //#endregion
 export { version };

package/dist/lib.js

@@ -1,14 +1,14 @@
-import { isNotFoundError, runSubCommand } from "./utils.js";
 import { version } from "./deno.js";
 import kv_default from "./json/kv.js";
 import mq_default from "./json/mq.js";
 import pm_default from "./json/pm.js";
 import rt_default from "./json/rt.js";
+import { isNotFoundError, runSubCommand } from "./utils.js";
 import { entries, evolve, fromEntries, isObject, map, negate, pipe, throwIf } from "@fxts/core";
 import process from "node:process";
 import { commandLine, message } from "@optique/core/message";
-import { toMerged } from "es-toolkit";
 import { getLogger } from "@logtape/logtape";
+import { toMerged } from "es-toolkit";
 import { readFileSync } from "node:fs";
 import { mkdir, readdir, writeFile } from "node:fs/promises";
 import { dirname, join as join$1 } from "node:path";

package/dist/test/create.js

@@ -1,12 +1,12 @@
-import { CommandError, printErrorMessage, printMessage, product, runSubCommand } from "../utils.js";
 import pm_default from "../json/pm.js";
+import { CommandError, printErrorMessage, printMessage, product, runSubCommand } from "../utils.js";
 import { kvStores, messageQueues } from "../lib.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";
+import { values } from "@optique/core";
 //#region src/test/create.ts
 const BANNED_PMS = ["bun", "yarn"];
 const createTestApp = (testDirPrefix, dry) => async (options) => {

package/dist/test/lookup.js

@@ -2,10 +2,10 @@ import { printErrorMessage, printMessage, runSubCommand } from "../utils.js";
 import { getDevCommand } from "../lib.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 { values } from "@optique/core";
+import { spawn } from "node:child_process";
 import { isEmpty } from "@fxts/core/index.js";
 //#region src/test/lookup.ts
 const HANDLE = "john";

package/dist/test/run.js

@@ -2,8 +2,8 @@ import { printMessage } from "../utils.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";
+import { optionNames } from "@optique/core";
 //#region src/test/run.ts
 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

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
-import { message } from "@optique/core";
 import { toMerged } from "es-toolkit";
+import { message } from "@optique/core";
 import { spawn } from "node:child_process";
 
 //#region src/utils.d.ts

package/dist/utils.js

@@ -1,9 +1,9 @@
 import { isObject } from "@fxts/core";
 import process from "node:process";
 import { print, printError } from "@optique/run";
+import { flow, toMerged } from "es-toolkit";
 import { message } from "@optique/core";
 import { Chalk } from "chalk";
-import { flow, toMerged } from "es-toolkit";
 import { spawn } from "node:child_process";
 const colors = new Chalk(process.stdout.isTTY && !("NO_COLOR" in process.env && process.env.NO_COLOR !== "") ? {} : { level: 0 });
 const isPromise = (value) => value instanceof Promise;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/init",
-  "version": "2.0.25",
+  "version": "2.0.26-dev.1875+623710b2",
   "description": "Project initializer for Fedify",
   "keywords": [
     "fedify",