@marko/language-server 1.1.1 → 1.1.3

package/dist/index.js

@@ -25,13 +25,17 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 // src/index.ts
 var import_util2 = require("util");
 var import_node = require("vscode-languageserver/node");
-var import_language_tools17 = require("@marko/language-tools");
+var import_language_tools18 = require("@marko/language-tools");
 
 // src/utils/file.ts
 var import_path = __toESM(require("path"));
 var import_language_tools = require("@marko/language-tools");
 var import_vscode_uri = require("vscode-uri");
 var processorCaches = /* @__PURE__ */ new WeakMap();
+function getFSDir(doc) {
+  const filename = getFSPath(doc);
+  return filename ? import_path.default.dirname(filename) : void 0;
+}
 function getFSPath(doc) {
   return import_vscode_uri.URI.parse(doc.uri).fsPath;
 }
@@ -1950,13 +1954,17 @@ function extractDocumentSymbols({
 var import_vscode_languageserver9 = require("vscode-languageserver");
 var prettier = __toESM(require("prettier"));
 var markoPrettier = __toESM(require("prettier-plugin-marko"));
+var import_language_tools14 = require("@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: import_language_tools14.Project.getCompiler(dir),
+      markoCompilerConfig: import_language_tools14.Project.getConfig(dir),
       plugins: [markoPrettier],
       tabWidth: params.options.tabSize,
       useTabs: params.options.insertSpaces === false,
@@ -1999,20 +2007,27 @@ var import_tsserverlibrary = __toESM(require("typescript/lib/tsserverlibrary"));
 var import_vscode_languageserver10 = require("vscode-languageserver");
 var import_vscode_uri6 = require("vscode-uri");
 var prettier2 = __toESM(require("prettier"));
-var import_language_tools15 = require("@marko/language-tools");
+var import_language_tools16 = require("@marko/language-tools");
 
 // src/ts-plugin/host.ts
 var import_path6 = __toESM(require("path"));
-var import_language_tools14 = require("@marko/language-tools");
+var defaultCompiler = __toESM(require("@marko/compiler"));
+var defaultConfig = __toESM(require("@marko/compiler/config"));
+var defaultTranslator = __toESM(require("@marko/translator-default"));
+var import_language_tools15 = require("@marko/language-tools");
 var fsPathReg = /^(?:[./\\]|[A-Z]:)/i;
 var modulePartsReg = /^((?:@(?:[^/]+)\/)?(?:[^/]+))(.*)$/;
-import_language_tools14.Project.setDefaultTypePaths({
+import_language_tools15.Project.setDefaultTypePaths({
   internalTypesFile: import_path6.default.join(__dirname, "marko.internal.d.ts"),
   markoTypesFile: import_path6.default.join(__dirname, "marko.runtime.d.ts")
 });
+import_language_tools15.Project.setDefaultCompilerMeta(defaultCompiler, {
+  ...defaultConfig,
+  translator: defaultTranslator
+});
 function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
   var _a, _b, _c;
-  const processors = import_language_tools14.Processors.create({
+  const processors = import_language_tools15.Processors.create({
     ts: ts2,
     host,
     configFile
@@ -2079,7 +2094,7 @@ function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
     host.readDirectory = (path8, extensions, exclude, include, depth) => {
       return readDirectory2(
         path8,
-        extensions == null ? void 0 : extensions.concat(import_language_tools14.Processors.extensions),
+        extensions == null ? void 0 : extensions.concat(import_language_tools15.Processors.extensions),
         exclude,
         include,
         depth
@@ -2126,12 +2141,12 @@ function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
             }
           }
           if (resolvedFileName) {
-            if ((0, import_language_tools14.isDefinitionFile)(resolvedFileName)) {
+            if ((0, import_language_tools15.isDefinitionFile)(resolvedFileName)) {
               if (!host.fileExists(resolvedFileName)) {
                 resolvedFileName = void 0;
               }
             } else {
-              const ext = (0, import_language_tools14.getExt)(resolvedFileName);
+              const ext = (0, import_language_tools15.getExt)(resolvedFileName);
               const definitionFile = `${resolvedFileName.slice(
                 0,
                 -ext.length
@@ -2179,7 +2194,7 @@ function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
   }
   return host;
   function getProcessor(fileName) {
-    const ext = (0, import_language_tools14.getExt)(fileName);
+    const ext = (0, import_language_tools15.getExt)(fileName);
     return ext ? processors[ext] : void 0;
   }
 }
@@ -2385,7 +2400,7 @@ var ScriptService = {
         return;
       const tsProject = getTSProject(filename);
       const extracted = processScript(doc, tsProject);
-      const lang = import_language_tools15.Project.getScriptLang(
+      const lang = import_language_tools16.Project.getScriptLang(
         filename,
         tsProject.markoScriptLang,
         import_tsserverlibrary.default,
@@ -2395,14 +2410,14 @@ var ScriptService = {
       const content = (() => {
         try {
           return prettier2.format(generated, {
-            parser: lang === import_language_tools15.ScriptLang.ts ? "typescript" : "babel"
+            parser: lang === import_language_tools16.ScriptLang.ts ? "typescript" : "babel"
           });
         } catch {
           return generated;
         }
       })();
       return {
-        language: lang === import_language_tools15.ScriptLang.ts ? "typescript" : "javascript",
+        language: lang === import_language_tools16.ScriptLang.ts ? "typescript" : "javascript",
         content
       };
     }
@@ -2765,12 +2780,12 @@ function processScript(doc, tsProject) {
   return processDoc(doc, ({ filename, parsed, lookup }) => {
     var _a;
     const { host, markoScriptLang } = tsProject;
-    return (0, import_language_tools15.extractScript)({
+    return (0, import_language_tools16.extractScript)({
       ts: import_tsserverlibrary.default,
       parsed,
       lookup,
-      scriptLang: import_language_tools15.Project.getScriptLang(filename, markoScriptLang, import_tsserverlibrary.default, host),
-      runtimeTypesCode: (_a = import_language_tools15.Project.getTypeLibs(tsProject.rootDir, import_tsserverlibrary.default, host)) == null ? void 0 : _a.markoTypesCode
+      scriptLang: import_language_tools16.Project.getScriptLang(filename, markoScriptLang, import_tsserverlibrary.default, host),
+      runtimeTypesCode: (_a = import_language_tools16.Project.getTypeLibs(tsProject.rootDir, import_tsserverlibrary.default, host)) == null ? void 0 : _a.markoTypesCode
     });
   });
 }
@@ -2781,9 +2796,9 @@ function getInsertModuleStatementOffset(parsed) {
     let lastImport;
     for (const node of program.static) {
       switch (node.type) {
-        case import_language_tools15.NodeType.Export:
+        case import_language_tools16.NodeType.Export:
           return node.start;
-        case import_language_tools15.NodeType.Import:
+        case import_language_tools16.NodeType.Import:
           lastImport = node;
           break;
       }
@@ -2824,7 +2839,7 @@ function docLocationAtTextSpan(doc, { start, length }) {
 function getTSProject(docFsPath) {
   var _a;
   let configFile;
-  let markoScriptLang = import_language_tools15.ScriptLang.js;
+  let markoScriptLang = import_language_tools16.ScriptLang.js;
   if (docFsPath) {
     configFile = import_tsserverlibrary.default.findConfigFile(
       docFsPath,
@@ -2832,7 +2847,7 @@ function getTSProject(docFsPath) {
       "tsconfig.json"
     );
     if (configFile) {
-      markoScriptLang = import_language_tools15.ScriptLang.ts;
+      markoScriptLang = import_language_tools16.ScriptLang.ts;
     } else {
       configFile = import_tsserverlibrary.default.findConfigFile(
         docFsPath,
@@ -2842,7 +2857,7 @@ function getTSProject(docFsPath) {
     }
   }
   const rootDir = configFile && import_path7.default.dirname(configFile) || process.cwd();
-  const cache = import_language_tools15.Project.getCache(configFile && rootDir);
+  const cache = import_language_tools16.Project.getCache(configFile && rootDir);
   let projectCache = cache.get(getTSProject);
   let cached;
   if (projectCache) {
@@ -2981,7 +2996,7 @@ function filenameToURI(filename) {
 }
 async function getPreferences(scriptLang) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
-  const configName = scriptLang === import_language_tools15.ScriptLang.js ? "javascript" : "typescript";
+  const configName = scriptLang === import_language_tools16.ScriptLang.js ? "javascript" : "typescript";
   const [preferencesConfig, suggestConfig, inlayHintsConfig] = await Promise.all([
     getConfig(`${configName}.preferences`),
     getConfig(`${configName}.suggest`),
@@ -3138,7 +3153,7 @@ function getCanonicalFileName(fileName) {
 var import_vscode_css_languageservice2 = require("vscode-css-languageservice");
 var import_vscode_languageserver11 = require("vscode-languageserver");
 var import_vscode_languageserver_textdocument2 = require("vscode-languageserver-textdocument");
-var import_language_tools16 = require("@marko/language-tools");
+var import_language_tools17 = require("@marko/language-tools");
 var services = {
   ".css": import_vscode_css_languageservice2.getCSSLanguageService,
   ".less": import_vscode_css_languageservice2.getLESSLanguageService,
@@ -3445,7 +3460,7 @@ function processStyle(doc) {
   return processDoc(doc, ({ uri, version, parsed, lookup }) => {
     var _a;
     const result = [];
-    for (const [ext, extracted] of (0, import_language_tools16.extractStyle)({
+    for (const [ext, extracted] of (0, import_language_tools17.extractStyle)({
       parsed,
       lookup
     })) {
@@ -3541,39 +3556,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;
@@ -3589,172 +3596,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,
@@ -3764,32 +3788,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
 };
@@ -4029,7 +4057,7 @@ for (const command in service.commands) {
 }
 function validateDocs() {
   queueDiagnostic();
-  import_language_tools17.Project.clearCaches();
+  import_language_tools18.Project.clearCaches();
 }
 function queueDiagnostic() {
   clearTimeout(diagnosticTimeout);