zixulu 1.71.3 → 1.71.5

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 = [];
@@ -1423,6 +1468,7 @@ const config = {
     printWidth: 160,
     plugins: ["@1adybug/prettier"],
     controlStatementBraces: "add",
+    multipleLineBraces: "add",
 }
 
 export default config
@@ -1449,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"
@@ -4940,6 +4959,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 配置")));