zixulu 1.80.7 → 1.81.0

package/dist/index.js

@@ -130,15 +130,6 @@ var constant_Software = /*#__PURE__*/ function(Software) {
     Software["PowerShell"] = "PowerShell";
     return Software;
 }({});
-const CommitTypeMap = {
-    ["feature"]: "✨feature: ",
-    ["fix"]: "🐞 fix: ",
-    ["docs"]: "📄 docs: ",
-    ["wip"]: "🖥️ wip: ",
-    ["perfs"]: "🚅 perfs: ",
-    ["rollback"]: "⏪ rollback: ",
-    ["other"]: "🔵 other: "
-};
 const agent = await checkPort(7890, "127.0.0.1") ? void 0 : new HttpsProxyAgent("http://127.0.0.1:7890");
 const addedRules = [
     "package-lock.json",
@@ -669,11 +660,11 @@ export function useDelete${type}<TContext = never>({ onMutate, onSuccess, onErro
     if (items.includes("delete")) await addApi_writeFile(join(hook, `useDelete${type}.ts`), useDelete);
 }
 function getCommitMessage(type, message) {
-    return `${CommitTypeMap[type]}${message}`;
+    return `${type}: ${message}`;
 }
 async function addRuleToGitIgnore(...rules) {
     const dir = await readdir(".");
-    const message = getCommitMessage("feature", `添加 .gitignore 规则 ${rules.join(", ")}`);
+    const message = getCommitMessage("feat", `添加 .gitignore 规则 ${rules.join(", ")}`);
     if (!dir.includes(".gitignore")) {
         await writeFile(".gitignore", rules.join("\n"), "utf-8");
         return message;
@@ -1081,7 +1072,7 @@ async function installDependceny(config) {
     return true;
 }
 async function addEslint() {
-    await writeFile("eslint.config.mjs", `export { default } from "@1adybug/eslint"\n`);
+    await writeFile("eslint.config.mjs", `// eslint-disable-next-line n/no-unpublished-import\nexport { default } from "@1adybug/eslint"\n`);
     const packages = [
         {
             packageName: "eslint",
@@ -1097,7 +1088,7 @@ async function addEslint() {
     await addScript({
         lint: "eslint ."
     });
-    return getCommitMessage("feature", "add eslint");
+    return getCommitMessage("feat", "add eslint");
 }
 async function addGitAttributes() {
     await writeFile(".gitattributes", `# 将所有文本文件在提交到 Git 仓库时，自动转换为 LF 换行符
@@ -1308,7 +1299,7 @@ async function replacePathAlias() {
         });
         await writeFile(file, code, "utf-8");
     }
-    return getCommitMessage("feature", "replace path alias");
+    return getCommitMessage("feat", "replace path alias");
 }
 async function addFolderPathAlias() {
     const { folder } = await inquirer_0.prompt({
@@ -1336,11 +1327,11 @@ async function addFolderPathAlias() {
             name: item,
             path: getRelativePath_getRelativePath(join(folder, item))
         })));
-    return getCommitMessage("feature", `add path alias: ${result.join(", ")}`);
+    return getCommitMessage("feat", `add path alias: ${result.join(", ")}`);
 }
 async function addRuleToPrettierIgnore(...rules) {
     const dir = await readdir(".");
-    const message = getCommitMessage("feature", `添加 .prettierignore 规则 ${rules.join(", ")}`);
+    const message = getCommitMessage("feat", `添加 .prettierignore 规则 ${rules.join(", ")}`);
     if (!dir.includes(".prettierignore")) {
         await writeFile(".prettierignore", rules.join("\n"), "utf-8");
         return message;
@@ -1379,6 +1370,7 @@ const config = {
     controlStatementBraces: "add",
     multiLineBraces: "add",
     nodeProtocol: "add",
+    markTypeOnlyImports: true,
 }
 
 export default config
@@ -1398,7 +1390,7 @@ async function addPrettier() {
     const packageJson2 = await readPackageJson();
     packageJson2.scripts ??= {};
     packageJson2.scripts.format = "prettier --write .";
-    packageJson2.scripts.fg = 'npm run format && git add . && git commit -m "✨feature: format"';
+    packageJson2.scripts.fg = 'npm run format && git add . && git commit -m "feat: format"';
     await writePackageJson({
         data: packageJson2
     });
@@ -1635,7 +1627,7 @@ async function addStartScript({ type, pemPath, port, core, hostname }) {
     });
     consola.success("已添加启动命令 start");
     await installDependceny();
-    return getCommitMessage("feature", "添加启动命令");
+    return getCommitMessage("feat", "添加启动命令");
 }
 async function addSyncPackageScript({ monorepo } = {}) {
     let dir;
@@ -1725,7 +1717,7 @@ main()
     await writePackageJson({
         data: packageJson
     });
-    return getCommitMessage("feature", "添加同步包脚本");
+    return getCommitMessage("feat", "添加同步包脚本");
 }
 const regexPlaceholders = [
     {
@@ -2565,7 +2557,7 @@ async function addZipDist({ install } = {}) {
         data: packageJson
     });
     if (install) await installDependceny();
-    return getCommitMessage("feature", "添加压缩脚本");
+    return getCommitMessage("feat", "添加压缩脚本");
 }
 function getTypeInGenerics(str, start = 0) {
     if ("<" !== str[start]) throw new Error("无效的泛型");
@@ -3969,7 +3961,7 @@ async function removeLock() {
         recursive: true
     });
     await addRuleToGitIgnore("package-lock.json", "yarn.lock", "pnpm-lock.yaml", "bun.lockb", "bun.lock");
-    return getCommitMessage("feature", "删除包管理 lock 文件");
+    return getCommitMessage("feat", "删除包管理 lock 文件");
 }
 async function removeTag({ reg, flags, push, remote = "origin" }) {
     const git = simpleGit();
@@ -4788,26 +4780,22 @@ async function sortPackageJson() {
     });
     consola.success("排序 package.json 中的依赖成功");
 }
-const AgentRulesSyncTarget = {
-    agentsMd: "AGENTS.md",
-    cursor: "Cursor",
-    antiGravity: "AntiGravity"
-};
-const syncAgentRules_source = join(".cursor-rules");
-const cursorRulesTarget = join(".cursor", "rules");
-const antiGravityRulesTarget = join(".agent", "rules");
+const syncAgentRules_source = join(".agent-rules");
+const agentsMdTarget = "AGENTS.md";
 const orders = [
-    "base.mdc",
-    "react.mdc",
-    "api.mdc",
-    "next.mdc"
+    "base.md",
+    "style.md",
+    "react.md",
+    "api.md",
+    "next.md"
 ];
-function getDefaultSyncTargets() {
-    const targets = [];
-    if (existsSync("AGENTS.md")) targets.push(AgentRulesSyncTarget.agentsMd);
-    if (existsSync(".cursor")) targets.push(AgentRulesSyncTarget.cursor);
-    if (existsSync(".agent")) targets.push(AgentRulesSyncTarget.antiGravity);
-    return targets;
+async function pathExists(path) {
+    try {
+        await access(path);
+        return true;
+    } catch  {
+        return false;
+    }
 }
 function sortAgentRuleFiles(files) {
     return files.toSorted((a, b)=>{
@@ -4819,72 +4807,70 @@ function sortAgentRuleFiles(files) {
         return aIndex - bIndex;
     });
 }
-function transformCursorRuleToAntiGravityRule(source) {
-    return source.replace(/^---\nalwaysApply: (true|false)\n---/, (match, p1)=>`---
-trigger: ${"true" === p1 ? "always_on" : "model_decision"}
-glob:
-description:
----`);
+function normalizeMarkdownHeading(heading) {
+    return heading.replace(/\s+#+$/, "").trim().toLocaleLowerCase();
 }
-function transformCursorRuleToAgentsRule(source) {
-    return source.replace(/^---\nalwaysApply: (true|false)\n---/, "").replace(/^(#+ )/gm, "#$1");
+function getMarkdownHeadings(content, level) {
+    const hashes = "#".repeat(level);
+    const regexp = new RegExp(`^${hashes}(?!#)\\s+(.+?)\\s*$`, "gm");
+    return Array.from(content.matchAll(regexp), ([, heading])=>heading.replace(/\s+#+$/, "").trim());
 }
-async function getCursorRuleFileStatusMap(files) {
-    const map = {};
-    if (!existsSync(cursorRulesTarget)) return Object.fromEntries(files.map((file)=>[
-            file,
-            "new"
-        ]));
-    const targetDir = await readdir(cursorRulesTarget);
-    for (const file of files){
-        if (!targetDir.includes(file)) {
-            map[file] = "new";
-            continue;
-        }
-        const sourceContent = await readFile(join(syncAgentRules_source, file), "utf-8");
-        const targetContent = await readFile(join(cursorRulesTarget, file), "utf-8");
-        if (sourceContent !== targetContent) map[file] = "modified";
+function getMarkdownFirstHeading(content) {
+    return getMarkdownHeadings(content, 1)[0] ?? "";
+}
+function transformMarkdownRuleToAgentsRule(source) {
+    return source.replace(/^(#+ )/gm, "#$1").replace(/\n+$/, "");
+}
+async function getMarkdownRuleFilenames() {
+    const entries = await readdir(syncAgentRules_source, {
+        withFileTypes: true
+    });
+    return sortAgentRuleFiles(entries.filter((entry)=>entry.isFile()).map((entry)=>entry.name).filter((filename)=>filename.toLowerCase().endsWith(".md")));
+}
+async function readAgentRuleFiles(files) {
+    const rules = [];
+    for (const filename of files){
+        const content = await readFile(join(syncAgentRules_source, filename), "utf-8");
+        const title = getMarkdownFirstHeading(content) || filename;
+        rules.push({
+            filename,
+            title,
+            content
+        });
     }
-    return map;
+    return rules;
+}
+async function readOriginalAgentsMd() {
+    if (!await pathExists(agentsMdTarget)) return;
+    return await readFile(agentsMdTarget, "utf-8");
+}
+function getDefaultAgentRuleFiles(params) {
+    const { rules, originalContent } = params;
+    if (!originalContent) return rules.map((rule)=>rule.filename);
+    const originalSecondHeadings = new Set(getMarkdownHeadings(originalContent, 2).map(normalizeMarkdownHeading));
+    return rules.filter((rule)=>originalSecondHeadings.has(normalizeMarkdownHeading(rule.title))).map((rule)=>rule.filename);
 }
-async function syncCursorRules(files) {
-    const map = await getCursorRuleFileStatusMap(files);
-    const changedFiles = Object.keys(map);
-    if (0 === changedFiles.length) return;
-    const { files: selectedFiles } = await inquirer_0.prompt({
+async function selectAgentRuleFiles(params) {
+    const { rules, defaultFiles } = params;
+    const { files } = await inquirer_0.prompt({
         type: "checkbox",
         name: "files",
-        message: "请选择要添加的 Cursor 规则文件",
-        choices: Object.entries(map).map(([key, value])=>({
-                name: `${key} (${value})`,
-                value: key
+        message: "请选择要同步到 AGENTS.md 的规则",
+        choices: rules.map((rule)=>({
+                name: `${rule.title} (${rule.filename})`,
+                value: rule.filename
             })),
-        default: changedFiles
+        default: defaultFiles
     });
-    await mkdir(cursorRulesTarget, {
-        recursive: true
-    });
-    for (const file of selectedFiles)await copyFile(join(syncAgentRules_source, file), join(cursorRulesTarget, file));
+    return files;
 }
-async function syncAntiGravityRules(files) {
-    await mkdir(antiGravityRulesTarget, {
-        recursive: true
-    });
-    for (const file of files){
-        const sourceContent = await readFile(join(syncAgentRules_source, file), "utf-8");
-        const content = transformCursorRuleToAntiGravityRule(sourceContent);
-        await writeFile(join(antiGravityRulesTarget, file.replace(/\.mdc$/, ".md")), content);
-    }
-}
-async function syncAgentsMdRules(files) {
-    let agentsRule = "# Agent Rules";
-    for (const file of files){
-        const sourceContent = await readFile(join(syncAgentRules_source, file), "utf-8");
-        const content = transformCursorRuleToAgentsRule(sourceContent);
-        agentsRule = `${agentsRule}${content}`.replace(/\n+$/, "");
-    }
-    agentsRule = `${agentsRule}\n`;
-    await writeFile("AGENTS.md", agentsRule);
+async function syncAgentsMdRules(rules) {
+    const sections = rules.map((rule)=>transformMarkdownRuleToAgentsRule(rule.content)).filter(Boolean);
+    const agentsRule = `${[
+        "# Agent Rules",
+        ...sections
+    ].join("\n\n").replace(/\n+$/, "")}\n`;
+    await writeFile(agentsMdTarget, agentsRule);
 }
 async function asyncAgentRules() {
     try {
@@ -4893,33 +4879,33 @@ async function asyncAgentRules() {
         await writePackageJson({
             data: packageJson
         });
-    } catch (error) {}
-    await spawnAsync("npx gitpick 1adybug/cursor-rule/tree/main/.cursor/rules .cursor-rules");
+    } catch  {}
+    await rm(syncAgentRules_source, {
+        recursive: true,
+        force: true
+    });
     try {
-        const sourceDir = sortAgentRuleFiles(await readdir(syncAgentRules_source));
-        const defaultTargets = getDefaultSyncTargets();
-        const { targets } = await inquirer_0.prompt({
-            type: "checkbox",
-            name: "targets",
-            message: "请选择要同步的 Agent 规则",
-            choices: Object.values(AgentRulesSyncTarget),
-            default: defaultTargets
+        await spawnAsync(`npx gitpick 1adybug/cursor-rule ${syncAgentRules_source}`);
+        const sourceDir = await getMarkdownRuleFilenames();
+        if (0 === sourceDir.length) throw new Error("未找到 Agent 规则文件");
+        const rules = await readAgentRuleFiles(sourceDir);
+        const originalAgentsMd = await readOriginalAgentsMd();
+        const defaultFiles = getDefaultAgentRuleFiles({
+            rules,
+            originalContent: originalAgentsMd
         });
-        if (0 === targets.length) throw new Error("未选择同步目标");
-        if (targets.includes(AgentRulesSyncTarget.cursor)) await syncCursorRules(sourceDir);
-        if (targets.includes(AgentRulesSyncTarget.antiGravity)) await syncAntiGravityRules(sourceDir);
-        if (targets.includes(AgentRulesSyncTarget.agentsMd)) await syncAgentsMdRules(sourceDir);
-        await rm(syncAgentRules_source, {
-            recursive: true,
-            force: true
+        const selectedFiles = await selectAgentRuleFiles({
+            rules,
+            defaultFiles
         });
-        return getCommitMessage("feature", "同步 Agent 规则");
-    } catch (error) {
+        if (0 === selectedFiles.length) throw new Error("未选择 Agent 规则");
+        await syncAgentsMdRules(rules.filter((rule)=>selectedFiles.includes(rule.filename)));
+        return getCommitMessage("feat", "同步 Agent 规则");
+    } finally{
         await rm(syncAgentRules_source, {
             recursive: true,
             force: true
         });
-        throw error;
     }
 }
 const EditorExtensionCommandMap = {
@@ -4928,7 +4914,7 @@ const EditorExtensionCommandMap = {
     Antigravity: "antigravity"
 };
 const editorExtensionCommandCache = new Map();
-async function pathExists({ path }) {
+async function getEditorExtensions_pathExists({ path }) {
     try {
         await access(path);
         return true;
@@ -4994,7 +4980,7 @@ async function getEditorExtensionCommand({ editor }) {
     for (const candidate of getEditorWindowsCliCandidates({
         editor
     })){
-        if (!await pathExists({
+        if (!await getEditorExtensions_pathExists({
             path: candidate
         })) continue;
         const command = quoteShellCommand({
@@ -5344,7 +5330,7 @@ async function syncEditorSetting() {
         });
         if (await hasChangeNoCommit(onlinePath)) {
             await addGitCommit({
-                message: getCommitMessage("feature", "sync editor setting"),
+                message: getCommitMessage("feat", "sync editor setting"),
                 cwd: onlinePath
             });
             await execAsync("git push", {
@@ -5824,7 +5810,7 @@ async function upgradeDependency(config) {
         dir
     });
     await installDependceny();
-    return getCommitMessage("feature", `upgrade dependencies: ${upgradeLogs.join(", ")}`);
+    return getCommitMessage("feat", `upgrade dependencies: ${upgradeLogs.join(", ")}`);
 }
 async function getPackageLatestVersion(packageName) {
     const registry = await getRegistry();
@@ -5858,7 +5844,7 @@ async function upgradeRsbuild() {
     await installDependceny();
     const upgradeLog = `upgrade dependencies: ${upgradeLogs.join(", ")}`;
     consola.success(upgradeLog);
-    return getCommitMessage("feature", upgradeLog);
+    return getCommitMessage("feat", upgradeLog);
 }
 async function upgradeTailwind() {
     const version = await getPackageVersionInDependcy("tailwindcss");
@@ -5881,7 +5867,7 @@ async function upgradeTailwind() {
     await installDependceny();
     const upgradeLog = `upgrade dependencies: tailwindcss ${version} => ${newVersion}`;
     consola.success(upgradeLog);
-    return getCommitMessage("feature", upgradeLog);
+    return getCommitMessage("feat", upgradeLog);
 }
 async function upgradeWorkspaceDependceny() {
     const { dir, ...rest } = await getUpgradeDependencyConfig();
@@ -6378,15 +6364,15 @@ const program = new Command();
 const src_pkg = readPackageJsonSync("win32" === process.platform ? import.meta.resolve("../").replace(/^file:\/\/\//, "") : import.meta.resolve("../").replace(/^file:\/\//, ""));
 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 配置")));
-program.command("tailwind").description("添加 tailwind 配置").action(actionWithBackup(addTailwind, getCommitMessage("feature", "添加 tailwind 配置")));
-program.command("remove-comment").description("删除文件注释").argument("path", "文件路径").action(actionWithBackup(removeComment, getCommitMessage("feature", "删除文件注释")));
-program.command("father").alias("fs").description("初始化 father 项目配置").action(actionWithBackup(setFatherConfig, getCommitMessage("feature", "初始化 father 项目配置")));
+program.command("eslint").description("添加 ESLint 相关配置").action(actionWithBackup(addEslint, getCommitMessage("feat", "添加 ESLint 相关配置")));
+program.command("prettier").description("添加 prettier 配置").action(actionWithBackup(addPrettier, getCommitMessage("feat", "添加 prettier 配置文件")));
+program.command("husky").description("添加 husky 配置").action(actionWithBackup(addHusky, getCommitMessage("feat", "添加 husky 配置")));
+program.command("vite").description("初始化 vite 配置").action(actionWithBackup(vite, getCommitMessage("feat", "初始化 vite 配置")));
+program.command("rsbuild").description("初始化 rsbuild 配置").action(actionWithBackup(rsbuild, getCommitMessage("feat", "初始化 rsbuild 配置")));
+program.command("next").description("初始化 next 配置").action(actionWithBackup(next_next, getCommitMessage("feat", "初始化 next 配置")));
+program.command("tailwind").description("添加 tailwind 配置").action(actionWithBackup(addTailwind, getCommitMessage("feat", "添加 tailwind 配置")));
+program.command("remove-comment").description("删除文件注释").argument("path", "文件路径").action(actionWithBackup(removeComment, getCommitMessage("feat", "删除文件注释")));
+program.command("father").alias("fs").description("初始化 father 项目配置").action(actionWithBackup(setFatherConfig, getCommitMessage("feat", "初始化 father 项目配置")));
 program.command("upgrade-dependency").alias("ud").description("升级项目依赖").option("-r, --registry <registry>", "npm 源地址，可以是 npm、taobao、tencent 或者自定义地址").option("-p, --proxy", "是否使用代理").action(async (optios)=>{
     setGlobalConfig(optios);
     await actionWithBackup(()=>upgradeDependency())();
@@ -6396,9 +6382,9 @@ program.command("upgrade-workspace-dependency").alias("uwd").description("升级
     await upgradeWorkspaceDependceny();
 });
 program.command("registry").description("设置 npm registry").action(setRegistry);
-program.command("sort-package-json").alias("spj").description("对 package.json 中的依赖进行排序").action(actionWithBackup(sortPackageJson, getCommitMessage("feature", "对 package.json 中的依赖进行排序")));
-program.command("arrow-to-function").alias("a2f").description("将箭头函数组件转换为函数组件").action(actionWithBackup(arrowToFunction, getCommitMessage("feature", "将箭头函数组件转换为函数组件")));
-program.command("interface-to-type").alias("i2t").description("将 interface 转换为 type").action(actionWithBackup(interfaceToType, getCommitMessage("feature", "将 interface 转换为 type")));
+program.command("sort-package-json").alias("spj").description("对 package.json 中的依赖进行排序").action(actionWithBackup(sortPackageJson, getCommitMessage("feat", "对 package.json 中的依赖进行排序")));
+program.command("arrow-to-function").alias("a2f").description("将箭头函数组件转换为函数组件").action(actionWithBackup(arrowToFunction, getCommitMessage("feat", "将箭头函数组件转换为函数组件")));
+program.command("interface-to-type").alias("i2t").description("将 interface 转换为 type").action(actionWithBackup(interfaceToType, getCommitMessage("feat", "将 interface 转换为 type")));
 program.command("gitignore").description("添加 .gitignore 配置").action(actionWithBackup(addGitignore));
 program.command("git-proxy").alias("gp").description("设置 git 代理").action(setGitProxy);
 program.command("shell-proxy").alias("sp").description("设置 Shell 代理").action(setShellProxy);
@@ -6407,10 +6393,10 @@ program.command("vscode").alias("vsc").description("同步 VS Code 配置").acti
 program.command("kill-port").description("根据端口号杀死进程").argument("port", "端口号").action(killProcessByPort);
 program.command("rm-git").argument("path", "要移除的文件或文件夹").action(removeFileOrFolderFromGit);
 program.command("npm-download").alias("nd").description("下载 npm 包").argument("name", "包名").action(downloadNpm);
-program.command("prisma").description("添加 prisma 配置").action(actionWithBackup(()=>addPrisma(), getCommitMessage("feature", "添加 prisma 配置")));
+program.command("prisma").description("添加 prisma 配置").action(actionWithBackup(()=>addPrisma(), getCommitMessage("feat", "添加 prisma 配置")));
 program.command("prisma-generate").alias("pg").description("生成 prisma client").action(generatePrisma);
-program.command("antd").description("添加 antd 配置").action(actionWithBackup(addAntd, getCommitMessage("feature", "添加 antd 配置")));
-program.command("init").description("初始化项目").action(actionWithBackup(initProject, getCommitMessage("feature", "初始化项目")));
+program.command("antd").description("添加 antd 配置").action(actionWithBackup(addAntd, getCommitMessage("feat", "添加 antd 配置")));
+program.command("init").description("初始化项目").action(actionWithBackup(initProject, getCommitMessage("feat", "初始化项目")));
 program.command("tsc").description("类型检查").action(checkType);
 program.command("beta-version").alias("bv").description("设置版本号").action(betaVersion);
 program.command("reinstall").alias("ri").description("重新安装依赖").option("-r, --registry <registry>", "npm 源地址，可以是 npm、taobao、tencent 或者自定义地址").action(async (options)=>{