@marko/language-server 0.12.10 → 0.12.11

package/dist/index.mjs

@@ -857,7 +857,7 @@ function AttrName({
 }
 
 // src/service/marko/complete/AttrValue.ts
-import path4 from "path";
+import path3 from "path";
 import {
   CompletionItemKind as CompletionItemKind4,
   Range as Range2,
@@ -890,20 +890,20 @@ function isDocumentLinkAttr(doc, tag, attr) {
 }
 
 // src/utils/file-system.ts
-import path3 from "path";
 import fs from "fs/promises";
 import { FileType } from "vscode-css-languageservice";
+import { fileURLToPath } from "url";
 var file_system_default = {
   stat,
   readDirectory
 };
-async function stat(fileName) {
-  const stat2 = await fs.stat(fileName).catch(() => null);
+async function stat(uri) {
   let type = FileType.Unknown;
-  let ctime = 0;
-  let mtime = 0;
-  let size = 0;
-  if (stat2) {
+  let ctime = -1;
+  let mtime = -1;
+  let size = -1;
+  try {
+    const stat2 = await fs.stat(fileURLToPath(uri));
     if (stat2.isDirectory())
       type = FileType.Directory;
     else if (stat2.isFile())
@@ -911,6 +911,7 @@ async function stat(fileName) {
     ctime = stat2.ctimeMs;
     mtime = stat2.mtimeMs;
     size = stat2.size;
+  } catch {
   }
   return {
     type,
@@ -919,20 +920,22 @@ async function stat(fileName) {
     size
   };
 }
-async function readDirectory(dir) {
-  return (await Promise.all((await fs.readdir(dir).catch(() => [])).map(async (entry) => [entry, (await stat(path3.join(dir, entry))).type]))).filter(([, type]) => type !== FileType.Unknown);
+async function readDirectory(uri) {
+  try {
+    const entries = await fs.readdir(fileURLToPath(uri));
+    const base = uri.at(-1) === "/" ? uri : `${uri}/`;
+    return (await Promise.all(entries.map(async (entry) => [entry, (await stat(new URL(entry, base).toString())).type]))).filter(([, type]) => type !== FileType.Unknown);
+  } catch {
+    return [];
+  }
 }
 
 // src/utils/resolve-url.ts
 function resolveUrl(to, base) {
   try {
-    const baseUrl = new URL(base, "file://");
-    const resolved = new URL(to, baseUrl);
-    const { origin, protocol } = baseUrl;
-    if (resolved.origin === origin && resolved.protocol === protocol) {
-      return resolved.pathname + resolved.search + resolved.hash;
-    }
-    return resolved.toString();
+    const url = new URL(to, base);
+    if (url.protocol === "file:")
+      return url.toString();
   } catch {
     return void 0;
   }
@@ -957,28 +960,29 @@ async function AttrValue({
       start,
       end
     });
-    let segmentStart = rawValue.lastIndexOf("/", relativeOffset);
+    const segmentStart = rawValue.lastIndexOf("/", relativeOffset);
     if (segmentStart === -1)
-      segmentStart = relativeOffset;
-    const resolveRequest = rawValue.slice(0, segmentStart) || ".";
-    const dir = resolveUrl(resolveRequest, document.uri);
-    if ((dir == null ? void 0 : dir[0]) === "/") {
+      return;
+    const req = rawValue.slice(0, segmentStart);
+    const uri = resolveUrl(req, document.uri);
+    if (uri) {
       const result = [];
-      const curDir = resolveRequest === "." ? dir : resolveUrl(".", document.uri);
-      const curFile = curDir === dir ? path4.basename(document.uri) : void 0;
+      const curFile = req === "." ? path3.basename(document.uri) : void 0;
       const replaceRange = Range2.create(document.positionAt(start + segmentStart + 1), document.positionAt(start + rawValue.length));
-      for (const [entry, type] of await file_system_default.readDirectory(dir)) {
+      for (const [entry, type] of await file_system_default.readDirectory(uri)) {
         if (entry[0] !== "." && entry !== curFile) {
-          const isDir = type === FileType.Directory;
-          const label = isDir ? `${entry}/` : entry;
-          result.push({
-            label,
-            kind: isDir ? CompletionItemKind4.Folder : CompletionItemKind4.File,
-            textEdit: TextEdit4.replace(replaceRange, label),
-            command: isDir ? {
+          result.push(type === FileType.Directory ? {
+            label: `${entry}/`,
+            kind: CompletionItemKind4.Folder,
+            textEdit: TextEdit4.replace(replaceRange, `${entry}/`),
+            command: {
               title: "Suggest",
               command: "editor.action.triggerSuggest"
-            } : void 0
+            }
+          } : {
+            label: entry,
+            kind: CompletionItemKind4.File,
+            textEdit: TextEdit4.replace(replaceRange, entry)
           });
         }
       }
@@ -1038,7 +1042,7 @@ var doValidate = (doc) => {
 };
 
 // src/service/marko/definition/OpenTagName.ts
-import path5 from "path";
+import path4 from "path";
 import { URI as URI4 } from "vscode-uri";
 import { Range as Range5, LocationLink } from "vscode-languageserver";
 
@@ -1099,7 +1103,7 @@ function OpenTagName2({
     return;
   }
   const tagEntryFile = tagDef.template || tagDef.renderer || tagDef.filePath;
-  if (!path5.isAbsolute(tagEntryFile)) {
+  if (!path4.isAbsolute(tagEntryFile)) {
     return;
   }
   if (/\/marko(?:-tag)?\.json$/.test(tagEntryFile)) {
@@ -1535,15 +1539,13 @@ var StyleSheetService = {
       return result.length ? result : void 0;
     }
   },
-  findDocumentLinks(doc) {
+  async findDocumentLinks(doc) {
     const infoByExt = getStyleSheetInfo(doc);
     const result = [];
     for (const ext in infoByExt) {
       const info = infoByExt[ext];
       const { service: service2, virtualDoc } = info;
-      for (const link of service2.findDocumentLinks(virtualDoc, info.parsed, {
-        resolveReference: resolveUrl
-      })) {
+      for (const link of await service2.findDocumentLinks2(virtualDoc, info.parsed, { resolveReference: resolveUrl })) {
         const range = getSourceRange(doc, info, link.range);
         if (range) {
           result.push({