marko 6.0.0-3.12 → 6.0.0-3.14

package/dist/dom.js

@@ -389,8 +389,8 @@ var tagVarSignal = (scope, valueOrOp) => scope["/" /* TagVariable */]?.(valueOrO
 function setTagVarChange(scope, changeHandler) {
   scope["@" /* TagVariableChange */] = changeHandler;
 }
-var tagVarSignalChange = (scope, value2) => scope["@" /* TagVariableChange */]?.(value2), renderBodyClosures = (renderBody, childScope, op) => {
-  let signals = renderBody?.c;
+var tagVarSignalChange = (scope, value2) => scope["@" /* TagVariableChange */]?.(value2), contentClosures = (content, childScope, op) => {
+  let signals = content?.c;
   if (signals)
     for (let signal of signals)
       signal(childScope, op);
@@ -515,7 +515,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
@@ -925,7 +925,7 @@ function attrsInternal(scope, nodeAccessor, nextAttrs) {
       case "style":
         styleAttr(el, value2);
         break;
-      case "renderBody":
+      case "content":
         break;
       default:
         isEventHandler(name) ? (events ||= scope[nodeAccessor + "~" /* EventAttributes */] = {})[getEventHandlerName(name)] = value2 : skip?.test(name) || attr(el, name, value2);
@@ -1054,7 +1054,7 @@ function initRenderer(renderer, scope) {
     scope
   ), scope.a = dom.nodeType === 11 /* DocumentFragment */ ? dom.firstChild : dom, scope.b = dom.nodeType === 11 /* DocumentFragment */ ? dom.lastChild : dom, renderer.s && renderer.s(scope), dom;
 }
-function dynamicTagAttrs(nodeAccessor, getRenderBody, inputIsArgs) {
+function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
   return (scope, attrsOrOp) => {
     let renderer = scope[nodeAccessor + "(" /* ConditionalRenderer */];
     if (!renderer || attrsOrOp === DIRTY)
@@ -1062,17 +1062,17 @@ function dynamicTagAttrs(nodeAccessor, getRenderBody, inputIsArgs) {
     let childScope = scope[nodeAccessor + "!" /* ConditionalScope */];
     if (attrsOrOp === MARK || attrsOrOp === CLEAN)
       return renderer.e?.(childScope, attrsOrOp);
-    let renderBody = getRenderBody?.(scope);
+    let content = getContent?.(scope);
     if (typeof renderer == "string")
-      setConditionalRendererOnlyChild(childScope, 0, renderBody), attrs(childScope, 0, attrsOrOp());
+      setConditionalRendererOnlyChild(childScope, 0, content), attrs(childScope, 0, attrsOrOp());
     else if (renderer.e) {
       let attributes = attrsOrOp();
       renderer.e(
         childScope,
         inputIsArgs ? attributes : [
-          renderBody ? {
+          content ? {
             ...attributes,
-            renderBody
+            content
           } : attributes
         ]
       );
@@ -1125,7 +1125,7 @@ var conditional = function(nodeAccessor, fn, getIntersection) {
       let normalizedRenderer = normalizeDynamicRenderer(newRendererOrOp);
       isDifferentRenderer(normalizedRenderer, currentRenderer) ? (currentRenderer = scope[rendererAccessor] = normalizedRenderer, setConditionalRenderer(scope, nodeAccessor, normalizedRenderer), fn && fn(scope), op = DIRTY) : op = CLEAN;
     }
-    intersection2?.(scope, op), renderBodyClosures(currentRenderer, scope[childScopeAccessor], op);
+    intersection2?.(scope, op), contentClosures(currentRenderer, scope[childScopeAccessor], op);
   };
 };
 function inConditionalScope(signal, nodeAccessor) {
@@ -1163,7 +1163,7 @@ var conditionalOnlyChild = function(nodeAccessor, fn, getIntersection) {
         normalizedRenderer
       ), fn && fn(scope), op = DIRTY) : op = CLEAN;
     }
-    intersection2?.(scope, op), renderBodyClosures(currentRenderer, scope[childScopeAccessor], op);
+    intersection2?.(scope, op), contentClosures(currentRenderer, scope[childScopeAccessor], op);
   };
 };
 function setConditionalRendererOnlyChild(scope, nodeAccessor, newRenderer) {
@@ -1301,13 +1301,18 @@ var classIdToScope = /* @__PURE__ */ new Map(), compat = {
     );
     return renderer.k = clone, renderer;
   },
-  render(out, component, renderer, input) {
+  render(out, component, renderer, args) {
     let scope = component.scope;
     scope || (scope = classIdToScope.get(component.id), scope && (component.scope = scope, classIdToScope.delete(component.id)));
-    let args = renderer.e || noop, existing = !1;
+    let applyArgs = renderer.e || noop, existing = !1;
+    if (typeof args[0] == "object" && "renderBody" in args[0]) {
+      let input = args[0], normalizedInput = args[0] = {};
+      for (let key in input)
+        normalizedInput[key === "renderBody" ? "content" : key] = input[key];
+    }
     if (component.effects = prepareEffects(() => {
       if (scope)
-        args(scope, MARK), existing = !0;
+        applyArgs(scope, MARK), existing = !0;
       else {
         scope = component.scope = createScopeWithRenderer(renderer, out.global);
         let closures = renderer.c;
@@ -1315,7 +1320,7 @@ var classIdToScope = /* @__PURE__ */ new Map(), compat = {
           for (let signal of closures)
             signal(component.scope, CLEAN);
       }
-      args(scope, input);
+      applyArgs(scope, args);
     }), !existing)
       return scope.a === scope.b ? scope.a : scope.a.parentNode;
   }

package/dist/dom.mjs

@@ -302,8 +302,8 @@ var tagVarSignal = (scope, valueOrOp) => scope["/" /* TagVariable */]?.(valueOrO
 function setTagVarChange(scope, changeHandler) {
   scope["@" /* TagVariableChange */] = changeHandler;
 }
-var tagVarSignalChange = (scope, value2) => scope["@" /* TagVariableChange */]?.(value2), renderBodyClosures = (renderBody, childScope, op) => {
-  let signals = renderBody?.c;
+var tagVarSignalChange = (scope, value2) => scope["@" /* TagVariableChange */]?.(value2), contentClosures = (content, childScope, op) => {
+  let signals = content?.c;
   if (signals)
     for (let signal of signals)
       signal(childScope, op);
@@ -428,7 +428,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
@@ -838,7 +838,7 @@ function attrsInternal(scope, nodeAccessor, nextAttrs) {
       case "style":
         styleAttr(el, value2);
         break;
-      case "renderBody":
+      case "content":
         break;
       default:
         isEventHandler(name) ? (events ||= scope[nodeAccessor + "~" /* EventAttributes */] = {})[getEventHandlerName(name)] = value2 : skip?.test(name) || attr(el, name, value2);
@@ -967,7 +967,7 @@ function initRenderer(renderer, scope) {
     scope
   ), scope.a = dom.nodeType === 11 /* DocumentFragment */ ? dom.firstChild : dom, scope.b = dom.nodeType === 11 /* DocumentFragment */ ? dom.lastChild : dom, renderer.s && renderer.s(scope), dom;
 }
-function dynamicTagAttrs(nodeAccessor, getRenderBody, inputIsArgs) {
+function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
   return (scope, attrsOrOp) => {
     let renderer = scope[nodeAccessor + "(" /* ConditionalRenderer */];
     if (!renderer || attrsOrOp === DIRTY)
@@ -975,17 +975,17 @@ function dynamicTagAttrs(nodeAccessor, getRenderBody, inputIsArgs) {
     let childScope = scope[nodeAccessor + "!" /* ConditionalScope */];
     if (attrsOrOp === MARK || attrsOrOp === CLEAN)
       return renderer.e?.(childScope, attrsOrOp);
-    let renderBody = getRenderBody?.(scope);
+    let content = getContent?.(scope);
     if (typeof renderer == "string")
-      setConditionalRendererOnlyChild(childScope, 0, renderBody), attrs(childScope, 0, attrsOrOp());
+      setConditionalRendererOnlyChild(childScope, 0, content), attrs(childScope, 0, attrsOrOp());
     else if (renderer.e) {
       let attributes = attrsOrOp();
       renderer.e(
         childScope,
         inputIsArgs ? attributes : [
-          renderBody ? {
+          content ? {
             ...attributes,
-            renderBody
+            content
           } : attributes
         ]
       );
@@ -1038,7 +1038,7 @@ var conditional = function(nodeAccessor, fn, getIntersection) {
       let normalizedRenderer = normalizeDynamicRenderer(newRendererOrOp);
       isDifferentRenderer(normalizedRenderer, currentRenderer) ? (currentRenderer = scope[rendererAccessor] = normalizedRenderer, setConditionalRenderer(scope, nodeAccessor, normalizedRenderer), fn && fn(scope), op = DIRTY) : op = CLEAN;
     }
-    intersection2?.(scope, op), renderBodyClosures(currentRenderer, scope[childScopeAccessor], op);
+    intersection2?.(scope, op), contentClosures(currentRenderer, scope[childScopeAccessor], op);
   };
 };
 function inConditionalScope(signal, nodeAccessor) {
@@ -1076,7 +1076,7 @@ var conditionalOnlyChild = function(nodeAccessor, fn, getIntersection) {
         normalizedRenderer
       ), fn && fn(scope), op = DIRTY) : op = CLEAN;
     }
-    intersection2?.(scope, op), renderBodyClosures(currentRenderer, scope[childScopeAccessor], op);
+    intersection2?.(scope, op), contentClosures(currentRenderer, scope[childScopeAccessor], op);
   };
 };
 function setConditionalRendererOnlyChild(scope, nodeAccessor, newRenderer) {
@@ -1214,13 +1214,18 @@ var classIdToScope = /* @__PURE__ */ new Map(), compat = {
     );
     return renderer.k = clone, renderer;
   },
-  render(out, component, renderer, input) {
+  render(out, component, renderer, args) {
     let scope = component.scope;
     scope || (scope = classIdToScope.get(component.id), scope && (component.scope = scope, classIdToScope.delete(component.id)));
-    let args = renderer.e || noop, existing = !1;
+    let applyArgs = renderer.e || noop, existing = !1;
+    if (typeof args[0] == "object" && "renderBody" in args[0]) {
+      let input = args[0], normalizedInput = args[0] = {};
+      for (let key in input)
+        normalizedInput[key === "renderBody" ? "content" : key] = input[key];
+    }
     if (component.effects = prepareEffects(() => {
       if (scope)
-        args(scope, MARK), existing = !0;
+        applyArgs(scope, MARK), existing = !0;
       else {
         scope = component.scope = createScopeWithRenderer(renderer, out.global);
         let closures = renderer.c;
@@ -1228,7 +1233,7 @@ var classIdToScope = /* @__PURE__ */ new Map(), compat = {
           for (let signal of closures)
             signal(component.scope, CLEAN);
       }
-      args(scope, input);
+      applyArgs(scope, args);
     }), !existing)
       return scope.a === scope.b ? scope.a : scope.a.parentNode;
   }

package/dist/html/attrs.d.ts

@@ -2,7 +2,7 @@ import { type Accessor } from "../common/types";
 export declare function classAttr(val: unknown): string;
 export declare function styleAttr(val: unknown): string;
 export declare function optionValueAttr(value: unknown): string;
-export declare function controllable_select_value(scopeId: number, nodeAccessor: Accessor, value: unknown, valueChange: unknown, renderBody?: () => void): void;
+export declare function controllable_select_value(scopeId: number, nodeAccessor: Accessor, value: unknown, valueChange: unknown, content?: () => void): void;
 export declare function controllable_textarea_value(scopeId: number, nodeAccessor: Accessor, value: unknown, valueChange: unknown): string;
 export declare function controllable_input_value(scopeId: number, nodeAccessor: Accessor, value: unknown, valueChange: unknown): string;
 export declare function controllable_input_checked(scopeId: number, nodeAccessor: Accessor, checked: unknown, checkedChange: unknown): string;

package/dist/html/dynamic-tag.d.ts

@@ -1,11 +1,11 @@
 import type { ServerRenderer } from "./template";
 import { type PartialScope } from "./writer";
-interface RenderBodyObject {
+interface BodyContentObject {
     [x: PropertyKey]: unknown;
-    renderBody: ServerRenderer;
+    content: ServerRenderer;
 }
-export declare function dynamicTagInput(scope: PartialScope, tag: unknown | string | ServerRenderer | RenderBodyObject, input: Record<string, unknown>, renderBody?: () => void, tagVar?: unknown): unknown;
-export declare function dynamicTagArgs(scope: PartialScope, tag: unknown | string | ServerRenderer | RenderBodyObject, args: unknown[]): unknown;
+export declare function dynamicTagInput(scope: PartialScope, tag: unknown | string | ServerRenderer | BodyContentObject, input: Record<string, unknown>, content?: () => void, tagVar?: unknown): unknown;
+export declare function dynamicTagArgs(scope: PartialScope, tag: unknown | string | ServerRenderer | BodyContentObject, args: unknown[]): unknown;
 declare let getDynamicRenderer: (value: any) => string | ServerRenderer | undefined;
 export declare let createRenderer: (fn: ServerRenderer) => ServerRenderer;
 export declare function patchDynamicTag(newGetDynamicRenderer: typeof getDynamicRenderer, newCreateRenderer: typeof createRenderer): void;

package/dist/html/writer.d.ts

@@ -40,9 +40,9 @@ export declare function $global(): $Global & {
     renderId: string;
     runtimeId: string;
 };
-export declare function fork<T>(promise: Promise<T> | T, renderBody: (value: T) => void): void;
-export declare function tryPlaceholder(renderBody: () => void, renderPlaceholder: () => void): void;
-export declare function tryCatch(renderBody: () => void, renderCatch: (err: unknown) => void): void;
+export declare function fork<T>(promise: Promise<T> | T, content: (value: T) => void): void;
+export declare function tryPlaceholder(content: () => void, placeholder: () => void): void;
+export declare function tryCatch(content: () => void, catchContent: (err: unknown) => void): void;
 export declare class State {
     $global: $Global & {
         renderId: string;
@@ -102,8 +102,8 @@ export declare class Chunk {
     append(chunk: Chunk): void;
     flushPlaceholder(): void;
     consume(): Chunk;
-    render(renderBody: () => void): Chunk;
-    render<T>(renderBody: (val: T) => void, val: T): Chunk;
+    render(content: () => void): Chunk;
+    render<T>(content: (val: T) => void, val: T): Chunk;
 }
 export declare function prepareChunk(chunk: Chunk): Chunk;
 export declare function flushChunk(head: Chunk, last: boolean): string;

package/dist/html.js

@@ -129,7 +129,7 @@ function isVoid(value) {
   return value == null || value === !1;
 }
 function normalizeDynamicRenderer(value) {
-  if (value) return value.renderBody || value.default || value;
+  if (value) return value.content || value.default || value;
 }
 
 // src/html/content.ts
@@ -1043,33 +1043,33 @@ 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;
   }
   let chunk = $chunk, { boundary } = chunk;
   chunk.next = $chunk = new Chunk(boundary, chunk.next, chunk.context), chunk.async = !0, chunk.context?.[kPendingContexts] && (chunk.context = { ...chunk.context, [kPendingContexts]: 0 }), boundary.startAsync(), promise.then(
     (value) => {
-      chunk.async && (chunk.async = !1, boundary.signal.aborted || (chunk.render(renderBody, value), boundary.endAsync(chunk)));
+      chunk.async && (chunk.async = !1, boundary.signal.aborted || (chunk.render(content, value), boundary.endAsync(chunk)));
     },
     (err) => {
       chunk.async = !1, boundary.abort(err);
     }
   );
 }
-function tryPlaceholder(renderBody, renderPlaceholder) {
+function tryPlaceholder(content, placeholder) {
   let chunk = $chunk, { boundary } = chunk, 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.next = $chunk = new Chunk(boundary, chunk.next, body.context), chunk.placeholderBody = body, chunk.placeholderRender = placeholder;
 }
-function tryCatch(renderBody, renderCatch) {
-  let chunk = $chunk, { boundary } = chunk, { state } = boundary, catchBoundary = new Boundary(state), body = new Chunk(catchBoundary, null, chunk.context), bodyEnd = body.render(renderBody);
+function tryCatch(content, catchContent) {
+  let chunk = $chunk, { boundary } = chunk, { state } = boundary, catchBoundary = new Boundary(state), body = new Chunk(catchBoundary, null, chunk.context), bodyEnd = body.render(content);
   if (catchBoundary.signal.aborted) {
-    renderCatch(catchBoundary.signal.reason);
+    catchContent(catchBoundary.signal.reason);
     return;
   }
   if (body === bodyEnd) {
@@ -1088,7 +1088,7 @@ function tryCatch(renderBody, renderCatch) {
           } while (cur !== bodyNext);
         }
         let catchChunk = new Chunk(boundary, null, chunk.context);
-        catchChunk.reorderId = reorderId, catchChunk.render(renderCatch, catchBoundary.signal.reason), state.reorder(catchChunk), boundary.endAsync();
+        catchChunk.reorderId = reorderId, catchChunk.render(catchContent, catchBoundary.signal.reason), state.reorder(catchChunk), boundary.endAsync();
       } else catchBoundary.done ? boundary.endAsync() : boundary.onNext();
   };
 }
@@ -1208,11 +1208,11 @@ var State2 = class {
     }
     return cur;
   }
-  render(renderBody, val) {
+  render(content, val) {
     let prev = $chunk;
     $chunk = this;
     try {
-      return renderBody(val), $chunk;
+      return content(val), $chunk;
     } catch (err) {
       return this.boundary.abort(err), this;
     } finally {
@@ -1320,14 +1320,14 @@ 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) {
   valueChange && writeControlledScope(
     3 /* SelectValue */,
     scopeId,
     nodeAccessor,
     value,
     valueChange
-  ), renderBody && withContext(kSelectedValue, value, renderBody);
+  ), content && withContext(kSelectedValue, value, content);
 }
 function controllable_textarea_value(scopeId, nodeAccessor, value, valueChange) {
   return valueChange && writeControlledScope(
@@ -1435,7 +1435,7 @@ function attrs(data, nodeAccessor, scopeId, tagName) {
         result += styleAttr(val);
         break;
       case "":
-      case "renderBody":
+      case "content":
         break;
       default:
         isVoid(val) || (isEventHandler(name) ? (events || (events = {}, writeScope(scopeId, {
@@ -1497,8 +1497,8 @@ var DEFAULT_RUNTIME_ID = "M", 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;
+function dynamicTagInput(scope, tag, input, content, tagVar) {
+  if (!tag && !content) return;
   let scopeId = getScopeId(scope);
   return write(`${markResumeScopeStart(scopeId)}`), writeScope(scopeId, scope), tag ? typeof tag == "string" ? (nextScopeId(), write(
     `<${tag}${attrs(input, 0, scopeId, tag)}>`
@@ -1509,13 +1509,13 @@ function dynamicTagInput(scope, tag, input, renderBody, tagVar) {
       input.value,
       input.valueChange
     )
-  ) : renderBody && (tag === "select" && ("value" in input || "valueChange" in input) ? controllable_select_value(
+  ) : content && (tag === "select" && ("value" in input || "valueChange" in input) ? controllable_select_value(
     scopeId,
     0,
     input.value,
     input.valueChange,
-    renderBody
-  ) : renderBody()), write(`</${tag}>`)), null) : getDynamicRenderer(tag)(renderBody ? { ...input, renderBody } : input, tagVar) : renderBody();
+    content
+  ) : content()), write(`</${tag}>`)), null) : getDynamicRenderer(tag)(content ? { ...input, content } : input, tagVar) : content();
 }
 function dynamicTagArgs(scope, tag, args) {
   if (!tag) return;
@@ -1565,13 +1565,18 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
       boundary,
       null,
       null
-    );
+    ), normalizedInput = input;
+    if ("renderBody" in input) {
+      normalizedInput = {};
+      for (let key in input)
+        normalizedInput[key === "renderBody" ? "content" : key] = input[key];
+    }
     head.render(() => {
       if (willRerender) {
         let scopeId = peekNextScopeId();
         writeScope(scopeId, { m5c: component.id }), writeEffect(scopeId, SET_SCOPE_REGISTER_ID);
       }
-      renderer(input);
+      renderer(normalizedInput);
     });
     let asyncOut = classAPIOut.beginAsync();
     (boundary.onNext = () => {

package/dist/html.mjs

@@ -56,7 +56,7 @@ function isVoid(value) {
   return value == null || value === !1;
 }
 function normalizeDynamicRenderer(value) {
-  if (value) return value.renderBody || value.default || value;
+  if (value) return value.content || value.default || value;
 }
 
 // src/html/content.ts
@@ -970,33 +970,33 @@ 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;
   }
   let chunk = $chunk, { boundary } = chunk;
   chunk.next = $chunk = new Chunk(boundary, chunk.next, chunk.context), chunk.async = !0, chunk.context?.[kPendingContexts] && (chunk.context = { ...chunk.context, [kPendingContexts]: 0 }), boundary.startAsync(), promise.then(
     (value) => {
-      chunk.async && (chunk.async = !1, boundary.signal.aborted || (chunk.render(renderBody, value), boundary.endAsync(chunk)));
+      chunk.async && (chunk.async = !1, boundary.signal.aborted || (chunk.render(content, value), boundary.endAsync(chunk)));
     },
     (err) => {
       chunk.async = !1, boundary.abort(err);
     }
   );
 }
-function tryPlaceholder(renderBody, renderPlaceholder) {
+function tryPlaceholder(content, placeholder) {
   let chunk = $chunk, { boundary } = chunk, 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.next = $chunk = new Chunk(boundary, chunk.next, body.context), chunk.placeholderBody = body, chunk.placeholderRender = placeholder;
 }
-function tryCatch(renderBody, renderCatch) {
-  let chunk = $chunk, { boundary } = chunk, { state } = boundary, catchBoundary = new Boundary(state), body = new Chunk(catchBoundary, null, chunk.context), bodyEnd = body.render(renderBody);
+function tryCatch(content, catchContent) {
+  let chunk = $chunk, { boundary } = chunk, { state } = boundary, catchBoundary = new Boundary(state), body = new Chunk(catchBoundary, null, chunk.context), bodyEnd = body.render(content);
   if (catchBoundary.signal.aborted) {
-    renderCatch(catchBoundary.signal.reason);
+    catchContent(catchBoundary.signal.reason);
     return;
   }
   if (body === bodyEnd) {
@@ -1015,7 +1015,7 @@ function tryCatch(renderBody, renderCatch) {
           } while (cur !== bodyNext);
         }
         let catchChunk = new Chunk(boundary, null, chunk.context);
-        catchChunk.reorderId = reorderId, catchChunk.render(renderCatch, catchBoundary.signal.reason), state.reorder(catchChunk), boundary.endAsync();
+        catchChunk.reorderId = reorderId, catchChunk.render(catchContent, catchBoundary.signal.reason), state.reorder(catchChunk), boundary.endAsync();
       } else catchBoundary.done ? boundary.endAsync() : boundary.onNext();
   };
 }
@@ -1135,11 +1135,11 @@ var State2 = class {
     }
     return cur;
   }
-  render(renderBody, val) {
+  render(content, val) {
     let prev = $chunk;
     $chunk = this;
     try {
-      return renderBody(val), $chunk;
+      return content(val), $chunk;
     } catch (err) {
       return this.boundary.abort(err), this;
     } finally {
@@ -1247,14 +1247,14 @@ 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) {
   valueChange && writeControlledScope(
     3 /* SelectValue */,
     scopeId,
     nodeAccessor,
     value,
     valueChange
-  ), renderBody && withContext(kSelectedValue, value, renderBody);
+  ), content && withContext(kSelectedValue, value, content);
 }
 function controllable_textarea_value(scopeId, nodeAccessor, value, valueChange) {
   return valueChange && writeControlledScope(
@@ -1362,7 +1362,7 @@ function attrs(data, nodeAccessor, scopeId, tagName) {
         result += styleAttr(val);
         break;
       case "":
-      case "renderBody":
+      case "content":
         break;
       default:
         isVoid(val) || (isEventHandler(name) ? (events || (events = {}, writeScope(scopeId, {
@@ -1424,8 +1424,8 @@ var DEFAULT_RUNTIME_ID = "M", 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;
+function dynamicTagInput(scope, tag, input, content, tagVar) {
+  if (!tag && !content) return;
   let scopeId = getScopeId(scope);
   return write(`${markResumeScopeStart(scopeId)}`), writeScope(scopeId, scope), tag ? typeof tag == "string" ? (nextScopeId(), write(
     `<${tag}${attrs(input, 0, scopeId, tag)}>`
@@ -1436,13 +1436,13 @@ function dynamicTagInput(scope, tag, input, renderBody, tagVar) {
       input.value,
       input.valueChange
     )
-  ) : renderBody && (tag === "select" && ("value" in input || "valueChange" in input) ? controllable_select_value(
+  ) : content && (tag === "select" && ("value" in input || "valueChange" in input) ? controllable_select_value(
     scopeId,
     0,
     input.value,
     input.valueChange,
-    renderBody
-  ) : renderBody()), write(`</${tag}>`)), null) : getDynamicRenderer(tag)(renderBody ? { ...input, renderBody } : input, tagVar) : renderBody();
+    content
+  ) : content()), write(`</${tag}>`)), null) : getDynamicRenderer(tag)(content ? { ...input, content } : input, tagVar) : content();
 }
 function dynamicTagArgs(scope, tag, args) {
   if (!tag) return;
@@ -1492,13 +1492,18 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
       boundary,
       null,
       null
-    );
+    ), normalizedInput = input;
+    if ("renderBody" in input) {
+      normalizedInput = {};
+      for (let key in input)
+        normalizedInput[key === "renderBody" ? "content" : key] = input[key];
+    }
     head.render(() => {
       if (willRerender) {
         let scopeId = peekNextScopeId();
         writeScope(scopeId, { m5c: component.id }), writeEffect(scopeId, SET_SCOPE_REGISTER_ID);
       }
-      renderer(input);
+      renderer(normalizedInput);
     });
     let asyncOut = classAPIOut.beginAsync();
     (boundary.onNext = () => {

package/dist/translator/index.d.ts

@@ -1,5 +1,7 @@
 import type { Config } from "@marko/compiler";
+export declare const tagDiscoveryDirs: string[];
 export { default as internalEntryBuilder } from "./util/entry-builder";
+export declare const preferAPI = "tags";
 export declare const transform: import("@marko/compiler/babel-types").Visitor<unknown>, analyze: import("@marko/compiler/babel-types").Visitor<unknown>, translate: import("@marko/compiler/babel-types").Visitor<unknown>;
 export declare const taglibs: (string | {
     migrate: import("@marko/compiler/babel-types").Visitor<unknown>;