zixulu 1.74.0 → 1.75.0

package/dist/index.js

@@ -24,6 +24,7 @@ import { Readable } from "stream";
 import { JSDOM } from "jsdom";
 import { exec } from "child_process";
 import md5 from "md5";
+import { applyEdits, modify } from "jsonc-parser";
 async function addGitCommit(messageOrParams) {
     const { message, cwd } = "string" == typeof messageOrParams ? {
         message: messageOrParams
@@ -4355,6 +4356,21 @@ function hasCursor() {
     const path = join(userDir, "AppData/Roaming/Cursor");
     return existsSync(path);
 }
+function modifyJsonc(text, path, value, options) {
+    options = {
+        ...options
+    };
+    options.formattingOptions = {
+        ...options.formattingOptions
+    };
+    options.formattingOptions.tabSize ??= 4;
+    options.formattingOptions.insertSpaces ??= true;
+    options.formattingOptions.insertFinalNewline ??= true;
+    options.formattingOptions.keepLines ??= true;
+    options.formattingOptions.eol ??= "\n";
+    const edits = modify(text, path, value, options);
+    return applyEdits(text, edits);
+}
 const syncEditorSetting_userDir = homedir();
 const fileSourceMap = {
     settings: {
@@ -4377,19 +4393,32 @@ async function getFile(source) {
     }
     return await readFile(source, "utf-8");
 }
-async function syncEditorFile({ source: { type: sourceType, value: sourceValue }, target: { type: targetType, value: targetValue } }) {
+async function syncEditorFile({ type, source: { type: sourceType, value: sourceValue }, target: { type: targetType, value: targetValue } }) {
     const { dir, base } = parse(targetValue);
     await mkdir(dir, {
         recursive: true
     });
     const setting = await readZixuluSetting();
     let code = await getFile(sourceValue);
-    if ("Code" === targetType) code = code.replace(/\n^ *"extensions\.gallery\.serviceUrl":.+,?$/m, "");
-    if ("Antigravity" === targetType) code = code.replace(/\n^ *"extensions\.gallery\.serviceUrl":.+,?$/m, "").replace(/}[ \n]*$/, `    "antigravity.marketplaceExtensionGalleryServiceURL": "https://marketplace.visualstudio.com/_apis/public/gallery",
-    "antigravity.marketplaceGalleryItemURL": "https://marketplace.visualstudio.com/items",
-    "json.schemaDownload.enable": true,
-}
-`);
+    if ("settings" === type) {
+        code = modifyJsonc(code, [
+            "extensions.gallery.serviceUrl"
+        ], void 0);
+        code = modifyJsonc(code, [
+            "antigravity.marketplaceExtensionGalleryServiceURL"
+        ], void 0);
+        code = modifyJsonc(code, [
+            "antigravity.marketplaceGalleryItemURL"
+        ], void 0);
+        if ("Antigravity" === targetType) {
+            code = modifyJsonc(code, [
+                "antigravity.marketplaceExtensionGalleryServiceURL"
+            ], "https://marketplace.visualstudio.com/_apis/public/gallery");
+            code = modifyJsonc(code, [
+                "antigravity.marketplaceGalleryItemURL"
+            ], "https://marketplace.visualstudio.com/items");
+        }
+    }
     if (existsSync(targetValue)) {
         const text = await readFile(targetValue, "utf-8");
         if (text === code) return void consola_0.success(`${targetValue} 已是最新`);
@@ -4474,6 +4503,7 @@ async function syncEditorSetting() {
     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)=>({
+                type: fileType,
                 source: {
                     type: source,
                     value: fileSourceMap[fileType][source]