@marko/language-tools 2.5.51 → 2.5.52

package/dist/index.js

@@ -2528,6 +2528,8 @@ scope: ${scopeExpr}
     const def = tagName ? this.#lookup.getTag(tagName) : void 0;
     const importPath = resolveTagImport(this.#filename, def);
     const isHTML = !importPath && (def == null ? void 0 : def.html);
+    const needsHoist = hasHoists(tag);
+    const mutatedVars = tag.var && !isHTML && getMutatedVars(tag);
     let isTemplate = false;
     let renderVar;
     let templateVar;
@@ -2564,8 +2566,22 @@ scope: ${scopeExpr}
         this.#extractor.write(";\n");
       }
     }
-    if (!isHTML && tag.var || hasHoists(tag)) {
+    if (needsHoist || tag.var) {
       renderVar = this.#getRenderVar(tag, true);
+      if (tag.var) {
+        this.#closeBrackets[this.#closeBrackets.length - 1]++;
+        this.#extractor.write("{const ");
+        if (isHTML) {
+          this.#extractor.copy(tag.var.value).write(` = ${varShared("el")}(${JSON.stringify(def.name)});
+`);
+        } else {
+          this.#copyWithMutationsReplaced(tag.var.value);
+          this.#extractor.write(
+            ` = ${varShared("returned")}(() => ${renderVar});
+`
+          );
+        }
+      }
       this.#extractor.write(`const ${renderVar} = `);
     }
     if (isHTML) {
@@ -2586,25 +2602,12 @@ scope: ${scopeExpr}
     }
     this.#writeTagInputObject(tag);
     this.#extractor.write(");\n");
-    if (tag.var) {
-      this.#extractor.write(`{const `);
-      this.#closeBrackets[this.#closeBrackets.length - 1]++;
-      if (renderVar) {
-        const mutatedVars = getMutatedVars(tag);
-        this.#copyWithMutationsReplaced(tag.var.value);
-        this.#extractor.write(` = ${renderVar}.return.${ATTR_UNAMED2};
-`);
-        if (mutatedVars) {
-          for (const binding of mutatedVars) {
-            this.#extractor.write(
-              `const ${varLocal(`change__${binding.name}`)} = ${varShared("change")}(${JSON.stringify(binding.name) + (binding.sourceName && binding.sourceName !== binding.name ? `, ${JSON.stringify(binding.sourceName)}` : "")}, ${renderVar}.return${binding.objectPath || ""});
+    if (mutatedVars) {
+      for (const binding of mutatedVars) {
+        this.#extractor.write(
+          `const ${varLocal(`change__${binding.name}`)} = ${varShared("change")}(${JSON.stringify(binding.name) + (binding.sourceName && binding.sourceName !== binding.name ? `, ${JSON.stringify(binding.sourceName)}` : "")}, ${renderVar}.return${binding.objectPath || ""});
 `
-            );
-          }
-        }
-      } else if (isHTML) {
-        this.#extractor.copy(tag.var.value).write(` = ${varShared("el")}(${JSON.stringify(def.name)});
-`);
+        );
       }
     }
   }

package/dist/index.mjs

@@ -2491,6 +2491,8 @@ scope: ${scopeExpr}
     const def = tagName ? this.#lookup.getTag(tagName) : void 0;
     const importPath = resolveTagImport(this.#filename, def);
     const isHTML = !importPath && (def == null ? void 0 : def.html);
+    const needsHoist = hasHoists(tag);
+    const mutatedVars = tag.var && !isHTML && getMutatedVars(tag);
     let isTemplate = false;
     let renderVar;
     let templateVar;
@@ -2527,8 +2529,22 @@ scope: ${scopeExpr}
         this.#extractor.write(";\n");
       }
     }
-    if (!isHTML && tag.var || hasHoists(tag)) {
+    if (needsHoist || tag.var) {
       renderVar = this.#getRenderVar(tag, true);
+      if (tag.var) {
+        this.#closeBrackets[this.#closeBrackets.length - 1]++;
+        this.#extractor.write("{const ");
+        if (isHTML) {
+          this.#extractor.copy(tag.var.value).write(` = ${varShared("el")}(${JSON.stringify(def.name)});
+`);
+        } else {
+          this.#copyWithMutationsReplaced(tag.var.value);
+          this.#extractor.write(
+            ` = ${varShared("returned")}(() => ${renderVar});
+`
+          );
+        }
+      }
       this.#extractor.write(`const ${renderVar} = `);
     }
     if (isHTML) {
@@ -2549,25 +2565,12 @@ scope: ${scopeExpr}
     }
     this.#writeTagInputObject(tag);
     this.#extractor.write(");\n");
-    if (tag.var) {
-      this.#extractor.write(`{const `);
-      this.#closeBrackets[this.#closeBrackets.length - 1]++;
-      if (renderVar) {
-        const mutatedVars = getMutatedVars(tag);
-        this.#copyWithMutationsReplaced(tag.var.value);
-        this.#extractor.write(` = ${renderVar}.return.${ATTR_UNAMED2};
-`);
-        if (mutatedVars) {
-          for (const binding of mutatedVars) {
-            this.#extractor.write(
-              `const ${varLocal(`change__${binding.name}`)} = ${varShared("change")}(${JSON.stringify(binding.name) + (binding.sourceName && binding.sourceName !== binding.name ? `, ${JSON.stringify(binding.sourceName)}` : "")}, ${renderVar}.return${binding.objectPath || ""});
+    if (mutatedVars) {
+      for (const binding of mutatedVars) {
+        this.#extractor.write(
+          `const ${varLocal(`change__${binding.name}`)} = ${varShared("change")}(${JSON.stringify(binding.name) + (binding.sourceName && binding.sourceName !== binding.name ? `, ${JSON.stringify(binding.sourceName)}` : "")}, ${renderVar}.return${binding.objectPath || ""});
 `
-            );
-          }
-        }
-      } else if (isHTML) {
-        this.#extractor.copy(tag.var.value).write(` = ${varShared("el")}(${JSON.stringify(def.name)});
-`);
+        );
       }
     }
   }

package/marko.internal.d.ts

@@ -24,6 +24,10 @@ declare global {
         override: Override,
       ): [0] extends [1 & Override] ? Marko.Global : Override;
 
+      export function returned<T>(
+        rendered: () => T,
+      ): T extends { return: { value: infer Returned } } ? Returned : never;
+
       export function hoist<T>(
         value: () => T,
       ): T extends () => infer R ? T & Iterable<R> : never;

package/package.json

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