coc-vscode-loader 1.2.2 → 1.2.4

package/converter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "converter",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "private": true,
   "description": "vscode → coc.nvim converter prototype",
   "type": "module",

package/lib/index.js

@@ -39,7 +39,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "coc-vscode-loader",
-      version: "1.2.2",
+      version: "1.2.4",
       description: "Run VS Code extensions seamlessly in coc.nvim",
       main: "lib/index.js",
       keywords: [
@@ -521,7 +521,7 @@ async function downloadSource(info, name, onProgress) {
 }
 async function convertSource(inputDir, name, info, onProgress) {
   const build = buildDir(name);
-  if (fs3.existsSync(build)) fs3.rmSync(build, { recursive: true });
+  await rimraf(build);
   const cli = converterCliPath();
   const converterDir = path3.resolve(path3.dirname(path3.dirname(cli)));
   if (!fs3.existsSync(path3.join(converterDir, "node_modules", "commander"))) {
@@ -543,13 +543,24 @@ async function convertSource(inputDir, name, info, onProgress) {
   } else {
     const globalPresetsCache = path3.join(os3.homedir(), ".config", "coc", "converter-cache", "presets.json");
     if (!fs3.existsSync(globalPresetsCache)) {
+      const presetsUrl = "https://raw.githubusercontent.com/coc-plugin/coc-vscode-registry/main/presets.json";
       try {
-        const res = await fetch("https://raw.githubusercontent.com/coc-plugin/coc-vscode-registry/main/presets.json");
+        const res = await fetch(presetsUrl);
         if (res.ok) {
           fs3.mkdirSync(path3.dirname(globalPresetsCache), { recursive: true });
           fs3.writeFileSync(globalPresetsCache, await res.text());
         }
       } catch {
+        try {
+          const out = await new Promise((resolve2, reject) => {
+            (0, import_child_process2.execFile)("curl", ["-sL", presetsUrl], { encoding: "utf-8", maxBuffer: 1024 * 1024 }, (err, stdout) => err ? reject(err) : resolve2(stdout));
+          });
+          if (out) {
+            fs3.mkdirSync(path3.dirname(globalPresetsCache), { recursive: true });
+            fs3.writeFileSync(globalPresetsCache, out);
+          }
+        } catch {
+        }
       }
     }
     if (fs3.existsSync(globalPresetsCache)) {
@@ -614,34 +625,52 @@ async function buildPackage(name, inputDir, info, onProgress) {
     onProgress(3, 5, "Installing server dependencies...", `npm install in ${serverDir}`);
     await run("npm", ["install", "--legacy-peer-deps"], serverDir, npmLog);
     const destServer = path3.join(build, "server");
-    if (fs3.existsSync(destServer)) fs3.rmSync(destServer, { recursive: true });
-    fs3.cpSync(serverDir, destServer, { recursive: true });
+    await rimraf(destServer);
+    await cpdir(serverDir, destServer);
   }
   onProgress(4, 5, "Building...", "node esbuild.mjs");
   const buildLog = (chunk) => onProgress(4, 5, chunk.trim(), "");
   await run("node", ["esbuild.mjs"], build, buildLog);
+  const archMap = {
+    arm64: "aarch64",
+    x64: "x86_64"
+  };
+  const platformMap = {
+    darwin: "apple-darwin",
+    linux: "unknown-linux-gnu",
+    win32: "pc-windows-msvc"
+  };
+  const arch2 = os3.arch() === "arm64" ? "arm64" : "x64";
+  const platform = process.platform === "win32" ? "win32" : process.platform === "darwin" ? "darwin" : "linux";
+  const rawArch = archMap[arch2] || arch2;
+  const rustTarget = `${rawArch}-${platformMap[platform] || platform}`;
+  const indexPath = path3.join(build, "lib", "index.js");
+  if (fs3.existsSync(indexPath)) {
+    let code = fs3.readFileSync(indexPath, "utf-8");
+    for (const [key, val] of [["platform", platform], ["arch", arch2], ["raw-arch", rawArch], ["rust-target", rustTarget]]) {
+      code = code.replace(new RegExp(`\\{\\{${key}}}`, "g"), val);
+    }
+    if (code !== fs3.readFileSync(indexPath, "utf-8")) {
+      fs3.writeFileSync(indexPath, code);
+    }
+  }
   if (info.serverBinary) {
     const sb = info.serverBinary;
     onProgress(4, 5, "Downloading language server...", `fetching ${sb.repo}`);
     try {
-      const tagRes = await fetch(`https://api.github.com/repos/${sb.repo}/releases/latest`);
-      if (!tagRes.ok) throw new Error(`GitHub API: HTTP ${tagRes.status}`);
-      const tagData = await tagRes.json();
+      let tagData;
+      try {
+        const tagRes = await fetch(`https://api.github.com/repos/${sb.repo}/releases/latest`);
+        if (!tagRes.ok) throw new Error(`HTTP ${tagRes.status}`);
+        tagData = await tagRes.json();
+      } catch {
+        const out = await new Promise((resolve2, reject) => {
+          (0, import_child_process2.execFile)("curl", ["-sL", `https://api.github.com/repos/${sb.repo}/releases/latest`], { encoding: "utf-8", maxBuffer: 1024 * 1024 }, (err, stdout) => err ? reject(err) : resolve2(stdout));
+        });
+        tagData = JSON.parse(out);
+      }
       const tag = tagData.tag_name;
       const version = tag.replace(/^v/, "");
-      const archMap = {
-        arm64: "aarch64",
-        x64: "x86_64"
-      };
-      const platformMap = {
-        darwin: "apple-darwin",
-        linux: "unknown-linux-gnu",
-        win32: "pc-windows-msvc"
-      };
-      const arch2 = os3.arch() === "arm64" ? "arm64" : "x64";
-      const platform = process.platform === "win32" ? "win32" : process.platform === "darwin" ? "darwin" : "linux";
-      const rawArch = archMap[arch2] || arch2;
-      const rustTarget = `${rawArch}-${platformMap[platform] || platform}`;
       const filename = sb.asset.replace(/\{\{version}}/g, version).replace(/\{\{platform}}/g, platform).replace(/\{\{arch}}/g, arch2).replace(/\{\{raw-arch}}/g, rawArch).replace(/\{\{rust-target}}/g, rustTarget);
       const url = `https://github.com/${sb.repo}/releases/download/${tag}/${filename}`;
       onProgress(4, 5, "Downloading...", `curl ${filename}`);
@@ -667,19 +696,18 @@ async function buildPackage(name, inputDir, info, onProgress) {
         });
       } catch {
       }
+      if (version) {
+        const verPath = path3.join(build, "lib", "index.js");
+        if (fs3.existsSync(verPath)) {
+          let vc = fs3.readFileSync(verPath, "utf-8");
+          if (vc.includes("{{version}}")) {
+            fs3.writeFileSync(verPath, vc.replace(/\{\{version}}/g, version));
+          }
+        }
+      }
       if (sb.binaryPath || filename.match(/\.(zip|gz)$/)) {
         const archivePath = path3.join(build, filename);
-        if (fs3.existsSync(archivePath)) fs3.rmSync(archivePath);
-      }
-      const indexPath = path3.join(build, "lib", "index.js");
-      if (fs3.existsSync(indexPath)) {
-        let code = fs3.readFileSync(indexPath, "utf-8");
-        code = code.replace(/\{\{version}}/g, version);
-        code = code.replace(/\{\{platform}}/g, platform);
-        code = code.replace(/\{\{arch}}/g, arch2);
-        code = code.replace(/\{\{raw-arch}}/g, rawArch);
-        code = code.replace(/\{\{rust-target}}/g, rustTarget);
-        fs3.writeFileSync(indexPath, code);
+        if (fs3.existsSync(archivePath)) await rimraf(archivePath);
       }
     } catch (e) {
       onProgress(4, 5, `Warning: serverBinary setup failed (${e.message})`, "install server binary manually");
@@ -693,9 +721,9 @@ async function installToCoc(name, onProgress) {
   const src = buildDir(name);
   const dest = pluginDir(name);
   onProgress(5, 5, "Installing to coc...", `copy to ${dest} + register in extensions/package.json`);
-  if (fs3.existsSync(dest)) fs3.rmSync(dest, { recursive: true });
+  await rimraf(dest);
   fs3.mkdirSync(path3.dirname(dest), { recursive: true });
-  fs3.cpSync(src, dest, { recursive: true });
+  await cpdir(src, dest);
   const pkgPath = extensionsPkgPath();
   const pkg = fs3.existsSync(pkgPath) ? JSON.parse(fs3.readFileSync(pkgPath, "utf-8")) : { dependencies: {} };
   pkg.dependencies = pkg.dependencies || {};
@@ -761,13 +789,23 @@ async function installPackage(state, name) {
     state.setPackageStatus(name, "failed", { error: e.message });
   }
 }
+function rimraf(dir) {
+  return new Promise((resolve2, reject) => {
+    if (!fs3.existsSync(dir)) return resolve2();
+    (0, import_child_process2.spawn)("rm", ["-rf", dir], { stdio: "ignore" }).on("close", (code) => code === 0 ? resolve2() : reject(new Error(`rm -rf exited ${code}`)));
+  });
+}
+function cpdir(src, dest) {
+  return new Promise((resolve2, reject) => {
+    const parent = path3.dirname(dest);
+    if (!fs3.existsSync(parent)) fs3.mkdirSync(parent, { recursive: true });
+    (0, import_child_process2.spawn)("cp", ["-r", src, dest], { stdio: "ignore" }).on("close", (code) => code === 0 ? resolve2() : reject(new Error(`cp -r exited ${code}`)));
+  });
+}
 async function uninstallPackage(state, name) {
   state.setPackageStatus(name, "uninstalling", { progress: "[1/3] Removing from coc..." });
   try {
-    const dest = pluginDir(name);
-    if (fs3.existsSync(dest)) {
-      fs3.rmSync(dest, { recursive: true });
-    }
+    await rimraf(pluginDir(name));
     state.setPackageStatus(name, "uninstalling", { progress: "[2/3] Removing from package.json..." });
     const pkgPath = extensionsPkgPath();
     const pkg = JSON.parse(fs3.readFileSync(pkgPath, "utf-8"));
@@ -779,10 +817,7 @@ async function uninstallPackage(state, name) {
       fs3.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2));
     }
     state.setPackageStatus(name, "uninstalling", { progress: "[3/3] Removing cache..." });
-    const cache = cacheDir(name);
-    if (fs3.existsSync(cache)) {
-      fs3.rmSync(cache, { recursive: true });
-    }
+    await rimraf(cacheDir(name));
     state.setPackageStatus(name, "not-installed");
     state.setDirty();
     import_coc.window.showInformationMessage(`coc-${name} uninstalled`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coc-vscode-loader",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "Run VS Code extensions seamlessly in coc.nvim",
   "main": "lib/index.js",
   "keywords": [