coc-vscode-loader 1.0.3 → 1.1.1

package/lib/index.js

@@ -41,38 +41,6 @@ var fs = __toESM(require("fs"));
 var os = __toESM(require("os"));
 var REMOTE_REGISTRY_URL = "https://raw.githubusercontent.com/coc-plugin/coc-vscode-registry/main/registry.json";
 var CACHE_PATH = path.join(os.homedir(), ".config", "coc", "converter-cache", "registry.json");
-var BUILTIN_REGISTRY = [
-  {
-    name: "volar",
-    displayName: "Volar (Vue)",
-    description: "Vue language support \u2014 template/script/style IntelliSense",
-    type: "ts-bridge",
-    source: { type: "github", repo: "vuejs/language-tools", subdir: "extensions/vscode" },
-    url: "https://github.com/vuejs/language-tools",
-    languages: ["vue"],
-    categories: ["LSP", "TypeScript"]
-  },
-  {
-    name: "prisma",
-    displayName: "Prisma",
-    description: "Prisma schema language support \u2014 syntax highlight, lint, format",
-    type: "pure-lsp",
-    source: { type: "github", repo: "prisma/language-tools", subdir: "packages/vscode" },
-    url: "https://github.com/prisma/language-tools",
-    languages: ["prisma"],
-    categories: ["LSP"]
-  },
-  {
-    name: "html-css-support",
-    displayName: "HTML CSS Support",
-    description: "CSS class name completion for HTML attributes",
-    type: "direct-api",
-    source: { type: "github", repo: "ecmel/vscode-html-css" },
-    url: "https://github.com/ecmel/vscode-html-css",
-    languages: ["html", "css"],
-    categories: ["Completion"]
-  }
-];
 var cached = null;
 function loadCache() {
   try {
@@ -96,7 +64,7 @@ async function updateRegistry() {
 function getAllPackages() {
   if (cached) return cached;
   cached = loadCache();
-  return cached || BUILTIN_REGISTRY;
+  return cached || [];
 }
 function getPackage(name) {
   return getAllPackages().find((p) => p.name === name);
@@ -113,12 +81,16 @@ function createInitialState() {
   const packages = getAllPackages().map((info) => {
     const installed = isInstalled(info.name);
     let commit;
+    let commitMsg;
+    let commitDate;
     if (installed) {
       try {
         const meta = JSON.parse(
           fs2.readFileSync(path2.join(os2.homedir(), ".config", "coc", "converter-cache", info.name, "meta.json"), "utf-8")
         );
         commit = meta.commit || void 0;
+        commitMsg = meta.msg || void 0;
+        commitDate = meta.date || void 0;
       } catch {
       }
     }
@@ -126,6 +98,8 @@ function createInitialState() {
       info,
       status: installed ? "installed" : "not-installed",
       commit,
+      commitMsg,
+      commitDate,
       progressLog: [],
       expanded: false,
       logExpanded: false
@@ -165,6 +139,9 @@ var StateManager = class {
     this.mutate((s) => {
       const pkg = s.packages.find((p) => p.info.name === name);
       if (pkg) {
+        if (status === "installing" || status === "updating" || status === "uninstalling") {
+          pkg.progressLog = [];
+        }
         pkg.status = status;
         if (extra?.progress !== void 0) pkg.progress = extra.progress;
         if (extra?.logEntry !== void 0) pkg.progressLog.push(extra.logEntry);
@@ -234,6 +211,26 @@ var StateManager = class {
   getPackage(name) {
     return this.state.packages.find((p) => p.info.name === name);
   }
+  refreshPackages() {
+    this.mutate((s) => {
+      const updated = getAllPackages();
+      const oldMap = new Map(s.packages.map((p) => [p.info.name, p]));
+      s.packages = updated.map((info) => {
+        const old = oldMap.get(info.name);
+        if (old) {
+          old.info = info;
+          return old;
+        }
+        return {
+          info,
+          status: isInstalled(info.name) ? "installed" : "not-installed",
+          progressLog: [],
+          expanded: false,
+          logExpanded: false
+        };
+      });
+    });
+  }
 };
 
 // src/tui.ts
@@ -259,10 +256,12 @@ function pluginDir(name) {
 }
 function converterCliPath() {
   const base = path3.resolve(__dirname, "..");
+  const cwd = process.cwd();
   const candidates = [
+    path3.join(base, "converter", "src", "cli.ts"),
     path3.join(base, "..", "converter", "src", "cli.ts"),
-    path3.join(base, "..", "..", "converter", "src", "cli.ts"),
-    path3.join(base, "..", "..", "..", "converter", "src", "cli.ts")
+    path3.join(cwd, "converter", "src", "cli.ts"),
+    path3.join(cwd, "..", "converter", "src", "cli.ts")
   ];
   for (const p of candidates) {
     if (fs3.existsSync(p)) return p;
@@ -313,14 +312,50 @@ async function convertSource(inputDir, name, onProgress) {
   await run("npx", ["tsx", cli, "convert", inputDir, "-o", build], cacheDir(name), () => {
   });
 }
-async function buildPackage(name, onProgress) {
+async function buildPackage(name, inputDir, info, onProgress) {
   const build = buildDir(name);
   onProgress(3, 5, "Installing dependencies...", "npm install --legacy-peer-deps");
   await run("npm", ["install", "--legacy-peer-deps"], build, () => {
   });
+  onProgress(3, 5, "Running postinstall...", "npm run postinstall");
+  await run("npm", ["run", "postinstall", "--if-present"], build, () => {
+  }).catch(() => {
+  });
+  const serverDir = path3.join(inputDir, "server");
+  if (fs3.existsSync(serverDir) && fs3.existsSync(path3.join(serverDir, "package.json"))) {
+    onProgress(3, 5, "Installing server dependencies...", `npm install in ${serverDir}`);
+    await run("npm", ["install", "--legacy-peer-deps"], serverDir, () => {
+    });
+    const destServer = path3.join(build, "server");
+    if (fs3.existsSync(destServer)) fs3.rmSync(destServer, { recursive: true });
+    fs3.cpSync(serverDir, destServer, { recursive: true });
+  }
   onProgress(4, 5, "Building...", "node esbuild.mjs");
   await run("node", ["esbuild.mjs"], build, () => {
   });
+  if (info.serverBinary) {
+    const sb = info.serverBinary;
+    onProgress(4, 5, "Downloading language server...", `fetching ${sb.repo}`);
+    try {
+      const tagData = await runWithOutput("gh", ["api", `repos/${sb.repo}/releases/latest`, "--jq", ".tag_name"], os3.homedir());
+      const version = tagData.replace(/^v/, "");
+      const arch2 = os3.arch() === "arm64" ? "arm64" : "x64";
+      const platform = process.platform === "win32" ? "win32" : process.platform === "darwin" ? "darwin" : "linux";
+      const filename = sb.asset.replace("{{version}}", version).replace("{{platform}}", platform).replace("{{arch}}", arch2);
+      const url = `https://github.com/${sb.repo}/releases/download/${version}/${filename}`;
+      onProgress(4, 5, "Downloading...", `curl ${filename}`);
+      await run("curl", ["-sSL", url, "-o", path3.join(build, filename)], build, () => {
+      });
+      onProgress(4, 5, "Extracting...", `tar xzf ${filename}`);
+      const serverDir2 = path3.join(build, "server");
+      fs3.mkdirSync(serverDir2, { recursive: true });
+      await run("tar", ["xzf", filename, "-C", serverDir2], build, () => {
+      });
+      fs3.rmSync(path3.join(build, filename));
+    } catch {
+      onProgress(4, 5, "Warning: server download failed", "install server binary manually");
+    }
+  }
 }
 function extensionsPkgPath() {
   return path3.join(os3.homedir(), ".config", "coc", "extensions", "package.json");
@@ -347,8 +382,9 @@ function metaPath(name) {
 function saveMeta(name) {
   const srcDir = sourceDir(name);
   try {
-    const commit = (0, import_child_process.execSync)("git", ["-C", srcDir, "rev-parse", "--short", "HEAD"], { encoding: "utf-8" }).toString().trim();
-    fs3.writeFileSync(metaPath(name), JSON.stringify({ commit, updatedAt: Date.now() }, null, 2));
+    const log = (0, import_child_process.execSync)(`git -C "${srcDir}" log -1 --format="%h|%s|%ar"`, { encoding: "utf-8" }).toString().trim();
+    const [commit, msg, date] = log.split("|");
+    fs3.writeFileSync(metaPath(name), JSON.stringify({ commit, msg, date, updatedAt: Date.now() }, null, 2));
   } catch {
   }
 }
@@ -370,11 +406,26 @@ async function installPackage(state, name) {
   try {
     const input = await downloadSource(info, name, prog);
     await convertSource(input, name, prog);
-    await buildPackage(name, prog);
+    await buildPackage(name, input, info, prog);
     await installToCoc(name, prog);
     saveMeta(name);
     state.setDirty();
     state.setPackageStatus(name, "installed");
+    try {
+      const meta = JSON.parse(fs3.readFileSync(metaPath(name), "utf-8"));
+      if (meta.commit) {
+        state.mutate((s) => {
+          const p = s.packages.find((p2) => p2.info.name === name);
+          if (p) {
+            p.commit = meta.commit;
+            p.commitMsg = meta.msg;
+            p.commitDate = meta.date;
+            p.updated = true;
+          }
+        });
+      }
+    } catch {
+    }
   } catch (e) {
     state.setPackageStatus(name, "failed", { error: e.message });
   }
@@ -424,11 +475,26 @@ async function updatePackage(state, name) {
   try {
     const input = await downloadSource(info, name, prog);
     await convertSource(input, name, prog);
-    await buildPackage(name, prog);
+    await buildPackage(name, input, info, prog);
     await installToCoc(name, prog);
     saveMeta(name);
     state.setDirty();
     state.setPackageStatus(name, "installed");
+    try {
+      const meta = JSON.parse(fs3.readFileSync(metaPath(name), "utf-8"));
+      if (meta.commit) {
+        state.mutate((s) => {
+          const p = s.packages.find((p2) => p2.info.name === name);
+          if (p) {
+            p.commit = meta.commit;
+            p.commitMsg = meta.msg;
+            p.commitDate = meta.date;
+            p.updated = true;
+          }
+        });
+      }
+    } catch {
+    }
   } catch (e) {
     state.setPackageStatus(name, "failed", { error: e.message });
   }
@@ -912,6 +978,15 @@ var TUI = class {
     if (entry.hasUpdate) {
       buf.append("  \u2191", "CocConverterKey");
     }
+    if (entry.updated && entry.commit && entry.commitMsg) {
+      buf.nl();
+      const ln = buf.currentLine();
+      buf.append(`     ${entry.commit} ${entry.commitMsg}`, "Comment");
+      if (entry.commitDate) {
+        buf.append(` (${entry.commitDate})`, "Comment");
+      }
+      pkgLineMap.set(ln, entry.info.name);
+    }
     if (entry.expanded) {
       buf.nl();
       for (const text of [
@@ -1070,6 +1145,8 @@ async function activate(context) {
       }
     })
   );
+  updateRegistry().then(() => state.refreshPackages()).catch(() => {
+  });
   import_coc2.window.showInformationMessage("coc-loader activated! Use :CocCommand loader.open");
 }
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coc-vscode-loader",
-  "version": "1.0.3",
+  "version": "1.1.1",
   "description": "Run VS Code extensions seamlessly in coc.nvim",
   "main": "lib/index.js",
   "keywords": [
@@ -24,16 +24,22 @@
     "coc": ">= 0.0.80"
   },
   "scripts": {
-    "build": "node esbuild.mjs",
+    "bundle-converter": "rm -rf converter && cp -r ../converter ./converter && cd converter && npm install --legacy-peer-deps",
+    "build": "npm run bundle-converter && node esbuild.mjs",
     "prepare": "node esbuild.mjs"
   },
   "devDependencies": {
     "coc.nvim": "^0.0.83-next.18",
-    "esbuild": "^0.25.0",
-    "typescript": "^5.3.3"
+    "esbuild": "^0.28.1",
+    "typescript": "^6.0.3"
   },
   "activationEvents": [
     "onCommand:loader.open",
+    "onCommand:loader.install",
+    "onCommand:loader.uninstall",
+    "onCommand:loader.update",
+    "onCommand:loader.uninstallAll",
+    "onCommand:loader.updateRegistry",
     "onCommand:loader._dispatch"
   ],
   "contributes": {