marko 6.0.39 → 6.0.41

package/dist/debug/html.js

@@ -71,8 +71,11 @@ __export(html_exports, {
   toString: () => toString,
   tryContent: () => tryContent,
   write: () => write,
+  writeAttrsAndContent: () => writeAttrsAndContent,
+  writeContent: () => writeContent,
   writeEffect: () => writeEffect,
   writeExistingScope: () => writeExistingScope,
+  writePartialAttrsAndContent: () => writePartialAttrsAndContent,
   writeScope: () => writeScope,
   writeSubscribe: () => writeSubscribe,
   writeTrailers: () => writeTrailers
@@ -1698,6 +1701,44 @@ function writeEffect(scopeId, registryId) {
   $chunk.boundary.state.needsMainRuntime = true;
   $chunk.writeEffect(scopeId, registryId);
 }
+function writeContent(nodeAccessor, scopeId, content, serializeReason) {
+  const shouldResume = serializeReason !== 0;
+  const render2 = normalizeServerRender(content);
+  const branchId = peekNextScopeId();
+  if (render2) {
+    if (shouldResume) {
+      withBranchId(branchId, render2);
+    } else {
+      render2();
+    }
+  }
+  const rendered = peekNextScopeId() !== branchId;
+  if (rendered) {
+    if (shouldResume) {
+      writeScope(scopeId, {
+        ["ConditionalScope:" /* ConditionalScope */ + nodeAccessor]: writeScope(
+          branchId,
+          {}
+        ),
+        ["ConditionalRenderer:" /* ConditionalRenderer */ + nodeAccessor]: render2?.___id
+      });
+    }
+  } else {
+    nextScopeId();
+  }
+}
+function normalizeServerRender(value) {
+  const renderer = normalizeDynamicRenderer(value);
+  if (renderer) {
+    if (typeof renderer === "function") {
+      return renderer;
+    } else if (true) {
+      throw new Error(
+        `Invalid \`content\` attribute. Received ${typeof value}`
+      );
+    }
+  }
+}
 var kPendingContexts = Symbol("Pending Contexts");
 function withContext(key, value, cb) {
   const ctx = $chunk.context ||= { [kPendingContexts]: 0 };
@@ -2757,6 +2798,10 @@ function attrs(data, nodeAccessor, scopeId, tagName) {
   }
   return result;
 }
+function writeAttrsAndContent(data, nodeAccessor, scopeId, tagName, serializeReason) {
+  write(`${attrs(data, nodeAccessor, scopeId, tagName)}>`);
+  writeContent(nodeAccessor, scopeId, data?.content, serializeReason);
+}
 function partialAttrs(data, skip, nodeAccessor, scopeId, tagName) {
   const partial = {};
   for (const key in data) {
@@ -2764,6 +2809,10 @@ function partialAttrs(data, skip, nodeAccessor, scopeId, tagName) {
   }
   return attrs(partial, nodeAccessor, scopeId, tagName);
 }
+function writePartialAttrsAndContent(data, skip, nodeAccessor, scopeId, tagName, serializeReason) {
+  write(`${partialAttrs(data, skip, nodeAccessor, scopeId, tagName)}>`);
+  writeContent(nodeAccessor, scopeId, data?.content, serializeReason);
+}
 function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange) {
   writeScope(scopeId, {
     ["ControlledType:" /* ControlledType */ + nodeAccessor]: type,
@@ -3067,6 +3116,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, ser
   let result;
   if (typeof renderer === "string") {
     const input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
+    const renderContent = content || normalizeDynamicRenderer(input.content);
     nextScopeId();
     write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`);
     if (!voidElementsReg.test(renderer)) {
@@ -3085,17 +3135,22 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, ser
               input.valueChange
             )
           );
-        } else if (content) {
+        } else if (renderContent) {
+          if (typeof renderContent !== "function") {
+            throw new Error(
+              `Body content is not supported for the \`<${renderer}>\` tag.`
+            );
+          }
           if (renderer === "select" && ("value" in input || "valueChange" in input)) {
             controllable_select_value(
               scopeId,
               accessor,
               input.value,
               input.valueChange,
-              content
+              renderContent
             );
           } else {
-            content();
+            renderContent();
           }
         }
       };
@@ -3106,7 +3161,9 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, ser
       }
       write(`</${renderer}>`);
     } else if (content) {
-      throw new Error(`Body content is not supported for a "${renderer}" tag.`);
+      throw new Error(
+        `Body content is not supported for the \`<${renderer}>\` tag.`
+      );
     }
     if (shouldResume) {
       write(
@@ -3323,8 +3380,11 @@ var compat = {
   toString,
   tryContent,
   write,
+  writeAttrsAndContent,
+  writeContent,
   writeEffect,
   writeExistingScope,
+  writePartialAttrsAndContent,
   writeScope,
   writeSubscribe,
   writeTrailers

package/dist/debug/html.mjs

@@ -1617,6 +1617,44 @@ function writeEffect(scopeId, registryId) {
   $chunk.boundary.state.needsMainRuntime = true;
   $chunk.writeEffect(scopeId, registryId);
 }
+function writeContent(nodeAccessor, scopeId, content, serializeReason) {
+  const shouldResume = serializeReason !== 0;
+  const render2 = normalizeServerRender(content);
+  const branchId = peekNextScopeId();
+  if (render2) {
+    if (shouldResume) {
+      withBranchId(branchId, render2);
+    } else {
+      render2();
+    }
+  }
+  const rendered = peekNextScopeId() !== branchId;
+  if (rendered) {
+    if (shouldResume) {
+      writeScope(scopeId, {
+        ["ConditionalScope:" /* ConditionalScope */ + nodeAccessor]: writeScope(
+          branchId,
+          {}
+        ),
+        ["ConditionalRenderer:" /* ConditionalRenderer */ + nodeAccessor]: render2?.___id
+      });
+    }
+  } else {
+    nextScopeId();
+  }
+}
+function normalizeServerRender(value) {
+  const renderer = normalizeDynamicRenderer(value);
+  if (renderer) {
+    if (typeof renderer === "function") {
+      return renderer;
+    } else if (true) {
+      throw new Error(
+        `Invalid \`content\` attribute. Received ${typeof value}`
+      );
+    }
+  }
+}
 var kPendingContexts = Symbol("Pending Contexts");
 function withContext(key, value, cb) {
   const ctx = $chunk.context ||= { [kPendingContexts]: 0 };
@@ -2676,6 +2714,10 @@ function attrs(data, nodeAccessor, scopeId, tagName) {
   }
   return result;
 }
+function writeAttrsAndContent(data, nodeAccessor, scopeId, tagName, serializeReason) {
+  write(`${attrs(data, nodeAccessor, scopeId, tagName)}>`);
+  writeContent(nodeAccessor, scopeId, data?.content, serializeReason);
+}
 function partialAttrs(data, skip, nodeAccessor, scopeId, tagName) {
   const partial = {};
   for (const key in data) {
@@ -2683,6 +2725,10 @@ function partialAttrs(data, skip, nodeAccessor, scopeId, tagName) {
   }
   return attrs(partial, nodeAccessor, scopeId, tagName);
 }
+function writePartialAttrsAndContent(data, skip, nodeAccessor, scopeId, tagName, serializeReason) {
+  write(`${partialAttrs(data, skip, nodeAccessor, scopeId, tagName)}>`);
+  writeContent(nodeAccessor, scopeId, data?.content, serializeReason);
+}
 function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange) {
   writeScope(scopeId, {
     ["ControlledType:" /* ControlledType */ + nodeAccessor]: type,
@@ -2986,6 +3032,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, ser
   let result;
   if (typeof renderer === "string") {
     const input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
+    const renderContent = content || normalizeDynamicRenderer(input.content);
     nextScopeId();
     write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`);
     if (!voidElementsReg.test(renderer)) {
@@ -3004,17 +3051,22 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, ser
               input.valueChange
             )
           );
-        } else if (content) {
+        } else if (renderContent) {
+          if (typeof renderContent !== "function") {
+            throw new Error(
+              `Body content is not supported for the \`<${renderer}>\` tag.`
+            );
+          }
           if (renderer === "select" && ("value" in input || "valueChange" in input)) {
             controllable_select_value(
               scopeId,
               accessor,
               input.value,
               input.valueChange,
-              content
+              renderContent
             );
           } else {
-            content();
+            renderContent();
           }
         }
       };
@@ -3025,7 +3077,9 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, ser
       }
       write(`</${renderer}>`);
     } else if (content) {
-      throw new Error(`Body content is not supported for a "${renderer}" tag.`);
+      throw new Error(
+        `Body content is not supported for the \`<${renderer}>\` tag.`
+      );
     }
     if (shouldResume) {
       write(
@@ -3241,8 +3295,11 @@ export {
   toString,
   tryContent,
   write,
+  writeAttrsAndContent,
+  writeContent,
   writeEffect,
   writeExistingScope,
+  writePartialAttrsAndContent,
   writeScope,
   writeSubscribe,
   writeTrailers

package/dist/dom/dom.d.ts

@@ -1,4 +1,5 @@
 import { type Accessor, type Scope } from "../common/types";
+import { type Renderer } from "./renderer";
 export declare function attr(element: Element, name: string, value: unknown): void;
 export declare function setAttribute(element: Element, name: string, value: string | undefined): void;
 export declare function classAttr(element: Element, value: unknown): void;
@@ -10,9 +11,13 @@ export declare function styleItem(element: HTMLElement, name: string, value: unk
 export declare function data(node: Text | Comment, value: unknown): void;
 export declare function textContent(node: ParentNode, value: unknown): void;
 export declare function attrs(scope: Scope, nodeAccessor: Accessor, nextAttrs: Record<string, unknown>): void;
+export declare function attrsAndContent(scope: Scope, nodeAccessor: Accessor, nextAttrs: Record<string, unknown>): void;
 export declare function partialAttrs(scope: Scope, nodeAccessor: Accessor, nextAttrs: Record<string, unknown>, skip: Record<string, 1>): void;
+export declare function partialAttrsAndContent(scope: Scope, nodeAccessor: Accessor, nextAttrs: Record<string, unknown>, skip: Record<string, 1>): void;
+export declare function insertContent(scope: Scope, nodeAccessor: Accessor, value: unknown): void;
 export declare function attrsEvents(scope: Scope, nodeAccessor: Accessor): void;
 export declare function html(scope: Scope, value: unknown, accessor: Accessor): void;
+export declare function normalizeClientRender(value: any): Renderer | undefined;
 export declare function props(scope: Scope, nodeIndex: number, index: number): void;
 export declare function normalizeAttrValue(value: unknown): string | undefined;
 export declare function lifecycle(scope: Scope, index: string | number, thisObj: Record<string, unknown> & {

package/dist/dom.d.ts

@@ -4,7 +4,7 @@ export { getAbortSignal, resetAbortSignal } from "./dom/abort-signal";
 export { compat } from "./dom/compat";
 export { awaitTag, conditional, createTry, dynamicTag, loopIn, loopOf, loopTo, } from "./dom/control-flow";
 export { controllable_detailsOrDialog_open, controllable_detailsOrDialog_open_effect, controllable_input_checked, controllable_input_checked_effect, controllable_input_checkedValue, controllable_input_checkedValue_effect, controllable_input_value, controllable_input_value_effect, controllable_select_value, controllable_select_value_effect, controllable_textarea_value, controllable_textarea_value_effect, } from "./dom/controllable";
-export { attr, attrs, attrsEvents, classAttr, classItem, classItems, data, html, lifecycle, partialAttrs, props, styleAttr, styleItem, styleItems, textContent, } from "./dom/dom";
+export { attr, attrs, attrsAndContent, attrsEvents, classAttr, classItem, classItems, data, html, insertContent, lifecycle, partialAttrs, partialAttrsAndContent, props, styleAttr, styleItem, styleItems, textContent, } from "./dom/dom";
 export { on } from "./dom/event";
 export { enableCatch, run } from "./dom/queue";
 export { createContent, createRenderer, localClosures, registerContent, } from "./dom/renderer";