marko 6.0.0-3.8 → 6.0.0-next.3.15

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>;