@marko/language-server 1.4.25 → 1.4.26

package/dist/index.js

@@ -38,7 +38,7 @@ import_language_tools.Project.setDefaultCompilerMeta(defaultCompiler, {
 });
 
 // src/index.ts
-var import_language_tools19 = require("@marko/language-tools");
+var import_language_tools20 = require("@marko/language-tools");
 var import_util2 = require("util");
 var import_node = require("vscode-languageserver/node");
 
@@ -938,7 +938,7 @@ async function acquireMutexLock() {
 var html_default = HTMLService;
 
 // src/service/marko/complete/index.ts
-var import_language_tools7 = require("@marko/language-tools");
+var import_language_tools8 = require("@marko/language-tools");
 
 // src/service/marko/complete/AttrName.ts
 var import_vscode_languageserver2 = require("vscode-languageserver");
@@ -1180,6 +1180,7 @@ async function AttrValue({
 }
 
 // src/service/marko/complete/Import.ts
+var import_language_tools5 = require("@marko/language-tools");
 var import_vscode_languageserver5 = require("vscode-languageserver");
 
 // src/service/marko/util/get-tag-name-completion.ts
@@ -1239,12 +1240,16 @@ ${autocomplete.description}`;
 }
 
 // src/service/marko/complete/Import.ts
+var staticImportReg = /^\s*(?:static|client|server) import\b/;
 var importTagReg = /(['"])<((?:[^'"\\>]|\\.)*)>?\1/;
 function Import({
   node,
   file: { parsed, filename, lookup }
 }) {
   const value = parsed.read(node);
+  if (node.type === import_language_tools5.NodeType.Static && !staticImportReg.test(value)) {
+    return;
+  }
   const match = importTagReg.exec(value);
   if (match) {
     const [{ length }] = match;
@@ -1270,14 +1275,14 @@ function Import({
 }
 
 // src/service/marko/complete/OpenTagName.ts
-var import_language_tools5 = require("@marko/language-tools");
+var import_language_tools6 = require("@marko/language-tools");
 function OpenTagName({
   node,
   file: { parsed, filename, lookup }
 }) {
   const tag = node.parent;
   const range = parsed.locationAt(node);
-  const isAttrTag = tag.type === import_language_tools5.NodeType.AttrTag;
+  const isAttrTag = tag.type === import_language_tools6.NodeType.AttrTag;
   const result = [];
   if (isAttrTag) {
     const ownerTagDef = tag.owner && tag.owner.nameText && lookup.getTag(tag.owner.nameText);
@@ -1298,7 +1303,7 @@ function OpenTagName({
       }
     }
   } else {
-    const skipStatements = !(tag.concise && tag.parent.type === import_language_tools5.NodeType.Program);
+    const skipStatements = !(tag.concise && tag.parent.type === import_language_tools6.NodeType.Program);
     for (const tag2 of lookup.getTagsSorted()) {
       if (!(tag2.name === "*" || tag2.isNestedTag || skipStatements && tag2.parseOptions?.statement || tag2.name[0] === "_" && /^@?marko[/-]|[\\/]node_modules[\\/]/.test(tag2.filePath))) {
         const completion = getTagNameCompletion({
@@ -1316,7 +1321,7 @@ function OpenTagName({
 }
 
 // src/service/marko/complete/Tag.ts
-var import_language_tools6 = require("@marko/language-tools");
+var import_language_tools7 = require("@marko/language-tools");
 var import_vscode_languageserver6 = require("vscode-languageserver");
 var partialCloseTagReg = /<\/(?:[^><]*>)?/iy;
 function Tag({
@@ -1324,7 +1329,7 @@ function Tag({
   offset,
   file: { parsed, code }
 }) {
-  const isClosed = node.end !== import_language_tools6.UNFINISHED;
+  const isClosed = node.end !== import_language_tools7.UNFINISHED;
   if (isClosed || node.concise) return;
   const closingTagStr = `</${node.nameText || ""}>`;
   if (offset === node.open.end) {
@@ -1366,14 +1371,15 @@ var handlers = {
   OpenTagName,
   AttrName,
   AttrValue,
-  Import
+  Import,
+  Static: Import
 };
 var doComplete = async (doc, params) => {
   const file = getMarkoFile(doc);
   const offset = doc.offsetAt(params.position);
   const node = file.parsed.nodeAt(offset);
   return {
-    items: await handlers[import_language_tools7.NodeType[node.type]]?.({
+    items: await handlers[import_language_tools8.NodeType[node.type]]?.({
       file,
       params,
       offset,
@@ -1384,10 +1390,10 @@ var doComplete = async (doc, params) => {
 };
 
 // src/service/marko/definition/index.ts
-var import_language_tools10 = require("@marko/language-tools");
+var import_language_tools11 = require("@marko/language-tools");
 
 // src/service/marko/definition/AttrName.ts
-var import_language_tools8 = require("@marko/language-tools");
+var import_language_tools9 = require("@marko/language-tools");
 var import_fs2 = __toESM(require("fs"));
 var import_vscode_uri4 = require("vscode-uri");
 
@@ -1448,8 +1454,8 @@ function AttrName2({
       tagDefSource
     );
     if (match && match.index) {
-      range = (0, import_language_tools8.getLocation)(
-        (0, import_language_tools8.getLines)(tagDefSource),
+      range = (0, import_language_tools9.getLocation)(
+        (0, import_language_tools9.getLines)(tagDefSource),
         match.index,
         match.index + match[0].length
       );
@@ -1466,7 +1472,7 @@ function AttrName2({
 }
 
 // src/service/marko/definition/OpenTagName.ts
-var import_language_tools9 = require("@marko/language-tools");
+var import_language_tools10 = require("@marko/language-tools");
 var import_fs3 = __toESM(require("fs"));
 var import_path5 = __toESM(require("path"));
 var import_vscode_uri5 = require("vscode-uri");
@@ -1477,7 +1483,7 @@ function OpenTagName2({
   const tag = node.parent;
   let tagDef;
   let range = START_LOCATION;
-  if (tag.type === import_language_tools9.NodeType.AttrTag) {
+  if (tag.type === import_language_tools10.NodeType.AttrTag) {
     tagDef = tag.owner && tag.owner.nameText ? lookup.getTag(tag.owner.nameText) : void 0;
   } else {
     tagDef = tag.nameText ? lookup.getTag(tag.nameText) : void 0;
@@ -1495,8 +1501,8 @@ function OpenTagName2({
       tagDefSource
     );
     if (match && match.index) {
-      range = (0, import_language_tools9.getLocation)(
-        (0, import_language_tools9.getLines)(tagDefSource),
+      range = (0, import_language_tools10.getLocation)(
+        (0, import_language_tools10.getLines)(tagDefSource),
         match.index,
         match.index + match[0].length
       );
@@ -1521,7 +1527,7 @@ var findDefinition = async (doc, params) => {
   const file = getMarkoFile(doc);
   const offset = doc.offsetAt(params.position);
   const node = file.parsed.nodeAt(offset);
-  return await handlers2[import_language_tools10.NodeType[node.type]]?.({
+  return await handlers2[import_language_tools11.NodeType[node.type]]?.({
     file,
     params,
     offset,
@@ -1530,7 +1536,7 @@ var findDefinition = async (doc, params) => {
 };
 
 // src/service/marko/document-links.ts
-var import_language_tools11 = require("@marko/language-tools");
+var import_language_tools12 = require("@marko/language-tools");
 var importTagReg2 = /(['"])<((?:[^'"\\>]|\\.)*)>?\1/g;
 var findDocumentLinks = async (doc) => {
   return processDoc(doc, extractDocumentLinks);
@@ -1549,14 +1555,14 @@ function extractDocumentLinks({
   const { program, read } = parsed;
   const visit = (node) => {
     switch (node.type) {
-      case import_language_tools11.NodeType.AttrTag:
+      case import_language_tools12.NodeType.AttrTag:
         if (node.body) {
           for (const child of node.body) {
             visit(child);
           }
         }
         break;
-      case import_language_tools11.NodeType.Tag:
+      case import_language_tools12.NodeType.Tag:
         if (node.attrs && node.nameText) {
           for (const attr of node.attrs) {
             if (isDocumentLinkAttr(code, node, attr)) {
@@ -1582,7 +1588,7 @@ function extractDocumentLinks({
     }
   };
   for (const node of program.static) {
-    if (node.type === import_language_tools11.NodeType.Import) {
+    if (node.type === import_language_tools12.NodeType.Import) {
       importTagReg2.lastIndex = 0;
       const value = parsed.read(node);
       const match = importTagReg2.exec(value);
@@ -1609,7 +1615,7 @@ function extractDocumentLinks({
 }
 
 // src/service/marko/document-symbols.ts
-var import_language_tools12 = require("@marko/language-tools");
+var import_language_tools13 = require("@marko/language-tools");
 var import_vscode_languageserver7 = require("vscode-languageserver");
 var findDocumentSymbols = async (doc) => processDoc(doc, extractDocumentSymbols);
 function extractDocumentSymbols({
@@ -1625,10 +1631,10 @@ function extractDocumentSymbols({
   const { program } = parsed;
   const visit = (node) => {
     switch (node.type) {
-      case import_language_tools12.NodeType.Tag:
-      case import_language_tools12.NodeType.AttrTag:
+      case import_language_tools13.NodeType.Tag:
+      case import_language_tools13.NodeType.AttrTag:
         symbols.push({
-          name: (node.type === import_language_tools12.NodeType.AttrTag ? node.nameText?.slice(node.nameText.indexOf("@")) : node.nameText) || "<${...}>",
+          name: (node.type === import_language_tools13.NodeType.AttrTag ? node.nameText?.slice(node.nameText.indexOf("@")) : node.nameText) || "<${...}>",
           kind: node.nameText && lookup.getTag(node.nameText)?.html && import_vscode_languageserver7.SymbolKind.Property || import_vscode_languageserver7.SymbolKind.Class,
           location: {
             uri,
@@ -1650,7 +1656,7 @@ function extractDocumentSymbols({
 }
 
 // src/service/marko/format.ts
-var import_language_tools13 = require("@marko/language-tools");
+var import_language_tools14 = require("@marko/language-tools");
 var prettier = __toESM(require("prettier"));
 var markoPrettier = __toESM(require("prettier-plugin-marko"));
 var import_vscode_languageserver8 = require("vscode-languageserver");
@@ -1697,7 +1703,7 @@ async function formatDocument(doc, formatOptions, cancel) {
         editorconfig: true
       }).catch(() => null) : null
     };
-    markoPrettier.setCompiler(import_language_tools13.Project.getCompiler(dir), import_language_tools13.Project.getConfig(dir));
+    markoPrettier.setCompiler(import_language_tools14.Project.getCompiler(dir), import_language_tools14.Project.getConfig(dir));
     if (cancel?.isCancellationRequested) return;
     return [
       import_vscode_languageserver8.TextEdit.replace(
@@ -1717,7 +1723,7 @@ var format2 = async (doc, params, cancel) => {
 };
 
 // src/service/marko/hover/index.ts
-var import_language_tools14 = require("@marko/language-tools");
+var import_language_tools15 = require("@marko/language-tools");
 
 // src/service/marko/hover/OpenTagName.ts
 function OpenTagName3({
@@ -1750,7 +1756,7 @@ var doHover = async (doc, params) => {
   const file = getMarkoFile(doc);
   const offset = doc.offsetAt(params.position);
   const node = file.parsed.nodeAt(offset);
-  return await handlers3[import_language_tools14.NodeType[node.type]]?.({
+  return await handlers3[import_language_tools15.NodeType[node.type]]?.({
     file,
     params,
     offset,
@@ -1760,7 +1766,7 @@ var doHover = async (doc, params) => {
 
 // src/service/marko/validate.ts
 var import_babel_utils = require("@marko/babel-utils");
-var import_language_tools15 = require("@marko/language-tools");
+var import_language_tools16 = require("@marko/language-tools");
 var import_path6 = __toESM(require("path"));
 var import_vscode_languageserver9 = require("vscode-languageserver");
 var markoErrorRegExp = /^(.+?)\.marko(?:\((\d+)(?:\s*,\s*(\d+))?\))?: (.*)$/gm;
@@ -1786,7 +1792,7 @@ var doValidate = (doc) => {
   const filename = getFSPath(doc);
   const diagnostics = [];
   try {
-    const { meta } = import_language_tools15.Project.getCompiler(
+    const { meta } = import_language_tools16.Project.getCompiler(
       filename && import_path6.default.dirname(filename)
     ).compileSync(doc.getText(), filename || "untitled.marko", compilerConfig);
     if (meta.diagnostics) {
@@ -1923,7 +1929,7 @@ var marko_default = {
 };
 
 // src/service/script/index.ts
-var import_language_tools17 = require("@marko/language-tools");
+var import_language_tools18 = require("@marko/language-tools");
 var import_path8 = __toESM(require("path"));
 var prettier2 = __toESM(require("prettier"));
 var import_relative_import_path = require("relative-import-path");
@@ -1932,12 +1938,13 @@ var import_vscode_languageserver10 = require("vscode-languageserver");
 var import_vscode_uri6 = require("vscode-uri");
 
 // src/ts-plugin/host.ts
-var import_language_tools16 = require("@marko/language-tools");
+var import_language_tools17 = require("@marko/language-tools");
 var import_path7 = __toESM(require("path"));
 var fsPathReg = /^(?:[./\\]|[A-Z]:)/i;
 var modulePartsReg = /^((?:@(?:[^/]+)\/)?(?:[^/]+))(.*)$/;
+var importTagReg3 = /<([^>]+)>/;
 function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
-  const processors = import_language_tools16.Processors.create({
+  const processors = import_language_tools17.Processors.create({
     ts: ts2,
     host,
     configFile
@@ -1999,7 +2006,7 @@ function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
     host.readDirectory = (path9, extensions, exclude, include, depth) => {
       return readDirectory2(
         path9,
-        extensions?.concat(import_language_tools16.Processors.extensions),
+        extensions?.concat(import_language_tools17.Processors.extensions),
         exclude,
         include,
         depth
@@ -2013,7 +2020,18 @@ function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
       let resolvedModules;
       for (let i = 0; i < moduleLiterals.length; i++) {
         const moduleLiteral = moduleLiterals[i];
-        const moduleName = moduleLiteral.text;
+        let moduleName = moduleLiteral.text;
+        const tagNameMatch = importTagReg3.exec(moduleName);
+        if (tagNameMatch) {
+          const [, tagName] = tagNameMatch;
+          const tagDef = import_language_tools17.Project.getTagLookup(
+            import_path7.default.dirname(containingFile)
+          ).getTag(tagName);
+          const tagFileName = tagDef && (tagDef.template || tagDef.renderer);
+          if (tagFileName) {
+            moduleName = tagFileName;
+          }
+        }
         const processor = moduleName[0] !== "*" ? getProcessor(moduleName) : void 0;
         if (processor) {
           let resolvedFileName;
@@ -2046,12 +2064,12 @@ function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
             }
           }
           if (resolvedFileName) {
-            if ((0, import_language_tools16.isDefinitionFile)(resolvedFileName)) {
+            if ((0, import_language_tools17.isDefinitionFile)(resolvedFileName)) {
               if (!host.fileExists(resolvedFileName)) {
                 resolvedFileName = void 0;
               }
             } else {
-              const ext = (0, import_language_tools16.getExt)(resolvedFileName);
+              const ext = (0, import_language_tools17.getExt)(resolvedFileName);
               const definitionFile = `${resolvedFileName.slice(
                 0,
                 -ext.length
@@ -2099,7 +2117,7 @@ function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
   }
   return host;
   function getProcessor(fileName) {
-    const ext = (0, import_language_tools16.getExt)(fileName);
+    const ext = (0, import_language_tools17.getExt)(fileName);
     return ext ? processors[ext] : void 0;
   }
 }
@@ -2334,7 +2352,7 @@ var ScriptService = {
       if (!filename) return;
       const tsProject = getTSProject(filename);
       const extracted = processScript(doc, tsProject);
-      const lang = import_language_tools17.Project.getScriptLang(
+      const lang = import_language_tools18.Project.getScriptLang(
         filename,
         tsProject.markoScriptLang,
         import_tsserverlibrary.default,
@@ -2342,10 +2360,10 @@ var ScriptService = {
       );
       const generated = extracted.toString();
       const content = await prettier2.format(generated, {
-        parser: lang === import_language_tools17.ScriptLang.ts ? "typescript" : "babel"
+        parser: lang === import_language_tools18.ScriptLang.ts ? "typescript" : "babel"
       }).catch(() => generated);
       return {
-        language: lang === import_language_tools17.ScriptLang.ts ? "typescript" : "javascript",
+        language: lang === import_language_tools18.ScriptLang.ts ? "typescript" : "javascript",
         content
       };
     }
@@ -2684,13 +2702,13 @@ ${documentation}`;
 function processScript(doc, tsProject) {
   return processDoc(doc, ({ filename, parsed, lookup, dirname }) => {
     const { host, markoScriptLang } = tsProject;
-    return (0, import_language_tools17.extractScript)({
+    return (0, import_language_tools18.extractScript)({
       ts: import_tsserverlibrary.default,
       parsed,
       lookup,
-      translator: import_language_tools17.Project.getConfig(dirname).translator,
-      scriptLang: filename ? import_language_tools17.Project.getScriptLang(filename, markoScriptLang, import_tsserverlibrary.default, host) : markoScriptLang,
-      runtimeTypesCode: import_language_tools17.Project.getTypeLibs(tsProject.rootDir, import_tsserverlibrary.default, host)?.markoTypesCode
+      translator: import_language_tools18.Project.getConfig(dirname).translator,
+      scriptLang: filename ? import_language_tools18.Project.getScriptLang(filename, markoScriptLang, import_tsserverlibrary.default, host) : markoScriptLang,
+      runtimeTypesCode: import_language_tools18.Project.getTypeLibs(tsProject.rootDir, import_tsserverlibrary.default, host)?.markoTypesCode
     });
   });
 }
@@ -2701,9 +2719,9 @@ function getInsertModuleStatementOffset(parsed) {
     let lastImport;
     for (const node of program.static) {
       switch (node.type) {
-        case import_language_tools17.NodeType.Export:
+        case import_language_tools18.NodeType.Export:
           return node.start;
-        case import_language_tools17.NodeType.Import:
+        case import_language_tools18.NodeType.Import:
           lastImport = node;
           break;
       }
@@ -2743,7 +2761,7 @@ function docLocationAtTextSpan(doc, { start, length }) {
 function getTSConfigFile(fileName) {
   let configFile;
   const docFsDir = import_path8.default.dirname(fileName);
-  const cache = import_language_tools17.Project.getCache(docFsDir);
+  const cache = import_language_tools18.Project.getCache(docFsDir);
   let configFileCache = cache.get(getTSConfigFile);
   if (configFileCache) {
     configFile = configFileCache.get(docFsDir);
@@ -2759,15 +2777,15 @@ function getTSConfigFile(fileName) {
 }
 function getTSProject(docFsPath) {
   let configFile;
-  let markoScriptLang = import_language_tools17.ScriptLang.js;
+  let markoScriptLang = import_language_tools18.ScriptLang.js;
   if (docFsPath) {
     configFile = getTSConfigFile(docFsPath);
     if (configFile?.endsWith("tsconfig.json")) {
-      markoScriptLang = import_language_tools17.ScriptLang.ts;
+      markoScriptLang = import_language_tools18.ScriptLang.ts;
     }
   }
   const basePath = configFile && import_path8.default.dirname(configFile) || process.cwd();
-  const cache = import_language_tools17.Project.getCache(configFile && basePath);
+  const cache = import_language_tools18.Project.getCache(configFile && basePath);
   let projectCache = cache.get(getTSProject);
   let cached;
   if (projectCache) {
@@ -2903,7 +2921,7 @@ function filenameToURI(filename) {
   return import_vscode_uri6.URI.file(filename).toString();
 }
 async function getPreferences(scriptLang) {
-  const configName = scriptLang === import_language_tools17.ScriptLang.js ? "javascript" : "typescript";
+  const configName = scriptLang === import_language_tools18.ScriptLang.js ? "javascript" : "typescript";
   const [preferencesConfig, suggestConfig, inlayHintsConfig] = await Promise.all([
     getConfig(`${configName}.preferences`),
     getConfig(`${configName}.suggest`),
@@ -3055,7 +3073,7 @@ function getCanonicalFileName(fileName) {
 }
 
 // src/service/style/index.ts
-var import_language_tools18 = require("@marko/language-tools");
+var import_language_tools19 = require("@marko/language-tools");
 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");
@@ -3355,7 +3373,7 @@ var StyleSheetService = {
 function processStyle(doc) {
   return processDoc(doc, ({ uri, version, parsed, lookup }) => {
     const result = [];
-    for (const [ext, extracted] of (0, import_language_tools18.extractStyle)({
+    for (const [ext, extracted] of (0, import_language_tools19.extractStyle)({
       parsed,
       lookup
     })) {
@@ -3885,7 +3903,7 @@ for (const command in service.commands) {
 }
 function validateDocs() {
   queueDiagnostic();
-  import_language_tools19.Project.clearCaches();
+  import_language_tools20.Project.clearCaches();
 }
 function queueDiagnostic() {
   clearTimeout(diagnosticTimeout);