@marko/language-tools 2.5.9 → 2.5.10

package/dist/index.js

@@ -2430,51 +2430,53 @@ constructor(_?: Return) {}
     const tagName = tag.nameText;
     const renderId = this.#getRenderId(tag);
     const def = tagName ? this.#lookup.getTag(tagName) : void 0;
-    if (renderId) {
-      this.#extractor.write(
-        `${varShared("assertRendered")}(${varShared("rendered")},${renderId},`
-      );
-    }
-    if (def == null ? void 0 : def.html) {
-      this.#extractor.write(`${varShared("renderNativeTag")}("`).copy(tag.name).write('")');
-    } else {
-      const importPath = def && resolveTagImport(this.#filename, def);
-      if (def && !importPath) {
-        this.#extractor.write(varShared("missingTag"));
-      } else {
-        const tagId = this.#ensureTagId(tag);
-        let isDynamic = true;
-        this.#extractor.write(
-          `(${varShared("assertTag")}(${varShared("tags")},${tagId},(
-`
-        );
-        if (tagName && REG_TAG_NAME_IDENTIFIER.test(tagName)) {
-          if (importPath) {
-            this.#extractor.write(
-              `${varShared("fallbackTemplate")}(${tagName},import("${importPath}"))`
-            );
-          } else {
-            this.#extractor.copy(tag.name);
-          }
-        } else if (importPath) {
-          isDynamic = !importPath.endsWith(".marko");
+    const isHTML = def == null ? void 0 : def.html;
+    const importPath = !isHTML && resolveTagImport(this.#filename, def);
+    const isMissing = def && !isHTML && !importPath;
+    let tagIdentifier;
+    let isTemplate = false;
+    if (!isHTML || !isMissing) {
+      const tagId = this.#ensureTagId(tag);
+      tagIdentifier = varLocal("tag_" + tagId);
+      this.#extractor.write(`const ${tagIdentifier} = (
+`);
+      if (tagName && REG_TAG_NAME_IDENTIFIER.test(tagName)) {
+        if (importPath) {
           this.#extractor.write(
-            `${varShared("resolveTemplate")}(import("${importPath}"))`
+            `${varShared("fallbackTemplate")}(${tagName},import("${importPath}"))`
           );
         } 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.copy(tag.name);
         }
+      } else if (importPath) {
+        isTemplate = importPath.endsWith(".marko");
         this.#extractor.write(
-          `${varShared(isDynamic ? "renderDynamicTag" : "renderTemplate")}(${varShared("tags")}[${tagId}]))`
+          `${varShared("resolveTemplate")}(import("${importPath}"))`
         );
+      } else {
+        this.#writeDynamicTagName(tag);
+      }
+      this.#extractor.write("\n);\n");
+      const attrTagTree = this.#getAttrTagTree(tag);
+      if (attrTagTree) {
+        this.#writeAttrTagTree(attrTagTree, tagIdentifier);
+        this.#extractor.write(";\n");
       }
     }
+    if (renderId) {
+      this.#extractor.write(
+        `${varShared("assertRendered")}(${varShared("rendered")},${renderId},`
+      );
+    }
+    if (isHTML) {
+      this.#extractor.write(`${varShared("renderNativeTag")}("`).copy(tag.name).write('")');
+    } else if (tagIdentifier) {
+      this.#extractor.write(
+        `${varShared(isTemplate ? "renderTemplate" : "renderDynamicTag")}(${tagIdentifier})`
+      );
+    } else {
+      this.#extractor.write(varShared("missingTag"));
+    }
     if (tag.typeArgs) {
       this.#extractor.write(`<0>()`).copy(tag.typeArgs).write("()(");
     } else {
@@ -2712,7 +2714,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
             curTag = curTag.parent;
           }
           this.#extractor.write(
-            `${varShared("attrTagFor")}(${varShared("tags")}[${tagId}],${accessor})([`
+            `${varShared("attrTagFor")}(${varLocal("tag_" + tagId)},${accessor})([`
           );
         } else {
           this.#extractor.write(`${varShared("attrTag")}([`);
@@ -2838,7 +2840,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
           );
           if (tagId) {
             this.#extractor.write(
-              `${varShared("contentFor")}(${varShared("tags")}[${tagId}])`
+              `${varShared("contentFor")}(${varLocal("tag_" + tagId)})`
             );
           } else {
             this.#extractor.write(varShared("content"));

package/dist/index.mjs

@@ -2393,51 +2393,53 @@ constructor(_?: Return) {}
     const tagName = tag.nameText;
     const renderId = this.#getRenderId(tag);
     const def = tagName ? this.#lookup.getTag(tagName) : void 0;
-    if (renderId) {
-      this.#extractor.write(
-        `${varShared("assertRendered")}(${varShared("rendered")},${renderId},`
-      );
-    }
-    if (def == null ? void 0 : def.html) {
-      this.#extractor.write(`${varShared("renderNativeTag")}("`).copy(tag.name).write('")');
-    } else {
-      const importPath = def && resolveTagImport(this.#filename, def);
-      if (def && !importPath) {
-        this.#extractor.write(varShared("missingTag"));
-      } else {
-        const tagId = this.#ensureTagId(tag);
-        let isDynamic = true;
-        this.#extractor.write(
-          `(${varShared("assertTag")}(${varShared("tags")},${tagId},(
-`
-        );
-        if (tagName && REG_TAG_NAME_IDENTIFIER.test(tagName)) {
-          if (importPath) {
-            this.#extractor.write(
-              `${varShared("fallbackTemplate")}(${tagName},import("${importPath}"))`
-            );
-          } else {
-            this.#extractor.copy(tag.name);
-          }
-        } else if (importPath) {
-          isDynamic = !importPath.endsWith(".marko");
+    const isHTML = def == null ? void 0 : def.html;
+    const importPath = !isHTML && resolveTagImport(this.#filename, def);
+    const isMissing = def && !isHTML && !importPath;
+    let tagIdentifier;
+    let isTemplate = false;
+    if (!isHTML || !isMissing) {
+      const tagId = this.#ensureTagId(tag);
+      tagIdentifier = varLocal("tag_" + tagId);
+      this.#extractor.write(`const ${tagIdentifier} = (
+`);
+      if (tagName && REG_TAG_NAME_IDENTIFIER.test(tagName)) {
+        if (importPath) {
           this.#extractor.write(
-            `${varShared("resolveTemplate")}(import("${importPath}"))`
+            `${varShared("fallbackTemplate")}(${tagName},import("${importPath}"))`
           );
         } 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.copy(tag.name);
         }
+      } else if (importPath) {
+        isTemplate = importPath.endsWith(".marko");
         this.#extractor.write(
-          `${varShared(isDynamic ? "renderDynamicTag" : "renderTemplate")}(${varShared("tags")}[${tagId}]))`
+          `${varShared("resolveTemplate")}(import("${importPath}"))`
         );
+      } else {
+        this.#writeDynamicTagName(tag);
+      }
+      this.#extractor.write("\n);\n");
+      const attrTagTree = this.#getAttrTagTree(tag);
+      if (attrTagTree) {
+        this.#writeAttrTagTree(attrTagTree, tagIdentifier);
+        this.#extractor.write(";\n");
       }
     }
+    if (renderId) {
+      this.#extractor.write(
+        `${varShared("assertRendered")}(${varShared("rendered")},${renderId},`
+      );
+    }
+    if (isHTML) {
+      this.#extractor.write(`${varShared("renderNativeTag")}("`).copy(tag.name).write('")');
+    } else if (tagIdentifier) {
+      this.#extractor.write(
+        `${varShared(isTemplate ? "renderTemplate" : "renderDynamicTag")}(${tagIdentifier})`
+      );
+    } else {
+      this.#extractor.write(varShared("missingTag"));
+    }
     if (tag.typeArgs) {
       this.#extractor.write(`<0>()`).copy(tag.typeArgs).write("()(");
     } else {
@@ -2675,7 +2677,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
             curTag = curTag.parent;
           }
           this.#extractor.write(
-            `${varShared("attrTagFor")}(${varShared("tags")}[${tagId}],${accessor})([`
+            `${varShared("attrTagFor")}(${varLocal("tag_" + tagId)},${accessor})([`
           );
         } else {
           this.#extractor.write(`${varShared("attrTag")}([`);
@@ -2801,7 +2803,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
           );
           if (tagId) {
             this.#extractor.write(
-              `${varShared("contentFor")}(${varShared("tags")}[${tagId}])`
+              `${varShared("contentFor")}(${varLocal("tag_" + tagId)})`
             );
           } else {
             this.#extractor.write(varShared("content"));

package/marko.internal.d.ts

@@ -331,11 +331,13 @@ declare global {
       ): <AttrTag>(
         attrTags: Relate<
           AttrTag,
-          Marko.Input<Tag> extends infer Input
-            ? [0] extends [1 & Input]
-              ? Marko.AttrTag<unknown>
-              : AttrTagValue<Marko.Input<Tag>, Path>
-            : Marko.AttrTag<unknown>
+          [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>
         >[],
       ) => AttrTag;
 

package/package.json

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