marko 6.0.0-next.3.68 → 6.0.0-next.3.69

package/dist/debug/dom.js

@@ -290,7 +290,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
             const branchEnd = (branchId, reference) => {
               const branch = scopeLookup[branchId] ||= {};
               let endNode = reference;
-              while (visitNodes.has(endNode = endNode.previousSibling)) ;
+              while (endNode.previousSibling !== branch.___startNode && visitNodes.has(endNode = endNode.previousSibling)) ;
               if (endNode === lastEndNode) {
                 endNode = reference.parentNode.insertBefore(
                   new Text(),

package/dist/debug/dom.mjs

@@ -202,7 +202,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
             const branchEnd = (branchId, reference) => {
               const branch = scopeLookup[branchId] ||= {};
               let endNode = reference;
-              while (visitNodes.has(endNode = endNode.previousSibling)) ;
+              while (endNode.previousSibling !== branch.___startNode && visitNodes.has(endNode = endNode.previousSibling)) ;
               if (endNode === lastEndNode) {
                 endNode = reference.parentNode.insertBefore(
                   new Text(),

package/dist/debug/html.js

@@ -35,19 +35,17 @@ __export(html_exports, {
   controllable_textarea_value: () => controllable_textarea_value,
   createContent: () => createContent,
   createTemplate: () => createTemplate,
-  dynamicTagArgs: () => dynamicTagArgs,
-  dynamicTagId: () => dynamicTagId,
-  dynamicTagInput: () => dynamicTagInput,
+  dynamicTag: () => dynamicTag,
   ensureScopeWithId: () => ensureScopeWithId,
   escapeScript: () => escapeScript,
   escapeStyle: () => escapeStyle,
   escapeXML: () => escapeXML,
   forIn: () => forIn,
-  forInBy: () => forInBy,
+  forInBy: () => forInBy2,
   forOf: () => forOf,
-  forOfBy: () => forOfBy,
+  forOfBy: () => forOfBy2,
   forTo: () => forTo,
-  forToBy: () => forToBy,
+  forToBy: () => forToBy2,
   fork: () => fork,
   getScopeById: () => getScopeById,
   hoist: () => hoist,
@@ -585,11 +583,7 @@ var Reference = class {
 };
 var DEBUG = /* @__PURE__ */ new WeakMap();
 function setDebugInfo(obj, file, loc, vars) {
-  DEBUG.set(obj, {
-    file,
-    loc,
-    vars
-  });
+  DEBUG.set(obj, { file, loc, vars });
 }
 var Serializer = class {
   #state = new State();
@@ -648,10 +642,7 @@ function register(id, val, scope) {
 function getRegistered(val) {
   const registered = REGISTRY.get(val);
   if (registered) {
-    return {
-      id: registered.id,
-      scope: registered.scope
-    };
+    return { id: registered.id, scope: registered.scope };
   }
 }
 function writeRoot(state, root) {
@@ -821,7 +812,7 @@ function writeRegistered(state, val, parent, accessor, { access, scope, getter }
       return true;
     }
     if (scopeRef) {
-      if (isCircular(parent, scopeRef)) {
+      if (parent && (state.assigned.has(scopeRef) || isCircular(parent, scopeRef))) {
         state.assigned.add(parent);
         state.assigned.add(fnRef);
         fnRef.init = access + "(" + ensureId(state, scopeRef) + ")";
@@ -1677,7 +1668,7 @@ function withContext(key, value, cb) {
   ctx[kPendingContexts]++;
   ctx[key] = value;
   try {
-    cb();
+    return cb();
   } finally {
     ctx[kPendingContexts]--;
     ctx[key] = prev;
@@ -1738,23 +1729,33 @@ function hoist(scopeId, id) {
 function resumeClosestBranch(scopeId) {
   const branchId = $chunk.context?.[branchIdKey];
   if (branchId !== void 0 && branchId !== scopeId) {
-    writeScope(scopeId, {
-      ["#ClosestBranchId" /* ClosestBranchId */]: branchId
-    });
+    writeScope(scopeId, { ["#ClosestBranchId" /* ClosestBranchId */]: branchId });
   }
 }
 var branchIdKey = Symbol();
-function resumeForOf(list, cb, scopeId, accessor) {
-  forOf(list, (item, i) => {
+function withBranchId(branchId, cb) {
+  return withContext(branchIdKey, branchId, cb);
+}
+function resumeForOf(list, cb, by, scopeId, accessor) {
+  const loopScopes = /* @__PURE__ */ new Map();
+  forOf(list, (item, index) => {
     const branchId = peekNextScopeId();
     $chunk.writeHTML(
       $chunk.boundary.state.mark(
         "[" /* BranchStart */,
-        branchId + (i ? " " : "")
+        branchId + (index ? " " : "")
       )
     );
-    withContext(branchIdKey, branchId, () => cb(item, i));
+    withBranchId(branchId, () => {
+      cb(item, index);
+      loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
+    });
   });
+  if (loopScopes.size) {
+    writeScope(scopeId, {
+      ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+    });
+  }
   $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
@@ -1762,13 +1763,22 @@ function resumeForOf(list, cb, scopeId, accessor) {
     )
   );
 }
-function resumeSingleNodeForOf(list, cb, scopeId, accessor, onlyChildInParent) {
+function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, onlyChildInParent) {
+  const loopScopes = /* @__PURE__ */ new Map();
   let branchIds = "";
   forOf(list, (item, index) => {
     const branchId = peekNextScopeId();
     branchIds = " " + branchId + branchIds;
-    withContext(branchIdKey, branchId, () => cb(item, index));
+    withBranchId(branchId, () => {
+      cb(item, index);
+      loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
+    });
   });
+  if (loopScopes.size) {
+    writeScope(scopeId, {
+      ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+    });
+  }
   $chunk.writeHTML(
     $chunk.boundary.state.mark(
       onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
@@ -1776,7 +1786,17 @@ function resumeSingleNodeForOf(list, cb, scopeId, accessor, onlyChildInParent) {
     )
   );
 }
-function resumeForIn(obj, cb, scopeId, accessor) {
+function forOfBy(by, item, index) {
+  if (by) {
+    if (typeof by === "string") {
+      return item[by];
+    }
+    return by(item, index);
+  }
+  return index;
+}
+function resumeForIn(obj, cb, by, scopeId, accessor) {
+  const loopScopes = /* @__PURE__ */ new Map();
   let sep = "";
   forIn(obj, (key, value) => {
     const branchId = peekNextScopeId();
@@ -1784,8 +1804,16 @@ function resumeForIn(obj, cb, scopeId, accessor) {
       $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
     );
     sep = " ";
-    withContext(branchIdKey, branchId, () => cb(key, value));
+    withBranchId(branchId, () => {
+      cb(key, value);
+      loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
+    });
   });
+  if (loopScopes.size) {
+    writeScope(scopeId, {
+      ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+    });
+  }
   $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
@@ -1793,13 +1821,22 @@ function resumeForIn(obj, cb, scopeId, accessor) {
     )
   );
 }
-function resumeSingleNodeForIn(obj, cb, scopeId, accessor, onlyChild) {
+function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, onlyChild) {
+  const loopScopes = /* @__PURE__ */ new Map();
   let branchIds = "";
   forIn(obj, (key, value) => {
     const branchId = peekNextScopeId();
     branchIds = " " + branchId + branchIds;
-    withContext(branchIdKey, branchId, () => cb(key, value));
+    withBranchId(branchId, () => {
+      cb(key, value);
+      loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
+    });
   });
+  if (loopScopes.size) {
+    writeScope(scopeId, {
+      ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+    });
+  }
   $chunk.writeHTML(
     $chunk.boundary.state.mark(
       onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
@@ -1807,7 +1844,14 @@ function resumeSingleNodeForIn(obj, cb, scopeId, accessor, onlyChild) {
     )
   );
 }
-function resumeForTo(to, from, step, cb, scopeId, accessor) {
+function forInBy(by, name, value) {
+  if (by) {
+    return by(name, value);
+  }
+  return name;
+}
+function resumeForTo(to, from, step, cb, by, scopeId, accessor) {
+  const loopScopes = /* @__PURE__ */ new Map();
   let sep = "";
   forTo(to, from, step, (index) => {
     const branchId = peekNextScopeId();
@@ -1815,8 +1859,16 @@ function resumeForTo(to, from, step, cb, scopeId, accessor) {
       $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
     );
     sep = " ";
-    withContext(branchIdKey, branchId, () => cb(index));
+    withBranchId(branchId, () => {
+      cb(index);
+      loopScopes.set(forToBy(by, index), writeScope(branchId, {}));
+    });
   });
+  if (loopScopes.size) {
+    writeScope(scopeId, {
+      ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+    });
+  }
   $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
@@ -1824,13 +1876,22 @@ function resumeForTo(to, from, step, cb, scopeId, accessor) {
     )
   );
 }
-function resumeSingleNodeForTo(to, from, step, cb, scopeId, accessor, onlyChild) {
+function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, onlyChild) {
+  const loopScopes = /* @__PURE__ */ new Map();
   let branchIds = "";
   forTo(to, from, step, (index) => {
     const branchId = peekNextScopeId();
     branchIds = " " + branchId + branchIds;
-    withContext(branchIdKey, branchId, () => cb(index));
+    withBranchId(branchId, () => {
+      cb(index);
+      loopScopes.set(forToBy(by, index), writeScope(branchId, {}));
+    });
   });
+  if (loopScopes.size) {
+    writeScope(scopeId, {
+      ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+    });
+  }
   $chunk.writeHTML(
     $chunk.boundary.state.mark(
       onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
@@ -1838,40 +1899,57 @@ function resumeSingleNodeForTo(to, from, step, cb, scopeId, accessor, onlyChild)
     )
   );
 }
-function resumeConditional(cb, scopeId, accessor) {
+function forToBy(by, index) {
+  if (by) {
+    return by(index);
+  }
+  return index;
+}
+function resumeConditional(cb, scopeId, accessor, dynamic) {
   const branchId = peekNextScopeId();
-  $chunk.writeHTML(
-    $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-  );
-  withContext(branchIdKey, branchId, cb);
-  const rendered = peekNextScopeId() !== branchId;
-  if (rendered) {
-    writeScope(branchId, {});
+  if (dynamic) {
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
+    );
+  }
+  const branchIndex = withBranchId(branchId, cb);
+  if (branchIndex !== void 0) {
+    writeScope(scopeId, {
+      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: dynamic ? branchIndex : void 0,
+      ["ConditionalScope:" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
+    });
   } else {
     nextScopeId();
   }
-  $chunk.writeHTML(
-    $chunk.boundary.state.mark(
-      "]" /* BranchEnd */,
-      scopeId + " " + accessor
-    )
-  );
+  if (dynamic) {
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark(
+        "]" /* BranchEnd */,
+        scopeId + " " + accessor
+      )
+    );
+  }
 }
-function resumeSingleNodeConditional(cb, scopeId, accessor, onlyChild) {
+function resumeSingleNodeConditional(cb, scopeId, accessor, dynamic, onlyChild) {
   const branchId = peekNextScopeId();
-  withContext(branchIdKey, branchId, cb);
-  const rendered = peekNextScopeId() !== branchId;
+  const branchIndex = withBranchId(branchId, cb);
+  const rendered = branchIndex !== void 0;
   if (rendered) {
-    writeScope(branchId, {});
+    writeScope(scopeId, {
+      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: dynamic ? branchIndex : void 0,
+      ["ConditionalScope:" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
+    });
   } else {
     nextScopeId();
   }
-  $chunk.writeHTML(
-    $chunk.boundary.state.mark(
-      onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + (rendered ? " " + branchId : "")
-    )
-  );
+  if (dynamic) {
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark(
+        onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
+        scopeId + " " + accessor + (rendered ? " " + branchId : "")
+      )
+    );
+  }
 }
 var writeScope = (scopeId, partialScope) => {
   const { state } = $chunk.boundary;
@@ -2724,117 +2802,97 @@ var DEFAULT_RENDER_ID = "_";
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
-function dynamicTagId(tagName) {
-  const normalizedRenderer = normalizeDynamicRenderer(tagName);
-  return normalizedRenderer?.___id || normalizedRenderer;
-}
-var dynamicTagInput = (scopeId, accessor, tag, input, content) => {
-  if (!tag && !content) {
-    nextScopeId();
-    return;
-  }
-  if (!tag) {
-    resumeConditional(content, scopeId, accessor);
-    return;
+var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, resume) => {
+  const renderer = normalizeDynamicRenderer(tag);
+  if (true) {
+    if (renderer && typeof renderer !== "function" && typeof renderer !== "string") {
+      throw new Error(`Invalid renderer passed for dynamic tag: ${renderer}`);
+    }
   }
-  if (typeof tag === "string") {
-    resumeSingleNodeConditional(
-      () => {
-        nextScopeId();
-        write(`<${tag}${attrs(input, accessor, scopeId, tag)}>`);
-        if (!voidElementsReg.test(tag)) {
-          if (tag === "textarea") {
-            if (content) {
-              throw new Error(
-                "A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead."
-              );
-            }
-            write(
-              controllable_textarea_value(
-                scopeId,
-                accessor,
-                input.value,
-                input.valueChange
-              )
+  const chunk = getChunk();
+  const branchId = peekNextScopeId();
+  let result;
+  if (typeof renderer === "string") {
+    const input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
+    nextScopeId();
+    write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`);
+    if (!voidElementsReg.test(renderer)) {
+      withBranchId(branchId, () => {
+        if (renderer === "textarea") {
+          if (content) {
+            throw new Error(
+              "A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead."
             );
-          } else if (content) {
-            if (tag === "select" && ("value" in input || "valueChange" in input)) {
-              controllable_select_value(
-                scopeId,
-                accessor,
-                input.value,
-                input.valueChange,
-                content
-              );
-            } else {
-              content();
-            }
           }
-          write(`</${tag}>`);
+          write(
+            controllable_textarea_value(
+              scopeId,
+              accessor,
+              input.value,
+              input.valueChange
+            )
+          );
         } else if (content) {
-          throw new Error(`Body content is not supported for a "${tag}" tag.`);
+          if (renderer === "select" && ("value" in input || "valueChange" in input)) {
+            controllable_select_value(
+              scopeId,
+              accessor,
+              input.value,
+              input.valueChange,
+              content
+            );
+          } else {
+            content();
+          }
         }
-      },
-      scopeId,
-      accessor
-    );
-    return;
-  }
-  const renderer = normalizeDynamicRenderer(
-    tag
-  );
-  if (true) {
-    if (typeof renderer !== "function") {
-      throw new Error(`Invalid renderer passed for dynamic tag: ${tag}`);
+      });
+      write(`</${renderer}>`);
+    } else if (content) {
+      throw new Error(`Body content is not supported for a "${renderer}" tag.`);
+    }
+    if (resume) {
+      chunk.writeHTML(
+        chunk.boundary.state.mark(
+          "|" /* BranchSingleNode */,
+          scopeId + " " + accessor + " " + branchId
+        )
+      );
     }
-  }
-  let result;
-  resumeConditional(
-    () => {
-      result = renderer(content ? { ...input, content } : input);
-    },
-    scopeId,
-    accessor
-  );
-  return result;
-};
-var dynamicTagArgs = (scopeId, accessor, tag, args) => {
-  if (!tag) {
-    nextScopeId();
-    return;
-  }
-  if (typeof tag === "string") {
-    resumeSingleNodeConditional(
-      () => {
-        nextScopeId();
-        write(
-          `<${tag}${attrs(args[0], accessor, scopeId, tag)}>`
+  } else {
+    if (resume) {
+      chunk.writeHTML(
+        chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
+      );
+    }
+    result = withBranchId(branchId, () => {
+      if (renderer) {
+        return inputIsArgs ? renderer(...inputOrArgs) : renderer(
+          content ? { ...inputOrArgs, content } : inputOrArgs
         );
-        if (!voidElementsReg.test(tag)) {
-          write(`</${tag}>`);
-        }
-      },
-      scopeId,
-      accessor
-    );
-    return;
+      } else if (content) {
+        return content();
+      }
+    });
+    if (resume) {
+      chunk.writeHTML(
+        chunk.boundary.state.mark(
+          "]" /* BranchEnd */,
+          scopeId + " " + accessor
+        )
+      );
+    }
   }
-  const renderer = normalizeDynamicRenderer(
-    tag
-  );
-  if (true) {
-    if (typeof renderer !== "function") {
-      throw new Error(`Invalid renderer passed for dynamic tag: ${tag}`);
+  const rendered = peekNextScopeId() !== branchId;
+  if (rendered) {
+    if (resume) {
+      writeScope(scopeId, {
+        ["ConditionalScope:" /* ConditionalScope */ + accessor]: writeScope(branchId, {}),
+        ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: renderer?.___id || renderer
+      });
     }
+  } else {
+    nextScopeId();
   }
-  let result;
-  resumeConditional(
-    () => {
-      result = renderer(...args);
-    },
-    scopeId,
-    accessor
-  );
   return result;
 };
 function createContent(id, fn) {
@@ -2845,19 +2903,19 @@ function registerContent(id, fn, scopeId) {
   return register2(createContent(id, fn), id, scopeId);
 }
 function patchDynamicTag(patch) {
-  dynamicTagInput = /* @__PURE__ */ ((originalDynamicTagInput) => (scopeId, accessor, tag, input, content) => originalDynamicTagInput(
-    scopeId,
-    accessor,
-    patch(scopeId, accessor, tag),
-    input,
-    content
-  ))(dynamicTagInput);
-  dynamicTagArgs = /* @__PURE__ */ ((originalDynamicTagArgs) => (scopeId, accessor, tag, args) => originalDynamicTagArgs(
-    scopeId,
-    accessor,
-    patch(scopeId, accessor, tag),
-    args
-  ))(dynamicTagArgs);
+  dynamicTag = /* @__PURE__ */ ((originalDynamicTag) => (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
+    const patched = patch(scopeId, accessor, tag);
+    patched.___id = tag;
+    return originalDynamicTag(
+      scopeId,
+      accessor,
+      patched,
+      input,
+      content,
+      inputIsArgs,
+      resume
+    );
+  })(dynamicTag);
 }
 
 // src/html/compat.ts
@@ -2957,7 +3015,7 @@ var compat = {
 };
 
 // src/html/for.ts
-function forOfBy(by, item, index) {
+function forOfBy2(by, item, index) {
   if (by) {
     if (typeof by === "string") {
       return item[by];
@@ -2966,13 +3024,13 @@ function forOfBy(by, item, index) {
   }
   return index;
 }
-function forInBy(by, name, value) {
+function forInBy2(by, name, value) {
   if (by) {
     return by(name, value);
   }
   return name;
 }
-function forToBy(by, index) {
+function forToBy2(by, index) {
   if (by) {
     return by(index);
   }
@@ -3218,9 +3276,7 @@ function NOOP2() {
   controllable_textarea_value,
   createContent,
   createTemplate,
-  dynamicTagArgs,
-  dynamicTagId,
-  dynamicTagInput,
+  dynamicTag,
   ensureScopeWithId,
   escapeScript,
   escapeStyle,