@marko/language-tools 2.5.58 → 2.5.59

package/dist/extractors/html/index.d.ts

@@ -1,6 +1,6 @@
-import { Parsed } from "../../parser";
+import { type Parsed } from "../../parser";
 export declare function extractHTML(parsed: Parsed): {
-    extracted: import("../../util/extractor").Extracted;
+    extracted: import("../..").Extracted;
     nodeDetails: {
         [id: string]: {
             hasDynamicAttrs: boolean;

package/dist/extractors/script/index.d.ts

@@ -17,4 +17,4 @@ export interface ExtractScriptOptions {
     runtimeTypesCode?: string;
     translator: Meta["config"]["translator"];
 }
-export declare function extractScript(opts: ExtractScriptOptions): import("../../util/extractor").Extracted;
+export declare function extractScript(opts: ExtractScriptOptions): import("../..").Extracted;

package/dist/extractors/script/util/attach-scopes.d.ts

@@ -1,4 +1,4 @@
-import { type Node, Parsed, type Range, Repeatable, Repeated } from "../../../parser";
+import { type Node, type Parsed, type Range, type Repeatable, type Repeated } from "../../../parser";
 import { ScriptParser } from "./script-parser";
 export type Scope = ProgramScope | TagScope;
 export interface ProgramScope {

package/dist/extractors/script/util/get-runtime-api.d.ts

@@ -1,5 +1,5 @@
 import type { TaglibLookup } from "@marko/compiler/babel-utils";
-import { Parsed } from "../../../parser";
+import { type Parsed } from "../../../parser";
 export type RuntimeAPI = (typeof RuntimeAPI)[keyof typeof RuntimeAPI];
 export declare const RuntimeAPI: {
     readonly tags: "tags";

package/dist/extractors/script/util/is-text-only-script.d.ts

@@ -1,4 +1,4 @@
-import { type Node, Repeated } from "../../../parser";
+import { type Node, type Repeated } from "../../../parser";
 export declare function isTextOnlyScript(tag: Node.ParentTag): tag is Node.Tag & {
     nameText: "script";
     args: undefined;

package/dist/index.js

@@ -730,6 +730,7 @@ var Extracted = class {
       );
     }
   }
+  parsed;
   #generated;
   #sourceToGenerated;
   #generatedToSource;
@@ -1065,6 +1066,205 @@ var import_relative_import_path = require("relative-import-path");
 
 // src/extractors/script/util/attach-scopes.ts
 var import_compiler = require("@marko/compiler");
+
+// src/extractors/script/util/script-parser.ts
+var import_babel = require("@marko/compiler/internal/babel");
+
+// src/extractors/script/util/is-text-only-script.ts
+function isTextOnlyScript(tag) {
+  if (tag.nameText !== "script" || tag.args || tag.attrs || !tag.body) {
+    return false;
+  }
+  for (const child of tag.body) {
+    if (child.type !== 17 /* Text */) {
+      return false;
+    }
+  }
+  return true;
+}
+
+// src/extractors/script/util/script-parser.ts
+var plugins = ["exportDefaultFrom", "importAssertions", "typescript"];
+var ScriptParser = class {
+  #parsed;
+  #cache = /* @__PURE__ */ new Map();
+  constructor(parsed) {
+    this.#parsed = parsed;
+  }
+  tagName(name) {
+    return this.#templateExpressions(name);
+  }
+  tagShorthandId(shorthandId) {
+    return this.#templateExpressions(shorthandId);
+  }
+  tagShorthandClassName(node) {
+    return this.#templateExpressions(node);
+  }
+  tagVar(node) {
+    const start = node.value.start - 1;
+    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `(${this.#parsed.read(node.value)})=>0`);
+    if (expr) {
+      return expr.params[0];
+    }
+  }
+  tagParams(node) {
+    const start = node.start;
+    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `(${this.#parsed.read(node.value)})=>0`);
+    if (expr) {
+      return expr.params;
+    }
+  }
+  tagTypeParams(node) {
+    const start = node.value.start - 1;
+    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `<${this.#parsed.read(node.value)}>()=>0`);
+    if (expr) {
+      return expr.typeParameters;
+    }
+  }
+  tagArgs(node) {
+    const start = node.value.start - 2;
+    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `_(${this.#parsed.read(node.value)})`);
+    if (expr) {
+      return expr.arguments;
+    }
+  }
+  tagTypeArgs(node) {
+    const start = node.value.start - 2;
+    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `_<${this.#parsed.read(node.value)}>()`);
+    if (expr) {
+      return expr.typeParameters;
+    }
+  }
+  attrValue(node) {
+    const start = node.value.start;
+    return (this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(node.value))) || void 0;
+  }
+  attrSpread(node) {
+    const start = node.value.start;
+    return (this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(node.value))) || void 0;
+  }
+  attrMethod(node) {
+    const start = node.params.start - 2;
+    const expr = this.#cache.get(start) ?? this.#expressionAt(
+      start,
+      `{_${this.#parsed.read({ start: node.params.start, end: node.body.end })}}`
+    );
+    if (expr) {
+      return expr.properties[0];
+    }
+  }
+  attrArgs(node) {
+    const start = node.value.start;
+    return (this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(node.value))) || void 0;
+  }
+  placeholder(node) {
+    const start = node.value.start;
+    return (this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(node.value))) || void 0;
+  }
+  scriptBody(node) {
+    if (!isTextOnlyScript(node)) return;
+    const start = node.body[0].start;
+    const statements = this.#cache.get(start) ?? this.#statementsAt(
+      start,
+      this.#parsed.read({ start, end: node.body[node.body.length - 1].end })
+    );
+    if (statements) {
+      return statements;
+    }
+  }
+  scriptlet(node) {
+    const start = node.value.start;
+    const statements = this.#cache.get(start) ?? this.#statementsAt(start, this.#parsed.read(node.value));
+    if (statements) {
+      return statements;
+    }
+  }
+  import(node) {
+    const statements = this.#cache.get(node.start) ?? this.#statementsAt(node.start, this.#parsed.read(node));
+    if (statements) {
+      return statements[0];
+    }
+  }
+  export(node) {
+    const statements = this.#cache.get(node.start) ?? this.#statementsAt(node.start, this.#parsed.read(node));
+    if (statements) {
+      return statements[0];
+    }
+  }
+  class(node) {
+    const expr = this.#cache.get(node.start) ?? this.#expressionAt(node.start, this.#parsed.read(node));
+    return expr || void 0;
+  }
+  static(node) {
+    const start = node.start + "static ".length;
+    const statements = this.#cache.get(start) ?? this.#statementsAt(start, this.#parsed.read({ start, end: node.end }));
+    if (statements) {
+      return statements;
+    }
+  }
+  #templateExpressions(template) {
+    const { expressions } = template;
+    if (!expressions.length) return;
+    const result = [];
+    for (const expr of expressions) {
+      const start = expr.value.start;
+      const parsed = this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(expr.value));
+      if (!parsed) return;
+      result.push(parsed);
+    }
+    if (result.length) return result;
+  }
+  #statementsAt(startIndex, src) {
+    try {
+      const pos = this.#parsed.positionAt(startIndex);
+      const result = (0, import_babel.parse)(src, {
+        plugins,
+        startIndex,
+        startLine: pos.line + 1,
+        startColumn: pos.character,
+        strictMode: true,
+        errorRecovery: true,
+        sourceType: "module",
+        allowUndeclaredExports: true,
+        allowSuperOutsideMethod: true,
+        allowAwaitOutsideFunction: true,
+        allowReturnOutsideFunction: true,
+        sourceFilename: this.#parsed.filename
+      }).program.body;
+      if (result.length) {
+        this.#cache.set(startIndex, result);
+        return result;
+      }
+    } catch {
+    }
+    this.#cache.set(startIndex, false);
+  }
+  #expressionAt(startIndex, src) {
+    try {
+      const pos = this.#parsed.positionAt(startIndex);
+      const result = (0, import_babel.parseExpression)(src, {
+        plugins,
+        startIndex,
+        startLine: pos.line + 1,
+        startColumn: pos.character,
+        strictMode: true,
+        errorRecovery: true,
+        sourceType: "module",
+        allowUndeclaredExports: true,
+        allowSuperOutsideMethod: true,
+        allowAwaitOutsideFunction: true,
+        allowReturnOutsideFunction: true,
+        sourceFilename: this.#parsed.filename
+      });
+      this.#cache.set(startIndex, result);
+      return result;
+    } catch {
+      this.#cache.set(startIndex, false);
+    }
+  }
+};
+
+// src/extractors/script/util/attach-scopes.ts
 var VISITOR_KEYS = import_compiler.types.VISITOR_KEYS;
 var ATTR_UNNAMED = "value";
 var Scopes = /* @__PURE__ */ new WeakMap();
@@ -1772,19 +1972,6 @@ function detectAPIFromTag(parsed, tag) {
   return detectAPIFromBody(parsed, tag.body);
 }
 
-// src/extractors/script/util/is-text-only-script.ts
-function isTextOnlyScript(tag) {
-  if (tag.nameText !== "script" || tag.args || tag.attrs || !tag.body) {
-    return false;
-  }
-  for (const child of tag.body) {
-    if (child.type !== 17 /* Text */) {
-      return false;
-    }
-  }
-  return true;
-}
-
 // src/extractors/script/util/jsdoc-input-type.ts
 var MaybeInputTypedefReg = /@typedef\b[\s\S]*\bInput\b/;
 function getJSDocInputType(comment, ts) {
@@ -1894,188 +2081,6 @@ function getRuntimeOverrides(api, runtimeTypes, generics, applyGenerics, returnT
   return result;
 }
 
-// src/extractors/script/util/script-parser.ts
-var import_babel = require("@marko/compiler/internal/babel");
-var plugins = ["exportDefaultFrom", "importAssertions", "typescript"];
-var ScriptParser = class {
-  #parsed;
-  #cache = /* @__PURE__ */ new Map();
-  constructor(parsed) {
-    this.#parsed = parsed;
-  }
-  tagName(name) {
-    return this.#templateExpressions(name);
-  }
-  tagShorthandId(shorthandId) {
-    return this.#templateExpressions(shorthandId);
-  }
-  tagShorthandClassName(node) {
-    return this.#templateExpressions(node);
-  }
-  tagVar(node) {
-    const start = node.value.start - 1;
-    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `(${this.#parsed.read(node.value)})=>0`);
-    if (expr) {
-      return expr.params[0];
-    }
-  }
-  tagParams(node) {
-    const start = node.start;
-    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `(${this.#parsed.read(node.value)})=>0`);
-    if (expr) {
-      return expr.params;
-    }
-  }
-  tagTypeParams(node) {
-    const start = node.value.start - 1;
-    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `<${this.#parsed.read(node.value)}>()=>0`);
-    if (expr) {
-      return expr.typeParameters;
-    }
-  }
-  tagArgs(node) {
-    const start = node.value.start - 2;
-    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `_(${this.#parsed.read(node.value)})`);
-    if (expr) {
-      return expr.arguments;
-    }
-  }
-  tagTypeArgs(node) {
-    const start = node.value.start - 2;
-    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `_<${this.#parsed.read(node.value)}>()`);
-    if (expr) {
-      return expr.typeParameters;
-    }
-  }
-  attrValue(node) {
-    const start = node.value.start;
-    return (this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(node.value))) || void 0;
-  }
-  attrSpread(node) {
-    const start = node.value.start;
-    return (this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(node.value))) || void 0;
-  }
-  attrMethod(node) {
-    const start = node.params.start - 2;
-    const expr = this.#cache.get(start) ?? this.#expressionAt(
-      start,
-      `{_${this.#parsed.read({ start: node.params.start, end: node.body.end })}}`
-    );
-    if (expr) {
-      return expr.properties[0];
-    }
-  }
-  attrArgs(node) {
-    const start = node.value.start;
-    return (this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(node.value))) || void 0;
-  }
-  placeholder(node) {
-    const start = node.value.start;
-    return (this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(node.value))) || void 0;
-  }
-  scriptBody(node) {
-    if (!isTextOnlyScript(node)) return;
-    const start = node.body[0].start;
-    const statements = this.#cache.get(start) ?? this.#statementsAt(
-      start,
-      this.#parsed.read({ start, end: node.body[node.body.length - 1].end })
-    );
-    if (statements) {
-      return statements;
-    }
-  }
-  scriptlet(node) {
-    const start = node.value.start;
-    const statements = this.#cache.get(start) ?? this.#statementsAt(start, this.#parsed.read(node.value));
-    if (statements) {
-      return statements;
-    }
-  }
-  import(node) {
-    const statements = this.#cache.get(node.start) ?? this.#statementsAt(node.start, this.#parsed.read(node));
-    if (statements) {
-      return statements[0];
-    }
-  }
-  export(node) {
-    const statements = this.#cache.get(node.start) ?? this.#statementsAt(node.start, this.#parsed.read(node));
-    if (statements) {
-      return statements[0];
-    }
-  }
-  class(node) {
-    const expr = this.#cache.get(node.start) ?? this.#expressionAt(node.start, this.#parsed.read(node));
-    return expr || void 0;
-  }
-  static(node) {
-    const start = node.start + "static ".length;
-    const statements = this.#cache.get(start) ?? this.#statementsAt(start, this.#parsed.read({ start, end: node.end }));
-    if (statements) {
-      return statements;
-    }
-  }
-  #templateExpressions(template) {
-    const { expressions } = template;
-    if (!expressions.length) return;
-    const result = [];
-    for (const expr of expressions) {
-      const start = expr.value.start;
-      const parsed = this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(expr.value));
-      if (!parsed) return;
-      result.push(parsed);
-    }
-    if (result.length) return result;
-  }
-  #statementsAt(startIndex, src) {
-    try {
-      const pos = this.#parsed.positionAt(startIndex);
-      const result = (0, import_babel.parse)(src, {
-        plugins,
-        startIndex,
-        startLine: pos.line + 1,
-        startColumn: pos.character,
-        strictMode: true,
-        errorRecovery: true,
-        sourceType: "module",
-        allowUndeclaredExports: true,
-        allowSuperOutsideMethod: true,
-        allowAwaitOutsideFunction: true,
-        allowReturnOutsideFunction: true,
-        sourceFilename: this.#parsed.filename
-      }).program.body;
-      if (result.length) {
-        this.#cache.set(startIndex, result);
-        return result;
-      }
-    } catch {
-    }
-    this.#cache.set(startIndex, false);
-  }
-  #expressionAt(startIndex, src) {
-    try {
-      const pos = this.#parsed.positionAt(startIndex);
-      const result = (0, import_babel.parseExpression)(src, {
-        plugins,
-        startIndex,
-        startLine: pos.line + 1,
-        startColumn: pos.character,
-        strictMode: true,
-        errorRecovery: true,
-        sourceType: "module",
-        allowUndeclaredExports: true,
-        allowSuperOutsideMethod: true,
-        allowAwaitOutsideFunction: true,
-        allowReturnOutsideFunction: true,
-        sourceFilename: this.#parsed.filename
-      });
-      this.#cache.set(startIndex, result);
-      return result;
-    } catch {
-      this.#cache.set(startIndex, false);
-    }
-  }
-};
-
 // src/extractors/script/index.ts
 var SEP_EMPTY = "";
 var SEP_SPACE = " ";

package/dist/index.mjs

@@ -690,6 +690,7 @@ var Extracted = class {
       );
     }
   }
+  parsed;
   #generated;
   #sourceToGenerated;
   #generatedToSource;
@@ -1025,6 +1026,208 @@ import { relativeImportPath } from "relative-import-path";
 
 // src/extractors/script/util/attach-scopes.ts
 import { types as t } from "@marko/compiler";
+
+// src/extractors/script/util/script-parser.ts
+import {
+  parse as parseStatement,
+  parseExpression
+} from "@marko/compiler/internal/babel";
+
+// src/extractors/script/util/is-text-only-script.ts
+function isTextOnlyScript(tag) {
+  if (tag.nameText !== "script" || tag.args || tag.attrs || !tag.body) {
+    return false;
+  }
+  for (const child of tag.body) {
+    if (child.type !== 17 /* Text */) {
+      return false;
+    }
+  }
+  return true;
+}
+
+// src/extractors/script/util/script-parser.ts
+var plugins = ["exportDefaultFrom", "importAssertions", "typescript"];
+var ScriptParser = class {
+  #parsed;
+  #cache = /* @__PURE__ */ new Map();
+  constructor(parsed) {
+    this.#parsed = parsed;
+  }
+  tagName(name) {
+    return this.#templateExpressions(name);
+  }
+  tagShorthandId(shorthandId) {
+    return this.#templateExpressions(shorthandId);
+  }
+  tagShorthandClassName(node) {
+    return this.#templateExpressions(node);
+  }
+  tagVar(node) {
+    const start = node.value.start - 1;
+    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `(${this.#parsed.read(node.value)})=>0`);
+    if (expr) {
+      return expr.params[0];
+    }
+  }
+  tagParams(node) {
+    const start = node.start;
+    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `(${this.#parsed.read(node.value)})=>0`);
+    if (expr) {
+      return expr.params;
+    }
+  }
+  tagTypeParams(node) {
+    const start = node.value.start - 1;
+    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `<${this.#parsed.read(node.value)}>()=>0`);
+    if (expr) {
+      return expr.typeParameters;
+    }
+  }
+  tagArgs(node) {
+    const start = node.value.start - 2;
+    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `_(${this.#parsed.read(node.value)})`);
+    if (expr) {
+      return expr.arguments;
+    }
+  }
+  tagTypeArgs(node) {
+    const start = node.value.start - 2;
+    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `_<${this.#parsed.read(node.value)}>()`);
+    if (expr) {
+      return expr.typeParameters;
+    }
+  }
+  attrValue(node) {
+    const start = node.value.start;
+    return (this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(node.value))) || void 0;
+  }
+  attrSpread(node) {
+    const start = node.value.start;
+    return (this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(node.value))) || void 0;
+  }
+  attrMethod(node) {
+    const start = node.params.start - 2;
+    const expr = this.#cache.get(start) ?? this.#expressionAt(
+      start,
+      `{_${this.#parsed.read({ start: node.params.start, end: node.body.end })}}`
+    );
+    if (expr) {
+      return expr.properties[0];
+    }
+  }
+  attrArgs(node) {
+    const start = node.value.start;
+    return (this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(node.value))) || void 0;
+  }
+  placeholder(node) {
+    const start = node.value.start;
+    return (this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(node.value))) || void 0;
+  }
+  scriptBody(node) {
+    if (!isTextOnlyScript(node)) return;
+    const start = node.body[0].start;
+    const statements = this.#cache.get(start) ?? this.#statementsAt(
+      start,
+      this.#parsed.read({ start, end: node.body[node.body.length - 1].end })
+    );
+    if (statements) {
+      return statements;
+    }
+  }
+  scriptlet(node) {
+    const start = node.value.start;
+    const statements = this.#cache.get(start) ?? this.#statementsAt(start, this.#parsed.read(node.value));
+    if (statements) {
+      return statements;
+    }
+  }
+  import(node) {
+    const statements = this.#cache.get(node.start) ?? this.#statementsAt(node.start, this.#parsed.read(node));
+    if (statements) {
+      return statements[0];
+    }
+  }
+  export(node) {
+    const statements = this.#cache.get(node.start) ?? this.#statementsAt(node.start, this.#parsed.read(node));
+    if (statements) {
+      return statements[0];
+    }
+  }
+  class(node) {
+    const expr = this.#cache.get(node.start) ?? this.#expressionAt(node.start, this.#parsed.read(node));
+    return expr || void 0;
+  }
+  static(node) {
+    const start = node.start + "static ".length;
+    const statements = this.#cache.get(start) ?? this.#statementsAt(start, this.#parsed.read({ start, end: node.end }));
+    if (statements) {
+      return statements;
+    }
+  }
+  #templateExpressions(template) {
+    const { expressions } = template;
+    if (!expressions.length) return;
+    const result = [];
+    for (const expr of expressions) {
+      const start = expr.value.start;
+      const parsed = this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(expr.value));
+      if (!parsed) return;
+      result.push(parsed);
+    }
+    if (result.length) return result;
+  }
+  #statementsAt(startIndex, src) {
+    try {
+      const pos = this.#parsed.positionAt(startIndex);
+      const result = parseStatement(src, {
+        plugins,
+        startIndex,
+        startLine: pos.line + 1,
+        startColumn: pos.character,
+        strictMode: true,
+        errorRecovery: true,
+        sourceType: "module",
+        allowUndeclaredExports: true,
+        allowSuperOutsideMethod: true,
+        allowAwaitOutsideFunction: true,
+        allowReturnOutsideFunction: true,
+        sourceFilename: this.#parsed.filename
+      }).program.body;
+      if (result.length) {
+        this.#cache.set(startIndex, result);
+        return result;
+      }
+    } catch {
+    }
+    this.#cache.set(startIndex, false);
+  }
+  #expressionAt(startIndex, src) {
+    try {
+      const pos = this.#parsed.positionAt(startIndex);
+      const result = parseExpression(src, {
+        plugins,
+        startIndex,
+        startLine: pos.line + 1,
+        startColumn: pos.character,
+        strictMode: true,
+        errorRecovery: true,
+        sourceType: "module",
+        allowUndeclaredExports: true,
+        allowSuperOutsideMethod: true,
+        allowAwaitOutsideFunction: true,
+        allowReturnOutsideFunction: true,
+        sourceFilename: this.#parsed.filename
+      });
+      this.#cache.set(startIndex, result);
+      return result;
+    } catch {
+      this.#cache.set(startIndex, false);
+    }
+  }
+};
+
+// src/extractors/script/util/attach-scopes.ts
 var VISITOR_KEYS = t.VISITOR_KEYS;
 var ATTR_UNNAMED = "value";
 var Scopes = /* @__PURE__ */ new WeakMap();
@@ -1732,19 +1935,6 @@ function detectAPIFromTag(parsed, tag) {
   return detectAPIFromBody(parsed, tag.body);
 }
 
-// src/extractors/script/util/is-text-only-script.ts
-function isTextOnlyScript(tag) {
-  if (tag.nameText !== "script" || tag.args || tag.attrs || !tag.body) {
-    return false;
-  }
-  for (const child of tag.body) {
-    if (child.type !== 17 /* Text */) {
-      return false;
-    }
-  }
-  return true;
-}
-
 // src/extractors/script/util/jsdoc-input-type.ts
 var MaybeInputTypedefReg = /@typedef\b[\s\S]*\bInput\b/;
 function getJSDocInputType(comment, ts) {
@@ -1854,191 +2044,6 @@ function getRuntimeOverrides(api, runtimeTypes, generics, applyGenerics, returnT
   return result;
 }
 
-// src/extractors/script/util/script-parser.ts
-import {
-  parse as parseStatement,
-  parseExpression
-} from "@marko/compiler/internal/babel";
-var plugins = ["exportDefaultFrom", "importAssertions", "typescript"];
-var ScriptParser = class {
-  #parsed;
-  #cache = /* @__PURE__ */ new Map();
-  constructor(parsed) {
-    this.#parsed = parsed;
-  }
-  tagName(name) {
-    return this.#templateExpressions(name);
-  }
-  tagShorthandId(shorthandId) {
-    return this.#templateExpressions(shorthandId);
-  }
-  tagShorthandClassName(node) {
-    return this.#templateExpressions(node);
-  }
-  tagVar(node) {
-    const start = node.value.start - 1;
-    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `(${this.#parsed.read(node.value)})=>0`);
-    if (expr) {
-      return expr.params[0];
-    }
-  }
-  tagParams(node) {
-    const start = node.start;
-    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `(${this.#parsed.read(node.value)})=>0`);
-    if (expr) {
-      return expr.params;
-    }
-  }
-  tagTypeParams(node) {
-    const start = node.value.start - 1;
-    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `<${this.#parsed.read(node.value)}>()=>0`);
-    if (expr) {
-      return expr.typeParameters;
-    }
-  }
-  tagArgs(node) {
-    const start = node.value.start - 2;
-    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `_(${this.#parsed.read(node.value)})`);
-    if (expr) {
-      return expr.arguments;
-    }
-  }
-  tagTypeArgs(node) {
-    const start = node.value.start - 2;
-    const expr = this.#cache.get(start) ?? this.#expressionAt(start, `_<${this.#parsed.read(node.value)}>()`);
-    if (expr) {
-      return expr.typeParameters;
-    }
-  }
-  attrValue(node) {
-    const start = node.value.start;
-    return (this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(node.value))) || void 0;
-  }
-  attrSpread(node) {
-    const start = node.value.start;
-    return (this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(node.value))) || void 0;
-  }
-  attrMethod(node) {
-    const start = node.params.start - 2;
-    const expr = this.#cache.get(start) ?? this.#expressionAt(
-      start,
-      `{_${this.#parsed.read({ start: node.params.start, end: node.body.end })}}`
-    );
-    if (expr) {
-      return expr.properties[0];
-    }
-  }
-  attrArgs(node) {
-    const start = node.value.start;
-    return (this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(node.value))) || void 0;
-  }
-  placeholder(node) {
-    const start = node.value.start;
-    return (this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(node.value))) || void 0;
-  }
-  scriptBody(node) {
-    if (!isTextOnlyScript(node)) return;
-    const start = node.body[0].start;
-    const statements = this.#cache.get(start) ?? this.#statementsAt(
-      start,
-      this.#parsed.read({ start, end: node.body[node.body.length - 1].end })
-    );
-    if (statements) {
-      return statements;
-    }
-  }
-  scriptlet(node) {
-    const start = node.value.start;
-    const statements = this.#cache.get(start) ?? this.#statementsAt(start, this.#parsed.read(node.value));
-    if (statements) {
-      return statements;
-    }
-  }
-  import(node) {
-    const statements = this.#cache.get(node.start) ?? this.#statementsAt(node.start, this.#parsed.read(node));
-    if (statements) {
-      return statements[0];
-    }
-  }
-  export(node) {
-    const statements = this.#cache.get(node.start) ?? this.#statementsAt(node.start, this.#parsed.read(node));
-    if (statements) {
-      return statements[0];
-    }
-  }
-  class(node) {
-    const expr = this.#cache.get(node.start) ?? this.#expressionAt(node.start, this.#parsed.read(node));
-    return expr || void 0;
-  }
-  static(node) {
-    const start = node.start + "static ".length;
-    const statements = this.#cache.get(start) ?? this.#statementsAt(start, this.#parsed.read({ start, end: node.end }));
-    if (statements) {
-      return statements;
-    }
-  }
-  #templateExpressions(template) {
-    const { expressions } = template;
-    if (!expressions.length) return;
-    const result = [];
-    for (const expr of expressions) {
-      const start = expr.value.start;
-      const parsed = this.#cache.get(start) ?? this.#expressionAt(start, this.#parsed.read(expr.value));
-      if (!parsed) return;
-      result.push(parsed);
-    }
-    if (result.length) return result;
-  }
-  #statementsAt(startIndex, src) {
-    try {
-      const pos = this.#parsed.positionAt(startIndex);
-      const result = parseStatement(src, {
-        plugins,
-        startIndex,
-        startLine: pos.line + 1,
-        startColumn: pos.character,
-        strictMode: true,
-        errorRecovery: true,
-        sourceType: "module",
-        allowUndeclaredExports: true,
-        allowSuperOutsideMethod: true,
-        allowAwaitOutsideFunction: true,
-        allowReturnOutsideFunction: true,
-        sourceFilename: this.#parsed.filename
-      }).program.body;
-      if (result.length) {
-        this.#cache.set(startIndex, result);
-        return result;
-      }
-    } catch {
-    }
-    this.#cache.set(startIndex, false);
-  }
-  #expressionAt(startIndex, src) {
-    try {
-      const pos = this.#parsed.positionAt(startIndex);
-      const result = parseExpression(src, {
-        plugins,
-        startIndex,
-        startLine: pos.line + 1,
-        startColumn: pos.character,
-        strictMode: true,
-        errorRecovery: true,
-        sourceType: "module",
-        allowUndeclaredExports: true,
-        allowSuperOutsideMethod: true,
-        allowAwaitOutsideFunction: true,
-        allowReturnOutsideFunction: true,
-        sourceFilename: this.#parsed.filename
-      });
-      this.#cache.set(startIndex, result);
-      return result;
-    } catch {
-      this.#cache.set(startIndex, false);
-    }
-  }
-};
-
 // src/extractors/script/index.ts
 var SEP_EMPTY = "";
 var SEP_SPACE = " ";

package/dist/util/get-node-at-offset.d.ts

@@ -1,2 +1,2 @@
-import { Node } from "../parser";
+import { type Node } from "../parser";
 export declare function getNodeAtOffset(offset: number, program: Node.Program): Node.AnyNode;

package/marko.internal.d.ts

@@ -439,24 +439,24 @@ declare global {
         ...attrTags: AttrTags
       ) => AttrTagsToAttrTag<Name, AttrTags>;
 
-      // TODO: this could be improved.
-      // currently falls back to DefaultRenderer too eagerly.
       export type DynamicRenderer<Name> = [0] extends [1 & Name]
         ? DefaultRenderer
-        : [Name] extends [Marko.Template<any, any>]
-          ? TemplateRenderer<Name>
-          : [Name] extends [string]
-            ? NativeTagRenderer<Name>
-            : [Name] extends [AnyMarkoBody]
-              ? BodyRenderer<Name>
-              : [Name] extends [
-                    {
-                      [BodyContentKey in DefaultBodyContentKey]?: infer BodyValue extends
-                        AnyMarkoBody;
-                    },
-                  ]
-                ? BodyRenderer<BodyValue>
-                : DefaultRenderer;
+        : [Name] extends [Marko.Template<any, any> | string]
+          ? {
+              (): () => <Input extends Marko.Input<Name>>(
+                input: Marko.Directives & Input,
+              ) => ReturnAndScope<Scopes<Input>, Marko.Return<Name>>;
+            }
+          : [Name] extends [AnyMarkoBody]
+            ? BodyRenderer<Name>
+            : [Name] extends [
+                  {
+                    [BodyContentKey in DefaultBodyContentKey]?: infer BodyValue extends
+                      AnyMarkoBody;
+                  },
+                ]
+              ? BodyRenderer<BodyValue>
+              : DefaultRenderer;
 
       export type TemplateRenderer<Template> = Template extends {
         _: infer Renderer;

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@marko/language-tools",
+  "version": "2.5.59",
   "description": "Marko Language Tools",
-  "version": "2.5.58",
-  "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
-  "dependencies": {
-    "@marko/compiler": "^5.39.61",
-    "@luxass/strip-json-comments": "^1.4.0",
-    "htmljs-parser": "^5.10.2",
-    "relative-import-path": "^1.0.0"
-  },
-  "devDependencies": {
-    "@types/babel__code-frame": "^7.27.0",
-    "@typescript/vfs": "^1.6.4",
-    "marko": "^5.38.31",
-    "mitata": "^1.0.34",
-    "tsx": "^4.21.0"
+  "keywords": [
+    "analysis",
+    "analyze",
+    "language",
+    "marko",
+    "tools"
+  ],
+  "homepage": "https://github.com/marko-js/language-server/tree/main/packages/language-tools/README.md",
+  "bugs": "https://github.com/marko-js/language-server/issues/new?template=bug-report.yml",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/marko-js/language-server/tree/main/packages/language-tools"
   },
+  "license": "MIT",
   "exports": {
     ".": {
       "import": "./dist/index.mjs",
@@ -23,29 +23,29 @@
     },
     "./marko.internal.d.ts": "./marko.internal.d.ts"
   },
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
   "files": [
     "dist",
     "!**/__tests__",
     "!**/*.tsbuildinfo",
     "marko.internal.d.ts"
   ],
-  "homepage": "https://github.com/marko-js/language-server/tree/main/packages/language-tools/README.md",
-  "keywords": [
-    "analysis",
-    "analyze",
-    "language",
-    "marko",
-    "tools"
-  ],
-  "license": "MIT",
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/marko-js/language-server/tree/main/packages/language-tools"
-  },
   "scripts": {
     "bench": "BENCH=1 mocha './src/**/__tests__/*.test.ts'",
-    "build": "tsc -b && tsx build.mts"
+    "build": "tsx build.mts"
+  },
+  "dependencies": {
+    "@luxass/strip-json-comments": "^1.4.0",
+    "@marko/compiler": "^5.39.63",
+    "htmljs-parser": "^5.10.2",
+    "relative-import-path": "^1.0.0"
+  },
+  "devDependencies": {
+    "@types/babel__code-frame": "^7.27.0",
+    "@typescript/vfs": "^1.6.4",
+    "marko": "^5.38.36",
+    "mitata": "^1.0.34",
+    "tsx": "^4.21.0"
   }
 }