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

package/dist/html.d.ts

@@ -2,7 +2,7 @@ export { attrTag, attrTags } from "./common/attr-tag";
 export { attr, attrs, classAttr, controllable_detailsOrDialog_open, controllable_input_checked, controllable_input_checkedValue, controllable_input_value, controllable_select_value, controllable_textarea_value, optionValueAttr, partialAttrs, styleAttr, } from "./html/attrs";
 export { compat } from "./html/compat";
 export { escapeScript, escapeStyle, escapeXML, toString } from "./html/content";
-export { createContent, dynamicTagArgs, dynamicTagId, dynamicTagInput, registerContent, } from "./html/dynamic-tag";
+export { createContent, dynamicTag, registerContent } from "./html/dynamic-tag";
 export { forIn, forInBy, forOf, forOfBy, forTo, forToBy } from "./html/for";
 export { createTemplate } from "./html/template";
 export { $global, ensureScopeWithId, fork, getScopeById, hoist, markResumeNode, nextScopeId, nextTagId, nodeRef, peekNextScope, register, resumeClosestBranch, resumeConditional, resumeForIn, resumeForOf, resumeForTo, resumeSingleNodeConditional, resumeSingleNodeForIn, resumeSingleNodeForOf, resumeSingleNodeForTo, setTagVar, tryContent, write, writeEffect, writeExistingScope, writeScope, writeSubscribe, writeTrailers, } from "./html/writer";

package/dist/html.js

@@ -32,19 +32,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,
@@ -492,10 +490,7 @@ function register(id, val, scope) {
 function getRegistered(val) {
   let registered = REGISTRY.get(val);
   if (registered)
-    return {
-      id: registered.id,
-      scope: registered.scope
-    };
+    return { id: registered.id, scope: registered.scope };
 }
 function writeRoot(state, root) {
   let { buf, assigned, mutations } = state, hadBuf = buf.length !== 0, result = "";
@@ -591,7 +586,7 @@ function writeRegistered(state, val, parent, accessor, { access, scope, getter }
       return newScopeRef && ensureId(state, newScopeRef), !0;
     }
     if (scopeRef) {
-      if (isCircular(parent, scopeRef))
+      if (parent && (state.assigned.has(scopeRef) || isCircular(parent, scopeRef)))
         return state.assigned.add(parent), state.assigned.add(fnRef), fnRef.init = access + "(" + ensureId(state, scopeRef) + ")", addAssignment(fnRef, ensureId(state, parent) + toAccess(accessor)), !1;
       state.buf.push(access + "(" + ensureId(state, scopeRef) + ")");
     } else {
@@ -1093,7 +1088,7 @@ function withContext(key, value, cb) {
   let ctx = $chunk.context ||= { [kPendingContexts]: 0 }, prev = ctx[key];
   ctx[kPendingContexts]++, ctx[key] = value;
   try {
-    cb();
+    return cb();
   } finally {
     ctx[kPendingContexts]--, ctx[key] = prev;
   }
@@ -1141,20 +1136,26 @@ function hoist(scopeId, id) {
 }
 function resumeClosestBranch(scopeId) {
   let branchId = $chunk.context?.[branchIdKey];
-  branchId !== void 0 && branchId !== scopeId && writeScope(scopeId, {
-    g: branchId
-  });
+  branchId !== void 0 && branchId !== scopeId && writeScope(scopeId, { g: 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) {
+  let loopScopes = /* @__PURE__ */ new Map();
+  forOf(list, (item, index) => {
     let 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, {}));
+    });
+  }), loopScopes.size && writeScope(scopeId, {
+    ["m" /* LoopScopeMap */ + accessor]: loopScopes
   }), $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
@@ -1162,11 +1163,15 @@ function resumeForOf(list, cb, scopeId, accessor) {
     )
   );
 }
-function resumeSingleNodeForOf(list, cb, scopeId, accessor, onlyChildInParent) {
-  let branchIds = "";
+function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, onlyChildInParent) {
+  let loopScopes = /* @__PURE__ */ new Map(), branchIds = "";
   forOf(list, (item, index) => {
     let branchId = peekNextScopeId();
-    branchIds = " " + branchId + branchIds, withContext(branchIdKey, branchId, () => cb(item, index));
+    branchIds = " " + branchId + branchIds, withBranchId(branchId, () => {
+      cb(item, index), loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
+    });
+  }), loopScopes.size && writeScope(scopeId, {
+    ["m" /* LoopScopeMap */ + accessor]: loopScopes
   }), $chunk.writeHTML(
     $chunk.boundary.state.mark(
       onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
@@ -1174,13 +1179,20 @@ function resumeSingleNodeForOf(list, cb, scopeId, accessor, onlyChildInParent) {
     )
   );
 }
-function resumeForIn(obj, cb, scopeId, accessor) {
-  let sep = "";
+function forOfBy(by, item, index) {
+  return by ? typeof by == "string" ? item[by] : by(item, index) : index;
+}
+function resumeForIn(obj, cb, by, scopeId, accessor) {
+  let loopScopes = /* @__PURE__ */ new Map(), sep = "";
   forIn(obj, (key, value) => {
     let branchId = peekNextScopeId();
     $chunk.writeHTML(
       $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
-    ), sep = " ", withContext(branchIdKey, branchId, () => cb(key, value));
+    ), sep = " ", withBranchId(branchId, () => {
+      cb(key, value), loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
+    });
+  }), loopScopes.size && writeScope(scopeId, {
+    ["m" /* LoopScopeMap */ + accessor]: loopScopes
   }), $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
@@ -1188,11 +1200,15 @@ function resumeForIn(obj, cb, scopeId, accessor) {
     )
   );
 }
-function resumeSingleNodeForIn(obj, cb, scopeId, accessor, onlyChild) {
-  let branchIds = "";
+function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, onlyChild) {
+  let loopScopes = /* @__PURE__ */ new Map(), branchIds = "";
   forIn(obj, (key, value) => {
     let branchId = peekNextScopeId();
-    branchIds = " " + branchId + branchIds, withContext(branchIdKey, branchId, () => cb(key, value));
+    branchIds = " " + branchId + branchIds, withBranchId(branchId, () => {
+      cb(key, value), loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
+    });
+  }), loopScopes.size && writeScope(scopeId, {
+    ["m" /* LoopScopeMap */ + accessor]: loopScopes
   }), $chunk.writeHTML(
     $chunk.boundary.state.mark(
       onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
@@ -1200,13 +1216,20 @@ function resumeSingleNodeForIn(obj, cb, scopeId, accessor, onlyChild) {
     )
   );
 }
-function resumeForTo(to, from, step, cb, scopeId, accessor) {
-  let sep = "";
+function forInBy(by, name, value) {
+  return by ? by(name, value) : name;
+}
+function resumeForTo(to, from, step, cb, by, scopeId, accessor) {
+  let loopScopes = /* @__PURE__ */ new Map(), sep = "";
   forTo(to, from, step, (index) => {
     let branchId = peekNextScopeId();
     $chunk.writeHTML(
       $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
-    ), sep = " ", withContext(branchIdKey, branchId, () => cb(index));
+    ), sep = " ", withBranchId(branchId, () => {
+      cb(index), loopScopes.set(forToBy(by, index), writeScope(branchId, {}));
+    });
+  }), loopScopes.size && writeScope(scopeId, {
+    ["m" /* LoopScopeMap */ + accessor]: loopScopes
   }), $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
@@ -1214,11 +1237,15 @@ function resumeForTo(to, from, step, cb, scopeId, accessor) {
     )
   );
 }
-function resumeSingleNodeForTo(to, from, step, cb, scopeId, accessor, onlyChild) {
-  let branchIds = "";
+function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, onlyChild) {
+  let loopScopes = /* @__PURE__ */ new Map(), branchIds = "";
   forTo(to, from, step, (index) => {
     let branchId = peekNextScopeId();
-    branchIds = " " + branchId + branchIds, withContext(branchIdKey, branchId, () => cb(index));
+    branchIds = " " + branchId + branchIds, withBranchId(branchId, () => {
+      cb(index), loopScopes.set(forToBy(by, index), writeScope(branchId, {}));
+    });
+  }), loopScopes.size && writeScope(scopeId, {
+    ["m" /* LoopScopeMap */ + accessor]: loopScopes
   }), $chunk.writeHTML(
     $chunk.boundary.state.mark(
       onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
@@ -1226,22 +1253,31 @@ function resumeSingleNodeForTo(to, from, step, cb, scopeId, accessor, onlyChild)
     )
   );
 }
-function resumeConditional(cb, scopeId, accessor) {
+function forToBy(by, index) {
+  return by ? by(index) : index;
+}
+function resumeConditional(cb, scopeId, accessor, dynamic) {
   let branchId = peekNextScopeId();
-  $chunk.writeHTML(
+  dynamic && $chunk.writeHTML(
     $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-  ), withContext(branchIdKey, branchId, cb), peekNextScopeId() !== branchId ? writeScope(branchId, {}) : nextScopeId(), $chunk.writeHTML(
+  );
+  let branchIndex = withBranchId(branchId, cb);
+  branchIndex !== void 0 ? writeScope(scopeId, {
+    ["c" /* ConditionalRenderer */ + accessor]: dynamic ? branchIndex : void 0,
+    ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
+  }) : nextScopeId(), dynamic && $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
       scopeId + " " + accessor
     )
   );
 }
-function resumeSingleNodeConditional(cb, scopeId, accessor, onlyChild) {
-  let branchId = peekNextScopeId();
-  withContext(branchIdKey, branchId, cb);
-  let rendered = peekNextScopeId() !== branchId;
-  rendered ? writeScope(branchId, {}) : nextScopeId(), $chunk.writeHTML(
+function resumeSingleNodeConditional(cb, scopeId, accessor, dynamic, onlyChild) {
+  let branchId = peekNextScopeId(), branchIndex = withBranchId(branchId, cb), rendered = branchIndex !== void 0;
+  rendered ? writeScope(scopeId, {
+    ["c" /* ConditionalRenderer */ + accessor]: dynamic ? branchIndex : void 0,
+    ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
+  }) : nextScopeId(), dynamic && $chunk.writeHTML(
     $chunk.boundary.state.mark(
       onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
       scopeId + " " + accessor + (rendered ? " " + branchId : "")
@@ -1794,80 +1830,51 @@ var prefix = "$C_", RENDERER_REGISTER_ID = prefix + "r", SET_SCOPE_REGISTER_ID =
 var DEFAULT_RUNTIME_ID = "M", 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) {
-  let normalizedRenderer = normalizeDynamicRenderer(tagName);
-  return normalizedRenderer?.h || normalizedRenderer;
-}
-var dynamicTagInput = (scopeId, accessor, tag, input, content) => {
-  if (!tag && !content) {
-    nextScopeId();
-    return;
-  }
-  if (!tag) {
-    resumeConditional(content, scopeId, accessor);
-    return;
-  }
-  if (typeof tag == "string") {
-    resumeSingleNodeConditional(
-      () => {
-        nextScopeId(), write(`<${tag}${attrs(input, accessor, scopeId, tag)}>`), voidElementsReg.test(tag) || (tag === "textarea" ? write(
-          controllable_textarea_value(
-            scopeId,
-            accessor,
-            input.value,
-            input.valueChange
-          )
-        ) : content && (tag === "select" && ("value" in input || "valueChange" in input) ? controllable_select_value(
+var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, resume) => {
+  let renderer = normalizeDynamicRenderer(tag), chunk = getChunk(), branchId = peekNextScopeId(), result;
+  if (typeof renderer == "string") {
+    let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
+    nextScopeId(), write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`), voidElementsReg.test(renderer) || (withBranchId(branchId, () => {
+      renderer === "textarea" ? write(
+        controllable_textarea_value(
           scopeId,
           accessor,
           input.value,
-          input.valueChange,
-          content
-        ) : content()), write(`</${tag}>`));
-      },
-      scopeId,
-      accessor
+          input.valueChange
+        )
+      ) : content && (renderer === "select" && ("value" in input || "valueChange" in input) ? controllable_select_value(
+        scopeId,
+        accessor,
+        input.value,
+        input.valueChange,
+        content
+      ) : content());
+    }), write(`</${renderer}>`)), resume && chunk.writeHTML(
+      chunk.boundary.state.mark(
+        "|" /* BranchSingleNode */,
+        scopeId + " " + accessor + " " + branchId
+      )
     );
-    return;
-  }
-  let renderer = normalizeDynamicRenderer(
-    tag
-  ), result;
-  return resumeConditional(
-    () => {
-      result = renderer(content ? { ...input, content } : input);
-    },
-    scopeId,
-    accessor
-  ), result;
-}, dynamicTagArgs = (scopeId, accessor, tag, args) => {
-  if (!tag) {
-    nextScopeId();
-    return;
-  }
-  if (typeof tag == "string") {
-    resumeSingleNodeConditional(
-      () => {
-        nextScopeId(), write(
-          `<${tag}${attrs(args[0], accessor, scopeId, tag)}>`
-        ), voidElementsReg.test(tag) || write(`</${tag}>`);
-      },
-      scopeId,
-      accessor
+  } else
+    resume && chunk.writeHTML(
+      chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
+    ), result = withBranchId(branchId, () => {
+      if (renderer)
+        return inputIsArgs ? renderer(...inputOrArgs) : renderer(
+          content ? { ...inputOrArgs, content } : inputOrArgs
+        );
+      if (content)
+        return content();
+    }), resume && chunk.writeHTML(
+      chunk.boundary.state.mark(
+        "]" /* BranchEnd */,
+        scopeId + " " + accessor
+      )
     );
-    return;
-  }
-  let renderer = normalizeDynamicRenderer(
-    tag
-  ), result;
-  return resumeConditional(
-    () => {
-      result = renderer(...args);
-    },
-    scopeId,
-    accessor
-  ), result;
+  return peekNextScopeId() !== branchId ? resume && writeScope(scopeId, {
+    ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {}),
+    ["c" /* ConditionalRenderer */ + accessor]: renderer?.h || renderer
+  }) : nextScopeId(), result;
 };
 function createContent(id, fn) {
   return fn.h = id, fn;
@@ -1876,18 +1883,18 @@ 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) => {
+    let patched = patch(scopeId, accessor, tag);
+    return patched.h = tag, originalDynamicTag(
+      scopeId,
+      accessor,
+      patched,
+      input,
+      content,
+      inputIsArgs,
+      resume
+    );
+  })(dynamicTag);
 }
 
 // src/html/compat.ts
@@ -1962,13 +1969,13 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
 };
 
 // src/html/for.ts
-function forOfBy(by, item, index) {
+function forOfBy2(by, item, index) {
   return by ? typeof by == "string" ? item[by] : by(item, index) : index;
 }
-function forInBy(by, name, value) {
+function forInBy2(by, name, value) {
   return by ? by(name, value) : name;
 }
-function forToBy(by, index) {
+function forToBy2(by, index) {
   return by ? by(index) : index;
 }
 
@@ -2129,9 +2136,7 @@ function NOOP2() {
   controllable_textarea_value,
   createContent,
   createTemplate,
-  dynamicTagArgs,
-  dynamicTagId,
-  dynamicTagInput,
+  dynamicTag,
   ensureScopeWithId,
   escapeScript,
   escapeStyle,