zixulu 1.79.1 → 1.79.2

package/dist/index.js

@@ -1727,8 +1727,90 @@ main()
     });
     return getCommitMessage("feature", "添加同步包脚本");
 }
+const regexPlaceholders = [
+    {
+        token: "__SPACE__",
+        value: " "
+    },
+    {
+        token: "__CARET__",
+        value: "^"
+    },
+    {
+        token: "__DOLLAR__",
+        value: "$"
+    },
+    {
+        token: "__PIPE__",
+        value: "|"
+    },
+    {
+        token: "__AMPERSAND__",
+        value: "&"
+    },
+    {
+        token: "__SEMICOLON__",
+        value: ";"
+    },
+    {
+        token: "__LPAREN__",
+        value: "("
+    },
+    {
+        token: "__RPAREN__",
+        value: ")"
+    },
+    {
+        token: "__LBRACE__",
+        value: "{"
+    },
+    {
+        token: "__RBRACE__",
+        value: "}"
+    },
+    {
+        token: "__LBRACKET__",
+        value: "["
+    },
+    {
+        token: "__RBRACKET__",
+        value: "]"
+    },
+    {
+        token: "__SQUOTE__",
+        value: "'"
+    },
+    {
+        token: "__DQUOTE__",
+        value: '"'
+    },
+    {
+        token: "__BACKTICK__",
+        value: "`"
+    },
+    {
+        token: "__AT__",
+        value: "@"
+    },
+    {
+        token: "__LT__",
+        value: "<"
+    },
+    {
+        token: "__GT__",
+        value: ">"
+    },
+    {
+        token: "__BACKSLASH__",
+        value: "\\"
+    }
+];
+const regexPlaceholderHint = "特殊字符请使用 __XXX__ 占位符，例如 __CARET__、__DOLLAR__、__PIPE__、__LPAREN__、__RPAREN__、__AMPERSAND__、__SPACE__";
+function preprocessPlaceholderText(text) {
+    return regexPlaceholders.reduce((result, placeholder)=>result.split(placeholder.token).join(placeholder.value), text);
+}
 function preprocessRegex(reg) {
-    return reg.replace(/\{\{CARET\}\}/g, "^");
+    return preprocessPlaceholderText(reg);
 }
 async function addTag({ reg, flags, replacement, push, remote = "origin", force }) {
     const git = simpleGit();
@@ -1737,8 +1819,9 @@ async function addTag({ reg, flags, replacement, push, remote = "origin", force
     const status = await git.status();
     if (status.files.length > 0) return void external_consola_consola.error("当前 Git 仓库存在未提交的文件，请先提交或暂存这些文件");
     const processedReg = preprocessRegex(reg);
+    const processedReplacement = preprocessPlaceholderText(replacement);
     external_consola_consola.info(`正则表达式: /${processedReg}/${flags ?? ""}`);
-    external_consola_consola.info(`替换字符串: ${replacement}`);
+    external_consola_consola.info(`替换字符串: ${processedReplacement}`);
     const cont = await shouldContinue("是否继续？");
     if (!cont) return void external_consola_consola.info("操作已取消");
     const log = await git.log();
@@ -1751,7 +1834,7 @@ async function addTag({ reg, flags, replacement, push, remote = "origin", force
     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);
+            const tagName = commit.message.replace(new RegExp(processedReg, flags), processedReplacement);
             if (tagName && tagName.trim()) tagsToAdd.push({
                 hash: commit.hash,
                 message: commit.message,
@@ -3623,10 +3706,11 @@ async function replaceCommitMessage({ reg, replace, flags, push, remote = "origi
         "HEAD"
     ]);
     const processedReg = preprocessRegex(reg);
+    const processedReplace = preprocessPlaceholderText(replace);
     external_consola_consola.warn("⚠️  警告：此操作将重写 Git 历史，建议先备份");
     external_consola_consola.info(`目标分支: ${currentBranch}`);
     external_consola_consola.info(`正则表达式: /${processedReg}/${flags ?? ""}`);
-    external_consola_consola.info(`替换字符串: ${replace}`);
+    external_consola_consola.info(`替换字符串: ${processedReplace}`);
     const cont = await shouldContinue("⚠️ 是否继续？此操作将重写 Git 历史");
     if (!cont) return void external_consola_consola.info("操作已取消");
     const logResult = await git.log([
@@ -3637,7 +3721,7 @@ async function replaceCommitMessage({ reg, replace, flags, push, remote = "origi
     const tempScriptPath = join(tmpdir(), `git-msg-filter-${Date.now()}.js`);
     const scriptContent = `
 const reg = ${JSON.stringify(processedReg)}
-const replace = ${JSON.stringify(replace)}
+const replace = ${JSON.stringify(processedReplace)}
 const flags = ${JSON.stringify(flags ?? "")}
 
 let input = ""
@@ -3698,8 +3782,9 @@ async function replaceTag({ reg, replace, flags, push, remote = "origin" }) {
     const status = await git.status();
     if (status.files.length > 0) return void external_consola_consola.error("当前 Git 仓库存在未提交的文件，请先提交或暂存这些文件");
     const processedReg = preprocessRegex(reg);
+    const processedReplace = preprocessPlaceholderText(replace);
     external_consola_consola.info(`正则表达式: /${processedReg}/${flags ?? ""}`);
-    external_consola_consola.info(`替换字符串: ${replace}`);
+    external_consola_consola.info(`替换字符串: ${processedReplace}`);
     const cont = await shouldContinue("是否继续？");
     if (!cont) return void external_consola_consola.info("操作已取消");
     const tags = await git.tags();
@@ -3709,7 +3794,7 @@ async function replaceTag({ reg, replace, flags, push, remote = "origin" }) {
     const operations = [];
     for (const tag of allTags){
         const regexp = new RegExp(processedReg, flags);
-        const newTag = tag.replace(regexp, replace);
+        const newTag = tag.replace(regexp, processedReplace);
         if (newTag !== tag) operations.push({
             oldTag: tag,
             newTag
@@ -6088,7 +6173,7 @@ program.command("sync-cursor-ext-to-code").alias("sce2c").description("同步 cu
 program.command("create-prisma-debugger").alias("cpd").description("创建 prisma 调试器").action(createPrismaDebugger);
 program.command("verdaccio").description("同步 verdaccio 配置").action(verdaccio);
 program.command("sync-agent-rules").alias("sar").description("同步 Agent 规则").action(actionWithBackup(asyncAgentRules));
-program.command("replace-tag").alias("rt").description("替换所有 git tag (正则中可用 {{CARET}} 代替 ^)").argument("regexp", "正则表达式字符串").argument("[replace]", "替换字符串，默认为空字符串").option("-f, --flags <flags>", "正则表达式标志，如 i、g、m 等").option("-p, --push", "是否推送到远程仓库").option("-r, --remote <remote>", "远程仓库名称，默认为 origin").action(async (regexp, replace, options)=>{
+program.command("replace-tag").alias("rt").description(`替换所有 git tag (${regexPlaceholderHint})`).argument("regexp", "正则表达式字符串").argument("[replace]", "替换字符串，默认为空字符串").option("-f, --flags <flags>", "正则表达式标志，如 i、g、m 等").option("-p, --push", "是否推送到远程仓库").option("-r, --remote <remote>", "远程仓库名称，默认为 origin").action(async (regexp, replace, options)=>{
     await replaceTag({
         reg: regexp,
         replace: replace ?? "",
@@ -6097,7 +6182,7 @@ program.command("replace-tag").alias("rt").description("替换所有 git tag (
         remote: options.remote
     });
 });
-program.command("remove-tag").alias("rmt").description("删除匹配的 git tag (正则中可用 {{CARET}} 代替 ^)").argument("regexp", "正则表达式字符串").option("-f, --flags <flags>", "正则表达式标志，如 i、g、m 等").option("-p, --push", "是否同时删除远程仓库的 tag").option("-r, --remote <remote>", "远程仓库名称，默认为 origin").action(async (regexp, options)=>{
+program.command("remove-tag").alias("rmt").description(`删除匹配的 git tag (${regexPlaceholderHint})`).argument("regexp", "正则表达式字符串").option("-f, --flags <flags>", "正则表达式标志，如 i、g、m 等").option("-p, --push", "是否同时删除远程仓库的 tag").option("-r, --remote <remote>", "远程仓库名称，默认为 origin").action(async (regexp, options)=>{
     await removeTag({
         reg: regexp,
         flags: options.flags,
@@ -6105,7 +6190,7 @@ program.command("remove-tag").alias("rmt").description("删除匹配的 git tag
         remote: options.remote
     });
 });
-program.command("add-tag").alias("adt").description("为匹配的 commit 添加 git tag (正则中可用 {{CARET}} 代替 ^)").argument("regexp", "用于匹配 commit message 的正则表达式字符串").argument("replacement", "用于生成 tag 名称的替换字符串").option("-f, --flags <flags>", "正则表达式标志，如 i、g、m 等").option("-p, --push", "是否推送到远程仓库").option("-r, --remote <remote>", "远程仓库名称，默认为 origin").option("--force", "是否覆盖已存在的 tag").action(async (regexp, replacement, options)=>{
+program.command("add-tag").alias("adt").description(`为匹配的 commit 添加 git tag (${regexPlaceholderHint})`).argument("regexp", "用于匹配 commit message 的正则表达式字符串").argument("replacement", "用于生成 tag 名称的替换字符串").option("-f, --flags <flags>", "正则表达式标志，如 i、g、m 等").option("-p, --push", "是否推送到远程仓库").option("-r, --remote <remote>", "远程仓库名称，默认为 origin").option("--force", "是否覆盖已存在的 tag").action(async (regexp, replacement, options)=>{
     await addTag({
         reg: regexp,
         replacement,
@@ -6115,7 +6200,7 @@ program.command("add-tag").alias("adt").description("为匹配的 commit 添加
         force: options.force
     });
 });
-program.command("replace-commit-message").alias("rcm").description("替换所有提交消息（⚠️ 会重写 Git 历史，正则中可用 {{CARET}} 代替 ^）").argument("regexp", "正则表达式字符串").argument("[replace]", "替换字符串，默认为空字符串").option("-f, --flags <flags>", "正则表达式标志，如 g、i 等（注意：sed 语法）").option("-p, --push", "是否强制推送到远程仓库").option("-r, --remote <remote>", "远程仓库名称，默认为 origin").option("-b, --branch <branch>", "分支名称，默认为当前分支").action(async (regexp, replace, options)=>{
+program.command("replace-commit-message").alias("rcm").description(`替换所有提交消息（⚠️ 会重写 Git 历史，${regexPlaceholderHint}）`).argument("regexp", "正则表达式字符串").argument("[replace]", "替换字符串，默认为空字符串").option("-f, --flags <flags>", "正则表达式标志，如 g、i 等（注意：sed 语法）").option("-p, --push", "是否强制推送到远程仓库").option("-r, --remote <remote>", "远程仓库名称，默认为 origin").option("-b, --branch <branch>", "分支名称，默认为当前分支").action(async (regexp, replace, options)=>{
     await replaceCommitMessage({
         reg: regexp,
         replace: replace ?? "",