zixulu 1.80.1 → 1.80.2

package/dist/index.js

@@ -4865,23 +4865,10 @@ description:
         throw error;
     }
 }
-const getEditorExtensions_userDir = homedir();
-const editorExtensionCommandMap = {
-    Code: {
-        command: "code",
-        win32Command: "code.cmd",
-        win32Path: join(getEditorExtensions_userDir, "AppData/Local/Programs/Microsoft VS Code/bin/code.cmd")
-    },
-    Cursor: {
-        command: "cursor",
-        win32Command: "cursor.cmd",
-        win32Path: join(getEditorExtensions_userDir, "AppData/Local/Programs/cursor/resources/app/bin/cursor.cmd")
-    },
-    Antigravity: {
-        command: "antigravity",
-        win32Command: "antigravity.cmd",
-        win32Path: join(getEditorExtensions_userDir, "AppData/Local/Programs/Antigravity/bin/antigravity.cmd")
-    }
+const EditorExtensionCommandMap = {
+    Code: "code",
+    Cursor: "cursor",
+    Antigravity: "antigravity"
 };
 async function canGetEditorExtensions({ editor }) {
     const command = getEditorExtensionCommand({
@@ -4895,11 +4882,7 @@ async function canGetEditorExtensions({ editor }) {
     }
 }
 function getEditorExtensionCommand({ editor }) {
-    const item = editorExtensionCommandMap[editor];
-    if ("win32" !== process.platform) return item.command;
-    if (item.win32Path && existsSync(item.win32Path)) return `"${item.win32Path}"`;
-    if (item.win32Command) return item.win32Command;
-    return item.command;
+    return EditorExtensionCommandMap[editor];
 }
 async function getEditorExtensions({ source }) {
     let data = [];
@@ -5258,13 +5241,10 @@ async function getVscodeExtInfo(ext) {
     const reg = /^(.+?)\.(.+?)$/;
     const [, author, name] = ext.match(reg);
     let version;
-    const codeCommand = getEditorExtensionCommand({
-        editor: "Code"
-    });
     if ("ms-ceintl.vscode-language-pack-zh-hans" === ext) {
         const reg2 = /"Versions":(\[\{".+?\])/;
         const versions = JSON.parse(html.match(reg2)[1]);
-        const output = await execAsync(`${codeCommand} --version`);
+        const output = await execAsync("code --version");
         const codeVersions = output.split("\n")[0].split(".").map(Number);
         const item = versions.find(({ version })=>version.split(".").map(Number).every((item, index)=>index >= 2 || item <= codeVersions[index])) ?? versions[0];
         version = item.version;
@@ -5287,10 +5267,7 @@ async function downloadVscodeExts(dir) {
         recursive: true
     });
     consola.start("正在获取 VS Code 扩展列表");
-    const codeCommand = getEditorExtensionCommand({
-        editor: "Code"
-    });
-    const extList = await execAsync(`${codeCommand} --list-extensions`);
+    const extList = await execAsync("code --list-extensions");
     const exts = await Promise.all(extList.split(/[\n\r]/).filter(Boolean).filter((item)=>!item.startsWith("anysphere.")).map((ext)=>getVscodeExtInfo(ext)));
     const setting = await readZixuluSetting();
     const vscodeDownloadHistory = setting?.vscodeDownloadHistory;
@@ -5308,37 +5285,127 @@ async function downloadVscodeExts(dir) {
     await writeZixuluSetting(setting);
     await Promise.all(exts.filter((ext)=>exts2.exts.includes(ext.id)).map((ext)=>retry(()=>download_download(ext.url, dir, `${ext.id}-${ext.version}.vsix`), 4)));
 }
-var syncVscode_VscodeSyncOption = /*#__PURE__*/ function(VscodeSyncOption) {
-    VscodeSyncOption["配置"] = "SETTING";
-    VscodeSyncOption["插件"] = "EXTENSION";
-    VscodeSyncOption["软件"] = "SOFTWARE";
-    VscodeSyncOption["PowerShell"] = "POWERSHELL";
-    return VscodeSyncOption;
-}({});
+const VscodeSyncOption = {
+    配置: "SETTING",
+    插件: "EXTENSION",
+    软件: "SOFTWARE",
+    PowerShell: "POWERSHELL"
+};
+function createSyncVscodeScript(options) {
+    const needUserDir = options.includes(VscodeSyncOption.配置) || options.includes(VscodeSyncOption.PowerShell);
+    return `// @ts-check
+
+import { spawn } from "node:child_process"
+import { access, copyFile, mkdir, readdir, rm } from "node:fs/promises"
+import { homedir } from "node:os"
+import { delimiter, join } from "node:path"
+
+/**
+ * @param {string} path
+ */
+async function pathExists(path) {
+    try {
+        await access(path)
+        return true
+    } catch {
+        return false
+    }
+}
+
+// Windows 上优先查找真实的 code.cmd，避免 shell 拼命令时的路径问题
+async function resolveCodeCli() {
+    if (process.platform !== "win32") return "code"
+
+    const candidates = new Set()
+    const localAppData = process.env.LOCALAPPDATA ?? join(homedir(), "AppData", "Local")
+    const programFiles = process.env.ProgramFiles ?? "C:/Program Files"
+    const programFilesX86 = process.env["ProgramFiles(x86)"] ?? "C:/Program Files (x86)"
+
+    candidates.add(join(localAppData, "Programs", "Microsoft VS Code", "bin", "code.cmd"))
+    candidates.add(join(programFiles, "Microsoft VS Code", "bin", "code.cmd"))
+    candidates.add(join(programFilesX86, "Microsoft VS Code", "bin", "code.cmd"))
+
+    const pathDirs = process.env.PATH?.split(delimiter).filter(Boolean) ?? []
+    for (const dir of pathDirs) {
+        candidates.add(join(dir, "code.cmd"))
+        candidates.add(join(dir, "code.exe"))
+        candidates.add(join(dir, "code"))
+    }
+
+    for (const candidate of candidates) {
+        if (await pathExists(candidate)) return candidate
+    }
+
+    throw new Error("未找到 VS Code 命令行工具，请先安装 VS Code，并确认安装时勾选了“添加到 PATH”")
+}
+
+/**
+ * @param {string} command
+ * @param {string[]} args
+ */
+function spawnAsync(command, args) {
+    return new Promise((resolve, reject) => {
+        const child = spawn(command, args, { stdio: "inherit" })
+        child.on("error", reject)
+        child.on("exit", code => {
+            if (code !== 0) return reject(new Error(\`Command failed with code \${code}: \${command} \${args.join(" ")}\`))
+            resolve(0)
+        })
+    })
+}
+
+async function main() {
+    const workspaceDir = process.cwd()
+${needUserDir ? `    const userDir = homedir()
+` : ""}${options.includes(VscodeSyncOption.插件) ? `    const extensionsDir = join(workspaceDir, "extensions")
+    const codeCli = await resolveCodeCli()
+    const dir = await readdir(extensionsDir)
+    for (const ext of dir) {
+        await spawnAsync(codeCli, ["--install-extension", join(extensionsDir, ext)])
+    }
+` : ""}${options.includes(VscodeSyncOption.配置) ? `    const codeUserDir = join(userDir, "AppData", "Roaming", "Code", "User")
+    await mkdir(codeUserDir, { recursive: true })
+    const setting = join(codeUserDir, "settings.json")
+    await rm(setting, { force: true })
+    await copyFile(join(workspaceDir, "settings.json"), setting)
+    const snippetTarget = join(codeUserDir, "snippets")
+    await mkdir(snippetTarget, { recursive: true })
+    const dir2 = await readdir(join(workspaceDir, "snippets"))
+    for (const file of dir2) {
+        await rm(join(snippetTarget, file), { force: true })
+        await copyFile(join(workspaceDir, "snippets", file), join(snippetTarget, file))
+    }` : ""}${options.includes(VscodeSyncOption.PowerShell) ? `
+    const profileDir = join(userDir, "Documents", "PowerShell")
+    await mkdir(profileDir, { recursive: true })
+    const profile = join(profileDir, "Microsoft.PowerShell_profile.ps1")
+    await copyFile(join(workspaceDir, "Microsoft.PowerShell_profile.ps1"), profile)` : ""}
+}
+
+main()
+`;
+}
 async function syncVscode() {
-    const codeCommand = getEditorExtensionCommand({
-        editor: "Code"
-    });
     const options = (await inquirer_0.prompt({
         type: "checkbox",
         name: "options",
         message: "请选择要同步的内容",
-        choices: getEnumEntries(syncVscode_VscodeSyncOption).map(([name, value])=>({
+        choices: getEnumEntries(VscodeSyncOption).map(([name, value])=>({
                 name,
                 value
             })),
-        default: getEnumValues(syncVscode_VscodeSyncOption)
+        default: getEnumValues(VscodeSyncOption)
     })).options;
     if (0 === options.length) return;
     const userDir = homedir();
-    const snippetSource = join(userDir, "AppData/Roaming/Code/User/snippets");
-    const setting = (await readFile(join(userDir, "AppData/Roaming/Code/User/settings.json"), "utf-8")).replace(/}[ \n\r]*$/, `    "chat.disableAIFeatures": true,\n}`);
+    const codeUserDir = join(userDir, "AppData", "Roaming", "Code", "User");
+    const snippetSource = join(codeUserDir, "snippets");
+    const setting = (await readFile(join(codeUserDir, "settings.json"), "utf-8")).replace(/}[ \n\r]*$/, `    "chat.disableAIFeatures": true,\n}`);
     const dir = `vscode-${dayjs().format("YYYYMMDDHHmmss")}`;
     try {
         await mkdir(dir, {
             recursive: true
         });
-        if (options.includes("SETTING")) {
+        if (options.includes(VscodeSyncOption.配置)) {
             const snippetTarget = join(dir, "snippets");
             await mkdir(snippetTarget, {
                 recursive: true
@@ -5349,62 +5416,20 @@ async function syncVscode() {
             for (const file of files)await copyFile(join(snippetSource, file), join(snippetTarget, file));
             consola.success("下载最新 VSCode 配置完成");
         }
-        if (options.includes("EXTENSION")) {
+        if (options.includes(VscodeSyncOption.插件)) {
             await downloadVscodeExts(join(dir, "extensions"));
             consola.success("下载最新 VSCode 插件完成");
         }
-        if (options.includes("SETTING") || options.includes("EXTENSION")) {
-            const script = `// @ts-check
-
-import { spawn } from "node:child_process"
-import { readdir, copyFile, rm } from "node:fs/promises"
-import { homedir } from "node:os"
-import { join } from "node:path"
-
-const codeCommand = ${JSON.stringify(codeCommand)}
-
-/** 
- * @param {string} command
- */
-function spawnAsync(command) {
-    return new Promise((resolve, reject) => {
-        const child = spawn(command, { shell: true, stdio: "inherit" })
-        child.on("exit", code => {
-            if (code !== 0) return reject(new Error(\`Command failed with code \${code}\`))
-            resolve(0)
-        })
-    })
-}
-
-async function main() {
-${options.includes("EXTENSION") ? `    const dir = await readdir("./extensions")
-    for (const ext of dir) {
-        await spawnAsync(\`\${codeCommand} --install-extension "./extensions/\${ext}"\`)
-    }
-` : ""}${options.includes("SETTING") ? `    const userDir = homedir()
-    const setting = join(userDir, "AppData/Roaming/Code/User/settings.json")
-    await rm(setting, { force: true })
-    await copyFile("./settings.json", setting)
-    const snippetTarget = join(userDir, "AppData/Roaming/Code/User/snippets")
-    const dir2 = await readdir("./snippets")
-    for (const file of dir2) {
-        await rm(join(snippetTarget, file), { force: true })
-        await copyFile(join("./snippets", file), join(snippetTarget, file))
-    }` : ""}${options.includes("POWERSHELL") ? `
-    ${options.includes("SETTING") ? "" : `const userDir = homedir()
-`}const profile = join(userDir, "Documents/PowerShell/Microsoft.PowerShell_profile.ps1")
-    await copyFile("./Microsoft.PowerShell_profile.ps1", profile)` : ""}
-}
-
-main()`;
+        if (options.includes(VscodeSyncOption.配置) || options.includes(VscodeSyncOption.插件) || options.includes(VscodeSyncOption.PowerShell)) {
+            const script = createSyncVscodeScript(options);
             await writeFile(join(dir, "syncVscode.mjs"), script, "utf-8");
         }
-        if (options.includes("SOFTWARE")) {
+        if (options.includes(VscodeSyncOption.软件)) {
             consola.start("开始下载最新 VSCode");
             await download_download("https://code.visualstudio.com/sha/download?build=stable&os=win32-x64", dir);
             consola.success("下载最新 VSCode 完成");
         }
-        if (options.includes("POWERSHELL")) {
+        if (options.includes(VscodeSyncOption.PowerShell)) {
             consola.start("开始同步 PowerShell 配置");
             const userDir = homedir();
             const profile = join(userDir, "Documents/PowerShell/Microsoft.PowerShell_profile.ps1");