marko 6.0.72 → 6.0.74

package/dist/debug/dom.js

@@ -1004,7 +1004,7 @@ function _if_closure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
   const branchAccessor = "ConditionalRenderer:" /* ConditionalRenderer */ + ownerConditionalNodeAccessor;
   const ownerSignal = (scope) => {
     const ifScope = scope[scopeAccessor];
-    if (ifScope && !ifScope.___creating && (scope[branchAccessor] ?? branch) === branch) {
+    if (ifScope && !ifScope.___creating && (scope[branchAccessor] || 0) === branch) {
       queueRender(ifScope, childSignal, -1);
     }
   };

package/dist/debug/dom.mjs

@@ -905,7 +905,7 @@ function _if_closure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
   const branchAccessor = "ConditionalRenderer:" /* ConditionalRenderer */ + ownerConditionalNodeAccessor;
   const ownerSignal = (scope) => {
     const ifScope = scope[scopeAccessor];
-    if (ifScope && !ifScope.___creating && (scope[branchAccessor] ?? branch) === branch) {
+    if (ifScope && !ifScope.___creating && (scope[branchAccessor] || 0) === branch) {
       queueRender(ifScope, childSignal, -1);
     }
   };

package/dist/debug/html.js

@@ -1043,7 +1043,9 @@ function writePromise(state, val, ref) {
   if (!boundary) return false;
   const pId = nextRefAccess(state);
   const pRef = new Reference(ref, null, state.flush, null, pId);
-  state.buf.push("new Promise((f,r)=>" + pId + "={f,r})");
+  state.buf.push(
+    "(p=>p=new Promise((f,r)=>" + pId + "={f,r(e){p.catch(_=>0);r(e)}}))()"
+  );
   val.then(
     (v) => writeAsyncCall(state, boundary, pRef, "f", v, pId),
     (v) => writeAsyncCall(state, boundary, pRef, "r", v, pId)
@@ -2012,7 +2014,11 @@ function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeS
   const shouldWriteBranch = resumeBranch && branchIndex !== void 0;
   if (shouldWriteBranch) {
     writeScope(scopeId, {
-      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: resumeMarker ? branchIndex : void 0,
+      // TODO: technically conditional renderer should only be written when either the
+      // condition is stateful, or if there are direct closures.
+      // It may make sense to pass in another arg for this.
+      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: branchIndex || void 0,
+      // we convert 0 to undefined since the runtime defaults branch to 0.
       ["ConditionalScope:" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
     });
   }

package/dist/debug/html.mjs

@@ -957,7 +957,9 @@ function writePromise(state, val, ref) {
   if (!boundary) return false;
   const pId = nextRefAccess(state);
   const pRef = new Reference(ref, null, state.flush, null, pId);
-  state.buf.push("new Promise((f,r)=>" + pId + "={f,r})");
+  state.buf.push(
+    "(p=>p=new Promise((f,r)=>" + pId + "={f,r(e){p.catch(_=>0);r(e)}}))()"
+  );
   val.then(
     (v) => writeAsyncCall(state, boundary, pRef, "f", v, pId),
     (v) => writeAsyncCall(state, boundary, pRef, "r", v, pId)
@@ -1926,7 +1928,11 @@ function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeS
   const shouldWriteBranch = resumeBranch && branchIndex !== void 0;
   if (shouldWriteBranch) {
     writeScope(scopeId, {
-      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: resumeMarker ? branchIndex : void 0,
+      // TODO: technically conditional renderer should only be written when either the
+      // condition is stateful, or if there are direct closures.
+      // It may make sense to pass in another arg for this.
+      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: branchIndex || void 0,
+      // we convert 0 to undefined since the runtime defaults branch to 0.
       ["ConditionalScope:" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
     });
   }

package/dist/dom.js

@@ -643,7 +643,7 @@ function _for_closure(valueAccessor, ownerLoopNodeAccessor, fn) {
 function _if_closure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
   let childSignal = closure(valueAccessor, fn), scopeAccessor = "d" /* ConditionalScope */ + ownerConditionalNodeAccessor, branchAccessor = "c" /* ConditionalRenderer */ + ownerConditionalNodeAccessor, ownerSignal = (scope) => {
     let ifScope = scope[scopeAccessor];
-    ifScope && !ifScope.q && (scope[branchAccessor] ?? branch) === branch && queueRender(ifScope, childSignal, -1);
+    ifScope && !ifScope.q && (scope[branchAccessor] || 0) === branch && queueRender(ifScope, childSignal, -1);
   };
   return ownerSignal._ = childSignal, ownerSignal;
 }

package/dist/dom.mjs

@@ -547,7 +547,7 @@ function _for_closure(valueAccessor, ownerLoopNodeAccessor, fn) {
 function _if_closure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
   let childSignal = closure(valueAccessor, fn), scopeAccessor = "d" /* ConditionalScope */ + ownerConditionalNodeAccessor, branchAccessor = "c" /* ConditionalRenderer */ + ownerConditionalNodeAccessor, ownerSignal = (scope) => {
     let ifScope = scope[scopeAccessor];
-    ifScope && !ifScope.q && (scope[branchAccessor] ?? branch) === branch && queueRender(ifScope, childSignal, -1);
+    ifScope && !ifScope.q && (scope[branchAccessor] || 0) === branch && queueRender(ifScope, childSignal, -1);
   };
   return ownerSignal._ = childSignal, ownerSignal;
 }

package/dist/html.js

@@ -736,7 +736,9 @@ function writePromise(state, val, ref) {
   let { boundary } = state;
   if (!boundary) return !1;
   let pId = nextRefAccess(state), pRef = new Reference(ref, null, state.flush, null, pId);
-  return state.buf.push("new Promise((f,r)=>" + pId + "={f,r})"), val.then(
+  return state.buf.push(
+    "(p=>p=new Promise((f,r)=>" + pId + "={f,r(e){p.catch(_=>0);r(e)}}))()"
+  ), val.then(
     (v) => writeAsyncCall(state, boundary, pRef, "f", v, pId),
     (v) => writeAsyncCall(state, boundary, pRef, "r", v, pId)
   ), boundary.startAsync(), !0;
@@ -1304,7 +1306,11 @@ function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeS
   resumeMarker && resumeBranch && !singleNode && $chunk.writeHTML(state.mark("[" /* BranchStart */, ""));
   let branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb(), shouldWriteBranch = resumeBranch && branchIndex !== void 0;
   shouldWriteBranch && writeScope(scopeId, {
-    ["c" /* ConditionalRenderer */ + accessor]: resumeMarker ? branchIndex : void 0,
+    // TODO: technically conditional renderer should only be written when either the
+    // condition is stateful, or if there are direct closures.
+    // It may make sense to pass in another arg for this.
+    ["c" /* ConditionalRenderer */ + accessor]: branchIndex || void 0,
+    // we convert 0 to undefined since the runtime defaults branch to 0.
     ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
   }), writeBranchEnd(
     scopeId,

package/dist/html.mjs

@@ -653,7 +653,9 @@ function writePromise(state, val, ref) {
   let { boundary } = state;
   if (!boundary) return !1;
   let pId = nextRefAccess(state), pRef = new Reference(ref, null, state.flush, null, pId);
-  return state.buf.push("new Promise((f,r)=>" + pId + "={f,r})"), val.then(
+  return state.buf.push(
+    "(p=>p=new Promise((f,r)=>" + pId + "={f,r(e){p.catch(_=>0);r(e)}}))()"
+  ), val.then(
     (v) => writeAsyncCall(state, boundary, pRef, "f", v, pId),
     (v) => writeAsyncCall(state, boundary, pRef, "r", v, pId)
   ), boundary.startAsync(), !0;
@@ -1221,7 +1223,11 @@ function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeS
   resumeMarker && resumeBranch && !singleNode && $chunk.writeHTML(state.mark("[" /* BranchStart */, ""));
   let branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb(), shouldWriteBranch = resumeBranch && branchIndex !== void 0;
   shouldWriteBranch && writeScope(scopeId, {
-    ["c" /* ConditionalRenderer */ + accessor]: resumeMarker ? branchIndex : void 0,
+    // TODO: technically conditional renderer should only be written when either the
+    // condition is stateful, or if there are direct closures.
+    // It may make sense to pass in another arg for this.
+    ["c" /* ConditionalRenderer */ + accessor]: branchIndex || void 0,
+    // we convert 0 to undefined since the runtime defaults branch to 0.
     ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
   }), writeBranchEnd(
     scopeId,

package/dist/translator/index.js

@@ -10163,7 +10163,10 @@ var try_default = {
         "The [`<try>` tag](https://markojs.com/docs/reference/core-tag#try) requires [body content](https://markojs.com/docs/reference/language#tag-content)."
       );
     }
-    startSection(tag.get("body"));
+    const bodySection = startSection(tag.get("body"));
+    if (bodySection) {
+      bodySection.upstreamExpression = tagExtra;
+    }
   },
   translate: translateByTarget({
     html: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.72",
+  "version": "6.0.74",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",