marko 6.0.0-next.3.22 → 6.0.0-next.3.24

package/dist/html.mjs

@@ -79,6 +79,24 @@ function escapeStyle(val) {
   return val ? escapeStyleStr(val + "") : val === 0 ? "0" : "";
 }
 
+// src/common/for.ts
+function forIn(obj, cb) {
+  for (let key in obj)
+    cb(key, obj[key]);
+}
+function forOf(list, cb) {
+  if (list) {
+    let i = 0;
+    for (let item of list)
+      cb(item, i++);
+  }
+}
+function forTo(to, from, step, cb) {
+  let start = from || 0, 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 = '(e=>self[e]=self[e]||(l=>{let t,d={},s=[],f=document,i=f.createTreeWalker(f,129),n=self[e][l]={i:l=e+l,d:f,l:d,v:s,x(){},w(e){for(;e=i.nextNode();)this.x(n=(n=e.data)&&!n.indexOf(l)&&(d[t=n.slice(x+1)]=e,n[x]),t,e),n>"#"&&s.push(e)}},x=l.length}))', REORDER_RUNTIME_CODE = '(e=>{let i,t,r,l={},o=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,n,a,c,p)=>{"#"==d?(l[n]=t).i++:a==r&&i(),"T"==a.tagName&&(n=a.getAttribute(e.i))&&((c=e.l["^"+n])&&(l[n]={i:1,c(i=e.l[n]||a){for(;i.parentNode!==c.parentNode;)i=i.parentNode;for(;i!=r;(r=c.nextSibling).remove());o(c,a)}}),r=a.nextSibling,t=l[n],i=()=>{c||o(e.l[n],a),--t.i||t.c()},(d=e.j[n])&&(p=t.c,t.c=()=>p()+d(e)))}})';
 
@@ -935,23 +953,114 @@ 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) {
+  let branchId = $chunk.context?.[branchIdKey];
+  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) => {
+    let 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 resumeSingleNodeForOf(list, cb, scopeId, accessor) {
+  let branchIds = "";
+  forOf(list, (item, index) => {
+    let branchId = peekNextScopeId();
+    branchIds = " " + branchId + branchIds, withContext(branchIdKey, branchId, () => cb(item, index));
+  }), $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "|" /* BranchSingleNode */,
+      scopeId + " " + accessor + branchIds
+    )
+  );
+}
+function resumeForIn(obj, cb, scopeId, accessor) {
+  let sep = "";
+  forIn(obj, (key, value) => {
+    let 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 resumeSingleNodeForIn(obj, cb, scopeId, accessor) {
+  let branchIds = "";
+  forIn(obj, (key, value) => {
+    let 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) => {
+    let 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 markResumeControlEnd(scopeId, accessor) {
-  return $chunk.boundary.state.mark("]" /* SectionEnd */, scopeId + " " + accessor);
+function resumeSingleNodeForTo(to, from, step, cb, scopeId, accessor) {
+  let branchIds = "";
+  forTo(to, from, step, (index) => {
+    let branchId = peekNextScopeId();
+    branchIds = " " + branchId + branchIds, withContext(branchIdKey, branchId, () => cb(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 resumeConditional(cb, scopeId, accessor) {
+  let branchId = peekNextScopeId();
+  $chunk.writeHTML(
+    $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
+  ), withContext(branchIdKey, branchId, cb), peekNextScopeId() !== branchId ? writeScope(branchId, {}) : nextScopeId(), $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "]" /* BranchEnd */,
+      scopeId + " " + accessor
+    )
   );
 }
-function markResumeCleanup(scopeId) {
-  return $chunk.boundary.state.mark("$" /* Cleanup */, "" + scopeId);
+function resumeSingleNodeConditional(cb, scopeId, accessor) {
+  let branchId = peekNextScopeId();
+  withContext(branchIdKey, branchId, cb);
+  let rendered = peekNextScopeId() !== branchId;
+  rendered ? writeScope(branchId, {}) : nextScopeId(), $chunk.writeHTML(
+    $chunk.boundary.state.mark(
+      "|" /* BranchSingleNode */,
+      scopeId + " " + accessor + (rendered ? " " + branchId : "")
+    )
+  );
 }
 function writeScope(scopeId, partialScope) {
   let { state } = $chunk.boundary, { scopes } = state, scope = scopes.get(scopeId);
@@ -1139,7 +1248,7 @@ var State2 = class {
     if (cur.next && !cur.async) {
       let html = "", effects = "", scripts = "";
       do
-        cur.flushPlaceholder(), html += cur.html, effects += cur.effects, scripts = concatScripts(scripts, cur.scripts), cur.consumed = !0, cur = cur.next;
+        cur.flushPlaceholder(), html += cur.html, effects = concatEffects(effects, cur.effects), scripts = concatScripts(scripts, cur.scripts), cur.consumed = !0, cur = cur.next;
       while (cur.next && !cur.async);
       cur.html = html + cur.html, cur.effects = concatEffects(effects, cur.effects), cur.scripts = concatScripts(scripts, cur.scripts);
     }
@@ -1439,36 +1548,72 @@ 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 dynamicTagInput(scope, tag, input, content, tagVar) {
-  if (!tag && !content) return;
-  let scopeId = getScopeId(scope);
-  return write(`${markResumeScopeStart(scopeId)}`), writeScope(scopeId, scope), tag ? typeof tag == "string" ? (nextScopeId(), write(
-    `<${tag}${attrs(input, 0, scopeId, tag)}>`
-  ), voidElementsReg.test(tag) || (tag === "textarea" ? write(
-    controllable_textarea_value(
+function dynamicTagInput(scopeId, accessor, tag, input, content, tagVar) {
+  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(
+          scopeId,
+          accessor,
+          input.value,
+          input.valueChange,
+          content
+        ) : content()), write(`</${tag}>`));
+      },
       scopeId,
-      0,
-      input.value,
-      input.valueChange
-    )
-  ) : content && (tag === "select" && ("value" in input || "valueChange" in input) ? controllable_select_value(
+      accessor
+    );
+    return;
+  }
+  let renderer = getDynamicRenderer(tag), result;
+  return resumeConditional(
+    () => {
+      result = renderer(content ? { ...input, content } : input, tagVar);
+    },
     scopeId,
-    0,
-    input.value,
-    input.valueChange,
-    content
-  ) : content()), write(`</${tag}>`)), null) : getDynamicRenderer(tag)(content ? { ...input, content } : input, tagVar) : content();
-}
-function dynamicTagArgs(scope, tag, args) {
-  if (!tag) return;
-  let scopeId = getScopeId(scope);
-  if (write(`${markResumeScopeStart(scopeId)}`), writeScope(scopeId, scope), typeof tag == "string") {
-    nextScopeId(), write(
-      `<${tag}${attrs(args[0], 0, scopeId, tag)}>`
-    ), voidElementsReg.test(tag) || write(`</${tag}>`);
+    accessor
+  ), result;
+}
+function 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
+    );
     return;
   }
-  return getDynamicRenderer(tag)(...args);
+  let renderer = getDynamicRenderer(tag), result;
+  return resumeConditional(
+    () => {
+      result = renderer(...args);
+    },
+    scopeId,
+    accessor
+  ), result;
 }
 var getDynamicRenderer = normalizeDynamicRenderer, createRenderer = (fn) => fn;
 function patchDynamicTag(newGetDynamicRenderer, newCreateRenderer) {
@@ -1538,24 +1683,6 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
   }
 };
 
-// src/common/for.ts
-function forIn(obj, cb) {
-  for (let key in obj)
-    cb(key, obj[key]);
-}
-function forOf(list, cb) {
-  if (list) {
-    let i = 0;
-    for (let item of list)
-      cb(item, i++);
-  }
-}
-function forTo(to, from, step, cb) {
-  let start = from || 0, 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) {
   return by ? typeof by == "string" ? item[by] : by(item, index) : index;
@@ -1739,11 +1866,7 @@ export {
   forToBy,
   fork,
   getScopeById,
-  markResumeCleanup,
-  markResumeControlEnd,
-  markResumeControlSingleNodeEnd,
   markResumeNode,
-  markResumeScopeStart,
   nextScopeId,
   nextTagId,
   nodeRef,
@@ -1752,6 +1875,15 @@ export {
   partialAttrs,
   peekNextScope,
   register2 as register,
+  resumeClosestBranch,
+  resumeConditional,
+  resumeForIn,
+  resumeForOf,
+  resumeForTo,
+  resumeSingleNodeConditional,
+  resumeSingleNodeForIn,
+  resumeSingleNodeForOf,
+  resumeSingleNodeForTo,
   styleAttr,
   toString,
   tryContent,

package/dist/translator/core/for.d.ts

@@ -2,12 +2,10 @@ import { types as t } from "@marko/compiler";
 import { type Binding } from "../util/references";
 type ForType = "in" | "of" | "to";
 declare const kForMarkerBinding: unique symbol;
-declare const kForScopeStartIndex: unique symbol;
 declare const kOnlyChildInParent: unique symbol;
 declare module "@marko/compiler/dist/types" {
     interface NodeExtra {
         [kForMarkerBinding]?: Binding;
-        [kForScopeStartIndex]?: t.Identifier;
         [kOnlyChildInParent]?: boolean;
     }
 }