marko 6.0.112 → 6.0.114

package/dist/debug/dom.mjs

@@ -512,60 +512,64 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         let lastScopeId = 0;
         const nextToken = () => lastToken = visitText.slice(
           lastTokenIndex,
-          // eslint-disable-next-line no-cond-assign
-          (lastTokenIndex = visitText.indexOf(" ", lastTokenIndex) + 1) ? lastTokenIndex - 1 : visitText.length
+          (lastTokenIndex = visitText.indexOf(" ", lastTokenIndex) + 1 || visitText.length + 1) - 1
         );
-        render.w = (effects = []) => {
-          try {
-            walk2();
-            isResuming = 1;
-            for (const serialized of resumes = render.r || []) {
-              if (typeof serialized === "string") {
-                lastEffect = serialized;
-              } else if (typeof serialized === "number") {
-                effects.push(
-                  registeredValues[lastEffect],
-                  scopeLookup[serialized] ||= {
-                    ["#Id" /* Id */]: serialized
-                  }
-                );
-              } else {
-                for (const scope of serialized(serializeContext)) {
-                  if (!$global) {
-                    $global = scope || {};
-                    $global.runtimeId = runtimeId;
-                    $global.renderId = renderId;
-                  } else if (typeof scope === "number") {
-                    lastScopeId += scope;
-                  } else {
-                    scopeLookup[scope["#Id" /* Id */] = ++lastScopeId] = scope;
-                    scope["$global" /* Global */] = $global;
-                    if (branchesEnabled) {
-                      scope["#ClosestBranch" /* ClosestBranch */] = scopeLookup[scope["#ClosestBranchId" /* ClosestBranchId */]];
+        render.m = (effects = []) => {
+          for (const serialized of resumes = render.r || []) {
+            if (typeof serialized === "string") {
+              lastTokenIndex = 0;
+              visitText = serialized;
+              while (nextToken()) {
+                if (/\D/.test(lastToken)) {
+                  lastEffect = registeredValues[lastToken];
+                } else {
+                  effects.push(
+                    lastEffect,
+                    scopeLookup[lastToken] ||= {
+                      ["#Id" /* Id */]: +lastToken
                     }
+                  );
+                }
+              }
+            } else {
+              for (const scope of serialized(serializeContext)) {
+                if (!$global) {
+                  $global = scope || {};
+                  $global.runtimeId = runtimeId;
+                  $global.renderId = renderId;
+                } else if (typeof scope === "number") {
+                  lastScopeId += scope;
+                } else {
+                  scopeLookup[scope["#Id" /* Id */] = ++lastScopeId] = scope;
+                  scope["$global" /* Global */] = $global;
+                  if (branchesEnabled) {
+                    scope["#ClosestBranch" /* ClosestBranch */] = scopeLookup[scope["#ClosestBranchId" /* ClosestBranchId */]];
                   }
                 }
               }
             }
-            for (visit of visits = render.v) {
-              lastTokenIndex = render.i.length;
-              visitText = visit.data;
-              visitType = visitText[lastTokenIndex++];
-              visitScope = scopeLookup[+nextToken(
-                /* read scope id */
-              )] ||= {
-                ["#Id" /* Id */]: +lastToken
-              };
-              if (visitType === "*" /* Node */) {
-                visitScope["Getter:" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling);
-              } else if (branchesEnabled) {
-                visitBranches();
-              }
+          }
+          for (visit of visits = render.v) {
+            lastTokenIndex = render.i.length;
+            visitText = visit.data;
+            visitType = visitText[lastTokenIndex++];
+            visitScope = scopeLookup[+nextToken(
+              /* read scope id */
+            )] ||= {
+              ["#Id" /* Id */]: +lastToken
+            };
+            if (visitType === "*" /* Node */) {
+              visitScope["Getter:" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling);
+            } else if (branchesEnabled) {
+              visitBranches();
             }
-            runEffects(effects);
-          } finally {
-            isResuming = visits.length = resumes.length = 0;
           }
+          visits.length = resumes.length = 0;
+          return effects;
+        };
+        render.w = () => {
+          walk2();
+          runResumeEffects(render);
         };
         return render;
       })
@@ -574,7 +578,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
   if (renders) {
     initRuntime(renders);
     for (const renderId in renders) {
-      resumeRender(renderId).w();
+      runResumeEffects(resumeRender(renderId));
     }
   } else {
     defineRuntime({
@@ -584,6 +588,14 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
   }
 }
 var isResuming;
+function runResumeEffects(render) {
+  try {
+    isResuming = 1;
+    runEffects(render.m(), 1);
+  } finally {
+    isResuming = 0;
+  }
+}
 function getRegisteredWithScope(id, scope) {
   const val = registeredValues[id];
   return scope ? val(scope) : val;
@@ -1670,24 +1682,52 @@ function longestIncreasingSubsequence(a) {
 }
 
 // src/dom/control-flow.ts
-function _await(nodeAccessor, template, walks, setup, params) {
+function _await_promise(nodeAccessor, params) {
   if (false) nodeAccessor = decodeAccessor4(nodeAccessor);
   const promiseAccessor = "Promise:" /* Promise */ + nodeAccessor;
   const branchAccessor = "BranchScopes:" /* BranchScopes */ + nodeAccessor;
-  const renderer = _content("", template, walks, setup)();
-  enableBranches();
+  const rendererAccessor = "ConditionalRenderer:" /* ConditionalRenderer */ + nodeAccessor;
+  _enable_catch();
   return (scope, promise) => {
-    const referenceNode = scope[nodeAccessor];
+    let awaitCounter;
+    let renderData;
     const tryWithPlaceholder = findBranchWithKey(
       scope,
       "#PlaceholderContent" /* PlaceholderContent */
     );
-    let awaitBranch = scope[branchAccessor];
     if (tryWithPlaceholder) {
+      renderData = self[tryWithPlaceholder["$global" /* Global */].runtimeId]?.[tryWithPlaceholder["$global" /* Global */].renderId];
+      awaitCounter = tryWithPlaceholder["#AwaitCounter" /* AwaitCounter */] ||= renderData?.p?.[tryWithPlaceholder["#Id" /* Id */]];
+      if (!awaitCounter?.i) {
+        awaitCounter = tryWithPlaceholder["#AwaitCounter" /* AwaitCounter */] = {
+          d: 1,
+          i: 0,
+          c() {
+            if (!--awaitCounter.i) {
+              const placeholderBranch = tryWithPlaceholder["#PlaceholderBranch" /* PlaceholderBranch */];
+              tryWithPlaceholder["#PlaceholderBranch" /* PlaceholderBranch */] = 0;
+              if (placeholderBranch) {
+                placeholderBranch["#StartNode" /* StartNode */].parentNode.insertBefore(
+                  tryWithPlaceholder["#StartNode" /* StartNode */].parentNode,
+                  placeholderBranch["#StartNode" /* StartNode */]
+                );
+                removeAndDestroyBranch(placeholderBranch);
+              }
+              queueEffect(tryWithPlaceholder, (scope2) => {
+                const pendingEffects2 = scope2["#PendingEffects" /* PendingEffects */];
+                if (pendingEffects2) {
+                  scope2["#PendingEffects" /* PendingEffects */] = [];
+                  runEffects(pendingEffects2, true);
+                }
+              });
+            }
+          }
+        };
+      }
       placeholderShown.add(pendingEffects);
-      if (!scope[promiseAccessor] && (tryWithPlaceholder["#PendingAsyncCount" /* PendingAsyncCount */] = (tryWithPlaceholder["#PendingAsyncCount" /* PendingAsyncCount */] || 0) + 1) === 1) {
+      if (!scope[promiseAccessor] && !awaitCounter.i++) {
         requestAnimationFrame(
-          () => tryWithPlaceholder["#PendingAsyncCount" /* PendingAsyncCount */] && runEffects(
+          () => awaitCounter.i && runEffects(
             prepareEffects(
               () => queueRender(
                 tryWithPlaceholder,
@@ -1710,12 +1750,12 @@ function _await(nodeAccessor, template, walks, setup, params) {
           )
         );
       }
-    } else if (awaitBranch && !scope[promiseAccessor]) {
-      awaitBranch["#StartNode" /* StartNode */].parentNode.insertBefore(
-        referenceNode,
-        awaitBranch["#StartNode" /* StartNode */]
+    } else if (scope[branchAccessor] && !scope[promiseAccessor]) {
+      scope[branchAccessor]["#StartNode" /* StartNode */].parentNode.insertBefore(
+        scope[nodeAccessor],
+        scope[branchAccessor]["#StartNode" /* StartNode */]
       );
-      tempDetachBranch(awaitBranch);
+      tempDetachBranch(scope[branchAccessor]);
     }
     const thisPromise = scope[promiseAccessor] = promise.then(
       (data) => {
@@ -1725,45 +1765,47 @@ function _await(nodeAccessor, template, walks, setup, params) {
           queueRender(
             scope,
             () => {
-              if (awaitBranch) {
+              if (scope[branchAccessor]) {
                 if (!tryWithPlaceholder) {
-                  referenceNode.replaceWith(
-                    awaitBranch["#StartNode" /* StartNode */].parentNode
+                  scope[nodeAccessor].replaceWith(
+                    scope[branchAccessor]["#StartNode" /* StartNode */].parentNode
                   );
                 }
               } else {
                 insertBranchBefore(
-                  awaitBranch = scope[branchAccessor] = createAndSetupBranch(
+                  scope[branchAccessor] = createAndSetupBranch(
                     scope["$global" /* Global */],
-                    renderer,
+                    scope[rendererAccessor],
                     scope,
-                    referenceNode.parentNode
+                    scope[nodeAccessor].parentNode
                   ),
-                  referenceNode.parentNode,
-                  referenceNode
+                  scope[nodeAccessor].parentNode,
+                  scope[nodeAccessor]
                 );
-                referenceNode.remove();
+                scope[nodeAccessor].remove();
               }
-              params?.(awaitBranch, [data]);
-              if (tryWithPlaceholder) {
+              params?.(scope[branchAccessor], [data]);
+              if (awaitCounter) {
                 placeholderShown.add(pendingEffects);
-                if (!--tryWithPlaceholder["#PendingAsyncCount" /* PendingAsyncCount */]) {
-                  const placeholderBranch = tryWithPlaceholder["#PlaceholderBranch" /* PlaceholderBranch */];
-                  tryWithPlaceholder["#PlaceholderBranch" /* PlaceholderBranch */] = 0;
-                  if (placeholderBranch) {
-                    placeholderBranch["#StartNode" /* StartNode */].parentNode.insertBefore(
-                      tryWithPlaceholder["#StartNode" /* StartNode */].parentNode,
-                      placeholderBranch["#StartNode" /* StartNode */]
-                    );
-                    removeAndDestroyBranch(placeholderBranch);
+                awaitCounter.c();
+                if (!awaitCounter.d) {
+                  const fnScopes = /* @__PURE__ */ new Map();
+                  const effects = renderData.m();
+                  for (let i = 0; i < pendingEffects.length; ) {
+                    const fn = pendingEffects[i++];
+                    let scopes = fnScopes.get(fn);
+                    if (!scopes) {
+                      fnScopes.set(fn, scopes = /* @__PURE__ */ new Set());
+                    }
+                    scopes.add(pendingEffects[i++]);
                   }
-                  queueEffect(tryWithPlaceholder, (scope2) => {
-                    const pendingEffects2 = scope2["#PendingEffects" /* PendingEffects */];
-                    if (pendingEffects2) {
-                      scope2["#PendingEffects" /* PendingEffects */] = [];
-                      runEffects(pendingEffects2, true);
+                  for (let i = 0; i < effects.length; ) {
+                    const fn = effects[i++];
+                    const scope2 = effects[i++];
+                    if (!fnScopes.get(fn)?.has(scope2)) {
+                      queueEffect(scope2, fn);
                     }
-                  });
+                  }
                 }
               }
             },
@@ -1773,8 +1815,7 @@ function _await(nodeAccessor, template, walks, setup, params) {
       },
       (error) => {
         if (thisPromise === scope[promiseAccessor]) {
-          if (tryWithPlaceholder)
-            tryWithPlaceholder["#PendingAsyncCount" /* PendingAsyncCount */] = 0;
+          if (awaitCounter) awaitCounter.i = 0;
           scope[promiseAccessor] = 0;
           schedule();
           queueRender(scope, renderCatch, -1, error);
@@ -1783,6 +1824,13 @@ function _await(nodeAccessor, template, walks, setup, params) {
     );
   };
 }
+function _await_content(nodeAccessor, template, walks, setup) {
+  const rendererAccessor = "ConditionalRenderer:" /* ConditionalRenderer */ + (true ? nodeAccessor : decodeAccessor4(nodeAccessor));
+  const renderer = _content("", template, walks, setup)();
+  return (scope) => {
+    scope[rendererAccessor] = renderer;
+  };
+}
 function _try(nodeAccessor, template, walks, setup) {
   if (false) nodeAccessor = decodeAccessor4(nodeAccessor);
   const branchAccessor = "BranchScopes:" /* BranchScopes */ + nodeAccessor;
@@ -1814,7 +1862,8 @@ function renderCatch(scope, error) {
     const owner = tryWithCatch["_" /* Owner */];
     const placeholderBranch = tryWithCatch["#PlaceholderBranch" /* PlaceholderBranch */];
     if (placeholderBranch) {
-      tryWithCatch["#PendingAsyncCount" /* PendingAsyncCount */] = 0;
+      if (tryWithCatch["#AwaitCounter" /* AwaitCounter */])
+        tryWithCatch["#AwaitCounter" /* AwaitCounter */].i = 0;
       owner["BranchScopes:" /* BranchScopes */ + tryWithCatch["#BranchAccessor" /* BranchAccessor */]] = placeholderBranch;
       destroyBranch(tryWithCatch);
     }
@@ -2191,7 +2240,7 @@ var _enable_catch = () => {
   enableBranches();
   const handlePendingTry = (fn, scope, branch) => {
     while (branch) {
-      if (branch["#PendingAsyncCount" /* PendingAsyncCount */]) {
+      if (branch["#AwaitCounter" /* AwaitCounter */]?.i) {
         return (branch["#PendingEffects" /* PendingEffects */] ||= []).push(fn, scope);
       }
       branch = branch["#ParentBranch" /* ParentBranch */];
@@ -2472,7 +2521,8 @@ export {
   _attrs_partial,
   _attrs_partial_content,
   _attrs_script,
-  _await,
+  _await_content,
+  _await_promise,
   _call,
   _child_setup,
   _closure,

package/dist/debug/html.js

@@ -374,7 +374,7 @@ var REORDER_RUNTIME_CODE = true ? (
   let onNextSibling,
     placeholder,
     nextSibling,
-    placeholders = {},
+    placeholders = runtime.p = {},
     replace = (id, container) => runtime.l[id].replaceWith(...container.childNodes);
   runtime.d.head.append(
     runtime.d.querySelector("style[" + runtime.i + "]") || ""
@@ -424,7 +424,7 @@ var REORDER_RUNTIME_CODE = true ? (
     }
   };
 })`
-) : `(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)))}})`;
+) : `(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();
@@ -1792,6 +1792,9 @@ function writeScript(script) {
   $chunk.writeScript(script);
 }
 function _script(scopeId, registryId) {
+  if ($chunk.context?.[kIsAsync]) {
+    _resume_branch(scopeId);
+  }
   $chunk.boundary.state.needsMainRuntime = true;
   $chunk.writeEffect(scopeId, registryId);
 }
@@ -1831,13 +1834,13 @@ function normalizeServerRender(value) {
   }
 }
 var kPendingContexts = Symbol("Pending Contexts");
-function withContext(key, value, cb) {
+function withContext(key, value, cb, cbValue) {
   const ctx = $chunk.context ||= { [kPendingContexts]: 0 };
   const prev = ctx[key];
   ctx[kPendingContexts]++;
   ctx[key] = value;
   try {
-    return cb();
+    return cb(cbValue);
   } finally {
     ctx[kPendingContexts]--;
     ctx[key] = prev;
@@ -1906,17 +1909,21 @@ function _hoist(scopeId, id) {
   return _resume(getter, id, scopeId);
 }
 function _resume_branch(scopeId) {
-  const branchId = $chunk.context?.[branchIdKey];
+  const branchId = $chunk.context?.[kBranchId];
   if (branchId !== void 0 && branchId !== scopeId) {
     writeScope(scopeId, { ["#ClosestBranchId" /* ClosestBranchId */]: branchId });
   }
 }
-var branchIdKey = Symbol();
+var kBranchId = Symbol("Branch Id");
+var 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, true, cb, value);
 }
 function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
   const { state } = $chunk.boundary;
@@ -2300,7 +2307,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
               $chunk.writeHTML(
                 $chunk.boundary.state.mark("[" /* BranchStart */, "")
               );
-              content(value);
+              withIsAsync(content, value);
               $chunk.writeHTML(
                 $chunk.boundary.state.mark(
                   "]" /* BranchEnd */,
@@ -2308,7 +2315,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
                 )
               );
             } else {
-              content(value);
+              withIsAsync(content, value);
             }
           });
           boundary.endAsync(chunk);
@@ -2328,11 +2335,11 @@ function _try(scopeId, accessor, content, input) {
   const placeholderContent = normalizeDynamicRenderer(input.placeholder);
   if (catchContent) {
     tryCatch(
-      placeholderContent ? () => tryPlaceholder(content, placeholderContent) : content,
+      placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId) : content,
       catchContent
     );
   } else if (placeholderContent) {
-    tryPlaceholder(content, placeholderContent);
+    tryPlaceholder(content, placeholderContent, branchId);
   } else {
     content();
   }
@@ -2348,7 +2355,7 @@ function _try(scopeId, accessor, content, input) {
     )
   );
 }
-function tryPlaceholder(content, placeholder) {
+function tryPlaceholder(content, placeholder, branchId) {
   const chunk = $chunk;
   const { boundary } = chunk;
   const body = new Chunk(boundary, null, chunk.context);
@@ -2356,9 +2363,10 @@ function tryPlaceholder(content, placeholder) {
     chunk.append(body);
     return;
   }
-  chunk.next = $chunk = new Chunk(boundary, chunk.next, body.context);
+  chunk.next = $chunk = new Chunk(boundary, chunk.next, chunk.context);
   chunk.placeholderBody = body;
   chunk.placeholderRender = placeholder;
+  chunk.placeholderBranchId = branchId;
 }
 function tryCatch(content, catchContent) {
   const chunk = $chunk;
@@ -2534,18 +2542,16 @@ var Chunk = class {
   reorderId = null;
   placeholderBody = null;
   placeholderRender = null;
+  placeholderBranchId = null;
   writeHTML(html) {
     this.html += html;
   }
   writeEffect(scopeId, registryId) {
     if (this.lastEffect === registryId) {
-      this.effects += "," + scopeId;
+      this.effects += " " + scopeId;
     } else {
       this.lastEffect = registryId;
-      this.effects = concatEffects(
-        this.effects,
-        '"' + registryId + '",' + scopeId
-      );
+      this.effects = concatEffects(this.effects, registryId + " " + scopeId);
     }
   }
   writeScript(script) {
@@ -2562,7 +2568,8 @@ var Chunk = class {
       const body = this.placeholderBody.consume();
       if (body.async) {
         const { state } = this.boundary;
-        const reorderId = body.reorderId = state.nextReorderId();
+        const reorderId = body.reorderId = this.placeholderBranchId ? this.placeholderBranchId + "" : state.nextReorderId();
+        this.placeholderBranchId = null;
         this.writeHTML(state.mark("!^" /* Placeholder */, reorderId));
         const after = this.render(this.placeholderRender);
         if (after !== this) {
@@ -2634,7 +2641,7 @@ var Chunk = class {
     }
     if (effects) {
       needsWalk = true;
-      state.resumes = state.resumes ? state.resumes + "," + effects : effects;
+      state.resumes = state.resumes ? state.resumes + ',"' + effects + '"' : '"' + effects + '"';
     }
     if (state.resumes) {
       if (state.hasWrittenResume) {
@@ -2698,12 +2705,12 @@ var Chunk = class {
           }
           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>";
       }
@@ -2762,7 +2769,7 @@ function flushSerializer(boundary) {
       if (scopeIdDelta) serializeData.push(scopeIdDelta);
       serializeData.push(scope);
     }
-    state.resumes = concatEffects(
+    state.resumes = concatSequence(
       state.resumes,
       serializer.stringify(serializeData, boundary)
     );
@@ -2777,6 +2784,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) {