marko 6.0.0-next.3.24 → 6.0.0-next.3.25

package/dist/debug/dom.js

@@ -1892,6 +1892,7 @@ function runRenders() {
   finishPendingScopes();
 }
 function comparePendingRenders(a, b) {
+  if (a.___scope.___pending || b.___scope.___pending) return 0;
   const aStart = ownerStartNode(a.___scope);
   const bStart = ownerStartNode(b.___scope);
   return aStart === bStart ? 0 : aStart ? bStart ? aStart.compareDocumentPosition(bStart) & 2 ? -1 : 1 : -1 : 1;

package/dist/debug/dom.mjs

@@ -1805,6 +1805,7 @@ function runRenders() {
   finishPendingScopes();
 }
 function comparePendingRenders(a, b) {
+  if (a.___scope.___pending || b.___scope.___pending) return 0;
   const aStart = ownerStartNode(a.___scope);
   const bStart = ownerStartNode(b.___scope);
   return aStart === bStart ? 0 : aStart ? bStart ? aStart.compareDocumentPosition(bStart) & 2 ? -1 : 1 : -1 : 1;

package/dist/dom.js

@@ -133,14 +133,14 @@ function triggerMacroTask() {
 var pendingScopes = [];
 function createScope($global) {
   let scope = {
-    g: 1,
+    e: 1,
     $global
   };
   return pendingScopes.push(scope), scope;
 }
 function finishPendingScopes() {
   for (let scope of pendingScopes)
-    scope.g = 0;
+    scope.e = 0;
   pendingScopes = [];
 }
 var emptyScope = createScope({});
@@ -150,8 +150,8 @@ function getEmptyScope(marker) {
 function destroyBranch(branch) {
   if (branch.y = 1, branch.m?.forEach(destroyBranch), branch.n)
     for (let scope of branch.n)
-      for (let id in scope.h)
-        scope.h[id]?.abort();
+      for (let id in scope.j)
+        scope.j[id]?.abort();
 }
 function removeAndDestroyBranch(branch) {
   destroyBranch(branch);
@@ -376,15 +376,15 @@ var registeredValues = {}, Render = class {
         else if (token === "$" /* ClosestBranch */)
           closestBranchMarkers.set(scopeId, visit);
         else if (token === "[" /* BranchStart */)
-          this.f && (dataIndex && branchEnd(this.f, visit, visit), this.o.push(this.f)), this.f = scopeId, scope.a = visit;
+          this.h && (dataIndex && branchEnd(this.h, visit, visit), this.o.push(this.h)), this.h = scopeId, scope.a = visit;
         else if (token === "]" /* BranchEnd */) {
           scope[data3] = visit;
           let curParent = visit.parentNode, startNode = branchEnd(
-            this.f,
+            this.h,
             visit,
             visit
           ).a;
-          curParent !== startNode.parentNode && curParent.prepend(startNode), this.f = this.o.pop();
+          curParent !== startNode.parentNode && curParent.prepend(startNode), this.h = this.o.pop();
         } else if (token === "|" /* BranchSingleNode */) {
           let next = data3.indexOf(" "), curNode = scope[~next ? data3.slice(0, next) : data3] = visit;
           for (; ~next; ) {
@@ -902,13 +902,13 @@ function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
       return;
     let childScope = scope[nodeAccessor + "!" /* ConditionalScope */];
     if (attrsOrOp === MARK || attrsOrOp === CLEAN)
-      return renderer.e?.(childScope, attrsOrOp);
+      return renderer.f?.(childScope, attrsOrOp);
     let content = getContent?.(scope);
     if (typeof renderer == "string")
       setConditionalRendererOnlyChild(childScope, 0, content), attrs(childScope, 0, attrsOrOp());
-    else if (renderer.e) {
+    else if (renderer.f) {
       let attributes = attrsOrOp();
-      renderer.e(
+      renderer.f(
         childScope,
         inputIsArgs ? attributes : [
           content ? {
@@ -923,14 +923,14 @@ function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
 function createRendererWithOwner(template, rawWalks, setup, getArgs) {
   let args, id = {}, walks = rawWalks ? /* @__PURE__ */ trimWalkString(rawWalks) : " ";
   return (owner) => ({
-    j: id,
+    k: id,
     F: template,
     E: walks,
     x: setup,
     l: _clone,
     u: owner,
     G: void 0,
-    get e() {
+    get f() {
       return args ||= getArgs?.();
     }
   });
@@ -1020,7 +1020,7 @@ function loopTo(nodeAccessor, renderer) {
   );
 }
 function loop(nodeAccessor, renderer, forEach) {
-  let loopScopeAccessor = nodeAccessor + "!" /* LoopScopeArray */, params = renderer.e;
+  let loopScopeAccessor = nodeAccessor + "!" /* LoopScopeArray */, params = renderer.f;
   return (scope, valueOrOp) => {
     if (valueOrOp === DIRTY) return;
     if (valueOrOp === MARK || valueOrOp === CLEAN) {
@@ -1053,7 +1053,7 @@ function byFirstArg(name) {
   return name;
 }
 function isDifferentRenderer(a, b) {
-  return a !== b && (a?.j || 0) !== b?.j;
+  return a !== b && (a?.k || 0) !== b?.k;
 }
 
 // src/dom/signals.ts
@@ -1094,14 +1094,14 @@ function loopClosure(ownerLoopNodeAccessor, fn, getIntersection) {
     let loopScopes = ownerScope[loopScopeAccessor] ?? ownerScope[loopScopeMapAccessor]?.values() ?? [];
     if (loopScopes !== emptyMarkerArray)
       for (let scope of loopScopes)
-        scope.g || queueSource(scope, signal, value2);
+        scope.e || queueSource(scope, signal, value2);
   };
   return helperSignal._ = signal, helperSignal;
 }
 function conditionalClosure(ownerConditionalNodeAccessor, getRenderer, fn, getIntersection) {
   let signal = closure(fn, getIntersection), scopeAccessor = ownerConditionalNodeAccessor + "!" /* ConditionalScope */, rendererAccessor = ownerConditionalNodeAccessor + "(" /* ConditionalRenderer */, helperSignal = (scope, value2) => {
     let conditionalScope = scope[scopeAccessor];
-    conditionalScope && !conditionalScope.g && scope[rendererAccessor]?.j === getRenderer().j && queueSource(conditionalScope, signal, value2);
+    conditionalScope && !conditionalScope.e && scope[rendererAccessor]?.k === getRenderer().k && queueSource(conditionalScope, signal, value2);
   };
   return helperSignal._ = signal, helperSignal;
 }
@@ -1111,7 +1111,7 @@ function dynamicClosure(ownerValueAccessor, fn, getOwnerScope = defaultGetOwnerS
     let subscribers = ownerScope[ownerSubscribersAccessor];
     if (subscribers)
       for (let subscriber of subscribers)
-        subscriber.g || queueSource(subscriber, _signal, value2);
+        subscriber.e || queueSource(subscriber, _signal, value2);
   }, setupSignal = (scope, value2) => {
     _signal(scope, value2), subscribe(scope);
   }, subscribe = (scope) => {
@@ -1160,7 +1160,7 @@ function queueSource(scope, signal, value2) {
 }
 function queueRender(scope, signal, value2) {
   let nextRender = {
-    k: scope,
+    g: scope,
     H: signal,
     I: value2,
     d: void 0
@@ -1206,11 +1206,12 @@ function runEffects(effects = pendingEffects) {
 }
 function runRenders() {
   for (; pendingRender; )
-    pendingRender.k.b?.y || pendingRender.H(pendingRender.k, pendingRender.I), pendingRender = pendingRender.d;
+    pendingRender.g.b?.y || pendingRender.H(pendingRender.g, pendingRender.I), pendingRender = pendingRender.d;
   finishPendingScopes();
 }
 function comparePendingRenders(a, b) {
-  let aStart = ownerStartNode(a.k), bStart = ownerStartNode(b.k);
+  if (a.g.e || b.g.e) return 0;
+  let aStart = ownerStartNode(a.g), bStart = ownerStartNode(b.g);
   return aStart === bStart ? 0 : aStart ? bStart ? aStart.compareDocumentPosition(bStart) & 2 ? -1 : 1 : -1 : 1;
 }
 function ownerStartNode(scope) {
@@ -1219,11 +1220,11 @@ function ownerStartNode(scope) {
 
 // src/dom/abort-signal.ts
 function resetAbortSignal(scope, id) {
-  let ctrl = scope.h?.[id];
-  ctrl && (queueEffect(ctrl, abort), scope.h[id] = void 0);
+  let ctrl = scope.j?.[id];
+  ctrl && (queueEffect(ctrl, abort), scope.j[id] = void 0);
 }
 function getAbortSignal(scope, id) {
-  return scope.b && (scope.b.n ||= /* @__PURE__ */ new Set()).add(scope), ((scope.h ||= {})[id] ||= new AbortController()).signal;
+  return scope.b && (scope.b.n ||= /* @__PURE__ */ new Set()).add(scope), ((scope.j ||= {})[id] ||= new AbortController()).signal;
 }
 function abort(ctrl) {
   ctrl.abort();
@@ -1278,7 +1279,7 @@ var classIdToScope = /* @__PURE__ */ new Map(), compat = {
   render(out, component, renderer, args) {
     let scope = component.scope;
     scope || (scope = classIdToScope.get(component.id), scope && (component.scope = scope, classIdToScope.delete(component.id)));
-    let applyArgs = renderer.e || noop, existing = !1;
+    let applyArgs = renderer.f || noop, existing = !1;
     if (typeof args[0] == "object" && "renderBody" in args[0]) {
       let input = args[0], normalizedInput = args[0] = {};
       for (let key in input)
@@ -1308,7 +1309,7 @@ function mount(input = {}, reference, position) {
     runtimeId: DEFAULT_RUNTIME_ID,
     renderId: DEFAULT_RENDER_ID
   };
-  let args = this.e, effects = prepareEffects(() => {
+  let args = this.f, effects = prepareEffects(() => {
     branch = createScope($global), dom = initRenderer(this, branch), args && args(branch, [input]);
   });
   switch (position) {

package/dist/dom.mjs

@@ -49,14 +49,14 @@ function triggerMacroTask() {
 var pendingScopes = [];
 function createScope($global) {
   let scope = {
-    g: 1,
+    e: 1,
     $global
   };
   return pendingScopes.push(scope), scope;
 }
 function finishPendingScopes() {
   for (let scope of pendingScopes)
-    scope.g = 0;
+    scope.e = 0;
   pendingScopes = [];
 }
 var emptyScope = createScope({});
@@ -66,8 +66,8 @@ function getEmptyScope(marker) {
 function destroyBranch(branch) {
   if (branch.y = 1, branch.m?.forEach(destroyBranch), branch.n)
     for (let scope of branch.n)
-      for (let id in scope.h)
-        scope.h[id]?.abort();
+      for (let id in scope.j)
+        scope.j[id]?.abort();
 }
 function removeAndDestroyBranch(branch) {
   destroyBranch(branch);
@@ -292,15 +292,15 @@ var registeredValues = {}, Render = class {
         else if (token === "$" /* ClosestBranch */)
           closestBranchMarkers.set(scopeId, visit);
         else if (token === "[" /* BranchStart */)
-          this.f && (dataIndex && branchEnd(this.f, visit, visit), this.o.push(this.f)), this.f = scopeId, scope.a = visit;
+          this.h && (dataIndex && branchEnd(this.h, visit, visit), this.o.push(this.h)), this.h = scopeId, scope.a = visit;
         else if (token === "]" /* BranchEnd */) {
           scope[data3] = visit;
           let curParent = visit.parentNode, startNode = branchEnd(
-            this.f,
+            this.h,
             visit,
             visit
           ).a;
-          curParent !== startNode.parentNode && curParent.prepend(startNode), this.f = this.o.pop();
+          curParent !== startNode.parentNode && curParent.prepend(startNode), this.h = this.o.pop();
         } else if (token === "|" /* BranchSingleNode */) {
           let next = data3.indexOf(" "), curNode = scope[~next ? data3.slice(0, next) : data3] = visit;
           for (; ~next; ) {
@@ -818,13 +818,13 @@ function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
       return;
     let childScope = scope[nodeAccessor + "!" /* ConditionalScope */];
     if (attrsOrOp === MARK || attrsOrOp === CLEAN)
-      return renderer.e?.(childScope, attrsOrOp);
+      return renderer.f?.(childScope, attrsOrOp);
     let content = getContent?.(scope);
     if (typeof renderer == "string")
       setConditionalRendererOnlyChild(childScope, 0, content), attrs(childScope, 0, attrsOrOp());
-    else if (renderer.e) {
+    else if (renderer.f) {
       let attributes = attrsOrOp();
-      renderer.e(
+      renderer.f(
         childScope,
         inputIsArgs ? attributes : [
           content ? {
@@ -839,14 +839,14 @@ function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
 function createRendererWithOwner(template, rawWalks, setup, getArgs) {
   let args, id = {}, walks = rawWalks ? /* @__PURE__ */ trimWalkString(rawWalks) : " ";
   return (owner) => ({
-    j: id,
+    k: id,
     F: template,
     E: walks,
     x: setup,
     l: _clone,
     u: owner,
     G: void 0,
-    get e() {
+    get f() {
       return args ||= getArgs?.();
     }
   });
@@ -936,7 +936,7 @@ function loopTo(nodeAccessor, renderer) {
   );
 }
 function loop(nodeAccessor, renderer, forEach) {
-  let loopScopeAccessor = nodeAccessor + "!" /* LoopScopeArray */, params = renderer.e;
+  let loopScopeAccessor = nodeAccessor + "!" /* LoopScopeArray */, params = renderer.f;
   return (scope, valueOrOp) => {
     if (valueOrOp === DIRTY) return;
     if (valueOrOp === MARK || valueOrOp === CLEAN) {
@@ -969,7 +969,7 @@ function byFirstArg(name) {
   return name;
 }
 function isDifferentRenderer(a, b) {
-  return a !== b && (a?.j || 0) !== b?.j;
+  return a !== b && (a?.k || 0) !== b?.k;
 }
 
 // src/dom/signals.ts
@@ -1010,14 +1010,14 @@ function loopClosure(ownerLoopNodeAccessor, fn, getIntersection) {
     let loopScopes = ownerScope[loopScopeAccessor] ?? ownerScope[loopScopeMapAccessor]?.values() ?? [];
     if (loopScopes !== emptyMarkerArray)
       for (let scope of loopScopes)
-        scope.g || queueSource(scope, signal, value2);
+        scope.e || queueSource(scope, signal, value2);
   };
   return helperSignal._ = signal, helperSignal;
 }
 function conditionalClosure(ownerConditionalNodeAccessor, getRenderer, fn, getIntersection) {
   let signal = closure(fn, getIntersection), scopeAccessor = ownerConditionalNodeAccessor + "!" /* ConditionalScope */, rendererAccessor = ownerConditionalNodeAccessor + "(" /* ConditionalRenderer */, helperSignal = (scope, value2) => {
     let conditionalScope = scope[scopeAccessor];
-    conditionalScope && !conditionalScope.g && scope[rendererAccessor]?.j === getRenderer().j && queueSource(conditionalScope, signal, value2);
+    conditionalScope && !conditionalScope.e && scope[rendererAccessor]?.k === getRenderer().k && queueSource(conditionalScope, signal, value2);
   };
   return helperSignal._ = signal, helperSignal;
 }
@@ -1027,7 +1027,7 @@ function dynamicClosure(ownerValueAccessor, fn, getOwnerScope = defaultGetOwnerS
     let subscribers = ownerScope[ownerSubscribersAccessor];
     if (subscribers)
       for (let subscriber of subscribers)
-        subscriber.g || queueSource(subscriber, _signal, value2);
+        subscriber.e || queueSource(subscriber, _signal, value2);
   }, setupSignal = (scope, value2) => {
     _signal(scope, value2), subscribe(scope);
   }, subscribe = (scope) => {
@@ -1076,7 +1076,7 @@ function queueSource(scope, signal, value2) {
 }
 function queueRender(scope, signal, value2) {
   let nextRender = {
-    k: scope,
+    g: scope,
     H: signal,
     I: value2,
     d: void 0
@@ -1122,11 +1122,12 @@ function runEffects(effects = pendingEffects) {
 }
 function runRenders() {
   for (; pendingRender; )
-    pendingRender.k.b?.y || pendingRender.H(pendingRender.k, pendingRender.I), pendingRender = pendingRender.d;
+    pendingRender.g.b?.y || pendingRender.H(pendingRender.g, pendingRender.I), pendingRender = pendingRender.d;
   finishPendingScopes();
 }
 function comparePendingRenders(a, b) {
-  let aStart = ownerStartNode(a.k), bStart = ownerStartNode(b.k);
+  if (a.g.e || b.g.e) return 0;
+  let aStart = ownerStartNode(a.g), bStart = ownerStartNode(b.g);
   return aStart === bStart ? 0 : aStart ? bStart ? aStart.compareDocumentPosition(bStart) & 2 ? -1 : 1 : -1 : 1;
 }
 function ownerStartNode(scope) {
@@ -1135,11 +1136,11 @@ function ownerStartNode(scope) {
 
 // src/dom/abort-signal.ts
 function resetAbortSignal(scope, id) {
-  let ctrl = scope.h?.[id];
-  ctrl && (queueEffect(ctrl, abort), scope.h[id] = void 0);
+  let ctrl = scope.j?.[id];
+  ctrl && (queueEffect(ctrl, abort), scope.j[id] = void 0);
 }
 function getAbortSignal(scope, id) {
-  return scope.b && (scope.b.n ||= /* @__PURE__ */ new Set()).add(scope), ((scope.h ||= {})[id] ||= new AbortController()).signal;
+  return scope.b && (scope.b.n ||= /* @__PURE__ */ new Set()).add(scope), ((scope.j ||= {})[id] ||= new AbortController()).signal;
 }
 function abort(ctrl) {
   ctrl.abort();
@@ -1194,7 +1195,7 @@ var classIdToScope = /* @__PURE__ */ new Map(), compat = {
   render(out, component, renderer, args) {
     let scope = component.scope;
     scope || (scope = classIdToScope.get(component.id), scope && (component.scope = scope, classIdToScope.delete(component.id)));
-    let applyArgs = renderer.e || noop, existing = !1;
+    let applyArgs = renderer.f || noop, existing = !1;
     if (typeof args[0] == "object" && "renderBody" in args[0]) {
       let input = args[0], normalizedInput = args[0] = {};
       for (let key in input)
@@ -1224,7 +1225,7 @@ function mount(input = {}, reference, position) {
     runtimeId: DEFAULT_RUNTIME_ID,
     renderId: DEFAULT_RENDER_ID
   };
-  let args = this.e, effects = prepareEffects(() => {
+  let args = this.f, effects = prepareEffects(() => {
     branch = createScope($global), dom = initRenderer(this, branch), args && args(branch, [input]);
   });
   switch (position) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.0-next.3.24",
+  "version": "6.0.0-next.3.25",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",