marko 6.0.40 → 6.0.42

package/dist/html/attrs.d.ts

@@ -10,7 +10,9 @@ export declare function controllable_input_checkedValue(scopeId: number, nodeAcc
 export declare function controllable_detailsOrDialog_open(scopeId: number, nodeAccessor: Accessor, open: unknown, openChange: unknown): string;
 export declare function attr(name: string, value: unknown): string;
 export declare function attrs(data: Record<string, unknown>, nodeAccessor: Accessor, scopeId: number, tagName: string): string;
+export declare function writeAttrsAndContent(data: Record<string, unknown>, nodeAccessor: Accessor, scopeId: number, tagName: string, serializeReason?: 1 | 0): void;
 export declare function partialAttrs(data: Record<string, unknown>, skip: Record<string, 1>, nodeAccessor: Accessor, scopeId: number, tagName: string): string;
+export declare function writePartialAttrsAndContent(data: Record<string, unknown>, skip: Record<string, 1>, nodeAccessor: Accessor, scopeId: number, tagName: string, serializeReason?: 1 | 0): void;
 export declare function attrAssignment(value: string): string;
 export declare function escapeSingleQuotedAttrValue(value: string): string;
 export declare function escapeDoubleQuotedAttrValue(value: string): string;

package/dist/html/writer.d.ts

@@ -1,5 +1,6 @@
 import { type $Global, type Accessor, type Falsy, ResumeSymbol } from "../common/types";
 import { Serializer } from "./serializer";
+import type { ServerRenderer } from "./template";
 export type PartialScope = Record<Accessor, unknown>;
 type ScopeInternals = PartialScope & {
     [K_SCOPE_ID]?: number;
@@ -17,6 +18,8 @@ export declare function getScopeId(scope: unknown): number | undefined;
 export declare function write(html: string): void;
 export declare function writeScript(script: string): void;
 export declare function writeEffect(scopeId: number, registryId: string): void;
+export declare function writeContent(nodeAccessor: Accessor, scopeId: number, content: unknown, serializeReason?: 1 | 0): void;
+export declare function normalizeServerRender(value: unknown): ServerRenderer | undefined;
 export declare function withContext<T>(key: PropertyKey, value: unknown, cb: () => T): T;
 export declare function setTagVar(parentScopeId: number, scopeOffsetAccessor: Accessor, childScopeId: number, registryId: string): void;
 export declare function register<T extends WeakKey>(val: T, id: string, scopeId?: number): T;

package/dist/html.d.ts

@@ -1,8 +1,8 @@
 export { attrTag, attrTags } from "./common/attr-tag";
-export { attr, attrs, classAttr, controllable_detailsOrDialog_open, controllable_input_checked, controllable_input_checkedValue, controllable_input_value, controllable_select_value, controllable_textarea_value, optionValueAttr, partialAttrs, styleAttr, } from "./html/attrs";
+export { attr, attrs, classAttr, controllable_detailsOrDialog_open, controllable_input_checked, controllable_input_checkedValue, controllable_input_value, controllable_select_value, controllable_textarea_value, optionValueAttr, partialAttrs, styleAttr, writeAttrsAndContent, writePartialAttrsAndContent, } from "./html/attrs";
 export { compat } from "./html/compat";
 export { escapeScript, escapeStyle, escapeXML, toString } from "./html/content";
 export { createContent, dynamicTag, registerContent } from "./html/dynamic-tag";
 export { forIn, forInBy, forOf, forOfBy, forTo, forToBy } from "./html/for";
 export { createTemplate } from "./html/template";
-export { $global, commentSeparator, ensureScopeWithId, fork, getScopeById, hoist, markResumeNode, nextScopeId, nextTagId, nodeRef, peekNextScopeId, register, resumeClosestBranch, resumeConditional, resumeForIn, resumeForOf, resumeForTo, serializeGuard, serializeIf, setTagVar, tryContent, write, writeEffect, writeExistingScope, writeScope, writeSubscribe, writeTrailers, } from "./html/writer";
+export { $global, commentSeparator, ensureScopeWithId, fork, getScopeById, hoist, markResumeNode, nextScopeId, nextTagId, nodeRef, peekNextScopeId, register, resumeClosestBranch, resumeConditional, resumeForIn, resumeForOf, resumeForTo, serializeGuard, serializeIf, setTagVar, tryContent, write, writeContent, writeEffect, writeExistingScope, writeScope, writeSubscribe, writeTrailers, } from "./html/writer";

package/dist/html.js

@@ -68,8 +68,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
@@ -1102,6 +1105,21 @@ function writeScript(script) {
 function writeEffect(scopeId, registryId) {
   $chunk.boundary.state.needsMainRuntime = !0, $chunk.writeEffect(scopeId, registryId);
 }
+function writeContent(nodeAccessor, scopeId, content, serializeReason) {
+  let shouldResume = serializeReason !== 0, render2 = normalizeServerRender(content), branchId = peekNextScopeId();
+  render2 && (shouldResume ? withBranchId(branchId, render2) : render2()), peekNextScopeId() !== branchId ? shouldResume && writeScope(scopeId, {
+    ["d" /* ConditionalScope */ + nodeAccessor]: writeScope(
+      branchId,
+      {}
+    ),
+    ["c" /* ConditionalRenderer */ + nodeAccessor]: render2?.h
+  }) : nextScopeId();
+}
+function normalizeServerRender(value) {
+  let renderer = normalizeDynamicRenderer(value);
+  if (renderer && typeof renderer == "function")
+    return renderer;
+}
 var kPendingContexts = Symbol("Pending Contexts");
 function withContext(key, value, cb) {
   let ctx = $chunk.context ||= { [kPendingContexts]: 0 }, prev = ctx[key];
@@ -1772,12 +1790,18 @@ 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) {
   let partial = {};
   for (let key in data)
     skip[key] || (partial[key] = data[key]);
   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, {
     ["f" /* ControlledType */ + nodeAccessor]: type,
@@ -1981,23 +2005,31 @@ function NOOP2() {
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
   let shouldResume = serializeReason !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = peekNextScopeId(), result;
   if (typeof renderer == "string") {
-    let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
+    let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {}, renderContent = content || normalizeDynamicRenderer(input.content);
     if (nextScopeId(), write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`), !voidElementsReg.test(renderer)) {
       let renderNativeTag = () => {
-        renderer === "textarea" ? write(
-          controllable_textarea_value(
+        if (renderer === "textarea")
+          write(
+            controllable_textarea_value(
+              scopeId,
+              accessor,
+              input.value,
+              input.valueChange
+            )
+          );
+        else if (renderContent) {
+          if (typeof renderContent != "function")
+            throw new Error(
+              `Body content is not supported for the \`<${renderer}>\` tag.`
+            );
+          renderer === "select" && ("value" in input || "valueChange" in input) ? controllable_select_value(
             scopeId,
             accessor,
             input.value,
-            input.valueChange
-          )
-        ) : content && (renderer === "select" && ("value" in input || "valueChange" in input) ? controllable_select_value(
-          scopeId,
-          accessor,
-          input.value,
-          input.valueChange,
-          content
-        ) : content());
+            input.valueChange,
+            renderContent
+          ) : renderContent();
+        }
       };
       shouldResume ? withBranchId(branchId, renderNativeTag) : renderNativeTag(), write(`</${renderer}>`);
     }
@@ -2177,8 +2209,11 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
   toString,
   tryContent,
   write,
+  writeAttrsAndContent,
+  writeContent,
   writeEffect,
   writeExistingScope,
+  writePartialAttrsAndContent,
   writeScope,
   writeSubscribe,
   writeTrailers

package/dist/html.mjs

@@ -1024,6 +1024,21 @@ function writeScript(script) {
 function writeEffect(scopeId, registryId) {
   $chunk.boundary.state.needsMainRuntime = !0, $chunk.writeEffect(scopeId, registryId);
 }
+function writeContent(nodeAccessor, scopeId, content, serializeReason) {
+  let shouldResume = serializeReason !== 0, render2 = normalizeServerRender(content), branchId = peekNextScopeId();
+  render2 && (shouldResume ? withBranchId(branchId, render2) : render2()), peekNextScopeId() !== branchId ? shouldResume && writeScope(scopeId, {
+    ["d" /* ConditionalScope */ + nodeAccessor]: writeScope(
+      branchId,
+      {}
+    ),
+    ["c" /* ConditionalRenderer */ + nodeAccessor]: render2?.h
+  }) : nextScopeId();
+}
+function normalizeServerRender(value) {
+  let renderer = normalizeDynamicRenderer(value);
+  if (renderer && typeof renderer == "function")
+    return renderer;
+}
 var kPendingContexts = Symbol("Pending Contexts");
 function withContext(key, value, cb) {
   let ctx = $chunk.context ||= { [kPendingContexts]: 0 }, prev = ctx[key];
@@ -1694,12 +1709,18 @@ 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) {
   let partial = {};
   for (let key in data)
     skip[key] || (partial[key] = data[key]);
   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, {
     ["f" /* ControlledType */ + nodeAccessor]: type,
@@ -1903,23 +1924,31 @@ function NOOP2() {
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
   let shouldResume = serializeReason !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = peekNextScopeId(), result;
   if (typeof renderer == "string") {
-    let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
+    let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {}, renderContent = content || normalizeDynamicRenderer(input.content);
     if (nextScopeId(), write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`), !voidElementsReg.test(renderer)) {
       let renderNativeTag = () => {
-        renderer === "textarea" ? write(
-          controllable_textarea_value(
+        if (renderer === "textarea")
+          write(
+            controllable_textarea_value(
+              scopeId,
+              accessor,
+              input.value,
+              input.valueChange
+            )
+          );
+        else if (renderContent) {
+          if (typeof renderContent != "function")
+            throw new Error(
+              `Body content is not supported for the \`<${renderer}>\` tag.`
+            );
+          renderer === "select" && ("value" in input || "valueChange" in input) ? controllable_select_value(
             scopeId,
             accessor,
             input.value,
-            input.valueChange
-          )
-        ) : content && (renderer === "select" && ("value" in input || "valueChange" in input) ? controllable_select_value(
-          scopeId,
-          accessor,
-          input.value,
-          input.valueChange,
-          content
-        ) : content());
+            input.valueChange,
+            renderContent
+          ) : renderContent();
+        }
       };
       shouldResume ? withBranchId(branchId, renderNativeTag) : renderNativeTag(), write(`</${renderer}>`);
     }
@@ -2098,8 +2127,11 @@ export {
   toString,
   tryContent,
   write,
+  writeAttrsAndContent,
+  writeContent,
   writeEffect,
   writeExistingScope,
+  writePartialAttrsAndContent,
   writeScope,
   writeSubscribe,
   writeTrailers

package/dist/translator/index.js

@@ -802,6 +802,7 @@ function getFnRoot(path5) {
       fnPath = curPath;
     } else {
       switch (curPath.type) {
+        case "OptionalCallExpression":
         case "CallExpression":
         case "NewExpression":
           fnPath = void 0;
@@ -850,6 +851,7 @@ function isInvokedFunction(expr) {
   while (curPath) {
     const { parent, node } = curPath;
     switch (parent.type) {
+      case "OptionalCallExpression":
       case "CallExpression":
         return parent.callee === node;
       case "TSNonNullExpression":
@@ -3412,24 +3414,33 @@ function generateSignalName(referencedBindings) {
   return name2;
 }
 function replaceNullishAndEmptyFunctionsWith0(args) {
-  for (let i = args.length; i--; ) {
+  const len = args.length;
+  let finalLen = void 0;
+  for (let i = len; i--; ) {
     const arg = args[i];
     if (!arg) {
       args[i] = import_compiler20.types.numericLiteral(0);
-    } else if (import_compiler20.types.isArrowFunctionExpression(arg) && import_compiler20.types.isBlockStatement(arg.body)) {
+      continue;
+    }
+    if (import_compiler20.types.isNullLiteral(arg) || import_compiler20.types.isUnaryExpression(arg) && arg.operator === "void") {
+      args[i] = import_compiler20.types.numericLiteral(0);
+      continue;
+    }
+    if (import_compiler20.types.isArrowFunctionExpression(arg) && import_compiler20.types.isBlockStatement(arg.body)) {
       const body = arg.body.body;
       if (body.length === 0) {
         args[i] = import_compiler20.types.numericLiteral(0);
-      } else if (body.length === 1 && import_compiler20.types.isExpressionStatement(body[0])) {
+        continue;
+      }
+      if (body.length === 1 && import_compiler20.types.isExpressionStatement(body[0])) {
         arg.body = toParenthesizedExpressionIfNeeded(body[0].expression);
       }
-    } else if (import_compiler20.types.isNullLiteral(arg) || import_compiler20.types.isUnaryExpression(arg) && arg.operator === "void") {
-      args[i] = import_compiler20.types.numericLiteral(0);
+    }
+    if (finalLen === void 0) {
+      finalLen = i + 1;
     }
   }
-  for (let i = args.length - 1; import_compiler20.types.isNumericLiteral(args[i]) && args[i].value === 0; ) {
-    args.length = i--;
-  }
+  args.length = finalLen || 0;
   return args;
 }
 function addStatement(type, targetSection, referencedBindings, statement, usedReferences) {
@@ -3949,25 +3960,34 @@ function replaceBindingReadNode2(node) {
     }
   }
 }
+var updateExpressions = /* @__PURE__ */ new WeakSet();
 function replaceAssignedNode(node) {
   switch (node.type) {
+    case "ExpressionStatement": {
+      if (node.expression.type === "SequenceExpression" && updateExpressions.delete(node.expression)) {
+        return node.expression.expressions[0];
+      }
+      break;
+    }
     case "UpdateExpression": {
       const { extra } = node.argument;
       if (isAssignedBindingExtra(extra)) {
         const buildAssignment = getBuildAssignment(extra);
         if (buildAssignment) {
-          const replacement = buildAssignment(
-            extra.section,
-            import_compiler20.types.binaryExpression(
-              node.operator === "++" ? "+" : "-",
-              node.argument,
-              import_compiler20.types.numericLiteral(1)
-            )
-          );
           if (!node.prefix) {
-            return import_compiler20.types.sequenceExpression([replacement, node.argument]);
+            node.prefix = true;
+            const replacement = import_compiler20.types.sequenceExpression([
+              buildAssignment(extra.section, node),
+              import_compiler20.types.binaryExpression(
+                node.operator === "++" ? "-" : "+",
+                node.argument,
+                import_compiler20.types.numericLiteral(1)
+              )
+            ]);
+            updateExpressions.add(replacement);
+            return replacement;
           }
-          return replacement;
+          return buildAssignment(extra.section, node);
         }
       }
       break;
@@ -3979,17 +3999,24 @@ function replaceAssignedNode(node) {
           if (isAssignedBindingExtra(extra)) {
             const buildAssignment = getBuildAssignment(extra);
             if (buildAssignment) {
-              return buildAssignment(
-                extra.section,
-                node.operator === "=" ? node.right : import_compiler20.types.binaryExpression(
-                  node.operator.slice(
-                    0,
-                    -1
-                  ),
-                  node.left,
-                  node.right
-                )
-              );
+              if (bindingUtil.has(
+                extra.fnExtra?.referencedBindingsInFunction,
+                extra.assignment
+              )) {
+                return buildAssignment(extra.section, node);
+              } else {
+                return buildAssignment(
+                  extra.section,
+                  node.operator === "=" ? node.right : import_compiler20.types.binaryExpression(
+                    node.operator.slice(
+                      0,
+                      -1
+                    ),
+                    node.left,
+                    node.right
+                  )
+                );
+              }
             }
           }
           break;
@@ -4003,19 +4030,24 @@ function replaceAssignedNode(node) {
             if (isAssignedBindingExtra(extra)) {
               const buildAssignment = getBuildAssignment(extra);
               if (buildAssignment) {
-                id.name = generateUid(id.name);
-                (params ||= []).push(import_compiler20.types.identifier(id.name));
+                if (!bindingUtil.has(
+                  extra.fnExtra?.referencedBindingsInFunction,
+                  extra.assignment
+                )) {
+                  id.name = generateUid(id.name);
+                  (params ||= []).push(import_compiler20.types.identifier(id.name));
+                }
                 (assignments ||= []).push(
                   buildAssignment(extra.section, import_compiler20.types.identifier(id.name))
                 );
               }
             }
           });
-          if (params && assignments) {
+          if (assignments) {
             const resultId = generateUid("result");
             return import_compiler20.types.callExpression(
               import_compiler20.types.arrowFunctionExpression(
-                [import_compiler20.types.identifier(resultId), ...params],
+                [import_compiler20.types.identifier(resultId), ...params || []],
                 import_compiler20.types.sequenceExpression([
                   import_compiler20.types.assignmentExpression(
                     "=",
@@ -4620,6 +4652,8 @@ function trackReferencesForBinding(babelBinding, binding) {
   }
 }
 function trackAssignment(assignment, binding) {
+  const fnRoot = getFnRoot(assignment);
+  const fnExtra = fnRoot && (fnRoot.node.extra ??= {});
   const section = getOrCreateSection(assignment);
   setReferencesScope(assignment);
   forEachIdentifierPath(assignment, (id) => {
@@ -4646,6 +4680,7 @@ function trackAssignment(assignment, binding) {
       );
       extra.assignment = binding;
       extra.section = section;
+      extra.fnExtra = fnExtra;
     }
   });
 }
@@ -5273,6 +5308,7 @@ function addReadToExpression(root, binding) {
   if (fnRoot) {
     const readsByFn = getReadsByFunction();
     const fnExtra = fnRoot.node.extra ??= {};
+    exprExtra.fnExtra = fnExtra;
     fnExtra.section = section;
     readsByFn.set(fnExtra, push(readsByFn.get(fnExtra), read));
   }
@@ -5981,6 +6017,7 @@ var import_babel_utils23 = require("@marko/compiler/babel-utils");
 var kNativeTagBinding = Symbol("native tag binding");
 var kSkipEndTag = Symbol("skip native tag mark");
 var kGetterId = Symbol("node getter id");
+var kTagContentAttr = Symbol("tag could have dynamic content attribute");
 var htmlSelectArgs = /* @__PURE__ */ new WeakMap();
 var native_tag_default = {
   transform: {
@@ -6245,15 +6282,19 @@ var native_tag_default = {
               break;
           }
         }
+        const isOpenOnly = !!(tagDef && tagDef.parseOptions?.openTagOnly);
+        const hasChildren = !!tag.node.body.body.length;
         if (spreadExpression) {
           addHTMLEffectCall(tagSection, tagExtra.referencedBindings);
-          if (skipExpression) {
-            write2`${callRuntime("partialAttrs", spreadExpression, skipExpression, visitAccessor, getScopeIdIdentifier(tagSection), tag.node.name)}`;
-          } else {
-            write2`${callRuntime("attrs", spreadExpression, visitAccessor, getScopeIdIdentifier(tagSection), tag.node.name)}`;
+          if (isOpenOnly || hasChildren || usedAttrs.staticContentAttr) {
+            if (skipExpression) {
+              write2`${callRuntime("partialAttrs", spreadExpression, skipExpression, visitAccessor, getScopeIdIdentifier(tagSection), tag.node.name)}`;
+            } else {
+              write2`${callRuntime("attrs", spreadExpression, visitAccessor, getScopeIdIdentifier(tagSection), tag.node.name)}`;
+            }
           }
         }
-        if (tagDef && tagDef.parseOptions?.openTagOnly) {
+        if (isOpenOnly) {
           switch (tagDef.htmlType) {
             case "svg":
             case "math":
@@ -6264,7 +6305,54 @@ var native_tag_default = {
               break;
           }
         } else {
-          write2`>`;
+          if (usedAttrs.staticContentAttr) {
+            write2`>`;
+            tagExtra[kTagContentAttr] = true;
+            tag.node.body.body = [
+              import_compiler31.types.expressionStatement(
+                callRuntime(
+                  "writeContent",
+                  visitAccessor,
+                  getScopeIdIdentifier(tagSection),
+                  usedAttrs.staticContentAttr.value,
+                  getSerializeGuard(
+                    nodeBinding && getBindingSerializeReason(tagSection, nodeBinding),
+                    true
+                  )
+                )
+              )
+            ];
+          } else if (spreadExpression && !hasChildren) {
+            const serializeReason = getSerializeGuard(
+              nodeBinding && getBindingSerializeReason(tagSection, nodeBinding),
+              true
+            );
+            tagExtra[kTagContentAttr] = true;
+            tag.node.body.body = [
+              skipExpression ? import_compiler31.types.expressionStatement(
+                callRuntime(
+                  "writePartialAttrsAndContent",
+                  spreadExpression,
+                  skipExpression,
+                  visitAccessor,
+                  getScopeIdIdentifier(tagSection),
+                  tag.node.name,
+                  serializeReason
+                )
+              ) : import_compiler31.types.expressionStatement(
+                callRuntime(
+                  "writeAttrsAndContent",
+                  spreadExpression,
+                  visitAccessor,
+                  getScopeIdIdentifier(tagSection),
+                  tag.node.name,
+                  serializeReason
+                )
+              )
+            ];
+          } else {
+            write2`>`;
+          }
         }
         if (tagExtra.tagNameNullable) {
           tag.insertBefore(
@@ -6282,6 +6370,9 @@ var native_tag_default = {
         const selectArgs = htmlSelectArgs.get(tag.node);
         const tagName = getTagName(tag);
         const tagSection = getSection(tag);
+        if (tagExtra[kTagContentAttr]) {
+          flushBefore(tag);
+        }
         if (tagExtra.tagNameNullable) {
           flushInto(tag);
         }
@@ -6395,6 +6486,8 @@ var native_tag_default = {
         const usedAttrs = getUsedAttrs(tagName, tag.node);
         const { staticAttrs, staticControllable, skipExpression } = usedAttrs;
         const { spreadExpression } = usedAttrs;
+        const isOpenOnly = !!(tagDef && tagDef.parseOptions?.openTagOnly);
+        const hasChildren = !!tag.node.body.body.length;
         if (staticControllable) {
           const { helper, attrs: attrs2 } = staticControllable;
           const firstAttr = attrs2.find(Boolean);
@@ -6521,6 +6614,7 @@ var native_tag_default = {
           }
         }
         if (spreadExpression) {
+          const canHaveAttrContent = !(isOpenOnly || hasChildren || usedAttrs.staticContentAttr);
           if (skipExpression) {
             addStatement(
               "render",
@@ -6528,7 +6622,7 @@ var native_tag_default = {
               tagExtra.referencedBindings,
               import_compiler31.types.expressionStatement(
                 callRuntime(
-                  "partialAttrs",
+                  canHaveAttrContent ? "partialAttrsAndContent" : "partialAttrs",
                   scopeIdentifier,
                   visitAccessor,
                   spreadExpression,
@@ -6543,7 +6637,7 @@ var native_tag_default = {
               tagExtra.referencedBindings,
               import_compiler31.types.expressionStatement(
                 callRuntime(
-                  "attrs",
+                  canHaveAttrContent ? "attrsAndContent" : "attrs",
                   scopeIdentifier,
                   visitAccessor,
                   spreadExpression
@@ -6561,7 +6655,23 @@ var native_tag_default = {
             false
           );
         }
-        if (tagDef && tagDef.parseOptions?.openTagOnly) {
+        if (usedAttrs.staticContentAttr) {
+          const contentAttrValue = usedAttrs.staticContentAttr.value;
+          addStatement(
+            "render",
+            tagSection,
+            contentAttrValue.extra?.referencedBindings,
+            import_compiler31.types.expressionStatement(
+              callRuntime(
+                "insertContent",
+                scopeIdentifier,
+                visitAccessor,
+                contentAttrValue
+              )
+            )
+          );
+        }
+        if (isOpenOnly) {
           switch (tagDef.htmlType) {
             case "svg":
             case "math":
@@ -6665,6 +6775,7 @@ function getUsedAttrs(tagName, tag) {
   let spreadProps;
   let skipProps;
   let staticControllable;
+  let staticContentAttr;
   for (let i = attributes.length; i--; ) {
     const attr2 = attributes[i];
     const { value } = attr2;
@@ -6683,10 +6794,12 @@ function getUsedAttrs(tagName, tag) {
         }
       }
       spreadProps.push(import_compiler31.types.spreadElement(value));
-    } else if (!seen[attr2.name]) {
+    } else if (!seen[attr2.name] || !(attr2.name === "content" && tag.body.body.length)) {
       seen[attr2.name] = attr2;
       if (spreadProps) {
         spreadProps.push(toObjectProperty(attr2.name, attr2.value));
+      } else if (attr2.name === "content") {
+        staticContentAttr = attr2;
       } else {
         maybeStaticAttrs.add(attr2);
       }
@@ -6720,13 +6833,14 @@ function getUsedAttrs(tagName, tag) {
     for (const { name: name2 } of staticAttrs) {
       (skipProps ||= []).push(toObjectProperty(name2, import_compiler31.types.numericLiteral(1)));
     }
-    if (skipProps) {
-      skipExpression = import_compiler31.types.objectExpression(skipProps);
-    }
     spreadExpression = propsToExpression(spreadProps);
   }
+  if (skipProps) {
+    skipExpression = import_compiler31.types.objectExpression(skipProps);
+  }
   return {
     staticAttrs,
+    staticContentAttr,
     staticControllable,
     spreadExpression,
     skipExpression

package/dist/translator/util/is-invoked-function.d.ts

@@ -1,5 +1,5 @@
 import { types as t } from "@marko/compiler";
 export default function isInvokedFunction(expr: t.NodePath<t.Node>): expr is typeof expr & {
-    parent: t.CallExpression;
+    parent: t.CallExpression | t.OptionalCallExpression;
     parentPath: t.NodePath<t.CallExpression>;
 };

package/dist/translator/util/references.d.ts

@@ -45,6 +45,9 @@ export interface InputBinding extends Binding {
 }
 export type ReferencedBindings = Opt<Binding>;
 export type Intersection = Many<Binding>;
+type FnExtra = (t.FunctionExpressionExtra | t.ArrowFunctionExpressionExtra | t.FunctionDeclarationExtra) & {
+    section: Section;
+};
 declare module "@marko/compiler/dist/types" {
     interface NodeExtra {
         section?: Section;
@@ -103,6 +106,7 @@ export declare function getSectionInstancesAccessorLiteral(section: Section): t.
 export declare function getReadReplacement(node: t.Identifier | t.MemberExpression): t.Node | undefined;
 export interface ReferencedExtra extends t.NodeExtra {
     section: Section;
+    fnExtra?: FnExtra;
 }
 export declare function isReferencedExtra(extra: t.NodeExtra | undefined): extra is ReferencedExtra;
 export interface AssignedBindingExtra extends ReferencedExtra {

package/dist/translator/visitors/tag/native-tag.d.ts

@@ -3,11 +3,13 @@ import { type Binding } from "../../util/references";
 export declare const kNativeTagBinding: unique symbol;
 export declare const kSkipEndTag: unique symbol;
 declare const kGetterId: unique symbol;
+declare const kTagContentAttr: unique symbol;
 declare module "@marko/compiler/dist/types" {
     interface NodeExtra {
         [kNativeTagBinding]?: Binding;
         [kSkipEndTag]?: true;
         [kGetterId]?: string;
+        [kTagContentAttr]?: true;
     }
 }
 declare const _default: {