marko 6.0.160 → 6.0.161

package/dist/debug/dom.js

@@ -365,6 +365,7 @@ function handleDelegated(ev) {
 }
 
 // src/dom/resolve-cursor-position.ts
+var R = /[^\p{L}\p{N}]/gu;
 function resolveCursorPosition(inputType2, initialPosition, initialValue, updatedValue) {
   if (
     // If initial position is null or false then
@@ -375,26 +376,17 @@ function resolveCursorPosition(inputType2, initialPosition, initialValue, update
   ) {
     const before = initialValue.slice(0, initialPosition);
     const after = initialValue.slice(initialPosition);
-    if (updatedValue.startsWith(before)) {
-      return initialPosition;
-    } else if (updatedValue.endsWith(after)) {
-      return updatedValue.length - after.length;
-    } else {
-      const relevantChars = stripSpacesAndPunctuation(before).length;
-      let pos = 0;
-      let relevantIndex = 0;
-      while (relevantIndex < relevantChars) {
-        if (stripSpacesAndPunctuation(updatedValue[pos])) relevantIndex++;
-        pos++;
-      }
-      return pos;
+    if (updatedValue.startsWith(before)) return initialPosition;
+    if (updatedValue.endsWith(after)) return updatedValue.length - after.length;
+    let count = before.replace(R, "").length;
+    let pos = 0;
+    while (count && updatedValue[pos]) {
+      if (updatedValue[pos++].replace(R, "")) count--;
     }
+    return pos;
   }
   return -1;
 }
-function stripSpacesAndPunctuation(str) {
-  return str.replace(/[^\p{L}\p{N}]/gu, "");
-}
 
 // src/dom/parse-html.ts
 var parsers = {};
@@ -1089,9 +1081,10 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
               /* read scope id */
             ));
             if (visitType === "*" /* Node */) {
+              const prev = visit.previousSibling;
               visitScope[nextToken(
                 /* read accessor */
-              )] = visit.previousSibling;
+              )] = prev && (prev.nodeType < 8 || prev.data) ? prev : visit.parentNode.insertBefore(new Text(), visit);
             } else if (branchesEnabled) {
               visitBranches();
             }
@@ -1515,13 +1508,13 @@ function _attr_nonce(scope, nodeAccessor) {
   _attr(scope[nodeAccessor], "nonce", scope["$global" /* Global */].cspNonce);
 }
 function _text(node, value) {
-  const normalizedValue = normalizeString(value);
+  const normalizedValue = _to_text(value);
   if (node.data !== normalizedValue) {
     node.data = normalizedValue;
   }
 }
 function _text_content(node, value) {
-  const normalizedValue = normalizeString(value);
+  const normalizedValue = _to_text(value);
   if (node.textContent !== normalizedValue) {
     node.textContent = normalizedValue;
   }
@@ -1737,9 +1730,6 @@ function normalizeAttrValue(value) {
     return value === true ? "" : value + "";
   }
 }
-function normalizeString(value) {
-  return value || value === 0 ? value + "" : "\u200D";
-}
 function _lifecycle(scope, thisObj, index = 0) {
   const accessor = "Lifecycle:" /* Lifecycle */ + index;
   const instance = scope[accessor];

package/dist/debug/dom.mjs

@@ -249,6 +249,7 @@ function handleDelegated(ev) {
 }
 
 // src/dom/resolve-cursor-position.ts
+var R = /[^\p{L}\p{N}]/gu;
 function resolveCursorPosition(inputType2, initialPosition, initialValue, updatedValue) {
   if (
     // If initial position is null or false then
@@ -259,26 +260,17 @@ function resolveCursorPosition(inputType2, initialPosition, initialValue, update
   ) {
     const before = initialValue.slice(0, initialPosition);
     const after = initialValue.slice(initialPosition);
-    if (updatedValue.startsWith(before)) {
-      return initialPosition;
-    } else if (updatedValue.endsWith(after)) {
-      return updatedValue.length - after.length;
-    } else {
-      const relevantChars = stripSpacesAndPunctuation(before).length;
-      let pos = 0;
-      let relevantIndex = 0;
-      while (relevantIndex < relevantChars) {
-        if (stripSpacesAndPunctuation(updatedValue[pos])) relevantIndex++;
-        pos++;
-      }
-      return pos;
+    if (updatedValue.startsWith(before)) return initialPosition;
+    if (updatedValue.endsWith(after)) return updatedValue.length - after.length;
+    let count = before.replace(R, "").length;
+    let pos = 0;
+    while (count && updatedValue[pos]) {
+      if (updatedValue[pos++].replace(R, "")) count--;
     }
+    return pos;
   }
   return -1;
 }
-function stripSpacesAndPunctuation(str) {
-  return str.replace(/[^\p{L}\p{N}]/gu, "");
-}
 
 // src/dom/parse-html.ts
 var parsers = {};
@@ -973,9 +965,10 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
               /* read scope id */
             ));
             if (visitType === "*" /* Node */) {
+              const prev = visit.previousSibling;
               visitScope[nextToken(
                 /* read accessor */
-              )] = visit.previousSibling;
+              )] = prev && (prev.nodeType < 8 || prev.data) ? prev : visit.parentNode.insertBefore(new Text(), visit);
             } else if (branchesEnabled) {
               visitBranches();
             }
@@ -1399,13 +1392,13 @@ function _attr_nonce(scope, nodeAccessor) {
   _attr(scope[nodeAccessor], "nonce", scope["$global" /* Global */].cspNonce);
 }
 function _text(node, value) {
-  const normalizedValue = normalizeString(value);
+  const normalizedValue = _to_text(value);
   if (node.data !== normalizedValue) {
     node.data = normalizedValue;
   }
 }
 function _text_content(node, value) {
-  const normalizedValue = normalizeString(value);
+  const normalizedValue = _to_text(value);
   if (node.textContent !== normalizedValue) {
     node.textContent = normalizedValue;
   }
@@ -1621,9 +1614,6 @@ function normalizeAttrValue(value) {
     return value === true ? "" : value + "";
   }
 }
-function normalizeString(value) {
-  return value || value === 0 ? value + "" : "\u200D";
-}
 function _lifecycle(scope, thisObj, index = 0) {
   const accessor = "Lifecycle:" /* Lifecycle */ + index;
   const instance = scope[accessor];

package/dist/debug/html.js

@@ -49,7 +49,6 @@ __export(html_exports, {
   _escape: () => _escape,
   _escape_script: () => _escape_script,
   _escape_style: () => _escape_style,
-  _escape_text: () => _escape_text,
   _existing_scope: () => _existing_scope,
   _for_in: () => _for_in,
   _for_of: () => _for_of,
@@ -255,9 +254,6 @@ var unsafeXMLReg = /[<&]/g;
 var replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;";
 var escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str;
 function _escape(val) {
-  return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "&zwj;";
-}
-function _escape_text(val) {
   return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
 var unsafeScriptReg = /<\/script/g;
@@ -2943,7 +2939,7 @@ function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange) {
       valueChange
     );
   }
-  return _escape_text(value);
+  return _escape(value);
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange) {
   if (valueChange) {
@@ -3770,7 +3766,6 @@ function NOOP3() {
   _escape,
   _escape_script,
   _escape_style,
-  _escape_text,
   _existing_scope,
   _for_in,
   _for_of,

package/dist/debug/html.mjs

@@ -162,9 +162,6 @@ var unsafeXMLReg = /[<&]/g;
 var replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;";
 var escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str;
 function _escape(val) {
-  return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "&zwj;";
-}
-function _escape_text(val) {
   return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
 var unsafeScriptReg = /<\/script/g;
@@ -2850,7 +2847,7 @@ function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange) {
       valueChange
     );
   }
-  return _escape_text(value);
+  return _escape(value);
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange) {
   if (valueChange) {
@@ -3676,7 +3673,6 @@ export {
   _escape,
   _escape_script,
   _escape_style,
-  _escape_text,
   _existing_scope,
   _for_in,
   _for_of,

package/dist/dom.js

@@ -224,6 +224,7 @@ function handleDelegated(ev) {
 }
 
 // src/dom/resolve-cursor-position.ts
+var R = /[^\p{L}\p{N}]/gu;
 function resolveCursorPosition(inputType2, initialPosition, initialValue, updatedValue) {
   if (
     // If initial position is null or false then
@@ -233,22 +234,15 @@ function resolveCursorPosition(inputType2, initialPosition, initialValue, update
     /kw/.test(inputType2))
   ) {
     let before = initialValue.slice(0, initialPosition), after = initialValue.slice(initialPosition);
-    if (updatedValue.startsWith(before))
-      return initialPosition;
-    if (updatedValue.endsWith(after))
-      return updatedValue.length - after.length;
-    {
-      let relevantChars = stripSpacesAndPunctuation(before).length, pos = 0, relevantIndex = 0;
-      for (; relevantIndex < relevantChars; )
-        stripSpacesAndPunctuation(updatedValue[pos]) && relevantIndex++, pos++;
-      return pos;
-    }
+    if (updatedValue.startsWith(before)) return initialPosition;
+    if (updatedValue.endsWith(after)) return updatedValue.length - after.length;
+    let count = before.replace(R, "").length, pos = 0;
+    for (; count && updatedValue[pos]; )
+      updatedValue[pos++].replace(R, "") && count--;
+    return pos;
   }
   return -1;
 }
-function stripSpacesAndPunctuation(str) {
-  return str.replace(/[^\p{L}\p{N}]/gu, "");
-}
 
 // src/dom/parse-html.ts
 var parsers = {};
@@ -639,11 +633,14 @@ function init(runtimeId = "M") {
                   scope.G
                 ))) : ($global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId);
           for (visit of visits = render.v)
-            lastTokenIndex = render.i.length, visitText = visit.data, visitType = visitText[lastTokenIndex++], visitScope = getScope(nextToken(
+            if (lastTokenIndex = render.i.length, visitText = visit.data, visitType = visitText[lastTokenIndex++], visitScope = getScope(nextToken(
               /* read scope id */
-            )), visitType === "*" /* Node */ ? visitScope[nextToken(
-              /* read accessor */
-            )] = visit.previousSibling : branchesEnabled && visitBranches();
+            )), visitType === "*" /* Node */) {
+              let prev = visit.previousSibling;
+              visitScope[nextToken(
+                /* read accessor */
+              )] = prev && (prev.nodeType < 8 || prev.data) ? prev : visit.parentNode.insertBefore(new Text(), visit);
+            } else branchesEnabled && visitBranches();
           return embedEnabled && (render.n ||= visit?.parentNode.insertBefore(
             new Text(),
             visit.nextSibling
@@ -919,11 +916,11 @@ function _attr_nonce(scope, nodeAccessor) {
   _attr(scope[nodeAccessor], "nonce", scope.$.cspNonce);
 }
 function _text(node, value) {
-  let normalizedValue = normalizeString(value);
+  let normalizedValue = _to_text(value);
   node.data !== normalizedValue && (node.data = normalizedValue);
 }
 function _text_content(node, value) {
-  let normalizedValue = normalizeString(value);
+  let normalizedValue = _to_text(value);
   node.textContent !== normalizedValue && (node.textContent = normalizedValue);
 }
 function _attrs(scope, nodeAccessor, nextAttrs) {
@@ -1083,9 +1080,6 @@ function normalizeAttrValue(value) {
   if (value || value === 0)
     return value === !0 ? "" : value + "";
 }
-function normalizeString(value) {
-  return value || value === 0 ? value + "" : "\u200D";
-}
 function _lifecycle(scope, thisObj, index = 0) {
   let accessor = "K" /* Lifecycle */ + index, instance = scope[accessor];
   instance ? (Object.assign(instance, thisObj), instance.onUpdate?.()) : (scope[accessor] = thisObj, thisObj.onMount?.(), $signal(scope, accessor).onabort = () => thisObj.onDestroy?.());

package/dist/dom.mjs

@@ -111,6 +111,7 @@ function handleDelegated(ev) {
 }
 
 // src/dom/resolve-cursor-position.ts
+var R = /[^\p{L}\p{N}]/gu;
 function resolveCursorPosition(inputType2, initialPosition, initialValue, updatedValue) {
   if (
     // If initial position is null or false then
@@ -120,22 +121,15 @@ function resolveCursorPosition(inputType2, initialPosition, initialValue, update
     /kw/.test(inputType2))
   ) {
     let before = initialValue.slice(0, initialPosition), after = initialValue.slice(initialPosition);
-    if (updatedValue.startsWith(before))
-      return initialPosition;
-    if (updatedValue.endsWith(after))
-      return updatedValue.length - after.length;
-    {
-      let relevantChars = stripSpacesAndPunctuation(before).length, pos = 0, relevantIndex = 0;
-      for (; relevantIndex < relevantChars; )
-        stripSpacesAndPunctuation(updatedValue[pos]) && relevantIndex++, pos++;
-      return pos;
-    }
+    if (updatedValue.startsWith(before)) return initialPosition;
+    if (updatedValue.endsWith(after)) return updatedValue.length - after.length;
+    let count = before.replace(R, "").length, pos = 0;
+    for (; count && updatedValue[pos]; )
+      updatedValue[pos++].replace(R, "") && count--;
+    return pos;
   }
   return -1;
 }
-function stripSpacesAndPunctuation(str) {
-  return str.replace(/[^\p{L}\p{N}]/gu, "");
-}
 
 // src/dom/parse-html.ts
 var parsers = {};
@@ -526,11 +520,14 @@ function init(runtimeId = "M") {
                   scope.G
                 ))) : ($global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId);
           for (visit of visits = render.v)
-            lastTokenIndex = render.i.length, visitText = visit.data, visitType = visitText[lastTokenIndex++], visitScope = getScope(nextToken(
+            if (lastTokenIndex = render.i.length, visitText = visit.data, visitType = visitText[lastTokenIndex++], visitScope = getScope(nextToken(
               /* read scope id */
-            )), visitType === "*" /* Node */ ? visitScope[nextToken(
-              /* read accessor */
-            )] = visit.previousSibling : branchesEnabled && visitBranches();
+            )), visitType === "*" /* Node */) {
+              let prev = visit.previousSibling;
+              visitScope[nextToken(
+                /* read accessor */
+              )] = prev && (prev.nodeType < 8 || prev.data) ? prev : visit.parentNode.insertBefore(new Text(), visit);
+            } else branchesEnabled && visitBranches();
           return embedEnabled && (render.n ||= visit?.parentNode.insertBefore(
             new Text(),
             visit.nextSibling
@@ -806,11 +803,11 @@ function _attr_nonce(scope, nodeAccessor) {
   _attr(scope[nodeAccessor], "nonce", scope.$.cspNonce);
 }
 function _text(node, value) {
-  let normalizedValue = normalizeString(value);
+  let normalizedValue = _to_text(value);
   node.data !== normalizedValue && (node.data = normalizedValue);
 }
 function _text_content(node, value) {
-  let normalizedValue = normalizeString(value);
+  let normalizedValue = _to_text(value);
   node.textContent !== normalizedValue && (node.textContent = normalizedValue);
 }
 function _attrs(scope, nodeAccessor, nextAttrs) {
@@ -970,9 +967,6 @@ function normalizeAttrValue(value) {
   if (value || value === 0)
     return value === !0 ? "" : value + "";
 }
-function normalizeString(value) {
-  return value || value === 0 ? value + "" : "\u200D";
-}
 function _lifecycle(scope, thisObj, index = 0) {
   let accessor = "K" /* Lifecycle */ + index, instance = scope[accessor];
   instance ? (Object.assign(instance, thisObj), instance.onUpdate?.()) : (scope[accessor] = thisObj, thisObj.onMount?.(), $signal(scope, accessor).onabort = () => thisObj.onDestroy?.());

package/dist/html/content.d.ts

@@ -1,5 +1,4 @@
 export declare function _unescaped(val: unknown): string;
 export declare function _escape(val: unknown): string;
-export declare function _escape_text(val: unknown): string;
 export declare function _escape_script(val: unknown): string;
 export declare function _escape_style(val: unknown): string;

package/dist/html.d.ts

@@ -2,7 +2,7 @@ export { attrTag, attrTags } from "./common/attr-tag";
 export { _assert_hoist, _el_read_error, _hoist_read_error, } from "./common/errors";
 export { _attr, _attr_class, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_option_value, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, } from "./html/attrs";
 export { compat } from "./html/compat";
-export { _escape, _escape_script, _escape_style, _escape_text, _unescaped, } from "./html/content";
+export { _escape, _escape_script, _escape_style, _unescaped, } from "./html/content";
 export { _content, _content_resume, _dynamic_tag } from "./html/dynamic-tag";
 export { forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, } from "./html/for";
 export { _template } from "./html/template";

package/dist/html.js

@@ -46,7 +46,6 @@ __export(html_exports, {
   _escape: () => _escape,
   _escape_script: () => _escape_script,
   _escape_style: () => _escape_style,
-  _escape_text: () => _escape_text,
   _existing_scope: () => _existing_scope,
   _for_in: () => _for_in,
   _for_of: () => _for_of,
@@ -158,9 +157,6 @@ function _unescaped(val) {
 }
 var unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str;
 function _escape(val) {
-  return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "&zwj;";
-}
-function _escape_text(val) {
   return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
 var unsafeScriptReg = /<\/script/g, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
@@ -1818,7 +1814,7 @@ function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange) {
     nodeAccessor,
     void 0,
     valueChange
-  ), _escape_text(value);
+  ), _escape(value);
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange) {
   return valueChange && writeControlledScope(
@@ -2400,7 +2396,6 @@ function NOOP3() {
   _escape,
   _escape_script,
   _escape_style,
-  _escape_text,
   _existing_scope,
   _for_in,
   _for_of,

package/dist/html.mjs

@@ -68,9 +68,6 @@ function _unescaped(val) {
 }
 var unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str;
 function _escape(val) {
-  return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "&zwj;";
-}
-function _escape_text(val) {
   return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
 var unsafeScriptReg = /<\/script/g, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
@@ -1728,7 +1725,7 @@ function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange) {
     nodeAccessor,
     void 0,
     valueChange
-  ), _escape_text(value);
+  ), _escape(value);
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange) {
   return valueChange && writeControlledScope(
@@ -2309,7 +2306,6 @@ export {
   _escape,
   _escape_script,
   _escape_style,
-  _escape_text,
   _existing_scope,
   _for_in,
   _for_of,

package/dist/translator/index.js

@@ -1358,6 +1358,9 @@ var scopeExprsBySection = /* @__PURE__ */ new WeakMap();
 var propExprsBySection = /* @__PURE__ */ new WeakMap();
 var serializePropsByBinding = /* @__PURE__ */ new WeakMap();
 var serializePropByModifier = {};
+function isSameReason(a, b) {
+  return a === b || (a && b ? a !== true && b !== true && compareSources(a, b) === 0 : false);
+}
 function isForceSerialized(section, prop, prefix2) {
   return true === (prop ? section.serializeReasons.get(getPropKey(section, prop, prefix2)) : section.serializeReason);
 }
@@ -2367,7 +2370,7 @@ var unsafeXMLReg = /[<&]/g;
 var replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;";
 var escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str;
 function _escape(val) {
-  return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "&zwj;";
+  return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
 var unsafeScriptReg = /<\/script/g;
 var escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
@@ -2774,32 +2777,34 @@ function withLeadingComment(node, value) {
 }
 
 // src/translator/util/serialize-guard.ts
+var sourcesUtil = new Sorted(compareSources);
+var [getSectionReasonState] = createSectionState(
+  "serializeReasonState",
+  (section) => ({
+    if: createTypeState(),
+    guard: createTypeState(),
+    declarators: [
+      import_compiler14.types.variableDeclarator(
+        import_compiler14.types.identifier(getSharedUid(`scope${section.id}_reason`, section)),
+        callRuntime("_scope_reason")
+      )
+    ]
+  })
+);
+function getScopeReasonDeclaration(section) {
+  return import_compiler14.types.variableDeclaration(
+    "const",
+    getSectionReasonState(section).declarators
+  );
+}
 function getSerializeGuard(section, reason, optional) {
-  if (!isReasonDynamic(reason)) {
+  if (!isReasonDynamic(reason) || isCrossSection(section, reason)) {
     return reason ? optional ? void 0 : withLeadingComment(
       import_compiler14.types.numericLiteral(1),
       getDebugNames(reason === true ? void 0 : reason.state)
     ) : import_compiler14.types.numericLiteral(0);
   }
-  let expr;
-  for (const [paramsSection, params] of groupParamsBySection(reason.param)) {
-    if (!isSameOrChildSection(paramsSection, section)) {
-      return optional ? void 0 : withLeadingComment(import_compiler14.types.numericLiteral(1), getDebugNames(params));
-    }
-    const serializeIdentifier = import_compiler14.types.identifier(
-      getSharedUid(`scope${paramsSection.id}_reason`, paramsSection)
-    );
-    const guard = paramsSection.paramReasonGroups ? callRuntime(
-      "_serialize_guard",
-      serializeIdentifier,
-      withLeadingComment(
-        import_compiler14.types.numericLiteral(getParamReasonGroupIndex(paramsSection, params)),
-        getDebugNames(params)
-      )
-    ) : serializeIdentifier;
-    expr = expr ? import_compiler14.types.logicalExpression("||", expr, guard) : guard;
-  }
-  return expr;
+  return getOrHoist(reason, true);
 }
 function getSerializeGuardForAny(section, reasons, optional) {
   if (!reasons || reasons === true) {
@@ -2819,28 +2824,81 @@ function getSerializeGuardForAny(section, reasons, optional) {
   return expr;
 }
 function getExprIfSerialized(section, reason, expr) {
-  if (!isReasonDynamic(reason)) {
+  if (!isReasonDynamic(reason) || isCrossSection(section, reason)) {
     return reason && expr;
   }
-  let orExpr;
-  for (const [paramsSection, params] of groupParamsBySection(reason.param)) {
-    if (!isSameOrChildSection(paramsSection, section)) {
+  const guard = getOrHoist(reason, false);
+  return guard ? import_compiler14.types.logicalExpression("&&", guard, expr) : expr;
+}
+function getOrHoist(reason, isGuard) {
+  const onlySection = getOnlySection(reason.param);
+  if (onlySection) {
+    const state = getSectionReasonState(onlySection);
+    const tracking = isGuard ? state.guard : state.if;
+    const existingFound = sourcesUtil.find(tracking.hoistedReasons, reason);
+    if (existingFound) {
+      return import_compiler14.types.identifier(tracking.names.get(existingFound));
+    }
+    const guard = buildGuardExpr(onlySection, reason.param, isGuard);
+    const seenFound = sourcesUtil.find(tracking.seenReasons, reason);
+    if (!seenFound) {
+      const expr = import_compiler14.types.parenthesizedExpression(guard);
+      tracking.pending.set(reason, expr);
+      tracking.seenReasons = sourcesUtil.add(tracking.seenReasons, reason);
       return expr;
     }
-    const serializeIdentifier = import_compiler14.types.identifier(
-      getSharedUid(`scope${paramsSection.id}_reason`, paramsSection)
+    const name2 = generateUid(
+      `${isGuard ? "sg" : "si"}__${getDebugNamesAsIdentifier(reason.param)}`
     );
-    const guard = paramsSection.paramReasonGroups ? callRuntime(
-      "_serialize_if",
-      serializeIdentifier,
-      withLeadingComment(
-        import_compiler14.types.numericLiteral(getParamReasonGroupIndex(paramsSection, params)),
-        getDebugNames(params)
-      )
-    ) : serializeIdentifier;
-    orExpr = orExpr ? import_compiler14.types.logicalExpression("||", orExpr, guard) : guard;
+    tracking.hoistedReasons = sourcesUtil.add(tracking.hoistedReasons, reason);
+    tracking.names.set(reason, name2);
+    state.declarators.push(import_compiler14.types.variableDeclarator(import_compiler14.types.identifier(name2), guard));
+    const pendingParen = tracking.pending.get(seenFound);
+    if (pendingParen) {
+      pendingParen.expression = import_compiler14.types.identifier(name2);
+      tracking.pending.delete(seenFound);
+    }
+    return import_compiler14.types.parenthesizedExpression(import_compiler14.types.identifier(name2));
   }
-  return import_compiler14.types.logicalExpression("&&", orExpr, expr);
+  let orExpr;
+  for (const [paramsSection, params] of groupParamsBySection(reason.param)) {
+    const expr = buildGuardExpr(paramsSection, params, isGuard);
+    orExpr = orExpr ? import_compiler14.types.logicalExpression("||", orExpr, expr) : expr;
+  }
+  return orExpr;
+}
+function buildGuardExpr(paramsSection, params, isGuard) {
+  const serializeIdentifier = import_compiler14.types.identifier(
+    getSharedUid(`scope${paramsSection.id}_reason`, paramsSection)
+  );
+  return paramsSection.paramReasonGroups ? callRuntime(
+    isGuard ? "_serialize_guard" : "_serialize_if",
+    serializeIdentifier,
+    withLeadingComment(
+      import_compiler14.types.numericLiteral(getParamReasonGroupIndex(paramsSection, params)),
+      getDebugNames(params)
+    )
+  ) : serializeIdentifier;
+}
+function getOnlySection(params) {
+  if (params === void 0) return void 0;
+  if (!Array.isArray(params)) return params.section;
+  const { section } = params[0];
+  return section === params[params.length - 1].section ? section : void 0;
+}
+function isCrossSection(section, reason) {
+  return some(
+    reason.param,
+    (param) => !isSameOrChildSection(param.section, section)
+  );
+}
+function createTypeState() {
+  return {
+    names: /* @__PURE__ */ new Map(),
+    pending: /* @__PURE__ */ new Map(),
+    seenReasons: void 0,
+    hoistedReasons: void 0
+  };
 }
 
 // src/translator/util/walks.ts
@@ -3448,7 +3506,7 @@ function getBindingGetterIdentifier(binding, getterSection) {
   }
   return identifier;
 }
-function getSignal(section, referencedBindings, name2 = generateSignalName(referencedBindings)) {
+function getSignal(section, referencedBindings, name2) {
   if (referencedBindings && !Array.isArray(referencedBindings)) {
     if (referencedBindings.type === 6 /* constant */) {
       return getSignal(section, void 0);
@@ -3463,12 +3521,13 @@ function getSignal(section, referencedBindings, name2 = generateSignalName(refer
   const signals = getSignals(section);
   let signal = signals.get(referencedBindings);
   if (!signal) {
+    const signalName = name2 ?? (referencedBindings ? getDebugNamesAsIdentifier(referencedBindings) : "setup");
     const exportName = referencedBindings ? !Array.isArray(referencedBindings) && referencedBindings.section === section && referencedBindings.export : !section.parent && (0, import_babel_utils15.getProgram)().node.extra.domExports?.setup;
     signals.set(
       referencedBindings,
       signal = {
         identifier: exportName ? import_compiler22.types.identifier(exportName) : generateUidIdentifier(
-          section.name ? `${section.name}__${name2}` : name2
+          section.name ? `${section.name}__${signalName}` : signalName
         ),
         referencedBindings,
         section,
@@ -3803,26 +3862,6 @@ function subscribe(references, subscriber) {
     });
   }
 }
-function generateSignalName(referencedBindings) {
-  let name2;
-  if (referencedBindings) {
-    if (Array.isArray(referencedBindings)) {
-      name2 = "";
-      for (const ref of referencedBindings) {
-        if (name2) {
-          name2 += `__OR__${ref.name.replace(/^\$/, "")}`;
-        } else {
-          name2 = ref.name;
-        }
-      }
-    } else {
-      name2 = referencedBindings.name;
-    }
-  } else {
-    name2 = "setup";
-  }
-  return name2;
-}
 function replaceNullishAndEmptyFunctionsWith0(args) {
   const len = args.length;
   let finalLen = void 0;
@@ -4170,6 +4209,10 @@ function writeHTMLResumeStatements(path7) {
   const serializedLookup = getSerializedAccessors(section);
   const serializedProperties = [];
   const sectionSerializeReason = nonAnalyzedForceSerializedSection.has(section) ? true : section.serializeReason;
+  const ifSerialized = (reason, expr) => {
+    if (isSameReason(sectionSerializeReason, reason)) return expr;
+    return getExprIfSerialized(section, reason, expr);
+  };
   let debugVars;
   const writeSerializedBinding = (binding) => {
     const reason = getSerializeReason(section, binding);
@@ -4179,11 +4222,7 @@ function writeHTMLResumeStatements(path7) {
     serializedProperties.push(
       toObjectProperty(
         accessor,
-        sectionSerializeReason && (sectionSerializeReason === reason || sectionSerializeReason !== true && reason !== true && compareSources(sectionSerializeReason, reason) === 0) ? getDeclaredBindingExpression(binding) : getExprIfSerialized(
-          section,
-          reason,
-          getDeclaredBindingExpression(binding)
-        )
+        ifSerialized(reason, getDeclaredBindingExpression(binding))
       )
     );
     if (debug) {
@@ -4209,22 +4248,21 @@ function writeHTMLResumeStatements(path7) {
     const ownerAccessor = getAccessorProp().Owner;
     const ownerReason = getSerializeReason(section, ownerAccessor);
     if (ownerReason) {
-      const getOwnerExpr = callRuntime(
-        "_scope_with_id",
-        getScopeIdIdentifier(section.parent)
-      );
       serializedLookup.delete(ownerAccessor);
       serializedProperties.push(
         toObjectProperty(
           ownerAccessor,
-          sectionSerializeReason && (sectionSerializeReason === ownerReason || sectionSerializeReason !== true && ownerReason !== true && compareSources(sectionSerializeReason, ownerReason) === 0) ? getOwnerExpr : getExprIfSerialized(section, ownerReason, getOwnerExpr)
+          ifSerialized(
+            ownerReason,
+            callRuntime("_scope_with_id", getScopeIdIdentifier(section.parent))
+          )
         )
       );
     }
   }
   for (const [key, { expression, reason }] of serializedLookup) {
     serializedProperties.push(
-      toObjectProperty(key, getExprIfSerialized(section, reason, expression))
+      toObjectProperty(key, ifSerialized(reason, expression))
     );
   }
   if (sectionSerializeReason) {
@@ -4437,11 +4475,22 @@ function getBuildAssignment(extra) {
   const { assignmentTo, assignment } = extra;
   if (assignmentTo) {
     return (section, value) => {
-      const replacement = callRuntime(
-        "_call",
-        createScopeReadExpression(assignmentTo, section),
-        value
-      );
+      let scopeRead;
+      if (assignmentTo.pruned) {
+        let cur = assignmentTo;
+        const props = [];
+        while (cur.pruned && cur.property !== void 0 && cur.upstreamAlias) {
+          props.push(cur.property);
+          cur = cur.upstreamAlias;
+        }
+        scopeRead = createScopeReadExpression(cur, section);
+        for (let i = props.length; i--; ) {
+          scopeRead = toMemberExpression(scopeRead, props[i], false);
+        }
+      } else {
+        scopeRead = createScopeReadExpression(assignmentTo, section);
+      }
+      const replacement = callRuntime("_call", scopeRead, value);
       updateExpressions.add(replacement);
       return replacement;
     };
@@ -4768,14 +4817,7 @@ var html_default = {
         }
       }
       if (dynamicSerializeReason) {
-        renderContent.push(
-          import_compiler24.types.variableDeclaration("const", [
-            import_compiler24.types.variableDeclarator(
-              import_compiler24.types.identifier(getSharedUid(`scope${section.id}_reason`, section)),
-              callRuntime("_scope_reason")
-            )
-          ])
-        );
+        renderContent.push(getScopeReasonDeclaration(section));
       } else {
         renderContent.push(import_compiler24.types.expressionStatement(callRuntime("_scope_reason")));
       }
@@ -5859,7 +5901,7 @@ var native_tag_default = {
               valueChange
             );
           } else if (value) {
-            writeAtStartOfBody = callRuntime("_escape_text", value);
+            writeAtStartOfBody = callRuntime("_escape", value);
           }
         }
         for (const attr of staticAttrs) {
@@ -6518,7 +6560,7 @@ function getTextOnlyEscapeHelper(tagName) {
     case "style":
       return "_escape_style";
     default:
-      return "_escape_text";
+      return "_escape";
   }
 }
 function trackDelimitedAttrValue(expr, meta) {
@@ -7326,16 +7368,7 @@ function buildContent(body) {
         }
       }
       if (dynamicSerializeReason) {
-        body.node.body.unshift(
-          import_compiler35.types.variableDeclaration("const", [
-            import_compiler35.types.variableDeclarator(
-              import_compiler35.types.identifier(
-                getSharedUid(`scope${bodySection.id}_reason`, bodySection)
-              ),
-              callRuntime("_scope_reason")
-            )
-          ])
-        );
+        body.node.body.unshift(getScopeReasonDeclaration(bodySection));
       } else {
         body.node.body.unshift(
           import_compiler35.types.expressionStatement(callRuntime("_scope_reason"))
@@ -8875,7 +8908,6 @@ function trackAssignment(assignment, binding) {
           true
         );
         idExtra.assignmentTo = changeBinding;
-        changeBinding.pruned = false;
         addReadToExpression(id, changeBinding, void 0);
       }
     }
@@ -9685,6 +9717,29 @@ function getDebugName(binding) {
 function getDebugNames(refs) {
   return mapToString(refs, ", ", getDebugName);
 }
+function getDebugNamesAsIdentifier(refs) {
+  return mapToString(refs, "__OR__", getDebugNameAsIdentifier);
+}
+function getDebugNameAsIdentifier(binding) {
+  let root = binding;
+  let access = "";
+  if (binding.type === 2 /* input */) {
+    while (root.upstreamAlias !== root.section.params && root.excludeProperties === void 0) {
+      if (root.property !== void 0) {
+        access = `_${root.property.replace(/[^a-z0-9_$]/gi, "_") + access}`;
+      }
+      root = root.upstreamAlias;
+    }
+  } else {
+    while (!(root.loc || root.declared) && root.upstreamAlias && root.excludeProperties === void 0) {
+      if (root.property !== void 0) {
+        access = `_${root.property.replace(/[^a-z0-9_$]/gi, "_") + access}`;
+      }
+      root = root.upstreamAlias;
+    }
+  }
+  return root.name + access;
+}
 function getSectionInstancesAccessor(section) {
   return section.sectionAccessor ? section.sectionAccessor.prefix + getScopeAccessor(section.sectionAccessor.binding) : getAccessorPrefix().ClosureScopes + section.id;
 }
@@ -9942,7 +9997,12 @@ function resolveReferencedBindings(expr, reads, intersectionsBySection) {
           hoistedBindings = bindingUtil.add(hoistedBindings, binding);
         }
       } else {
-        if (extra.assignmentTo !== binding) {
+        if (extra.assignmentTo === binding) {
+          const upstreamRoot = binding.upstreamAlias && findClosestReference(binding.upstreamAlias, rootBindings);
+          if (upstreamRoot) {
+            binding = upstreamRoot;
+          }
+        } else {
           extra.section = expr.section;
           ({ binding } = extra.read ??= resolveExpressionReference(
             rootBindings,
@@ -10761,7 +10821,7 @@ var html_comment_default = {
           if (import_compiler45.types.isMarkoText(child)) {
             write`${child.value}`;
           } else if (import_compiler45.types.isMarkoPlaceholder(child)) {
-            write`${callRuntime("_escape_text", child.value)}`;
+            write`${callRuntime("_escape", child.value)}`;
           }
         }
       } else {

package/dist/translator/util/references.d.ts

@@ -137,6 +137,8 @@ export declare function getDebugScopeAccess(binding: Binding): {
 };
 export declare function getDebugName(binding: Binding): string;
 export declare function getDebugNames(refs: ReferencedBindings): string;
+export declare function getDebugNamesAsIdentifier(refs: ReferencedBindings): string;
+export declare function getDebugNameAsIdentifier(binding: Binding): string;
 export declare function getSectionInstancesAccessor(section: Section): string;
 export declare function getSectionInstancesAccessorLiteral(section: Section): t.StringLiteral | t.NumericLiteral | undefined;
 export declare function getReadReplacement(node: t.Identifier | t.MemberExpression | t.OptionalMemberExpression, signal?: Signal): t.Expression | undefined;

package/dist/translator/util/serialize-guard.d.ts

@@ -1,6 +1,7 @@
 import { types as t } from "@marko/compiler";
 import { type Section } from "./sections";
 import { type SerializeReason, type SerializeReasons } from "./serialize-reasons";
+export declare function getScopeReasonDeclaration(section: Section): t.VariableDeclaration;
 export declare function getSerializeGuard(section: Section, reason: undefined | SerializeReason, optional: boolean): t.Expression | undefined;
 export declare function getSerializeGuardForAny(section: Section, reasons: undefined | SerializeReasons, optional: boolean): t.Expression | undefined;
-export declare function getExprIfSerialized<T extends undefined | SerializeReason, U extends t.Expression>(section: Section, reason: T, expr: U): T extends {} ? U : undefined;
+export declare function getExprIfSerialized<T extends undefined | SerializeReason, R extends T extends {} ? t.Expression : undefined>(section: Section, reason: T, expr: t.Expression): R;

package/dist/translator/util/serialize-reasons.d.ts

@@ -8,6 +8,7 @@ export type SerializeReason = true | Sources;
 export type SerializeKey = symbol & {
     __serialize_key__: 1;
 };
+export declare function isSameReason(a: SerializeReason | undefined, b: SerializeReason | undefined): boolean;
 export declare function isForceSerialized(section: Section, prop?: Binding | AccessorProp | symbol, prefix?: AccessorPrefix | symbol): boolean;
 export declare function addSerializeReason(section: Section, reason: undefined | false | SerializeReason, prop?: Binding | AccessorProp | symbol, prefix?: AccessorPrefix | symbol): void;
 export declare function addSerializeExpr(section: Section, expr: boolean | Opt<t.NodeExtra>, prop?: Binding | AccessorProp | symbol, prefix?: AccessorPrefix | symbol): void;

package/package.json

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