@marko/runtime-tags 6.0.139 → 6.0.140

package/dist/debug/dom.js

@@ -71,6 +71,7 @@ __export(dom_exports, {
   _for_to: () => _for_to,
   _for_until: () => _for_until,
   _hoist: () => _hoist,
+  _hoist_resume: () => _hoist_resume,
   _html: () => _html,
   _id: () => _id,
   _if: () => _if,
@@ -656,19 +657,22 @@ function _el_read(value) {
   }
   return value;
 }
-function* traverseAllHoisted(scope, path, curIndex = path.length - 1) {
+function* traverse(scope, path, i = path.length - 1) {
   if (rendering) {
     _hoist_read_error();
   }
   if (scope) {
     if (Symbol.iterator in scope) {
-      for (const s of scope instanceof Map ? scope.values() : scope) {
-        yield* traverseAllHoisted(s, path, curIndex);
+      for (const childScope of scope.values()) {
+        yield* traverse(childScope, path, i);
       }
-    } else if (curIndex) {
-      yield* traverseAllHoisted(scope[path[curIndex]], path, curIndex - 1);
     } else {
-      yield scope[path[0]];
+      const item = scope[path[i]];
+      if (i) {
+        yield* traverse(item, path, i - 1);
+      } else {
+        yield typeof item === "function" ? item() : item;
+      }
     }
   }
 }
@@ -676,11 +680,14 @@ function _hoist(...path) {
   if (false)
     path = path.map((p) => typeof p === "string" ? p : decodeAccessor(p));
   return (scope) => {
-    const getOne = (...args) => iterator().next().value?.(...args);
-    const iterator = getOne[Symbol.iterator] = () => traverseAllHoisted(scope, path);
-    return getOne;
+    const fn = () => traverse(scope, path).next().value;
+    fn[Symbol.iterator] = () => traverse(scope, path);
+    return fn;
   };
 }
+function _hoist_resume(id, ...path) {
+  return _resume(id, _hoist(...path));
+}
 
 // src/dom/walker.ts
 var walker = /* @__PURE__ */ document.createTreeWalker(document);
@@ -690,7 +697,6 @@ function walk(startNode, walkCodes, branch) {
 }
 function walkInternal(currentWalkIndex, walkCodes, scope) {
   let value;
-  let id;
   let storedMultiplier = 0;
   let currentMultiplier = 0;
   let currentScopeIndex = 0;
@@ -700,8 +706,7 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
     storedMultiplier = 0;
     if (value === 32 /* Get */) {
       const node = walker.currentNode;
-      scope[id = true ? getDebugKey(currentScopeIndex++, node) : decodeAccessor2(currentScopeIndex++)] = node;
-      scope["Getter:" /* Getter */ + id] = () => node;
+      scope[true ? getDebugKey(currentScopeIndex++, node) : decodeAccessor2(currentScopeIndex++)] = node;
     } else if (value === 37 /* Replace */ || value === 49 /* DynamicTagWithVar */) {
       walker.currentNode.replaceWith(
         walker.currentNode = scope[true ? getDebugKey(currentScopeIndex++, "#text") : decodeAccessor2(currentScopeIndex++)] = new Text()
@@ -888,11 +893,9 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         const visitBranches = branchesEnabled && /* @__PURE__ */ ((branchScopesStack = [], branchStarts = [], orphanBranches = [], curBranchScopes) => {
           return (branchId, branch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length) => {
             if (visitType !== "[" /* BranchStart */) {
-              visitScope["Getter:" /* Getter */ + nextToken(
+              visitScope[nextToken(
                 /* read accessor */
-              )] = /* @__PURE__ */ ((node) => () => node)(
-                visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? parent : visit
-              );
+              )] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? parent : visit;
               accessor = "BranchScopes:" /* BranchScopes */ + lastToken;
               singleNode = visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */;
               nextToken(
@@ -1005,7 +1008,9 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
               /* read scope id */
             ));
             if (visitType === "*" /* Node */) {
-              visitScope["Getter:" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling);
+              visitScope[nextToken(
+                /* read accessor */
+              )] = visit.previousSibling;
             } else if (branchesEnabled) {
               visitBranches();
             }
@@ -1054,10 +1059,12 @@ function _var_resume(id, signal) {
   return signal;
 }
 function _el(id, accessor) {
-  const getterAccessor = "Getter:" /* Getter */ + (true ? accessor : decodeAccessor3(accessor));
-  return _resume(id, (scope) => () => {
-    return scope[getterAccessor]();
-  });
+  if (true) {
+    return _resume(id, (scope) => () => _el_read(scope[accessor]));
+  } else {
+    accessor = decodeAccessor3(accessor);
+    return _resume(id, (scope) => () => scope[accessor]);
+  }
 }
 
 // src/dom/controllable.ts

package/dist/debug/dom.mjs

@@ -550,19 +550,22 @@ function _el_read(value) {
   }
   return value;
 }
-function* traverseAllHoisted(scope, path, curIndex = path.length - 1) {
+function* traverse(scope, path, i = path.length - 1) {
   if (rendering) {
     _hoist_read_error();
   }
   if (scope) {
     if (Symbol.iterator in scope) {
-      for (const s of scope instanceof Map ? scope.values() : scope) {
-        yield* traverseAllHoisted(s, path, curIndex);
+      for (const childScope of scope.values()) {
+        yield* traverse(childScope, path, i);
       }
-    } else if (curIndex) {
-      yield* traverseAllHoisted(scope[path[curIndex]], path, curIndex - 1);
     } else {
-      yield scope[path[0]];
+      const item = scope[path[i]];
+      if (i) {
+        yield* traverse(item, path, i - 1);
+      } else {
+        yield typeof item === "function" ? item() : item;
+      }
     }
   }
 }
@@ -570,11 +573,14 @@ function _hoist(...path) {
   if (false)
     path = path.map((p) => typeof p === "string" ? p : decodeAccessor(p));
   return (scope) => {
-    const getOne = (...args) => iterator().next().value?.(...args);
-    const iterator = getOne[Symbol.iterator] = () => traverseAllHoisted(scope, path);
-    return getOne;
+    const fn = () => traverse(scope, path).next().value;
+    fn[Symbol.iterator] = () => traverse(scope, path);
+    return fn;
   };
 }
+function _hoist_resume(id, ...path) {
+  return _resume(id, _hoist(...path));
+}
 
 // src/dom/walker.ts
 var walker = /* @__PURE__ */ document.createTreeWalker(document);
@@ -584,7 +590,6 @@ function walk(startNode, walkCodes, branch) {
 }
 function walkInternal(currentWalkIndex, walkCodes, scope) {
   let value;
-  let id;
   let storedMultiplier = 0;
   let currentMultiplier = 0;
   let currentScopeIndex = 0;
@@ -594,8 +599,7 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
     storedMultiplier = 0;
     if (value === 32 /* Get */) {
       const node = walker.currentNode;
-      scope[id = true ? getDebugKey(currentScopeIndex++, node) : decodeAccessor2(currentScopeIndex++)] = node;
-      scope["Getter:" /* Getter */ + id] = () => node;
+      scope[true ? getDebugKey(currentScopeIndex++, node) : decodeAccessor2(currentScopeIndex++)] = node;
     } else if (value === 37 /* Replace */ || value === 49 /* DynamicTagWithVar */) {
       walker.currentNode.replaceWith(
         walker.currentNode = scope[true ? getDebugKey(currentScopeIndex++, "#text") : decodeAccessor2(currentScopeIndex++)] = new Text()
@@ -782,11 +786,9 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         const visitBranches = branchesEnabled && /* @__PURE__ */ ((branchScopesStack = [], branchStarts = [], orphanBranches = [], curBranchScopes) => {
           return (branchId, branch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length) => {
             if (visitType !== "[" /* BranchStart */) {
-              visitScope["Getter:" /* Getter */ + nextToken(
+              visitScope[nextToken(
                 /* read accessor */
-              )] = /* @__PURE__ */ ((node) => () => node)(
-                visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? parent : visit
-              );
+              )] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? parent : visit;
               accessor = "BranchScopes:" /* BranchScopes */ + lastToken;
               singleNode = visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */;
               nextToken(
@@ -899,7 +901,9 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
               /* read scope id */
             ));
             if (visitType === "*" /* Node */) {
-              visitScope["Getter:" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling);
+              visitScope[nextToken(
+                /* read accessor */
+              )] = visit.previousSibling;
             } else if (branchesEnabled) {
               visitBranches();
             }
@@ -948,10 +952,12 @@ function _var_resume(id, signal) {
   return signal;
 }
 function _el(id, accessor) {
-  const getterAccessor = "Getter:" /* Getter */ + (true ? accessor : decodeAccessor3(accessor));
-  return _resume(id, (scope) => () => {
-    return scope[getterAccessor]();
-  });
+  if (true) {
+    return _resume(id, (scope) => () => _el_read(scope[accessor]));
+  } else {
+    accessor = decodeAccessor3(accessor);
+    return _resume(id, (scope) => () => scope[accessor]);
+  }
 }
 
 // src/dom/controllable.ts
@@ -2574,6 +2580,7 @@ export {
   _for_to,
   _for_until,
   _hoist,
+  _hoist_resume,
   _html,
   _id,
   _if,

package/dist/dom/resume.d.ts

@@ -1,5 +1,5 @@
 import { type AwaitCounter, type EncodedAccessor, type Scope } from "../common/types";
-import type { Signal } from "./signals";
+import { type Signal } from "./signals";
 type Resumes = (number | Scope)[];
 type ResumeFn = (ctx: object) => Resumes;
 export interface Renders {

package/dist/dom/signals.d.ts

@@ -29,4 +29,8 @@ export declare const _var_change: (scope: Scope, value: unknown, name?: string)
 export declare function _id({ [AccessorProp.Global]: $global }: Scope): string;
 export declare function _script(id: string, fn: (scope: Scope) => void): (scope: Scope) => void;
 export declare function _el_read<T>(value: T): T;
-export declare function _hoist(...path: Accessor[]): (scope: Scope) => (...args: unknown[]) => any;
+type Hoistable<T> = () => T;
+type Hoisted<T> = Hoistable<T> & Iterable<T>;
+export declare function _hoist<T>(...path: Accessor[]): (scope: Scope) => Hoisted<T>;
+export declare function _hoist_resume<T>(id: string, ...path: Accessor[]): (scope: Scope) => Hoisted<T>;
+export {};

package/dist/dom.d.ts

@@ -11,5 +11,5 @@ export { _on } from "./dom/event";
 export { _enable_catch as _enable_catch, run } from "./dom/queue";
 export { _content, _content_closures, _content_resume } from "./dom/renderer";
 export { _el, _resume, _var_resume, init } from "./dom/resume";
-export { _child_setup, _closure, _closure_get, _const, _el_read, _for_closure, _hoist, _id, _if_closure, _let, _or, _return, _return_change, _script, _var, _var_change, } from "./dom/signals";
+export { _child_setup, _closure, _closure_get, _const, _el_read, _for_closure, _hoist, _hoist_resume, _id, _if_closure, _let, _or, _return, _return_change, _script, _var, _var_change, } from "./dom/signals";
 export { _template } from "./dom/template";

package/dist/dom.js

@@ -68,6 +68,7 @@ __export(dom_exports, {
   _for_to: () => _for_to,
   _for_until: () => _for_until,
   _hoist: () => _hoist,
+  _hoist_resume: () => _hoist_resume,
   _html: () => _html,
   _id: () => _id,
   _if: () => _if,
@@ -412,19 +413,25 @@ function _script(id, fn) {
 function _el_read(value) {
   return rendering && void 0, value;
 }
-function* traverseAllHoisted(scope, path, curIndex = path.length - 1) {
+function* traverse(scope, path, i = path.length - 1) {
   if (scope)
     if (Symbol.iterator in scope)
-      for (let s of scope instanceof Map ? scope.values() : scope)
-        yield* traverseAllHoisted(s, path, curIndex);
-    else curIndex ? yield* traverseAllHoisted(scope[path[curIndex]], path, curIndex - 1) : yield scope[path[0]];
+      for (let childScope of scope.values())
+        yield* traverse(childScope, path, i);
+    else {
+      let item = scope[path[i]];
+      i ? yield* traverse(item, path, i - 1) : yield typeof item == "function" ? item() : item;
+    }
 }
 function _hoist(...path) {
   return path = path.map((p) => typeof p == "string" ? p : decodeAccessor(p)), (scope) => {
-    let getOne = (...args) => iterator().next().value?.(...args), iterator = getOne[Symbol.iterator] = () => traverseAllHoisted(scope, path);
-    return getOne;
+    let fn = () => traverse(scope, path).next().value;
+    return fn[Symbol.iterator] = () => traverse(scope, path), fn;
   };
 }
+function _hoist_resume(id, ...path) {
+  return _resume(id, _hoist(...path));
+}
 
 // src/dom/walker.ts
 var walker = /* @__PURE__ */ document.createTreeWalker(document);
@@ -432,11 +439,11 @@ function walk(startNode, walkCodes, branch) {
   walker.currentNode = startNode, walkInternal(0, walkCodes, branch);
 }
 function walkInternal(currentWalkIndex, walkCodes, scope) {
-  let value, id, storedMultiplier = 0, currentMultiplier = 0, currentScopeIndex = 0;
+  let value, storedMultiplier = 0, currentMultiplier = 0, currentScopeIndex = 0;
   for (; currentWalkIndex < walkCodes.length; )
     if (value = walkCodes.charCodeAt(currentWalkIndex++), currentMultiplier = storedMultiplier, storedMultiplier = 0, value === 32 /* Get */) {
       let node = walker.currentNode;
-      scope[id = decodeAccessor(currentScopeIndex++)] = node, scope["J" /* Getter */ + id] = () => node;
+      scope[decodeAccessor(currentScopeIndex++)] = node;
     } else if (value === 37 /* Replace */ || value === 49 /* DynamicTagWithVar */)
       walker.currentNode.replaceWith(
         walker.currentNode = scope[decodeAccessor(currentScopeIndex++)] = new Text()
@@ -553,11 +560,9 @@ function init(runtimeId = "M") {
         let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, scopeLookup = render.s = {}, getScope = (id) => scopeLookup[id] ||= { L: +id }, serializeContext = {
           _: registeredValues
         }, visitBranches = branchesEnabled && /* @__PURE__ */ ((branchScopesStack = [], branchStarts = [], orphanBranches = [], curBranchScopes) => (branchId, branch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length) => {
-          for (visitType !== "[" /* BranchStart */ && (visitScope["J" /* Getter */ + nextToken(
+          for (visitType !== "[" /* BranchStart */ && (visitScope[nextToken(
             /* read accessor */
-          )] = /* @__PURE__ */ ((node) => () => node)(
-            visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? parent : visit
-          ), accessor = "A" /* BranchScopes */ + lastToken, singleNode = visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */, nextToken(
+          )] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? parent : visit, accessor = "A" /* BranchScopes */ + lastToken, singleNode = visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */, nextToken(
             /* read optional first branchId */
           )); branchId = +lastToken; ) {
             if ((endedBranches ||= []).push(
@@ -593,7 +598,9 @@ function init(runtimeId = "M") {
           for (visit of visits = render.v)
             lastTokenIndex = render.i.length, visitText = visit.data, visitType = visitText[lastTokenIndex++], visitScope = getScope(nextToken(
               /* read scope id */
-            )), visitType === "*" /* Node */ ? visitScope["J" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling) : branchesEnabled && visitBranches();
+            )), visitType === "*" /* Node */ ? visitScope[nextToken(
+              /* read accessor */
+            )] = visit.previousSibling : branchesEnabled && visitBranches();
           return visits.length = resumes.length = 0, effects;
         }, render.w = () => {
           walk2(), runResumeEffects(render);
@@ -630,8 +637,7 @@ function _var_resume(id, signal) {
   return _resume(id, (scope) => (value) => signal(scope, value)), signal;
 }
 function _el(id, accessor) {
-  let getterAccessor = "J" /* Getter */ + decodeAccessor(accessor);
-  return _resume(id, (scope) => () => scope[getterAccessor]());
+  return accessor = decodeAccessor(accessor), _resume(id, (scope) => () => scope[accessor]);
 }
 
 // src/dom/controllable.ts

package/dist/dom.mjs

@@ -309,19 +309,25 @@ function _script(id, fn) {
 function _el_read(value) {
   return rendering && void 0, value;
 }
-function* traverseAllHoisted(scope, path, curIndex = path.length - 1) {
+function* traverse(scope, path, i = path.length - 1) {
   if (scope)
     if (Symbol.iterator in scope)
-      for (let s of scope instanceof Map ? scope.values() : scope)
-        yield* traverseAllHoisted(s, path, curIndex);
-    else curIndex ? yield* traverseAllHoisted(scope[path[curIndex]], path, curIndex - 1) : yield scope[path[0]];
+      for (let childScope of scope.values())
+        yield* traverse(childScope, path, i);
+    else {
+      let item = scope[path[i]];
+      i ? yield* traverse(item, path, i - 1) : yield typeof item == "function" ? item() : item;
+    }
 }
 function _hoist(...path) {
   return path = path.map((p) => typeof p == "string" ? p : decodeAccessor(p)), (scope) => {
-    let getOne = (...args) => iterator().next().value?.(...args), iterator = getOne[Symbol.iterator] = () => traverseAllHoisted(scope, path);
-    return getOne;
+    let fn = () => traverse(scope, path).next().value;
+    return fn[Symbol.iterator] = () => traverse(scope, path), fn;
   };
 }
+function _hoist_resume(id, ...path) {
+  return _resume(id, _hoist(...path));
+}
 
 // src/dom/walker.ts
 var walker = /* @__PURE__ */ document.createTreeWalker(document);
@@ -329,11 +335,11 @@ function walk(startNode, walkCodes, branch) {
   walker.currentNode = startNode, walkInternal(0, walkCodes, branch);
 }
 function walkInternal(currentWalkIndex, walkCodes, scope) {
-  let value, id, storedMultiplier = 0, currentMultiplier = 0, currentScopeIndex = 0;
+  let value, storedMultiplier = 0, currentMultiplier = 0, currentScopeIndex = 0;
   for (; currentWalkIndex < walkCodes.length; )
     if (value = walkCodes.charCodeAt(currentWalkIndex++), currentMultiplier = storedMultiplier, storedMultiplier = 0, value === 32 /* Get */) {
       let node = walker.currentNode;
-      scope[id = decodeAccessor(currentScopeIndex++)] = node, scope["J" /* Getter */ + id] = () => node;
+      scope[decodeAccessor(currentScopeIndex++)] = node;
     } else if (value === 37 /* Replace */ || value === 49 /* DynamicTagWithVar */)
       walker.currentNode.replaceWith(
         walker.currentNode = scope[decodeAccessor(currentScopeIndex++)] = new Text()
@@ -450,11 +456,9 @@ function init(runtimeId = "M") {
         let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, scopeLookup = render.s = {}, getScope = (id) => scopeLookup[id] ||= { L: +id }, serializeContext = {
           _: registeredValues
         }, visitBranches = branchesEnabled && /* @__PURE__ */ ((branchScopesStack = [], branchStarts = [], orphanBranches = [], curBranchScopes) => (branchId, branch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length) => {
-          for (visitType !== "[" /* BranchStart */ && (visitScope["J" /* Getter */ + nextToken(
+          for (visitType !== "[" /* BranchStart */ && (visitScope[nextToken(
             /* read accessor */
-          )] = /* @__PURE__ */ ((node) => () => node)(
-            visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? parent : visit
-          ), accessor = "A" /* BranchScopes */ + lastToken, singleNode = visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */, nextToken(
+          )] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? parent : visit, accessor = "A" /* BranchScopes */ + lastToken, singleNode = visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */, nextToken(
             /* read optional first branchId */
           )); branchId = +lastToken; ) {
             if ((endedBranches ||= []).push(
@@ -490,7 +494,9 @@ function init(runtimeId = "M") {
           for (visit of visits = render.v)
             lastTokenIndex = render.i.length, visitText = visit.data, visitType = visitText[lastTokenIndex++], visitScope = getScope(nextToken(
               /* read scope id */
-            )), visitType === "*" /* Node */ ? visitScope["J" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling) : branchesEnabled && visitBranches();
+            )), visitType === "*" /* Node */ ? visitScope[nextToken(
+              /* read accessor */
+            )] = visit.previousSibling : branchesEnabled && visitBranches();
           return visits.length = resumes.length = 0, effects;
         }, render.w = () => {
           walk2(), runResumeEffects(render);
@@ -527,8 +533,7 @@ function _var_resume(id, signal) {
   return _resume(id, (scope) => (value) => signal(scope, value)), signal;
 }
 function _el(id, accessor) {
-  let getterAccessor = "J" /* Getter */ + decodeAccessor(accessor);
-  return _resume(id, (scope) => () => scope[getterAccessor]());
+  return accessor = decodeAccessor(accessor), _resume(id, (scope) => () => scope[accessor]);
 }
 
 // src/dom/controllable.ts
@@ -1598,6 +1603,7 @@ export {
   _for_to,
   _for_until,
   _hoist,
+  _hoist_resume,
   _html,
   _id,
   _if,