@marko/language-tools 2.5.39 → 2.5.41

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

@@ -1,9 +1,13 @@
+import type { TaglibLookup } from "@marko/compiler/babel-utils";
 import { Parsed } from "../../../parser";
-export type RuntimeAPI = (typeof RuntimeAPI)[keyof typeof RuntimeAPI] | void;
+export type RuntimeAPI = (typeof RuntimeAPI)[keyof typeof RuntimeAPI];
 export declare const RuntimeAPI: {
     readonly tags: "tags";
     readonly class: "class";
 };
 export declare function getRuntimeAPI(translator: {
     preferAPI?: string;
-} | undefined, parsed: Parsed): RuntimeAPI;
+} | undefined, lookup: TaglibLookup, parsed: Parsed): {
+    interop: boolean;
+    api: RuntimeAPI;
+};

package/dist/index.js

@@ -1678,31 +1678,50 @@ var RuntimeAPI = {
   tags: "tags",
   class: "class"
 };
-function getRuntimeAPI(translator, parsed) {
-  return detectAPIFromTranslator(translator) || detectAPIFromFileName(parsed.filename) || detectAPIFromProgram(parsed, parsed.program);
+function getRuntimeAPI(translator, lookup, parsed) {
+  const api = detectAPIFromTranslator(translator);
+  return {
+    interop: !api,
+    api: api || detectAPIFromFileName(parsed.filename, lookup) || detectAPIFromProgram(parsed, parsed.program) || (lookup.exclusiveTagDiscoveryDirs === "tags" ? RuntimeAPI.tags : RuntimeAPI.class)
+  };
 }
 function detectAPIFromTranslator(translator) {
-  switch (translator == null ? void 0 : translator.preferAPI) {
-    case "class":
-      return RuntimeAPI.class;
-    case "tags":
-      return RuntimeAPI.tags;
+  if ((translator == null ? void 0 : translator.preferAPI) === "tags") {
+    return RuntimeAPI.tags;
   }
 }
-function detectAPIFromFileName(filename) {
-  for (let end = filename.length, i = end; --i; ) {
-    switch (filename[i]) {
-      case "/":
-      case "\\":
-        if (filename.startsWith("tags", i + 1)) {
-          return RuntimeAPI.tags;
-        } else if (filename.startsWith("components", i + 1)) {
-          return;
+function detectAPIFromFileName(filename, lookup) {
+  var _a;
+  const tagsDir = getTagsDir(filename);
+  if (tagsDir && !((_a = lookup.manualTagsDirs) == null ? void 0 : _a.has(tagsDir))) {
+    return RuntimeAPI.tags;
+  }
+}
+function getTagsDir(filename) {
+  var _a;
+  const pathSeparator = (_a = /\/|\\/.exec(filename)) == null ? void 0 : _a[0];
+  if (pathSeparator) {
+    let previousIndex = filename.length - 1;
+    while (previousIndex > 0) {
+      const index = filename.lastIndexOf(pathSeparator, previousIndex);
+      switch (previousIndex - index) {
+        case 4: {
+          if (filename.startsWith("tags", index + 1)) {
+            return filename.slice(0, index + 5);
+          }
+          break;
         }
-        end = i;
-        break;
+        case 10: {
+          if (filename.startsWith("components", index + 1)) {
+            return false;
+          }
+          break;
+        }
+      }
+      previousIndex = index - 1;
     }
   }
+  return false;
 }
 function detectAPIFromProgram(parsed, program) {
   if (program.comments) {
@@ -1743,14 +1762,17 @@ function detectAPIFromChild(parsed, child) {
 }
 function detectAPIFromTag(parsed, tag) {
   var _a;
+  if (tag.var) {
+    return RuntimeAPI.tags;
+  }
   switch (tag.nameText) {
-    case "macro":
-    case "include-text":
+    case "await-reorderer":
     case "include-html":
+    case "include-text":
     case "init-components":
-    case "await-reorderer":
-    case "while":
+    case "macro":
     case "module-code":
+    case "while":
       return RuntimeAPI.class;
     case "const":
     case "debug":
@@ -1760,11 +1782,9 @@ function detectAPIFromTag(parsed, tag) {
     case "lifecycle":
     case "log":
     case "return":
+    case "try":
       return RuntimeAPI.tags;
   }
-  if (tag.var) {
-    return RuntimeAPI.tags;
-  }
   if (tag.attrs) {
     for (const attr of tag.attrs) {
       if (attr.type !== 15 /* AttrSpread */) {
@@ -1774,9 +1794,7 @@ function detectAPIFromTag(parsed, tag) {
         if (attr.args) {
           return RuntimeAPI.class;
         }
-        if (/^(?:key|no-update(?:-body)?(?:-if)?)$|:(scoped:no-update)$/.test(
-          parsed.read(attr.name)
-        )) {
+        if (/:/.test(parsed.read(attr.name))) {
           return RuntimeAPI.class;
         }
       }
@@ -1981,6 +1999,8 @@ function extractScript(opts) {
 var ScriptExtractor = class {
   #code;
   #filename;
+  #api;
+  #interop;
   #parsed;
   #extractor;
   #scriptParser;
@@ -1991,14 +2011,20 @@ var ScriptExtractor = class {
   #scriptLang;
   #ts;
   #runtimeTypes;
-  #api;
   #mutationOffsets;
   #tagId = 1;
   #renderId = 1;
   constructor(opts) {
     const { parsed, lookup, scriptLang } = opts;
-    this.#filename = parsed.filename;
+    const { api, interop } = getRuntimeAPI(
+      opts.translator,
+      opts.lookup,
+      parsed
+    );
     this.#code = parsed.code;
+    this.#filename = parsed.filename;
+    this.#api = api;
+    this.#interop = interop;
     this.#scriptLang = scriptLang;
     this.#parsed = parsed;
     this.#lookup = lookup;
@@ -2007,7 +2033,6 @@ var ScriptExtractor = class {
     this.#extractor = new Extractor(parsed);
     this.#scriptParser = new ScriptParser(parsed);
     this.#read = parsed.read.bind(parsed);
-    this.#api = getRuntimeAPI(opts.translator, parsed);
     this.#mutationOffsets = crawlProgramScope(this.#parsed, this.#scriptParser);
     this.#writeProgram(parsed.program);
   }
@@ -2016,7 +2041,7 @@ var ScriptExtractor = class {
   }
   #writeProgram(program) {
     this.#writeCommentPragmas(program);
-    const componentFileName = this.#api !== RuntimeAPI.tags ? getComponentFilename(this.#filename) : void 0;
+    const componentFileName = this.#api === RuntimeAPI.class ? getComponentFilename(this.#filename) : void 0;
     const inputType = this.#getInputType(program);
     let componentClassBody;
     for (const node of program.static) {
@@ -2106,7 +2131,7 @@ var ScriptExtractor = class {
         );
       }
     }
-    if (this.#api !== RuntimeAPI.tags) {
+    if (this.#api === RuntimeAPI.class) {
       if (isExternalComponentFile) {
         const componentImport = `"${stripExt((0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName))}"`;
         if (this.#scriptLang === "ts" /* ts */) {
@@ -2168,7 +2193,7 @@ export type { Component };
 function ${templateName}() {
 `);
     }
-    this.#extractor.write(`  const input = ${this.#getCastedType(`Input${typeArgsStr}`)};${this.#api !== RuntimeAPI.tags ? `
+    this.#extractor.write(`  const input = ${this.#getCastedType(`Input${typeArgsStr}`)};${this.#api === RuntimeAPI.class ? `
   const component = ${this.#getCastedType(`Component${typeArgsStr}`)};
   const state = ${varShared("state")}(component);
   const out = ${varShared("out")};` : ""}
@@ -2190,7 +2215,7 @@ function ${templateName}() {
       );
     }
     this.#extractor.write(
-      `${varShared("noop")}({ ${hoists ? hoists.join(SEP_COMMA_SPACE) + SEP_COMMA_SPACE : ""}${this.#api !== RuntimeAPI.tags ? "component, state, out, " : ""}input, $global, $signal });
+      `${varShared("noop")}({ ${hoists ? hoists.join(SEP_COMMA_SPACE) + SEP_COMMA_SPACE : ""}${this.#api === RuntimeAPI.class ? "component, state, out, " : ""}input, $global, $signal });
 `
     );
     if (didReturn) {
@@ -2217,7 +2242,7 @@ function ${templateName}() {
       typeArgsStr,
       returnTypeStr
     ) : ""}
-  ${this.#api ? `api: "${this.#api}",` : ""}
+  ${this.#interop ? `api: "${this.#api}",` : ""}
   _${typeParamsStr ? `<${internalApply} = 1>(): ${internalApply} extends 0
     ? ${typeParamsStr}() => <${internalInputWithExtends}>${renderAndReturn}
     : () => <${internalInputWithExtends}, ${typeParamsStr.slice(
@@ -2662,7 +2687,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
               }
             } else if (attr.args) {
               this.#extractor.write('"').copy(name).write('": ');
-              if (this.#api !== RuntimeAPI.tags && typeof name !== "string" && this.#read(name).startsWith("on")) {
+              if (this.#api === RuntimeAPI.class && typeof name !== "string" && this.#read(name).startsWith("on")) {
                 const stringLiteralFirstArgMatch = this.#execAtIndex(
                   REG_ATTR_ARG_LITERAL,
                   attr.args.value.start
@@ -2841,7 +2866,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     const body = this.#processBody(tag);
     let hasInput = false;
     let writeInputObj = true;
-    if (tag.args && (this.#api !== RuntimeAPI.class || !!this.#getDynamicTagExpression(tag))) {
+    if (tag.args && (this.#api === RuntimeAPI.tags || !!this.#getDynamicTagExpression(tag))) {
       hasInput = true;
       this.#extractor.copy(tag.args.value);
       if (body || tag.attrs || tag.shorthandId || tag.shorthandClassNames) {
@@ -2868,7 +2893,9 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     const isScript = isTextOnlyScript(tag);
     let hasBodyContent = false;
     if (isScript) {
-      this.#extractor.write("async value(){");
+      this.#extractor.write(
+        `async ${this.#api === RuntimeAPI.tags ? "value" : `[${varShared("never")}]`}(){`
+      );
       this.#copyWithMutationsReplaced({
         start: tag.body[0].start,
         end: tag.body[tag.body.length - 1].end
@@ -2883,26 +2910,19 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     }
     if (tag.params || hasBodyContent) {
       this.#extractor.write("[");
-      switch (this.#api) {
-        case RuntimeAPI.tags:
-          this.#extractor.write('"content"');
-          break;
-        case RuntimeAPI.class:
-          this.#extractor.write('"renderBody"');
-          break;
-        default: {
-          const tagId = this.#tagIds.get(
-            tag.type === 16 /* AttrTag */ ? tag.owner : tag
+      if (this.#interop) {
+        const tagId = this.#tagIds.get(
+          tag.type === 16 /* AttrTag */ ? tag.owner : tag
+        );
+        if (tagId) {
+          this.#extractor.write(
+            `${varShared("contentFor")}(${varLocal("tag_" + tagId)})`
           );
-          if (tagId) {
-            this.#extractor.write(
-              `${varShared("contentFor")}(${varLocal("tag_" + tagId)})`
-            );
-          } else {
-            this.#extractor.write(varShared("content"));
-          }
-          break;
+        } else {
+          this.#extractor.write(varShared("content"));
         }
+      } else {
+        this.#extractor.write('"content"');
       }
       this.#writeTagNameComment(tag);
       this.#extractor.write("]: ");

package/dist/index.mjs

@@ -1638,31 +1638,50 @@ var RuntimeAPI = {
   tags: "tags",
   class: "class"
 };
-function getRuntimeAPI(translator, parsed) {
-  return detectAPIFromTranslator(translator) || detectAPIFromFileName(parsed.filename) || detectAPIFromProgram(parsed, parsed.program);
+function getRuntimeAPI(translator, lookup, parsed) {
+  const api = detectAPIFromTranslator(translator);
+  return {
+    interop: !api,
+    api: api || detectAPIFromFileName(parsed.filename, lookup) || detectAPIFromProgram(parsed, parsed.program) || (lookup.exclusiveTagDiscoveryDirs === "tags" ? RuntimeAPI.tags : RuntimeAPI.class)
+  };
 }
 function detectAPIFromTranslator(translator) {
-  switch (translator == null ? void 0 : translator.preferAPI) {
-    case "class":
-      return RuntimeAPI.class;
-    case "tags":
-      return RuntimeAPI.tags;
+  if ((translator == null ? void 0 : translator.preferAPI) === "tags") {
+    return RuntimeAPI.tags;
   }
 }
-function detectAPIFromFileName(filename) {
-  for (let end = filename.length, i = end; --i; ) {
-    switch (filename[i]) {
-      case "/":
-      case "\\":
-        if (filename.startsWith("tags", i + 1)) {
-          return RuntimeAPI.tags;
-        } else if (filename.startsWith("components", i + 1)) {
-          return;
+function detectAPIFromFileName(filename, lookup) {
+  var _a;
+  const tagsDir = getTagsDir(filename);
+  if (tagsDir && !((_a = lookup.manualTagsDirs) == null ? void 0 : _a.has(tagsDir))) {
+    return RuntimeAPI.tags;
+  }
+}
+function getTagsDir(filename) {
+  var _a;
+  const pathSeparator = (_a = /\/|\\/.exec(filename)) == null ? void 0 : _a[0];
+  if (pathSeparator) {
+    let previousIndex = filename.length - 1;
+    while (previousIndex > 0) {
+      const index = filename.lastIndexOf(pathSeparator, previousIndex);
+      switch (previousIndex - index) {
+        case 4: {
+          if (filename.startsWith("tags", index + 1)) {
+            return filename.slice(0, index + 5);
+          }
+          break;
         }
-        end = i;
-        break;
+        case 10: {
+          if (filename.startsWith("components", index + 1)) {
+            return false;
+          }
+          break;
+        }
+      }
+      previousIndex = index - 1;
     }
   }
+  return false;
 }
 function detectAPIFromProgram(parsed, program) {
   if (program.comments) {
@@ -1703,14 +1722,17 @@ function detectAPIFromChild(parsed, child) {
 }
 function detectAPIFromTag(parsed, tag) {
   var _a;
+  if (tag.var) {
+    return RuntimeAPI.tags;
+  }
   switch (tag.nameText) {
-    case "macro":
-    case "include-text":
+    case "await-reorderer":
     case "include-html":
+    case "include-text":
     case "init-components":
-    case "await-reorderer":
-    case "while":
+    case "macro":
     case "module-code":
+    case "while":
       return RuntimeAPI.class;
     case "const":
     case "debug":
@@ -1720,11 +1742,9 @@ function detectAPIFromTag(parsed, tag) {
     case "lifecycle":
     case "log":
     case "return":
+    case "try":
       return RuntimeAPI.tags;
   }
-  if (tag.var) {
-    return RuntimeAPI.tags;
-  }
   if (tag.attrs) {
     for (const attr of tag.attrs) {
       if (attr.type !== 15 /* AttrSpread */) {
@@ -1734,9 +1754,7 @@ function detectAPIFromTag(parsed, tag) {
         if (attr.args) {
           return RuntimeAPI.class;
         }
-        if (/^(?:key|no-update(?:-body)?(?:-if)?)$|:(scoped:no-update)$/.test(
-          parsed.read(attr.name)
-        )) {
+        if (/:/.test(parsed.read(attr.name))) {
           return RuntimeAPI.class;
         }
       }
@@ -1944,6 +1962,8 @@ function extractScript(opts) {
 var ScriptExtractor = class {
   #code;
   #filename;
+  #api;
+  #interop;
   #parsed;
   #extractor;
   #scriptParser;
@@ -1954,14 +1974,20 @@ var ScriptExtractor = class {
   #scriptLang;
   #ts;
   #runtimeTypes;
-  #api;
   #mutationOffsets;
   #tagId = 1;
   #renderId = 1;
   constructor(opts) {
     const { parsed, lookup, scriptLang } = opts;
-    this.#filename = parsed.filename;
+    const { api, interop } = getRuntimeAPI(
+      opts.translator,
+      opts.lookup,
+      parsed
+    );
     this.#code = parsed.code;
+    this.#filename = parsed.filename;
+    this.#api = api;
+    this.#interop = interop;
     this.#scriptLang = scriptLang;
     this.#parsed = parsed;
     this.#lookup = lookup;
@@ -1970,7 +1996,6 @@ var ScriptExtractor = class {
     this.#extractor = new Extractor(parsed);
     this.#scriptParser = new ScriptParser(parsed);
     this.#read = parsed.read.bind(parsed);
-    this.#api = getRuntimeAPI(opts.translator, parsed);
     this.#mutationOffsets = crawlProgramScope(this.#parsed, this.#scriptParser);
     this.#writeProgram(parsed.program);
   }
@@ -1979,7 +2004,7 @@ var ScriptExtractor = class {
   }
   #writeProgram(program) {
     this.#writeCommentPragmas(program);
-    const componentFileName = this.#api !== RuntimeAPI.tags ? getComponentFilename(this.#filename) : void 0;
+    const componentFileName = this.#api === RuntimeAPI.class ? getComponentFilename(this.#filename) : void 0;
     const inputType = this.#getInputType(program);
     let componentClassBody;
     for (const node of program.static) {
@@ -2069,7 +2094,7 @@ var ScriptExtractor = class {
         );
       }
     }
-    if (this.#api !== RuntimeAPI.tags) {
+    if (this.#api === RuntimeAPI.class) {
       if (isExternalComponentFile) {
         const componentImport = `"${stripExt(relativeImportPath(this.#filename, componentFileName))}"`;
         if (this.#scriptLang === "ts" /* ts */) {
@@ -2131,7 +2156,7 @@ export type { Component };
 function ${templateName}() {
 `);
     }
-    this.#extractor.write(`  const input = ${this.#getCastedType(`Input${typeArgsStr}`)};${this.#api !== RuntimeAPI.tags ? `
+    this.#extractor.write(`  const input = ${this.#getCastedType(`Input${typeArgsStr}`)};${this.#api === RuntimeAPI.class ? `
   const component = ${this.#getCastedType(`Component${typeArgsStr}`)};
   const state = ${varShared("state")}(component);
   const out = ${varShared("out")};` : ""}
@@ -2153,7 +2178,7 @@ function ${templateName}() {
       );
     }
     this.#extractor.write(
-      `${varShared("noop")}({ ${hoists ? hoists.join(SEP_COMMA_SPACE) + SEP_COMMA_SPACE : ""}${this.#api !== RuntimeAPI.tags ? "component, state, out, " : ""}input, $global, $signal });
+      `${varShared("noop")}({ ${hoists ? hoists.join(SEP_COMMA_SPACE) + SEP_COMMA_SPACE : ""}${this.#api === RuntimeAPI.class ? "component, state, out, " : ""}input, $global, $signal });
 `
     );
     if (didReturn) {
@@ -2180,7 +2205,7 @@ function ${templateName}() {
       typeArgsStr,
       returnTypeStr
     ) : ""}
-  ${this.#api ? `api: "${this.#api}",` : ""}
+  ${this.#interop ? `api: "${this.#api}",` : ""}
   _${typeParamsStr ? `<${internalApply} = 1>(): ${internalApply} extends 0
     ? ${typeParamsStr}() => <${internalInputWithExtends}>${renderAndReturn}
     : () => <${internalInputWithExtends}, ${typeParamsStr.slice(
@@ -2625,7 +2650,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
               }
             } else if (attr.args) {
               this.#extractor.write('"').copy(name).write('": ');
-              if (this.#api !== RuntimeAPI.tags && typeof name !== "string" && this.#read(name).startsWith("on")) {
+              if (this.#api === RuntimeAPI.class && typeof name !== "string" && this.#read(name).startsWith("on")) {
                 const stringLiteralFirstArgMatch = this.#execAtIndex(
                   REG_ATTR_ARG_LITERAL,
                   attr.args.value.start
@@ -2804,7 +2829,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     const body = this.#processBody(tag);
     let hasInput = false;
     let writeInputObj = true;
-    if (tag.args && (this.#api !== RuntimeAPI.class || !!this.#getDynamicTagExpression(tag))) {
+    if (tag.args && (this.#api === RuntimeAPI.tags || !!this.#getDynamicTagExpression(tag))) {
       hasInput = true;
       this.#extractor.copy(tag.args.value);
       if (body || tag.attrs || tag.shorthandId || tag.shorthandClassNames) {
@@ -2831,7 +2856,9 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     const isScript = isTextOnlyScript(tag);
     let hasBodyContent = false;
     if (isScript) {
-      this.#extractor.write("async value(){");
+      this.#extractor.write(
+        `async ${this.#api === RuntimeAPI.tags ? "value" : `[${varShared("never")}]`}(){`
+      );
       this.#copyWithMutationsReplaced({
         start: tag.body[0].start,
         end: tag.body[tag.body.length - 1].end
@@ -2846,26 +2873,19 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     }
     if (tag.params || hasBodyContent) {
       this.#extractor.write("[");
-      switch (this.#api) {
-        case RuntimeAPI.tags:
-          this.#extractor.write('"content"');
-          break;
-        case RuntimeAPI.class:
-          this.#extractor.write('"renderBody"');
-          break;
-        default: {
-          const tagId = this.#tagIds.get(
-            tag.type === 16 /* AttrTag */ ? tag.owner : tag
+      if (this.#interop) {
+        const tagId = this.#tagIds.get(
+          tag.type === 16 /* AttrTag */ ? tag.owner : tag
+        );
+        if (tagId) {
+          this.#extractor.write(
+            `${varShared("contentFor")}(${varLocal("tag_" + tagId)})`
           );
-          if (tagId) {
-            this.#extractor.write(
-              `${varShared("contentFor")}(${varLocal("tag_" + tagId)})`
-            );
-          } else {
-            this.#extractor.write(varShared("content"));
-          }
-          break;
+        } else {
+          this.#extractor.write(varShared("content"));
         }
+      } else {
+        this.#extractor.write('"content"');
       }
       this.#writeTagNameComment(tag);
       this.#extractor.write("]: ");

package/marko.internal.d.ts

@@ -38,13 +38,15 @@ declare global {
 
       export function contentFor<Name>(
         tag: Name,
-      ): Name extends { api: infer API }
-        ? API extends "tags"
-          ? "content"
-          : API extends "class"
-            ? "renderBody"
-            : DefaultBodyContentKey
-        : DefaultBodyContentKey;
+      ): [0] extends [1 & Name]
+        ? DefaultBodyContentKey
+        : Name extends { api: infer API }
+          ? API extends "tags"
+            ? "content"
+            : API extends "class"
+              ? "renderBody"
+              : DefaultBodyContentKey
+          : DefaultBodyContentKey;
 
       export const Template: new <Overrides = unknown>() => {
         [K in Exclude<
@@ -152,7 +154,7 @@ declare global {
           : Handler
         : (...args: any) => any; // If typescript ever actually supports partial application maybe we do this.
 
-      export function renderTemplate<Name extends Marko.Template<any, any>>(
+      export function renderTemplate<Name>(
         template: Name,
       ): TemplateRenderer<Name>;
       export function renderNativeTag<Name extends string>(
@@ -177,19 +179,19 @@ declare global {
       >(input: Input): Input;
 
       export function forOfTag<
-        Value extends Iterable,
+        Value,
         Item extends [0] extends [1 & Value]
           ? any
-          : Value extends readonly (infer Item)[] | Iterable<infer Item>
+          : Value extends Iterable<infer Item>
             ? Item
             : never,
         BodyContent extends Marko.Body<
-          [item: Item, index: number, all: Value],
+          [item: Item, index: number, all: Exclude<Value, false | void | null>],
           void
         >,
       >(
         input: {
-          of: Value | false | void | null;
+          of: Value & (Iterable<unknown> | false | void | null);
           by?: ((item: Item, index: number) => string) | string;
         },
         content: BodyContent,
@@ -210,14 +212,14 @@ declare global {
       ): ReturnAndScope<BodyContentScope<BodyContent>, void>;
 
       export function forToTag<
-        From extends void | number,
         To extends number,
+        From extends void | number,
         Step extends void | number,
         BodyContent extends Marko.Body<[index: number], void>,
       >(
         input: {
-          from?: From;
           to: To;
+          from?: From;
           step?: Step;
           by?: (index: number) => string;
         },
@@ -225,14 +227,14 @@ declare global {
       ): ReturnAndScope<BodyContentScope<BodyContent>, void>;
 
       export function forUntilTag<
-        From extends void | number,
         Until extends number,
+        From extends void | number,
         Step extends void | number,
         BodyContent extends Marko.Body<[index: number], void>,
       >(
         input: {
-          from?: From;
           until: Until;
+          from?: From;
           step?: Step;
           by?: (index: number) => string;
         },
@@ -242,27 +244,27 @@ declare global {
       export function forTag<BodyContent extends AnyMarkoBody>(
         input: (
           | {
-              from?: number;
               to: number;
+              from?: number;
               step?: number;
             }
           | {
-              from?: number;
               until: number;
+              from?: number;
               step?: number;
             }
           | {
-              in: object | false | void | null;
+              in: any;
             }
           | {
-              of: Iterable<unknown> | readonly unknown[] | false | void | null;
+              of: any;
             }
-        ) & { by?: (...args: unknown[]) => string },
+        ) & { by?: string | ((...args: unknown[]) => string) },
         content: BodyContent,
       ): ReturnAndScope<BodyContentScope<BodyContent>, void>;
 
       export function forOfAttrTag<
-        Value extends Iterable,
+        Value,
         Item extends [0] extends [1 & Value]
           ? any
           : Value extends readonly (infer Item)[] | Iterable<infer Item>
@@ -271,14 +273,18 @@ declare global {
         const Return,
       >(
         input: {
-          of: Value | false | void | null;
+          of: Value & (Iterable<unknown> | false | void | null);
         },
-        content: (value: Item, index: number, all: Value) => Return,
+        content: (
+          value: Item,
+          index: number,
+          all: Exclude<Value, false | void | null>,
+        ) => Return,
       ): {
         [Key in keyof Return]: Return[Key] extends
           | readonly (infer Item)[]
           | (infer Item extends Record<PropertyKey, any>)
-          ? AttrTagByListSize<Value, Item>
+          ? AttrTagByListSize<Exclude<Value, false | void | null>, Item>
           : never;
       };
 
@@ -296,14 +302,14 @@ declare global {
       };
 
       export function forToAttrTag<
-        From extends void | number,
         To extends number,
+        From extends void | number,
         Step extends void | number,
         const Return,
       >(
         input: {
-          from?: From;
           to: To;
+          from?: From;
           step?: Step;
         },
         content: (index: number) => Return,
@@ -322,14 +328,14 @@ declare global {
       };
 
       export function forUntilAttrTag<
-        From extends void | number,
         Until extends number,
+        From extends void | number,
         Step extends void | number,
         const Return,
       >(
         input: {
-          from?: From;
           until: Until;
+          from?: From;
           step?: Step;
         },
         content: (index: number) => Return,
@@ -350,19 +356,19 @@ declare global {
       export function forAttrTag<const Return>(
         input:
           | {
-              of: Iterable<unknown> | readonly unknown[] | false | void | null;
+              of: Iterable<unknown> | false | void | null;
             }
           | {
-              in: object;
+              in: object | false | void | null;
             }
           | {
-              from?: number;
               to: number;
+              from?: number;
               step?: number;
             }
           | {
-              from?: number;
               until: number;
+              from?: number;
               step?: number;
             },
         content: (...args: unknown[]) => Return,
@@ -420,7 +426,7 @@ declare global {
         ? Renderer
         : Template extends Marko.Template<infer Input, infer Return>
           ? BaseRenderer<Input, Return>
-          : never;
+          : DefaultRenderer;
 
       export interface NativeTagRenderer<Name extends string> {
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint
@@ -537,14 +543,6 @@ type MergeScopes<Scopes> = {
     : never;
 };
 
-type MergeOptionalScopes<Scopes> = {
-  [K in Scopes extends Scopes ? keyof Scopes : never]: Scopes extends Scopes
-    ? K extends keyof Scopes
-      ? Scopes[K]
-      : undefined
-    : never;
-};
-
 type MergeAttrTags<Attrs extends readonly any[]> = Attrs extends readonly [
   infer A,
   infer B,

package/package.json

@@ -1,25 +1,25 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.5.39",
+  "version": "2.5.41",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"
   },
   "dependencies": {
-    "@babel/parser": "^7.28.4",
+    "@babel/parser": "^7.28.5",
     "@luxass/strip-json-comments": "^1.4.0",
     "htmljs-parser": "^5.7.4",
     "relative-import-path": "^1.0.0"
   },
   "devDependencies": {
     "@babel/code-frame": "^7.27.1",
-    "@marko/compiler": "^5.39.35",
+    "@marko/compiler": "^5.39.45",
     "@types/babel__code-frame": "^7.0.6",
-    "@typescript/vfs": "^1.6.1",
-    "marko": "^5.37.55",
+    "@typescript/vfs": "^1.6.2",
+    "marko": "^5.38.1",
     "mitata": "^1.0.34",
-    "tsx": "^4.20.5"
+    "tsx": "^4.21.0"
   },
   "exports": {
     ".": {