@marko/runtime-tags 6.0.148 → 6.0.149

package/dist/debug/dom.js

@@ -1593,8 +1593,7 @@ function attrsInternal(scope, nodeAccessor, nextAttrs) {
 }
 function _attr_content(scope, nodeAccessor, value) {
   const content = normalizeClientRender(value);
-  const rendererAccessor = "ConditionalRenderer:" /* ConditionalRenderer */ + nodeAccessor;
-  if (scope[rendererAccessor] !== (scope[rendererAccessor] = content?.___id)) {
+  if (scope["ConditionalRenderer:" /* ConditionalRenderer */ + nodeAccessor] !== (scope["ConditionalRenderer:" /* ConditionalRenderer */ + nodeAccessor] = content?.___id)) {
     setConditionalRenderer(scope, nodeAccessor, content, createAndSetupBranch);
     if (content?.___accessor) {
       subscribeToScopeSet(
@@ -1604,6 +1603,12 @@ function _attr_content(scope, nodeAccessor, value) {
       );
     }
   }
+  for (const accessor in content?.___localClosures) {
+    content.___localClosures[accessor](
+      scope["BranchScopes:" /* BranchScopes */ + nodeAccessor],
+      content.___localClosureValues[accessor]
+    );
+  }
 }
 function _attrs_script(scope, nodeAccessor) {
   const el = scope[nodeAccessor];

package/dist/debug/dom.mjs

@@ -1479,8 +1479,7 @@ function attrsInternal(scope, nodeAccessor, nextAttrs) {
 }
 function _attr_content(scope, nodeAccessor, value) {
   const content = normalizeClientRender(value);
-  const rendererAccessor = "ConditionalRenderer:" /* ConditionalRenderer */ + nodeAccessor;
-  if (scope[rendererAccessor] !== (scope[rendererAccessor] = content?.___id)) {
+  if (scope["ConditionalRenderer:" /* ConditionalRenderer */ + nodeAccessor] !== (scope["ConditionalRenderer:" /* ConditionalRenderer */ + nodeAccessor] = content?.___id)) {
     setConditionalRenderer(scope, nodeAccessor, content, createAndSetupBranch);
     if (content?.___accessor) {
       subscribeToScopeSet(
@@ -1490,6 +1489,12 @@ function _attr_content(scope, nodeAccessor, value) {
       );
     }
   }
+  for (const accessor in content?.___localClosures) {
+    content.___localClosures[accessor](
+      scope["BranchScopes:" /* BranchScopes */ + nodeAccessor],
+      content.___localClosureValues[accessor]
+    );
+  }
 }
 function _attrs_script(scope, nodeAccessor) {
   const el = scope[nodeAccessor];

package/dist/debug/html.js

@@ -1814,7 +1814,9 @@ function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
   if (rendered) {
     if (shouldResume) {
       writeScope(scopeId, {
-        ["BranchScopes:" /* BranchScopes */ + nodeAccessor]: writeScope(branchId, {}),
+        ["BranchScopes:" /* BranchScopes */ + nodeAccessor]: referenceScope(
+          writeScope(branchId, {})
+        ),
         ["ConditionalRenderer:" /* ConditionalRenderer */ + nodeAccessor]: render2?.___id
       });
     }

package/dist/debug/html.mjs

@@ -1721,7 +1721,9 @@ function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
   if (rendered) {
     if (shouldResume) {
       writeScope(scopeId, {
-        ["BranchScopes:" /* BranchScopes */ + nodeAccessor]: writeScope(branchId, {}),
+        ["BranchScopes:" /* BranchScopes */ + nodeAccessor]: referenceScope(
+          writeScope(branchId, {})
+        ),
         ["ConditionalRenderer:" /* ConditionalRenderer */ + nodeAccessor]: render2?.___id
       });
     }

package/dist/dom.js

@@ -371,9 +371,9 @@ function subscribeToScopeSet(ownerScope, accessor, scope) {
   ));
 }
 function _closure(...closureSignals) {
-  let [{ k: ___scopeInstancesAccessor, l: ___signalIndexAccessor }] = closureSignals;
+  let [{ l: ___scopeInstancesAccessor, n: ___signalIndexAccessor }] = closureSignals;
   for (let i = closureSignals.length; i--; )
-    closureSignals[i].q = i;
+    closureSignals[i].t = i;
   return (scope) => {
     if (scope[___scopeInstancesAccessor])
       for (let childScope of scope[___scopeInstancesAccessor])
@@ -387,13 +387,13 @@ function _closure(...closureSignals) {
 function _closure_get(valueAccessor, fn, getOwnerScope, resumeId) {
   valueAccessor = decodeAccessor(valueAccessor);
   let closureSignal = ((scope) => {
-    scope[closureSignal.l] = closureSignal.q, fn(scope), subscribeToScopeSet(
+    scope[closureSignal.n] = closureSignal.t, fn(scope), subscribeToScopeSet(
       getOwnerScope ? getOwnerScope(scope) : scope._,
-      closureSignal.k,
+      closureSignal.l,
       scope
     );
   });
-  return closureSignal.k = "B" /* ClosureScopes */ + valueAccessor, closureSignal.l = "C" /* ClosureSignalIndex */ + valueAccessor, resumeId && _resume(resumeId, closureSignal), closureSignal;
+  return closureSignal.l = "B" /* ClosureScopes */ + valueAccessor, closureSignal.n = "C" /* ClosureSignalIndex */ + valueAccessor, resumeId && _resume(resumeId, closureSignal), closureSignal;
 }
 function _child_setup(setup) {
   return setup._ = (scope, owner) => {
@@ -485,7 +485,7 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
 // src/dom/renderer.ts
 function createBranch($global, renderer, parentScope, parentNode) {
   let branch = createScope($global);
-  return branch._ = renderer.e || parentScope, setParentBranch(branch, parentScope?.F), renderer.h?.(
+  return branch._ = renderer.e || parentScope, setParentBranch(branch, parentScope?.F), renderer.j?.(
     branch,
     parentNode.namespaceURI
   ), branch;
@@ -500,7 +500,7 @@ function createAndSetupBranch($global, renderer, parentScope, parentNode) {
   );
 }
 function setupBranch(renderer, branch) {
-  return renderer.j && queueRender(branch, renderer.j, -1), branch;
+  return renderer.k && queueRender(branch, renderer.k, -1), branch;
 }
 function _content(id, template, walks, setup, params, dynamicScopesAccessor) {
   walks = walks ? walks.replace(/[^\0-1]+$/, "") : "", setup = setup ? setup._ || setup : void 0, params ||= void 0;
@@ -518,9 +518,9 @@ function _content(id, template, walks, setup, params, dynamicScopesAccessor) {
   };
   return (owner) => ({
     f: id,
-    h: clone,
+    j: clone,
     e: owner,
-    j: setup,
+    k: setup,
     b: params,
     d: dynamicScopesAccessor
   });
@@ -537,7 +537,7 @@ function _content_closures(renderer, closureFns) {
     closureSignals[key] = _const(+key, closureFns[key]);
   return (owner, closureValues) => {
     let instance = renderer(owner);
-    return instance.n = closureSignals, instance.t = closureValues, instance;
+    return instance.g = closureSignals, instance.o = closureValues, instance;
   };
 }
 var cloneCache = {};
@@ -989,12 +989,17 @@ function attrsInternal(scope, nodeAccessor, nextAttrs) {
   }
 }
 function _attr_content(scope, nodeAccessor, value) {
-  let content = normalizeClientRender(value), rendererAccessor = "D" /* ConditionalRenderer */ + nodeAccessor;
-  scope[rendererAccessor] !== (scope[rendererAccessor] = content?.f) && (setConditionalRenderer(scope, nodeAccessor, content, createAndSetupBranch), content?.d && subscribeToScopeSet(
+  let content = normalizeClientRender(value);
+  scope["D" /* ConditionalRenderer */ + nodeAccessor] !== (scope["D" /* ConditionalRenderer */ + nodeAccessor] = content?.f) && (setConditionalRenderer(scope, nodeAccessor, content, createAndSetupBranch), content?.d && subscribeToScopeSet(
     content.e,
     content.d,
     scope["A" /* BranchScopes */ + nodeAccessor]
   ));
+  for (let accessor in content?.g)
+    content.g[accessor](
+      scope["A" /* BranchScopes */ + nodeAccessor],
+      content.o[accessor]
+    );
 }
 function _attrs_script(scope, nodeAccessor) {
   let el = scope[nodeAccessor], events = scope["I" /* EventAttributes */ + nodeAccessor];
@@ -1337,10 +1342,10 @@ var _dynamic_tag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
           (inputIsArgs ? args[0] : args) || {}
         ), (childScope["Ia"] || childScope["Ea"]) && queueEffect(childScope, dynamicTagScript);
       else {
-        for (let accessor in normalizedRenderer.n)
-          normalizedRenderer.n[accessor](
+        for (let accessor in normalizedRenderer.g)
+          normalizedRenderer.g[accessor](
             childScope,
-            normalizedRenderer.t[accessor]
+            normalizedRenderer.o[accessor]
           );
         if (normalizedRenderer.b)
           if (inputIsArgs)
@@ -1437,12 +1442,12 @@ function byFirstArg(name) {
 var pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map(), asyncRendersLookup, caughtError = /* @__PURE__ */ new WeakSet(), placeholderShown = /* @__PURE__ */ new WeakSet(), pendingEffects = [], pendingScopes = [], rendering, scopeKeyOffset = 1e3;
 function queueRender(scope, signal, signalKey, value, scopeKey = scope.L) {
   let key = scopeKey * scopeKeyOffset + signalKey, render = signalKey >= 0 && pendingRendersLookup.get(key);
-  render ? render.o = value : (queuePendingRender(
+  render ? render.q = value : (queuePendingRender(
     render = {
       a: key,
-      g: scope,
+      h: scope,
       u: signal,
-      o: value
+      q: value
     }
   ), signalKey >= 0 && pendingRendersLookup.set(key, render));
 }
@@ -1495,13 +1500,13 @@ function runRenders() {
       }
       pendingRenders[i] = item;
     }
-    render.g.F?.I || runRender(render);
+    render.h.F?.I || runRender(render);
   }
   for (let scope of pendingScopes)
     scope.H = 0;
   pendingScopes = [];
 }
-var runRender = (render) => render.u(render.g, render.o), _enable_catch = () => {
+var runRender = (render) => render.u(render.h, render.q), _enable_catch = () => {
   _enable_catch = () => {
   }, enableBranches();
   let handlePendingTry = (fn, scope, branch) => {
@@ -1520,7 +1525,7 @@ var runRender = (render) => render.u(render.g, render.o), _enable_catch = () =>
       runEffects2(effects);
   })(runEffects), runRender = /* @__PURE__ */ ((runRender2) => (render) => {
     try {
-      let branch = render.g.F;
+      let branch = render.h.F;
       for (; branch; ) {
         if (branch.W)
           return asyncRendersLookup.set(
@@ -1531,7 +1536,7 @@ var runRender = (render) => render.u(render.g, render.o), _enable_catch = () =>
       }
       runRender2(render);
     } catch (error) {
-      renderCatch(render.g, error);
+      renderCatch(render.h, error);
     }
   })(runRender);
 };
@@ -1564,7 +1569,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
     _resume(RENDERER_REGISTER_ID, fn);
   },
   isRenderer(renderer) {
-    return renderer.h;
+    return renderer.j;
   },
   getStartNode(branch) {
     return branch.S;
@@ -1586,7 +1591,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
   },
   createRenderer(params, clone) {
     let renderer = _content("", 0, 0, 0, params)();
-    return renderer.h = (branch) => {
+    return renderer.j = (branch) => {
       let cloned = clone();
       branch.S = cloned.startNode, branch.K = cloned.endNode;
     }, renderer;
@@ -1652,7 +1657,7 @@ function mount(input = {}, reference, position) {
       parentNode
     ), branch.T = (newValue) => {
       curValue = newValue;
-    }, this.j?.(branch), args?.(branch, input);
+    }, this.k?.(branch), args?.(branch, input);
   });
   return insertChildNodes(
     parentNode,

package/dist/dom.mjs

@@ -260,9 +260,9 @@ function subscribeToScopeSet(ownerScope, accessor, scope) {
   ));
 }
 function _closure(...closureSignals) {
-  let [{ k: ___scopeInstancesAccessor, l: ___signalIndexAccessor }] = closureSignals;
+  let [{ l: ___scopeInstancesAccessor, n: ___signalIndexAccessor }] = closureSignals;
   for (let i = closureSignals.length; i--; )
-    closureSignals[i].q = i;
+    closureSignals[i].t = i;
   return (scope) => {
     if (scope[___scopeInstancesAccessor])
       for (let childScope of scope[___scopeInstancesAccessor])
@@ -276,13 +276,13 @@ function _closure(...closureSignals) {
 function _closure_get(valueAccessor, fn, getOwnerScope, resumeId) {
   valueAccessor = decodeAccessor(valueAccessor);
   let closureSignal = ((scope) => {
-    scope[closureSignal.l] = closureSignal.q, fn(scope), subscribeToScopeSet(
+    scope[closureSignal.n] = closureSignal.t, fn(scope), subscribeToScopeSet(
       getOwnerScope ? getOwnerScope(scope) : scope._,
-      closureSignal.k,
+      closureSignal.l,
       scope
     );
   });
-  return closureSignal.k = "B" /* ClosureScopes */ + valueAccessor, closureSignal.l = "C" /* ClosureSignalIndex */ + valueAccessor, resumeId && _resume(resumeId, closureSignal), closureSignal;
+  return closureSignal.l = "B" /* ClosureScopes */ + valueAccessor, closureSignal.n = "C" /* ClosureSignalIndex */ + valueAccessor, resumeId && _resume(resumeId, closureSignal), closureSignal;
 }
 function _child_setup(setup) {
   return setup._ = (scope, owner) => {
@@ -374,7 +374,7 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
 // src/dom/renderer.ts
 function createBranch($global, renderer, parentScope, parentNode) {
   let branch = createScope($global);
-  return branch._ = renderer.e || parentScope, setParentBranch(branch, parentScope?.F), renderer.h?.(
+  return branch._ = renderer.e || parentScope, setParentBranch(branch, parentScope?.F), renderer.j?.(
     branch,
     parentNode.namespaceURI
   ), branch;
@@ -389,7 +389,7 @@ function createAndSetupBranch($global, renderer, parentScope, parentNode) {
   );
 }
 function setupBranch(renderer, branch) {
-  return renderer.j && queueRender(branch, renderer.j, -1), branch;
+  return renderer.k && queueRender(branch, renderer.k, -1), branch;
 }
 function _content(id, template, walks, setup, params, dynamicScopesAccessor) {
   walks = walks ? walks.replace(/[^\0-1]+$/, "") : "", setup = setup ? setup._ || setup : void 0, params ||= void 0;
@@ -407,9 +407,9 @@ function _content(id, template, walks, setup, params, dynamicScopesAccessor) {
   };
   return (owner) => ({
     f: id,
-    h: clone,
+    j: clone,
     e: owner,
-    j: setup,
+    k: setup,
     b: params,
     d: dynamicScopesAccessor
   });
@@ -426,7 +426,7 @@ function _content_closures(renderer, closureFns) {
     closureSignals[key] = _const(+key, closureFns[key]);
   return (owner, closureValues) => {
     let instance = renderer(owner);
-    return instance.n = closureSignals, instance.t = closureValues, instance;
+    return instance.g = closureSignals, instance.o = closureValues, instance;
   };
 }
 var cloneCache = {};
@@ -878,12 +878,17 @@ function attrsInternal(scope, nodeAccessor, nextAttrs) {
   }
 }
 function _attr_content(scope, nodeAccessor, value) {
-  let content = normalizeClientRender(value), rendererAccessor = "D" /* ConditionalRenderer */ + nodeAccessor;
-  scope[rendererAccessor] !== (scope[rendererAccessor] = content?.f) && (setConditionalRenderer(scope, nodeAccessor, content, createAndSetupBranch), content?.d && subscribeToScopeSet(
+  let content = normalizeClientRender(value);
+  scope["D" /* ConditionalRenderer */ + nodeAccessor] !== (scope["D" /* ConditionalRenderer */ + nodeAccessor] = content?.f) && (setConditionalRenderer(scope, nodeAccessor, content, createAndSetupBranch), content?.d && subscribeToScopeSet(
     content.e,
     content.d,
     scope["A" /* BranchScopes */ + nodeAccessor]
   ));
+  for (let accessor in content?.g)
+    content.g[accessor](
+      scope["A" /* BranchScopes */ + nodeAccessor],
+      content.o[accessor]
+    );
 }
 function _attrs_script(scope, nodeAccessor) {
   let el = scope[nodeAccessor], events = scope["I" /* EventAttributes */ + nodeAccessor];
@@ -1226,10 +1231,10 @@ var _dynamic_tag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
           (inputIsArgs ? args[0] : args) || {}
         ), (childScope["Ia"] || childScope["Ea"]) && queueEffect(childScope, dynamicTagScript);
       else {
-        for (let accessor in normalizedRenderer.n)
-          normalizedRenderer.n[accessor](
+        for (let accessor in normalizedRenderer.g)
+          normalizedRenderer.g[accessor](
             childScope,
-            normalizedRenderer.t[accessor]
+            normalizedRenderer.o[accessor]
           );
         if (normalizedRenderer.b)
           if (inputIsArgs)
@@ -1326,12 +1331,12 @@ function byFirstArg(name) {
 var pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map(), asyncRendersLookup, caughtError = /* @__PURE__ */ new WeakSet(), placeholderShown = /* @__PURE__ */ new WeakSet(), pendingEffects = [], pendingScopes = [], rendering, scopeKeyOffset = 1e3;
 function queueRender(scope, signal, signalKey, value, scopeKey = scope.L) {
   let key = scopeKey * scopeKeyOffset + signalKey, render = signalKey >= 0 && pendingRendersLookup.get(key);
-  render ? render.o = value : (queuePendingRender(
+  render ? render.q = value : (queuePendingRender(
     render = {
       a: key,
-      g: scope,
+      h: scope,
       u: signal,
-      o: value
+      q: value
     }
   ), signalKey >= 0 && pendingRendersLookup.set(key, render));
 }
@@ -1384,13 +1389,13 @@ function runRenders() {
       }
       pendingRenders[i] = item;
     }
-    render.g.F?.I || runRender(render);
+    render.h.F?.I || runRender(render);
   }
   for (let scope of pendingScopes)
     scope.H = 0;
   pendingScopes = [];
 }
-var runRender = (render) => render.u(render.g, render.o), _enable_catch = () => {
+var runRender = (render) => render.u(render.h, render.q), _enable_catch = () => {
   _enable_catch = () => {
   }, enableBranches();
   let handlePendingTry = (fn, scope, branch) => {
@@ -1409,7 +1414,7 @@ var runRender = (render) => render.u(render.g, render.o), _enable_catch = () =>
       runEffects2(effects);
   })(runEffects), runRender = /* @__PURE__ */ ((runRender2) => (render) => {
     try {
-      let branch = render.g.F;
+      let branch = render.h.F;
       for (; branch; ) {
         if (branch.W)
           return asyncRendersLookup.set(
@@ -1420,7 +1425,7 @@ var runRender = (render) => render.u(render.g, render.o), _enable_catch = () =>
       }
       runRender2(render);
     } catch (error) {
-      renderCatch(render.g, error);
+      renderCatch(render.h, error);
     }
   })(runRender);
 };
@@ -1453,7 +1458,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
     _resume(RENDERER_REGISTER_ID, fn);
   },
   isRenderer(renderer) {
-    return renderer.h;
+    return renderer.j;
   },
   getStartNode(branch) {
     return branch.S;
@@ -1475,7 +1480,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
   },
   createRenderer(params, clone) {
     let renderer = _content("", 0, 0, 0, params)();
-    return renderer.h = (branch) => {
+    return renderer.j = (branch) => {
       let cloned = clone();
       branch.S = cloned.startNode, branch.K = cloned.endNode;
     }, renderer;
@@ -1541,7 +1546,7 @@ function mount(input = {}, reference, position) {
       parentNode
     ), branch.T = (newValue) => {
       curValue = newValue;
-    }, this.j?.(branch), args?.(branch, input);
+    }, this.k?.(branch), args?.(branch, input);
   });
   return insertChildNodes(
     parentNode,

package/dist/html.js

@@ -1156,7 +1156,9 @@ function _script(scopeId, registryId) {
 function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
   let shouldResume = serializeReason !== 0, render2 = normalizeServerRender(content), branchId = _peek_scope_id();
   render2 && (shouldResume ? withBranchId(branchId, render2) : render2()), _peek_scope_id() !== branchId ? shouldResume && writeScope(scopeId, {
-    ["A" /* BranchScopes */ + nodeAccessor]: writeScope(branchId, {}),
+    ["A" /* BranchScopes */ + nodeAccessor]: referenceScope(
+      writeScope(branchId, {})
+    ),
     ["D" /* ConditionalRenderer */ + nodeAccessor]: render2?.a
   }) : _scope_id();
 }

package/dist/html.mjs

@@ -1066,7 +1066,9 @@ function _script(scopeId, registryId) {
 function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
   let shouldResume = serializeReason !== 0, render2 = normalizeServerRender(content), branchId = _peek_scope_id();
   render2 && (shouldResume ? withBranchId(branchId, render2) : render2()), _peek_scope_id() !== branchId ? shouldResume && writeScope(scopeId, {
-    ["A" /* BranchScopes */ + nodeAccessor]: writeScope(branchId, {}),
+    ["A" /* BranchScopes */ + nodeAccessor]: referenceScope(
+      writeScope(branchId, {})
+    ),
     ["D" /* ConditionalRenderer */ + nodeAccessor]: render2?.a
   }) : _scope_id();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/runtime-tags",
-  "version": "6.0.148",
+  "version": "6.0.149",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",