marko 6.0.0-next.3.70 → 6.0.0-next.3.72

package/dist/dom.mjs

@@ -178,13 +178,13 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
           }
           if (resumes)
             try {
-              render.r = [], isResuming = !0;
+              render.r = [], isResuming = 1;
               for (let i = 0; i < resumes.length; i++) {
                 let serialized = resumes[i];
                 if (typeof serialized == "function")
                   for (let scope of serialized(serializeContext))
                     if (!$global)
-                      $global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId, $global.n = 1e6;
+                      $global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId, $global.o = 1e6;
                     else if (typeof scope == "number")
                       lastScopeId += scope;
                     else {
@@ -196,7 +196,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                       let parentBranchId = scope.g || parentBranchIds.get(scopeId);
                       if (parentBranchId && (scope.k = scopeLookup[parentBranchId]), branchIds.has(scopeId)) {
                         let branch = scope, parentBranch = branch.k;
-                        scope.k = branch, parentBranch && (branch.u = parentBranch, (parentBranch.A ||= /* @__PURE__ */ new Set()).add(
+                        scope.k = branch, parentBranch && (branch.t = parentBranch, (parentBranch.z ||= /* @__PURE__ */ new Set()).add(
                           branch
                         ));
                       }
@@ -208,7 +208,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                   );
               }
             } finally {
-              isResuming = !1;
+              isResuming = 0;
             }
         }, render;
       }
@@ -224,7 +224,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
       set: initRuntime
     });
 }
-var isResuming = !1;
+var isResuming;
 function register(id, obj) {
   return registeredValues[id] = obj, obj;
 }
@@ -629,34 +629,34 @@ function toInsertNode(startNode, endNode) {
 var pendingScopes = [];
 function createScope($global, closestBranch) {
   let scope = {
-    m: $global.n++,
-    o: 1,
+    m: $global.o++,
+    p: 1,
     k: closestBranch,
     $global
   };
   return pendingScopes.push(scope), scope;
 }
 function skipScope(scope) {
-  return scope.$global.n++;
+  return scope.$global.o++;
 }
 function finishPendingScopes() {
   for (let scope of pendingScopes)
-    scope.o = 0;
+    scope.p = 0;
   pendingScopes = [];
 }
 function findBranchWithKey(scope, key) {
   let branch = scope.k;
   for (; branch && !branch[key]; )
-    branch = branch.u;
+    branch = branch.t;
   return branch;
 }
 function destroyBranch(branch) {
-  branch.u?.A?.delete(branch), destroyNestedBranches(branch);
+  branch.t?.z?.delete(branch), destroyNestedBranches(branch);
 }
 function destroyNestedBranches(branch) {
-  branch.p = 1, branch.A?.forEach(destroyNestedBranches), branch.J?.forEach((scope) => {
-    for (let id in scope.x)
-      scope.x[id]?.abort();
+  branch.A = 1, branch.z?.forEach(destroyNestedBranches), branch.J?.forEach((scope) => {
+    for (let id in scope.u)
+      scope.u[id]?.abort();
   });
 }
 function removeAndDestroyBranch(branch) {
@@ -796,7 +796,7 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
 // src/dom/renderer.ts
 function createBranch($global, renderer, parentScope, parentNode) {
   let branch = createScope($global), parentBranch = parentScope?.k;
-  return branch._ = renderer.y || parentScope, branch.k = branch, parentBranch && (branch.u = parentBranch, (parentBranch.A ||= /* @__PURE__ */ new Set()).add(branch)), renderer.B?.(
+  return branch._ = renderer.x || parentScope, branch.k = branch, parentBranch && (branch.t = parentBranch, (parentBranch.z ||= /* @__PURE__ */ new Set()).add(branch)), renderer.B?.(
     branch,
     parentNode.namespaceURI
   ), branch;
@@ -833,11 +833,11 @@ function createContent(id, template, walks, setup, params, closures, dynamicScop
   return (owner) => ({
     m: id,
     B: clone,
-    y: owner,
+    x: owner,
     C: setup,
     l: params,
     E: closures,
-    z: dynamicScopesAccessor
+    y: dynamicScopesAccessor
   });
 }
 function registerContent(id, template, walks, setup, params, closures, dynamicScopesAccessor) {
@@ -876,11 +876,11 @@ function createCloneableHTML(html2, ns) {
 var port2 = /* @__PURE__ */ (() => {
   let { port1, port2: port22 } = new MessageChannel();
   return port1.onmessage = () => {
-    isScheduled = !1, run();
+    isScheduled = 0, run();
   }, port22;
 })(), isScheduled;
 function schedule() {
-  isScheduled || (isScheduled = !0, queueMicrotask(flushAndWaitFrame));
+  isScheduled || (isScheduled = 1, queueMicrotask(flushAndWaitFrame));
 }
 function flushAndWaitFrame() {
   run(), requestAnimationFrame(triggerMacroTask);
@@ -911,7 +911,7 @@ function value(valueAccessor, fn = () => {
 }
 function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "m") {
   return (scope) => {
-    scope.o ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
+    scope.p ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
   };
 }
 function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
@@ -921,7 +921,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
       ownerScope,
       () => {
         for (let scope of scopes)
-          !scope.o && !scope.p && childSignal(scope);
+          !scope.p && !scope.A && childSignal(scope);
       },
       -1,
       0,
@@ -933,7 +933,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.o && scope[branchAccessor] === branch && queueRender(ifScope, childSignal, -1);
+    ifScope && !ifScope.p && scope[branchAccessor] === branch && queueRender(ifScope, childSignal, -1);
   };
   return ownerSignal._ = childSignal, ownerSignal;
 }
@@ -951,7 +951,7 @@ function dynamicClosure(...closureSignals) {
   return (scope) => {
     if (scope[___scopeInstancesAccessor])
       for (let childScope of scope[___scopeInstancesAccessor])
-        childScope.o || queueRender(
+        childScope.p || queueRender(
           childScope,
           closureSignals[childScope[___signalIndexAccessor]],
           -1
@@ -1011,49 +1011,63 @@ function awaitTag(nodeAccessor, renderer) {
     let tryWithPlaceholder = findBranchWithKey(
       scope,
       "d" /* PlaceholderContent */
-    ), awaitBranch = scope[branchAccessor], referenceNode = scope[nodeAccessor], namespaceNode = (awaitBranch?.h ?? referenceNode).parentNode, thisPromise = scope[promiseAccessor] = promise.then((data2) => {
-      if (!(scope.k?.p || scope[promiseAccessor] !== thisPromise) && (scope[promiseAccessor] = void 0, runEffects(
-        prepareEffects(() => {
-          tryWithPlaceholder && placeholderShown.add(pendingEffects), (!awaitBranch || !tryWithPlaceholder) && (insertBranchBefore(
-            awaitBranch ??= scope[branchAccessor] = createAndSetupBranch(
-              scope.$global,
-              renderer,
-              scope,
-              namespaceNode
-            ),
-            referenceNode.parentNode,
-            referenceNode
-          ), referenceNode.remove()), renderer.l?.(awaitBranch, [data2]);
-        })
-      ), tryWithPlaceholder && !--tryWithPlaceholder.q)) {
-        let placeholderBranch = tryWithPlaceholder.c;
-        tryWithPlaceholder.c = void 0, placeholderBranch && (insertBranchBefore(
-          tryWithPlaceholder,
-          placeholderBranch.h.parentNode,
-          placeholderBranch.h
-        ), removeAndDestroyBranch(placeholderBranch)), tryWithPlaceholder.H && runEffects(tryWithPlaceholder.H, !0);
-      }
-    }).catch((error) => {
-      renderCatch(scope, error, !0);
-    });
-    tryWithPlaceholder ? (placeholderShown.add(pendingEffects), tryWithPlaceholder.q || (tryWithPlaceholder.q = 0, requestAnimationFrame(() => {
-      if (tryWithPlaceholder.q && !tryWithPlaceholder.p) {
-        let placeholderBranch = tryWithPlaceholder.c = createAndSetupBranch(
-          scope.$global,
-          tryWithPlaceholder.d,
-          tryWithPlaceholder._,
-          tryWithPlaceholder.h.parentNode
-        );
-        insertBranchBefore(
-          placeholderBranch,
-          tryWithPlaceholder.h.parentNode,
-          tryWithPlaceholder.h
-        ), tempDetatchBranch(tryWithPlaceholder);
-      }
-    })), tryWithPlaceholder.q++) : awaitBranch && (awaitBranch.h.parentNode.insertBefore(
+    ), referenceNode = scope[nodeAccessor], awaitBranch = scope[branchAccessor];
+    tryWithPlaceholder ? (placeholderShown.add(pendingEffects), !scope[promiseAccessor] && (tryWithPlaceholder.n = (tryWithPlaceholder.n || 0) + 1) === 1 && requestAnimationFrame(
+      () => tryWithPlaceholder.n && runEffects(
+        prepareEffects(
+          () => queueRender(
+            tryWithPlaceholder,
+            () => {
+              let placeholderBranch = tryWithPlaceholder.c = createAndSetupBranch(
+                scope.$global,
+                tryWithPlaceholder.d,
+                tryWithPlaceholder._,
+                tryWithPlaceholder.h.parentNode
+              );
+              insertBranchBefore(
+                placeholderBranch,
+                tryWithPlaceholder.h.parentNode,
+                tryWithPlaceholder.h
+              ), tempDetatchBranch(tryWithPlaceholder);
+            },
+            -1
+          )
+        )
+      )
+    )) : awaitBranch && (awaitBranch.h.parentNode.insertBefore(
       referenceNode,
       awaitBranch.h
     ), tempDetatchBranch(awaitBranch));
+    let thisPromise = scope[promiseAccessor] = promise.then(
+      (data2) => {
+        thisPromise === scope[promiseAccessor] && (scope[promiseAccessor] = 0, schedule(), queueRender(
+          scope,
+          () => {
+            if ((!awaitBranch || !tryWithPlaceholder) && (insertBranchBefore(
+              awaitBranch ??= scope[branchAccessor] = createAndSetupBranch(
+                scope.$global,
+                renderer,
+                scope,
+                referenceNode.parentNode
+              ),
+              referenceNode.parentNode,
+              referenceNode
+            ), referenceNode.remove()), renderer.l?.(awaitBranch, [data2]), tryWithPlaceholder && (placeholderShown.add(pendingEffects), !--tryWithPlaceholder.n)) {
+              let placeholderBranch = tryWithPlaceholder.c;
+              tryWithPlaceholder.c = 0, placeholderBranch && (insertBranchBefore(
+                tryWithPlaceholder,
+                placeholderBranch.h.parentNode,
+                placeholderBranch.h
+              ), removeAndDestroyBranch(placeholderBranch)), tryWithPlaceholder.H && runEffects(tryWithPlaceholder.H, !0);
+            }
+          },
+          -1
+        ));
+      },
+      (error) => {
+        thisPromise === scope[promiseAccessor] && (tryWithPlaceholder && (tryWithPlaceholder.n = 0), scope[promiseAccessor] = 0, schedule(), queueRender(scope, renderCatch, -1, error));
+      }
+    );
   };
 }
 function createTry(nodeAccessor, tryContent) {
@@ -1071,11 +1085,11 @@ function createTry(nodeAccessor, tryContent) {
     ));
   };
 }
-function renderCatch(scope, error, async) {
+function renderCatch(scope, error) {
   let tryWithCatch = findBranchWithKey(scope, "b" /* CatchContent */);
   if (tryWithCatch) {
     let placeholderBranch = tryWithCatch.c;
-    placeholderBranch && (tryWithCatch._["d" /* ConditionalScope */ + tryWithCatch.a] = placeholderBranch, destroyBranch(tryWithCatch)), caughtError.add(pendingEffects), setConditionalRenderer(
+    placeholderBranch && (tryWithCatch.n = 0, tryWithCatch._["d" /* ConditionalScope */ + tryWithCatch.a] = placeholderBranch, destroyBranch(tryWithCatch)), caughtError.add(pendingEffects), setConditionalRenderer(
       tryWithCatch._,
       tryWithCatch.a,
       tryWithCatch.b,
@@ -1084,11 +1098,7 @@ function renderCatch(scope, error, async) {
       tryWithCatch._["d" /* ConditionalScope */ + tryWithCatch.a],
       [error]
     );
-  } else if (async)
-    setTimeout(() => {
-      throw error;
-    });
-  else
+  } else
     throw error;
 }
 function conditional(nodeAccessor, ...branches) {
@@ -1123,15 +1133,15 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
             0,
             content,
             createAndSetupBranch
-          ), content.z && subscribeToScopeSet(
+          ), content.y && subscribeToScopeSet(
+            content.x,
             content.y,
-            content.z,
             scope[childScopeAccessor]["d" /* ConditionalScope */ + 0]
           );
         }
-      } else normalizedRenderer?.z && subscribeToScopeSet(
+      } else normalizedRenderer?.y && subscribeToScopeSet(
+        normalizedRenderer.x,
         normalizedRenderer.y,
-        normalizedRenderer.z,
         scope[childScopeAccessor]
       );
     if (normalizedRenderer) {
@@ -1149,10 +1159,7 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
             normalizedRenderer._ ? args[0] : args
           );
         else {
-          let inputWithContent = getContent ? {
-            ...args,
-            content: getContent(scope)
-          } : args || {};
+          let inputWithContent = getContent ? { ...args, content: getContent(scope) } : args || {};
           normalizedRenderer.l(
             scope[childScopeAccessor],
             normalizedRenderer._ ? inputWithContent : [inputWithContent]
@@ -1225,21 +1232,21 @@ function byFirstArg(name) {
 }
 
 // src/dom/queue.ts
-var pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map(), caughtError = /* @__PURE__ */ new WeakSet(), placeholderShown = /* @__PURE__ */ new WeakSet(), pendingEffects = [], rendering = !1, scopeKeyOffset = 1e3;
+var pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map(), caughtError = /* @__PURE__ */ new WeakSet(), placeholderShown = /* @__PURE__ */ new WeakSet(), pendingEffects = [], rendering, scopeKeyOffset = 1e3;
 function queueRender(scope, signal, signalKey, value2, scopeKey = scope.m) {
   let key = scopeKey * scopeKeyOffset + signalKey, existingRender = signalKey >= 0 && pendingRendersLookup.get(key);
   if (existingRender)
     existingRender.I = value2;
   else {
     let render = {
-      t: key,
+      q: key,
       D: scope,
       L: signal,
       I: value2
     }, i = pendingRenders.push(render) - 1;
     for (; i; ) {
       let parentIndex = i - 1 >> 1, parent = pendingRenders[parentIndex];
-      if (key - parent.t >= 0) break;
+      if (key - parent.q >= 0) break;
       pendingRenders[i] = parent, i = parentIndex;
     }
     signalKey >= 0 && pendingRendersLookup.set(key, render), pendingRenders[i] = render;
@@ -1251,9 +1258,9 @@ function queueEffect(scope, fn) {
 function run() {
   let effects = pendingEffects;
   try {
-    rendering = !0, runRenders();
+    rendering = 1, runRenders();
   } finally {
-    pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map(), pendingEffects = [], rendering = !1;
+    pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map(), pendingEffects = [], rendering = 0;
   }
   runEffects(effects);
 }
@@ -1261,9 +1268,9 @@ function prepareEffects(fn) {
   let prevRenders = pendingRenders, prevRendersLookup = pendingRendersLookup, prevEffects = pendingEffects, preparedEffects = pendingEffects = [];
   pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map();
   try {
-    rendering = !0, fn(), runRenders();
+    rendering = 1, fn(), runRenders();
   } finally {
-    rendering = !1, pendingRenders = prevRenders, pendingRendersLookup = prevRendersLookup, pendingEffects = prevEffects;
+    rendering = 0, pendingRenders = prevRenders, pendingRendersLookup = prevRendersLookup, pendingEffects = prevEffects;
   }
   return preparedEffects;
 }
@@ -1278,16 +1285,16 @@ function runRenders() {
   for (; pendingRenders.length; ) {
     let render = pendingRenders[0], item = pendingRenders.pop();
     if (render !== item) {
-      let i = 0, mid = pendingRenders.length >> 1, key = (pendingRenders[0] = item).t;
+      let i = 0, mid = pendingRenders.length >> 1, key = (pendingRenders[0] = item).q;
       for (; i < mid; ) {
         let bestChild = (i << 1) + 1, right = bestChild + 1;
-        if (right < pendingRenders.length && pendingRenders[right].t - pendingRenders[bestChild].t < 0 && (bestChild = right), pendingRenders[bestChild].t - key >= 0)
+        if (right < pendingRenders.length && pendingRenders[right].q - pendingRenders[bestChild].q < 0 && (bestChild = right), pendingRenders[bestChild].q - key >= 0)
           break;
         pendingRenders[i] = pendingRenders[bestChild], i = bestChild;
       }
       pendingRenders[i] = item;
     }
-    render.D.k?.p || runRender(render);
+    render.D.k?.A || runRender(render);
   }
   finishPendingScopes();
 }
@@ -1296,16 +1303,16 @@ var runRender = (render) => render.L(render.D, render.I), enableCatch = () => {
   };
   let handlePendingTry = (fn, scope, branch) => {
     for (; branch; ) {
-      if (branch.q)
+      if (branch.n)
         return (branch.H ||= []).push(fn, scope);
-      branch = branch.u;
+      branch = branch.t;
     }
   };
   runEffects = /* @__PURE__ */ ((runEffects2) => (effects, checkPending = placeholderShown.has(effects)) => {
     if (checkPending || caughtError.has(effects)) {
       let i = 0, fn, scope, branch;
       for (; i < effects.length; )
-        fn = effects[i++], scope = effects[i++], branch = scope.k, !branch?.p && !(checkPending && handlePendingTry(fn, scope, branch)) && fn(scope, scope);
+        fn = effects[i++], scope = effects[i++], branch = scope.k, !branch?.A && !(checkPending && handlePendingTry(fn, scope, branch)) && fn(scope, scope);
     } else
       runEffects2(effects);
   })(runEffects), runRender = /* @__PURE__ */ ((runRender2) => (render) => {
@@ -1319,11 +1326,11 @@ var runRender = (render) => render.L(render.D, render.I), enableCatch = () => {
 
 // src/dom/abort-signal.ts
 function resetAbortSignal(scope, id) {
-  let ctrl = scope.x?.[id];
-  ctrl && (queueEffect(ctrl, abort), scope.x[id] = void 0);
+  let ctrl = scope.u?.[id];
+  ctrl && (queueEffect(ctrl, abort), scope.u[id] = void 0);
 }
 function getAbortSignal(scope, id) {
-  return scope.k && (scope.k.J ||= /* @__PURE__ */ new Set()).add(scope), ((scope.x ||= {})[id] ||= new AbortController()).signal;
+  return scope.k && (scope.k.J ||= /* @__PURE__ */ new Set()).add(scope), ((scope.u ||= {})[id] ||= new AbortController()).signal;
 }
 function abort(ctrl) {
   ctrl.abort();
@@ -1378,17 +1385,17 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
   render(out, component, renderer, args) {
     let branch = component.scope;
     branch || (branch = classIdToBranch.get(component.id), branch && (component.scope = branch, classIdToBranch.delete(component.id)));
-    let existing = !1;
+    let existing;
     if (typeof args[0] == "object" && "renderBody" in args[0]) {
       let input = args[0], normalizedInput = args[0] = {};
       for (let key in input)
         normalizedInput[key === "renderBody" ? "content" : key] = input[key];
     }
     if (component.effects = prepareEffects(() => {
-      branch ? existing = !0 : (out.global.n ||= 0, branch = component.scope = createAndSetupBranch(
+      branch ? existing = 1 : (out.global.o ||= 0, branch = component.scope = createAndSetupBranch(
         out.global,
         renderer,
-        renderer.y,
+        renderer.x,
         document.body
       )), renderer.l?.(branch, renderer._ ? args[0] : args);
     }), !existing)
@@ -1410,12 +1417,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 = {
-    n: 0,
+    o: 0,
     runtimeId: DEFAULT_RUNTIME_ID,
     renderId: DEFAULT_RENDER_ID,
     ...$global
   }) : $global = {
-    n: 0,
+    o: 0,
     runtimeId: DEFAULT_RUNTIME_ID,
     renderId: DEFAULT_RENDER_ID
   }, position) {

package/dist/html.js

@@ -2002,9 +2002,9 @@ function render(input = {}) {
     null,
     null
   );
-  return head.render(this, input), new ServerRenderResult(head);
+  return head.render(this, input), new ServerRendered(head);
 }
-var ServerRenderResult = class {
+var ServerRendered = class {
   #head;
   #cachedPromise = null;
   constructor(head) {
@@ -2058,11 +2058,12 @@ var ServerRenderResult = class {
     );
   }
   toReadable() {
+    let encoder = new TextEncoder();
     return new ReadableStream({
       start: (ctrl) => {
         this.#read(
           (html) => {
-            ctrl.enqueue(html);
+            ctrl.enqueue(encoder.encode(html));
           },
           (err) => {
             ctrl.error(err);

package/dist/html.mjs

@@ -1923,9 +1923,9 @@ function render(input = {}) {
     null,
     null
   );
-  return head.render(this, input), new ServerRenderResult(head);
+  return head.render(this, input), new ServerRendered(head);
 }
-var ServerRenderResult = class {
+var ServerRendered = class {
   #head;
   #cachedPromise = null;
   constructor(head) {
@@ -1979,11 +1979,12 @@ var ServerRenderResult = class {
     );
   }
   toReadable() {
+    let encoder = new TextEncoder();
     return new ReadableStream({
       start: (ctrl) => {
         this.#read(
           (html) => {
-            ctrl.enqueue(html);
+            ctrl.enqueue(encoder.encode(html));
           },
           (err) => {
             ctrl.error(err);