zixulu 1.71.5 → 1.71.7

package/dist/index.js

@@ -1458,7 +1458,7 @@ generated
 const prettierConfig = `// @ts-check
 
 /**
- * @type {import("prettier").Options}
+ * @type {import("@1adybug/prettier").Options}
  */
 const config = {
     semi: false,
@@ -1468,7 +1468,7 @@ const config = {
     printWidth: 160,
     plugins: ["@1adybug/prettier"],
     controlStatementBraces: "add",
-    multipleLineBraces: "add",
+    multiLineBraces: "add",
 }
 
 export default config
@@ -4325,6 +4325,16 @@ async function getEditorExtensions({ source }) {
     data = data.filter((item)=>!item.startsWith("anysphere.") && "github.copilot" !== item && "github.copilot-chat" !== item);
     return new Set(data);
 }
+function hasCode() {
+    const userDir = homedir();
+    const path = join(userDir, "AppData/Roaming/Code");
+    return existsSync(path);
+}
+function hasCursor() {
+    const userDir = homedir();
+    const path = join(userDir, "AppData/Roaming/Cursor");
+    return existsSync(path);
+}
 const syncEditorSetting_userDir = homedir();
 const fileSourceMap = {
     settings: {
@@ -4347,8 +4357,12 @@ async function getFile(source) {
 }
 async function syncEditorFile({ source, target }) {
     const { dir, base } = parse(target);
+    await mkdir(dir, {
+        recursive: true
+    });
     const setting = await readZixuluSetting();
-    const code = await getFile(source);
+    let code = await getFile(source);
+    if (target === fileSourceMap.settings.Code) code = code.replace(/\n^ *"extensions\.gallery\.serviceUrl":.+,?$/m, "");
     if (existsSync(target)) {
         const text = await readFile(target, "utf-8");
         if (text === code) return void consola_0.success(`${target} 已是最新`);
@@ -4372,36 +4386,31 @@ async function syncEditorFile({ source, target }) {
 }
 async function syncEditorSetting() {
     const setting = await readZixuluSetting();
+    const sourceChoices = [
+        "Online"
+    ];
+    if (hasCode()) sourceChoices.unshift("Code");
+    if (hasCursor()) sourceChoices.unshift("Cursor");
     const { source } = await inquirer_0.prompt([
         {
             type: "list",
             name: "source",
             message: "选择同步来源",
-            choices: [
-                "Code",
-                "Cursor",
-                "Online"
-            ],
+            choices: sourceChoices,
             default: setting.syncEditor?.source ?? "Cursor"
         }
     ]);
     setting.syncEditor ??= {};
     setting.syncEditor.source = source;
+    const targetChoices = sourceChoices.filter((v)=>v !== source);
+    if (0 === targetChoices.length) return consola_0.info("没有可同步的目标");
     const { targets, types } = await inquirer_0.prompt([
         {
             type: "checkbox",
             name: "targets",
             message: "选择同步目标",
-            choices: [
-                "Code",
-                "Cursor",
-                "Online"
-            ].filter((v)=>v !== source),
-            default: (setting.syncEditor?.targets ?? [
-                "Code",
-                "Cursor",
-                "Online"
-            ]).filter((v)=>v !== source)
+            choices: targetChoices,
+            default: setting.syncEditor?.targets?.filter((item)=>targetChoices.includes(item)) ?? targetChoices
         },
         {
             type: "checkbox",
@@ -4425,11 +4434,12 @@ async function syncEditorSetting() {
         const { onlinePath } = await inquirer_0.prompt({
             type: "input",
             name: "onlinePath",
-            message: "请输入 blog 文件夹的路径",
-            default: setting.syncEditor?.onlinePath ?? "C:\\Users\\lenovo\\Desktop\\workspace\\blog"
+            message: "请输入 blog 文件夹的路径（留空则跳过）",
+            default: setting.syncEditor?.onlinePath
         });
-        setting.syncEditor.onlinePath = onlinePath;
+        setting.syncEditor.onlinePath = onlinePath.trim() ?? void 0;
     }
+    if (!setting.syncEditor.onlinePath) setting.syncEditor.targets = targets.filter((v)=>"Online" !== v);
     const onlinePath = setting.syncEditor.onlinePath;
     const configs = types.filter((item)=>"extensions" !== item).map((fileType)=>targets.map((target)=>({
                 source: fileSourceMap[fileType][source],
@@ -4482,6 +4492,9 @@ async function syncEditorSetting() {
         if (targets.includes("Online")) await writeFile(join(onlinePath, "static", "extensions.json"), JSON.stringify(Array.from(sourceExtensions), null, 4));
     }
     if (targets.includes("Online")) {
+        await execAsync("npm run format", {
+            cwd: onlinePath
+        });
         if (await hasChangeNoCommit(onlinePath)) {
             await addGitCommit({
                 message: getCommitMessage("feature", "sync editor setting"),
@@ -4566,7 +4579,7 @@ async function syncVscode() {
     if (0 === options.length) return;
     const userDir = homedir();
     const snippetSource = join(userDir, "AppData/Roaming/Code/User/snippets");
-    const setting = join(userDir, "AppData/Roaming/Code/User/settings.json");
+    const setting = (await readFile(join(userDir, "AppData/Roaming/Code/User/settings.json"), "utf-8")).replace(/}[ \n\r]*$/, `    "chat.disableAIFeatures": true,\n}`);
     const dir = `vscode-${dayjs().format("YYYYMMDDHHmmss")}`;
     try {
         await mkdir(dir, {
@@ -4578,7 +4591,7 @@ async function syncVscode() {
                 recursive: true
             });
             consola_0.start("开始下载最新 VSCode 配置");
-            await copyFile(setting, join(dir, "settings.json"));
+            await writeFile(join(dir, "settings.json"), setting, "utf-8");
             const files = await readdir(snippetSource);
             for (const file of files)await copyFile(join(snippetSource, file), join(snippetTarget, file));
             consola_0.success("下载最新 VSCode 配置完成");