nuxt-gin-tools 0.3.0 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-gin-tools",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "This project is used as a dependency for [nuxt-gin-starter](https://github.com/RapboyGao/nuxt-gin-starter.git)",
   "bin": {
     "nuxt-gin": "index.js"
@@ -13,19 +13,19 @@
     "publish": "npm publish --access public"
   },
   "dependencies": {
-    "7zip-min": "^2.1.0",
-    "chalk": "^5.4.1",
-    "chokidar": "^3.6.0",
-    "concurrently": "^9.2.0",
+    "7zip-min": "^3.0.1",
+    "chalk": "^5.6.2",
+    "chokidar": "^5.0.0",
+    "concurrently": "^9.2.1",
     "fast-glob": "^3.3.3",
-    "fs-extra": "^11.3.0",
+    "fs-extra": "^11.3.4",
     "jiti": "^2.6.1"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^24.0.15",
-    "nuxt": "^4.0.1",
+    "@types/node": "^25.5.0",
+    "nuxt": "^4.4.2",
     "ts-node": "^10.9.2",
-    "typescript": "^5.8.3"
+    "typescript": "^5.9.3"
   }
 }

package/src/cli/commands/update.js

@@ -1,53 +1,87 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.update = update;
 const concurrently_1 = __importDefault(require("concurrently"));
+const promises_1 = require("node:readline/promises");
 const package_manager_1 = require("../../config/package-manager");
 const nuxt_gin_1 = require("../../nuxt-gin");
 const terminal_ui_1 = require("../terminal-ui");
-function update(options = {}) {
-    var _a, _b;
-    (0, terminal_ui_1.printCommandBanner)("update", "Update Node and Go dependencies");
-    const projectConfig = (0, nuxt_gin_1.resolveNuxtGinProjectConfig)();
-    for (const warning of projectConfig.warnings) {
-        (0, terminal_ui_1.printCommandWarn)(`[config] ${warning}`);
-    }
-    const resolvedOptions = (0, nuxt_gin_1.mergeDefined)(Object.assign({ latest: false, packageManager: "auto" }, ((_a = projectConfig.config.update) !== null && _a !== void 0 ? _a : {})), options);
-    const actions = [];
-    const commands = [];
-    const packageManager = (0, package_manager_1.resolvePackageManager)((_b = resolvedOptions.packageManager) !== null && _b !== void 0 ? _b : "auto");
-    const latest = resolvedOptions.latest === true;
-    if (!resolvedOptions.skipNode) {
-        actions.push(`updated Node dependencies with ${packageManager} (${latest ? "latest" : "conservative"} mode)`);
-        commands.push({
-            command: (0, package_manager_1.packageManagerUpdateCommand)(packageManager, latest),
-            name: packageManager,
-            prefixColor: "magenta",
-        });
-    }
-    if (!resolvedOptions.skipGo) {
-        actions.push(`updated Go modules with ${latest ? "latest" : "patch"} strategy`);
-        commands.push({
-            command: latest ? "go get -u ./... && go mod tidy" : "go get -u=patch ./... && go mod tidy",
-            name: "go",
-            prefixColor: "green",
+function resolveLatestPreference(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (typeof options.latest === "boolean") {
+            return options.latest;
+        }
+        if (!process.stdin.isTTY || !process.stdout.isTTY) {
+            (0, terminal_ui_1.printCommandWarn)("Non-interactive terminal detected, defaulting update mode to conservative");
+            return false;
+        }
+        const rl = (0, promises_1.createInterface)({
+            input: process.stdin,
+            output: process.stdout,
         });
-    }
-    if (resolvedOptions.skipNode) {
-        actions.push("skipped Node dependency update");
-    }
-    if (resolvedOptions.skipGo) {
-        actions.push("skipped Go dependency update");
-    }
-    if (commands.length === 0) {
-        (0, terminal_ui_1.printCommandWarn)("No update targets selected, nothing to do");
-        (0, terminal_ui_1.printCommandSummary)("update", actions.length > 0 ? actions : ["nothing was executed"]);
-        return Promise.resolve();
-    }
-    return (0, concurrently_1.default)(commands).result.then(() => {
+        try {
+            const answer = yield rl.question("Use latest dependency upgrade strategy? [y/N] ");
+            const normalized = answer.trim().toLowerCase();
+            return ["y", "yes"].includes(normalized);
+        }
+        finally {
+            rl.close();
+        }
+    });
+}
+function update() {
+    return __awaiter(this, arguments, void 0, function* (options = {}) {
+        var _a, _b;
+        (0, terminal_ui_1.printCommandBanner)("update", "Update Node and Go dependencies");
+        const projectConfig = (0, nuxt_gin_1.resolveNuxtGinProjectConfig)();
+        for (const warning of projectConfig.warnings) {
+            (0, terminal_ui_1.printCommandWarn)(`[config] ${warning}`);
+        }
+        const resolvedOptions = (0, nuxt_gin_1.mergeDefined)(Object.assign({ packageManager: "auto" }, ((_a = projectConfig.config.update) !== null && _a !== void 0 ? _a : {})), options);
+        const latest = yield resolveLatestPreference(resolvedOptions);
+        const actions = [];
+        const commands = [];
+        const packageManager = (0, package_manager_1.resolvePackageManager)((_b = resolvedOptions.packageManager) !== null && _b !== void 0 ? _b : "auto");
+        if (!resolvedOptions.skipNode) {
+            actions.push(`updated Node dependencies with ${packageManager} (${latest ? "latest" : "conservative"} mode)`);
+            commands.push({
+                command: (0, package_manager_1.packageManagerUpdateCommand)(packageManager, latest),
+                name: packageManager,
+                prefixColor: "magenta",
+            });
+        }
+        if (!resolvedOptions.skipGo) {
+            actions.push(`updated Go modules with ${latest ? "latest" : "patch"} strategy`);
+            commands.push({
+                command: latest ? "go get -u ./... && go mod tidy" : "go get -u=patch ./... && go mod tidy",
+                name: "go",
+                prefixColor: "green",
+            });
+        }
+        if (resolvedOptions.skipNode) {
+            actions.push("skipped Node dependency update");
+        }
+        if (resolvedOptions.skipGo) {
+            actions.push("skipped Go dependency update");
+        }
+        if (commands.length === 0) {
+            (0, terminal_ui_1.printCommandWarn)("No update targets selected, nothing to do");
+            (0, terminal_ui_1.printCommandSummary)("update", actions.length > 0 ? actions : ["nothing was executed"]);
+            return;
+        }
+        yield (0, concurrently_1.default)(commands).result;
         (0, terminal_ui_1.printCommandSuccess)("update", "Dependency update completed");
         (0, terminal_ui_1.printCommandSummary)("update", actions);
     });

package/src/cli/terminal-ui.js

@@ -11,8 +11,10 @@ exports.printCommandError = printCommandError;
 exports.printCommandLog = printCommandLog;
 exports.printCommandSummary = printCommandSummary;
 const chalk_1 = __importDefault(require("chalk"));
-const TERMINAL_WIDTH = 72;
-function printLine(message, method = "log") {
+const MIN_WIDTH = 60;
+const DEFAULT_WIDTH = 96;
+const INDENT = "  ";
+function printLine(message = "", method = "log") {
     if (method === "warn") {
         console.warn(message);
         return;
@@ -23,8 +25,85 @@ function printLine(message, method = "log") {
     }
     console.log(message);
 }
-function repeat(char, width = TERMINAL_WIDTH) {
-    return char.repeat(width);
+function getTerminalWidth() {
+    const detected = typeof process.stdout.columns === "number" ? process.stdout.columns : 0;
+    return Math.max(MIN_WIDTH, detected || DEFAULT_WIDTH);
+}
+function stripAnsi(value) {
+    return value.replace(/\u001B\[[0-9;]*m/g, "");
+}
+function wrapText(value, width) {
+    const normalized = value.replace(/\r/g, "");
+    const rawLines = normalized.split("\n");
+    const wrapped = [];
+    for (const rawLine of rawLines) {
+        const line = rawLine.trimEnd();
+        if (!line) {
+            wrapped.push("");
+            continue;
+        }
+        let current = "";
+        for (const word of line.split(/\s+/)) {
+            if (!word) {
+                continue;
+            }
+            if (!current) {
+                if (stripAnsi(word).length <= width) {
+                    current = word;
+                    continue;
+                }
+                let remainder = word;
+                while (stripAnsi(remainder).length > width) {
+                    wrapped.push(remainder.slice(0, width));
+                    remainder = remainder.slice(width);
+                }
+                current = remainder;
+                continue;
+            }
+            const candidate = `${current} ${word}`;
+            if (stripAnsi(candidate).length <= width) {
+                current = candidate;
+                continue;
+            }
+            wrapped.push(current);
+            if (stripAnsi(word).length <= width) {
+                current = word;
+                continue;
+            }
+            let remainder = word;
+            while (stripAnsi(remainder).length > width) {
+                wrapped.push(remainder.slice(0, width));
+                remainder = remainder.slice(width);
+            }
+            current = remainder;
+        }
+        if (current) {
+            wrapped.push(current);
+        }
+    }
+    return wrapped;
+}
+function printWrapped(prefix, message, options = {}) {
+    var _a, _b, _c;
+    const method = (_a = options.method) !== null && _a !== void 0 ? _a : "log";
+    const width = getTerminalWidth();
+    const visiblePrefix = stripAnsi(prefix).length;
+    const visibleContinuationPrefix = stripAnsi((_b = options.continuationPrefix) !== null && _b !== void 0 ? _b : prefix).length;
+    const firstWidth = Math.max(12, width - visiblePrefix);
+    const continuationWidth = Math.max(12, width - visibleContinuationPrefix);
+    const lines = wrapText(message, firstWidth);
+    if (lines.length === 0) {
+        printLine(prefix.trimEnd(), method);
+        return;
+    }
+    printLine(`${prefix}${lines[0]}`, method);
+    for (const line of lines.slice(1)) {
+        printLine(`${(_c = options.continuationPrefix) !== null && _c !== void 0 ? _c : " ".repeat(visiblePrefix)}${line}`, method);
+    }
+}
+function divider(color) {
+    const width = Math.max(20, getTerminalWidth() - 2);
+    return color(`┄`.repeat(width));
 }
 function formatClock() {
     return new Date().toLocaleTimeString("en-GB", {
@@ -34,85 +113,79 @@ function formatClock() {
         hour12: false,
     });
 }
-function padText(value, width) {
-    const text = value.length > width ? `${value.slice(0, Math.max(0, width - 1))}…` : value;
-    return text + " ".repeat(Math.max(0, width - text.length));
-}
-function sectionBorder(color) {
-    return color(`╭${repeat("─", TERMINAL_WIDTH - 2)}╮`);
-}
-function sectionFooter(color) {
-    return color(`╰${repeat("─", TERMINAL_WIDTH - 2)}╯`);
-}
-function sectionBody(text, color) {
-    return color(`│ ${padText(text, TERMINAL_WIDTH - 4)} │`);
-}
-function printSection(lines, options) {
-    var _a;
-    if (lines.length === 0) {
-        return;
-    }
-    const method = (_a = options.method) !== null && _a !== void 0 ? _a : "log";
-    printLine(options.color(``), method);
-    printLine(sectionBorder(options.color), method);
-    for (const line of lines) {
-        printLine(sectionBody(line, options.color), method);
-    }
-    printLine(sectionFooter(options.color), method);
-}
 function commandChip(command) {
-    return chalk_1.default.bgBlueBright.black(` ${command.toUpperCase()} `);
-}
-function subtleChip(text) {
-    return chalk_1.default.bgBlackBright.white(` ${text} `);
+    return chalk_1.default.bold.blueBright(`[${command.toUpperCase()}]`);
+}
+function timeChip(text) {
+    return chalk_1.default.gray(`[${text}]`);
+}
+function printBlock(title, subtitle, color, method = "log") {
+    const top = color(`┌ ${title}`);
+    const bodyPrefix = color("│ ");
+    const bottom = color("└");
+    printLine("", method);
+    printLine(top, method);
+    printWrapped(bodyPrefix, subtitle, {
+        method,
+        continuationPrefix: color("│ "),
+    });
+    printLine(bottom, method);
 }
 function printCommandBanner(command, subtitle) {
-    const timestamp = subtleChip(formatClock());
-    const title = `nuxt-gin-tools ${commandChip(command)} ${timestamp}`;
-    const detail = chalk_1.default.cyanBright(subtitle);
-    printLine("");
-    printSection([title, detail], {
-        color: chalk_1.default.blueBright,
-    });
+    const title = `${chalk_1.default.bold("nuxt-gin-tools")} ${commandChip(command)} ${timeChip(formatClock())}`;
+    printBlock(title, chalk_1.default.cyanBright(subtitle), chalk_1.default.blueBright);
 }
 function printCommandSuccess(command, message) {
-    printLine(chalk_1.default.greenBright(`◆ ${chalk_1.default.bold(command)} completed`) + chalk_1.default.green(`  ${message}`));
+    const prefix = `${chalk_1.default.greenBright("◆")} ${chalk_1.default.bold.green(command)} `;
+    const continuationPrefix = `${" ".repeat(stripAnsi(prefix).length)}${INDENT}`;
+    printWrapped(prefix, chalk_1.default.green(message), {
+        continuationPrefix,
+    });
 }
 function printCommandInfo(label, message) {
-    const head = chalk_1.default.bgCyan.black(` ${label.toUpperCase()} `);
-    printLine(`${head} ${chalk_1.default.cyanBright(message)}`);
+    const prefix = `${chalk_1.default.bold.cyan(`[${label.toUpperCase()}]`)} `;
+    const continuationPrefix = `${" ".repeat(stripAnsi(prefix).length)}${INDENT}`;
+    printWrapped(prefix, chalk_1.default.cyanBright(message), {
+        continuationPrefix,
+    });
 }
 function printCommandWarn(message) {
-    printSection([`${chalk_1.default.bold("warning")}  ${message}`], {
-        color: chalk_1.default.yellow,
-        method: "warn",
-    });
+    printBlock(chalk_1.default.bold.yellow("warning"), chalk_1.default.yellow(message), chalk_1.default.yellow, "warn");
 }
 function printCommandError(message, error) {
     const detail = error instanceof Error ? error.message : error !== undefined ? String(error) : "";
-    const lines = [`${chalk_1.default.bold("error")}  ${message}`];
+    printBlock(chalk_1.default.bold.red("error"), chalk_1.default.redBright(message), chalk_1.default.red, "error");
     if (detail) {
-        lines.push(chalk_1.default.redBright(detail));
+        const prefix = `${chalk_1.default.red("│")} `;
+        printWrapped(prefix, chalk_1.default.red(detail), {
+            method: "error",
+            continuationPrefix: prefix,
+        });
+        printLine(chalk_1.default.red("└"), "error");
     }
-    printSection(lines, {
-        color: chalk_1.default.red,
-        method: "error",
-    });
 }
 function printCommandLog(label, message) {
-    const chip = chalk_1.default.bgMagenta.white(` ${label} `);
-    printLine(`${chip} ${chalk_1.default.white(message)}`);
+    const prefix = `${chalk_1.default.bold.magenta(`[${label}]`)} `;
+    const continuationPrefix = `${" ".repeat(stripAnsi(prefix).length)}${INDENT}`;
+    printWrapped(prefix, chalk_1.default.white(message), {
+        continuationPrefix,
+    });
 }
 function printCommandSummary(command, items) {
     const normalizedItems = items.map((item) => item.trim()).filter(Boolean);
     if (normalizedItems.length === 0) {
         return;
     }
-    const lines = [
-        `${chalk_1.default.bold(`${command} summary`)}  ${chalk_1.default.gray(`(${normalizedItems.length} items)`)}`,
-        ...normalizedItems.map((item) => chalk_1.default.magenta(`• ${item}`)),
-    ];
-    printSection(lines, {
-        color: chalk_1.default.magentaBright,
+    printLine("");
+    printLine(divider(chalk_1.default.magentaBright));
+    printWrapped(`${chalk_1.default.magentaBright("■")} `, chalk_1.default.bold.magenta(`${command} summary`) +
+        chalk_1.default.gray(` (${normalizedItems.length} item${normalizedItems.length > 1 ? "s" : ""})`), {
+        continuationPrefix: "  ",
     });
+    for (const item of normalizedItems) {
+        printWrapped(`${chalk_1.default.magenta("•")} `, chalk_1.default.white(item), {
+            continuationPrefix: "  ",
+        });
+    }
+    printLine(divider(chalk_1.default.magentaBright));
 }