@marko/language-server 1.3.8 → 1.3.9

package/dist/index.js

@@ -22,17 +22,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// src/index.ts
-var import_util2 = require("util");
-var import_node = require("vscode-languageserver/node");
-var import_language_tools19 = require("@marko/language-tools");
-
 // src/utils/project-defaults.ts
-var import_path = __toESM(require("path"));
 var defaultCompiler = __toESM(require("@marko/compiler"));
 var import_config = __toESM(require("@marko/compiler/config"));
-var defaultTranslator = __toESM(require("@marko/translator-default"));
 var import_language_tools = require("@marko/language-tools");
+var defaultTranslator = __toESM(require("@marko/translator-default"));
+var import_path = __toESM(require("path"));
 import_language_tools.Project.setDefaultTypePaths({
   internalTypesFile: import_path.default.join(__dirname, "marko.internal.d.ts"),
   markoTypesFile: import_path.default.join(__dirname, "marko.runtime.d.ts")
@@ -42,72 +37,19 @@ import_language_tools.Project.setDefaultCompilerMeta(defaultCompiler, {
   translator: defaultTranslator
 });
 
-// src/utils/file.ts
-var import_path2 = __toESM(require("path"));
-var import_language_tools2 = 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_path2.default.dirname(filename);
-}
-function getFSPath(doc) {
-  const parsed = import_vscode_uri.URI.parse(doc.uri);
-  return parsed.scheme === "file" ? parsed.fsPath : void 0;
-}
-function getMarkoFile(doc) {
-  const { uri } = doc;
-  const { fsPath, scheme } = import_vscode_uri.URI.parse(uri);
-  const filename = scheme === "file" ? fsPath : void 0;
-  const dirname = filename ? import_path2.default.dirname(filename) : process.cwd();
-  const cache = import_language_tools2.Project.getCache(dirname);
-  let file = cache.get(doc);
-  if (!file) {
-    const { version } = doc;
-    const code = doc.getText();
-    const parsed = (0, import_language_tools2.parse)(code, filename);
-    const lookup = import_language_tools2.Project.getTagLookup(dirname);
-    cache.set(
-      doc,
-      file = {
-        uri,
-        scheme,
-        version,
-        lookup,
-        filename,
-        dirname,
-        parsed,
-        code
-      }
-    );
-  }
-  return file;
-}
-function clearMarkoCacheForFile(doc) {
-  import_language_tools2.Project.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
+var import_language_tools19 = require("@marko/language-tools");
+var import_util2 = require("util");
+var import_node = require("vscode-languageserver/node");
+
+// src/service/index.ts
+var import_vscode_languageserver12 = require("vscode-languageserver");
 
 // src/utils/text-documents.ts
 var import_fs = __toESM(require("fs"));
-var import_vscode_uri2 = require("vscode-uri");
 var import_vscode_languageserver = require("vscode-languageserver");
 var import_vscode_languageserver_textdocument = require("vscode-languageserver-textdocument");
+var import_vscode_uri = require("vscode-uri");
 var docs = /* @__PURE__ */ new Map();
 var openDocs = /* @__PURE__ */ new Set();
 var fileExists = /* @__PURE__ */ new Map();
@@ -122,7 +64,7 @@ function getAllOpen() {
 function get(uri) {
   const doc = docs.get(uri);
   if (doc) return doc;
-  const { fsPath, scheme } = import_vscode_uri2.URI.parse(uri);
+  const { fsPath, scheme } = import_vscode_uri.URI.parse(uri);
   if (scheme === "file") {
     if (fileExists.get(uri) === false) return void 0;
     try {
@@ -143,7 +85,7 @@ function get(uri) {
 function exists(uri) {
   const cached = fileExists.get(uri);
   if (cached !== void 0) return cached;
-  const { fsPath, scheme } = import_vscode_uri2.URI.parse(uri);
+  const { fsPath, scheme } = import_vscode_uri.URI.parse(uri);
   if (scheme === "file") {
     try {
       import_fs.default.accessSync(fsPath);
@@ -196,7 +138,7 @@ function doClose(params) {
   if (doc) {
     projectVersion++;
     openDocs.delete(doc);
-    if (import_vscode_uri2.URI.parse(ref.uri).scheme !== "file") {
+    if (import_vscode_uri.URI.parse(ref.uri).scheme !== "file") {
       docs.delete(ref.uri);
     }
   }
@@ -241,75 +183,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
+var import_language_tools3 = require("@marko/language-tools");
+var import_axe_core = __toESM(require("axe-core"));
+var import_jsdom = require("jsdom");
+
+// src/utils/file.ts
+var import_language_tools2 = require("@marko/language-tools");
+var import_path2 = __toESM(require("path"));
+var import_vscode_uri2 = require("vscode-uri");
+var processorCaches = /* @__PURE__ */ new WeakMap();
+function getFSDir(doc) {
+  const filename = getFSPath(doc);
+  return filename && import_path2.default.dirname(filename);
 }
-function setup(_) {
-  connection = _;
-  connection.onDidChangeConfiguration(() => {
-    if (isInitialized) {
-      settingsCache.clear();
-      emitConfigChange();
-    } else {
-      isInitialized = true;
-    }
-  });
+function getFSPath(doc) {
+  const parsed = import_vscode_uri2.URI.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 } = import_vscode_uri2.URI.parse(uri);
+  const filename = scheme === "file" ? fsPath : void 0;
+  const dirname = filename ? import_path2.default.dirname(filename) : process.cwd();
+  const cache = import_language_tools2.Project.getCache(dirname);
+  let file = cache.get(doc);
+  if (!file) {
+    const { version } = doc;
+    const code = doc.getText();
+    const parsed = (0, import_language_tools2.parse)(code, filename);
+    const lookup = import_language_tools2.Project.getTagLookup(dirname);
+    cache.set(
+      doc,
+      file = {
+        uri,
+        scheme,
+        version,
+        lookup,
+        filename,
+        dirname,
+        parsed,
+        code
+      }
+    );
   }
+  return file;
 }
-
-// src/utils/messages.ts
-var import_util = require("util");
-var connection2;
-var previousMessagesByType = /* @__PURE__ */ new Map();
-function setup2(_) {
-  connection2 = _;
-}
-function displayError(data) {
-  display("showError", data);
+function clearMarkoCacheForFile(doc) {
+  import_language_tools2.Project.getCache(getFSDir(doc)).delete(doc);
 }
-function display(type, data) {
-  const msg = typeof data === "string" ? data : (0, import_util.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
-var import_vscode_languageserver12 = require("vscode-languageserver");
-
-// src/service/html/index.ts
-var import_axe_core = __toESM(require("axe-core"));
-var import_language_tools3 = require("@marko/language-tools");
-var import_jsdom = require("jsdom");
-
 // src/service/html/axe-rules/axe-rules.ts
 var keyboard = {
   /**
@@ -853,7 +792,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"] },
@@ -1107,31 +1046,6 @@ function isExternalModule(file) {
 var import_path3 = __toESM(require("path"));
 var import_vscode_languageserver3 = require("vscode-languageserver");
 
-// src/service/marko/util/is-document-link-attr.ts
-var import_language_tools4 = require("@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 === import_language_tools4.NodeType.AttrNamed && attr.value?.type === import_language_tools4.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
 var import_promises = __toESM(require("fs/promises"));
 var import_url = require("url");
@@ -1186,6 +1100,31 @@ function resolveUrl(to, base) {
   }
 }
 
+// src/service/marko/util/is-document-link-attr.ts
+var import_language_tools4 = require("@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 === import_language_tools4.NodeType.AttrNamed && attr.value?.type === import_language_tools4.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,
@@ -1376,8 +1315,8 @@ function OpenTagName({
 }
 
 // src/service/marko/complete/Tag.ts
-var import_vscode_languageserver6 = require("vscode-languageserver");
 var import_language_tools6 = require("@marko/language-tools");
+var import_vscode_languageserver6 = require("vscode-languageserver");
 var partialCloseTagReg = /<\/(?:[^><]*>)?/iy;
 function Tag({
   node,
@@ -1447,9 +1386,19 @@ var doComplete = async (doc, params) => {
 var import_language_tools10 = require("@marko/language-tools");
 
 // src/service/marko/definition/AttrName.ts
+var import_language_tools8 = require("@marko/language-tools");
 var import_fs2 = __toESM(require("fs"));
 var import_vscode_uri4 = require("vscode-uri");
-var import_language_tools8 = require("@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) {
@@ -1475,16 +1424,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,
@@ -1526,10 +1465,10 @@ function AttrName2({
 }
 
 // src/service/marko/definition/OpenTagName.ts
+var import_language_tools9 = require("@marko/language-tools");
 var import_fs3 = __toESM(require("fs"));
 var import_path5 = __toESM(require("path"));
 var import_vscode_uri5 = require("vscode-uri");
-var import_language_tools9 = require("@marko/language-tools");
 function OpenTagName2({
   node,
   file: { parsed, lookup }
@@ -1671,8 +1610,8 @@ function extractDocumentLinks({
 }
 
 // src/service/marko/document-symbols.ts
-var import_vscode_languageserver7 = require("vscode-languageserver");
 var import_language_tools12 = require("@marko/language-tools");
+var import_vscode_languageserver7 = require("vscode-languageserver");
 var findDocumentSymbols = async (doc) => processDoc(doc, extractDocumentSymbols);
 function extractDocumentSymbols({
   uri,
@@ -1716,6 +1655,33 @@ var import_language_tools13 = require("@marko/language-tools");
 var prettier = __toESM(require("prettier"));
 var markoPrettier = __toESM(require("prettier-plugin-marko"));
 var import_vscode_languageserver8 = require("vscode-languageserver");
+
+// src/utils/messages.ts
+var import_util = require("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 : (0, import_util.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);
@@ -1794,10 +1760,10 @@ var doHover = async (doc, params) => {
 };
 
 // src/service/marko/validate.ts
-var import_path6 = __toESM(require("path"));
+var import_babel_utils = require("@marko/babel-utils");
 var import_language_tools15 = require("@marko/language-tools");
+var import_path6 = __toESM(require("path"));
 var import_vscode_languageserver9 = require("vscode-languageserver");
-var import_babel_utils = require("@marko/babel-utils");
 var markoErrorRegExp = /^(.+?)\.marko(?:\((\d+)(?:\s*,\s*(\d+))?\))?: (.*)$/gm;
 var compilerConfig = {
   code: false,
@@ -1958,17 +1924,17 @@ var marko_default = {
 };
 
 // src/service/script/index.ts
+var import_language_tools17 = require("@marko/language-tools");
 var import_path8 = __toESM(require("path"));
+var prettier2 = __toESM(require("prettier"));
 var import_relative_import_path = require("relative-import-path");
 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_tools17 = require("@marko/language-tools");
 
 // src/ts-plugin/host.ts
-var import_path7 = __toESM(require("path"));
 var import_language_tools16 = require("@marko/language-tools");
+var import_path7 = __toESM(require("path"));
 var fsPathReg = /^(?:[./\\]|[A-Z]:)/i;
 var modulePartsReg = /^((?:@(?:[^/]+)\/)?(?:[^/]+))(.*)$/;
 function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
@@ -2139,6 +2105,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/;
@@ -3053,10 +3055,10 @@ function getCanonicalFileName(fileName) {
 }
 
 // src/service/style/index.ts
+var import_language_tools18 = 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");
-var import_language_tools18 = require("@marko/language-tools");
 var services = {
   ".css": import_vscode_css_languageservice2.getCSSLanguageService,
   ".less": import_vscode_css_languageservice2.getLESSLanguageService,
@@ -3724,7 +3726,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: {
@@ -3766,7 +3768,7 @@ connection3.onInitialize(async (params) => {
     }
   };
 });
-setup(connection3);
+setup2(connection3);
 onConfigChange(validateDocs);
 connection3.onDidOpenTextDocument(async (params) => {
   doOpen(params);