marko 6.0.15 → 6.0.17

package/dist/debug/dom.mjs

@@ -1130,183 +1130,6 @@ function longestIncreasingSubsequence(a) {
   return result;
 }
 
-// src/dom/walker.ts
-var walker = /* @__PURE__ */ document.createTreeWalker(document);
-function walk(startNode, walkCodes, branch) {
-  walker.currentNode = startNode;
-  walkInternal(0, walkCodes, branch);
-}
-function walkInternal(currentWalkIndex, walkCodes, scope) {
-  let value2;
-  let storedMultiplier = 0;
-  let currentMultiplier = 0;
-  let currentScopeIndex = 0;
-  for (; currentWalkIndex < walkCodes.length; ) {
-    value2 = walkCodes.charCodeAt(currentWalkIndex++);
-    currentMultiplier = storedMultiplier;
-    storedMultiplier = 0;
-    if (value2 === 32 /* Get */) {
-      const node = walker.currentNode;
-      scope[true ? getDebugKey(currentScopeIndex, walker.currentNode) : currentScopeIndex] = node;
-      scope["Getter:" /* Getter */ + (true ? getDebugKey(currentScopeIndex++, walker.currentNode) : currentScopeIndex++)] = () => node;
-    } else if (value2 === 37 /* Replace */ || value2 === 49 /* DynamicTagWithVar */) {
-      walker.currentNode.replaceWith(
-        walker.currentNode = scope[true ? getDebugKey(currentScopeIndex++, "#text") : currentScopeIndex++] = new Text()
-      );
-      if (value2 === 49 /* DynamicTagWithVar */) {
-        scope[true ? getDebugKey(currentScopeIndex++, "#scopeOffset") : currentScopeIndex++] = skipScope(scope);
-      }
-    } else if (value2 === 38 /* EndChild */) {
-      return currentWalkIndex;
-    } else if (value2 === 47 /* BeginChild */ || value2 === 48 /* BeginChildWithVar */) {
-      currentWalkIndex = walkInternal(
-        currentWalkIndex,
-        walkCodes,
-        scope[true ? getDebugKey(currentScopeIndex++, "#childScope") : currentScopeIndex++] = createScope(scope.$global, scope.___closestBranch)
-      );
-      if (value2 === 48 /* BeginChildWithVar */) {
-        scope[true ? getDebugKey(currentScopeIndex++, "#scopeOffset") : currentScopeIndex++] = skipScope(scope);
-      }
-    } else if (value2 < 91 /* NextEnd */ + 1) {
-      value2 = 20 /* Next */ * currentMultiplier + value2 - 67 /* Next */;
-      while (value2--) {
-        walker.nextNode();
-      }
-    } else if (value2 < 106 /* OverEnd */ + 1) {
-      value2 = 10 /* Over */ * currentMultiplier + value2 - 97 /* Over */;
-      while (value2--) {
-        walker.nextSibling();
-      }
-    } else if (value2 < 116 /* OutEnd */ + 1) {
-      value2 = 10 /* Out */ * currentMultiplier + value2 - 107 /* Out */;
-      while (value2--) {
-        walker.parentNode();
-      }
-      walker.nextSibling();
-    } else {
-      if (value2 < 117 /* Multiplier */ || value2 > 126 /* MultiplierEnd */) {
-        throw new Error(`Unknown walk code: ${value2}`);
-      }
-      storedMultiplier = currentMultiplier * 10 /* Multiplier */ + value2 - 117 /* Multiplier */;
-    }
-  }
-}
-function getDebugKey(index, node) {
-  if (typeof node === "string") {
-    return `${node}/${index}`;
-  } else if (node.nodeType === 3 /* Text */) {
-    return `#text/${index}`;
-  } else if (node.nodeType === 8 /* Comment */) {
-    return `#comment/${index}`;
-  } else if (node.nodeType === 1 /* Element */) {
-    return `#${node.tagName.toLowerCase()}/${index}`;
-  }
-  return index;
-}
-
-// src/dom/renderer.ts
-function createBranch($global, renderer, parentScope, parentNode) {
-  const branch = createScope($global);
-  const parentBranch = parentScope?.___closestBranch;
-  branch["_" /* Owner */] = renderer.___owner || parentScope;
-  branch.___closestBranch = branch;
-  if (parentBranch) {
-    branch.___parentBranch = parentBranch;
-    (parentBranch.___branchScopes ||= /* @__PURE__ */ new Set()).add(branch);
-  }
-  if (true) {
-    branch.___renderer = renderer;
-  }
-  renderer.___clone?.(
-    branch,
-    parentNode.namespaceURI
-  );
-  return branch;
-}
-function createAndSetupBranch($global, renderer, parentScope, parentNode) {
-  return setupBranch(
-    renderer,
-    createBranch($global, renderer, parentScope, parentNode)
-  );
-}
-function setupBranch(renderer, branch) {
-  if (renderer.___setup || renderer.___closures) {
-    queueRender(
-      branch,
-      (branch2) => {
-        renderer.___setup?.(branch2);
-        renderer.___closures?.(branch2);
-      },
-      -1
-    );
-  }
-  return branch;
-}
-function createContent(id, template, walks, setup, params, closures, dynamicScopesAccessor) {
-  walks = walks ? walks.replace(/[^\0-1]+$/, "") : "";
-  setup ||= void 0;
-  params ||= void 0;
-  closures = closures ? closures._ || closures : void 0;
-  const clone = template ? (branch, ns) => {
-    ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
-      template,
-      ns
-    ))(branch, walks);
-  } : (branch) => {
-    walk(
-      branch.___startNode = branch.___endNode = new Text(),
-      walks,
-      branch
-    );
-  };
-  return (owner) => {
-    return {
-      ___id: id,
-      ___clone: clone,
-      ___owner: owner,
-      ___setup: setup,
-      ___params: params,
-      ___closures: closures,
-      ___accessor: dynamicScopesAccessor
-    };
-  };
-}
-function registerContent(id, template, walks, setup, params, closures, dynamicScopesAccessor) {
-  return register(
-    id,
-    createContent(
-      id,
-      template,
-      walks,
-      setup,
-      params,
-      closures,
-      dynamicScopesAccessor
-    )
-  );
-}
-function createRenderer(template, walks, setup, params, closures) {
-  return createContent("", template, walks, setup, params, closures)();
-}
-var cloneCache = {};
-function createCloneableHTML(html2, ns) {
-  const { firstChild, lastChild } = parseHTML(html2, ns);
-  const parent = document.createElementNS(ns, "t");
-  insertChildNodes(parent, null, firstChild, lastChild);
-  return firstChild === lastChild && firstChild.nodeType < 8 /* Comment */ ? (branch, walks) => {
-    walk(
-      branch.___startNode = branch.___endNode = firstChild.cloneNode(true),
-      walks,
-      branch
-    );
-  } : (branch, walks) => {
-    const clone = parent.cloneNode(true);
-    walk(clone.firstChild, walks, branch);
-    branch.___startNode = clone.firstChild;
-    branch.___endNode = clone.lastChild;
-  };
-}
-
 // src/dom/schedule.ts
 var runTask;
 var isScheduled;
@@ -1542,6 +1365,178 @@ function hoist(...path) {
   };
 }
 
+// src/dom/walker.ts
+var walker = /* @__PURE__ */ document.createTreeWalker(document);
+function walk(startNode, walkCodes, branch) {
+  walker.currentNode = startNode;
+  walkInternal(0, walkCodes, branch);
+}
+function walkInternal(currentWalkIndex, walkCodes, scope) {
+  let value2;
+  let storedMultiplier = 0;
+  let currentMultiplier = 0;
+  let currentScopeIndex = 0;
+  for (; currentWalkIndex < walkCodes.length; ) {
+    value2 = walkCodes.charCodeAt(currentWalkIndex++);
+    currentMultiplier = storedMultiplier;
+    storedMultiplier = 0;
+    if (value2 === 32 /* Get */) {
+      const node = walker.currentNode;
+      scope[true ? getDebugKey(currentScopeIndex, walker.currentNode) : currentScopeIndex] = node;
+      scope["Getter:" /* Getter */ + (true ? getDebugKey(currentScopeIndex++, walker.currentNode) : currentScopeIndex++)] = () => node;
+    } else if (value2 === 37 /* Replace */ || value2 === 49 /* DynamicTagWithVar */) {
+      walker.currentNode.replaceWith(
+        walker.currentNode = scope[true ? getDebugKey(currentScopeIndex++, "#text") : currentScopeIndex++] = new Text()
+      );
+      if (value2 === 49 /* DynamicTagWithVar */) {
+        scope[true ? getDebugKey(currentScopeIndex++, "#scopeOffset") : currentScopeIndex++] = skipScope(scope);
+      }
+    } else if (value2 === 38 /* EndChild */) {
+      return currentWalkIndex;
+    } else if (value2 === 47 /* BeginChild */ || value2 === 48 /* BeginChildWithVar */) {
+      currentWalkIndex = walkInternal(
+        currentWalkIndex,
+        walkCodes,
+        scope[true ? getDebugKey(currentScopeIndex++, "#childScope") : currentScopeIndex++] = createScope(scope.$global, scope.___closestBranch)
+      );
+      if (value2 === 48 /* BeginChildWithVar */) {
+        scope[true ? getDebugKey(currentScopeIndex++, "#scopeOffset") : currentScopeIndex++] = skipScope(scope);
+      }
+    } else if (value2 < 91 /* NextEnd */ + 1) {
+      value2 = 20 /* Next */ * currentMultiplier + value2 - 67 /* Next */;
+      while (value2--) {
+        walker.nextNode();
+      }
+    } else if (value2 < 106 /* OverEnd */ + 1) {
+      value2 = 10 /* Over */ * currentMultiplier + value2 - 97 /* Over */;
+      while (value2--) {
+        walker.nextSibling();
+      }
+    } else if (value2 < 116 /* OutEnd */ + 1) {
+      value2 = 10 /* Out */ * currentMultiplier + value2 - 107 /* Out */;
+      while (value2--) {
+        walker.parentNode();
+      }
+      walker.nextSibling();
+    } else {
+      if (value2 < 117 /* Multiplier */ || value2 > 126 /* MultiplierEnd */) {
+        throw new Error(`Unknown walk code: ${value2}`);
+      }
+      storedMultiplier = currentMultiplier * 10 /* Multiplier */ + value2 - 117 /* Multiplier */;
+    }
+  }
+}
+function getDebugKey(index, node) {
+  if (typeof node === "string") {
+    return `${node}/${index}`;
+  } else if (node.nodeType === 3 /* Text */) {
+    return `#text/${index}`;
+  } else if (node.nodeType === 8 /* Comment */) {
+    return `#comment/${index}`;
+  } else if (node.nodeType === 1 /* Element */) {
+    return `#${node.tagName.toLowerCase()}/${index}`;
+  }
+  return index;
+}
+
+// src/dom/renderer.ts
+function createBranch($global, renderer, parentScope, parentNode) {
+  const branch = createScope($global);
+  const parentBranch = parentScope?.___closestBranch;
+  branch["_" /* Owner */] = renderer.___owner || parentScope;
+  branch.___closestBranch = branch;
+  if (parentBranch) {
+    branch.___parentBranch = parentBranch;
+    (parentBranch.___branchScopes ||= /* @__PURE__ */ new Set()).add(branch);
+  }
+  if (true) {
+    branch.___renderer = renderer;
+  }
+  renderer.___clone?.(
+    branch,
+    parentNode.namespaceURI
+  );
+  return branch;
+}
+function createAndSetupBranch($global, renderer, parentScope, parentNode) {
+  return setupBranch(
+    renderer,
+    createBranch($global, renderer, parentScope, parentNode)
+  );
+}
+function setupBranch(renderer, branch) {
+  if (renderer.___setup) {
+    queueRender(branch, renderer.___setup, -1);
+  }
+  return branch;
+}
+function createContent(id, template, walks, setup, params, dynamicScopesAccessor) {
+  walks = walks ? walks.replace(/[^\0-1]+$/, "") : "";
+  setup = setup ? setup._ || setup : void 0;
+  params ||= void 0;
+  const clone = template ? (branch, ns) => {
+    ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
+      template,
+      ns
+    ))(branch, walks);
+  } : (branch) => {
+    walk(
+      branch.___startNode = branch.___endNode = new Text(),
+      walks,
+      branch
+    );
+  };
+  return (owner) => {
+    return {
+      ___id: id,
+      ___clone: clone,
+      ___owner: owner,
+      ___setup: setup,
+      ___params: params,
+      ___accessor: dynamicScopesAccessor
+    };
+  };
+}
+function registerContent(id, template, walks, setup, params, dynamicScopesAccessor) {
+  return register(
+    id,
+    createContent(id, template, walks, setup, params, dynamicScopesAccessor)
+  );
+}
+function localClosures(renderer, closureFns) {
+  const closureSignals = {};
+  for (const key in closureFns) {
+    closureSignals[key] = value(key, closureFns[key]);
+  }
+  return (owner, closureValues) => {
+    const instance = renderer(owner);
+    instance.___localClosures = closureSignals;
+    instance.___localClosureValues = closureValues;
+    return instance;
+  };
+}
+function createRenderer(template, walks, setup, params) {
+  return createContent("", template, walks, setup, params)();
+}
+var cloneCache = {};
+function createCloneableHTML(html2, ns) {
+  const { firstChild, lastChild } = parseHTML(html2, ns);
+  const parent = document.createElementNS(ns, "t");
+  insertChildNodes(parent, null, firstChild, lastChild);
+  return firstChild === lastChild && firstChild.nodeType < 8 /* Comment */ ? (branch, walks) => {
+    walk(
+      branch.___startNode = branch.___endNode = firstChild.cloneNode(true),
+      walks,
+      branch
+    );
+  } : (branch, walks) => {
+    const clone = parent.cloneNode(true);
+    walk(clone.firstChild, walks, branch);
+    branch.___startNode = clone.firstChild;
+    branch.___endNode = clone.lastChild;
+  };
+}
+
 // src/dom/control-flow.ts
 function awaitTag(nodeAccessor, renderer) {
   const promiseAccessor = "Promise:" /* Promise */ + nodeAccessor;
@@ -1753,26 +1748,35 @@ var dynamicTag = function dynamicTag2(nodeAccessor, getContent, getTagVar, input
       }
     }
     if (normalizedRenderer) {
+      const childScope = scope[childScopeAccessor];
       const args = getInput?.();
       if (typeof normalizedRenderer === "string") {
         attrs(
-          scope[childScopeAccessor],
+          childScope,
           true ? `#${normalizedRenderer}/0` : 0,
           (inputIsArgs ? args[0] : args) || {}
         );
-      } else if (normalizedRenderer.___params) {
-        if (inputIsArgs) {
-          normalizedRenderer.___params(
-            scope[childScopeAccessor],
-            normalizedRenderer._ ? args[0] : args
-          );
-        } else {
-          const inputWithContent = getContent ? { ...args, content: getContent(scope) } : args || {};
-          normalizedRenderer.___params(
-            scope[childScopeAccessor],
-            normalizedRenderer._ ? inputWithContent : [inputWithContent]
+      } else {
+        for (const accessor in normalizedRenderer.___localClosures) {
+          normalizedRenderer.___localClosures[accessor](
+            childScope,
+            normalizedRenderer.___localClosureValues[accessor]
           );
         }
+        if (normalizedRenderer.___params) {
+          if (inputIsArgs) {
+            normalizedRenderer.___params(
+              childScope,
+              normalizedRenderer._ ? args[0] : args
+            );
+          } else {
+            const inputWithContent = getContent ? { ...args, content: getContent(scope) } : args || {};
+            normalizedRenderer.___params(
+              childScope,
+              normalizedRenderer._ ? inputWithContent : [inputWithContent]
+            );
+          }
+        }
       }
     }
   };
@@ -2281,6 +2285,7 @@ export {
   init,
   intersection,
   lifecycle,
+  localClosures,
   loopClosure,
   loopIn,
   loopOf,

package/dist/dom/renderer.d.ts

@@ -1,25 +1,23 @@
 import { type Accessor, type BranchScope, type Scope } from "../common/types";
-import type { Signal } from "./signals";
+import { type Signal, type SignalFn } from "./signals";
 export type Renderer = {
     ___id: string;
-    ___setup: undefined | ((branch: BranchScope) => void);
+    ___setup: undefined | SetupFn;
     ___clone: (branch: BranchScope, ns: string) => void;
     ___params: Signal<unknown> | undefined;
-    ___closures: SetupFn | undefined;
     ___owner: Scope | undefined;
     ___accessor: Accessor | undefined;
+    ___localClosures?: Record<Accessor, Signal<unknown>>;
+    ___localClosureValues?: Record<Accessor, unknown>;
 };
 type SetupFn = (scope: Scope) => void;
 export declare function createBranch($global: Scope["$global"], renderer: Renderer | string, parentScope: Scope | undefined, parentNode: ParentNode): BranchScope;
 export declare function createAndSetupBranch($global: Scope["$global"], renderer: Renderer, parentScope: Scope | undefined, parentNode: ParentNode): BranchScope;
 export declare function setupBranch(renderer: Renderer, branch: BranchScope): BranchScope;
-export declare function createContent(id: string, template: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown> | 0, closures?: {
+export declare function createContent(id: string, template: string | 0, walks?: string | 0, setup?: {
     _: Signal<unknown>;
-} | Signal<unknown> | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;
-export declare function registerContent(id: string, template: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown> | 0, closures?: {
-    _: Signal<unknown>;
-} | Signal<unknown> | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;
-export declare function createRenderer(template: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown> | 0, closures?: {
-    _: Signal<unknown>;
-} | Signal<unknown> | 0): Renderer;
+} | SetupFn | 0, params?: Signal<unknown> | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;
+export declare function registerContent(id: string, template: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown> | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;
+export declare function localClosures(renderer: ReturnType<typeof createContent>, closureFns: Record<Accessor, SignalFn<unknown>>): (owner: Scope, closureValues: Record<Accessor, unknown>) => Renderer;
+export declare function createRenderer(template: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown> | 0): Renderer;
 export {};

package/dist/dom.d.ts

@@ -7,7 +7,7 @@ export { controllable_detailsOrDialog_open, controllable_detailsOrDialog_open_ef
 export { attr, attrs, attrsEvents, classAttr, classItem, classItems, data, html, lifecycle, partialAttrs, props, styleAttr, styleItem, styleItems, textContent, } from "./dom/dom";
 export { on } from "./dom/event";
 export { enableCatch, run } from "./dom/queue";
-export { createContent, createRenderer, registerContent } from "./dom/renderer";
+export { createContent, createRenderer, localClosures, registerContent, } from "./dom/renderer";
 export { init, nodeRef, register, registerBoundSignal } from "./dom/resume";
 export { conditionalClosure, dynamicClosure, dynamicClosureRead, effect, hoist, intersection, loopClosure, nextTagId, setTagVar, setTagVarChange, state, tagVarSignal, tagVarSignalChange, value, } from "./dom/signals";
 export { createTemplate } from "./dom/template";