zixulu 1.71.0 → 1.71.1

package/dist/index.js

@@ -1422,6 +1422,7 @@ const config = {
     endOfLine: "lf",
     printWidth: 160,
     plugins: ["./prettier-plugin-sort-imports.mjs"],
+    controlStatementBraces: "add",
 }
 
 export default config
@@ -1432,6 +1433,7 @@ function getPluginConfig({ isTailwind, isReact }) {
 import { readFileSync } from "fs"
 import { builtinModules } from "module"
 
+import removeBraces from "@1adybug/prettier-plugin-remove-braces"
 import { createPlugin } from "@1adybug/prettier-plugin-sort-imports"
 import JSON5 from "json5"
 import blockPadding from "prettier-plugin-block-padding"${isTailwind ? `
@@ -1513,7 +1515,7 @@ ${isReact ? `
     separator: "",
     sortSideEffect: true,
     removeUnusedImports: true,
-    otherPlugins: [blockPadding${isTailwind ? ", tailwindcss" : ""}],
+    otherPlugins: [blockPadding${isTailwind ? ", tailwindcss" : ""}, removeBraces],
 })
 `;
     return config;
@@ -1548,6 +1550,50 @@ async function addPrettier() {
         data: packageJson2
     });
     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 = "bunx 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 配置");
     consola_0.success("添加 prettier 配置成功");
 }
 const prismaFile = `import { PrismaClient } from "@prisma/client"
@@ -1855,6 +1901,75 @@ main()
     });
     return getCommitMessage("feature", "添加同步包脚本");
 }
+function preprocessRegex(reg) {
+    return reg.replace(/\{\{CARET\}\}/g, "^");
+}
+async function addTag({ reg, flags, replacement, push, remote = "origin", force }) {
+    const git = simpleGit();
+    const isRepo = await git.checkIsRepo();
+    if (!isRepo) return void consola.error("当前目录不是 git 仓库");
+    const status = await git.status();
+    if (status.files.length > 0) return void consola.error("当前 Git 仓库存在未提交的文件，请先提交或暂存这些文件");
+    const processedReg = preprocessRegex(reg);
+    consola.info(`正则表达式: /${processedReg}/${flags ?? ""}`);
+    consola.info(`替换字符串: ${replacement}`);
+    const cont = await shouldContinue("是否继续？");
+    if (!cont) return void consola.info("操作已取消");
+    const log = await git.log();
+    const commits = log.all;
+    if (0 === commits.length) return void consola.warn("当前仓库没有任何 commit");
+    consola.info(`找到 ${commits.length} 个 commit`);
+    const existingTags = await git.tags();
+    const allExistingTags = new Set(existingTags.all);
+    const tagsToAdd = [];
+    for (const commit of commits){
+        const regexp = new RegExp(processedReg, flags);
+        if (regexp.test(commit.message)) {
+            const tagName = commit.message.replace(new RegExp(processedReg, flags), replacement);
+            if (tagName && tagName.trim()) tagsToAdd.push({
+                hash: commit.hash,
+                message: commit.message,
+                tagName: tagName.trim()
+            });
+        }
+    }
+    if (0 === tagsToAdd.length) return void consola.warn("没有匹配的 commit 需要添加 tag");
+    consola.info(`将要为 ${tagsToAdd.length} 个 commit 添加 tag`);
+    for (const { hash, message, tagName } of tagsToAdd)try {
+        if (allExistingTags.has(tagName)) if (force) {
+            await git.tag([
+                "-d",
+                tagName
+            ]);
+            consola.info(`删除已存在的 tag: ${tagName}`);
+        } else {
+            consola.warn(`tag ${tagName} 已存在，跳过 (使用 force 选项可覆盖)`);
+            continue;
+        }
+        await git.tag([
+            tagName,
+            hash
+        ]);
+        consola.success(`本地: 为 commit ${hash.substring(0, 7)} (${message.substring(0, 50)}...) 添加 tag ${tagName}`);
+        if (push) try {
+            const pushArgs = force ? [
+                remote,
+                tagName,
+                "--force"
+            ] : [
+                remote,
+                tagName
+            ];
+            await git.push(pushArgs);
+            consola.success(`远程: 推送 tag ${tagName}`);
+        } catch (error) {
+            consola.error(`推送 tag ${tagName} 到远程失败:`, error);
+        }
+    } catch (error) {
+        consola.error(`为 commit ${hash} 添加 tag ${tagName} 失败:`, error);
+    }
+    consola.success("所有匹配的 tag 添加完成");
+}
 const postcssConfig = `// @ts-check
 
 /** @type {import("postcss-load-config").Config} */
@@ -2013,75 +2128,6 @@ async function addTailwind() {
     await addPrettier();
     consola_0.success("添加 tailwind 配置成功");
 }
-function preprocessRegex(reg) {
-    return reg.replace(/\{\{CARET\}\}/g, "^");
-}
-async function addTag({ reg, flags, replacement, push, remote = "origin", force }) {
-    const git = simpleGit();
-    const isRepo = await git.checkIsRepo();
-    if (!isRepo) return void consola.error("当前目录不是 git 仓库");
-    const status = await git.status();
-    if (status.files.length > 0) return void consola.error("当前 Git 仓库存在未提交的文件，请先提交或暂存这些文件");
-    const processedReg = preprocessRegex(reg);
-    consola.info(`正则表达式: /${processedReg}/${flags ?? ""}`);
-    consola.info(`替换字符串: ${replacement}`);
-    const cont = await shouldContinue("是否继续？");
-    if (!cont) return void consola.info("操作已取消");
-    const log = await git.log();
-    const commits = log.all;
-    if (0 === commits.length) return void consola.warn("当前仓库没有任何 commit");
-    consola.info(`找到 ${commits.length} 个 commit`);
-    const existingTags = await git.tags();
-    const allExistingTags = new Set(existingTags.all);
-    const tagsToAdd = [];
-    for (const commit of commits){
-        const regexp = new RegExp(processedReg, flags);
-        if (regexp.test(commit.message)) {
-            const tagName = commit.message.replace(new RegExp(processedReg, flags), replacement);
-            if (tagName && tagName.trim()) tagsToAdd.push({
-                hash: commit.hash,
-                message: commit.message,
-                tagName: tagName.trim()
-            });
-        }
-    }
-    if (0 === tagsToAdd.length) return void consola.warn("没有匹配的 commit 需要添加 tag");
-    consola.info(`将要为 ${tagsToAdd.length} 个 commit 添加 tag`);
-    for (const { hash, message, tagName } of tagsToAdd)try {
-        if (allExistingTags.has(tagName)) if (force) {
-            await git.tag([
-                "-d",
-                tagName
-            ]);
-            consola.info(`删除已存在的 tag: ${tagName}`);
-        } else {
-            consola.warn(`tag ${tagName} 已存在，跳过 (使用 force 选项可覆盖)`);
-            continue;
-        }
-        await git.tag([
-            tagName,
-            hash
-        ]);
-        consola.success(`本地: 为 commit ${hash.substring(0, 7)} (${message.substring(0, 50)}...) 添加 tag ${tagName}`);
-        if (push) try {
-            const pushArgs = force ? [
-                remote,
-                tagName,
-                "--force"
-            ] : [
-                remote,
-                tagName
-            ];
-            await git.push(pushArgs);
-            consola.success(`远程: 推送 tag ${tagName}`);
-        } catch (error) {
-            consola.error(`推送 tag ${tagName} 到远程失败:`, error);
-        }
-    } catch (error) {
-        consola.error(`为 commit ${hash} 添加 tag ${tagName} 失败:`, error);
-    }
-    consola.success("所有匹配的 tag 添加完成");
-}
 const zipDistContent = `// @ts-check
 import { rm } from "fs/promises"
 import { zip } from "soda-nodejs"
@@ -3525,6 +3571,48 @@ async function removeLock() {
     await addRuleToGitIgnore("package-lock.json", "yarn.lock", "pnpm-lock.yaml", "bun.lockb", "bun.lock");
     return getCommitMessage("feature", "删除包管理 lock 文件");
 }
+async function removeTag({ reg, flags, push, remote = "origin" }) {
+    const git = simpleGit();
+    const isRepo = await git.checkIsRepo();
+    if (!isRepo) return void consola.error("当前目录不是 git 仓库");
+    const status = await git.status();
+    if (status.files.length > 0) return void consola.error("当前 Git 仓库存在未提交的文件，请先提交或暂存这些文件");
+    const processedReg = preprocessRegex(reg);
+    consola.info(`正则表达式: /${processedReg}/${flags ?? ""}`);
+    const cont = await shouldContinue("是否继续？");
+    if (!cont) return void consola.info("操作已取消");
+    const tags = await git.tags();
+    const allTags = tags.all;
+    if (0 === allTags.length) return void consola.warn("当前仓库没有任何 tag");
+    consola.info(`找到 ${allTags.length} 个 tag`);
+    const tagsToRemove = [];
+    for (const tag of allTags){
+        const regexp = new RegExp(processedReg, flags);
+        if (regexp.test(tag)) tagsToRemove.push(tag);
+    }
+    if (0 === tagsToRemove.length) return void consola.warn("没有匹配的 tag 需要删除");
+    consola.info(`将要删除 ${tagsToRemove.length} 个 tag`);
+    for (const tag of tagsToRemove)try {
+        await git.tag([
+            "-d",
+            tag
+        ]);
+        consola.success(`本地: 删除 ${tag}`);
+        if (push) try {
+            await git.push([
+                remote,
+                "--delete",
+                tag
+            ]);
+            consola.success(`远程: 删除 ${tag}`);
+        } catch (error) {
+            consola.warn(`远程可能不存在 ${tag}，跳过删除`);
+        }
+    } catch (error) {
+        consola.error(`删除 ${tag} 失败:`, error);
+    }
+    consola.success("所有匹配的 tag 删除完成");
+}
 function isAsset(url) {
     const lower = url.toLowerCase();
     return lower.endsWith(".svg") || lower.endsWith(".png") || lower.endsWith(".jpg") || lower.endsWith(".jpeg") || lower.endsWith(".gif") || lower.endsWith(".webp") || lower.endsWith(".ico") || lower.endsWith(".ttf") || lower.endsWith(".woff") || lower.endsWith(".woff2") || lower.endsWith(".css") || lower.endsWith(".js") || lower.endsWith(".json") || lower.includes("/img/") || lower.includes("/file/") || lower.includes("/assets/");
@@ -3768,48 +3856,6 @@ process.stdin.on("end", () => {
         } catch  {}
     }
 }
-async function removeTag({ reg, flags, push, remote = "origin" }) {
-    const git = simpleGit();
-    const isRepo = await git.checkIsRepo();
-    if (!isRepo) return void consola.error("当前目录不是 git 仓库");
-    const status = await git.status();
-    if (status.files.length > 0) return void consola.error("当前 Git 仓库存在未提交的文件，请先提交或暂存这些文件");
-    const processedReg = preprocessRegex(reg);
-    consola.info(`正则表达式: /${processedReg}/${flags ?? ""}`);
-    const cont = await shouldContinue("是否继续？");
-    if (!cont) return void consola.info("操作已取消");
-    const tags = await git.tags();
-    const allTags = tags.all;
-    if (0 === allTags.length) return void consola.warn("当前仓库没有任何 tag");
-    consola.info(`找到 ${allTags.length} 个 tag`);
-    const tagsToRemove = [];
-    for (const tag of allTags){
-        const regexp = new RegExp(processedReg, flags);
-        if (regexp.test(tag)) tagsToRemove.push(tag);
-    }
-    if (0 === tagsToRemove.length) return void consola.warn("没有匹配的 tag 需要删除");
-    consola.info(`将要删除 ${tagsToRemove.length} 个 tag`);
-    for (const tag of tagsToRemove)try {
-        await git.tag([
-            "-d",
-            tag
-        ]);
-        consola.success(`本地: 删除 ${tag}`);
-        if (push) try {
-            await git.push([
-                remote,
-                "--delete",
-                tag
-            ]);
-            consola.success(`远程: 删除 ${tag}`);
-        } catch (error) {
-            consola.warn(`远程可能不存在 ${tag}，跳过删除`);
-        }
-    } catch (error) {
-        consola.error(`删除 ${tag} 失败:`, error);
-    }
-    consola.success("所有匹配的 tag 删除完成");
-}
 async function replaceTag({ reg, replace, flags, push, remote = "origin" }) {
     const git = simpleGit();
     const isRepo = await git.checkIsRepo();