@marko/language-server 1.1.20 → 1.2.0

package/dist/index.mjs

@@ -1445,206 +1445,8 @@ var doComplete = async (doc, params) => {
   };
 };
 
-// src/service/marko/validate.ts
-import path5 from "path";
-import { Project as Project3 } from "@marko/language-tools";
-import { DiagnosticSeverity } from "vscode-languageserver";
-import { DiagnosticType } from "@marko/babel-utils";
-var markoErrorRegExp = /^(.+?)\.marko(?:\((\d+)(?:\s*,\s*(\d+))?\))?: (.*)$/gm;
-var compilerConfig = {
-  code: false,
-  output: "migrate",
-  sourceMaps: false,
-  errorRecovery: true,
-  babelConfig: {
-    babelrc: false,
-    configFile: false,
-    browserslistConfigFile: false,
-    caller: {
-      name: "@marko/language-server",
-      supportsStaticESM: true,
-      supportsDynamicImport: true,
-      supportsTopLevelAwait: true,
-      supportsExportNamespaceFrom: true
-    }
-  }
-};
-var doValidate = (doc) => {
-  const filename = getFSPath(doc);
-  const diagnostics = [];
-  try {
-    const { meta } = Project3.getCompiler(
-      filename && path5.dirname(filename)
-    ).compileSync(doc.getText(), filename || "untitled.marko", compilerConfig);
-    if (meta.diagnostics) {
-      for (const diag of meta.diagnostics) {
-        const range = diag.loc ? {
-          start: {
-            line: diag.loc.start.line - 1,
-            character: diag.loc.start.column
-          },
-          end: {
-            line: diag.loc.end.line - 1,
-            character: diag.loc.end.column
-          }
-        } : {
-          start: { line: 0, character: 0 },
-          end: { line: 0, character: 0 }
-        };
-        let severity;
-        switch (diag.type) {
-          case DiagnosticType.Warning:
-          case DiagnosticType.Deprecation:
-            severity = DiagnosticSeverity.Warning;
-            break;
-          case DiagnosticType.Suggestion:
-            severity = DiagnosticSeverity.Hint;
-            break;
-          default:
-            severity = DiagnosticSeverity.Error;
-            break;
-        }
-        diagnostics.push({
-          range,
-          source: "marko",
-          code: void 0,
-          tags: void 0,
-          severity,
-          message: diag.label
-        });
-      }
-    }
-  } catch (err) {
-    addDiagnosticsForError(err, diagnostics);
-  }
-  return diagnostics;
-};
-function addDiagnosticsForError(err, diagnostics) {
-  if (!isError(err)) {
-    diagnostics.push({
-      range: {
-        start: { line: 0, character: 0 },
-        end: { line: 0, character: 0 }
-      },
-      source: "marko",
-      code: void 0,
-      tags: void 0,
-      severity: DiagnosticSeverity.Error,
-      message: String(err)
-    });
-  } else if (isAggregateError(err)) {
-    for (const nestedError of err.errors) {
-      addDiagnosticsForError(nestedError, diagnostics);
-    }
-  } else if (isErrorWithLoc(err)) {
-    const message = err.label || err.message || err.stack;
-    if (!message)
-      return;
-    const { loc } = err;
-    diagnostics.push({
-      range: {
-        start: {
-          line: loc.start.line - 1,
-          character: loc.start.column
-        },
-        end: {
-          line: loc.end.line - 1,
-          character: loc.end.column
-        }
-      },
-      source: "marko",
-      code: void 0,
-      tags: void 0,
-      severity: DiagnosticSeverity.Error,
-      message
-    });
-  } else {
-    let match;
-    while (match = markoErrorRegExp.exec(err.message)) {
-      const [, , rawLine, rawCol, message] = match;
-      const pos = {
-        line: (parseInt(rawLine, 10) || 1) - 1,
-        character: (parseInt(rawCol, 10) || 1) - 1
-      };
-      diagnostics.push({
-        range: { start: pos, end: pos },
-        source: "marko",
-        code: void 0,
-        tags: void 0,
-        severity: DiagnosticSeverity.Error,
-        message
-      });
-    }
-  }
-}
-function isError(err) {
-  return err != null && typeof err === "object" && typeof err.message === "string";
-}
-function isAggregateError(err) {
-  return Array.isArray(err == null ? void 0 : err.errors);
-}
-function isErrorWithLoc(err) {
-  const loc = err == null ? void 0 : err.loc;
-  if (typeof loc !== "object")
-    return false;
-  return loc !== null && typeof loc === "object" && typeof loc.start === "object" && typeof loc.end === "object" && typeof loc.start.line === "number" && typeof loc.start.column === "number" && typeof loc.end.line === "number" && typeof loc.end.column === "number";
-}
-
-// src/service/marko/hover/index.ts
-import { NodeType as NodeType4 } 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/service/marko/hover/OpenTagName.ts
-function OpenTagName2({
-  node,
-  file: { parsed, filename, lookup }
-}) {
-  const tag = node.parent;
-  const range = parsed.locationAt(node);
-  const tagDef = tag.nameText && lookup.getTag(tag.nameText);
-  if (tagDef) {
-    const completion = getTagNameCompletion({
-      tag: tagDef,
-      range: START_LOCATION,
-      importer: filename
-    });
-    if (completion.documentation) {
-      return {
-        range,
-        contents: completion.documentation
-      };
-    }
-  }
-}
-
-// src/service/marko/hover/index.ts
-var handlers2 = {
-  OpenTagName: OpenTagName2
-};
-var doHover = async (doc, params) => {
-  var _a;
-  const file = getMarkoFile(doc);
-  const offset = doc.offsetAt(params.position);
-  const node = file.parsed.nodeAt(offset);
-  return await ((_a = handlers2[NodeType4[node.type]]) == null ? void 0 : _a.call(handlers2, {
-    file,
-    params,
-    offset,
-    node
-  }));
-};
-
 // src/service/marko/definition/index.ts
-import { NodeType as NodeType6 } from "@marko/language-tools";
+import { NodeType as NodeType5 } from "@marko/language-tools";
 
 // src/service/marko/definition/AttrName.ts
 import fs3 from "fs";
@@ -1675,6 +1477,16 @@ 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,
@@ -1717,23 +1529,23 @@ function AttrName2({
 
 // src/service/marko/definition/OpenTagName.ts
 import fs4 from "fs";
-import path6 from "path";
+import path5 from "path";
 import { URI as URI5 } from "vscode-uri";
 import {
-  NodeType as NodeType5,
+  NodeType as NodeType4,
   getLines as getLines2,
   getLocation as getLocation2
 } from "@marko/language-tools";
-function OpenTagName3({
+function OpenTagName2({
   node,
   file: { parsed, lookup }
 }) {
   const tag = node.parent;
   let tagDef;
   let range = START_LOCATION;
-  if (tag.type === NodeType5.AttrTag) {
+  if (tag.type === NodeType4.AttrTag) {
     let parentTag = tag.owner;
-    while ((parentTag == null ? void 0 : parentTag.type) === NodeType5.AttrTag)
+    while ((parentTag == null ? void 0 : parentTag.type) === NodeType4.AttrTag)
       parentTag = parentTag.owner;
     tagDef = parentTag && parentTag.nameText ? lookup.getTag(parentTag.nameText) : void 0;
   } else {
@@ -1743,7 +1555,7 @@ function OpenTagName3({
     return;
   }
   const tagEntryFile = tagDef.template || tagDef.renderer || tagDef.filePath;
-  if (!path6.isAbsolute(tagEntryFile)) {
+  if (!path5.isAbsolute(tagEntryFile)) {
     return;
   }
   if (/\/marko(?:-tag)?\.json$/.test(tagEntryFile)) {
@@ -1770,8 +1582,8 @@ function OpenTagName3({
 }
 
 // src/service/marko/definition/index.ts
-var handlers3 = {
-  OpenTagName: OpenTagName3,
+var handlers2 = {
+  OpenTagName: OpenTagName2,
   AttrName: AttrName2
 };
 var findDefinition = async (doc, params) => {
@@ -1779,7 +1591,7 @@ var findDefinition = async (doc, params) => {
   const file = getMarkoFile(doc);
   const offset = doc.offsetAt(params.position);
   const node = file.parsed.nodeAt(offset);
-  return await ((_a = handlers3[NodeType6[node.type]]) == null ? void 0 : _a.call(handlers3, {
+  return await ((_a = handlers2[NodeType5[node.type]]) == null ? void 0 : _a.call(handlers2, {
     file,
     params,
     offset,
@@ -1788,7 +1600,7 @@ var findDefinition = async (doc, params) => {
 };
 
 // src/service/marko/document-links.ts
-import { NodeType as NodeType7 } from "@marko/language-tools";
+import { NodeType as NodeType6 } from "@marko/language-tools";
 var importTagReg2 = /(['"])<((?:[^\1\\>]+|\\.)*)>?\1/g;
 var findDocumentLinks = async (doc) => {
   return processDoc(doc, extractDocumentLinks);
@@ -1807,14 +1619,14 @@ function extractDocumentLinks({
   const { program, read } = parsed;
   const visit = (node) => {
     switch (node.type) {
-      case NodeType7.AttrTag:
+      case NodeType6.AttrTag:
         if (node.body) {
           for (const child of node.body) {
             visit(child);
           }
         }
         break;
-      case NodeType7.Tag:
+      case NodeType6.Tag:
         if (node.attrs && node.nameText) {
           for (const attr of node.attrs) {
             if (isDocumentLinkAttr(code, node, attr)) {
@@ -1840,7 +1652,7 @@ function extractDocumentLinks({
     }
   };
   for (const node of program.static) {
-    if (node.type === NodeType7.Import) {
+    if (node.type === NodeType6.Import) {
       importTagReg2.lastIndex = 0;
       const value = parsed.read(node);
       const match = importTagReg2.exec(value);
@@ -1868,7 +1680,7 @@ function extractDocumentLinks({
 
 // src/service/marko/document-symbols.ts
 import { SymbolKind } from "vscode-languageserver";
-import { NodeType as NodeType8 } from "@marko/language-tools";
+import { NodeType as NodeType7 } from "@marko/language-tools";
 var findDocumentSymbols = async (doc) => processDoc(doc, extractDocumentSymbols);
 function extractDocumentSymbols({
   uri,
@@ -1884,10 +1696,10 @@ function extractDocumentSymbols({
   const visit = (node) => {
     var _a, _b;
     switch (node.type) {
-      case NodeType8.Tag:
-      case NodeType8.AttrTag:
+      case NodeType7.Tag:
+      case NodeType7.AttrTag:
         symbols.push({
-          name: (node.type === NodeType8.AttrTag ? (_a = node.nameText) == null ? void 0 : _a.slice(node.nameText.indexOf("@")) : node.nameText) || "<${...}>",
+          name: (node.type === NodeType7.AttrTag ? (_a = node.nameText) == null ? void 0 : _a.slice(node.nameText.indexOf("@")) : node.nameText) || "<${...}>",
           kind: node.nameText && ((_b = lookup.getTag(node.nameText)) == null ? void 0 : _b.html) && SymbolKind.Property || SymbolKind.Class,
           location: {
             uri,
@@ -1909,11 +1721,11 @@ function extractDocumentSymbols({
 }
 
 // src/service/marko/format.ts
-import { TextEdit as TextEdit6 } from "vscode-languageserver";
+import { Project as Project3 } from "@marko/language-tools";
 import * as prettier from "prettier";
 import * as markoPrettier from "prettier-plugin-marko";
-import { Project as Project4 } from "@marko/language-tools";
-var format2 = async (doc, params, cancel) => {
+import { TextEdit as TextEdit6 } from "vscode-languageserver";
+async function formatDocument(doc, formatOptions, cancel) {
   try {
     const dir = getFSDir(doc);
     const filepath = getFSPath(doc);
@@ -1922,16 +1734,17 @@ var format2 = async (doc, params, cancel) => {
       parser: "marko",
       filepath,
       plugins: [markoPrettier],
-      tabWidth: params.options.tabSize,
-      useTabs: params.options.insertSpaces === false,
+      tabWidth: formatOptions.tabSize,
+      useTabs: formatOptions.insertSpaces === false,
+      markoSyntax: formatOptions.mode ?? "auto",
       ...filepath ? await prettier.resolveConfig(filepath, {
         editorconfig: true
       }).catch(() => null) : null
     };
-    if (cancel.isCancellationRequested)
+    markoPrettier.setCompiler(Project3.getCompiler(dir), Project3.getConfig(dir));
+    if (cancel == null ? void 0 : cancel.isCancellationRequested)
       return;
-    markoPrettier.setCompiler(Project4.getCompiler(dir), Project4.getConfig(dir));
-    const ret = [
+    return [
       TextEdit6.replace(
         {
           start: START_POSITION,
@@ -1940,12 +1753,202 @@ var format2 = async (doc, params, cancel) => {
         await prettier.format(text, options)
       )
     ];
-    return ret;
   } catch (e) {
     displayError(e);
   }
+}
+var format2 = async (doc, params, cancel) => {
+  return formatDocument(doc, params.options, cancel);
+};
+
+// src/service/marko/hover/index.ts
+import { NodeType as NodeType8 } from "@marko/language-tools";
+
+// src/service/marko/hover/OpenTagName.ts
+function OpenTagName3({
+  node,
+  file: { parsed, filename, lookup }
+}) {
+  const tag = node.parent;
+  const range = parsed.locationAt(node);
+  const tagDef = tag.nameText && lookup.getTag(tag.nameText);
+  if (tagDef) {
+    const completion = getTagNameCompletion({
+      tag: tagDef,
+      range: START_LOCATION,
+      importer: filename
+    });
+    if (completion.documentation) {
+      return {
+        range,
+        contents: completion.documentation
+      };
+    }
+  }
+}
+
+// src/service/marko/hover/index.ts
+var handlers3 = {
+  OpenTagName: OpenTagName3
+};
+var doHover = async (doc, params) => {
+  var _a;
+  const file = getMarkoFile(doc);
+  const offset = doc.offsetAt(params.position);
+  const node = file.parsed.nodeAt(offset);
+  return await ((_a = handlers3[NodeType8[node.type]]) == null ? void 0 : _a.call(handlers3, {
+    file,
+    params,
+    offset,
+    node
+  }));
 };
 
+// src/service/marko/validate.ts
+import path6 from "path";
+import { Project as Project4 } from "@marko/language-tools";
+import { DiagnosticSeverity } from "vscode-languageserver";
+import { DiagnosticType } from "@marko/babel-utils";
+var markoErrorRegExp = /^(.+?)\.marko(?:\((\d+)(?:\s*,\s*(\d+))?\))?: (.*)$/gm;
+var compilerConfig = {
+  code: false,
+  output: "migrate",
+  sourceMaps: false,
+  errorRecovery: true,
+  babelConfig: {
+    babelrc: false,
+    configFile: false,
+    browserslistConfigFile: false,
+    caller: {
+      name: "@marko/language-server",
+      supportsStaticESM: true,
+      supportsDynamicImport: true,
+      supportsTopLevelAwait: true,
+      supportsExportNamespaceFrom: true
+    }
+  }
+};
+var doValidate = (doc) => {
+  const filename = getFSPath(doc);
+  const diagnostics = [];
+  try {
+    const { meta } = Project4.getCompiler(
+      filename && path6.dirname(filename)
+    ).compileSync(doc.getText(), filename || "untitled.marko", compilerConfig);
+    if (meta.diagnostics) {
+      for (const diag of meta.diagnostics) {
+        const range = diag.loc ? {
+          start: {
+            line: diag.loc.start.line - 1,
+            character: diag.loc.start.column
+          },
+          end: {
+            line: diag.loc.end.line - 1,
+            character: diag.loc.end.column
+          }
+        } : {
+          start: { line: 0, character: 0 },
+          end: { line: 0, character: 0 }
+        };
+        let severity;
+        switch (diag.type) {
+          case DiagnosticType.Warning:
+          case DiagnosticType.Deprecation:
+            severity = DiagnosticSeverity.Warning;
+            break;
+          case DiagnosticType.Suggestion:
+            severity = DiagnosticSeverity.Hint;
+            break;
+          default:
+            severity = DiagnosticSeverity.Error;
+            break;
+        }
+        diagnostics.push({
+          range,
+          source: "marko",
+          code: void 0,
+          tags: void 0,
+          severity,
+          message: diag.label
+        });
+      }
+    }
+  } catch (err) {
+    addDiagnosticsForError(err, diagnostics);
+  }
+  return diagnostics;
+};
+function addDiagnosticsForError(err, diagnostics) {
+  if (!isError(err)) {
+    diagnostics.push({
+      range: {
+        start: { line: 0, character: 0 },
+        end: { line: 0, character: 0 }
+      },
+      source: "marko",
+      code: void 0,
+      tags: void 0,
+      severity: DiagnosticSeverity.Error,
+      message: String(err)
+    });
+  } else if (isAggregateError(err)) {
+    for (const nestedError of err.errors) {
+      addDiagnosticsForError(nestedError, diagnostics);
+    }
+  } else if (isErrorWithLoc(err)) {
+    const message = err.label || err.message || err.stack;
+    if (!message)
+      return;
+    const { loc } = err;
+    diagnostics.push({
+      range: {
+        start: {
+          line: loc.start.line - 1,
+          character: loc.start.column
+        },
+        end: {
+          line: loc.end.line - 1,
+          character: loc.end.column
+        }
+      },
+      source: "marko",
+      code: void 0,
+      tags: void 0,
+      severity: DiagnosticSeverity.Error,
+      message
+    });
+  } else {
+    let match;
+    while (match = markoErrorRegExp.exec(err.message)) {
+      const [, , rawLine, rawCol, message] = match;
+      const pos = {
+        line: (parseInt(rawLine, 10) || 1) - 1,
+        character: (parseInt(rawCol, 10) || 1) - 1
+      };
+      diagnostics.push({
+        range: { start: pos, end: pos },
+        source: "marko",
+        code: void 0,
+        tags: void 0,
+        severity: DiagnosticSeverity.Error,
+        message
+      });
+    }
+  }
+}
+function isError(err) {
+  return err != null && typeof err === "object" && typeof err.message === "string";
+}
+function isAggregateError(err) {
+  return Array.isArray(err == null ? void 0 : err.errors);
+}
+function isErrorWithLoc(err) {
+  const loc = err == null ? void 0 : err.loc;
+  if (typeof loc !== "object")
+    return false;
+  return loc !== null && typeof loc === "object" && typeof loc.start === "object" && typeof loc.end === "object" && typeof loc.start.line === "number" && typeof loc.start.column === "number" && typeof loc.end.line === "number" && typeof loc.end.column === "number";
+}
+
 // src/service/marko/index.ts
 var marko_default = {
   doComplete,
@@ -1954,7 +1957,17 @@ var marko_default = {
   findDefinition,
   findDocumentLinks,
   findDocumentSymbols,
-  format: format2
+  format: format2,
+  commands: {
+    "$/formatWithMode": async ({
+      doc: docURI,
+      options
+    }) => {
+      const doc = get(docURI);
+      const formatted = await formatDocument(doc, options);
+      return formatted;
+    }
+  }
 };
 
 // src/service/script/index.ts
@@ -2818,12 +2831,12 @@ function getTSProject(docFsPath) {
       markoScriptLang = ScriptLang.ts;
     }
   }
-  const rootDir = configFile && path8.dirname(configFile) || process.cwd();
-  const cache = Project5.getCache(configFile && rootDir);
+  const basePath = configFile && path8.dirname(configFile) || process.cwd();
+  const cache = Project5.getCache(configFile && basePath);
   let projectCache = cache.get(getTSProject);
   let cached;
   if (projectCache) {
-    cached = projectCache.get(rootDir);
+    cached = projectCache.get(basePath);
     if (cached)
       return cached;
   } else {
@@ -2833,13 +2846,13 @@ function getTSProject(docFsPath) {
   const { fileNames, options, projectReferences } = ts.parseJsonConfigFileContent(
     configFile && ts.readConfigFile(configFile, ts.sys.readFile).config || defaultTSConfig,
     ts.sys,
-    rootDir,
+    basePath,
     requiredTSCompilerOptions,
     configFile,
     void 0,
     extraTSCompilerExtensions
   );
-  options.rootDir ??= rootDir;
+  options.rootDir = basePath;
   const potentialGlobalFiles = new Set(
     fileNames.filter((file) => /\.[cm]?ts$/.test(file))
   );
@@ -2849,7 +2862,7 @@ function getTSProject(docFsPath) {
     ts.getDefaultLibFileName(options)
   );
   const resolutionCache = ts.createModuleResolutionCache(
-    rootDir,
+    basePath,
     getCanonicalFileName,
     options
   );
@@ -2954,7 +2967,7 @@ function getTSProject(docFsPath) {
     service: ts.createLanguageService(host),
     markoScriptLang
   };
-  projectCache.set(rootDir, tsProject);
+  projectCache.set(basePath, tsProject);
   return tsProject;
 }
 function filenameToURI(filename) {