zixulu 1.71.4 → 1.71.6

package/dist/index.js

@@ -15,8 +15,8 @@ import { createWriteStream, existsSync, readFileSync } from "fs";
 import { homedir, tmpdir } from "os";
 import { parse as toml_parse, stringify } from "@iarna/toml";
 import { writeFile as promises_writeFile } from "node:fs/promises";
-import json5 from "json5";
 import simple_git, { simpleGit } from "simple-git";
+import json5 from "json5";
 import dayjs from "dayjs";
 import clipboardy from "clipboardy";
 import yaml_0 from "yaml";
@@ -1216,6 +1216,51 @@ async function addGitignore() {
     const message = await addRuleToGitIgnore(...addedRules);
     return message;
 }
+async function addHusky(params) {
+    const options = params ?? {};
+    const git = simple_git();
+    const isRepo = await git.checkIsRepo();
+    if (!isRepo) return void consola_0.info("当前目录不是 git 仓库，跳过 husky 配置");
+    if (options.skipConfirm) consola_0.info("已根据外部指令跳过 husky 配置确认");
+    else {
+        const shouldSetupHooks = await shouldContinue("是否配置 husky hooks，在每次 commit 前自动格式化修改的文件？");
+        if (!shouldSetupHooks) return void consola_0.info("已取消 husky 配置");
+    }
+    consola_0.start("开始配置 husky");
+    const huskyConfig = {
+        package: [
+            "husky",
+            "lint-staged"
+        ],
+        type: "devDependencies"
+    };
+    await addDependency(huskyConfig);
+    await installDependceny();
+    try {
+        consola_0.start("初始化 husky");
+        await spawnAsync("bunx husky init");
+        consola_0.success("husky 初始化成功");
+    } catch (error) {
+        consola_0.error("husky 初始化失败", error);
+    }
+    try {
+        consola_0.start("配置 pre-commit hook");
+        const preCommitHook = "npx lint-staged";
+        await writeFile(".husky/pre-commit", preCommitHook, "utf-8");
+        consola_0.success("pre-commit hook 配置成功");
+    } catch (error) {
+        consola_0.error("pre-commit hook 配置失败", error);
+    }
+    const packageJson = await readPackageJson();
+    packageJson["lint-staged"] = {
+        "**/*": "prettier --write --ignore-unknown"
+    };
+    await writePackageJson({
+        data: packageJson
+    });
+    consola_0.success("lint-staged 配置成功");
+    consola_0.success("husky 配置完成");
+}
 async function getFiles_getFiles(options) {
     const { dir = ".", match, count, depth, exclude } = options;
     const result = [];
@@ -1450,48 +1495,21 @@ async function addPrettier() {
     await installDependceny();
     const git = simple_git();
     const isRepo = await git.checkIsRepo();
-    if (isRepo) {
-        consola_0.info("检测到 git 仓库");
-        const shouldSetupHooks = await shouldContinue("是否配置 git hooks，在每次 commit 前自动格式化修改的文件？");
-        if (!shouldSetupHooks) {
-            consola_0.info("跳过 git hooks 配置");
-            consola_0.success("添加 prettier 配置成功");
-            return;
-        }
-        consola_0.start("开始配置 pre-commit hooks");
-        const huskyConfig = {
-            package: [
-                "husky",
-                "lint-staged"
-            ],
-            type: "devDependencies"
-        };
-        await addDependency(huskyConfig);
-        await installDependceny();
-        try {
-            consola_0.start("初始化 husky");
-            await spawnAsync("bunx husky init");
-            consola_0.success("husky 初始化成功");
-        } catch (error) {
-            consola_0.error("husky 初始化失败", error);
-        }
-        try {
-            consola_0.start("配置 pre-commit hook");
-            const preCommitHook = "npx lint-staged";
-            await writeFile(".husky/pre-commit", preCommitHook, "utf-8");
-            consola_0.success("pre-commit hook 配置成功");
-        } catch (error) {
-            consola_0.error("pre-commit hook 配置失败", error);
-        }
-        const packageJson3 = await readPackageJson();
-        packageJson3["lint-staged"] = {
-            "**/*": "prettier --write --ignore-unknown"
-        };
-        await writePackageJson({
-            data: packageJson3
-        });
-        consola_0.success("lint-staged 配置成功");
-    } else consola_0.info("当前目录不是 git 仓库，跳过 git hooks 配置");
+    if (!isRepo) {
+        consola_0.info("当前目录不是 git 仓库，跳过 git hooks 配置");
+        consola_0.success("添加 prettier 配置成功");
+        return;
+    }
+    consola_0.info("检测到 git 仓库");
+    const shouldSetupHooks = await shouldContinue("是否配置 git hooks，在每次 commit 前自动格式化修改的文件？");
+    if (!shouldSetupHooks) {
+        consola_0.info("跳过 git hooks 配置");
+        consola_0.success("添加 prettier 配置成功");
+        return;
+    }
+    await addHusky({
+        skipConfirm: true
+    });
     consola_0.success("添加 prettier 配置成功");
 }
 const prismaFile = `import { PrismaClient } from "@prisma/client"
@@ -4307,6 +4325,16 @@ async function getEditorExtensions({ source }) {
     data = data.filter((item)=>!item.startsWith("anysphere.") && "github.copilot" !== item && "github.copilot-chat" !== item);
     return new Set(data);
 }
+function hasCode() {
+    const userDir = homedir();
+    const path = join(userDir, "AppData/Roaming/Code");
+    return existsSync(path);
+}
+function hasCursor() {
+    const userDir = homedir();
+    const path = join(userDir, "AppData/Roaming/Cursor");
+    return existsSync(path);
+}
 const syncEditorSetting_userDir = homedir();
 const fileSourceMap = {
     settings: {
@@ -4329,8 +4357,12 @@ async function getFile(source) {
 }
 async function syncEditorFile({ source, target }) {
     const { dir, base } = parse(target);
+    await mkdir(dir, {
+        recursive: true
+    });
     const setting = await readZixuluSetting();
-    const code = await getFile(source);
+    let code = await getFile(source);
+    if (target === fileSourceMap.settings.Code) code = code.replace(/\n^ *"extensions\.gallery\.serviceUrl":.+,?$/m, "");
     if (existsSync(target)) {
         const text = await readFile(target, "utf-8");
         if (text === code) return void consola_0.success(`${target} 已是最新`);
@@ -4354,36 +4386,31 @@ async function syncEditorFile({ source, target }) {
 }
 async function syncEditorSetting() {
     const setting = await readZixuluSetting();
+    const sourceChoices = [
+        "Online"
+    ];
+    if (hasCode()) sourceChoices.unshift("Code");
+    if (hasCursor()) sourceChoices.unshift("Cursor");
     const { source } = await inquirer_0.prompt([
         {
             type: "list",
             name: "source",
             message: "选择同步来源",
-            choices: [
-                "Code",
-                "Cursor",
-                "Online"
-            ],
+            choices: sourceChoices,
             default: setting.syncEditor?.source ?? "Cursor"
         }
     ]);
     setting.syncEditor ??= {};
     setting.syncEditor.source = source;
+    const targetChoices = sourceChoices.filter((v)=>v !== source);
+    if (0 === targetChoices.length) return consola_0.info("没有可同步的目标");
     const { targets, types } = await inquirer_0.prompt([
         {
             type: "checkbox",
             name: "targets",
             message: "选择同步目标",
-            choices: [
-                "Code",
-                "Cursor",
-                "Online"
-            ].filter((v)=>v !== source),
-            default: (setting.syncEditor?.targets ?? [
-                "Code",
-                "Cursor",
-                "Online"
-            ]).filter((v)=>v !== source)
+            choices: targetChoices,
+            default: setting.syncEditor?.targets?.filter((item)=>targetChoices.includes(item)) ?? targetChoices
         },
         {
             type: "checkbox",
@@ -4407,11 +4434,12 @@ async function syncEditorSetting() {
         const { onlinePath } = await inquirer_0.prompt({
             type: "input",
             name: "onlinePath",
-            message: "请输入 blog 文件夹的路径",
-            default: setting.syncEditor?.onlinePath ?? "C:\\Users\\lenovo\\Desktop\\workspace\\blog"
+            message: "请输入 blog 文件夹的路径（留空则跳过）",
+            default: setting.syncEditor?.onlinePath
         });
-        setting.syncEditor.onlinePath = onlinePath;
+        setting.syncEditor.onlinePath = onlinePath.trim() ?? void 0;
     }
+    if (!setting.syncEditor.onlinePath) setting.syncEditor.targets = targets.filter((v)=>"Online" !== v);
     const onlinePath = setting.syncEditor.onlinePath;
     const configs = types.filter((item)=>"extensions" !== item).map((fileType)=>targets.map((target)=>({
                 source: fileSourceMap[fileType][source],
@@ -4464,6 +4492,9 @@ async function syncEditorSetting() {
         if (targets.includes("Online")) await writeFile(join(onlinePath, "static", "extensions.json"), JSON.stringify(Array.from(sourceExtensions), null, 4));
     }
     if (targets.includes("Online")) {
+        await execAsync("npm run format", {
+            cwd: onlinePath
+        });
         if (await hasChangeNoCommit(onlinePath)) {
             await addGitCommit({
                 message: getCommitMessage("feature", "sync editor setting"),
@@ -4548,7 +4579,7 @@ async function syncVscode() {
     if (0 === options.length) return;
     const userDir = homedir();
     const snippetSource = join(userDir, "AppData/Roaming/Code/User/snippets");
-    const setting = join(userDir, "AppData/Roaming/Code/User/settings.json");
+    const setting = (await readFile(join(userDir, "AppData/Roaming/Code/User/settings.json"), "utf-8")).replace(/}[ \n\r]*$/, `    "chat.disableAIFeatures": true,\n}`);
     const dir = `vscode-${dayjs().format("YYYYMMDDHHmmss")}`;
     try {
         await mkdir(dir, {
@@ -4560,7 +4591,7 @@ async function syncVscode() {
                 recursive: true
             });
             consola_0.start("开始下载最新 VSCode 配置");
-            await copyFile(setting, join(dir, "settings.json"));
+            await writeFile(join(dir, "settings.json"), setting, "utf-8");
             const files = await readdir(snippetSource);
             for (const file of files)await copyFile(join(snippetSource, file), join(snippetTarget, file));
             consola_0.success("下载最新 VSCode 配置完成");
@@ -4941,6 +4972,7 @@ program.name("格数科技").version(src_pkg.version);
 console.log(chalk.redBright.bold(`zixulu ${src_pkg.version}`));
 program.command("eslint").description("添加 ESLint 相关配置").action(actionWithBackup(addEslint, getCommitMessage("feature", "添加 ESLint 相关配置")));
 program.command("prettier").description("添加 prettier 配置").action(actionWithBackup(addPrettier, getCommitMessage("feature", "添加 prettier 配置文件")));
+program.command("husky").description("添加 husky 配置").action(actionWithBackup(addHusky, getCommitMessage("feature", "添加 husky 配置")));
 program.command("vite").description("初始化 vite 配置").action(actionWithBackup(vite, getCommitMessage("feature", "初始化 vite 配置")));
 program.command("rsbuild").description("初始化 rsbuild 配置").action(actionWithBackup(rsbuild, getCommitMessage("feature", "初始化 rsbuild 配置")));
 program.command("next").description("初始化 next 配置").action(actionWithBackup(next_next, getCommitMessage("feature", "初始化 next 配置")));