marko 6.0.0-next.3.57 → 6.0.0-next.3.59

package/dist/dom.js

@@ -203,95 +203,114 @@ function stripSpacesAndPunctuation(str) {
 var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 
 // src/dom/resume.ts
-var registeredValues = {}, Render = class {
-  q = [];
-  s = {};
-  E = {
-    _: registeredValues
-  };
-  constructor(renders, runtimeId, renderId) {
-    Object.assign(this, renders[renderId]), this.F = renders, this.G = runtimeId, this.t = renderId, this.H = this.w, this.u(), this.w = () => {
-      this.H(), this.u();
-    };
-  }
-  u() {
-    let serializeContext = this.E, scopeLookup = this.s, visits = this.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
-    if (visits.length) {
-      let commentPrefixLen = this.i.length, closestBranchMarkers = /* @__PURE__ */ new Map(), visitNodes = new Set(visits), lastEndNode;
-      this.v = [];
-      let branchEnd = (branchId, visit, reference) => {
-        let branch = scopeLookup[branchId] ||= {}, endNode = reference;
-        for (; visitNodes.has(endNode = endNode.previousSibling); ) ;
-        endNode === lastEndNode && (endNode = reference.parentNode.insertBefore(new Text(), reference)), branch.b = lastEndNode = endNode, branch.a ||= endNode;
-        for (let [markerScopeId, markerNode] of closestBranchMarkers)
-          branch.a.compareDocumentPosition(markerNode) & 4 && reference.compareDocumentPosition(markerNode) & 2 && (parentBranchIds.set(markerScopeId, branchId), closestBranchMarkers.delete(markerScopeId));
-        return branchIds.add(branchId), closestBranchMarkers.set(branchId, visit), branch;
-      };
-      for (let visit of visits) {
-        let commentText = visit.data, dataIndex = commentText.indexOf(" ") + 1, scopeId = commentText.slice(
-          commentPrefixLen + 1,
-          dataIndex ? dataIndex - 1 : commentText.length
-        ), scope = scopeLookup[scopeId] ||= { d: +scopeId }, data2 = dataIndex ? commentText.slice(dataIndex) : "", token = commentText[commentPrefixLen];
-        if (token === "*" /* Node */) {
-          let node = scope[data2] = visit.previousSibling;
-          scope[data2 + ">" /* Getter */] = () => node;
-        } else if (token === "$" /* ClosestBranch */)
-          closestBranchMarkers.set(scopeId, visit);
-        else if (token === "[" /* BranchStart */)
-          this.f && (dataIndex && branchEnd(this.f, visit, visit), this.q.push(this.f)), this.f = scopeId, scope.a = visit;
-        else if (token === "]" /* BranchEnd */) {
-          scope[data2] = visit;
-          let curParent = visit.parentNode, startNode = branchEnd(
-            this.f,
-            visit,
-            visit
-          ).a;
-          curParent !== startNode.parentNode && curParent.prepend(startNode), this.f = this.q.pop();
-        } else if (token === "|" /* BranchSingleNode */ || token === "=" /* BranchSingleNodeOnlyChildInParent */) {
-          let next = data2.indexOf(" "), curNode = visit;
-          for (scope[~next ? data2.slice(0, next) : data2] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit; ~next; ) {
-            let start = next + 1;
-            next = data2.indexOf(" ", start);
-            let childScopeId = data2.slice(start, ~next ? next : data2.length);
-            curNode = branchEnd(childScopeId, visit, curNode).b;
-          }
-        }
-      }
-    }
-    let resumes = this.r;
-    if (resumes) {
-      this.r = [];
-      let len = resumes.length, i = 0;
-      try {
-        for (isResuming = !0; i < len; ) {
-          let resumeData = resumes[i++];
-          if (typeof resumeData == "function") {
-            let scopes = resumeData(serializeContext), { $global } = scopeLookup;
-            $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = this.G, $global.renderId = this.t, $global.g = 1e6);
-            for (let scopeId in scopes)
-              if (scopeId !== "$") {
-                let scope = scopes[scopeId], prevScope = scopeLookup[scopeId];
-                scope.$global = $global, scope.d = +scopeId, prevScope !== scope && (scopeLookup[scopeId] = Object.assign(
-                  scope,
-                  prevScope
-                ));
-                let parentBranchId = parentBranchIds.get(scopeId);
-                if (parentBranchId && (scope.c = scopes[parentBranchId]), branchIds.has(scopeId)) {
-                  let branch = scope, parentBranch = branch.c;
-                  scope.c = branch, parentBranch && (branch.x = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch));
+var registeredValues = {};
+function init(runtimeId = DEFAULT_RUNTIME_ID) {
+  let renders = window[runtimeId], defineRuntime = (desc) => Object.defineProperty(window, runtimeId, desc), resumeRender, initRuntime = (renders2) => {
+    defineRuntime({
+      value: resumeRender = (renderId) => {
+        let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, commentPrefixLen = render.i.length, scopeStack = [], scopeLookup = render.s = {}, serializeContext = {
+          _: registeredValues
+        }, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map(), closestBranchMarkers = /* @__PURE__ */ new Map(), currentScopeId;
+        return render.w = () => {
+          walk2.call(render);
+          let visits = render.v, resumes = render.r;
+          if (visits.length) {
+            let visitNodes = new Set(visits), lastEndNode;
+            render.v = [];
+            let branchEnd = (branchId, visit, reference) => {
+              let branch = scopeLookup[branchId] ||= {}, endNode = reference;
+              for (; visitNodes.has(endNode = endNode.previousSibling); ) ;
+              endNode === lastEndNode && (endNode = reference.parentNode.insertBefore(
+                new Text(),
+                reference
+              )), branch.b = lastEndNode = endNode, branch.a ||= endNode;
+              for (let [markerScopeId, markerNode] of closestBranchMarkers)
+                branch.a.compareDocumentPosition(markerNode) & 4 && reference.compareDocumentPosition(markerNode) & 2 && (parentBranchIds.set(markerScopeId, branchId), closestBranchMarkers.delete(markerScopeId));
+              return branchIds.add(branchId), closestBranchMarkers.set(branchId, visit), branch;
+            };
+            for (let visit of visits) {
+              let commentText = visit.data, dataIndex = commentText.indexOf(" ") + 1, scopeId = commentText.slice(
+                commentPrefixLen + 1,
+                dataIndex ? dataIndex - 1 : commentText.length
+              ), scope = scopeLookup[scopeId] ||= {
+                d: +scopeId
+              }, data2 = dataIndex ? commentText.slice(dataIndex) : "", token = commentText[commentPrefixLen];
+              if (token === "*" /* Node */) {
+                let node = scope[data2] = visit.previousSibling;
+                scope[data2 + ">" /* Getter */] = () => node;
+              } else if (token === "$" /* ClosestBranch */)
+                closestBranchMarkers.set(scopeId, visit);
+              else if (token === "[" /* BranchStart */)
+                currentScopeId && (dataIndex && branchEnd(currentScopeId, visit, visit), scopeStack.push(currentScopeId)), currentScopeId = scopeId, scope.a = visit;
+              else if (token === "]" /* BranchEnd */) {
+                scope[data2] = visit;
+                let curParent = visit.parentNode, startNode = branchEnd(
+                  currentScopeId,
+                  visit,
+                  visit
+                ).a;
+                curParent !== startNode.parentNode && curParent.prepend(startNode), currentScopeId = scopeStack.pop();
+              } else if (token === "|" /* BranchSingleNode */ || token === "=" /* BranchSingleNodeOnlyChildInParent */) {
+                let next = data2.indexOf(" "), curNode = visit;
+                for (scope[~next ? data2.slice(0, next) : data2] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit; ~next; ) {
+                  let start = next + 1;
+                  next = data2.indexOf(" ", start);
+                  let childScopeId = data2.slice(
+                    start,
+                    ~next ? next : data2.length
+                  );
+                  curNode = branchEnd(childScopeId, visit, curNode).b;
                 }
               }
-          } else i === len || typeof resumes[i] != "string" ? delete this.F[this.t] : registeredValues[resumes[i++]](
-            scopeLookup[resumeData],
-            scopeLookup[resumeData]
-          );
-        }
-      } finally {
-        isResuming = !1;
+            }
+          }
+          if (resumes)
+            try {
+              render.r = [], isResuming = !0;
+              for (let i = 0; i < resumes.length; i++) {
+                let serialized = resumes[i];
+                if (typeof serialized == "function") {
+                  let scopes = serialized(serializeContext), { $global } = scopeLookup;
+                  $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = runtimeId, $global.renderId = renderId, $global.f = 1e6);
+                  for (let scopeId in scopes)
+                    if (scopeId !== "$") {
+                      let scope = scopes[scopeId], prevScope = scopeLookup[scopeId];
+                      scope.$global = $global, scope.d = +scopeId, prevScope !== scope && (scopeLookup[scopeId] = Object.assign(
+                        scope,
+                        prevScope
+                      ));
+                      let parentBranchId = parentBranchIds.get(scopeId);
+                      if (parentBranchId && (scope.c = scopes[parentBranchId]), branchIds.has(scopeId)) {
+                        let branch = scope, parentBranch = branch.c;
+                        scope.c = branch, parentBranch && (branch.p = parentBranch, (parentBranch.m ||= /* @__PURE__ */ new Set()).add(
+                          branch
+                        ));
+                      }
+                    }
+                } else
+                  registeredValues[resumes[++i]](
+                    scopeLookup[serialized],
+                    scopeLookup[serialized]
+                  );
+              }
+            } finally {
+              isResuming = !1;
+            }
+        }, render;
       }
-    }
-  }
-}, isResuming = !1;
+    });
+  };
+  if (renders) {
+    initRuntime(renders);
+    for (let renderId in renders)
+      resumeRender(renderId).w();
+  } else
+    defineRuntime({
+      configurable: !0,
+      set: initRuntime
+    });
+}
+var isResuming = !1;
 function register(id, obj) {
   return registeredValues[id] = obj, obj;
 }
@@ -302,22 +321,6 @@ function getRegisteredWithScope(id, scope) {
   let val = registeredValues[id];
   return scope ? val(scope) : val;
 }
-function init(runtimeId = DEFAULT_RUNTIME_ID) {
-  let resumeRender = (renderId) => resumeRender[renderId] = renders[renderId] = new Render(renders, runtimeId, renderId), renders;
-  window[runtimeId] ? setRenders(window[runtimeId]) : Object.defineProperty(window, runtimeId, {
-    configurable: !0,
-    set: setRenders
-  });
-  function setRenders(v) {
-    renders = v;
-    for (let renderId in v)
-      resumeRender(renderId);
-    Object.defineProperty(window, runtimeId, {
-      configurable: !0,
-      value: resumeRender
-    });
-  }
-}
 function nodeRef(id, key) {
   return register(id, (scope) => () => scope[key]());
 }
@@ -712,28 +715,28 @@ function toInsertNode(startNode, endNode) {
 var pendingScopes = [];
 function createScope($global, closestBranch) {
   let scope = {
-    d: $global.g++,
-    h: 1,
+    d: $global.f++,
+    g: 1,
     c: closestBranch,
     $global
   };
   return pendingScopes.push(scope), scope;
 }
 function skipScope(scope) {
-  return scope.$global.g++;
+  return scope.$global.f++;
 }
 function finishPendingScopes() {
   for (let scope of pendingScopes)
-    scope.h = 0;
+    scope.g = 0;
   pendingScopes = [];
 }
 function destroyBranch(branch) {
-  branch.x?.n?.delete(branch), destroyNestedBranches(branch);
+  branch.p?.m?.delete(branch), destroyNestedBranches(branch);
 }
 function destroyNestedBranches(branch) {
-  branch.y = 1, branch.n?.forEach(destroyNestedBranches), branch.I?.forEach((scope) => {
-    for (let id in scope.k)
-      scope.k[id]?.abort();
+  branch.q = 1, branch.m?.forEach(destroyNestedBranches), branch.A?.forEach((scope) => {
+    for (let id in scope.j)
+      scope.j[id]?.abort();
   });
 }
 function removeAndDestroyBranch(branch) {
@@ -753,17 +756,17 @@ var pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map(), pendi
 function queueRender(scope, signal, signalKey, value2, scopeKey = scope.d) {
   let key = scopeKey * scopeKeyOffset + signalKey, existingRender = signalKey >= 0 && pendingRendersLookup.get(key);
   if (existingRender)
-    existingRender.z = value2;
+    existingRender.t = value2;
   else {
     let render = {
-      j: key,
-      A: scope,
-      J: signal,
-      z: value2
+      h: key,
+      u: scope,
+      B: signal,
+      t: value2
     }, i = pendingRenders.push(render) - 1;
     for (; i; ) {
       let parentIndex = i - 1 >> 1, parent = pendingRenders[parentIndex];
-      if (key - parent.j >= 0) break;
+      if (key - parent.h >= 0) break;
       pendingRenders[i] = parent, i = parentIndex;
     }
     signalKey >= 0 && pendingRendersLookup.set(key, render), pendingRenders[i] = render;
@@ -802,27 +805,27 @@ 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).j;
+      let i = 0, mid = pendingRenders.length >> 1, key = (pendingRenders[0] = item).h;
       for (; i < mid; ) {
         let bestChild = (i << 1) + 1, right = bestChild + 1;
-        if (right < pendingRenders.length && pendingRenders[right].j - pendingRenders[bestChild].j < 0 && (bestChild = right), pendingRenders[bestChild].j - key >= 0)
+        if (right < pendingRenders.length && pendingRenders[right].h - pendingRenders[bestChild].h < 0 && (bestChild = right), pendingRenders[bestChild].h - key >= 0)
           break;
         pendingRenders[i] = pendingRenders[bestChild], i = bestChild;
       }
       pendingRenders[i] = item;
     }
-    render.A.c?.y || render.J(render.A, render.z);
+    render.u.c?.q || render.B(render.u, render.t);
   }
   finishPendingScopes();
 }
 
 // src/dom/abort-signal.ts
 function resetAbortSignal(scope, id) {
-  let ctrl = scope.k?.[id];
-  ctrl && (queueEffect(ctrl, abort), scope.k[id] = void 0);
+  let ctrl = scope.j?.[id];
+  ctrl && (queueEffect(ctrl, abort), scope.j[id] = void 0);
 }
 function getAbortSignal(scope, id) {
-  return scope.c && (scope.c.I ||= /* @__PURE__ */ new Set()).add(scope), ((scope.k ||= {})[id] ||= new AbortController()).signal;
+  return scope.c && (scope.c.A ||= /* @__PURE__ */ new Set()).add(scope), ((scope.j ||= {})[id] ||= new AbortController()).signal;
 }
 function abort(ctrl) {
   ctrl.abort();
@@ -948,7 +951,7 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
 // src/dom/renderer.ts
 function createBranch($global, renderer, parentScope, parentNode) {
   let branch = createScope($global), parentBranch = parentScope?.c;
-  return branch._ = renderer.l || parentScope, branch.c = branch, parentBranch && (branch.x = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch)), renderer.o?.(
+  return branch._ = renderer.k || parentScope, branch.c = branch, parentBranch && (branch.p = parentBranch, (parentBranch.m ||= /* @__PURE__ */ new Set()).add(branch)), renderer.n?.(
     branch,
     parentNode.namespaceURI
   ), branch;
@@ -960,10 +963,10 @@ function createAndSetupBranch($global, renderer, parentScope, parentNode) {
   );
 }
 function setupBranch(renderer, branch) {
-  return (renderer.p || renderer.B) && queueRender(
+  return (renderer.o || renderer.x) && queueRender(
     branch,
     (branch2) => {
-      renderer.p?.(branch2), renderer.B?.(branch2);
+      renderer.o?.(branch2), renderer.x?.(branch2);
     },
     -1
   ), branch;
@@ -984,12 +987,12 @@ function createContent(id, template, walks, setup, params, closures, dynamicScop
   };
   return (owner) => ({
     d: id,
-    o: clone,
-    l: owner,
-    p: setup,
+    n: clone,
+    k: owner,
+    o: setup,
     e: params,
-    B: closures,
-    m: dynamicScopesAccessor
+    x: closures,
+    l: dynamicScopesAccessor
   });
 }
 function registerContent(id, template, walks, setup, params, closures, dynamicScopesAccessor) {
@@ -1063,7 +1066,7 @@ function value(valueAccessor, fn = () => {
 }
 function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "d") {
   return (scope) => {
-    scope.h ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
+    scope.g ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
   };
 }
 function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
@@ -1073,7 +1076,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
       ownerScope,
       () => {
         for (let scope of scopes)
-          !scope.h && !scope.y && childSignal(scope);
+          !scope.g && !scope.q && childSignal(scope);
       },
       -1,
       0,
@@ -1085,7 +1088,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
 function conditionalClosure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
   let childSignal = closure(valueAccessor, fn), scopeAccessor = ownerConditionalNodeAccessor + "!" /* ConditionalScope */, branchAccessor = ownerConditionalNodeAccessor + "(" /* ConditionalRenderer */, ownerSignal = (scope) => {
     let ifScope = scope[scopeAccessor];
-    ifScope && !ifScope.h && scope[branchAccessor] === branch && queueRender(ifScope, childSignal, -1);
+    ifScope && !ifScope.g && scope[branchAccessor] === branch && queueRender(ifScope, childSignal, -1);
   };
   return ownerSignal._ = childSignal, ownerSignal;
 }
@@ -1097,13 +1100,13 @@ function subscribeToScopeSet(ownerScope, accessor, scope) {
   ));
 }
 function dynamicClosure(...closureSignals) {
-  let [{ C: ___scopeInstancesAccessor, D: ___signalIndexAccessor }] = closureSignals;
+  let [{ y: ___scopeInstancesAccessor, z: ___signalIndexAccessor }] = closureSignals;
   for (let i = closureSignals.length; i--; )
-    closureSignals[i].K = i;
+    closureSignals[i].C = i;
   return (scope) => {
     if (scope[___scopeInstancesAccessor])
       for (let childScope of scope[___scopeInstancesAccessor])
-        childScope.h || queueRender(
+        childScope.g || queueRender(
           childScope,
           closureSignals[childScope[___signalIndexAccessor]],
           -1
@@ -1112,13 +1115,13 @@ function dynamicClosure(...closureSignals) {
 }
 function dynamicClosureRead(valueAccessor, fn, getOwnerScope) {
   let childSignal = closure(valueAccessor, fn, getOwnerScope), closureSignal = (scope) => {
-    scope[closureSignal.D] = closureSignal.K, childSignal(scope), subscribeToScopeSet(
+    scope[closureSignal.z] = closureSignal.C, childSignal(scope), subscribeToScopeSet(
       getOwnerScope ? getOwnerScope(scope) : scope._,
-      closureSignal.C,
+      closureSignal.y,
       scope
     );
   };
-  return closureSignal.C = valueAccessor + "!" /* ClosureScopes */, closureSignal.D = valueAccessor + "(" /* ClosureSignalIndex */, closureSignal;
+  return closureSignal.y = valueAccessor + "!" /* ClosureScopes */, closureSignal.z = valueAccessor + "(" /* ClosureSignalIndex */, closureSignal;
 }
 function closure(valueAccessor, fn, getOwnerScope) {
   return (scope) => {
@@ -1189,15 +1192,15 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
             0,
             content,
             createAndSetupBranch
-          ), content.m && subscribeToScopeSet(
+          ), content.l && subscribeToScopeSet(
+            content.k,
             content.l,
-            content.m,
             scope[childScopeAccessor][0 + "!" /* ConditionalScope */]
           );
         }
-      } else normalizedRenderer?.m && subscribeToScopeSet(
+      } else normalizedRenderer?.l && subscribeToScopeSet(
+        normalizedRenderer.k,
         normalizedRenderer.l,
-        normalizedRenderer.m,
         scope[childScopeAccessor]
       );
     if (normalizedRenderer) {
@@ -1303,7 +1306,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
     register(RENDERER_REGISTER_ID, fn);
   },
   isRenderer(renderer) {
-    return renderer.o;
+    return renderer.n;
   },
   getStartNode(branch) {
     return branch.a;
@@ -1328,7 +1331,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
   },
   createRenderer(params, clone) {
     let renderer = createRenderer(0, 0, 0, params);
-    return renderer.o = (branch) => {
+    return renderer.n = (branch) => {
       let cloned = clone();
       branch.a = cloned.startNode, branch.b = cloned.endNode;
     }, renderer;
@@ -1343,10 +1346,10 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
         normalizedInput[key === "renderBody" ? "content" : key] = input[key];
     }
     if (component.effects = prepareEffects(() => {
-      branch ? existing = !0 : (out.global.g ||= 0, branch = component.scope = createAndSetupBranch(
+      branch ? existing = !0 : (out.global.f ||= 0, branch = component.scope = createAndSetupBranch(
         out.global,
         renderer,
-        renderer.l,
+        renderer.k,
         document.body
       )), renderer.e?.(branch, renderer._ ? args[0] : args);
     }), !existing)
@@ -1368,12 +1371,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 = {
-    g: 0,
+    f: 0,
     runtimeId: DEFAULT_RUNTIME_ID,
     renderId: DEFAULT_RENDER_ID,
     ...$global
   }) : $global = {
-    g: 0,
+    f: 0,
     runtimeId: DEFAULT_RUNTIME_ID,
     renderId: DEFAULT_RENDER_ID
   }, position) {
@@ -1393,7 +1396,7 @@ function mount(input = {}, reference, position) {
       this,
       void 0,
       parentNode
-    ), this.p?.(branch), args?.(branch, input);
+    ), this.o?.(branch), args?.(branch, input);
   });
   return insertChildNodes(
     parentNode,