marko 6.0.113 → 6.0.115

package/dist/html.mjs

@@ -122,7 +122,7 @@ function forStepBy(by, index) {
 }
 
 // src/html/inlined-runtimes.ts
-var WALKER_RUNTIME_CODE = '(e=>(self[e]||(self[e]=(l,f=e+l,s=f.length,a={},d=[],t=document,n=t.createTreeWalker(t,129))=>t=self[e][l]={i:f,d:t,l:a,v:d,x(){},w(e,l,r){for(;e=n.nextNode();)t.x(l=(l=e.data)&&!l.indexOf(f)&&(a[r=l.slice(s+1)]=e,l[s]),r,e),l>"#"&&d.push(e)}}),self[e]))', REORDER_RUNTIME_CODE = '(e=>{if(e.j)return;let i,l,r,t={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),"#"==n?(t[a]=l).i++:"!"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):"T"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,c(i=e.l["^"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})';
+var WALKER_RUNTIME_CODE = '(e=>(self[e]||(self[e]=(l,f=e+l,s=f.length,a={},d=[],t=document,n=t.createTreeWalker(t,129))=>t=self[e][l]={i:f,d:t,l:a,v:d,x(){},w(e,l,r){for(;e=n.nextNode();)t.x(l=(l=e.data)&&!l.indexOf(f)&&(a[r=l.slice(s+1)]=e,l[s]),r,e),l>"#"&&d.push(e)}}),self[e]))', REORDER_RUNTIME_CODE = '(e=>{if(e.j)return;let i,l,r,t=e.p={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),"#"==n?(t[a]=l).i++:"!"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):"T"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,c(i=e.l["^"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})';
 
 // src/html/serializer.ts
 var kTouchedIterator = Symbol(), { hasOwnProperty } = {}, Generator = (function* () {
@@ -1061,7 +1061,7 @@ function writeScript(script) {
   $chunk.writeScript(script);
 }
 function _script(scopeId, registryId) {
-  $chunk.boundary.state.needsMainRuntime = !0, $chunk.writeEffect(scopeId, registryId);
+  $chunk.context?.[kIsAsync] && _resume_branch(scopeId), $chunk.boundary.state.needsMainRuntime = !0, $chunk.writeEffect(scopeId, registryId);
 }
 function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
   let shouldResume = serializeReason !== 0, render2 = normalizeServerRender(content), branchId = _peek_scope_id();
@@ -1076,11 +1076,11 @@ function normalizeServerRender(value) {
     return renderer;
 }
 var kPendingContexts = Symbol("Pending Contexts");
-function withContext(key, value, cb) {
+function withContext(key, value, cb, cbValue) {
   let ctx = $chunk.context ||= { [kPendingContexts]: 0 }, prev = ctx[key];
   ctx[kPendingContexts]++, ctx[key] = value;
   try {
-    return cb();
+    return cb(cbValue);
   } finally {
     ctx[kPendingContexts]--, ctx[key] = prev;
   }
@@ -1142,15 +1142,18 @@ function _hoist(scopeId, id) {
   return getter[Symbol.iterator] = _hoist_read_error, _resume(getter, id, scopeId);
 }
 function _resume_branch(scopeId) {
-  let branchId = $chunk.context?.[branchIdKey];
+  let branchId = $chunk.context?.[kBranchId];
   branchId !== void 0 && branchId !== scopeId && writeScope(scopeId, { G: branchId });
 }
-var branchIdKey = Symbol();
+var kBranchId = Symbol("Branch Id"), kIsAsync = Symbol("Is Async");
 function isInResumedBranch() {
-  return $chunk?.context?.[branchIdKey] !== void 0;
+  return $chunk?.context?.[kBranchId] !== void 0;
 }
 function withBranchId(branchId, cb) {
-  return withContext(branchIdKey, branchId, cb);
+  return withContext(kBranchId, branchId, cb);
+}
+function withIsAsync(cb, value) {
+  return withContext(kIsAsync, !0, cb, value);
 }
 function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
   let { state } = $chunk.boundary, resumeMarker = serializeMarker !== 0, flushBranchIds = "";
@@ -1350,14 +1353,14 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
           let branchId = _peek_scope_id();
           $chunk.writeHTML(
             $chunk.boundary.state.mark("[" /* BranchStart */, "")
-          ), content(value), $chunk.writeHTML(
+          ), withIsAsync(content, value), $chunk.writeHTML(
             $chunk.boundary.state.mark(
               "]" /* BranchEnd */,
               scopeId + " " + accessor + " " + branchId
             )
           );
         } else
-          content(value);
+          withIsAsync(content, value);
       }), boundary.endAsync(chunk)));
     },
     (err) => {
@@ -1370,9 +1373,9 @@ function _try(scopeId, accessor, content, input) {
   $chunk.writeHTML($chunk.boundary.state.mark("[" /* BranchStart */, ""));
   let catchContent = normalizeDynamicRenderer(input.catch), placeholderContent = normalizeDynamicRenderer(input.placeholder);
   catchContent ? tryCatch(
-    placeholderContent ? () => tryPlaceholder(content, placeholderContent) : content,
+    placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId) : content,
     catchContent
-  ) : placeholderContent ? tryPlaceholder(content, placeholderContent) : content(), writeScope(branchId, {
+  ) : placeholderContent ? tryPlaceholder(content, placeholderContent, branchId) : content(), writeScope(branchId, {
     C: accessor,
     E: catchContent,
     Q: placeholderContent
@@ -1383,13 +1386,13 @@ function _try(scopeId, accessor, content, input) {
     )
   );
 }
-function tryPlaceholder(content, placeholder) {
+function tryPlaceholder(content, placeholder, branchId) {
   let chunk = $chunk, { boundary } = chunk, body = new Chunk(boundary, null, chunk.context);
   if (body === body.render(content)) {
     chunk.append(body);
     return;
   }
-  chunk.next = $chunk = new Chunk(boundary, chunk.next, body.context), chunk.placeholderBody = body, chunk.placeholderRender = placeholder;
+  chunk.next = $chunk = new Chunk(boundary, chunk.next, chunk.context), chunk.placeholderBody = body, chunk.placeholderRender = placeholder, chunk.placeholderBranchId = branchId;
 }
 function tryCatch(content, catchContent) {
   let chunk = $chunk, { boundary } = chunk, { state } = boundary, catchBoundary = new Boundary(state), body = new Chunk(catchBoundary, null, chunk.context), bodyEnd = body.render(content);
@@ -1499,14 +1502,12 @@ var Boundary = class extends AbortController {
   reorderId = null;
   placeholderBody = null;
   placeholderRender = null;
+  placeholderBranchId = null;
   writeHTML(html) {
     this.html += html;
   }
   writeEffect(scopeId, registryId) {
-    this.lastEffect === registryId ? this.effects += "," + scopeId : (this.lastEffect = registryId, this.effects = concatEffects(
-      this.effects,
-      '"' + registryId + '",' + scopeId
-    ));
+    this.lastEffect === registryId ? this.effects += " " + scopeId : (this.lastEffect = registryId, this.effects = concatEffects(this.effects, registryId + " " + scopeId));
   }
   writeScript(script) {
     this.scripts = concatScripts(this.scripts, script);
@@ -1518,8 +1519,8 @@ var Boundary = class extends AbortController {
     if (this.placeholderBody) {
       let body = this.placeholderBody.consume();
       if (body.async) {
-        let { state } = this.boundary, reorderId = body.reorderId = state.nextReorderId();
-        this.writeHTML(state.mark("!^" /* Placeholder */, reorderId));
+        let { state } = this.boundary, reorderId = body.reorderId = this.placeholderBranchId ? this.placeholderBranchId + "" : state.nextReorderId();
+        this.placeholderBranchId = null, this.writeHTML(state.mark("!^" /* Placeholder */, reorderId));
         let after = this.render(this.placeholderRender);
         after !== this && this.boundary.abort(
           new Error("An @placeholder cannot contain async content.")
@@ -1556,7 +1557,7 @@ var Boundary = class extends AbortController {
     if (needsWalk && (state.walkOnNextFlush = !1), state.needsMainRuntime && !state.hasMainRuntime && (state.hasMainRuntime = !0, scripts = concatScripts(
       scripts,
       WALKER_RUNTIME_CODE + '("' + $global2.runtimeId + '")("' + $global2.renderId + '")'
-    )), effects && (needsWalk = !0, state.resumes = state.resumes ? state.resumes + "," + effects : effects), state.resumes && (state.hasWrittenResume ? scripts = concatScripts(
+    )), effects && (needsWalk = !0, state.resumes = state.resumes ? state.resumes + ',"' + effects + '"' : '"' + effects + '"'), state.resumes && (state.hasWrittenResume ? scripts = concatScripts(
       scripts,
       runtimePrefix + ".r.push(" + state.resumes + ")"
     ) : (state.hasWrittenResume = !0, scripts = concatScripts(
@@ -1585,10 +1586,10 @@ var Boundary = class extends AbortController {
           runtimePrefix + ".r=[]"
         )), reorderScripts = concatScripts(
           reorderScripts,
-          "_.push(" + reorderEffects + ")"
+          '_.push("' + reorderEffects + '")'
         )), scripts = concatScripts(
           scripts,
-          reorderScripts && runtimePrefix + ".j." + reorderId + "=_=>{" + reorderScripts + "}"
+          reorderScripts && runtimePrefix + ".j" /* Scripts */ + toAccess(reorderId) + "=_=>{" + reorderScripts + "}"
         ), html += "<t " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
       }
       state.writeReorders = null;
@@ -1611,7 +1612,7 @@ function flushSerializer(boundary) {
       let scope = writeScopes[key], scopeId = getScopeId(scope), scopeIdDelta = scopeId - lastSerializedScopeId;
       lastSerializedScopeId = scopeId + 1, scopeIdDelta && serializeData.push(scopeIdDelta), serializeData.push(scope);
     }
-    state.resumes = concatEffects(
+    state.resumes = concatSequence(
       state.resumes,
       serializer.stringify(serializeData, boundary)
     ), state.lastSerializedScopeId = lastSerializedScopeId, state.writeScopes = null, flushed && (state.walkOnNextFlush = !0);
@@ -1621,6 +1622,9 @@ function _trailers(html) {
   $chunk.boundary.state.trailerHTML += html;
 }
 function concatEffects(a, b) {
+  return a ? b ? a + " " + b : a : b;
+}
+function concatSequence(a, b) {
   return a ? b ? a + "," + b : a : b;
 }
 function concatScripts(a, b) {

package/dist/translator/index.js

@@ -137,6 +137,7 @@ var AccessorProp = /* @__PURE__ */ ((AccessorProp4) => {
   AccessorProp4["Owner"] = "_";
   AccessorProp4["AbortControllers"] = "#AbortControllers";
   AccessorProp4["AbortScopes"] = "#AbortScopes";
+  AccessorProp4["AwaitCounter"] = "#AwaitCounter";
   AccessorProp4["BranchAccessor"] = "#BranchAccessor";
   AccessorProp4["BranchScopes"] = "#BranchScopes";
   AccessorProp4["CatchContent"] = "#CatchContent";
@@ -144,12 +145,11 @@ var AccessorProp = /* @__PURE__ */ ((AccessorProp4) => {
   AccessorProp4["ClosestBranchId"] = "#ClosestBranchId";
   AccessorProp4["Creating"] = "#Creating";
   AccessorProp4["Destroyed"] = "#Destroyed";
-  AccessorProp4["PendingEffects"] = "#PendingEffects";
   AccessorProp4["EndNode"] = "#EndNode";
   AccessorProp4["Id"] = "#Id";
   AccessorProp4["LoopKey"] = "#LoopKey";
   AccessorProp4["ParentBranch"] = "#ParentBranch";
-  AccessorProp4["PendingAsyncCount"] = "#PendingAsyncCount";
+  AccessorProp4["PendingEffects"] = "#PendingEffects";
   AccessorProp4["PlaceholderBranch"] = "#PlaceholderBranch";
   AccessorProp4["PlaceholderContent"] = "#PlaceholderContent";
   AccessorProp4["Renderer"] = "#Renderer";
@@ -1286,6 +1286,7 @@ var AccessorProp2 = /* @__PURE__ */ ((AccessorProp4) => {
   AccessorProp4["Owner"] = "_";
   AccessorProp4["AbortControllers"] = "A";
   AccessorProp4["AbortScopes"] = "B";
+  AccessorProp4["AwaitCounter"] = "O";
   AccessorProp4["BranchAccessor"] = "C";
   AccessorProp4["BranchScopes"] = "D";
   AccessorProp4["CatchContent"] = "E";
@@ -1293,12 +1294,11 @@ var AccessorProp2 = /* @__PURE__ */ ((AccessorProp4) => {
   AccessorProp4["ClosestBranchId"] = "G";
   AccessorProp4["Creating"] = "H";
   AccessorProp4["Destroyed"] = "I";
-  AccessorProp4["PendingEffects"] = "J";
   AccessorProp4["EndNode"] = "K";
   AccessorProp4["Id"] = "L";
   AccessorProp4["LoopKey"] = "M";
   AccessorProp4["ParentBranch"] = "N";
-  AccessorProp4["PendingAsyncCount"] = "O";
+  AccessorProp4["PendingEffects"] = "J";
   AccessorProp4["PlaceholderBranch"] = "P";
   AccessorProp4["PlaceholderContent"] = "Q";
   AccessorProp4["Renderer"] = "R";
@@ -1779,7 +1779,7 @@ var [_getScopeIdentifier] = createSectionState(
   "scopeIdentifier",
   () => import_compiler7.types.identifier("undefined")
 );
-var [getBranchRendererArgs, setSectionRendererArgs] = createSectionState("rendererExpression");
+var [getBranchRendererArgs, setBranchRendererArgs] = createSectionState("rendererExpression");
 function forEachSection(fn) {
   const { sections } = (0, import_babel_utils10.getProgram)().node.extra;
   sections?.forEach(fn);
@@ -2400,7 +2400,8 @@ function _escape_style(val) {
 // src/html/writer.ts
 var K_SCOPE_ID = Symbol("Scope ID");
 var kPendingContexts = Symbol("Pending Contexts");
-var branchIdKey = Symbol();
+var kBranchId = Symbol("Branch Id");
+var kIsAsync = Symbol("Is Async");
 if (false) {
   writeScope = /* @__PURE__ */ ((writeScope2) => (scopeId, partialScope, file, loc, vars) => {
     const scope = writeScope2(scopeId, partialScope);
@@ -2500,7 +2501,8 @@ function toMemberExpression(object, key, optional) {
 
 // src/translator/util/runtime.ts
 var pureDOMFunctions = /* @__PURE__ */ new Set([
-  "_await",
+  "_await_promise",
+  "_await_content",
   "_child_setup",
   "_if",
   "_if_closure",
@@ -4403,7 +4405,7 @@ var dom_default = {
           writeSignals(childSection);
           if (!childSection.downstreamBinding || bindingHasDownstreamExpressions(childSection.downstreamBinding)) {
             if (getSectionParentIsOwner(childSection)) {
-              setSectionRendererArgs(childSection, [
+              setBranchRendererArgs(childSection, [
                 writes2,
                 walks2,
                 setup,
@@ -6054,7 +6056,7 @@ function getUsedAttrs(tagName, tag) {
         }
       }
       spreadProps.push(import_compiler30.types.spreadElement(value));
-    } else if (!seen[attr.name] || !(attr.name === "content" && tag.body.body.length)) {
+    } else if (!(seen[attr.name] || attr.name === "content" && tag.body.body.length)) {
       seen[attr.name] = attr;
       if (spreadProps) {
         spreadProps.push(toObjectProperty(attr.name, attr.value));
@@ -9211,17 +9213,37 @@ var await_default = {
         const nodeRef = tagExtra[kDOMBinding];
         const section = getSection(tag);
         const bodySection = getSectionForBody(tag.get("body"));
-        const signal = getSignal(section, nodeRef, "await");
+        const signal = getSignal(section, nodeRef, "await_promise");
         const valueExpr = node.attributes[0].value;
         signal.build = () => {
+          const branchRenderArgs = getBranchRendererArgs(bodySection);
+          const branchParams = branchRenderArgs.pop();
+          (signal.prependStatements ||= []).push(
+            import_compiler36.types.variableDeclaration("const", [
+              import_compiler36.types.variableDeclarator(
+                import_compiler36.types.identifier(bodySection.name),
+                callRuntime(
+                  "_await_content",
+                  getScopeAccessorLiteral(nodeRef, true),
+                  ...replaceNullishAndEmptyFunctionsWith0(branchRenderArgs)
+                )
+              )
+            ])
+          );
           return callRuntime(
-            "_await",
+            "_await_promise",
             getScopeAccessorLiteral(nodeRef, true),
-            ...replaceNullishAndEmptyFunctionsWith0(
-              getBranchRendererArgs(bodySection)
-            )
+            branchParams
           );
         };
+        addStatement(
+          "render",
+          section,
+          void 0,
+          import_compiler36.types.expressionStatement(
+            import_compiler36.types.callExpression(import_compiler36.types.identifier(bodySection.name), [scopeIdentifier])
+          )
+        );
         addValue(
           section,
           valueExpr.extra?.referencedBindings,

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

@@ -67,7 +67,7 @@ export declare function getSectionForBody(body: t.NodePath<t.MarkoTagBody | t.Pr
 export declare function getSection(path: t.NodePath): Section;
 export declare const getScopeIdIdentifier: (section: Section) => t.Identifier;
 export declare const getSectionParentIsOwner: (section: Section) => boolean, setSectionParentIsOwner: (section: Section, value: boolean) => void;
-export declare const getBranchRendererArgs: (section: Section) => [template?: t.Expression | undefined, walks?: t.Expression | undefined, setup?: t.Expression | undefined, params?: t.Expression | undefined], setSectionRendererArgs: (section: Section, value: [template?: t.Expression | undefined, walks?: t.Expression | undefined, setup?: t.Expression | undefined, params?: t.Expression | undefined]) => void;
+export declare const getBranchRendererArgs: (section: Section) => [template?: t.Expression | undefined, walks?: t.Expression | undefined, setup?: t.Expression | undefined, params?: t.Expression | undefined], setBranchRendererArgs: (section: Section, value: [template?: t.Expression | undefined, walks?: t.Expression | undefined, setup?: t.Expression | undefined, params?: t.Expression | undefined]) => void;
 export declare const getScopeIdentifier: (section: Section, ignoreDefault?: boolean) => t.Identifier;
 export declare function forEachSection(fn: (section: Section) => void): void;
 export declare function forEachSectionReverse(fn: (section: Section) => void): void;

package/package.json

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