marko 6.0.0-next.3.50 → 6.0.0-next.3.52

package/dist/dom.mjs

@@ -117,19 +117,19 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 
 // src/dom/resume.ts
 var registeredValues = {}, Render = class {
-  p = [];
-  q = {};
-  B = {
+  q = [];
+  s = {};
+  F = {
     _: registeredValues
   };
   constructor(renders, runtimeId, renderId) {
-    this.C = renders, this.D = runtimeId, this.s = renderId, this.t = renders[renderId], this.u();
+    this.G = renders, this.H = runtimeId, this.t = renderId, this.u = renders[renderId], this.x();
   }
   w() {
-    this.t.w(), this.u();
+    this.u.w(), this.x();
   }
-  u() {
-    let data2 = this.t, serializeContext = this.B, scopeLookup = this.q, visits = data2.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
+  x() {
+    let data2 = this.u, serializeContext = this.F, scopeLookup = this.s, visits = data2.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
     if (visits.length) {
       let commentPrefixLen = data2.i.length, closestBranchMarkers = /* @__PURE__ */ new Map(), visitNodes = new Set(visits), lastEndNode;
       data2.v = [];
@@ -152,7 +152,7 @@ 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.p.push(this.f)), this.f = scopeId, scope.a = visit;
+          this.f && (dataIndex && branchEnd(this.f, visit, visit), this.q.push(this.f)), this.f = scopeId, scope.a = visit;
         else if (token === "]" /* BranchEnd */) {
           scope[data3] = visit;
           let curParent = visit.parentNode, startNode = branchEnd(
@@ -160,7 +160,7 @@ var registeredValues = {}, Render = class {
             visit,
             visit
           ).a;
-          curParent !== startNode.parentNode && curParent.prepend(startNode), this.f = this.p.pop();
+          curParent !== startNode.parentNode && curParent.prepend(startNode), this.f = this.q.pop();
         } else if (token === "|" /* BranchSingleNode */ || token === "=" /* BranchSingleNodeOnlyChildInParent */) {
           let next = data3.indexOf(" "), curNode = visit;
           for (scope[~next ? data3.slice(0, next) : data3] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit; ~next; ) {
@@ -181,7 +181,7 @@ var registeredValues = {}, Render = class {
           let resumeData = resumes[i++];
           if (typeof resumeData == "function") {
             let scopes = resumeData(serializeContext), { $global } = scopeLookup;
-            $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = this.D, $global.renderId = this.s, $global.g = 1e6);
+            $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = this.H, $global.renderId = this.t, $global.g = 1e6);
             for (let scopeId in scopes)
               if (scopeId !== "$") {
                 let scope = scopes[scopeId], prevScope = scopeLookup[scopeId];
@@ -192,10 +192,10 @@ var registeredValues = {}, Render = class {
                 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));
+                  scope.c = branch, parentBranch && (branch.y = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch));
                 }
               }
-          } else i === len || typeof resumes[i] != "string" ? delete this.C[this.s] : registeredValues[resumes[i++]](
+          } else i === len || typeof resumes[i] != "string" ? delete this.G[this.t] : registeredValues[resumes[i++]](
             scopeLookup[resumeData],
             scopeLookup[resumeData]
           );
@@ -647,10 +647,10 @@ function finishPendingScopes() {
   pendingScopes = [];
 }
 function destroyBranch(branch) {
-  branch.x?.n?.delete(branch), destroyNestedBranches(branch);
+  branch.y?.n?.delete(branch), destroyNestedBranches(branch);
 }
 function destroyNestedBranches(branch) {
-  branch.y = 1, branch.n?.forEach(destroyNestedBranches), branch.E?.forEach((scope) => {
+  branch.z = 1, branch.n?.forEach(destroyNestedBranches), branch.I?.forEach((scope) => {
     for (let id in scope.k)
       scope.k[id]?.abort();
   });
@@ -672,13 +672,13 @@ 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.A = value2;
   else {
     let render = {
       j: key,
-      A: scope,
-      F: signal,
-      z: value2
+      B: scope,
+      J: signal,
+      A: value2
     }, i = pendingRenders.push(render) - 1;
     for (; i; ) {
       let parentIndex = i - 1 >> 1, parent = pendingRenders[parentIndex];
@@ -730,7 +730,7 @@ function runRenders() {
       }
       pendingRenders[i] = item;
     }
-    render.A.c?.y || render.F(render.A, render.z);
+    render.B.c?.z || render.J(render.B, render.A);
   }
   finishPendingScopes();
 }
@@ -741,7 +741,7 @@ function resetAbortSignal(scope, id) {
   ctrl && (queueEffect(ctrl, abort), scope.k[id] = void 0);
 }
 function getAbortSignal(scope, id) {
-  return scope.c && (scope.c.E ||= /* @__PURE__ */ new Set()).add(scope), ((scope.k ||= {})[id] ||= new AbortController()).signal;
+  return scope.c && (scope.c.I ||= /* @__PURE__ */ new Set()).add(scope), ((scope.k ||= {})[id] ||= new AbortController()).signal;
 }
 function abort(ctrl) {
   ctrl.abort();
@@ -865,57 +865,68 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
 }
 
 // src/dom/renderer.ts
-function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentScope, parentNode) {
-  let branch = createBranch(
-    $global,
-    tagNameOrRenderer,
-    parentScope,
-    parentNode
-  );
-  return typeof tagNameOrRenderer == "string" && (branch[0] = branch.a = branch.b = document.createElementNS(
-    tagNameOrRenderer === "svg" ? "http://www.w3.org/2000/svg" : tagNameOrRenderer === "math" ? "http://www.w3.org/1998/Math/MathML" : parentNode.namespaceURI,
-    tagNameOrRenderer
-  )), branch;
-}
 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.l || parentScope, branch.c = branch, parentBranch && (branch.y = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch)), renderer.o?.(
     branch,
     parentNode.namespaceURI
   ), branch;
 }
-function createContent(id, template, walks, setup, getArgs, dynamicScopesAccessor) {
-  walks = walks ? walks.replace(/[^\0-1]+$/, "") : "";
-  let args, init2 = template ? (branch, ns) => {
+function createAndSetupBranch($global, renderer, parentScope, parentNode) {
+  return setupBranch(
+    renderer,
+    createBranch($global, renderer, parentScope, parentNode)
+  );
+}
+function setupBranch(renderer, branch) {
+  return (renderer.p || renderer.C) && queueRender(
+    branch,
+    (branch2) => {
+      renderer.p?.(branch2), renderer.C?.(branch2);
+    },
+    -1
+  ), branch;
+}
+function createContent(id, template, walks, setup, params, closures, dynamicScopesAccessor) {
+  walks = walks ? walks.replace(/[^\0-1]+$/, "") : "", setup ||= void 0, params ||= void 0, closures ||= void 0;
+  let clone = template ? (branch, ns) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
       ns
-    ))(branch, walks), setup && queueRender(branch, setup, -1);
+    ))(branch, walks);
   } : (branch) => {
     walk(
       branch.a = branch.b = new Text(),
       walks,
       branch
-    ), setup && queueRender(branch, setup, -1);
+    );
   };
   return (owner) => ({
     d: id,
-    o: init2,
+    o: clone,
     l: owner,
-    m: dynamicScopesAccessor,
-    get e() {
-      return args ||= getArgs ? getArgs() : void 0;
-    }
+    p: setup,
+    e: params,
+    C: closures,
+    m: dynamicScopesAccessor
   });
 }
-function registerContent(id, template, walks, setup, getArgs, dynamicScopesAccessor) {
+function registerContent(id, template, walks, setup, params, closures, dynamicScopesAccessor) {
   return register(
     id,
-    createContent(id, template, walks, setup, getArgs, dynamicScopesAccessor)
+    createContent(
+      id,
+      template,
+      walks,
+      setup,
+      params,
+      closures,
+      dynamicScopesAccessor
+    )
   );
 }
-function createRenderer(template, walks, setup, getArgs) {
-  return createContent("", template, walks, setup, getArgs)();
+function createRenderer(template, walks, setup, params, closures) {
+  return createContent("", template, walks, setup, params, closures)();
 }
 var cloneCache = {};
 function createCloneableHTML(html2, ns) {
@@ -969,7 +980,6 @@ function value(valueAccessor, fn = () => {
     (!(valueAccessor in scope) || scope[valueAccessor] !== value2) && (scope[valueAccessor] = value2, fn(scope, value2));
   };
 }
-var accessorId = 0;
 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]);
@@ -982,7 +992,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
       ownerScope,
       () => {
         for (let scope of scopes)
-          !scope.h && !scope.y && childSignal(scope);
+          !scope.h && !scope.z && childSignal(scope);
       },
       -1,
       0,
@@ -1005,24 +1015,29 @@ function subscribeToScopeSet(ownerScope, accessor, scope) {
     () => ownerScope[accessor].delete(scope)
   ));
 }
-function dynamicClosure(valueAccessor, fn, getOwnerScope) {
-  let subscribersAccessor = "?" /* Dynamic */ + accessorId++, childSignal = closure(valueAccessor, fn, getOwnerScope), ownerSignal = (ownerScope) => {
-    let subscribers = ownerScope[subscribersAccessor];
-    if (subscribers)
-      for (let subscriber of subscribers)
-        subscriber.h || queueRender(subscriber, childSignal, -1);
-  }, subscribe = ownerSignal.G = (scope) => subscribeToScopeSet(
-    getOwnerScope ? getOwnerScope(scope) : scope._,
-    subscribersAccessor,
-    scope
-  );
-  return ownerSignal._ = (scope) => {
-    childSignal(scope), subscribe(scope);
-  }, ownerSignal;
+function dynamicClosure(...closureSignals) {
+  let [{ D: ___scopeInstancesAccessor, E: ___signalIndexAccessor }] = closureSignals;
+  for (let i = closureSignals.length; i--; )
+    closureSignals[i].K = i;
+  return (scope) => {
+    if (scope[___scopeInstancesAccessor])
+      for (let childScope of scope[___scopeInstancesAccessor])
+        childScope.h || queueRender(
+          childScope,
+          closureSignals[childScope[___signalIndexAccessor]],
+          -1
+        );
+  };
 }
-function registerDynamicClosure(registryId, valueAccessor, fn, getOwnerScope) {
-  let signal = dynamicClosure(valueAccessor, fn, getOwnerScope);
-  return register(registryId, signal.G), signal;
+function dynamicClosureRead(valueAccessor, fn, getOwnerScope) {
+  let childSignal = closure(valueAccessor, fn, getOwnerScope), closureSignal = (scope) => {
+    scope[closureSignal.E] = closureSignal.K, childSignal(scope), subscribeToScopeSet(
+      getOwnerScope ? getOwnerScope(scope) : scope._,
+      closureSignal.D,
+      scope
+    );
+  };
+  return closureSignal.D = valueAccessor + "!" /* ClosureScopes */, closureSignal.E = valueAccessor + "(" /* ClosureSignalIndex */, closureSignal;
 }
 function closure(valueAccessor, fn, getOwnerScope) {
   return (scope) => {
@@ -1068,7 +1083,7 @@ function conditional(nodeAccessor, ...branches) {
       scope,
       nodeAccessor,
       branches[scope[branchAccessor] = newBranch],
-      createBranch
+      createAndSetupBranch
     );
   };
 }
@@ -1092,7 +1107,7 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
             scope[childScopeAccessor],
             0,
             content,
-            createBranch
+            createAndSetupBranch
           ), content.m && subscribeToScopeSet(
             content.l,
             content.m,
@@ -1168,13 +1183,25 @@ function loop(nodeAccessor, renderer, forEach) {
       ...oldMap.values()
     ] : [], parentNode = referenceNode.nodeType > 1 /* Element */ ? referenceNode.parentNode || oldArray[0].a.parentNode : referenceNode, newMap = scope[nodeAccessor + "(" /* LoopScopeMap */] = /* @__PURE__ */ new Map(), newArray = scope[nodeAccessor + "!" /* LoopScopeArray */] = [];
     forEach(value2, (key, args) => {
-      let branch = oldMap?.get(key) || createBranch(scope.$global, renderer, scope, parentNode);
+      let branch = oldMap?.get(key) || createAndSetupBranch(scope.$global, renderer, scope, parentNode);
       params?.(branch, args), newMap.set(key, branch), newArray.push(branch);
     });
     let afterReference = null;
     referenceNode !== parentNode && (oldArray.length ? (afterReference = oldArray[oldArray.length - 1].b.nextSibling, newArray.length || parentNode.insertBefore(referenceNode, afterReference)) : newArray.length && (afterReference = referenceNode.nextSibling, referenceNode.remove())), reconcile(parentNode, oldArray, newArray, afterReference);
   };
 }
+function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentScope, parentNode) {
+  let branch = createBranch(
+    $global,
+    tagNameOrRenderer,
+    parentScope,
+    parentNode
+  );
+  return typeof tagNameOrRenderer == "string" ? branch[0] = branch.a = branch.b = document.createElementNS(
+    tagNameOrRenderer === "svg" ? "http://www.w3.org/2000/svg" : tagNameOrRenderer === "math" ? "http://www.w3.org/1998/Math/MathML" : parentNode.namespaceURI,
+    tagNameOrRenderer
+  ) : setupBranch(tagNameOrRenderer, branch), branch;
+}
 function bySecondArg(_item, index) {
   return index;
 }
@@ -1215,11 +1242,11 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
   }) {
     return Array.isArray(value2) && typeof value2[0] == "string" ? getRegisteredWithScope(
       value2[0],
-      value2.length === 2 && window[runtimeId]?.[componentIdPrefix === "s" ? "_" : componentIdPrefix]?.q[value2[1]]
+      value2.length === 2 && window[runtimeId]?.[componentIdPrefix === "s" ? "_" : componentIdPrefix]?.s[value2[1]]
     ) : value2;
   },
-  createRenderer(args, clone) {
-    let renderer = createRenderer(0, 0, 0, () => args);
+  createRenderer(params, clone) {
+    let renderer = createRenderer(0, 0, 0, params);
     return renderer.o = (branch) => {
       let cloned = clone();
       branch.a = cloned.startNode, branch.b = cloned.endNode;
@@ -1235,7 +1262,7 @@ 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 = createBranch(
+      branch ? existing = !0 : (out.global.g ||= 0, branch = component.scope = createAndSetupBranch(
         out.global,
         renderer,
         renderer.l,
@@ -1253,7 +1280,7 @@ var createTemplate = (id, template, walks, setup, inputSignal) => {
     template,
     walks,
     setup,
-    inputSignal && (() => inputSignal)
+    inputSignal
   )();
   return renderer.mount = mount, renderer._ = renderer, register(id, renderer);
 };
@@ -1285,7 +1312,7 @@ function mount(input = {}, reference, position) {
       this,
       void 0,
       parentNode
-    ), args?.(branch, input);
+    ), this.p?.(branch), args?.(branch, input);
   });
   return insertChildNodes(
     parentNode,
@@ -1332,6 +1359,7 @@ export {
   createTemplate,
   data,
   dynamicClosure,
+  dynamicClosureRead,
   dynamicTag,
   effect,
   forIn,
@@ -1355,7 +1383,6 @@ export {
   register,
   registerBoundSignal,
   registerContent,
-  registerDynamicClosure,
   resetAbortSignal,
   run,
   setTagVar,