marko 6.0.9 → 6.0.11

package/dist/html.mjs

@@ -1090,7 +1090,7 @@ var branchIdKey = Symbol();
 function withBranchId(branchId, cb) {
   return withContext(branchIdKey, branchId, cb);
 }
-function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker) {
+function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
   let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0;
   if (resumeBranch) {
     let loopScopes = /* @__PURE__ */ new Map();
@@ -1109,14 +1109,18 @@ function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch, serialize
     });
   } else
     forOf(list, cb);
-  resumeMarker && $chunk.writeHTML(
-    $chunk.boundary.state.mark(
+  writeBranchEnd(
+    scopeId,
+    accessor,
+    resumeMarker,
+    parentEndTag,
+    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
       scopeId + " " + accessor
     )
   );
 }
-function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, onlyChildInParent) {
+function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
   let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchIds = "";
   if (resumeBranch) {
     let loopScopes = /* @__PURE__ */ new Map();
@@ -1130,14 +1134,18 @@ function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, serializeBranch,
     });
   } else
     forOf(list, cb);
-  resumeMarker && $chunk.writeHTML(
-    $chunk.boundary.state.mark(
-      onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
+  writeBranchEnd(
+    scopeId,
+    accessor,
+    resumeMarker,
+    parentEndTag,
+    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+      parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
       scopeId + " " + accessor + branchIds
     )
   );
 }
-function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker) {
+function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
   let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0;
   if (resumeBranch) {
     let loopScopes = /* @__PURE__ */ new Map(), sep = "";
@@ -1153,14 +1161,18 @@ function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeM
     });
   } else
     forIn(obj, cb);
-  resumeMarker && $chunk.writeHTML(
-    $chunk.boundary.state.mark(
+  writeBranchEnd(
+    scopeId,
+    accessor,
+    resumeMarker,
+    parentEndTag,
+    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
       scopeId + " " + accessor
     )
   );
 }
-function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, onlyChildInParent) {
+function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
   let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchIds = "";
   if (resumeBranch) {
     let loopScopes = /* @__PURE__ */ new Map();
@@ -1174,14 +1186,18 @@ function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, serializeBranch,
     });
   } else
     forIn(obj, cb);
-  resumeMarker && $chunk.writeHTML(
-    $chunk.boundary.state.mark(
-      onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
+  writeBranchEnd(
+    scopeId,
+    accessor,
+    resumeMarker,
+    parentEndTag,
+    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+      parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
       scopeId + " " + accessor + branchIds
     )
   );
 }
-function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker) {
+function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
   let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0;
   if (resumeBranch) {
     let loopScopes = /* @__PURE__ */ new Map(), sep = "";
@@ -1197,14 +1213,18 @@ function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch,
     });
   } else
     forTo(to, from, step, cb);
-  resumeMarker && $chunk.writeHTML(
-    $chunk.boundary.state.mark(
+  writeBranchEnd(
+    scopeId,
+    accessor,
+    resumeMarker,
+    parentEndTag,
+    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
       scopeId + " " + accessor
     )
   );
 }
-function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, onlyChildInParent) {
+function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
   let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchIds = "";
   if (resumeBranch) {
     let loopScopes = /* @__PURE__ */ new Map();
@@ -1218,14 +1238,18 @@ function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, serial
     });
   } else
     forTo(to, from, step, cb);
-  resumeMarker && $chunk.writeHTML(
-    $chunk.boundary.state.mark(
-      onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
+  writeBranchEnd(
+    scopeId,
+    accessor,
+    resumeMarker,
+    parentEndTag,
+    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+      parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
       scopeId + " " + accessor + branchIds
     )
   );
 }
-function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker) {
+function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
   let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchId = peekNextScopeId();
   resumeMarker && resumeBranch && $chunk.writeHTML(
     $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
@@ -1234,25 +1258,37 @@ function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMark
   resumeBranch && branchIndex !== void 0 && writeScope(scopeId, {
     ["c" /* ConditionalRenderer */ + accessor]: resumeMarker ? branchIndex : void 0,
     ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
-  }), resumeMarker && $chunk.writeHTML(
-    $chunk.boundary.state.mark(
+  }), writeBranchEnd(
+    scopeId,
+    accessor,
+    resumeMarker,
+    parentEndTag,
+    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
       scopeId + " " + accessor
     )
   );
 }
-function resumeSingleNodeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, onlyChildInParent) {
+function resumeSingleNodeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
   let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchId = peekNextScopeId(), branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb(), shouldWriteBranch = resumeBranch && branchIndex !== void 0;
   shouldWriteBranch && writeScope(scopeId, {
     ["c" /* ConditionalRenderer */ + accessor]: resumeMarker ? branchIndex : void 0,
     ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
-  }), resumeMarker && $chunk.writeHTML(
-    $chunk.boundary.state.mark(
-      onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
+  }), writeBranchEnd(
+    scopeId,
+    accessor,
+    resumeMarker,
+    parentEndTag,
+    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+      parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
       scopeId + " " + accessor + (shouldWriteBranch ? " " + branchId : "")
     )
   );
 }
+function writeBranchEnd(scopeId, accessor, resumeMarker, parentEndTag, mark) {
+  let endTag = parentEndTag || "";
+  resumeMarker ? mark ? $chunk.writeHTML(mark + endTag) : $chunk.writeHTML(endTag + markResumeNode(scopeId, accessor)) : $chunk.writeHTML(endTag);
+}
 var writeScope = (scopeId, partialScope) => {
   let { state } = $chunk.boundary, { scopes } = state, scope = scopes.get(scopeId);
   return state.needsMainRuntime = !0, scope ? Object.assign(scope, partialScope) : (scope = partialScope, scope[K_SCOPE_ID] = scopeId, state.scopes.set(scopeId, scope)), state.writeScopes ? state.writeScopes[scopeId] = scope : state.writeScopes = { [scopeId]: scope }, scope;

package/dist/translator/index.js

@@ -5752,7 +5752,7 @@ var import_babel_utils24 = require("@marko/compiler/babel-utils");
 var import_compiler31 = require("@marko/compiler");
 var import_babel_utils23 = require("@marko/compiler/babel-utils");
 var kNativeTagBinding = Symbol("native tag binding");
-var kSkipMark = Symbol("skip native tag mark");
+var kSkipEndTag = Symbol("skip native tag mark");
 var kGetterId = Symbol("node getter id");
 var htmlSelectArgs = /* @__PURE__ */ new WeakMap();
 var native_tag_default = {
@@ -6059,7 +6059,9 @@ var native_tag_default = {
           flushInto(tag);
         }
         if (selectArgs) {
-          writeTo(tag)`</${tag.node.name}>`;
+          if (!tagExtra[kSkipEndTag]) {
+            writeTo(tag)`</${tag.node.name}>`;
+          }
           flushInto(tag);
           tag.insertBefore(
             import_compiler31.types.expressionStatement(
@@ -6079,8 +6081,8 @@ var native_tag_default = {
         } else {
           tag.insertBefore(tag.node.body.body).forEach((child) => child.skip());
         }
-        const markerSerializeReason = nodeBinding && !tagExtra[kSkipMark] && getBindingSerializeReason(tagSection, nodeBinding);
-        if (!openTagOnly && !selectArgs) {
+        const markerSerializeReason = !tagExtra[kSkipEndTag] && nodeBinding && getBindingSerializeReason(tagSection, nodeBinding);
+        if (!tagExtra[kSkipEndTag] && !openTagOnly && !selectArgs) {
           writeTo(
             tag,
             !markerSerializeReason && (tagName === "html" || tagName === "body")
@@ -6593,19 +6595,16 @@ function buildUndefined() {
 // src/translator/util/is-only-child-in-parent.ts
 var kOnlyChildInParent = Symbol("only child in parent");
 var kNodeRef = Symbol("potential only child node ref");
-function isOnlyChildInParent(tag, branchSize = 1) {
+function getOnlyChildParentTagName(tag, branchSize = 1) {
   const extra = tag.node.extra;
   if (extra[kOnlyChildInParent] !== void 0) {
     return extra[kOnlyChildInParent];
   }
   const parentTag = getParentTag(tag);
-  if (parentTag && (0, import_babel_utils24.getTagDef)(parentTag)?.html) {
-    return extra[kOnlyChildInParent] = tag.parent.body.length === branchSize;
-  }
-  return extra[kOnlyChildInParent] = false;
+  return extra[kOnlyChildInParent] = parentTag && (0, import_babel_utils24.getTagDef)(parentTag)?.html && parentTag.node.name.type === "StringLiteral" && tag.parent.body.length === branchSize ? parentTag.node.name.value : false;
 }
 function getOptimizedOnlyChildNodeBinding(tag, section, branchSize = 1) {
-  if (isOnlyChildInParent(tag, branchSize)) {
+  if (getOnlyChildParentTagName(tag, branchSize)) {
     const parentTag = getParentTag(tag).node;
     const parentTagName = parentTag.name?.value;
     return (parentTag.extra ??= {})[kNativeTagBinding] ??= createBinding(
@@ -6685,7 +6684,7 @@ var for_default = {
           return;
         }
         setSectionParentIsOwner(bodySection, true);
-        if (!isOnlyChildInParent(tag)) {
+        if (!getOnlyChildParentTagName(tag)) {
           visit(tag, 37 /* Replace */);
           enterShallow(tag);
         }
@@ -6697,7 +6696,7 @@ var for_default = {
         const tagSection = getSection(tag);
         const bodySection = getSectionForBody(tagBody);
         const { node } = tag;
-        const onlyChildInParentOptimization = isOnlyChildInParent(tag);
+        const onlyChildParentTagName = getOnlyChildParentTagName(tag);
         const nodeBinding = getOptimizedOnlyChildNodeBinding(tag, tagSection);
         const forAttrs = getKnownAttrValues(node);
         const forType = getForType(node);
@@ -6721,12 +6720,10 @@ var for_default = {
           import_compiler33.types.arrowFunctionExpression(params, import_compiler33.types.blockStatement(bodyStatements))
         );
         if (branchSerializeReason) {
-          if (markerSerializeReason && onlyChildInParentOptimization) {
-            getParentTag(tag).node.extra[kSkipMark] = true;
-          }
+          const skipParentEnd = onlyChildParentTagName && markerSerializeReason;
           const markerSerializeArg = getSerializeGuard(
             markerSerializeReason,
-            !onlyChildInParentOptimization
+            !skipParentEnd
           );
           forTagArgs.push(
             forAttrs.by || import_compiler33.types.numericLiteral(0),
@@ -6735,8 +6732,9 @@ var for_default = {
             getSerializeGuard(branchSerializeReason, !markerSerializeArg),
             markerSerializeArg
           );
-          if (onlyChildInParentOptimization) {
-            forTagArgs.push(import_compiler33.types.numericLiteral(1));
+          if (skipParentEnd) {
+            getParentTag(tag).node.extra[kSkipEndTag] = true;
+            forTagArgs.push(import_compiler33.types.stringLiteral(`</${onlyChildParentTagName}>`));
           }
         }
         statements.push(
@@ -6757,7 +6755,7 @@ var for_default = {
           return;
         }
         setSectionParentIsOwner(bodySection, true);
-        if (!isOnlyChildInParent(tag)) {
+        if (!getOnlyChildParentTagName(tag)) {
           visit(tag, 37 /* Replace */);
           enterShallow(tag);
         }
@@ -8547,7 +8545,7 @@ var IfTag = {
         if (tag.node.body.attributeTags) return;
         const tagBody = tag.get("body");
         const bodySection = getSectionForBody(tagBody);
-        if (isRoot(tag) && !isOnlyChildInParent(tag)) {
+        if (isRoot(tag) && !getOnlyChildParentTagName(tag)) {
           visit(tag, 37 /* Replace */);
           enterShallow(tag);
         }
@@ -8574,7 +8572,7 @@ var IfTag = {
             ifTag,
             ifTagSection
           );
-          const onlyChildInParentOptimization = isOnlyChildInParent(ifTag);
+          const onlyChildParentTagName = getOnlyChildParentTagName(ifTag);
           const markerSerializeReason = getBindingSerializeReason(
             ifTagSection,
             nodeBinding
@@ -8623,51 +8621,32 @@ var IfTag = {
             branchTag.remove();
           }
           if (branchSerializeReasons) {
-            if (onlyChildInParentOptimization && markerSerializeReason) {
-              getParentTag(ifTag).node.extra[kSkipMark] = true;
+            const skipParentEnd = onlyChildParentTagName && markerSerializeReason;
+            if (skipParentEnd) {
+              getParentTag(ifTag).node.extra[kSkipEndTag] = true;
             }
+            const markerSerializeArg = getSerializeGuard(
+              markerSerializeReason,
+              !skipParentEnd
+            );
             const cbNode = import_compiler42.types.arrowFunctionExpression(
               [],
               import_compiler42.types.blockStatement([statement])
             );
-            if (singleNodeOptimization) {
-              const markerSerializeArg = getSerializeGuard(
-                markerSerializeReason,
-                !onlyChildInParentOptimization
-              );
-              statement = import_compiler42.types.expressionStatement(
-                callRuntime(
-                  "resumeSingleNodeConditional",
-                  cbNode,
-                  getScopeIdIdentifier(ifTagSection),
-                  getScopeAccessorLiteral(nodeBinding),
-                  getSerializeGuardForAny(
-                    branchSerializeReasons,
-                    !markerSerializeArg
-                  ),
-                  markerSerializeArg,
-                  onlyChildInParentOptimization && import_compiler42.types.numericLiteral(1)
-                )
-              );
-            } else {
-              const markerSerializeArg = getSerializeGuard(
-                markerSerializeReason,
-                true
-              );
-              statement = import_compiler42.types.expressionStatement(
-                callRuntime(
-                  "resumeConditional",
-                  cbNode,
-                  getScopeIdIdentifier(ifTagSection),
-                  getScopeAccessorLiteral(nodeBinding),
-                  getSerializeGuardForAny(
-                    branchSerializeReasons,
-                    !markerSerializeArg
-                  ),
-                  markerSerializeArg
-                )
-              );
-            }
+            statement = import_compiler42.types.expressionStatement(
+              callRuntime(
+                singleNodeOptimization ? "resumeSingleNodeConditional" : "resumeConditional",
+                cbNode,
+                getScopeIdIdentifier(ifTagSection),
+                getScopeAccessorLiteral(nodeBinding),
+                getSerializeGuardForAny(
+                  branchSerializeReasons,
+                  !markerSerializeArg
+                ),
+                markerSerializeArg,
+                skipParentEnd && import_compiler42.types.stringLiteral(`</${onlyChildParentTagName}>`)
+              )
+            );
           }
           nextTag.insertBefore(statement);
         }
@@ -8681,7 +8660,7 @@ var IfTag = {
         if (bodySection) {
           setSectionParentIsOwner(bodySection, true);
         }
-        if (isRoot(tag) && !isOnlyChildInParent(tag)) {
+        if (isRoot(tag) && !getOnlyChildParentTagName(tag)) {
           visit(tag, 37 /* Replace */);
           enterShallow(tag);
         }

package/dist/translator/util/is-only-child-in-parent.d.ts

@@ -5,10 +5,10 @@ declare const kOnlyChildInParent: unique symbol;
 declare const kNodeRef: unique symbol;
 declare module "@marko/compiler/dist/types" {
     interface NodeExtra {
-        [kOnlyChildInParent]?: boolean;
+        [kOnlyChildInParent]?: false | string;
         [kNodeRef]?: Binding;
     }
 }
-export declare function isOnlyChildInParent(tag: t.NodePath<t.MarkoTag>, branchSize?: number): boolean;
+export declare function getOnlyChildParentTagName(tag: t.NodePath<t.MarkoTag>, branchSize?: number): string | false;
 export declare function getOptimizedOnlyChildNodeBinding(tag: t.NodePath<t.MarkoTag>, section: Section, branchSize?: number): Binding;
 export {};

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

@@ -1,12 +1,12 @@
 import { types as t } from "@marko/compiler";
 import { type Binding } from "../../util/references";
 export declare const kNativeTagBinding: unique symbol;
-export declare const kSkipMark: unique symbol;
+export declare const kSkipEndTag: unique symbol;
 declare const kGetterId: unique symbol;
 declare module "@marko/compiler/dist/types" {
     interface NodeExtra {
         [kNativeTagBinding]?: Binding;
-        [kSkipMark]?: true;
+        [kSkipEndTag]?: true;
         [kGetterId]?: string;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.9",
+  "version": "6.0.11",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",