marko 6.0.49 → 6.0.51

package/dist/dom.mjs

@@ -108,6 +108,89 @@ function stripSpacesAndPunctuation(str) {
   return str.replace(/[^\p{L}\p{N}]/gu, "");
 }
 
+// src/dom/scope.ts
+function createScope($global, closestBranch) {
+  let scope = {
+    l: $global.p++,
+    q: 1,
+    k: closestBranch,
+    $global
+  };
+  return pendingScopes.push(scope), scope;
+}
+function skipScope(scope) {
+  return scope.$global.p++;
+}
+function findBranchWithKey(scope, key) {
+  let branch = scope.k;
+  for (; branch && !branch[key]; )
+    branch = branch.y;
+  return branch;
+}
+function destroyBranch(branch) {
+  branch.y?.A?.delete(branch), destroyNestedBranches(branch);
+}
+function destroyNestedBranches(branch) {
+  branch.B = 1, branch.A?.forEach(destroyNestedBranches), branch.J?.forEach((scope) => {
+    for (let id in scope.z)
+      scope.z[id]?.abort();
+  });
+}
+function removeAndDestroyBranch(branch) {
+  destroyBranch(branch), removeChildNodes(branch.h, branch.j);
+}
+function insertBranchBefore(branch, parentNode, nextSibling) {
+  insertChildNodes(
+    parentNode,
+    nextSibling,
+    branch.h,
+    branch.j
+  );
+}
+function tempDetachBranch(branch) {
+  let fragment = new DocumentFragment();
+  fragment.namespaceURI = branch.h.parentNode.namespaceURI, insertChildNodes(fragment, null, branch.h, branch.j);
+}
+
+// src/dom/walker.ts
+var walker = /* @__PURE__ */ document.createTreeWalker(document);
+function walk(startNode, walkCodes, branch) {
+  walker.currentNode = startNode, walkInternal(0, walkCodes, branch);
+}
+function walkInternal(currentWalkIndex, walkCodes, scope) {
+  let value2, storedMultiplier = 0, currentMultiplier = 0, currentScopeIndex = 0;
+  for (; currentWalkIndex < walkCodes.length; )
+    if (value2 = walkCodes.charCodeAt(currentWalkIndex++), currentMultiplier = storedMultiplier, storedMultiplier = 0, value2 === 32 /* Get */) {
+      let node = walker.currentNode;
+      scope[currentScopeIndex] = node, scope["j" /* Getter */ + currentScopeIndex++] = () => node;
+    } else if (value2 === 37 /* Replace */ || value2 === 49 /* DynamicTagWithVar */)
+      walker.currentNode.replaceWith(
+        walker.currentNode = scope[currentScopeIndex++] = new Text()
+      ), value2 === 49 /* DynamicTagWithVar */ && (scope[currentScopeIndex++] = skipScope(scope));
+    else {
+      if (value2 === 38 /* EndChild */)
+        return currentWalkIndex;
+      if (value2 === 47 /* BeginChild */ || value2 === 48 /* BeginChildWithVar */)
+        currentWalkIndex = walkInternal(
+          currentWalkIndex,
+          walkCodes,
+          scope[currentScopeIndex++] = createScope(scope.$global, scope.k)
+        ), value2 === 48 /* BeginChildWithVar */ && (scope[currentScopeIndex++] = skipScope(scope));
+      else if (value2 < 92)
+        for (value2 = 20 /* Next */ * currentMultiplier + value2 - 67 /* Next */; value2--; )
+          walker.nextNode();
+      else if (value2 < 107)
+        for (value2 = 10 /* Over */ * currentMultiplier + value2 - 97 /* Over */; value2--; )
+          walker.nextSibling();
+      else if (value2 < 117) {
+        for (value2 = 10 /* Out */ * currentMultiplier + value2 - 107 /* Out */; value2--; )
+          walker.parentNode();
+        walker.nextSibling();
+      } else
+        storedMultiplier = currentMultiplier * 10 /* Multiplier */ + value2 - 117 /* Multiplier */;
+    }
+}
+
 // src/dom/resume.ts
 var registeredValues = {}, branchesEnabled;
 function enableBranches() {
@@ -126,7 +209,7 @@ function init(runtimeId = "M") {
             return branch.j = lastEndNode = endNode === lastEndNode ? reference.parentNode.insertBefore(new Text(), reference) : endNode, branch.h ||= lastEndNode, branchIds.add(branchId), branch;
           };
           return {
-            J() {
+            K() {
               if (visitToken === "[" /* BranchStart */)
                 currentBranchId && visitDataIndex && (endBranch(currentBranchId, visit), currentBranchId = branchStack.pop()), currentBranchId && (branchStack.push(currentBranchId), parentBranchIds.set(scopeId, currentBranchId)), currentBranchId = scopeId, visitScope.h = visit;
               else if (visitToken === "]" /* BranchEnd */) {
@@ -144,11 +227,14 @@ function init(runtimeId = "M") {
                     start,
                     ~next ? next : visitData.length
                   );
-                  curNode = endBranch(childScopeId, curNode).j, parentBranchIds.set(childScopeId, scopeId);
+                  if (curNode = endBranch(childScopeId, curNode).j, parentBranchIds.set(childScopeId, scopeId), visitToken === "'" /* BranchNativeTag */) {
+                    let childBranch = scopeLookup[childScopeId];
+                    childBranch[0] = childBranch.h = childBranch.j = curNode;
+                  }
                 }
               }
             },
-            p(scope) {
+            t(scope) {
               let parentBranchId = scope.g || parentBranchIds.get(scopeId);
               if (parentBranchId && (scope.k = scopeLookup[parentBranchId]), branchIds.has(scopeId)) {
                 let branch = scope, parentBranch = branch.k;
@@ -166,7 +252,7 @@ function init(runtimeId = "M") {
                 visitDataIndex ? visitDataIndex - 1 : visitText.length
               ), visitData = visitDataIndex ? visitText.slice(visitDataIndex) : "", visitToken = visitText[commentPrefixLen], visitScope = scopeLookup[scopeId] ||= {
                 l: scopeId
-              }, visitToken === "*" /* Node */ ? visitScope["j" /* Getter */ + visitData] = /* @__PURE__ */ ((node) => () => node)(visitScope[visitData] = visit.previousSibling) : branches && branches.J();
+              }, visitToken === "*" /* Node */ ? visitScope["j" /* Getter */ + visitData] = /* @__PURE__ */ ((node) => () => node)(visitScope[visitData] = visit.previousSibling) : branches && branches.K();
             for (let serialized of resumes = render.r || [])
               if (typeof serialized == "string")
                 lastEffect = serialized;
@@ -182,7 +268,7 @@ function init(runtimeId = "M") {
                   $global ? typeof scope == "number" ? lastScopeId += scope : (scopeId = ++lastScopeId, scope.$global = $global, scope.l = scopeId, scopeLookup[scopeId] !== scope && (scopeLookup[scopeId] = Object.assign(
                     scope,
                     scopeLookup[scopeId]
-                  )), branches && branches.p(scope)) : ($global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId, $global.q = 1e6);
+                  )), branches && branches.t(scope)) : ($global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId, $global.p = 1e6);
           } finally {
             isResuming = visits.length = resumes.length = 0;
           }
@@ -407,50 +493,6 @@ function parseHTML(html2, ns) {
   return parser.innerHTML = html2, parser.content || parser;
 }
 
-// src/dom/scope.ts
-function createScope($global, closestBranch) {
-  let scope = {
-    l: $global.q++,
-    t: 1,
-    k: closestBranch,
-    $global
-  };
-  return pendingScopes.push(scope), scope;
-}
-function skipScope(scope) {
-  return scope.$global.q++;
-}
-function findBranchWithKey(scope, key) {
-  let branch = scope.k;
-  for (; branch && !branch[key]; )
-    branch = branch.y;
-  return branch;
-}
-function destroyBranch(branch) {
-  branch.y?.A?.delete(branch), destroyNestedBranches(branch);
-}
-function destroyNestedBranches(branch) {
-  branch.B = 1, branch.A?.forEach(destroyNestedBranches), branch.K?.forEach((scope) => {
-    for (let id in scope.z)
-      scope.z[id]?.abort();
-  });
-}
-function removeAndDestroyBranch(branch) {
-  destroyBranch(branch), removeChildNodes(branch.h, branch.j);
-}
-function insertBranchBefore(branch, parentNode, nextSibling) {
-  insertChildNodes(
-    parentNode,
-    nextSibling,
-    branch.h,
-    branch.j
-  );
-}
-function tempDetachBranch(branch) {
-  let fragment = new DocumentFragment();
-  fragment.namespaceURI = branch.h.parentNode.namespaceURI, insertChildNodes(fragment, null, branch.h, branch.j);
-}
-
 // src/dom/schedule.ts
 var isScheduled, channel;
 function schedule() {
@@ -487,7 +529,7 @@ function value(valueAccessor, fn = () => {
 }
 function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "l") {
   return (scope) => {
-    scope.t ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
+    scope.q ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
   };
 }
 function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
@@ -497,7 +539,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
       ownerScope,
       () => {
         for (let scope of scopes)
-          !scope.t && !scope.B && childSignal(scope);
+          !scope.q && !scope.B && childSignal(scope);
       },
       -1,
       0,
@@ -509,7 +551,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
 function conditionalClosure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
   let childSignal = closure(valueAccessor, fn), scopeAccessor = "d" /* ConditionalScope */ + ownerConditionalNodeAccessor, branchAccessor = "c" /* ConditionalRenderer */ + ownerConditionalNodeAccessor, ownerSignal = (scope) => {
     let ifScope = scope[scopeAccessor];
-    ifScope && !ifScope.t && scope[branchAccessor] === branch && queueRender(ifScope, childSignal, -1);
+    ifScope && !ifScope.q && scope[branchAccessor] === branch && queueRender(ifScope, childSignal, -1);
   };
   return ownerSignal._ = childSignal, ownerSignal;
 }
@@ -527,7 +569,7 @@ function dynamicClosure(...closureSignals) {
   return (scope) => {
     if (scope[___scopeInstancesAccessor])
       for (let childScope of scope[___scopeInstancesAccessor])
-        childScope.t || queueRender(
+        childScope.q || queueRender(
           childScope,
           closureSignals[childScope[___signalIndexAccessor]],
           -1
@@ -583,45 +625,6 @@ function hoist(...path) {
   };
 }
 
-// src/dom/walker.ts
-var walker = /* @__PURE__ */ document.createTreeWalker(document);
-function walk(startNode, walkCodes, branch) {
-  walker.currentNode = startNode, walkInternal(0, walkCodes, branch);
-}
-function walkInternal(currentWalkIndex, walkCodes, scope) {
-  let value2, storedMultiplier = 0, currentMultiplier = 0, currentScopeIndex = 0;
-  for (; currentWalkIndex < walkCodes.length; )
-    if (value2 = walkCodes.charCodeAt(currentWalkIndex++), currentMultiplier = storedMultiplier, storedMultiplier = 0, value2 === 32 /* Get */) {
-      let node = walker.currentNode;
-      scope[currentScopeIndex] = node, scope["j" /* Getter */ + currentScopeIndex++] = () => node;
-    } else if (value2 === 37 /* Replace */ || value2 === 49 /* DynamicTagWithVar */)
-      walker.currentNode.replaceWith(
-        walker.currentNode = scope[currentScopeIndex++] = new Text()
-      ), value2 === 49 /* DynamicTagWithVar */ && (scope[currentScopeIndex++] = skipScope(scope));
-    else {
-      if (value2 === 38 /* EndChild */)
-        return currentWalkIndex;
-      if (value2 === 47 /* BeginChild */ || value2 === 48 /* BeginChildWithVar */)
-        currentWalkIndex = walkInternal(
-          currentWalkIndex,
-          walkCodes,
-          scope[currentScopeIndex++] = createScope(scope.$global, scope.k)
-        ), value2 === 48 /* BeginChildWithVar */ && (scope[currentScopeIndex++] = skipScope(scope));
-      else if (value2 < 92)
-        for (value2 = 20 /* Next */ * currentMultiplier + value2 - 67 /* Next */; value2--; )
-          walker.nextNode();
-      else if (value2 < 107)
-        for (value2 = 10 /* Over */ * currentMultiplier + value2 - 97 /* Over */; value2--; )
-          walker.nextSibling();
-      else if (value2 < 117) {
-        for (value2 = 10 /* Out */ * currentMultiplier + value2 - 107 /* Out */; value2--; )
-          walker.parentNode();
-        walker.nextSibling();
-      } else
-        storedMultiplier = currentMultiplier * 10 /* Multiplier */ + value2 - 117 /* Multiplier */;
-    }
-}
-
 // src/dom/renderer.ts
 function createBranch($global, renderer, parentScope, parentNode) {
   let branch = createScope($global), parentBranch = parentScope?.k;
@@ -1137,7 +1140,7 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
     if (normalizedRenderer) {
       let childScope = scope[childScopeAccessor], args = getInput?.();
       if (typeof normalizedRenderer == "string")
-        attrs(
+        (getContent ? attrs : attrsAndContent)(
           childScope,
           0,
           (inputIsArgs ? args[0] : args) || {}
@@ -1237,7 +1240,7 @@ function queueRender(scope, signal, signalKey, value2, scopeKey = scope.l) {
   else {
     let render = {
       x: key,
-      p: scope,
+      t: scope,
       N: signal,
       I: value2
     }, i = pendingRenders.push(render) - 1;
@@ -1291,13 +1294,13 @@ function runRenders() {
       }
       pendingRenders[i] = item;
     }
-    render.p.k?.B || runRender(render);
+    render.t.k?.B || runRender(render);
   }
   for (let scope of pendingScopes)
-    scope.t = 0;
+    scope.q = 0;
   pendingScopes = [];
 }
-var runRender = (render) => render.N(render.p, render.I), enableCatch = () => {
+var runRender = (render) => render.N(render.t, render.I), enableCatch = () => {
   enableCatch = () => {
   }, enableBranches();
   let handlePendingTry = (fn, scope, branch) => {
@@ -1318,7 +1321,7 @@ var runRender = (render) => render.N(render.p, render.I), enableCatch = () => {
     try {
       runRender2(render);
     } catch (error) {
-      renderCatch(render.p, error);
+      renderCatch(render.t, error);
     }
   })(runRender);
 };
@@ -1329,7 +1332,7 @@ function resetAbortSignal(scope, id) {
   ctrl && (queueEffect(ctrl, abort), scope.z[id] = void 0);
 }
 function getAbortSignal(scope, id) {
-  return scope.k && (scope.k.K ||= /* @__PURE__ */ new Set()).add(scope), ((scope.z ||= {})[id] ||= new AbortController()).signal;
+  return scope.k && (scope.k.J ||= /* @__PURE__ */ new Set()).add(scope), ((scope.z ||= {})[id] ||= new AbortController()).signal;
 }
 function abort(ctrl) {
   ctrl.abort();
@@ -1388,7 +1391,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
         normalizedInput[key === "renderBody" ? "content" : key] = input[key];
     }
     if (component.effects = prepareEffects(() => {
-      branch ? existing = 1 : (out.global.q ||= 0, branch = component.scope = createAndSetupBranch(
+      branch ? existing = 1 : (out.global.p ||= 0, branch = component.scope = createAndSetupBranch(
         out.global,
         renderer,
         renderer.u,
@@ -1413,12 +1416,12 @@ var createTemplate = (id, template, walks, setup, inputSignal) => {
 function mount(input = {}, reference, position) {
   let branch, parentNode = reference, nextSibling = null, { $global } = input;
   switch ($global ? ({ $global, ...input } = input, $global = {
-    q: 0,
+    p: 0,
     runtimeId: "M",
     renderId: "_",
     ...$global
   }) : $global = {
-    q: 0,
+    p: 0,
     runtimeId: "M",
     renderId: "_"
   }, position) {

package/dist/html.js

@@ -517,11 +517,10 @@ function writeRoot(state, root) {
 }
 function writeAssigned(state) {
   if (state.assigned.size) {
+    let inits = "", assigns = "";
     for (let valueRef of state.assigned)
-      valueRef.init ? (valueRef.assigns ? state.buf.push(
-        "," + assignsToString(valueRef.assigns, valueRef.init)
-      ) : state.buf.push("," + valueRef.init), valueRef.init = "") : valueRef.assigns && state.buf.push("," + assignsToString(valueRef.assigns, valueRef.id));
-    state.assigned = /* @__PURE__ */ new Set();
+      valueRef.init ? (inits += "," + (valueRef.assigns ? assignsToString(valueRef.assigns, valueRef.init) : valueRef.init), valueRef.init = "") : valueRef.assigns && (assigns += "," + assignsToString(valueRef.assigns, valueRef.id)), valueRef.assigns = null;
+    assigns && state.buf.push(assigns), inits && state.buf.push(inits), state.assigned = /* @__PURE__ */ new Set();
   }
   if (state.mutations.length) {
     for (let mutation of state.mutations) {
@@ -1999,37 +1998,46 @@ 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) || {}, renderContent = content || normalizeDynamicRenderer(input.content);
-    if (nextScopeId(), write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`), !voidElementsReg.test(renderer)) {
-      let renderNativeTag = () => {
-        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,
+    let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
+    if (nextScopeId(), write(
+      `<${renderer}${attrs(input, 0, branchId, renderer)}>`
+    ), !voidElementsReg.test(renderer)) {
+      let renderContent = content || normalizeDynamicRenderer(input.content);
+      if (renderer === "textarea")
+        write(
+          controllable_textarea_value(
+            branchId,
+            0,
             input.value,
-            input.valueChange,
-            renderContent
-          ) : renderContent();
-        }
-      };
-      shouldResume ? withBranchId(branchId, renderNativeTag) : renderNativeTag(), write(`</${renderer}>`);
+            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(
+          branchId,
+          0,
+          input.value,
+          input.valueChange,
+          renderContent
+        ) : dynamicTag(
+          branchId,
+          0,
+          renderContent,
+          [],
+          0,
+          1,
+          serializeReason
+        );
+      }
+      write(`</${renderer}>`);
     }
     shouldResume && write(
       state.mark(
-        "|" /* BranchSingleNode */,
+        "'" /* BranchNativeTag */,
         scopeId + " " + accessor + " " + branchId
       )
     );

package/dist/html.mjs

@@ -436,11 +436,10 @@ function writeRoot(state, root) {
 }
 function writeAssigned(state) {
   if (state.assigned.size) {
+    let inits = "", assigns = "";
     for (let valueRef of state.assigned)
-      valueRef.init ? (valueRef.assigns ? state.buf.push(
-        "," + assignsToString(valueRef.assigns, valueRef.init)
-      ) : state.buf.push("," + valueRef.init), valueRef.init = "") : valueRef.assigns && state.buf.push("," + assignsToString(valueRef.assigns, valueRef.id));
-    state.assigned = /* @__PURE__ */ new Set();
+      valueRef.init ? (inits += "," + (valueRef.assigns ? assignsToString(valueRef.assigns, valueRef.init) : valueRef.init), valueRef.init = "") : valueRef.assigns && (assigns += "," + assignsToString(valueRef.assigns, valueRef.id)), valueRef.assigns = null;
+    assigns && state.buf.push(assigns), inits && state.buf.push(inits), state.assigned = /* @__PURE__ */ new Set();
   }
   if (state.mutations.length) {
     for (let mutation of state.mutations) {
@@ -1918,37 +1917,46 @@ 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) || {}, renderContent = content || normalizeDynamicRenderer(input.content);
-    if (nextScopeId(), write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`), !voidElementsReg.test(renderer)) {
-      let renderNativeTag = () => {
-        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,
+    let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
+    if (nextScopeId(), write(
+      `<${renderer}${attrs(input, 0, branchId, renderer)}>`
+    ), !voidElementsReg.test(renderer)) {
+      let renderContent = content || normalizeDynamicRenderer(input.content);
+      if (renderer === "textarea")
+        write(
+          controllable_textarea_value(
+            branchId,
+            0,
             input.value,
-            input.valueChange,
-            renderContent
-          ) : renderContent();
-        }
-      };
-      shouldResume ? withBranchId(branchId, renderNativeTag) : renderNativeTag(), write(`</${renderer}>`);
+            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(
+          branchId,
+          0,
+          input.value,
+          input.valueChange,
+          renderContent
+        ) : dynamicTag(
+          branchId,
+          0,
+          renderContent,
+          [],
+          0,
+          1,
+          serializeReason
+        );
+      }
+      write(`</${renderer}>`);
     }
     shouldResume && write(
       state.mark(
-        "|" /* BranchSingleNode */,
+        "'" /* BranchNativeTag */,
         scopeId + " " + accessor + " " + branchId
       )
     );

package/dist/translator/index.js

@@ -3211,11 +3211,11 @@ function getSignalFn(signal) {
           const aliasId = import_compiler20.types.identifier(alias.name);
           forEach(alias.excludeProperties, (name2) => {
             const propId = toPropertyName(name2);
-            const shorthand = propId.type === "Identifier";
+            const shorthand = propId.type === "Identifier" && import_compiler20.types.isValidIdentifier(name2);
             props.push(
               import_compiler20.types.objectProperty(
                 propId,
-                propId.type === "Identifier" ? propId : import_compiler20.types.objectPattern([]),
+                shorthand ? propId : generateUidIdentifier(name2),
                 false,
                 shorthand
               )
@@ -7375,13 +7375,13 @@ function translateAttrs(tag, templateExports, statements = [], contentKey = "con
     }
   }
   if (!seen.has(contentKey) && usesExport(templateExports, contentKey)) {
-    seen.add(contentKey);
     const contentExpression = buildContent(tag.get("body"));
     if (contentExpression) {
       const contentProp = import_compiler34.types.objectProperty(
         import_compiler34.types.identifier(contentKey),
         contentExpression
       );
+      seen.add(contentKey);
       contentProps.add(contentProp);
       properties.push(contentProp);
     }
@@ -10415,7 +10415,9 @@ var custom_tag_default = {
             `Local variables must be in a dynamic tag unless they are PascalCase. Use \`<\${${tagName}}/>\` or rename to \`${tagName.charAt(0).toUpperCase() + tagName.slice(1)}\`.`
           );
         }
-        throw tag.get("name").buildCodeFrameError("Unable to find entry point for custom tag.");
+        throw tag.get("name").buildCodeFrameError(
+          `Unable to find entry point for custom tag \`<${tagName}>\`.`
+        );
       }
       const section = getOrCreateSection(tag);
       const tagBody = tag.get("body");
@@ -10757,7 +10759,9 @@ function getTagRelativePath(tag) {
         `Local variables must be in a dynamic tag unless they are PascalCase. Use \`<\${${tagName}}/>\` or rename to \`${tagName.charAt(0).toUpperCase() + tagName.slice(1)}\`.`
       );
     }
-    throw tag.get("name").buildCodeFrameError("Unable to find entry point for custom tag.");
+    throw tag.get("name").buildCodeFrameError(
+      `Unable to find entry point for custom tag \`<${tagName}>\`.`
+    );
   }
   return relativePath;
 }

package/package.json

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