@marko/language-server 1.3.8 → 1.3.9

package/dist/index.mjs

@@ -5,21 +5,12 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// src/index.ts
-import { inspect as inspect2, isDeepStrictEqual } from "util";
-import {
-  ProposedFeatures,
-  TextDocumentSyncKind,
-  createConnection
-} from "vscode-languageserver/node";
-import { Project as Project6 } from "@marko/language-tools";
-
 // src/utils/project-defaults.ts
-import path from "path";
 import * as defaultCompiler from "@marko/compiler";
 import defaultConfig from "@marko/compiler/config";
-import * as defaultTranslator from "@marko/translator-default";
 import { Project } from "@marko/language-tools";
+import * as defaultTranslator from "@marko/translator-default";
+import path from "path";
 Project.setDefaultTypePaths({
   internalTypesFile: path.join(__dirname, "marko.internal.d.ts"),
   markoTypesFile: path.join(__dirname, "marko.runtime.d.ts")
@@ -29,74 +20,25 @@ Project.setDefaultCompilerMeta(defaultCompiler, {
   translator: defaultTranslator
 });
 
-// src/utils/file.ts
-import path2 from "path";
-import { Project as Project2, parse } from "@marko/language-tools";
-import { URI } from "vscode-uri";
-var processorCaches = /* @__PURE__ */ new WeakMap();
-function getFSDir(doc) {
-  const filename = getFSPath(doc);
-  return filename && path2.dirname(filename);
-}
-function getFSPath(doc) {
-  const parsed = URI.parse(doc.uri);
-  return parsed.scheme === "file" ? parsed.fsPath : void 0;
-}
-function getMarkoFile(doc) {
-  const { uri } = doc;
-  const { fsPath, scheme } = URI.parse(uri);
-  const filename = scheme === "file" ? fsPath : void 0;
-  const dirname = filename ? path2.dirname(filename) : process.cwd();
-  const cache = Project2.getCache(dirname);
-  let file = cache.get(doc);
-  if (!file) {
-    const { version } = doc;
-    const code = doc.getText();
-    const parsed = parse(code, filename);
-    const lookup = Project2.getTagLookup(dirname);
-    cache.set(
-      doc,
-      file = {
-        uri,
-        scheme,
-        version,
-        lookup,
-        filename,
-        dirname,
-        parsed,
-        code
-      }
-    );
-  }
-  return file;
-}
-function clearMarkoCacheForFile(doc) {
-  Project2.getCache(getFSDir(doc)).delete(doc);
-}
-function processDoc(doc, process2) {
-  const file = getMarkoFile(doc);
-  const cache = processorCaches.get(file.parsed);
-  let result;
-  if (cache) {
-    result = cache.get(process2);
-    if (!result) {
-      result = process2(file);
-      cache.set(process2, result);
-    }
-  } else {
-    result = process2(file);
-    processorCaches.set(file.parsed, /* @__PURE__ */ new Map([[process2, result]]));
-  }
-  return result;
-}
+// src/index.ts
+import { Project as Project6 } from "@marko/language-tools";
+import { inspect as inspect2, isDeepStrictEqual } from "util";
+import {
+  createConnection,
+  ProposedFeatures,
+  TextDocumentSyncKind
+} from "vscode-languageserver/node";
+
+// src/service/index.ts
+import { MarkupContent, MarkupKind as MarkupKind3 } from "vscode-languageserver";
 
 // src/utils/text-documents.ts
 import fs from "fs";
-import { URI as URI2 } from "vscode-uri";
 import {
   FileChangeType
 } from "vscode-languageserver";
 import { TextDocument } from "vscode-languageserver-textdocument";
+import { URI } from "vscode-uri";
 var docs = /* @__PURE__ */ new Map();
 var openDocs = /* @__PURE__ */ new Set();
 var fileExists = /* @__PURE__ */ new Map();
@@ -111,7 +53,7 @@ function getAllOpen() {
 function get(uri) {
   const doc = docs.get(uri);
   if (doc) return doc;
-  const { fsPath, scheme } = URI2.parse(uri);
+  const { fsPath, scheme } = URI.parse(uri);
   if (scheme === "file") {
     if (fileExists.get(uri) === false) return void 0;
     try {
@@ -132,7 +74,7 @@ function get(uri) {
 function exists(uri) {
   const cached = fileExists.get(uri);
   if (cached !== void 0) return cached;
-  const { fsPath, scheme } = URI2.parse(uri);
+  const { fsPath, scheme } = URI.parse(uri);
   if (scheme === "file") {
     try {
       fs.accessSync(fsPath);
@@ -185,7 +127,7 @@ function doClose(params) {
   if (doc) {
     projectVersion++;
     openDocs.delete(doc);
-    if (URI2.parse(ref.uri).scheme !== "file") {
+    if (URI.parse(ref.uri).scheme !== "file") {
       docs.delete(ref.uri);
     }
   }
@@ -230,75 +172,72 @@ function emitFileChange(doc) {
   }
 }
 
-// src/utils/workspace.ts
-var isInitialized = false;
-var connection;
-var configChangeHandlers = /* @__PURE__ */ new Set();
-var settingsCache = /* @__PURE__ */ new Map();
-async function getConfig(section) {
-  let cached = settingsCache.get(section);
-  if (!cached) {
-    try {
-      cached = await connection.workspace.getConfiguration(section) || {};
-      settingsCache.set(section, cached);
-    } catch {
-    }
-  }
-  return cached;
-}
-function onConfigChange(handler) {
-  configChangeHandlers.add(handler);
+// src/service/html/index.ts
+import { extractHTML } from "@marko/language-tools";
+import axe from "axe-core";
+import { JSDOM } from "jsdom";
+
+// src/utils/file.ts
+import { parse, Project as Project2 } from "@marko/language-tools";
+import path2 from "path";
+import { URI as URI2 } from "vscode-uri";
+var processorCaches = /* @__PURE__ */ new WeakMap();
+function getFSDir(doc) {
+  const filename = getFSPath(doc);
+  return filename && path2.dirname(filename);
 }
-function setup(_) {
-  connection = _;
-  connection.onDidChangeConfiguration(() => {
-    if (isInitialized) {
-      settingsCache.clear();
-      emitConfigChange();
-    } else {
-      isInitialized = true;
-    }
-  });
+function getFSPath(doc) {
+  const parsed = URI2.parse(doc.uri);
+  return parsed.scheme === "file" ? parsed.fsPath : void 0;
 }
-function emitConfigChange() {
-  for (const handler of configChangeHandlers) {
-    handler();
+function getMarkoFile(doc) {
+  const { uri } = doc;
+  const { fsPath, scheme } = URI2.parse(uri);
+  const filename = scheme === "file" ? fsPath : void 0;
+  const dirname = filename ? path2.dirname(filename) : process.cwd();
+  const cache = Project2.getCache(dirname);
+  let file = cache.get(doc);
+  if (!file) {
+    const { version } = doc;
+    const code = doc.getText();
+    const parsed = parse(code, filename);
+    const lookup = Project2.getTagLookup(dirname);
+    cache.set(
+      doc,
+      file = {
+        uri,
+        scheme,
+        version,
+        lookup,
+        filename,
+        dirname,
+        parsed,
+        code
+      }
+    );
   }
+  return file;
 }
-
-// src/utils/messages.ts
-import { inspect } from "util";
-var connection2;
-var previousMessagesByType = /* @__PURE__ */ new Map();
-function setup2(_) {
-  connection2 = _;
-}
-function displayError(data) {
-  display("showError", data);
+function clearMarkoCacheForFile(doc) {
+  Project2.getCache(getFSDir(doc)).delete(doc);
 }
-function display(type, data) {
-  const msg = typeof data === "string" ? data : inspect(data, { colors: false });
-  const previousMessages = previousMessagesByType.get(type);
-  if (previousMessages) {
-    if (previousMessages.includes(msg)) return;
-    previousMessages.push(msg);
-    if (previousMessages.length > 3) {
-      previousMessages.unshift();
+function processDoc(doc, process2) {
+  const file = getMarkoFile(doc);
+  const cache = processorCaches.get(file.parsed);
+  let result;
+  if (cache) {
+    result = cache.get(process2);
+    if (!result) {
+      result = process2(file);
+      cache.set(process2, result);
     }
   } else {
-    previousMessagesByType.set(type, [msg]);
+    result = process2(file);
+    processorCaches.set(file.parsed, /* @__PURE__ */ new Map([[process2, result]]));
   }
-  setImmediate(() => connection2.sendNotification(type, msg));
+  return result;
 }
 
-// src/service/index.ts
-import { MarkupContent, MarkupKind as MarkupKind3 } from "vscode-languageserver";
-
-// src/service/html/index.ts
-import axe from "axe-core";
-import { extractHTML } from "@marko/language-tools";
-import { JSDOM } from "jsdom";
-
 // src/service/html/axe-rules/axe-rules.ts
 var keyboard = {
   /**
@@ -842,7 +781,7 @@ var ruleExceptions = {
   [aria.ariaInputFieldName]: { unknownBody: true, attrSpread: true },
   [aria.ariaMeterName]: { unknownBody: true, attrSpread: true },
   [aria.ariaProgressbarName]: { unknownBody: true, attrSpread: true },
-  [aria.ariaProhibitedAttr]: {},
+  [aria.ariaProhibitedAttr]: { dynamicAttrs: ["role"] },
   [aria.ariaRequiredAttr]: { attrSpread: true },
   [aria.ariaRequiredChildren]: { unknownBody: true },
   [aria.ariaRoles]: { dynamicAttrs: ["role"] },
@@ -1104,31 +1043,6 @@ import {
   TextEdit as TextEdit2
 } from "vscode-languageserver";
 
-// src/service/marko/util/is-document-link-attr.ts
-import { NodeType } from "@marko/language-tools";
-var linkedAttrs = /* @__PURE__ */ new Map([
-  [
-    "src",
-    /* @__PURE__ */ new Set([
-      "audio",
-      "embed",
-      "iframe",
-      "img",
-      "input",
-      "script",
-      "source",
-      "track",
-      "video"
-    ])
-  ],
-  ["href", /* @__PURE__ */ new Set(["a", "area", "link"])],
-  ["data", /* @__PURE__ */ new Set(["object"])],
-  ["poster", /* @__PURE__ */ new Set(["video"])]
-]);
-function isDocumentLinkAttr(code, tag, attr) {
-  return tag.nameText && attr.type === NodeType.AttrNamed && attr.value?.type === NodeType.AttrValue && /^['"]$/.test(code[attr.value.value.start]) && linkedAttrs.get(code.slice(attr.name.start, attr.name.end))?.has(tag.nameText) || false;
-}
-
 // src/utils/file-system.ts
 import fs2 from "fs/promises";
 import { fileURLToPath } from "url";
@@ -1183,6 +1097,31 @@ function resolveUrl(to, base) {
   }
 }
 
+// src/service/marko/util/is-document-link-attr.ts
+import { NodeType } from "@marko/language-tools";
+var linkedAttrs = /* @__PURE__ */ new Map([
+  [
+    "src",
+    /* @__PURE__ */ new Set([
+      "audio",
+      "embed",
+      "iframe",
+      "img",
+      "input",
+      "script",
+      "source",
+      "track",
+      "video"
+    ])
+  ],
+  ["href", /* @__PURE__ */ new Set(["a", "area", "link"])],
+  ["data", /* @__PURE__ */ new Set(["object"])],
+  ["poster", /* @__PURE__ */ new Set(["video"])]
+]);
+function isDocumentLinkAttr(code, tag, attr) {
+  return tag.nameText && attr.type === NodeType.AttrNamed && attr.value?.type === NodeType.AttrValue && /^['"]$/.test(code[attr.value.value.start]) && linkedAttrs.get(code.slice(attr.name.start, attr.name.end))?.has(tag.nameText) || false;
+}
+
 // src/service/marko/complete/AttrValue.ts
 async function AttrValue({
   offset,
@@ -1379,12 +1318,12 @@ function OpenTagName({
 }
 
 // src/service/marko/complete/Tag.ts
+import { UNFINISHED } from "@marko/language-tools";
 import {
   CompletionItemKind as CompletionItemKind4,
   InsertTextFormat as InsertTextFormat3,
   TextEdit as TextEdit5
 } from "vscode-languageserver";
-import { UNFINISHED } from "@marko/language-tools";
 var partialCloseTagReg = /<\/(?:[^><]*>)?/iy;
 function Tag({
   node,
@@ -1454,9 +1393,19 @@ var doComplete = async (doc, params) => {
 import { NodeType as NodeType5 } from "@marko/language-tools";
 
 // src/service/marko/definition/AttrName.ts
+import { getLines, getLocation } from "@marko/language-tools";
 import fs3 from "fs";
 import { URI as URI4 } from "vscode-uri";
-import { getLines, getLocation } from "@marko/language-tools";
+
+// src/utils/constants.ts
+var START_POSITION = {
+  line: 0,
+  character: 0
+};
+var START_LOCATION = {
+  start: START_POSITION,
+  end: START_POSITION
+};
 
 // src/utils/regexp-builder.ts
 function RegExpBuilder(strings, ...expressions) {
@@ -1482,16 +1431,6 @@ function escape(val) {
   return String(val).replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
 }
 
-// src/utils/constants.ts
-var START_POSITION = {
-  line: 0,
-  character: 0
-};
-var START_LOCATION = {
-  start: START_POSITION,
-  end: START_POSITION
-};
-
 // src/service/marko/definition/AttrName.ts
 function AttrName2({
   node,
@@ -1533,14 +1472,14 @@ function AttrName2({
 }
 
 // src/service/marko/definition/OpenTagName.ts
-import fs4 from "fs";
-import path5 from "path";
-import { URI as URI5 } from "vscode-uri";
 import {
-  NodeType as NodeType4,
   getLines as getLines2,
-  getLocation as getLocation2
+  getLocation as getLocation2,
+  NodeType as NodeType4
 } from "@marko/language-tools";
+import fs4 from "fs";
+import path5 from "path";
+import { URI as URI5 } from "vscode-uri";
 function OpenTagName2({
   node,
   file: { parsed, lookup }
@@ -1682,8 +1621,8 @@ function extractDocumentLinks({
 }
 
 // src/service/marko/document-symbols.ts
-import { SymbolKind } from "vscode-languageserver";
 import { NodeType as NodeType7 } from "@marko/language-tools";
+import { SymbolKind } from "vscode-languageserver";
 var findDocumentSymbols = async (doc) => processDoc(doc, extractDocumentSymbols);
 function extractDocumentSymbols({
   uri,
@@ -1727,6 +1666,33 @@ import { Project as Project3 } from "@marko/language-tools";
 import * as prettier from "prettier";
 import * as markoPrettier from "prettier-plugin-marko";
 import { TextEdit as TextEdit6 } from "vscode-languageserver";
+
+// src/utils/messages.ts
+import { inspect } from "util";
+var connection;
+var previousMessagesByType = /* @__PURE__ */ new Map();
+function setup(_) {
+  connection = _;
+}
+function displayError(data) {
+  display("showError", data);
+}
+function display(type, data) {
+  const msg = typeof data === "string" ? data : inspect(data, { colors: false });
+  const previousMessages = previousMessagesByType.get(type);
+  if (previousMessages) {
+    if (previousMessages.includes(msg)) return;
+    previousMessages.push(msg);
+    if (previousMessages.length > 3) {
+      previousMessages.unshift();
+    }
+  } else {
+    previousMessagesByType.set(type, [msg]);
+  }
+  setImmediate(() => connection.sendNotification(type, msg));
+}
+
+// src/service/marko/format.ts
 async function formatDocument(doc, formatOptions, cancel) {
   try {
     const dir = getFSDir(doc);
@@ -1805,10 +1771,10 @@ var doHover = async (doc, params) => {
 };
 
 // src/service/marko/validate.ts
-import path6 from "path";
+import { DiagnosticType } from "@marko/babel-utils";
 import { Project as Project4 } from "@marko/language-tools";
+import path6 from "path";
 import { DiagnosticSeverity } from "vscode-languageserver";
-import { DiagnosticType } from "@marko/babel-utils";
 var markoErrorRegExp = /^(.+?)\.marko(?:\((\d+)(?:\s*,\s*(\d+))?\))?: (.*)$/gm;
 var compilerConfig = {
   code: false,
@@ -1969,7 +1935,14 @@ var marko_default = {
 };
 
 // src/service/script/index.ts
+import {
+  extractScript,
+  NodeType as NodeType9,
+  Project as Project5,
+  ScriptLang
+} from "@marko/language-tools";
 import path8 from "path";
+import * as prettier2 from "prettier";
 import { relativeImportPath } from "relative-import-path";
 import ts from "typescript/lib/tsserverlibrary";
 import {
@@ -1980,21 +1953,14 @@ import {
   InsertTextFormat as InsertTextFormat4
 } from "vscode-languageserver";
 import { URI as URI6 } from "vscode-uri";
-import * as prettier2 from "prettier";
-import {
-  NodeType as NodeType9,
-  Project as Project5,
-  ScriptLang,
-  extractScript
-} from "@marko/language-tools";
 
 // src/ts-plugin/host.ts
-import path7 from "path";
 import {
-  Processors,
   getExt,
-  isDefinitionFile
+  isDefinitionFile,
+  Processors
 } from "@marko/language-tools";
+import path7 from "path";
 var fsPathReg = /^(?:[./\\]|[A-Z]:)/i;
 var modulePartsReg = /^((?:@(?:[^/]+)\/)?(?:[^/]+))(.*)$/;
 function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
@@ -2165,6 +2131,42 @@ function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
   }
 }
 
+// src/utils/workspace.ts
+var isInitialized = false;
+var connection2;
+var configChangeHandlers = /* @__PURE__ */ new Set();
+var settingsCache = /* @__PURE__ */ new Map();
+async function getConfig(section) {
+  let cached = settingsCache.get(section);
+  if (!cached) {
+    try {
+      cached = await connection2.workspace.getConfiguration(section) || {};
+      settingsCache.set(section, cached);
+    } catch {
+    }
+  }
+  return cached;
+}
+function onConfigChange(handler) {
+  configChangeHandlers.add(handler);
+}
+function setup2(_) {
+  connection2 = _;
+  connection2.onDidChangeConfiguration(() => {
+    if (isInitialized) {
+      settingsCache.clear();
+      emitConfigChange();
+    } else {
+      isInitialized = true;
+    }
+  });
+}
+function emitConfigChange() {
+  for (const handler of configChangeHandlers) {
+    handler();
+  }
+}
+
 // src/service/script/util/print-jsdoc-tag.ts
 var REG_BACK_TICK = /`/g;
 var REG_LINE = /\r\n|\n/;
@@ -3079,6 +3081,7 @@ function getCanonicalFileName(fileName) {
 }
 
 // src/service/style/index.ts
+import { extractStyle } from "@marko/language-tools";
 import {
   getCSSLanguageService,
   getLESSLanguageService,
@@ -3088,7 +3091,6 @@ import {
   TextDocumentEdit
 } from "vscode-languageserver";
 import { TextDocument as TextDocument2 } from "vscode-languageserver-textdocument";
-import { extractStyle } from "@marko/language-tools";
 var services = {
   ".css": getCSSLanguageService,
   ".less": getLESSLanguageService,
@@ -3756,7 +3758,7 @@ console.error = (...args) => {
 process.on("uncaughtException", console.error);
 process.on("unhandledRejection", console.error);
 connection3.onInitialize(async (params) => {
-  setup2(connection3);
+  setup(connection3);
   await service.initialize(params);
   return {
     capabilities: {
@@ -3798,7 +3800,7 @@ connection3.onInitialize(async (params) => {
     }
   };
 });
-setup(connection3);
+setup2(connection3);
 onConfigChange(validateDocs);
 connection3.onDidOpenTextDocument(async (params) => {
   doOpen(params);