@marko/language-tools 2.5.3 → 2.5.5

package/dist/index.js

@@ -2215,12 +2215,14 @@ constructor(_?: Return) {}
                   )}, ${renderId}, `
                 );
               }
-              this.#extractor.write(`${varShared("forTag")}({
-`);
+              this.#extractor.write(
+                `${varShared(getForTagRuntime(this.#parsed, child))}({
+`
+              );
+              this.#writeTagNameComment(child);
               this.#writeAttrs(child);
-              this.#extractor.write(`["renderBody"/*`).copy(child.name).write(`*/]: (`);
+              this.#extractor.write("\n}" + SEP_COMMA_NEW_LINE).copy(child.typeParams).write("(\n");
               this.#writeComments(child);
-              this.#extractor.copy(child.typeParams).write("(\n");
               if (child.params) {
                 this.#copyWithMutationsReplaced(child.params.value);
               }
@@ -2233,7 +2235,6 @@ constructor(_?: Return) {}
                 void 0,
                 (body == null ? void 0 : body.renderBody) ? getHoistSources(child) : void 0
               );
-              this.#extractor.write("})");
               if (renderId) {
                 this.#extractor.write("\n}));\n");
               } else {
@@ -2648,10 +2649,13 @@ const attrTags = ${varShared(
           break;
         }
         case "for": {
-          this.#extractor.write(`${varShared("forAttrTag")}({
-`);
-          if (!this.#writeAttrs(tag)) this.#writeTagNameComment(tag);
-          this.#extractor.write("}, \n");
+          this.#extractor.write(
+            `${varShared(getForAttrTagRuntime(this.#parsed, tag))}({
+`
+          );
+          this.#writeTagNameComment(tag);
+          this.#writeAttrs(tag);
+          this.#extractor.write("\n}, \n");
           this.#writeComments(tag);
           this.#extractor.copy(tag.typeParams).write("(\n").copy((_b = tag.params) == null ? void 0 : _b.value).write("\n) => (");
           this.#writeDynamicAttrTagBody(tag);
@@ -3063,6 +3067,50 @@ const attrTags = ${varShared(
     return reg.exec(this.#code);
   }
 };
+function getForTagType(parsed, tag) {
+  if (tag.attrs) {
+    for (const attr of tag.attrs) {
+      if (attr.type === 15 /* AttrSpread */) {
+        return 0 /* unknown */;
+      }
+      switch (parsed.read(attr.name)) {
+        case "of":
+          return 1 /* of */;
+        case "in":
+          return 2 /* in */;
+        case "to":
+        case "from":
+        case "step":
+          return 3 /* to */;
+      }
+    }
+  }
+  return 0 /* unknown */;
+}
+function getForTagRuntime(parsed, tag) {
+  switch (getForTagType(parsed, tag)) {
+    case 1 /* of */:
+      return "forOfTag";
+    case 2 /* in */:
+      return "forInTag";
+    case 3 /* to */:
+      return "forToTag";
+    default:
+      return "forTag";
+  }
+}
+function getForAttrTagRuntime(parsed, tag) {
+  switch (getForTagType(parsed, tag)) {
+    case 1 /* of */:
+      return "forOfAttrTag";
+    case 2 /* in */:
+      return "forInAttrTag";
+    case 3 /* to */:
+      return "forToAttrTag";
+    default:
+      return "forAttrTag";
+  }
+}
 function varLocal(name) {
   return VAR_LOCAL_PREFIX + name;
 }

package/dist/index.mjs

@@ -2179,12 +2179,14 @@ constructor(_?: Return) {}
                   )}, ${renderId}, `
                 );
               }
-              this.#extractor.write(`${varShared("forTag")}({
-`);
+              this.#extractor.write(
+                `${varShared(getForTagRuntime(this.#parsed, child))}({
+`
+              );
+              this.#writeTagNameComment(child);
               this.#writeAttrs(child);
-              this.#extractor.write(`["renderBody"/*`).copy(child.name).write(`*/]: (`);
+              this.#extractor.write("\n}" + SEP_COMMA_NEW_LINE).copy(child.typeParams).write("(\n");
               this.#writeComments(child);
-              this.#extractor.copy(child.typeParams).write("(\n");
               if (child.params) {
                 this.#copyWithMutationsReplaced(child.params.value);
               }
@@ -2197,7 +2199,6 @@ constructor(_?: Return) {}
                 void 0,
                 (body == null ? void 0 : body.renderBody) ? getHoistSources(child) : void 0
               );
-              this.#extractor.write("})");
               if (renderId) {
                 this.#extractor.write("\n}));\n");
               } else {
@@ -2612,10 +2613,13 @@ const attrTags = ${varShared(
           break;
         }
         case "for": {
-          this.#extractor.write(`${varShared("forAttrTag")}({
-`);
-          if (!this.#writeAttrs(tag)) this.#writeTagNameComment(tag);
-          this.#extractor.write("}, \n");
+          this.#extractor.write(
+            `${varShared(getForAttrTagRuntime(this.#parsed, tag))}({
+`
+          );
+          this.#writeTagNameComment(tag);
+          this.#writeAttrs(tag);
+          this.#extractor.write("\n}, \n");
           this.#writeComments(tag);
           this.#extractor.copy(tag.typeParams).write("(\n").copy((_b = tag.params) == null ? void 0 : _b.value).write("\n) => (");
           this.#writeDynamicAttrTagBody(tag);
@@ -3027,6 +3031,50 @@ const attrTags = ${varShared(
     return reg.exec(this.#code);
   }
 };
+function getForTagType(parsed, tag) {
+  if (tag.attrs) {
+    for (const attr of tag.attrs) {
+      if (attr.type === 15 /* AttrSpread */) {
+        return 0 /* unknown */;
+      }
+      switch (parsed.read(attr.name)) {
+        case "of":
+          return 1 /* of */;
+        case "in":
+          return 2 /* in */;
+        case "to":
+        case "from":
+        case "step":
+          return 3 /* to */;
+      }
+    }
+  }
+  return 0 /* unknown */;
+}
+function getForTagRuntime(parsed, tag) {
+  switch (getForTagType(parsed, tag)) {
+    case 1 /* of */:
+      return "forOfTag";
+    case 2 /* in */:
+      return "forInTag";
+    case 3 /* to */:
+      return "forToTag";
+    default:
+      return "forTag";
+  }
+}
+function getForAttrTagRuntime(parsed, tag) {
+  switch (getForTagType(parsed, tag)) {
+    case 1 /* of */:
+      return "forOfAttrTag";
+    case 2 /* in */:
+      return "forInAttrTag";
+    case 3 /* to */:
+      return "forToAttrTag";
+    default:
+      return "forAttrTag";
+  }
+}
 function varLocal(name) {
   return VAR_LOCAL_PREFIX + name;
 }

package/marko.internal.d.ts

@@ -150,49 +150,55 @@ declare global {
         Input extends { value: unknown; valueChange?: (value: any) => void },
       >(input: Input): Input;
 
-      export function forTag<
+      export function forOfTag<
         Value,
         Item extends Value extends
           | readonly (infer Item)[]
           | Iterable<infer Item>
           ? Item
           : unknown,
-        RenderBody extends Marko.Body<
+        BodyContent extends Marko.Body<
           [item: Item, index: number, all: Value],
           void
         >,
-      >(input: {
-        of: Value;
-        renderBody: RenderBody;
-        by?: (item: Item, index: number) => string;
-      }): ReturnAndScope<RenderBodyScope<RenderBody>, void>;
+      >(
+        input: {
+          of: Value | false | void | null;
+          by?: (item: Item, index: number) => string;
+        },
+        content: BodyContent,
+      ): ReturnAndScope<BodyContentScope<BodyContent>, void>;
 
-      export function forTag<
+      export function forInTag<
         Value,
-        RenderBody extends Marko.Body<
+        BodyContent extends Marko.Body<
           [key: keyof Value, value: Value[keyof Value]],
           void
         >,
-      >(input: {
-        in: Value;
-        renderBody: RenderBody;
-        by?: (value: Value[keyof Value], key: keyof Value) => string;
-      }): ReturnAndScope<RenderBodyScope<RenderBody>, void>;
+      >(
+        input: {
+          in: Value | false | void | null;
+          by?: (value: Value[keyof Value], key: keyof Value) => string;
+        },
+        content: BodyContent,
+      ): ReturnAndScope<BodyContentScope<BodyContent>, void>;
 
-      export function forTag<
+      export function forToTag<
         From extends void | number,
         To extends number,
         Step extends void | number,
-        RenderBody extends Marko.Body<[index: number], void>,
-      >(input: {
-        from?: From;
-        to: To;
-        step?: Step;
-        renderBody: RenderBody;
-        by?: (index: number) => string;
-      }): ReturnAndScope<RenderBodyScope<RenderBody>, void>;
-
-      export function forTag<RenderBody extends AnyMarkoBody>(
+        BodyContent extends Marko.Body<[index: number], void>,
+      >(
+        input: {
+          from?: From;
+          to: To;
+          step?: Step;
+          by?: (index: number) => string;
+        },
+        content: BodyContent,
+      ): ReturnAndScope<BodyContentScope<BodyContent>, void>;
+
+      export function forTag<BodyContent extends AnyMarkoBody>(
         input: (
           | {
               from?: number;
@@ -200,22 +206,23 @@ declare global {
               step?: number;
             }
           | {
-              in: unknown;
+              in: object | false | void | null;
             }
           | {
-              of: readonly unknown[] | Iterable<unknown>;
+              of: Iterable<unknown> | readonly unknown[] | false | void | null;
             }
-        ) & { renderBody?: RenderBody; by?: (...args: unknown[]) => string },
-      ): ReturnAndScope<RenderBodyScope<RenderBody>, void>;
+        ) & { by?: (...args: unknown[]) => string },
+        content: BodyContent,
+      ): ReturnAndScope<BodyContentScope<BodyContent>, void>;
 
-      export function forAttrTag<
+      export function forOfAttrTag<
         Value extends Iterable<any> | readonly any[],
         const Return,
       >(
         input: {
-          of: Value;
+          of: Value | false | void | null;
         },
-        renderBody: (
+        content: (
           value: Value extends readonly (infer Item)[] | Iterable<infer Item>
             ? Item
             : unknown,
@@ -230,11 +237,11 @@ declare global {
           : never;
       };
 
-      export function forAttrTag<Value extends object, const Return>(
+      export function forInAttrTag<Value extends object, const Return>(
         input: {
-          in: Value;
+          in: Value | false | void | null;
         },
-        renderBody: (key: keyof Value, value: Value[keyof Value]) => Return,
+        content: (key: keyof Value, value: Value[keyof Value]) => Return,
       ): {
         [Key in keyof Return]: Return[Key] extends
           | readonly (infer Item)[]
@@ -243,7 +250,7 @@ declare global {
           : never;
       };
 
-      export function forAttrTag<
+      export function forToAttrTag<
         From extends void | number,
         To extends number,
         Step extends void | number,
@@ -254,7 +261,7 @@ declare global {
           to: To;
           step?: Step;
         },
-        renderBody: (index: number) => Return,
+        content: (index: number) => Return,
       ): {
         [Key in keyof Return]: Return[Key] extends
           | readonly (infer Item)[]
@@ -269,21 +276,21 @@ declare global {
           : never;
       };
 
-      export function forAttrTag<const Return>(attrs: {
+      export function forAttrTag<const Return>(
         input:
           | {
-              of: any;
+              of: Iterable<unknown> | readonly unknown[] | false | void | null;
             }
           | {
-              in: any;
+              in: object;
             }
           | {
-              from?: any;
-              to: any;
-              step?: any;
-            };
-        renderBody: (index: number) => Return;
-      }): {
+              from?: number;
+              to: number;
+              step?: number;
+            },
+        content: (...args: unknown[]) => Return,
+      ): {
         [Key in keyof Return]: Return[Key] extends
           | readonly (infer Item)[]
           | (infer Item extends Record<PropertyKey, any>)
@@ -313,7 +320,7 @@ declare global {
                 ? [Name["renderBody"]] extends [AnyMarkoBody]
                   ? BodyRenderer<Name["renderBody"]>
                   : BaseRenderer<
-                      RenderBodyInput<
+                      BodyContentInput<
                         BodyParameters<Exclude<Name["renderBody"], void>>
                       >
                     >
@@ -349,10 +356,10 @@ declare global {
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint
         (): () => <__marko_internal_input extends unknown>(
           input: Marko.Directives &
-            RenderBodyInput<BodyParameters<Body>> &
+            BodyContentInput<BodyParameters<Body>> &
             Relate<
               __marko_internal_input,
-              Marko.Directives & RenderBodyInput<BodyParameters<Body>>
+              Marko.Directives & BodyContentInput<BodyParameters<Body>>
             >,
         ) => ReturnAndScope<
           Scopes<__marko_internal_input>,
@@ -389,7 +396,7 @@ declare abstract class MarkoReturn<Return> {
 
 type AnyMarkoBody = Marko.Body<any, any>;
 
-type RenderBodyScope<RenderBody> = RenderBody extends (...params: any) => {
+type BodyContentScope<BodyContent> = BodyContent extends (...params: any) => {
   [Marko._.scope]: infer Scope;
 }
   ? Scope
@@ -400,7 +407,7 @@ type ReturnAndScope<Scope, Return> = {
   scope: Scope;
 };
 
-type RenderBodyInput<Args extends readonly unknown[]> = Args extends {
+type BodyContentInput<Args extends readonly unknown[]> = Args extends {
   length: infer Length;
 }
   ? number extends Length

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.5.3",
+  "version": "2.5.5",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"
@@ -14,12 +14,11 @@
   },
   "devDependencies": {
     "@babel/code-frame": "^7.26.2",
-    "@marko/compiler": "^5.38.4",
-    "@marko/translator-default": "^6.1.2",
+    "@marko/compiler": "^5.39.4",
     "@types/babel__code-frame": "^7.0.6",
     "@typescript/vfs": "^1.6.0",
-    "marko": "^5.36.3",
-    "mitata": "^1.0.20",
+    "marko": "^5.37.4",
+    "mitata": "^1.0.21",
     "tsx": "^4.19.2"
   },
   "exports": {