marko 6.0.0-3.9 → 6.0.0-next.3.16

package/dist/debug/dom.js

@@ -615,8 +615,8 @@ function setTagVarChange(scope, changeHandler) {
   scope["@" /* TagVariableChange */] = changeHandler;
 }
 var tagVarSignalChange = (scope, value2) => scope["@" /* TagVariableChange */]?.(value2);
-var renderBodyClosures = (renderBody, childScope, op) => {
-  const signals = renderBody?.___closureSignals;
+var contentClosures = (content, childScope, op) => {
+  const signals = content?.___closureSignals;
   if (signals) {
     for (const signal of signals) {
       signal(childScope, op);
@@ -787,7 +787,7 @@ function getEventHandlerName(name) {
   return name[2] === "-" ? name.slice(3) : name.slice(2).toLowerCase();
 }
 function normalizeDynamicRenderer(value2) {
-  if (value2) return value2.renderBody || value2.default || value2;
+  if (value2) return value2.content || value2.default || value2;
 }
 
 // src/dom/reconcile.ts
@@ -1181,15 +1181,14 @@ function controllable_detailsOrDialog_open(scope, nodeAccessor, open, openChange
 }
 function controllable_detailsOrDialog_open_effect(scope, nodeAccessor) {
   const el = scope[nodeAccessor];
+  const hasChanged = () => el.open !== scope[nodeAccessor + ":" /* ControlledValue */];
   syncControllable(
     el,
     el.tagName === "DIALOG" ? "close" : "toggle",
-    () => {
-      return scope[nodeAccessor + ";" /* ControlledHandler */] && el.open !== scope[nodeAccessor + ":" /* ControlledValue */];
-    },
+    hasChanged,
     () => {
       const openChange = scope[nodeAccessor + ";" /* ControlledHandler */];
-      if (openChange) {
+      if (openChange && hasChanged()) {
         scope[nodeAccessor + "=" /* ControlledType */] = 6 /* Pending */;
         openChange(el.open);
         run();
@@ -1293,7 +1292,7 @@ function toValueProp(it) {
 }
 
 // src/dom/parse-html.ts
-var fallback = document.createTextNode("");
+var fallback = /* @__PURE__ */ document.createTextNode("");
 var parser = /* @__PURE__ */ new Range();
 function parseHTML(html2) {
   return parser.createContextualFragment(html2);
@@ -1440,7 +1439,7 @@ function attrsInternal(scope, nodeAccessor, nextAttrs) {
       case "style":
         styleAttr(el, value2);
         break;
-      case "renderBody":
+      case "content":
         break;
       default: {
         if (isEventHandler(name)) {
@@ -1645,7 +1644,7 @@ function initRenderer(renderer, scope) {
   }
   return dom;
 }
-function dynamicTagAttrs(nodeAccessor, getRenderBody, inputIsArgs) {
+function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
   return (scope, attrsOrOp) => {
     const renderer = scope[nodeAccessor + "(" /* ConditionalRenderer */];
     if (!renderer || attrsOrOp === DIRTY) {
@@ -1655,24 +1654,24 @@ function dynamicTagAttrs(nodeAccessor, getRenderBody, inputIsArgs) {
     if (attrsOrOp === MARK || attrsOrOp === CLEAN) {
       return renderer.___args?.(childScope, attrsOrOp);
     }
-    const renderBody = getRenderBody?.(scope);
+    const content = getContent?.(scope);
     if (typeof renderer === "string") {
       const nodeAccessor2 = true ? `#${renderer}/0` : 0;
-      if (renderer === "textarea" && renderBody) {
+      if (renderer === "textarea" && content) {
         throw new Error(
-          "A dynamic tag rendering a `<textarea>` cannot have a `renderBody` and must use the `value` attribute instead."
+          "A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead."
         );
       }
-      setConditionalRendererOnlyChild(childScope, nodeAccessor2, renderBody);
+      setConditionalRendererOnlyChild(childScope, nodeAccessor2, content);
       attrs(childScope, nodeAccessor2, attrsOrOp());
     } else if (renderer.___args) {
       const attributes = attrsOrOp();
       renderer.___args(
         childScope,
         inputIsArgs ? attributes : [
-          renderBody ? {
+          content ? {
             ...attributes,
-            renderBody
+            content
           } : attributes
         ]
       );
@@ -1742,7 +1741,7 @@ var conditional = function conditional2(nodeAccessor, fn, getIntersection) {
       }
     }
     intersection2?.(scope, op);
-    renderBodyClosures(currentRenderer, scope[childScopeAccessor], op);
+    contentClosures(currentRenderer, scope[childScopeAccessor], op);
   };
 };
 function inConditionalScope(signal, nodeAccessor) {
@@ -1803,7 +1802,7 @@ var conditionalOnlyChild = function conditional3(nodeAccessor, fn, getIntersecti
       }
     }
     intersection2?.(scope, op);
-    renderBodyClosures(currentRenderer, scope[childScopeAccessor], op);
+    contentClosures(currentRenderer, scope[childScopeAccessor], op);
   };
 };
 function setConditionalRendererOnlyChild(scope, nodeAccessor, newRenderer) {
@@ -2007,7 +2006,7 @@ var compat = {
     renderer.___clone = clone;
     return renderer;
   },
-  render(out, component, renderer, input) {
+  render(out, component, renderer, args) {
     let scope = component.scope;
     if (!scope) {
       scope = classIdToScope.get(component.id);
@@ -2016,8 +2015,15 @@ var compat = {
         classIdToScope.delete(component.id);
       }
     }
-    const args = renderer.___args || noop;
+    const applyArgs = renderer.___args || noop;
     let existing = false;
+    if (typeof args[0] === "object" && "renderBody" in args[0]) {
+      const input = args[0];
+      const normalizedInput = args[0] = {};
+      for (const key in input) {
+        normalizedInput[key === "renderBody" ? "content" : key] = input[key];
+      }
+    }
     component.effects = prepareEffects(() => {
       if (!scope) {
         scope = component.scope = createScopeWithRenderer(renderer, out.global);
@@ -2028,10 +2034,10 @@ var compat = {
           }
         }
       } else {
-        args(scope, MARK);
+        applyArgs(scope, MARK);
         existing = true;
       }
-      args(scope, input);
+      applyArgs(scope, args);
     });
     if (!existing) {
       return scope.___startNode === scope.___endNode ? scope.___startNode : scope.___startNode.parentNode;

package/dist/debug/dom.mjs

@@ -525,8 +525,8 @@ function setTagVarChange(scope, changeHandler) {
   scope["@" /* TagVariableChange */] = changeHandler;
 }
 var tagVarSignalChange = (scope, value2) => scope["@" /* TagVariableChange */]?.(value2);
-var renderBodyClosures = (renderBody, childScope, op) => {
-  const signals = renderBody?.___closureSignals;
+var contentClosures = (content, childScope, op) => {
+  const signals = content?.___closureSignals;
   if (signals) {
     for (const signal of signals) {
       signal(childScope, op);
@@ -697,7 +697,7 @@ function getEventHandlerName(name) {
   return name[2] === "-" ? name.slice(3) : name.slice(2).toLowerCase();
 }
 function normalizeDynamicRenderer(value2) {
-  if (value2) return value2.renderBody || value2.default || value2;
+  if (value2) return value2.content || value2.default || value2;
 }
 
 // src/dom/reconcile.ts
@@ -1091,15 +1091,14 @@ function controllable_detailsOrDialog_open(scope, nodeAccessor, open, openChange
 }
 function controllable_detailsOrDialog_open_effect(scope, nodeAccessor) {
   const el = scope[nodeAccessor];
+  const hasChanged = () => el.open !== scope[nodeAccessor + ":" /* ControlledValue */];
   syncControllable(
     el,
     el.tagName === "DIALOG" ? "close" : "toggle",
-    () => {
-      return scope[nodeAccessor + ";" /* ControlledHandler */] && el.open !== scope[nodeAccessor + ":" /* ControlledValue */];
-    },
+    hasChanged,
     () => {
       const openChange = scope[nodeAccessor + ";" /* ControlledHandler */];
-      if (openChange) {
+      if (openChange && hasChanged()) {
         scope[nodeAccessor + "=" /* ControlledType */] = 6 /* Pending */;
         openChange(el.open);
         run();
@@ -1203,7 +1202,7 @@ function toValueProp(it) {
 }
 
 // src/dom/parse-html.ts
-var fallback = document.createTextNode("");
+var fallback = /* @__PURE__ */ document.createTextNode("");
 var parser = /* @__PURE__ */ new Range();
 function parseHTML(html2) {
   return parser.createContextualFragment(html2);
@@ -1350,7 +1349,7 @@ function attrsInternal(scope, nodeAccessor, nextAttrs) {
       case "style":
         styleAttr(el, value2);
         break;
-      case "renderBody":
+      case "content":
         break;
       default: {
         if (isEventHandler(name)) {
@@ -1555,7 +1554,7 @@ function initRenderer(renderer, scope) {
   }
   return dom;
 }
-function dynamicTagAttrs(nodeAccessor, getRenderBody, inputIsArgs) {
+function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
   return (scope, attrsOrOp) => {
     const renderer = scope[nodeAccessor + "(" /* ConditionalRenderer */];
     if (!renderer || attrsOrOp === DIRTY) {
@@ -1565,24 +1564,24 @@ function dynamicTagAttrs(nodeAccessor, getRenderBody, inputIsArgs) {
     if (attrsOrOp === MARK || attrsOrOp === CLEAN) {
       return renderer.___args?.(childScope, attrsOrOp);
     }
-    const renderBody = getRenderBody?.(scope);
+    const content = getContent?.(scope);
     if (typeof renderer === "string") {
       const nodeAccessor2 = true ? `#${renderer}/0` : 0;
-      if (renderer === "textarea" && renderBody) {
+      if (renderer === "textarea" && content) {
         throw new Error(
-          "A dynamic tag rendering a `<textarea>` cannot have a `renderBody` and must use the `value` attribute instead."
+          "A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead."
         );
       }
-      setConditionalRendererOnlyChild(childScope, nodeAccessor2, renderBody);
+      setConditionalRendererOnlyChild(childScope, nodeAccessor2, content);
       attrs(childScope, nodeAccessor2, attrsOrOp());
     } else if (renderer.___args) {
       const attributes = attrsOrOp();
       renderer.___args(
         childScope,
         inputIsArgs ? attributes : [
-          renderBody ? {
+          content ? {
             ...attributes,
-            renderBody
+            content
           } : attributes
         ]
       );
@@ -1652,7 +1651,7 @@ var conditional = function conditional2(nodeAccessor, fn, getIntersection) {
       }
     }
     intersection2?.(scope, op);
-    renderBodyClosures(currentRenderer, scope[childScopeAccessor], op);
+    contentClosures(currentRenderer, scope[childScopeAccessor], op);
   };
 };
 function inConditionalScope(signal, nodeAccessor) {
@@ -1713,7 +1712,7 @@ var conditionalOnlyChild = function conditional3(nodeAccessor, fn, getIntersecti
       }
     }
     intersection2?.(scope, op);
-    renderBodyClosures(currentRenderer, scope[childScopeAccessor], op);
+    contentClosures(currentRenderer, scope[childScopeAccessor], op);
   };
 };
 function setConditionalRendererOnlyChild(scope, nodeAccessor, newRenderer) {
@@ -1917,7 +1916,7 @@ var compat = {
     renderer.___clone = clone;
     return renderer;
   },
-  render(out, component, renderer, input) {
+  render(out, component, renderer, args) {
     let scope = component.scope;
     if (!scope) {
       scope = classIdToScope.get(component.id);
@@ -1926,8 +1925,15 @@ var compat = {
         classIdToScope.delete(component.id);
       }
     }
-    const args = renderer.___args || noop;
+    const applyArgs = renderer.___args || noop;
     let existing = false;
+    if (typeof args[0] === "object" && "renderBody" in args[0]) {
+      const input = args[0];
+      const normalizedInput = args[0] = {};
+      for (const key in input) {
+        normalizedInput[key === "renderBody" ? "content" : key] = input[key];
+      }
+    }
     component.effects = prepareEffects(() => {
       if (!scope) {
         scope = component.scope = createScopeWithRenderer(renderer, out.global);
@@ -1938,10 +1944,10 @@ var compat = {
           }
         }
       } else {
-        args(scope, MARK);
+        applyArgs(scope, MARK);
         existing = true;
       }
-      args(scope, input);
+      applyArgs(scope, args);
     });
     if (!existing) {
       return scope.___startNode === scope.___endNode ? scope.___startNode : scope.___startNode.parentNode;

package/dist/debug/html.js

@@ -153,7 +153,7 @@ function isVoid(value) {
   return value == null || value === false;
 }
 function normalizeDynamicRenderer(value) {
-  if (value) return value.renderBody || value.default || value;
+  if (value) return value.content || value.default || value;
 }
 
 // src/html/content.ts
@@ -1548,9 +1548,9 @@ function ensureScopeWithId(scopeId) {
 function $global() {
   return $chunk.boundary.state.$global;
 }
-function fork(promise, renderBody) {
+function fork(promise, content) {
   if (!isPromise(promise)) {
-    renderBody(promise);
+    content(promise);
     return;
   }
   const chunk = $chunk;
@@ -1566,7 +1566,7 @@ function fork(promise, renderBody) {
       if (chunk.async) {
         chunk.async = false;
         if (!boundary.signal.aborted) {
-          chunk.render(renderBody, value);
+          chunk.render(content, value);
           boundary.endAsync(chunk);
         }
       }
@@ -1577,27 +1577,27 @@ function fork(promise, renderBody) {
     }
   );
 }
-function tryPlaceholder(renderBody, renderPlaceholder) {
+function tryPlaceholder(content, placeholder) {
   const chunk = $chunk;
   const { boundary } = chunk;
   const body = new Chunk(boundary, null, chunk.context);
-  if (body === body.render(renderBody)) {
+  if (body === body.render(content)) {
     chunk.append(body);
     return;
   }
   chunk.next = $chunk = new Chunk(boundary, chunk.next, body.context);
   chunk.placeholderBody = body;
-  chunk.placeholderRender = renderPlaceholder;
+  chunk.placeholderRender = placeholder;
 }
-function tryCatch(renderBody, renderCatch) {
+function tryCatch(content, catchContent) {
   const chunk = $chunk;
   const { boundary } = chunk;
   const { state } = boundary;
   const catchBoundary = new Boundary(state);
   const body = new Chunk(catchBoundary, null, chunk.context);
-  const bodyEnd = body.render(renderBody);
+  const bodyEnd = body.render(content);
   if (catchBoundary.signal.aborted) {
-    renderCatch(catchBoundary.signal.reason);
+    catchContent(catchBoundary.signal.reason);
     return;
   }
   if (body === bodyEnd) {
@@ -1635,7 +1635,7 @@ function tryCatch(renderBody, renderCatch) {
       }
       const catchChunk = new Chunk(boundary, null, chunk.context);
       catchChunk.reorderId = reorderId;
-      catchChunk.render(renderCatch, catchBoundary.signal.reason);
+      catchChunk.render(catchContent, catchBoundary.signal.reason);
       state.reorder(catchChunk);
       boundary.endAsync();
     } else if (catchBoundary.done) {
@@ -1818,11 +1818,11 @@ var Chunk = class {
     }
     return cur;
   }
-  render(renderBody, val) {
+  render(content, val) {
     const prev = $chunk;
     $chunk = this;
     try {
-      renderBody(val);
+      content(val);
       return $chunk;
     } catch (err) {
       this.boundary.abort(err);
@@ -2035,7 +2035,7 @@ function optionValueAttr(value) {
   return attr("value", value) + (!isVoid(value) && (Array.isArray(value) ? selectedValue.includes(value) : selectedValue === value) ? ` selected` : "");
 }
 var kSelectedValue = Symbol("selectedValue");
-function controllable_select_value(scopeId, nodeAccessor, value, valueChange, renderBody) {
+function controllable_select_value(scopeId, nodeAccessor, value, valueChange, content) {
   if (valueChange) {
     writeControlledScope(
       3 /* SelectValue */,
@@ -2045,8 +2045,8 @@ function controllable_select_value(scopeId, nodeAccessor, value, valueChange, re
       valueChange
     );
   }
-  if (renderBody) {
-    withContext(kSelectedValue, value, renderBody);
+  if (content) {
+    withContext(kSelectedValue, value, content);
   }
 }
 function controllable_textarea_value(scopeId, nodeAccessor, value, valueChange) {
@@ -2182,7 +2182,7 @@ function attrs(data, nodeAccessor, scopeId, tagName) {
         result += styleAttr(val);
         break;
       case "":
-      case "renderBody":
+      case "content":
         break;
       default:
         if (!isVoid(val)) {
@@ -2260,13 +2260,13 @@ var DEFAULT_RENDER_ID = "_";
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
-function dynamicTagInput(scope, tag, input, renderBody, tagVar) {
-  if (!tag && !renderBody) return void 0;
+function dynamicTagInput(scope, tag, input, content, tagVar) {
+  if (!tag && !content) return void 0;
   const scopeId = getScopeId(scope);
   write(`${markResumeScopeStart(scopeId)}`);
   writeScope(scopeId, scope);
   if (!tag) {
-    return renderBody();
+    return content();
   }
   if (typeof tag === "string") {
     nextScopeId();
@@ -2275,9 +2275,9 @@ function dynamicTagInput(scope, tag, input, renderBody, tagVar) {
     );
     if (!voidElementsReg.test(tag)) {
       if (tag === "textarea") {
-        if (renderBody) {
+        if (content) {
           throw new Error(
-            "A dynamic tag rendering a `<textarea>` cannot have a `renderBody` and must use the `value` attribute instead."
+            "A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead."
           );
         }
         write(
@@ -2288,24 +2288,22 @@ function dynamicTagInput(scope, tag, input, renderBody, tagVar) {
             input.valueChange
           )
         );
-      } else if (renderBody) {
+      } else if (content) {
         if (tag === "select" && ("value" in input || "valueChange" in input)) {
           controllable_select_value(
             scopeId,
             true ? `#${tag}/0` : 0,
             input.value,
             input.valueChange,
-            renderBody
+            content
           );
         } else {
-          renderBody();
+          content();
         }
       }
       write(`</${tag}>`);
-    } else if (renderBody) {
-      throw new Error(
-        `A renderBody was provided for a "${tag}" tag, which cannot have children.`
-      );
+    } else if (content) {
+      throw new Error(`Body content is not supported for a "${tag}" tag.`);
     }
     return null;
   }
@@ -2315,7 +2313,7 @@ function dynamicTagInput(scope, tag, input, renderBody, tagVar) {
       throw new Error(`Invalid renderer passed for dynamic tag: ${tag}`);
     }
   }
-  return renderer(renderBody ? { ...input, renderBody } : input, tagVar);
+  return renderer(content ? { ...input, content } : input, tagVar);
 }
 function dynamicTagArgs(scope, tag, args) {
   if (!tag) return void 0;
@@ -2392,13 +2390,20 @@ var compat = {
       null,
       null
     );
+    let normalizedInput = input;
+    if ("renderBody" in input) {
+      normalizedInput = {};
+      for (const key in input) {
+        normalizedInput[key === "renderBody" ? "content" : key] = input[key];
+      }
+    }
     head.render(() => {
       if (willRerender) {
         const scopeId = peekNextScopeId();
         writeScope(scopeId, { m5c: component.id });
         writeEffect(scopeId, SET_SCOPE_REGISTER_ID);
       }
-      renderer(input);
+      renderer(normalizedInput);
     });
     const asyncOut = classAPIOut.beginAsync();
     (boundary.onNext = () => {