marko 6.0.101 → 6.0.103

package/dist/html/writer.d.ts

@@ -31,7 +31,7 @@ export declare function getScopeById(scopeId: number | undefined): PartialScope
 export declare function _set_serialize_reason(reason: undefined | 0 | 1): void;
 export declare function _scope_reason(): 0 | 1 | undefined;
 export declare function _serialize_if(condition: undefined | 1 | Record<string, 1>, key: string): 1 | undefined;
-export declare function _serialize_guard(condition: undefined | 1 | Record<string, 1>, key: string): 0 | 1;
+export declare function _serialize_guard(condition: undefined | 1 | Record<string, 1>, key: string): 1 | 0;
 export declare function _el_resume(scopeId: number, accessor: Accessor, shouldResume?: 0 | 1): string;
 export declare function _sep(shouldResume: 0 | 1): "" | "<!>";
 export declare function _el(scopeId: number, id: string): () => void;

package/dist/html.js

@@ -146,7 +146,7 @@ function normalizeDynamicRenderer(value) {
   if (value) {
     if (typeof value == "string") return value;
     let normalized = value.content || value.default || value;
-    if (/* @__KEY__ */ "h" in normalized)
+    if (/* @__KEY__ */ "a" in normalized)
       return normalized;
   }
 }
@@ -1150,11 +1150,11 @@ function _script(scopeId, registryId) {
 function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
   let shouldResume = serializeReason !== 0, render2 = normalizeServerRender(content), branchId = _peek_scope_id();
   render2 && (shouldResume ? withBranchId(branchId, render2) : render2()), _peek_scope_id() !== branchId ? shouldResume && writeScope(scopeId, {
-    ["d" /* ConditionalScope */ + nodeAccessor]: writeScope(
+    ["D" /* ConditionalScope */ + nodeAccessor]: writeScope(
       branchId,
       {}
     ),
-    ["c" /* ConditionalRenderer */ + nodeAccessor]: render2?.h
+    ["C" /* ConditionalRenderer */ + nodeAccessor]: render2?.a
   }) : _scope_id();
 }
 function normalizeServerRender(value) {
@@ -1173,7 +1173,7 @@ function withContext(key, value, cb) {
   }
 }
 function _var(parentScopeId, scopeOffsetAccessor, childScopeId, registryId) {
-  _scope_with_id(parentScopeId)[scopeOffsetAccessor] = _scope_id(), _scope_with_id(childScopeId).e = _resume(
+  _scope_with_id(parentScopeId)[scopeOffsetAccessor] = _scope_id(), _scope_with_id(childScopeId).T = _resume(
     {},
     registryId,
     parentScopeId
@@ -1230,7 +1230,7 @@ function _hoist(scopeId, id) {
 }
 function _resume_branch(scopeId) {
   let branchId = $chunk.context?.[branchIdKey];
-  branchId !== void 0 && branchId !== scopeId && writeScope(scopeId, { g: branchId });
+  branchId !== void 0 && branchId !== scopeId && writeScope(scopeId, { H: branchId });
 }
 var branchIdKey = Symbol();
 function isInResumedBranch() {
@@ -1251,7 +1251,7 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
         cb(item, index), loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
-      ["m" /* LoopScopeMap */ + accessor]: loopScopes
+      ["M" /* LoopScopeMap */ + accessor]: loopScopes
     });
   } else
     forOf(list, cb);
@@ -1277,7 +1277,7 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
         cb(key, value), loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
-      ["m" /* LoopScopeMap */ + accessor]: loopScopes
+      ["M" /* LoopScopeMap */ + accessor]: loopScopes
     });
   } else
     forIn(obj, cb);
@@ -1303,7 +1303,7 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
         cb(i), loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
-      ["m" /* LoopScopeMap */ + accessor]: loopScopes
+      ["M" /* LoopScopeMap */ + accessor]: loopScopes
     });
   } else
     forTo(to, from, step, cb);
@@ -1329,7 +1329,7 @@ function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch,
         cb(i), loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
-      ["m" /* LoopScopeMap */ + accessor]: loopScopes
+      ["M" /* LoopScopeMap */ + accessor]: loopScopes
     });
   } else
     forUntil(to, from, step, cb);
@@ -1351,9 +1351,9 @@ function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeS
     // 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,
+    ["C" /* ConditionalRenderer */ + accessor]: branchIndex || void 0,
     // we convert 0 to undefined since the runtime defaults branch to 0.
-    ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
+    ["D" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
   }), writeBranchEnd(
     scopeId,
     accessor,
@@ -1404,7 +1404,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
       $chunk.writeHTML(
         $chunk.boundary.state.mark("[" /* BranchStart */, "")
       ), content(promise), writeScope(scopeId, {
-        ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
+        ["D" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
       }), $chunk.writeHTML(
         $chunk.boundary.state.mark(
           "]" /* BranchEnd */,
@@ -1426,7 +1426,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
           ), content(value), boundary.state.serializer.writeAssign(
             writeScope(branchId, {}),
             _scope_with_id(scopeId),
-            "d" /* ConditionalScope */ + accessor
+            "D" /* ConditionalScope */ + accessor
           ), $chunk.writeHTML(
             $chunk.boundary.state.mark(
               "]" /* BranchEnd */,
@@ -1450,11 +1450,11 @@ function _try(scopeId, accessor, content, input) {
     placeholderContent ? () => tryPlaceholder(content, placeholderContent) : content,
     catchContent
   ) : placeholderContent ? tryPlaceholder(content, placeholderContent) : content(), writeScope(branchId, {
-    a: accessor,
-    b: catchContent,
-    d: placeholderContent
+    D: accessor,
+    F: catchContent,
+    Q: placeholderContent
   }), writeScope(scopeId, {
-    ["d" /* ConditionalScope */ + accessor]: getScopeById(branchId)
+    ["D" /* ConditionalScope */ + accessor]: getScopeById(branchId)
   }), $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
@@ -1870,7 +1870,7 @@ function _attrs(data, nodeAccessor, scopeId, tagName) {
         break;
       default:
         name && !(isVoid(value) || skip.test(name) || name === "content" && tagName !== "meta") && (isEventHandler(name) ? (events || (events = {}, writeScope(scopeId, {
-          ["i" /* EventAttributes */ + nodeAccessor]: events
+          ["I" /* EventAttributes */ + nodeAccessor]: events
         })), events[getEventHandlerName(name)] = value) : result += nonVoidAttr(name, value));
         break;
     }
@@ -1891,9 +1891,9 @@ function _attrs_partial_content(data, skip, nodeAccessor, scopeId, tagName, seri
 }
 function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange) {
   writeScope(scopeId, {
-    ["f" /* ControlledType */ + nodeAccessor]: type,
-    ["g" /* ControlledValue */ + nodeAccessor]: value,
-    ["e" /* ControlledHandler */ + nodeAccessor]: valueChange
+    ["F" /* ControlledType */ + nodeAccessor]: type,
+    ["G" /* ControlledValue */ + nodeAccessor]: value,
+    ["E" /* ControlledHandler */ + nodeAccessor]: valueChange
   });
 }
 function stringAttr(name, value) {
@@ -1946,14 +1946,14 @@ var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|p
   if (typeof renderer == "string") {
     let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
     if (rendered = !0, _scope_id(), _html(
-      `<${renderer}${_attrs(input, 0, branchId, renderer)}>`
+      `<${renderer}${_attrs(input, "a", branchId, renderer)}>`
     ), !voidElementsReg.test(renderer)) {
       let renderContent = content || normalizeDynamicRenderer(input.content);
       if (renderer === "textarea")
         _html(
           _attr_textarea_value(
             branchId,
-            0,
+            "a",
             input.value,
             input.valueChange
           )
@@ -1965,13 +1965,13 @@ var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|p
           );
         renderer === "select" && ("value" in input || "valueChange" in input) ? _attr_select_value(
           branchId,
-          0,
+          "a",
           input.value,
           input.valueChange,
           renderContent
         ) : _dynamic_tag(
           branchId,
-          0,
+          "a",
           renderContent,
           [],
           0,
@@ -1981,7 +1981,8 @@ var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|p
       }
       _html(`</${renderer}>`);
     }
-    shouldResume && _html(
+    let childScope = getScopeById(branchId);
+    childScope && (childScope["Ia"] || childScope["Ea"]) && (childScope.R = renderer, _script(branchId, "d")), shouldResume && _html(
       state.mark(
         "'" /* BranchEndNativeTag */,
         scopeId + " " + accessor + " " + branchId
@@ -2009,12 +2010,12 @@ var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|p
     );
   }
   return rendered ? shouldResume && writeScope(scopeId, {
-    ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {}),
-    ["c" /* ConditionalRenderer */ + accessor]: renderer?.h || renderer
+    ["D" /* ConditionalScope */ + accessor]: writeScope(branchId, {}),
+    ["C" /* ConditionalRenderer */ + accessor]: renderer?.a || renderer
   }) : _scope_id(), result;
 };
 function _content(id, fn) {
-  return fn.h = id, fn;
+  return fn.a = id, fn;
 }
 function _content_resume(id, fn, scopeId) {
   return _resume(_content(id, fn), id, scopeId);
@@ -2022,7 +2023,7 @@ function _content_resume(id, fn, scopeId) {
 function patchDynamicTag(patch) {
   _dynamic_tag = /* @__PURE__ */ ((originalDynamicTag) => (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
     let patched = patch(scopeId, accessor, tag);
-    return patched !== tag && (patched.h = tag), originalDynamicTag(
+    return patched !== tag && (patched.a = tag), originalDynamicTag(
       scopeId,
       accessor,
       patched,
@@ -2048,7 +2049,7 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
     return state || ($global2.runtimeId ||= "M", $global2.renderId ||= $global2.componentIdPrefix || $global2.widgetIdPrefix || "_", $global2[K_TAGS_API_STATE] = state = new State2($global2)), state;
   },
   isTagsAPI(fn) {
-    return !!fn.h;
+    return !!fn.a;
   },
   onFlush(fn) {
     let { flushHTML } = Chunk.prototype;

package/dist/html.mjs

@@ -57,7 +57,7 @@ function normalizeDynamicRenderer(value) {
   if (value) {
     if (typeof value == "string") return value;
     let normalized = value.content || value.default || value;
-    if (/* @__KEY__ */ "h" in normalized)
+    if (/* @__KEY__ */ "a" in normalized)
       return normalized;
   }
 }
@@ -1061,11 +1061,11 @@ function _script(scopeId, registryId) {
 function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
   let shouldResume = serializeReason !== 0, render2 = normalizeServerRender(content), branchId = _peek_scope_id();
   render2 && (shouldResume ? withBranchId(branchId, render2) : render2()), _peek_scope_id() !== branchId ? shouldResume && writeScope(scopeId, {
-    ["d" /* ConditionalScope */ + nodeAccessor]: writeScope(
+    ["D" /* ConditionalScope */ + nodeAccessor]: writeScope(
       branchId,
       {}
     ),
-    ["c" /* ConditionalRenderer */ + nodeAccessor]: render2?.h
+    ["C" /* ConditionalRenderer */ + nodeAccessor]: render2?.a
   }) : _scope_id();
 }
 function normalizeServerRender(value) {
@@ -1084,7 +1084,7 @@ function withContext(key, value, cb) {
   }
 }
 function _var(parentScopeId, scopeOffsetAccessor, childScopeId, registryId) {
-  _scope_with_id(parentScopeId)[scopeOffsetAccessor] = _scope_id(), _scope_with_id(childScopeId).e = _resume(
+  _scope_with_id(parentScopeId)[scopeOffsetAccessor] = _scope_id(), _scope_with_id(childScopeId).T = _resume(
     {},
     registryId,
     parentScopeId
@@ -1141,7 +1141,7 @@ function _hoist(scopeId, id) {
 }
 function _resume_branch(scopeId) {
   let branchId = $chunk.context?.[branchIdKey];
-  branchId !== void 0 && branchId !== scopeId && writeScope(scopeId, { g: branchId });
+  branchId !== void 0 && branchId !== scopeId && writeScope(scopeId, { H: branchId });
 }
 var branchIdKey = Symbol();
 function isInResumedBranch() {
@@ -1162,7 +1162,7 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
         cb(item, index), loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
-      ["m" /* LoopScopeMap */ + accessor]: loopScopes
+      ["M" /* LoopScopeMap */ + accessor]: loopScopes
     });
   } else
     forOf(list, cb);
@@ -1188,7 +1188,7 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
         cb(key, value), loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
-      ["m" /* LoopScopeMap */ + accessor]: loopScopes
+      ["M" /* LoopScopeMap */ + accessor]: loopScopes
     });
   } else
     forIn(obj, cb);
@@ -1214,7 +1214,7 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
         cb(i), loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
-      ["m" /* LoopScopeMap */ + accessor]: loopScopes
+      ["M" /* LoopScopeMap */ + accessor]: loopScopes
     });
   } else
     forTo(to, from, step, cb);
@@ -1240,7 +1240,7 @@ function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch,
         cb(i), loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
-      ["m" /* LoopScopeMap */ + accessor]: loopScopes
+      ["M" /* LoopScopeMap */ + accessor]: loopScopes
     });
   } else
     forUntil(to, from, step, cb);
@@ -1262,9 +1262,9 @@ function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeS
     // 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,
+    ["C" /* ConditionalRenderer */ + accessor]: branchIndex || void 0,
     // we convert 0 to undefined since the runtime defaults branch to 0.
-    ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
+    ["D" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
   }), writeBranchEnd(
     scopeId,
     accessor,
@@ -1315,7 +1315,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
       $chunk.writeHTML(
         $chunk.boundary.state.mark("[" /* BranchStart */, "")
       ), content(promise), writeScope(scopeId, {
-        ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
+        ["D" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
       }), $chunk.writeHTML(
         $chunk.boundary.state.mark(
           "]" /* BranchEnd */,
@@ -1337,7 +1337,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
           ), content(value), boundary.state.serializer.writeAssign(
             writeScope(branchId, {}),
             _scope_with_id(scopeId),
-            "d" /* ConditionalScope */ + accessor
+            "D" /* ConditionalScope */ + accessor
           ), $chunk.writeHTML(
             $chunk.boundary.state.mark(
               "]" /* BranchEnd */,
@@ -1361,11 +1361,11 @@ function _try(scopeId, accessor, content, input) {
     placeholderContent ? () => tryPlaceholder(content, placeholderContent) : content,
     catchContent
   ) : placeholderContent ? tryPlaceholder(content, placeholderContent) : content(), writeScope(branchId, {
-    a: accessor,
-    b: catchContent,
-    d: placeholderContent
+    D: accessor,
+    F: catchContent,
+    Q: placeholderContent
   }), writeScope(scopeId, {
-    ["d" /* ConditionalScope */ + accessor]: getScopeById(branchId)
+    ["D" /* ConditionalScope */ + accessor]: getScopeById(branchId)
   }), $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
@@ -1781,7 +1781,7 @@ function _attrs(data, nodeAccessor, scopeId, tagName) {
         break;
       default:
         name && !(isVoid(value) || skip.test(name) || name === "content" && tagName !== "meta") && (isEventHandler(name) ? (events || (events = {}, writeScope(scopeId, {
-          ["i" /* EventAttributes */ + nodeAccessor]: events
+          ["I" /* EventAttributes */ + nodeAccessor]: events
         })), events[getEventHandlerName(name)] = value) : result += nonVoidAttr(name, value));
         break;
     }
@@ -1802,9 +1802,9 @@ function _attrs_partial_content(data, skip, nodeAccessor, scopeId, tagName, seri
 }
 function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange) {
   writeScope(scopeId, {
-    ["f" /* ControlledType */ + nodeAccessor]: type,
-    ["g" /* ControlledValue */ + nodeAccessor]: value,
-    ["e" /* ControlledHandler */ + nodeAccessor]: valueChange
+    ["F" /* ControlledType */ + nodeAccessor]: type,
+    ["G" /* ControlledValue */ + nodeAccessor]: value,
+    ["E" /* ControlledHandler */ + nodeAccessor]: valueChange
   });
 }
 function stringAttr(name, value) {
@@ -1857,14 +1857,14 @@ var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|p
   if (typeof renderer == "string") {
     let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
     if (rendered = !0, _scope_id(), _html(
-      `<${renderer}${_attrs(input, 0, branchId, renderer)}>`
+      `<${renderer}${_attrs(input, "a", branchId, renderer)}>`
     ), !voidElementsReg.test(renderer)) {
       let renderContent = content || normalizeDynamicRenderer(input.content);
       if (renderer === "textarea")
         _html(
           _attr_textarea_value(
             branchId,
-            0,
+            "a",
             input.value,
             input.valueChange
           )
@@ -1876,13 +1876,13 @@ var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|p
           );
         renderer === "select" && ("value" in input || "valueChange" in input) ? _attr_select_value(
           branchId,
-          0,
+          "a",
           input.value,
           input.valueChange,
           renderContent
         ) : _dynamic_tag(
           branchId,
-          0,
+          "a",
           renderContent,
           [],
           0,
@@ -1892,7 +1892,8 @@ var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|p
       }
       _html(`</${renderer}>`);
     }
-    shouldResume && _html(
+    let childScope = getScopeById(branchId);
+    childScope && (childScope["Ia"] || childScope["Ea"]) && (childScope.R = renderer, _script(branchId, "d")), shouldResume && _html(
       state.mark(
         "'" /* BranchEndNativeTag */,
         scopeId + " " + accessor + " " + branchId
@@ -1920,12 +1921,12 @@ var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|p
     );
   }
   return rendered ? shouldResume && writeScope(scopeId, {
-    ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {}),
-    ["c" /* ConditionalRenderer */ + accessor]: renderer?.h || renderer
+    ["D" /* ConditionalScope */ + accessor]: writeScope(branchId, {}),
+    ["C" /* ConditionalRenderer */ + accessor]: renderer?.a || renderer
   }) : _scope_id(), result;
 };
 function _content(id, fn) {
-  return fn.h = id, fn;
+  return fn.a = id, fn;
 }
 function _content_resume(id, fn, scopeId) {
   return _resume(_content(id, fn), id, scopeId);
@@ -1933,7 +1934,7 @@ function _content_resume(id, fn, scopeId) {
 function patchDynamicTag(patch) {
   _dynamic_tag = /* @__PURE__ */ ((originalDynamicTag) => (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
     let patched = patch(scopeId, accessor, tag);
-    return patched !== tag && (patched.h = tag), originalDynamicTag(
+    return patched !== tag && (patched.a = tag), originalDynamicTag(
       scopeId,
       accessor,
       patched,
@@ -1959,7 +1960,7 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
     return state || ($global2.runtimeId ||= "M", $global2.renderId ||= $global2.componentIdPrefix || $global2.widgetIdPrefix || "_", $global2[K_TAGS_API_STATE] = state = new State2($global2)), state;
   },
   isTagsAPI(fn) {
-    return !!fn.h;
+    return !!fn.a;
   },
   onFlush(fn) {
     let { flushHTML } = Chunk.prototype;