@marko/language-server 1.4.25 → 1.4.26

package/dist/index.mjs

@@ -21,7 +21,7 @@ Project.setDefaultCompilerMeta(defaultCompiler, {
 });
 
 // src/index.ts
-import { Project as Project6 } from "@marko/language-tools";
+import { Project as Project7 } from "@marko/language-tools";
 import { inspect as inspect2, isDeepStrictEqual } from "util";
 import {
   createConnection,
@@ -927,7 +927,7 @@ async function acquireMutexLock() {
 var html_default = HTMLService;
 
 // src/service/marko/complete/index.ts
-import { NodeType as NodeType3 } from "@marko/language-tools";
+import { NodeType as NodeType4 } from "@marko/language-tools";
 
 // src/service/marko/complete/AttrName.ts
 import {
@@ -1177,6 +1177,7 @@ async function AttrValue({
 }
 
 // src/service/marko/complete/Import.ts
+import { NodeType as NodeType2 } from "@marko/language-tools";
 import { TextEdit as TextEdit4 } from "vscode-languageserver";
 
 // src/service/marko/util/get-tag-name-completion.ts
@@ -1242,12 +1243,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 === NodeType2.Static && !staticImportReg.test(value)) {
+    return;
+  }
   const match = importTagReg.exec(value);
   if (match) {
     const [{ length }] = match;
@@ -1273,14 +1278,14 @@ function Import({
 }
 
 // src/service/marko/complete/OpenTagName.ts
-import { NodeType as NodeType2 } from "@marko/language-tools";
+import { NodeType as NodeType3 } from "@marko/language-tools";
 function OpenTagName({
   node,
   file: { parsed, filename, lookup }
 }) {
   const tag = node.parent;
   const range = parsed.locationAt(node);
-  const isAttrTag = tag.type === NodeType2.AttrTag;
+  const isAttrTag = tag.type === NodeType3.AttrTag;
   const result = [];
   if (isAttrTag) {
     const ownerTagDef = tag.owner && tag.owner.nameText && lookup.getTag(tag.owner.nameText);
@@ -1301,7 +1306,7 @@ function OpenTagName({
       }
     }
   } else {
-    const skipStatements = !(tag.concise && tag.parent.type === NodeType2.Program);
+    const skipStatements = !(tag.concise && tag.parent.type === NodeType3.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({
@@ -1373,14 +1378,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[NodeType3[node.type]]?.({
+    items: await handlers[NodeType4[node.type]]?.({
       file,
       params,
       offset,
@@ -1391,7 +1397,7 @@ var doComplete = async (doc, params) => {
 };
 
 // src/service/marko/definition/index.ts
-import { NodeType as NodeType5 } from "@marko/language-tools";
+import { NodeType as NodeType6 } from "@marko/language-tools";
 
 // src/service/marko/definition/AttrName.ts
 import { getLines, getLocation } from "@marko/language-tools";
@@ -1476,7 +1482,7 @@ function AttrName2({
 import {
   getLines as getLines2,
   getLocation as getLocation2,
-  NodeType as NodeType4
+  NodeType as NodeType5
 } from "@marko/language-tools";
 import fs4 from "fs";
 import path5 from "path";
@@ -1488,7 +1494,7 @@ function OpenTagName2({
   const tag = node.parent;
   let tagDef;
   let range = START_LOCATION;
-  if (tag.type === NodeType4.AttrTag) {
+  if (tag.type === NodeType5.AttrTag) {
     tagDef = tag.owner && tag.owner.nameText ? lookup.getTag(tag.owner.nameText) : void 0;
   } else {
     tagDef = tag.nameText ? lookup.getTag(tag.nameText) : void 0;
@@ -1532,7 +1538,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[NodeType5[node.type]]?.({
+  return await handlers2[NodeType6[node.type]]?.({
     file,
     params,
     offset,
@@ -1541,7 +1547,7 @@ var findDefinition = async (doc, params) => {
 };
 
 // src/service/marko/document-links.ts
-import { NodeType as NodeType6 } from "@marko/language-tools";
+import { NodeType as NodeType7 } from "@marko/language-tools";
 var importTagReg2 = /(['"])<((?:[^'"\\>]|\\.)*)>?\1/g;
 var findDocumentLinks = async (doc) => {
   return processDoc(doc, extractDocumentLinks);
@@ -1560,14 +1566,14 @@ function extractDocumentLinks({
   const { program, read } = parsed;
   const visit = (node) => {
     switch (node.type) {
-      case NodeType6.AttrTag:
+      case NodeType7.AttrTag:
         if (node.body) {
           for (const child of node.body) {
             visit(child);
           }
         }
         break;
-      case NodeType6.Tag:
+      case NodeType7.Tag:
         if (node.attrs && node.nameText) {
           for (const attr of node.attrs) {
             if (isDocumentLinkAttr(code, node, attr)) {
@@ -1593,7 +1599,7 @@ function extractDocumentLinks({
     }
   };
   for (const node of program.static) {
-    if (node.type === NodeType6.Import) {
+    if (node.type === NodeType7.Import) {
       importTagReg2.lastIndex = 0;
       const value = parsed.read(node);
       const match = importTagReg2.exec(value);
@@ -1620,7 +1626,7 @@ function extractDocumentLinks({
 }
 
 // src/service/marko/document-symbols.ts
-import { NodeType as NodeType7 } from "@marko/language-tools";
+import { NodeType as NodeType8 } from "@marko/language-tools";
 import { SymbolKind } from "vscode-languageserver";
 var findDocumentSymbols = async (doc) => processDoc(doc, extractDocumentSymbols);
 function extractDocumentSymbols({
@@ -1636,10 +1642,10 @@ function extractDocumentSymbols({
   const { program } = parsed;
   const visit = (node) => {
     switch (node.type) {
-      case NodeType7.Tag:
-      case NodeType7.AttrTag:
+      case NodeType8.Tag:
+      case NodeType8.AttrTag:
         symbols.push({
-          name: (node.type === NodeType7.AttrTag ? node.nameText?.slice(node.nameText.indexOf("@")) : node.nameText) || "<${...}>",
+          name: (node.type === NodeType8.AttrTag ? node.nameText?.slice(node.nameText.indexOf("@")) : node.nameText) || "<${...}>",
           kind: node.nameText && lookup.getTag(node.nameText)?.html && SymbolKind.Property || SymbolKind.Class,
           location: {
             uri,
@@ -1728,7 +1734,7 @@ var format2 = async (doc, params, cancel) => {
 };
 
 // src/service/marko/hover/index.ts
-import { NodeType as NodeType8 } from "@marko/language-tools";
+import { NodeType as NodeType9 } from "@marko/language-tools";
 
 // src/service/marko/hover/OpenTagName.ts
 function OpenTagName3({
@@ -1761,7 +1767,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[NodeType8[node.type]]?.({
+  return await handlers3[NodeType9[node.type]]?.({
     file,
     params,
     offset,
@@ -1936,8 +1942,8 @@ var marko_default = {
 // src/service/script/index.ts
 import {
   extractScript,
-  NodeType as NodeType9,
-  Project as Project5,
+  NodeType as NodeType10,
+  Project as Project6,
   ScriptLang
 } from "@marko/language-tools";
 import path8 from "path";
@@ -1957,11 +1963,13 @@ import { URI as URI6 } from "vscode-uri";
 import {
   getExt,
   isDefinitionFile,
-  Processors
+  Processors,
+  Project as Project5
 } from "@marko/language-tools";
 import path7 from "path";
 var fsPathReg = /^(?:[./\\]|[A-Z]:)/i;
 var modulePartsReg = /^((?:@(?:[^/]+)\/)?(?:[^/]+))(.*)$/;
+var importTagReg3 = /<([^>]+)>/;
 function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
   const processors = Processors.create({
     ts: ts2,
@@ -2039,7 +2047,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 = Project5.getTagLookup(
+            path7.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;
@@ -2360,7 +2379,7 @@ var ScriptService = {
       if (!filename) return;
       const tsProject = getTSProject(filename);
       const extracted = processScript(doc, tsProject);
-      const lang = Project5.getScriptLang(
+      const lang = Project6.getScriptLang(
         filename,
         tsProject.markoScriptLang,
         ts,
@@ -2714,9 +2733,9 @@ function processScript(doc, tsProject) {
       ts,
       parsed,
       lookup,
-      translator: Project5.getConfig(dirname).translator,
-      scriptLang: filename ? Project5.getScriptLang(filename, markoScriptLang, ts, host) : markoScriptLang,
-      runtimeTypesCode: Project5.getTypeLibs(tsProject.rootDir, ts, host)?.markoTypesCode
+      translator: Project6.getConfig(dirname).translator,
+      scriptLang: filename ? Project6.getScriptLang(filename, markoScriptLang, ts, host) : markoScriptLang,
+      runtimeTypesCode: Project6.getTypeLibs(tsProject.rootDir, ts, host)?.markoTypesCode
     });
   });
 }
@@ -2727,9 +2746,9 @@ function getInsertModuleStatementOffset(parsed) {
     let lastImport;
     for (const node of program.static) {
       switch (node.type) {
-        case NodeType9.Export:
+        case NodeType10.Export:
           return node.start;
-        case NodeType9.Import:
+        case NodeType10.Import:
           lastImport = node;
           break;
       }
@@ -2769,7 +2788,7 @@ function docLocationAtTextSpan(doc, { start, length }) {
 function getTSConfigFile(fileName) {
   let configFile;
   const docFsDir = path8.dirname(fileName);
-  const cache = Project5.getCache(docFsDir);
+  const cache = Project6.getCache(docFsDir);
   let configFileCache = cache.get(getTSConfigFile);
   if (configFileCache) {
     configFile = configFileCache.get(docFsDir);
@@ -2793,7 +2812,7 @@ function getTSProject(docFsPath) {
     }
   }
   const basePath = configFile && path8.dirname(configFile) || process.cwd();
-  const cache = Project5.getCache(configFile && basePath);
+  const cache = Project6.getCache(configFile && basePath);
   let projectCache = cache.get(getTSProject);
   let cached;
   if (projectCache) {
@@ -3917,7 +3936,7 @@ for (const command in service.commands) {
 }
 function validateDocs() {
   queueDiagnostic();
-  Project6.clearCaches();
+  Project7.clearCaches();
 }
 function queueDiagnostic() {
   clearTimeout(diagnosticTimeout);