marko 6.0.0-next.3.21 → 6.0.0-next.3.23

package/dist/debug/html.js

@@ -49,11 +49,7 @@ __export(html_exports, {
   forToBy: () => forToBy,
   fork: () => fork,
   getScopeById: () => getScopeById,
-  markResumeCleanup: () => markResumeCleanup,
-  markResumeControlEnd: () => markResumeControlEnd,
-  markResumeControlSingleNodeEnd: () => markResumeControlSingleNodeEnd,
   markResumeNode: () => markResumeNode,
-  markResumeScopeStart: () => markResumeScopeStart,
   nextScopeId: () => nextScopeId,
   nextTagId: () => nextTagId,
   nodeRef: () => nodeRef,
@@ -62,6 +58,15 @@ __export(html_exports, {
   partialAttrs: () => partialAttrs,
   peekNextScope: () => peekNextScope,
   register: () => register2,
+  resumeClosestBranch: () => resumeClosestBranch,
+  resumeConditional: () => resumeConditional,
+  resumeForIn: () => resumeForIn,
+  resumeForOf: () => resumeForOf,
+  resumeForTo: () => resumeForTo,
+  resumeSingleNodeConditional: () => resumeSingleNodeConditional,
+  resumeSingleNodeForIn: () => resumeSingleNodeForIn,
+  resumeSingleNodeForOf: () => resumeSingleNodeForOf,
+  resumeSingleNodeForTo: () => resumeSingleNodeForTo,
   styleAttr: () => styleAttr,
   toString: () => toString,
   tryContent: () => tryContent,
@@ -179,6 +184,28 @@ function escapeStyle(val) {
   return val ? escapeStyleStr(val + "") : val === 0 ? "0" : "";
 }
 
+// src/common/for.ts
+function forIn(obj, cb) {
+  for (const key in obj) {
+    cb(key, obj[key]);
+  }
+}
+function forOf(list, cb) {
+  if (list) {
+    let i = 0;
+    for (const item of list) {
+      cb(item, i++);
+    }
+  }
+}
+function forTo(to, from, step, cb) {
+  const start = from || 0;
+  const delta = step || 1;
+  for (let steps = (to - start) / delta, i = 0; i <= steps; i++) {
+    cb(start + i * delta);
+  }
+}
+
 // src/html/inlined-runtimes.ts
 var WALKER_RUNTIME_CODE = true ? (
   /* js */
@@ -1488,23 +1515,143 @@ function nodeRef(scopeId, id) {
   };
   return id ? register2(getter, id, scopeId) : getter;
 }
-function markResumeScopeStart(scopeId, index) {
-  return $chunk.boundary.state.mark(
-    "[" /* SectionStart */,
-    scopeId + (index ? " " + index : "")
+function resumeClosestBranch(scopeId) {
+  const branchId = $chunk.context?.[branchIdKey];
+  if (branchId !== void 0 && branchId !== scopeId) {
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark("$" /* ClosestBranch */, "" + scopeId)
+    );
+  }
+}
+var branchIdKey = Symbol();
+function resumeForOf(list, cb, scopeId, accessor) {
+  forOf(list, (item, i) => {
+    const branchId = peekNextScopeId();
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark(
+        "[" /* BranchStart */,
+        branchId + (i ? " " : "")
+      )
+    );
+    withContext(branchIdKey, branchId, () => cb(item, i));
+  });
+  $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "]" /* BranchEnd */,
+      scopeId + " " + accessor
+    )
   );
 }
-function markResumeControlEnd(scopeId, accessor) {
-  return $chunk.boundary.state.mark("]" /* SectionEnd */, scopeId + " " + accessor);
+function resumeSingleNodeForOf(list, cb, scopeId, accessor) {
+  let branchIds = "";
+  forOf(list, (item, index) => {
+    const branchId = peekNextScopeId();
+    branchIds = " " + branchId + branchIds;
+    withContext(branchIdKey, branchId, () => cb(item, index));
+  });
+  $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "|" /* BranchSingleNode */,
+      scopeId + " " + accessor + branchIds
+    )
+  );
 }
-function markResumeControlSingleNodeEnd(scopeId, accessor, childScopeIds) {
-  return $chunk.boundary.state.mark(
-    "|" /* SectionSingleNodesEnd */,
-    scopeId + " " + accessor + " " + (childScopeIds ?? "")
+function resumeForIn(obj, cb, scopeId, accessor) {
+  let sep = "";
+  forIn(obj, (key, value) => {
+    const branchId = peekNextScopeId();
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
+    );
+    sep = " ";
+    withContext(branchIdKey, branchId, () => cb(key, value));
+  });
+  $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "]" /* BranchEnd */,
+      scopeId + " " + accessor
+    )
   );
 }
-function markResumeCleanup(scopeId) {
-  return $chunk.boundary.state.mark("$" /* Cleanup */, "" + scopeId);
+function resumeSingleNodeForIn(obj, cb, scopeId, accessor) {
+  let branchIds = "";
+  forIn(obj, (key, value) => {
+    const branchId = peekNextScopeId();
+    branchIds = " " + branchId + branchIds;
+    withContext(branchIdKey, branchId, () => cb(key, value));
+  });
+  $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "|" /* BranchSingleNode */,
+      scopeId + " " + accessor + branchIds
+    )
+  );
+}
+function resumeForTo(to, from, step, cb, scopeId, accessor) {
+  let sep = "";
+  forTo(to, from, step, (index) => {
+    const branchId = peekNextScopeId();
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
+    );
+    sep = " ";
+    withContext(branchIdKey, branchId, () => cb(index));
+  });
+  $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "]" /* BranchEnd */,
+      scopeId + " " + accessor
+    )
+  );
+}
+function resumeSingleNodeForTo(to, from, step, cb, scopeId, accessor) {
+  let branchIds = "";
+  forTo(to, from, step, (index) => {
+    const branchId = peekNextScopeId();
+    branchIds = " " + branchId + branchIds;
+    withContext(branchIdKey, branchId, () => cb(index));
+  });
+  $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "|" /* BranchSingleNode */,
+      scopeId + " " + accessor + branchIds
+    )
+  );
+}
+function resumeConditional(cb, scopeId, accessor) {
+  const branchId = peekNextScopeId();
+  $chunk.writeHTML(
+    $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
+  );
+  withContext(branchIdKey, branchId, cb);
+  const rendered = peekNextScopeId() !== branchId;
+  if (rendered) {
+    writeScope(branchId, {});
+  } else {
+    nextScopeId();
+  }
+  $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "]" /* BranchEnd */,
+      scopeId + " " + accessor
+    )
+  );
+}
+function resumeSingleNodeConditional(cb, scopeId, accessor) {
+  const branchId = peekNextScopeId();
+  withContext(branchIdKey, branchId, cb);
+  const rendered = peekNextScopeId() !== branchId;
+  if (rendered) {
+    writeScope(branchId, {});
+  } else {
+    nextScopeId();
+  }
+  $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "|" /* BranchSingleNode */,
+      scopeId + " " + accessor + (rendered ? " " + branchId : "")
+    )
+  );
 }
 function writeScope(scopeId, partialScope) {
   const { state } = $chunk.boundary;
@@ -1822,7 +1969,7 @@ var Chunk = class {
       do {
         cur.flushPlaceholder();
         html += cur.html;
-        effects += cur.effects;
+        effects = concatEffects(effects, cur.effects);
         scripts = concatScripts(scripts, cur.scripts);
         cur.consumed = true;
         cur = cur.next;
@@ -2276,52 +2423,57 @@ 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 dynamicTagInput(scope, tag, input, content, tagVar) {
-  if (!tag && !content) return void 0;
-  const scopeId = getScopeId(scope);
-  write(`${markResumeScopeStart(scopeId)}`);
-  writeScope(scopeId, scope);
+function dynamicTagInput(scopeId, accessor, tag, input, content, tagVar) {
+  if (!tag && !content) {
+    nextScopeId();
+    return;
+  }
   if (!tag) {
-    return content();
+    resumeConditional(content, scopeId, accessor);
+    return;
   }
   if (typeof tag === "string") {
-    nextScopeId();
-    write(
-      `<${tag}${attrs(input, true ? `#${tag}/0` : 0, 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,
-            true ? `#${tag}/0` : 0,
-            input.value,
-            input.valueChange
-          )
-        );
-      } else if (content) {
-        if (tag === "select" && ("value" in input || "valueChange" in input)) {
-          controllable_select_value(
-            scopeId,
-            true ? `#${tag}/0` : 0,
-            input.value,
-            input.valueChange,
-            content
-          );
-        } else {
-          content();
+    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
+              )
+            );
+          } 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}>`);
+        } else if (content) {
+          throw new Error(`Body content is not supported for a "${tag}" tag.`);
         }
-      }
-      write(`</${tag}>`);
-    } else if (content) {
-      throw new Error(`Body content is not supported for a "${tag}" tag.`);
-    }
-    return null;
+      },
+      scopeId,
+      accessor
+    );
+    return;
   }
   const renderer = getDynamicRenderer(tag);
   if (true) {
@@ -2329,22 +2481,36 @@ function dynamicTagInput(scope, tag, input, content, tagVar) {
       throw new Error(`Invalid renderer passed for dynamic tag: ${tag}`);
     }
   }
-  return renderer(content ? { ...input, content } : input, tagVar);
+  let result;
+  resumeConditional(
+    () => {
+      result = renderer(content ? { ...input, content } : input, tagVar);
+    },
+    scopeId,
+    accessor
+  );
+  return result;
 }
-function dynamicTagArgs(scope, tag, args) {
-  if (!tag) return void 0;
-  const scopeId = getScopeId(scope);
-  write(`${markResumeScopeStart(scopeId)}`);
-  writeScope(scopeId, scope);
-  if (typeof tag === "string") {
+function dynamicTagArgs(scopeId, accessor, tag, args) {
+  if (!tag) {
     nextScopeId();
-    write(
-      `<${tag}${attrs(args[0], true ? `#${tag}/0` : 0, scopeId, tag)}>`
+    return;
+  }
+  if (typeof tag === "string") {
+    resumeSingleNodeConditional(
+      () => {
+        nextScopeId();
+        write(
+          `<${tag}${attrs(args[0], accessor, scopeId, tag)}>`
+        );
+        if (!voidElementsReg.test(tag)) {
+          write(`</${tag}>`);
+        }
+      },
+      scopeId,
+      accessor
     );
-    if (!voidElementsReg.test(tag)) {
-      write(`</${tag}>`);
-    }
-    return void 0;
+    return;
   }
   const renderer = getDynamicRenderer(tag);
   if (true) {
@@ -2352,7 +2518,15 @@ function dynamicTagArgs(scope, tag, args) {
       throw new Error(`Invalid renderer passed for dynamic tag: ${tag}`);
     }
   }
-  return renderer(...args);
+  let result;
+  resumeConditional(
+    () => {
+      result = renderer(...args);
+    },
+    scopeId,
+    accessor
+  );
+  return result;
 }
 var getDynamicRenderer = normalizeDynamicRenderer;
 var createRenderer = (fn) => fn;
@@ -2448,28 +2622,6 @@ var compat = {
   }
 };
 
-// src/common/for.ts
-function forIn(obj, cb) {
-  for (const key in obj) {
-    cb(key, obj[key]);
-  }
-}
-function forOf(list, cb) {
-  if (list) {
-    let i = 0;
-    for (const item of list) {
-      cb(item, i++);
-    }
-  }
-}
-function forTo(to, from, step, cb) {
-  const start = from || 0;
-  const delta = step || 1;
-  for (let steps = (to - start) / delta, i = 0; i <= steps; i++) {
-    cb(start + i * delta);
-  }
-}
-
 // src/html/for.ts
 function forOfBy(by, item, index) {
   if (by) {
@@ -2736,11 +2888,7 @@ var ServerRenderResult = class {
   forToBy,
   fork,
   getScopeById,
-  markResumeCleanup,
-  markResumeControlEnd,
-  markResumeControlSingleNodeEnd,
   markResumeNode,
-  markResumeScopeStart,
   nextScopeId,
   nextTagId,
   nodeRef,
@@ -2749,6 +2897,15 @@ var ServerRenderResult = class {
   partialAttrs,
   peekNextScope,
   register,
+  resumeClosestBranch,
+  resumeConditional,
+  resumeForIn,
+  resumeForOf,
+  resumeForTo,
+  resumeSingleNodeConditional,
+  resumeSingleNodeForIn,
+  resumeSingleNodeForOf,
+  resumeSingleNodeForTo,
   styleAttr,
   toString,
   tryContent,