@marko/language-tools 2.5.46 → 2.5.48

package/dist/index.js

@@ -2831,18 +2831,25 @@ ${isMutatedVar(tag.parent, valueLiteral) ? varLocal(`change__${valueLiteral}.`)
             curTag = curTag.parent;
           }
           this.#extractor.write(
-            `${varShared("attrTagFor")}(${templateVar},${accessor})([`
+            `${varShared("attrTagFor")}(${templateVar},${accessor})(`
           );
         } else {
-          this.#extractor.write(`${varShared("attrTag")}([`);
+          this.#extractor.write(`${varShared("attrTag")}(`);
+        }
+        this.#extractor.write(`"${name}",`);
+        for (const childNode of attrTag) {
+          this.#extractor.write(`{["${name}"`);
+          this.#writeTagNameComment(childNode);
+          this.#extractor.write("]: ");
+          this.#writeTagInputObject(childNode);
+          this.#extractor.write(`}${SEP_COMMA_NEW_LINE}`);
+        }
+        this.#extractor.write(`)${SEP_COMMA_NEW_LINE}`);
+      } else {
+        for (const childNode of attrTag) {
+          this.#writeTagInputObject(childNode);
+          this.#extractor.write(SEP_COMMA_NEW_LINE);
         }
-      }
-      for (const childNode of attrTag) {
-        this.#writeTagInputObject(childNode);
-        this.#extractor.write(SEP_COMMA_NEW_LINE);
-      }
-      if (isRepeated) {
-        this.#extractor.write(`])${SEP_COMMA_NEW_LINE}`);
       }
     }
   }

package/dist/index.mjs

@@ -2794,18 +2794,25 @@ ${isMutatedVar(tag.parent, valueLiteral) ? varLocal(`change__${valueLiteral}.`)
             curTag = curTag.parent;
           }
           this.#extractor.write(
-            `${varShared("attrTagFor")}(${templateVar},${accessor})([`
+            `${varShared("attrTagFor")}(${templateVar},${accessor})(`
           );
         } else {
-          this.#extractor.write(`${varShared("attrTag")}([`);
+          this.#extractor.write(`${varShared("attrTag")}(`);
+        }
+        this.#extractor.write(`"${name}",`);
+        for (const childNode of attrTag) {
+          this.#extractor.write(`{["${name}"`);
+          this.#writeTagNameComment(childNode);
+          this.#extractor.write("]: ");
+          this.#writeTagInputObject(childNode);
+          this.#extractor.write(`}${SEP_COMMA_NEW_LINE}`);
+        }
+        this.#extractor.write(`)${SEP_COMMA_NEW_LINE}`);
+      } else {
+        for (const childNode of attrTag) {
+          this.#writeTagInputObject(childNode);
+          this.#extractor.write(SEP_COMMA_NEW_LINE);
         }
-      }
-      for (const childNode of attrTag) {
-        this.#writeTagInputObject(childNode);
-        this.#extractor.write(SEP_COMMA_NEW_LINE);
-      }
-      if (isRepeated) {
-        this.#extractor.write(`])${SEP_COMMA_NEW_LINE}`);
       }
     }
   }

package/marko.internal.d.ts

@@ -24,11 +24,16 @@ declare global {
         override: Override,
       ): [0] extends [1 & Override] ? Marko.Global : Override;
 
-      export function hoist<T, U = T>(
+      export function hoist<T>(
         value: () => T,
-      ): T extends (...args: any[]) => any
-        ? (T | (U extends undefined ? () => undefined : never)) & Iterable<T>
-        : never;
+      ): T extends () => infer R ? T & Iterable<R> : never;
+      // TODO: hoist should really be the below implementation which accounts for hoisting from unknown
+      // sections causing the getter to return undefined. Right now the type says it always has a value.
+      // export function hoist<T, U = T>(
+      //   value: () => T,
+      // ): T extends () => infer R
+      //   ? (T | (U extends undefined ? () => undefined : never)) & Iterable<R>
+      //   : never;
 
       export function attrTagNames<Tag>(
         tag: Tag,
@@ -126,7 +131,9 @@ declare global {
             : never
       >;
 
-      export function change<const Item>(...item: Item): UnionToIntersection<
+      export function change<const Item extends readonly unknown[]>(
+        ...item: Item
+      ): UnionToIntersection<
         Item extends
           | readonly [infer LocalName extends string, infer Data]
           | readonly [
@@ -392,23 +399,29 @@ declare global {
       export function mergeAttrTags<Attrs extends readonly any[]>(
         ...attrs: Attrs
       ): MergeAttrTags<Attrs>;
-      export function attrTag<AttrTag>(attrTags: AttrTag[]): AttrTag;
+      export function attrTag<
+        Name extends string,
+        AttrTags extends readonly { [K in Name]: unknown }[],
+      >(name: Name, ...attrTags: AttrTags): AttrTagsToAttrTag<Name, AttrTags>;
       export function attrTagFor<Tag, Path extends readonly string[]>(
         tag: Tag,
         ...path: Path
       ): <
-        AttrTag extends [0] extends [1 & Tag]
-          ? Marko.AttrTag<unknown>
-          : Marko.Input<Tag> extends infer Input
-            ? [0] extends [1 & Input]
-              ? Marko.AttrTag<unknown>
-              : AttrTagValue<Marko.Input<Tag>, Path>
-            : Marko.AttrTag<unknown>,
+        Name extends string,
+        AttrTags extends Record<
+          Name,
+          [0] extends [1 & Tag]
+            ? Marko.AttrTag<unknown>
+            : Marko.Input<Tag> extends infer Input
+              ? [0] extends [1 & Input]
+                ? Marko.AttrTag<unknown>
+                : AttrTagValue<Marko.Input<Tag>, Path>
+              : Marko.AttrTag<unknown>
+        >[],
       >(
-        attrTags: AttrTag[],
-      ) => AttrTag extends Marko.AttrTag<infer Input>
-        ? Marko.AttrTag<Input>
-        : any;
+        name: Name,
+        ...attrTags: AttrTags
+      ) => AttrTagsToAttrTag<Name, AttrTags>;
 
       // TODO: this could be improved.
       // currently falls back to DefaultRenderer too eagerly.
@@ -580,6 +593,17 @@ type MergeAttrTagValue<A, B> = A extends readonly (infer AType)[]
       ? A
       : A | B;
 
+type AttrTagsToAttrTag<
+  Name extends string,
+  AttrTags extends readonly unknown[],
+> = AttrTags[number] extends infer AttrTag
+  ? AttrTag extends { [K in Name]: Marko.AttrTag<infer Input> }
+    ? [0] extends [1 & Input]
+      ? never
+      : Marko.AttrTag<Input>
+    : never
+  : never;
+
 type AttrTagByListSize<T, Item> = T extends
   | readonly [any, ...any[]]
   | readonly [...any[], any]

package/package.json

@@ -1,23 +1,23 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.5.46",
+  "version": "2.5.48",
   "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.5",
+    "@babel/parser": "^7.28.6",
     "@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.45",
-    "@types/babel__code-frame": "^7.0.6",
+    "@babel/code-frame": "^7.28.6",
+    "@marko/compiler": "^5.39.49",
+    "@types/babel__code-frame": "^7.27.0",
     "@typescript/vfs": "^1.6.2",
-    "marko": "^5.38.1",
+    "marko": "^5.38.18",
     "mitata": "^1.0.34",
     "tsx": "^4.21.0"
   },