@marko/language-server 1.1.1 → 1.1.3

package/dist/index.mjs

@@ -13,13 +13,17 @@ import {
   TextDocumentSyncKind,
   createConnection
 } from "vscode-languageserver/node";
-import { Project as Project5 } from "@marko/language-tools";
+import { Project as Project6 } from "@marko/language-tools";
 
 // src/utils/file.ts
 import path from "path";
 import { Project, parse } from "@marko/language-tools";
 import { URI } from "vscode-uri";
 var processorCaches = /* @__PURE__ */ new WeakMap();
+function getFSDir(doc) {
+  const filename = getFSPath(doc);
+  return filename ? path.dirname(filename) : void 0;
+}
 function getFSPath(doc) {
   return URI.parse(doc.uri).fsPath;
 }
@@ -1962,13 +1966,17 @@ function extractDocumentSymbols({
 import { TextEdit as TextEdit6 } from "vscode-languageserver";
 import * as prettier from "prettier";
 import * as markoPrettier from "prettier-plugin-marko";
+import { Project as Project3 } from "@marko/language-tools";
 var format2 = async (doc, params, cancel) => {
   try {
+    const dir = getFSDir(doc);
     const filepath = getFSPath(doc);
     const text = doc.getText();
     const options = {
       parser: "marko",
       filepath,
+      markoCompiler: Project3.getCompiler(dir),
+      markoCompilerConfig: Project3.getConfig(dir),
       plugins: [markoPrettier],
       tabWidth: params.options.tabSize,
       useTabs: params.options.insertSpaces === false,
@@ -2019,25 +2027,32 @@ import { URI as URI6 } from "vscode-uri";
 import * as prettier2 from "prettier";
 import {
   NodeType as NodeType9,
-  Project as Project4,
+  Project as Project5,
   ScriptLang,
   extractScript
 } from "@marko/language-tools";
 
 // src/ts-plugin/host.ts
 import path6 from "path";
+import * as defaultCompiler from "@marko/compiler";
+import * as defaultConfig from "@marko/compiler/config";
+import * as defaultTranslator from "@marko/translator-default";
 import {
   Processors,
-  Project as Project3,
+  Project as Project4,
   getExt,
   isDefinitionFile
 } from "@marko/language-tools";
 var fsPathReg = /^(?:[./\\]|[A-Z]:)/i;
 var modulePartsReg = /^((?:@(?:[^/]+)\/)?(?:[^/]+))(.*)$/;
-Project3.setDefaultTypePaths({
+Project4.setDefaultTypePaths({
   internalTypesFile: path6.join(__dirname, "marko.internal.d.ts"),
   markoTypesFile: path6.join(__dirname, "marko.runtime.d.ts")
 });
+Project4.setDefaultCompilerMeta(defaultCompiler, {
+  ...defaultConfig,
+  translator: defaultTranslator
+});
 function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
   var _a, _b, _c;
   const processors = Processors.create({
@@ -2413,7 +2428,7 @@ var ScriptService = {
         return;
       const tsProject = getTSProject(filename);
       const extracted = processScript(doc, tsProject);
-      const lang = Project4.getScriptLang(
+      const lang = Project5.getScriptLang(
         filename,
         tsProject.markoScriptLang,
         ts,
@@ -2797,8 +2812,8 @@ function processScript(doc, tsProject) {
       ts,
       parsed,
       lookup,
-      scriptLang: Project4.getScriptLang(filename, markoScriptLang, ts, host),
-      runtimeTypesCode: (_a = Project4.getTypeLibs(tsProject.rootDir, ts, host)) == null ? void 0 : _a.markoTypesCode
+      scriptLang: Project5.getScriptLang(filename, markoScriptLang, ts, host),
+      runtimeTypesCode: (_a = Project5.getTypeLibs(tsProject.rootDir, ts, host)) == null ? void 0 : _a.markoTypesCode
     });
   });
 }
@@ -2870,7 +2885,7 @@ function getTSProject(docFsPath) {
     }
   }
   const rootDir = configFile && path7.dirname(configFile) || process.cwd();
-  const cache = Project4.getCache(configFile && rootDir);
+  const cache = Project5.getCache(configFile && rootDir);
   let projectCache = cache.get(getTSProject);
   let cached;
   if (projectCache) {
@@ -3575,39 +3590,31 @@ var service = {
     );
   },
   async doComplete(doc, params, cancel) {
-    const itemsByLabel = /* @__PURE__ */ new Map();
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.doComplete) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur) {
-          let curItems;
-          if (Array.isArray(cur)) {
-            curItems = cur;
-          } else {
-            curItems = cur.items;
-          }
-          for (const item of curItems) {
-            const { label } = item;
-            const existingItem = itemsByLabel.get(label);
-            if (existingItem) {
-              if ((existingItem.sortText || label) < (item.sortText || label)) {
-                itemsByLabel.set(label, item);
-              }
-            } else {
-              itemsByLabel.set(label, item);
-            }
-          }
-        }
+        return (_a = plugin.doComplete) == null ? void 0 : _a.call(plugin, doc, params, cancel);
       })
     );
     if (cancel.isCancellationRequested)
       return;
-    if (itemsByLabel.size) {
-      return { items: [...itemsByLabel.values()], isIncomplete: true };
+    const itemsByLabel = /* @__PURE__ */ new Map();
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      for (const item of Array.isArray(result.value) ? result.value : result.value.items) {
+        const { label } = item;
+        const existingItem = itemsByLabel.get(label);
+        if (existingItem) {
+          if ((existingItem.sortText || label) < (item.sortText || label)) {
+            itemsByLabel.set(label, item);
+          }
+        } else {
+          itemsByLabel.set(label, item);
+        }
+      }
     }
+    return { items: [...itemsByLabel.values()], isIncomplete: true };
   },
   async doCompletionResolve(item, cancel) {
     var _a;
@@ -3623,172 +3630,189 @@ var service = {
     }
   },
   async findDefinition(doc, params, cancel) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.findDefinition) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur)
-          result = (result || []).concat(cur);
+        return (_a = plugin.findDefinition) == null ? void 0 : _a.call(plugin, doc, params, cancel);
       })
     );
     if (cancel.isCancellationRequested)
       return;
-    return result;
+    let links;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      links = (links || []).concat(result.value);
+    }
+    return links;
   },
   async findReferences(doc, params, cancel) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.findReferences) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur)
-          result = (result || []).concat(cur);
+        return (_a = plugin.findReferences) == null ? void 0 : _a.call(plugin, doc, params, cancel);
       })
     );
     if (cancel.isCancellationRequested)
       return;
-    return result;
+    let references;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      references = (references || []).concat(result.value);
+    }
+    return references;
   },
   async findDocumentSymbols(doc, params, cancel) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.findDocumentSymbols) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur)
-          result = (result || []).concat(cur);
+        return (_a = plugin.findDocumentSymbols) == null ? void 0 : _a.call(plugin, doc, params, cancel);
       })
     );
     if (cancel.isCancellationRequested)
       return;
-    return result;
+    let symbols;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      symbols = (symbols || []).concat(result.value);
+    }
+    return symbols;
   },
   async findDocumentLinks(doc, params, cancel) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.findDocumentLinks) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur)
-          result = (result || []).concat(cur);
+        return (_a = plugin.findDocumentLinks) == null ? void 0 : _a.call(plugin, doc, params, cancel);
       })
     );
     if (cancel.isCancellationRequested)
       return;
-    return result;
+    let links;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      links = (links || []).concat(result.value);
+    }
+    return links;
   },
   async findDocumentHighlights(doc, params, cancel) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
-        var _a;
-        const cur = await ((_a = plugin.findDocumentHighlights) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur)
-          result = (result || []).concat(cur);
-      })
+    const results = await Promise.allSettled(
+      plugins.map(
+        (plugin) => {
+          var _a;
+          return (_a = plugin.findDocumentHighlights) == null ? void 0 : _a.call(plugin, doc, params, cancel);
+        }
+      )
     );
     if (cancel.isCancellationRequested)
       return;
-    return result;
+    let highlights;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      highlights = (highlights || []).concat(result.value);
+    }
+    return highlights;
   },
   async findDocumentColors(doc, params, cancel) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.findDocumentColors) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur)
-          result = (result || []).concat(cur);
+        return (_a = plugin.findDocumentColors) == null ? void 0 : _a.call(plugin, doc, params, cancel);
       })
     );
     if (cancel.isCancellationRequested)
       return;
-    return result;
+    let colors;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      colors = (colors || []).concat(result.value);
+    }
+    return colors;
   },
   async getColorPresentations(doc, params, cancel) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
-        var _a;
-        const cur = await ((_a = plugin.getColorPresentations) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur)
-          result = (result || []).concat(cur);
-      })
+    const results = await Promise.allSettled(
+      plugins.map(
+        (plugin) => {
+          var _a;
+          return (_a = plugin.getColorPresentations) == null ? void 0 : _a.call(plugin, doc, params, cancel);
+        }
+      )
     );
     if (cancel.isCancellationRequested)
       return;
-    return result;
+    let presentations;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      presentations = (presentations || []).concat(result.value);
+    }
+    return presentations;
   },
   async doHover(doc, params, cancel) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.doHover) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur) {
-          if (result) {
-            result.range = maxRange(result.range, cur.range);
-            result.contents = mergeHoverContents(result.contents, cur.contents);
-          } else {
-            result = cur;
-          }
-        }
+        return (_a = plugin.doHover) == null ? void 0 : _a.call(plugin, doc, params, cancel);
       })
     );
-    return result;
+    if (cancel.isCancellationRequested)
+      return;
+    let hovers;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      if (hovers) {
+        hovers.range = maxRange(hovers.range, result.value.range);
+        hovers.contents = mergeHoverContents(
+          hovers.contents,
+          result.value.contents
+        );
+      } else {
+        hovers = result.value;
+      }
+    }
+    return hovers;
   },
   async doRename(doc, params, cancel) {
-    let changes;
-    let changeAnnotations;
-    let documentChanges;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.doRename) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur) {
-          if (cur.changes) {
-            if (changes) {
-              changes = { ...changes };
-              for (const uri in cur.changes) {
-                changes[uri] = changes[uri] ? changes[uri].concat(cur.changes[uri]) : cur.changes[uri];
-              }
-            } else {
-              changes = cur.changes;
-            }
-          }
-          if (cur.changeAnnotations) {
-            changeAnnotations = changeAnnotations ? {
-              ...changeAnnotations,
-              ...cur.changeAnnotations
-            } : cur.changeAnnotations;
-          }
-          if (cur.documentChanges) {
-            documentChanges = documentChanges ? documentChanges.concat(cur.documentChanges) : cur.documentChanges;
-          }
-        }
+        return (_a = plugin.doRename) == null ? void 0 : _a.call(plugin, doc, params, cancel);
       })
     );
     if (cancel.isCancellationRequested)
       return;
+    let changes;
+    let changeAnnotations;
+    let documentChanges;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      const { value } = result;
+      if (value.changes) {
+        if (changes) {
+          changes = { ...changes };
+          for (const uri in value.changes) {
+            changes[uri] = changes[uri] ? changes[uri].concat(value.changes[uri]) : value.changes[uri];
+          }
+        } else {
+          changes = value.changes;
+        }
+      }
+      if (value.changeAnnotations) {
+        changeAnnotations = changeAnnotations ? {
+          ...changeAnnotations,
+          ...value.changeAnnotations
+        } : value.changeAnnotations;
+      }
+      if (value.documentChanges) {
+        documentChanges = documentChanges ? documentChanges.concat(value.documentChanges) : value.documentChanges;
+      }
+    }
     if (changes || changeAnnotations || documentChanges) {
       return {
         changes,
@@ -3798,32 +3822,36 @@ var service = {
     }
   },
   async doCodeActions(doc, params, cancel) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.doCodeActions) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur)
-          result = (result || []).concat(cur);
+        return (_a = plugin.doCodeActions) == null ? void 0 : _a.call(plugin, doc, params, cancel);
       })
     );
     if (cancel.isCancellationRequested)
       return;
-    return result;
+    let actions;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      actions = (actions || []).concat(result.value);
+    }
+    return actions;
   },
   async doValidate(doc) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.doValidate) == null ? void 0 : _a.call(plugin, doc));
-        if (cur)
-          result = (result || []).concat(cur);
+        return (_a = plugin.doValidate) == null ? void 0 : _a.call(plugin, doc);
       })
     );
-    return result;
+    let diagnostics;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      diagnostics = (diagnostics || []).concat(result.value);
+    }
+    return diagnostics;
   },
   format: marko_default.format
 };
@@ -4063,7 +4091,7 @@ for (const command in service.commands) {
 }
 function validateDocs() {
   queueDiagnostic();
-  Project5.clearCaches();
+  Project6.clearCaches();
 }
 function queueDiagnostic() {
   clearTimeout(diagnosticTimeout);