@marko/language-tools 2.5.7 → 2.5.9

package/dist/index.js

@@ -2464,9 +2464,14 @@ constructor(_?: Return) {}
         } else {
           this.#writeDynamicTagName(tag);
         }
+        this.#extractor.write("\n)),");
+        const attrTagTree = this.#getAttrTagTree(tag);
+        if (attrTagTree) {
+          this.#writeAttrTagTree(attrTagTree, `${varShared("tags")}[${tagId}]`);
+          this.#extractor.write(",");
+        }
         this.#extractor.write(
-          `
-)),${varShared(isDynamic ? "renderDynamicTag" : "renderTemplate")}(${varShared("tags")}[${tagId}]))`
+          `${varShared(isDynamic ? "renderDynamicTag" : "renderTemplate")}(${varShared("tags")}[${tagId}]))`
         );
       }
     }
@@ -2659,23 +2664,23 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     );
     return hasAttrs;
   }
-  #writeAttrTags({ staticAttrTags, dynamicAttrTagParents }, inMerge) {
+  #writeAttrTags({ staticAttrTags, dynamicAttrTagParents }) {
     let wasMerge = false;
     if (dynamicAttrTagParents) {
       if (staticAttrTags) {
         this.#extractor.write(`...${varShared("mergeAttrTags")}({
 `);
-        inMerge = wasMerge = true;
+        wasMerge = true;
       } else if (dynamicAttrTagParents.length > 1) {
         this.#extractor.write(`...${varShared("mergeAttrTags")}(
 `);
-        inMerge = wasMerge = true;
+        wasMerge = true;
       } else {
         this.#extractor.write(`...`);
       }
     }
     if (staticAttrTags) {
-      this.#writeStaticAttrTags(staticAttrTags, inMerge);
+      this.#writeStaticAttrTags(staticAttrTags);
       if (dynamicAttrTagParents)
         this.#extractor.write(`}${SEP_COMMA_NEW_LINE}`);
     }
@@ -2684,25 +2689,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
       if (wasMerge) this.#extractor.write(`)${SEP_COMMA_NEW_LINE}`);
     }
   }
-  #writeStaticAttrTags(staticAttrTags, wasMerge) {
-    if (!wasMerge) this.#extractor.write("...{");
-    this.#extractor.write(
-      `[${varShared("never")}](){
-const attrTags = ${varShared(
-        "attrTagNames"
-      )}(this);
-`
-    );
-    for (const nameText in staticAttrTags) {
-      for (const tag of staticAttrTags[nameText]) {
-        this.#extractor.write(`attrTags["`);
-        this.#extractor.copy(tag.name);
-        this.#extractor.write('"];\n');
-      }
-    }
-    this.#extractor.write("\n}");
-    if (!wasMerge) this.#extractor.write("}");
-    this.#extractor.write(SEP_COMMA_NEW_LINE);
+  #writeStaticAttrTags(staticAttrTags) {
     for (const nameText in staticAttrTags) {
       const attrTag = staticAttrTags[nameText];
       const isRepeated = attrTag.length > 1;
@@ -2714,23 +2701,21 @@ const attrTags = ${varShared(
       if (isRepeated) {
         const tagId = this.#tagIds.get(firstAttrTag.owner);
         if (tagId) {
-          let accessor = `["${name}"]`;
+          let accessor = `"${name}"`;
           let curTag = firstAttrTag.parent;
           while (curTag) {
             if (curTag.type === 16 /* AttrTag */) {
-              accessor = `["${this.#getAttrTagName(curTag)}"]${accessor}`;
+              accessor = `"${this.#getAttrTagName(curTag)}",${accessor}`;
             } else if (!isControlFlowTag(curTag)) {
               break;
             }
             curTag = curTag.parent;
           }
           this.#extractor.write(
-            `${varShared("attrTags")}(${varShared("input")}(${varShared("tags")}[${tagId}])${accessor})([
-`
+            `${varShared("attrTagFor")}(${varShared("tags")}[${tagId}],${accessor})([`
           );
         } else {
-          this.#extractor.write(`${varShared("attrTags")}()([
-`);
+          this.#extractor.write(`${varShared("attrTag")}([`);
         }
       }
       for (const childNode of attrTag) {
@@ -2832,7 +2817,7 @@ const attrTags = ${varShared(
       body = this.#processBody(tag);
       if (body) {
         hasInput = true;
-        this.#writeAttrTags(body, false);
+        this.#writeAttrTags(body);
         hasBodyContent = body.content !== void 0;
       } else if (tag.close) {
         hasBodyContent = true;
@@ -3092,7 +3077,7 @@ const attrTags = ${varShared(
         this.#extractor.write("return ");
       }
       this.#extractor.write("{\n");
-      this.#writeAttrTags(body, true);
+      this.#writeAttrTags(body);
       this.#extractor.write("}");
       if (body.content) {
         this.#extractor.write(";\n})()");
@@ -3218,6 +3203,50 @@ const attrTags = ${varShared(
     const { nameText } = tag;
     return ((_a = this.#lookup.getTag(nameText)) == null ? void 0 : _a.targetProperty) || nameText.slice(nameText.lastIndexOf(":") + 1);
   }
+  #writeAttrTagTree(tree, valueExpression, nested) {
+    this.#extractor.write(
+      `${varShared(nested ? "nestedAttrTagNames" : "attrTagNames")}(${valueExpression},input=>{
+`
+    );
+    for (const name in tree) {
+      const { tags, nested: nested2 } = tree[name];
+      for (const tag of tags) {
+        this.#extractor.write('input["').copy(tag.name).write('"];\n');
+      }
+      if (nested2) {
+        this.#writeAttrTagTree(nested2, `input["@${name}"]`, true);
+      }
+    }
+    this.#extractor.write(`})`);
+  }
+  #getAttrTagTree(tag, attrTags) {
+    if (!tag.hasAttrTags || !tag.body) return attrTags;
+    const curAttrTags = attrTags || {};
+    for (const child of tag.body) {
+      switch (child.type) {
+        case 16 /* AttrTag */: {
+          const name = this.#getAttrTagName(child);
+          const prev = curAttrTags[name];
+          if (prev) {
+            prev.tags.push(child);
+            prev.nested = this.#getAttrTagTree(child, prev.nested);
+          } else {
+            curAttrTags[name] = {
+              tags: [child],
+              nested: this.#getAttrTagTree(child)
+            };
+          }
+          break;
+        }
+        case 1 /* Tag */:
+          if (isControlFlowTag(child)) {
+            this.#getAttrTagTree(child, curAttrTags);
+          }
+          break;
+      }
+    }
+    return curAttrTags;
+  }
   #testAtIndex(reg, index) {
     reg.lastIndex = index;
     return reg.test(this.#code);

package/dist/index.mjs

@@ -2427,9 +2427,14 @@ constructor(_?: Return) {}
         } else {
           this.#writeDynamicTagName(tag);
         }
+        this.#extractor.write("\n)),");
+        const attrTagTree = this.#getAttrTagTree(tag);
+        if (attrTagTree) {
+          this.#writeAttrTagTree(attrTagTree, `${varShared("tags")}[${tagId}]`);
+          this.#extractor.write(",");
+        }
         this.#extractor.write(
-          `
-)),${varShared(isDynamic ? "renderDynamicTag" : "renderTemplate")}(${varShared("tags")}[${tagId}]))`
+          `${varShared(isDynamic ? "renderDynamicTag" : "renderTemplate")}(${varShared("tags")}[${tagId}]))`
         );
       }
     }
@@ -2622,23 +2627,23 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     );
     return hasAttrs;
   }
-  #writeAttrTags({ staticAttrTags, dynamicAttrTagParents }, inMerge) {
+  #writeAttrTags({ staticAttrTags, dynamicAttrTagParents }) {
     let wasMerge = false;
     if (dynamicAttrTagParents) {
       if (staticAttrTags) {
         this.#extractor.write(`...${varShared("mergeAttrTags")}({
 `);
-        inMerge = wasMerge = true;
+        wasMerge = true;
       } else if (dynamicAttrTagParents.length > 1) {
         this.#extractor.write(`...${varShared("mergeAttrTags")}(
 `);
-        inMerge = wasMerge = true;
+        wasMerge = true;
       } else {
         this.#extractor.write(`...`);
       }
     }
     if (staticAttrTags) {
-      this.#writeStaticAttrTags(staticAttrTags, inMerge);
+      this.#writeStaticAttrTags(staticAttrTags);
       if (dynamicAttrTagParents)
         this.#extractor.write(`}${SEP_COMMA_NEW_LINE}`);
     }
@@ -2647,25 +2652,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
       if (wasMerge) this.#extractor.write(`)${SEP_COMMA_NEW_LINE}`);
     }
   }
-  #writeStaticAttrTags(staticAttrTags, wasMerge) {
-    if (!wasMerge) this.#extractor.write("...{");
-    this.#extractor.write(
-      `[${varShared("never")}](){
-const attrTags = ${varShared(
-        "attrTagNames"
-      )}(this);
-`
-    );
-    for (const nameText in staticAttrTags) {
-      for (const tag of staticAttrTags[nameText]) {
-        this.#extractor.write(`attrTags["`);
-        this.#extractor.copy(tag.name);
-        this.#extractor.write('"];\n');
-      }
-    }
-    this.#extractor.write("\n}");
-    if (!wasMerge) this.#extractor.write("}");
-    this.#extractor.write(SEP_COMMA_NEW_LINE);
+  #writeStaticAttrTags(staticAttrTags) {
     for (const nameText in staticAttrTags) {
       const attrTag = staticAttrTags[nameText];
       const isRepeated = attrTag.length > 1;
@@ -2677,23 +2664,21 @@ const attrTags = ${varShared(
       if (isRepeated) {
         const tagId = this.#tagIds.get(firstAttrTag.owner);
         if (tagId) {
-          let accessor = `["${name}"]`;
+          let accessor = `"${name}"`;
           let curTag = firstAttrTag.parent;
           while (curTag) {
             if (curTag.type === 16 /* AttrTag */) {
-              accessor = `["${this.#getAttrTagName(curTag)}"]${accessor}`;
+              accessor = `"${this.#getAttrTagName(curTag)}",${accessor}`;
             } else if (!isControlFlowTag(curTag)) {
               break;
             }
             curTag = curTag.parent;
           }
           this.#extractor.write(
-            `${varShared("attrTags")}(${varShared("input")}(${varShared("tags")}[${tagId}])${accessor})([
-`
+            `${varShared("attrTagFor")}(${varShared("tags")}[${tagId}],${accessor})([`
           );
         } else {
-          this.#extractor.write(`${varShared("attrTags")}()([
-`);
+          this.#extractor.write(`${varShared("attrTag")}([`);
         }
       }
       for (const childNode of attrTag) {
@@ -2795,7 +2780,7 @@ const attrTags = ${varShared(
       body = this.#processBody(tag);
       if (body) {
         hasInput = true;
-        this.#writeAttrTags(body, false);
+        this.#writeAttrTags(body);
         hasBodyContent = body.content !== void 0;
       } else if (tag.close) {
         hasBodyContent = true;
@@ -3055,7 +3040,7 @@ const attrTags = ${varShared(
         this.#extractor.write("return ");
       }
       this.#extractor.write("{\n");
-      this.#writeAttrTags(body, true);
+      this.#writeAttrTags(body);
       this.#extractor.write("}");
       if (body.content) {
         this.#extractor.write(";\n})()");
@@ -3181,6 +3166,50 @@ const attrTags = ${varShared(
     const { nameText } = tag;
     return ((_a = this.#lookup.getTag(nameText)) == null ? void 0 : _a.targetProperty) || nameText.slice(nameText.lastIndexOf(":") + 1);
   }
+  #writeAttrTagTree(tree, valueExpression, nested) {
+    this.#extractor.write(
+      `${varShared(nested ? "nestedAttrTagNames" : "attrTagNames")}(${valueExpression},input=>{
+`
+    );
+    for (const name in tree) {
+      const { tags, nested: nested2 } = tree[name];
+      for (const tag of tags) {
+        this.#extractor.write('input["').copy(tag.name).write('"];\n');
+      }
+      if (nested2) {
+        this.#writeAttrTagTree(nested2, `input["@${name}"]`, true);
+      }
+    }
+    this.#extractor.write(`})`);
+  }
+  #getAttrTagTree(tag, attrTags) {
+    if (!tag.hasAttrTags || !tag.body) return attrTags;
+    const curAttrTags = attrTags || {};
+    for (const child of tag.body) {
+      switch (child.type) {
+        case 16 /* AttrTag */: {
+          const name = this.#getAttrTagName(child);
+          const prev = curAttrTags[name];
+          if (prev) {
+            prev.tags.push(child);
+            prev.nested = this.#getAttrTagTree(child, prev.nested);
+          } else {
+            curAttrTags[name] = {
+              tags: [child],
+              nested: this.#getAttrTagTree(child)
+            };
+          }
+          break;
+        }
+        case 1 /* Tag */:
+          if (isControlFlowTag(child)) {
+            this.#getAttrTagTree(child, curAttrTags);
+          }
+          break;
+      }
+    }
+    return curAttrTags;
+  }
   #testAtIndex(reg, index) {
     reg.lastIndex = index;
     return reg.test(this.#code);

package/marko.internal.d.ts

@@ -25,15 +25,14 @@ declare global {
         override: Override,
       ): [0] extends [1 & Override] ? Marko.Global : Override;
 
-      export function attrTagNames<Input, Keys extends keyof Input & string>(
+      export function attrTagNames<Tag>(
+        tag: Tag,
+        fn: (input: AttrTagNames<Marko.Input<Tag>>) => void,
+      ): void;
+      export function nestedAttrTagNames<Input>(
         input: Input,
-      ): Record<string, never> & {
-        [Key in Keys as `@${Input[Key] extends infer Value
-          ? Value extends Marko.AttrTag<any>
-            ? Key
-            : never
-          : never}`]: Input[Key];
-      };
+        fn: (input: AttrTagNames<Input>) => void,
+      ): void;
 
       export const rendered: {
         scopes: Record<number, never>;
@@ -99,7 +98,8 @@ declare global {
         tags: Tags,
         index: Index,
         tag: Tag,
-      ): asserts tags is Tags & Record<Index, Tag>;
+      ): asserts tags is Tags &
+        Record<Index, [0] extends [1 & Tag] ? any : Tag>;
 
       export function assertRendered<Index extends number, Rendered, Result>(
         rendered: Rendered,
@@ -324,16 +324,18 @@ declare global {
       export function mergeAttrTags<Attrs extends readonly any[]>(
         ...attrs: Attrs
       ): MergeAttrTags<Attrs>;
-      export function attrTags<T>(
-        type?: T,
+      export function attrTag<AttrTag>(attrTags: AttrTag[]): AttrTag;
+      export function attrTagFor<Tag, Path extends readonly string[]>(
+        tag: Tag,
+        ...path: Path
       ): <AttrTag>(
         attrTags: Relate<
           AttrTag,
-          [0] extends [1 & T]
-            ? Marko.AttrTag<unknown>
-            : T extends Marko.AttrTag<infer Type>
-              ? Marko.AttrTag<Type>
-              : Marko.AttrTag<unknown>
+          Marko.Input<Tag> extends infer Input
+            ? [0] extends [1 & Input]
+              ? Marko.AttrTag<unknown>
+              : AttrTagValue<Marko.Input<Tag>, Path>
+            : Marko.AttrTag<unknown>
         >[],
       ) => AttrTag;
 
@@ -349,15 +351,13 @@ declare global {
               ? BodyRenderer<Name>
               : [Name] extends [
                     {
-                      [BodyContentKey in DefaultBodyContentKey]?: AnyMarkoBody;
+                      [BodyContentKey in DefaultBodyContentKey]?: infer BodyValue;
                     },
                   ]
-                ? [Name[BodyContentKey]] extends [AnyMarkoBody]
-                  ? BodyRenderer<Name[BodyContentKey]>
+                ? [BodyValue] extends [AnyMarkoBody]
+                  ? BodyRenderer<BodyValue>
                   : BaseRenderer<
-                      BodyContentInput<
-                        BodyParameters<Exclude<Name[BodyContentKey], void>>
-                      >
+                      BodyContentInput<BodyParameters<Exclude<BodyValue, void>>>
                     >
                 : DefaultRenderer;
 
@@ -548,6 +548,28 @@ type AttrTagByObjectSize<
   CheckNever<KnownKeys, Marko.AttrTag<Item>, undefined | Marko.AttrTag<Item>>
 >;
 
+type AttrTagValue<Input, Path extends readonly string[]> = Path extends [
+  infer Prop extends keyof Input,
+  ...infer Rest extends readonly string[],
+]
+  ? Input[Prop] & Marko.AttrTag<unknown> extends infer Value
+    ? Rest extends readonly []
+      ? Value
+      : AttrTagValue<Value, Rest>
+    : Marko.AttrTag<unknown>
+  : Marko.AttrTag<unknown>;
+
+type AttrTagNames<Input> = Record<string, never> &
+  (Input extends infer Input extends {}
+    ? {
+        [Key in keyof Input & string as `@${Input[Key] extends infer Value
+          ? Value extends Marko.AttrTag<any>
+            ? Key
+            : never
+          : never}`]: Input[Key];
+      }
+    : never);
+
 type RecordKeys<T> = keyof {
   [K in keyof T as CheckNever<T[K], never, K>]: 0;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.5.7",
+  "version": "2.5.9",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"