marko 6.0.50 → 6.0.52

package/dist/html.mjs

@@ -1101,6 +1101,9 @@ function resumeClosestBranch(scopeId) {
   branchId !== void 0 && branchId !== scopeId && writeScope(scopeId, { g: branchId });
 }
 var branchIdKey = Symbol();
+function isInResumedBranch() {
+  return $chunk?.context?.[branchIdKey] !== void 0;
+}
 function withBranchId(branchId, cb) {
   return withContext(branchIdKey, branchId, cb);
 }
@@ -1458,7 +1461,6 @@ var State2 = class {
     }
   }
   flushScript() {
-    flushSerializer(this.boundary);
     let { boundary, effects } = this, { state } = boundary, { $global: $global2, runtimePrefix, nonceAttr } = state, { html, scripts } = this, hasWalk = state.walkOnNextFlush;
     if (hasWalk && (state.walkOnNextFlush = !1), state.needsMainRuntime && !state.hasMainRuntime && (state.hasMainRuntime = !0, scripts = concatScripts(
       scripts,
@@ -1877,7 +1879,7 @@ var ServerRendered = class {
         return reject(new Error("Cannot read from a consumed render result"));
       let { boundary } = head;
       (boundary.onNext = () => {
-        boundary.signal.aborted ? (boundary.onNext = NOOP2, reject(boundary.signal.reason)) : boundary.done && resolve(head.consume().flushHTML());
+        boundary.signal.aborted ? (boundary.onNext = NOOP2, reject(boundary.signal.reason)) : !boundary.count && boundary.done && resolve(head.consume().flushHTML());
       })();
     });
   }
@@ -1917,37 +1919,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
       )
     );
@@ -1984,7 +1995,7 @@ function registerContent(id, fn, scopeId) {
 function patchDynamicTag(patch) {
   dynamicTag = /* @__PURE__ */ ((originalDynamicTag) => (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
     let patched = patch(scopeId, accessor, tag);
-    return patched.h = tag, originalDynamicTag(
+    return patched !== tag && (patched.h = tag), originalDynamicTag(
       scopeId,
       accessor,
       patched,
@@ -2004,9 +2015,16 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
   writeScript,
   nextScopeId,
   peekNextScopeId,
+  isInResumedBranch,
   isTagsAPI(fn) {
     return !!fn.h;
   },
+  onFlush(fn) {
+    let { flushHTML } = Chunk.prototype;
+    Chunk.prototype.flushHTML = function() {
+      return fn(this), flushHTML.call(this);
+    };
+  },
   patchDynamicTag,
   writeSetScopeForComponent(branchId, m5c) {
     writeScope(branchId, { m5c }), writeEffect(branchId, SET_SCOPE_REGISTER_ID);
@@ -2025,7 +2043,7 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
     }
     return compatRegistered;
   },
-  render(renderer, willRerender, classAPIOut, component, input) {
+  render(renderer, willRerender, classAPIOut, component, input, toStringEvent) {
     let $global2 = classAPIOut.global, state = $global2[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
     state || ($global2.runtimeId ||= "M", $global2.renderId ||= $global2.componentIdPrefix || $global2.widgetIdPrefix || "_", $global2[K_TAGS_API_STATE] = state = new State2($global2));
     let boundary = new Boundary(state), head = new Chunk(
@@ -2044,18 +2062,19 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
         writeScope(scopeId, { m5c: component.id }), writeEffect(scopeId, SET_SCOPE_REGISTER_ID);
       }
       isTemplate(renderer) && willRerender ? renderer(normalizedInput, 1) : renderer(normalizedInput);
+      let asyncOut = classAPIOut.beginAsync();
+      (boundary.onNext = () => {
+        boundary.signal.aborted ? (asyncOut.error(boundary.signal.reason), boundary.onNext = NOOP3) : boundary.count || (asyncOut.once(toStringEvent, (writer) => {
+          if (boundary.done) {
+            let { html, scripts } = head.flushScript();
+            writer.script(scripts), writer.write(html);
+          } else
+            asyncOut.error(
+              new Error("Cannot serialize promises with class/tags interop.")
+            );
+        }), head = head.consume(), asyncOut.write(head.html), asyncOut.end(), head.html = "");
+      })();
     });
-    let asyncOut = classAPIOut.beginAsync();
-    queueMicrotask(
-      boundary.onNext = () => {
-        if (boundary.signal.aborted)
-          asyncOut.error(boundary.signal.reason);
-        else if (boundary.done) {
-          let { scripts, html } = head.consume().flushScript();
-          asyncOut.script(scripts), asyncOut.write(html), boundary.done && asyncOut.end();
-        }
-      }
-    );
   },
   registerRenderer(renderer, id) {
     return register(
@@ -2069,6 +2088,8 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
     register(RENDER_BODY_ID, fn);
   }
 };
+function NOOP3() {
+}
 export {
   $global,
   attr,

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
               )
@@ -5072,7 +5072,7 @@ function finalizeReferences() {
         let serializeReason;
         let currentSection = section;
         while (currentSection !== sourceSection) {
-          const upstreamReason = !currentSection.upstreamExpression || getSerializeSourcesForExpr(currentSection.upstreamExpression);
+          const upstreamReason = currentSection.downstreamBinding ? isSerializedSection(currentSection) || void 0 : !currentSection.upstreamExpression || getSerializeSourcesForExpr(currentSection.upstreamExpression);
           if (upstreamReason === true) {
             serializeReason = true;
             break;
@@ -5098,7 +5098,7 @@ function finalizeReferences() {
         let serializeReason;
         let currentSection = section;
         while (currentSection !== sourceSection) {
-          const upstreamReason = !currentSection.upstreamExpression || getSerializeSourcesForExpr(currentSection.upstreamExpression);
+          const upstreamReason = currentSection.downstreamBinding ? isSerializedSection(currentSection) || void 0 : !currentSection.upstreamExpression || getSerializeSourcesForExpr(currentSection.upstreamExpression);
           if (upstreamReason === true) {
             serializeReason = true;
             break;
@@ -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.50",
+  "version": "6.0.52",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",