@marko/language-tools 2.5.31 → 2.5.33

package/dist/index.js

@@ -2289,7 +2289,11 @@ constructor(_?: Return) {}
                 renderId = this.#getRenderId(child);
                 if (!renderId && alternates) {
                   for (const { node } of alternates) {
-                    if (renderId = this.#getRenderId(node)) break;
+                    if (renderId = this.#getRenderId(node)) {
+                      this.#renderIds.set(child, renderId);
+                      this.#renderIds.delete(node);
+                      break;
+                    }
                   }
                 }
                 if (renderId) {
@@ -2305,8 +2309,8 @@ constructor(_?: Return) {}
               ).write(") {\n");
               const ifBody = this.#processBody(child);
               if (ifBody == null ? void 0 : ifBody.content) {
-                const scopeExpr = this.#getScopeExpression(child.body);
                 this.#writeChildren(child, ifBody.content, true);
+                const scopeExpr = this.#getScopeExpression(child.body);
                 if (scopeExpr) {
                   this.#extractor.write(`return {
 scope: ${scopeExpr}
@@ -2328,8 +2332,8 @@ scope: ${scopeExpr}
                   }
                   const alternateBody = this.#processBody(node);
                   if (alternateBody == null ? void 0 : alternateBody.content) {
-                    const scopeExpr = this.#getScopeExpression(node.body);
                     this.#writeChildren(node, alternateBody.content, true);
+                    const scopeExpr = this.#getScopeExpression(node.body);
                     if (scopeExpr) {
                       this.#extractor.write(
                         `return {
@@ -3196,7 +3200,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
   }
   #getRenderId(tag) {
     let renderId = this.#renderIds.get(tag);
-    if (renderId === void 0 && (tag.var || hasHoists(tag))) {
+    if (!renderId && (tag.var || hasHoists(tag))) {
       renderId = this.#renderId++;
       this.#renderIds.set(tag, renderId);
     }
@@ -3211,8 +3215,8 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     let hoistIds;
     if (body) {
       for (const child of body) {
-        if (child.type === 1 /* Tag */ && hasHoists(child)) {
-          const renderId = this.#getRenderId(child);
+        const renderId = child.type === 1 /* Tag */ && this.#renderIds.get(child);
+        if (renderId && (!child.var || hasHoists(child))) {
           if (hoistIds) {
             hoistIds.push(renderId);
           } else {

package/dist/index.mjs

@@ -2252,7 +2252,11 @@ constructor(_?: Return) {}
                 renderId = this.#getRenderId(child);
                 if (!renderId && alternates) {
                   for (const { node } of alternates) {
-                    if (renderId = this.#getRenderId(node)) break;
+                    if (renderId = this.#getRenderId(node)) {
+                      this.#renderIds.set(child, renderId);
+                      this.#renderIds.delete(node);
+                      break;
+                    }
                   }
                 }
                 if (renderId) {
@@ -2268,8 +2272,8 @@ constructor(_?: Return) {}
               ).write(") {\n");
               const ifBody = this.#processBody(child);
               if (ifBody == null ? void 0 : ifBody.content) {
-                const scopeExpr = this.#getScopeExpression(child.body);
                 this.#writeChildren(child, ifBody.content, true);
+                const scopeExpr = this.#getScopeExpression(child.body);
                 if (scopeExpr) {
                   this.#extractor.write(`return {
 scope: ${scopeExpr}
@@ -2291,8 +2295,8 @@ scope: ${scopeExpr}
                   }
                   const alternateBody = this.#processBody(node);
                   if (alternateBody == null ? void 0 : alternateBody.content) {
-                    const scopeExpr = this.#getScopeExpression(node.body);
                     this.#writeChildren(node, alternateBody.content, true);
+                    const scopeExpr = this.#getScopeExpression(node.body);
                     if (scopeExpr) {
                       this.#extractor.write(
                         `return {
@@ -3159,7 +3163,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
   }
   #getRenderId(tag) {
     let renderId = this.#renderIds.get(tag);
-    if (renderId === void 0 && (tag.var || hasHoists(tag))) {
+    if (!renderId && (tag.var || hasHoists(tag))) {
       renderId = this.#renderId++;
       this.#renderIds.set(tag, renderId);
     }
@@ -3174,8 +3178,8 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     let hoistIds;
     if (body) {
       for (const child of body) {
-        if (child.type === 1 /* Tag */ && hasHoists(child)) {
-          const renderId = this.#getRenderId(child);
+        const renderId = child.type === 1 /* Tag */ && this.#renderIds.get(child);
+        if (renderId && (!child.var || hasHoists(child))) {
           if (hoistIds) {
             hoistIds.push(renderId);
           } else {

package/marko.internal.d.ts

@@ -170,7 +170,10 @@ declare global {
       export function renderDynamicTag<Name>(tag: Name): DynamicRenderer<Name>;
 
       export function returnTag<
-        Input extends { value: unknown; valueChange?: (value: any) => void },
+        Input extends {
+          value: unknown;
+          valueChange?: ((value: any) => void) | false | null;
+        },
       >(input: Input): Input;
 
       export function forOfTag<

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.5.31",
+  "version": "2.5.33",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"
@@ -17,7 +17,7 @@
     "@marko/compiler": "^5.39.33",
     "@types/babel__code-frame": "^7.0.6",
     "@typescript/vfs": "^1.6.1",
-    "marko": "^5.37.44",
+    "marko": "^5.37.47",
     "mitata": "^1.0.34",
     "tsx": "^4.20.4"
   },