coc-vscode-loader 1.1.9 → 1.2.1

package/converter/src/transforms/class-to-factory.ts

@@ -39,8 +39,7 @@ export const transformClassToFactory: Transform = (ctx) => {
     (match, type) => `${type}.create(`
   )
 
-  // CompletionItem.create(label) doesn't accept kind in coc.
-  // Convert `CompletionItem.create(label, kind)` to `item = CompletionItem.create(label); item.kind = kind`
+  // CompletionItem.create(label, kind) → item = CompletionItem.create(label); item.kind = kind
   text = text.replace(
     /const\s+(\w+)\s*=\s*CompletionItem\.create\(([^,]+),\s*([^)]+)\)/g,
     (_, varName, label, kind) => {

package/converter/src/transforms/enum-offset.ts

@@ -19,23 +19,6 @@ export const transformEnumOffset: Transform = (ctx) => {
   const { file } = ctx
   let content = file.getText()
 
-  // Detect hardcoded numbers used in enum position (e.g., CompletionItemKind.Xxx).
-  // This is hard to detect perfectly, so we log a note when numeric literals
-  // appear near enum-type names.
-  const enumPatterns = [
-    'CompletionItemKind', 'SymbolKind', 'DocumentHighlightKind', 'DiagnosticSeverity',
-    'CompletionTriggerKind', 'InlineCompletionTriggerKind',
-  ]
-
-  for (const enumName of enumPatterns) {
-    // Check if the enum is imported/used with a hardcoded number nearby
-    const enumRefs = content.match(new RegExp(`${enumName}\\.\\w+`, 'g'))
-    if (enumRefs) {
-      // Symbol references are fine - they resolve at runtime
-      // Only note if there are raw numbers being compared
-    }
-  }
-
   // Replace any numeric enum comparisons with comments
   // e.g., `severity === 0` → `severity === 0 /* DiagnosticSeverity.Error = 1 in coc */`
   content = content.replace(

package/converter/src/transforms/provider-register.ts

@@ -1,3 +1,4 @@
+import * as path from 'path'
 import { Transform } from '../types.js'
 
 /**
@@ -32,10 +33,15 @@ export const transformProviderRegister: Transform = (ctx) => {
   }
 
   // 2. registerCompletionItemProvider: insert name + shortcut at beginning
+  // Shortcut derived from source file name (first 2 uppercase letters)
+  const fileName = file.getFilePath() || 'plugin'
+  const baseName = path.basename(fileName, '.ts')
+  const shortcut = baseName.replace(/[^a-zA-Z]/g, '').substring(0, 2).toUpperCase() || 'PL'
   if (content.includes('registerCompletionItemProvider')) {
+    const pluginName = path.basename(path.dirname(path.dirname(fileName))) || 'plugin'
     content = content.replace(
       /registerCompletionItemProvider\(/g,
-      `registerCompletionItemProvider('plugin', 'PL', `
+      `registerCompletionItemProvider('${pluginName}', '${shortcut}', `
     )
     // Wrap the last argument in an array if it's a string (trigger chars)
     content = content.replace(

package/converter/src/transforms/strip-volar.ts

@@ -0,0 +1,29 @@
+import { Transform } from '../types.js'
+
+/**
+ * Remove Volar-specific framework imports that are not compatible with coc.nvim.
+ * The Volar extension uses @volar/vscode and reactive-vscode meta-framework,
+ * which need to be stripped since the bridge step provides alternative setup.
+ */
+export const transformStripVolar: Transform = (ctx) => {
+  const { file } = ctx
+  let content = file.getText()
+  let changed = false
+
+  const patterns = [
+    /import .* from ['"]@volar\/vscode['"];?\n?/g,
+    /import .* from ['"]reactive-vscode['"];?\n?/g,
+    /import \* as lsp from ['"]@volar\/vscode\/node['"];?\n?/g,
+  ]
+
+  for (const re of patterns) {
+    if (re.test(content)) {
+      content = content.replace(re, '')
+      changed = true
+    }
+  }
+
+  if (changed) {
+    file.replaceWithText(content)
+  }
+}

package/converter/src/types.ts

@@ -6,3 +6,120 @@ export interface TransformContext {
 }
 
 export type Transform = (ctx: TransformContext) => void
+
+// ---- Step type definitions ----
+
+export interface ServerModuleConfig {
+  kind: 'module'
+  package: string
+  entry?: 'main' | 'bin'
+}
+
+export interface ServerBinaryConfig {
+  kind: 'binary'
+  package: string
+  binary: {
+    repo: string
+    asset: string
+    binaryPath?: string
+  }
+  args?: string[]
+}
+
+export type ServerConfig = ServerModuleConfig | ServerBinaryConfig
+
+export interface LanguageClientStep {
+  type: 'language-client'
+  id?: string
+  server: ServerConfig
+  transport?: 'ipc' | 'stdio'
+  languages: string[]
+  multiRoot?: boolean
+  /** Enable debug logging in generated code */
+  verbose?: boolean
+}
+
+export interface SourceStep {
+  type: 'source'
+  transforms: string[]
+  entry?: string
+  keepDeps?: string[] | Record<string, string>
+  activationEvents?: string[]
+  /** Enable debug logging in generated/transformed code */
+  verbose?: boolean
+}
+
+export interface BridgeStep {
+  type: 'bridge'
+  preset?: string
+  /** Override preset options (extensions, services, etc.) */
+  options?: {
+    extensions?: string[]
+    services?: string[]
+  }
+  /** Enable debug logging in generated bridge code */
+  verbose?: boolean
+}
+
+export interface MarkUnsupportedStep {
+  type: 'mark-unsupported'
+  features: string[]
+  /** Enable detailed output during conversion */
+  verbose?: boolean
+}
+
+export type ConvertStep = LanguageClientStep | SourceStep | BridgeStep | MarkUnsupportedStep
+
+// ---- Step execution ----
+
+export interface StepResult {
+  generatedFiles: Array<{ path: string; content: string }>
+  entryPoint?: string
+  keepDeps: Record<string, string>
+  activationEvents: string[]
+  serverBinary?: {
+    repo: string
+    asset: string
+    binaryPath?: string
+    args?: string[]
+  }
+  /** Code to inject into previously generated files (target path, code to insert, insertion point) */
+  codeInjections?: Array<{
+    target: string        // file to modify (e.g. 'src/index.ts')
+    importCode?: string   // import line to add at top
+    insertBefore?: string // regex pattern to insert code before
+    insertAfter?: string  // regex pattern to insert code after
+    code: string          // code to insert
+  }>
+}
+
+export interface StepContext {
+  input: string
+  output: string
+  project: Project
+  origPkg: Record<string, any>
+  verbose?: boolean
+  /** Preset definitions from registry (e.g. bridge presets) */
+  presets?: Record<string, any>
+}
+
+export interface StepGenerator {
+  type: string
+  generate(ctx: StepContext, step: ConvertStep): StepResult
+}
+
+export function isLanguageClientStep(s: ConvertStep): s is LanguageClientStep {
+  return s.type === 'language-client'
+}
+
+export function isSourceStep(s: ConvertStep): s is SourceStep {
+  return s.type === 'source'
+}
+
+export function isBridgeStep(s: ConvertStep): s is BridgeStep {
+  return s.type === 'bridge'
+}
+
+export function isMarkUnsupportedStep(s: ConvertStep): s is MarkUnsupportedStep {
+  return s.type === 'mark-unsupported'
+}

package/lib/index.js

@@ -39,7 +39,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "coc-vscode-loader",
-      version: "1.1.9",
+      version: "1.2.1",
       description: "Run VS Code extensions seamlessly in coc.nvim",
       main: "lib/index.js",
       keywords: [
@@ -159,9 +159,13 @@ async function fetchRegistryJSON(url) {
     (0, import_child_process.execFile)("curl", ["-sL", url], { encoding: "utf-8", maxBuffer: 5 * 1024 * 1024 }, (err, stdout) => {
       if (err) reject(new Error(`curl failed: ${err.message}`));
       else {
-        const data = JSON.parse(stdout);
-        if (!Array.isArray(data)) reject(new Error("Invalid registry format"));
-        else resolve2(data);
+        try {
+          const data = JSON.parse(stdout);
+          if (!Array.isArray(data)) reject(new Error("Invalid registry format"));
+          else resolve2(data);
+        } catch (e) {
+          reject(new Error(`Invalid JSON from registry: ${e.message}`));
+        }
       }
     });
   });
@@ -437,8 +441,10 @@ function pluginDir(name) {
 function converterCliPath() {
   const base = path3.resolve(__dirname, "..");
   const candidates = [
-    path3.join(base, "converter", "src", "cli.ts"),
-    path3.join(base, "..", "converter", "src", "cli.ts")
+    // In dev mode (symlink), the converter is at repo root
+    path3.join(base, "..", "converter", "src", "cli.ts"),
+    // In npm install, the converter is bundled inside the package
+    path3.join(base, "converter", "src", "cli.ts")
   ];
   for (const p of candidates) {
     if (fs3.existsSync(p)) return p;
@@ -450,7 +456,7 @@ function converterCliPath() {
 var CMD_TIMEOUT = 3e5;
 async function run(cmd, args, cwd, onLine) {
   return new Promise((resolve2, reject) => {
-    const child = (0, import_child_process2.spawn)(cmd, args, { cwd, stdio: ["ignore", "pipe", "pipe"], shell: true });
+    const child = (0, import_child_process2.spawn)(cmd, args, { cwd, stdio: ["ignore", "pipe", "pipe"], shell: false });
     const timer = setTimeout(() => {
       child.kill("SIGTERM");
       reject(new Error(`Timed out after ${CMD_TIMEOUT / 1e3}s: ${cmd} ${args.join(" ")}`));
@@ -492,7 +498,7 @@ async function downloadSource(info, name, onProgress) {
   }
   return info.source.subdir ? path3.join(srcDir, info.source.subdir) : srcDir;
 }
-async function convertSource(inputDir, name, onProgress) {
+async function convertSource(inputDir, name, info, onProgress) {
   const build = buildDir(name);
   if (fs3.existsSync(build)) fs3.rmSync(build, { recursive: true });
   const cli = converterCliPath();
@@ -500,11 +506,40 @@ async function convertSource(inputDir, name, onProgress) {
   if (!fs3.existsSync(path3.join(converterDir, "node_modules", "commander"))) {
     onProgress(2, 5, "Installing converter dependencies...", "");
     const log2 = (chunk) => onProgress(2, 5, chunk.trim(), "");
-    await run("npm", ["install", "--legacy-peer-deps", "--production"], converterDir, log2);
+    await run("npm", ["install", "--legacy-peer-deps", "--omit=dev"], converterDir, log2);
+  }
+  if (!info.convert || !Array.isArray(info.convert) || info.convert.length === 0) {
+    throw new Error(`Registry entry "${name}" has no "convert" config. Please update the registry.`);
+  }
+  const convertFile = path3.join(cacheDir(name), "convert-config.json");
+  fs3.mkdirSync(path3.dirname(convertFile), { recursive: true });
+  fs3.writeFileSync(convertFile, JSON.stringify(info.convert));
+  const presetsFile = path3.join(cacheDir(name), "presets-config.json");
+  const registryDir = path3.resolve(__dirname, "..", "..", "coc-vscode-registry");
+  const localPresets = path3.join(registryDir, "presets.json");
+  if (fs3.existsSync(localPresets)) {
+    fs3.writeFileSync(presetsFile, fs3.readFileSync(localPresets));
+  } else {
+    const globalPresetsCache = path3.join(os3.homedir(), ".config", "coc", "converter-cache", "presets.json");
+    if (!fs3.existsSync(globalPresetsCache)) {
+      try {
+        const res = await fetch("https://raw.githubusercontent.com/coc-plugin/coc-vscode-registry/main/presets.json");
+        if (res.ok) {
+          fs3.mkdirSync(path3.dirname(globalPresetsCache), { recursive: true });
+          fs3.writeFileSync(globalPresetsCache, await res.text());
+        }
+      } catch {
+      }
+    }
+    if (fs3.existsSync(globalPresetsCache)) {
+      fs3.writeFileSync(presetsFile, fs3.readFileSync(globalPresetsCache));
+    }
   }
+  const args = ["tsx", cli, "convert", inputDir, "-o", build, "--convert-file", convertFile];
+  if (fs3.existsSync(presetsFile)) args.push("--presets-file", presetsFile);
   onProgress(2, 5, "Converting...", `converter convert ${inputDir} -o ${build}`);
   const log = (chunk) => onProgress(2, 5, chunk.trim(), "");
-  await run("npx", ["tsx", cli, "convert", inputDir, "-o", build], cacheDir(name), log);
+  await run("npx", args, cacheDir(name), log);
 }
 async function buildPackage(name, inputDir, info, onProgress) {
   const build = buildDir(name);
@@ -614,56 +649,18 @@ async function buildPackage(name, inputDir, info, onProgress) {
       }
       const indexPath = path3.join(build, "lib", "index.js");
       if (fs3.existsSync(indexPath)) {
-        const binPath = (sb.binaryPath || sb.asset.split(/-?\{\{/)[0]).replace(/\{\{version}}/g, version).replace(/\{\{platform}}/g, platform).replace(/\{\{arch}}/g, arch2).replace(/\{\{raw-arch}}/g, rawArch).replace(/\{\{rust-target}}/g, rustTarget);
         let code = fs3.readFileSync(indexPath, "utf-8");
-        const svrArgs = sb.args?.length ? JSON.stringify(sb.args) : "[]";
-        code = code.replace(
-          /\{ module:\s*serverModule,\s*transport:\s*\w+\.TransportKind\.\w+\s*\}/,
-          `{ command: serverModule, args: ${svrArgs} }`
-        );
-        const serverPath = `require('path').join(__dirname, '..', 'server', '${binPath}')`;
-        code = code.replace(
-          /try\s*\{[^}]*?require\.resolve\([^)]+\)\s*;?\s*\}\s*catch\s*\{\s*\}/g,
-          `try { serverModule = ${serverPath} } catch {}`
-        );
-        code = code.replace(
-          /let\s+serverModule\s*=\s*config\.get\([^)]+\)\s*;?\s*/g,
-          `let serverModule = ${serverPath};`
-        );
+        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);
       }
     } catch (e) {
       onProgress(4, 5, `Warning: serverBinary setup failed (${e.message})`, "install server binary manually");
     }
   }
-  const docSelPath = path3.join(build, "lib", "index.js");
-  if (fs3.existsSync(docSelPath)) {
-    let code = fs3.readFileSync(docSelPath, "utf-8");
-    const langSelector = info.languages.map((l) => `{ scheme: "file", language: "${l}" }`).join(", ");
-    code = code.replace(
-      /documentSelector:\s*\[\s*\{[^}]*?language:\s*['"][^'"]*['"][^}]*\}\s*\]/,
-      `documentSelector: [${langSelector}]`
-    );
-    code = code.replace(
-      /client\.start\(\);/g,
-      "client.start().catch(() => {/* init may complete async */});"
-    );
-    fs3.writeFileSync(docSelPath, code);
-  }
-  const pkgPath = path3.join(build, "package.json");
-  if (fs3.existsSync(pkgPath)) {
-    try {
-      const pkg = JSON.parse(fs3.readFileSync(pkgPath, "utf-8"));
-      const events = pkg.activationEvents || [];
-      const langEvents = info.languages.map((l) => `onLanguage:${l}`);
-      const newEvents = events.filter((e) => !e.startsWith("onLanguage:")).concat(langEvents);
-      if (newEvents.length > 0 && JSON.stringify(newEvents) !== JSON.stringify(events)) {
-        pkg.activationEvents = newEvents;
-        fs3.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2));
-      }
-    } catch {
-    }
-  }
 }
 function extensionsPkgPath() {
   return path3.join(os3.homedir(), ".config", "coc", "extensions", "package.json");
@@ -676,7 +673,7 @@ async function installToCoc(name, onProgress) {
   fs3.mkdirSync(path3.dirname(dest), { recursive: true });
   fs3.cpSync(src, dest, { recursive: true });
   const pkgPath = extensionsPkgPath();
-  const pkg = JSON.parse(fs3.readFileSync(pkgPath, "utf-8"));
+  const pkg = fs3.existsSync(pkgPath) ? JSON.parse(fs3.readFileSync(pkgPath, "utf-8")) : { dependencies: {} };
   pkg.dependencies = pkg.dependencies || {};
   const depName = `coc-${name}`;
   if (!pkg.dependencies[depName]) {
@@ -714,7 +711,7 @@ async function installPackage(state, name) {
   state.setPackageStatus(name, "installing", { progress: "Starting..." });
   try {
     const input = await downloadSource(info, name, prog);
-    await convertSource(input, name, prog);
+    await convertSource(input, name, info, prog);
     await buildPackage(name, input, info, prog);
     await installToCoc(name, prog);
     await saveMeta(name);
@@ -786,13 +783,13 @@ async function updatePackage(state, name) {
   state.setPackageStatus(name, "updating", { progress: "Starting..." });
   try {
     const input = await downloadSource(info, name, prog);
-    await convertSource(input, name, prog);
+    await convertSource(input, name, info, prog);
     await buildPackage(name, input, info, prog);
     await installToCoc(name, prog);
     await saveMeta(name);
     state.setDirty();
     state.setPackageStatus(name, "installed");
-    import_coc.window.showInformationMessage(`coc-${name} installed`);
+    import_coc.window.showInformationMessage(`coc-${name} updated`);
     try {
       const meta = JSON.parse(fs3.readFileSync(metaPath(name), "utf-8"));
       if (meta.commit) {
@@ -814,7 +811,7 @@ async function updatePackage(state, name) {
 }
 async function runWithOutput(cmd, args, cwd) {
   return new Promise((resolve2, reject) => {
-    const child = (0, import_child_process2.spawn)(cmd, args, { cwd, stdio: ["ignore", "pipe", "pipe"], shell: true });
+    const child = (0, import_child_process2.spawn)(cmd, args, { cwd, stdio: ["ignore", "pipe", "pipe"], shell: false });
     const timer = setTimeout(() => {
       child.kill("SIGTERM");
       reject(new Error(`Timed out after ${CMD_TIMEOUT / 1e3}s: ${cmd} ${args.join(" ")}`));
@@ -1227,7 +1224,7 @@ var TUI = class {
       return;
     }
     if (id === "X" && entry.status === "installed") {
-      uninstallPackage(this.state, pkgName);
+      await uninstallPackage(this.state, pkgName);
       return;
     }
     if (id === "R" && entry.status === "installed") {

package/package.json

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