marko 6.0.0-next.3.66 → 6.0.0-next.3.68

package/dist/html.js

@@ -178,7 +178,7 @@ function forTo(to, from, step, cb) {
 }
 
 // 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.r)))}})';
+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,l,t,r={},c=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,o,n,a,g)=>{"#"==d?(r[o]=l).i++:n==t&&i(),"T"==n.tagName&&(o=n.getAttribute(e.i))&&((a=e.l["^"+o])&&(r[o]={i:1,c(i=e.l[o]||n){for(;(t=i.previousSibling||a).remove(),a!=t;);c(i,n)}}),t=n.nextSibling,l=r[o],i=()=>{a||c(e.l[o],n),--l.i||l.c()},(d=e.j[o])&&(g=l.c,l.c=()=>g()+d(e.r)))}})';
 
 // src/html/serializer.ts
 var { hasOwnProperty } = {}, Generator = function* () {
@@ -1250,10 +1250,7 @@ function resumeSingleNodeConditional(cb, scopeId, accessor, onlyChild) {
 }
 var writeScope = (scopeId, partialScope) => {
   let { state } = $chunk.boundary, { scopes } = state, scope = scopes.get(scopeId);
-  return state.needsMainRuntime = !0, scope ? Object.assign(scope, partialScope) : (scope = partialScope, scope[K_SCOPE_ID] = scopeId, state.scopes.set(scopeId, scope)), state.writeScopes ? state.writeScopes[scopeId] = scope : state.hasGlobals ? state.writeScopes = { [scopeId]: scope } : (state.hasGlobals = !0, state.writeScopes = {
-    $: getFilteredGlobals(state.$global),
-    [scopeId]: scope
-  }), scope;
+  return state.needsMainRuntime = !0, scope ? Object.assign(scope, partialScope) : (scope = partialScope, scope[K_SCOPE_ID] = scopeId, state.scopes.set(scopeId, scope)), state.writeScopes ? state.writeScopes[scopeId] = scope : state.writeScopes = { [scopeId]: scope }, scope;
 };
 function writeExistingScope(scope) {
   return writeScope(scope[K_SCOPE_ID], scope);
@@ -1371,6 +1368,7 @@ var State2 = class {
   tagId = 1;
   scopeId = 1;
   reorderId = 1;
+  lastSerializedScopeId = this.scopeId;
   hasGlobals = !1;
   needsMainRuntime = !1;
   hasMainRuntime = !1;
@@ -1498,7 +1496,16 @@ function prepareChunk(chunk) {
     WALKER_RUNTIME_CODE + '("' + $global2.runtimeId + '")("' + $global2.renderId + '")'
   ));
   let resumes = "";
-  if ((state.writeScopes || serializer.flushed) && (resumes = state.serializer.stringify(state.writeScopes || {}, boundary), state.writeScopes = null), effects && (hasWalk = !0, resumes = resumes ? resumes + "," + effects : effects), resumes && (state.hasWrittenResume ? scripts = concatScripts(
+  if (state.writeScopes || serializer.flushed) {
+    let { lastSerializedScopeId } = state, serializeData = [];
+    state.hasGlobals || (state.hasGlobals = !0, serializeData.push(getFilteredGlobals(state.$global)));
+    for (let key in state.writeScopes) {
+      let scope = state.writeScopes[key], scopeId = getScopeId(scope), scopeIdDelta = scopeId - lastSerializedScopeId;
+      lastSerializedScopeId = scopeId + 1, scopeIdDelta && serializeData.push(scopeIdDelta), serializeData.push(scope);
+    }
+    resumes = state.serializer.stringify(serializeData, boundary), state.writeScopes = null, state.lastSerializedScopeId = lastSerializedScopeId;
+  }
+  if (effects && (hasWalk = !0, resumes = resumes ? resumes + "," + effects : effects), resumes && (state.hasWrittenResume ? scripts = concatScripts(
     scripts,
     runtimePrefix + ".r.push(" + resumes + ")"
   ) : (state.hasWrittenResume = !0, scripts = concatScripts(
@@ -1512,8 +1519,9 @@ function prepareChunk(chunk) {
     for (let reorderedChunk of state.writeReorders) {
       let { reorderId } = reorderedChunk, reorderHTML = "", reorderEffects = "", reorderScripts = "", cur = reorderedChunk;
       for (reorderedChunk.reorderId = null; ; ) {
+        cur.flushPlaceholder();
         let { next } = cur;
-        if (cur.flushPlaceholder(), cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, cur.scripts), cur.async && (reorderHTML += state.mark(
+        if (cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, cur.scripts), cur.async && (reorderHTML += state.mark(
           "#" /* ReorderMarker */,
           cur.reorderId = state.nextReorderId()
         ), cur.html = cur.effects = cur.scripts = "", cur.next = null), next)
@@ -1566,10 +1574,10 @@ function isPromise(value) {
   return value != null && typeof value.then == "function";
 }
 function getFilteredGlobals($global2) {
-  if (!$global2) return;
+  if (!$global2) return 0;
   let serializedGlobals = $global2.serializedGlobals;
-  if (!serializedGlobals) return;
-  let filtered;
+  if (!serializedGlobals) return 0;
+  let filtered = 0;
   if (Array.isArray(serializedGlobals))
     for (let key of serializedGlobals) {
       let value = $global2[key];

package/dist/html.mjs

@@ -97,7 +97,7 @@ function forTo(to, from, step, cb) {
 }
 
 // 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.r)))}})';
+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,l,t,r={},c=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,o,n,a,g)=>{"#"==d?(r[o]=l).i++:n==t&&i(),"T"==n.tagName&&(o=n.getAttribute(e.i))&&((a=e.l["^"+o])&&(r[o]={i:1,c(i=e.l[o]||n){for(;(t=i.previousSibling||a).remove(),a!=t;);c(i,n)}}),t=n.nextSibling,l=r[o],i=()=>{a||c(e.l[o],n),--l.i||l.c()},(d=e.j[o])&&(g=l.c,l.c=()=>g()+d(e.r)))}})';
 
 // src/html/serializer.ts
 var { hasOwnProperty } = {}, Generator = function* () {
@@ -1169,10 +1169,7 @@ function resumeSingleNodeConditional(cb, scopeId, accessor, onlyChild) {
 }
 var writeScope = (scopeId, partialScope) => {
   let { state } = $chunk.boundary, { scopes } = state, scope = scopes.get(scopeId);
-  return state.needsMainRuntime = !0, scope ? Object.assign(scope, partialScope) : (scope = partialScope, scope[K_SCOPE_ID] = scopeId, state.scopes.set(scopeId, scope)), state.writeScopes ? state.writeScopes[scopeId] = scope : state.hasGlobals ? state.writeScopes = { [scopeId]: scope } : (state.hasGlobals = !0, state.writeScopes = {
-    $: getFilteredGlobals(state.$global),
-    [scopeId]: scope
-  }), scope;
+  return state.needsMainRuntime = !0, scope ? Object.assign(scope, partialScope) : (scope = partialScope, scope[K_SCOPE_ID] = scopeId, state.scopes.set(scopeId, scope)), state.writeScopes ? state.writeScopes[scopeId] = scope : state.writeScopes = { [scopeId]: scope }, scope;
 };
 function writeExistingScope(scope) {
   return writeScope(scope[K_SCOPE_ID], scope);
@@ -1290,6 +1287,7 @@ var State2 = class {
   tagId = 1;
   scopeId = 1;
   reorderId = 1;
+  lastSerializedScopeId = this.scopeId;
   hasGlobals = !1;
   needsMainRuntime = !1;
   hasMainRuntime = !1;
@@ -1417,7 +1415,16 @@ function prepareChunk(chunk) {
     WALKER_RUNTIME_CODE + '("' + $global2.runtimeId + '")("' + $global2.renderId + '")'
   ));
   let resumes = "";
-  if ((state.writeScopes || serializer.flushed) && (resumes = state.serializer.stringify(state.writeScopes || {}, boundary), state.writeScopes = null), effects && (hasWalk = !0, resumes = resumes ? resumes + "," + effects : effects), resumes && (state.hasWrittenResume ? scripts = concatScripts(
+  if (state.writeScopes || serializer.flushed) {
+    let { lastSerializedScopeId } = state, serializeData = [];
+    state.hasGlobals || (state.hasGlobals = !0, serializeData.push(getFilteredGlobals(state.$global)));
+    for (let key in state.writeScopes) {
+      let scope = state.writeScopes[key], scopeId = getScopeId(scope), scopeIdDelta = scopeId - lastSerializedScopeId;
+      lastSerializedScopeId = scopeId + 1, scopeIdDelta && serializeData.push(scopeIdDelta), serializeData.push(scope);
+    }
+    resumes = state.serializer.stringify(serializeData, boundary), state.writeScopes = null, state.lastSerializedScopeId = lastSerializedScopeId;
+  }
+  if (effects && (hasWalk = !0, resumes = resumes ? resumes + "," + effects : effects), resumes && (state.hasWrittenResume ? scripts = concatScripts(
     scripts,
     runtimePrefix + ".r.push(" + resumes + ")"
   ) : (state.hasWrittenResume = !0, scripts = concatScripts(
@@ -1431,8 +1438,9 @@ function prepareChunk(chunk) {
     for (let reorderedChunk of state.writeReorders) {
       let { reorderId } = reorderedChunk, reorderHTML = "", reorderEffects = "", reorderScripts = "", cur = reorderedChunk;
       for (reorderedChunk.reorderId = null; ; ) {
+        cur.flushPlaceholder();
         let { next } = cur;
-        if (cur.flushPlaceholder(), cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, cur.scripts), cur.async && (reorderHTML += state.mark(
+        if (cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, cur.scripts), cur.async && (reorderHTML += state.mark(
           "#" /* ReorderMarker */,
           cur.reorderId = state.nextReorderId()
         ), cur.html = cur.effects = cur.scripts = "", cur.next = null), next)
@@ -1485,10 +1493,10 @@ function isPromise(value) {
   return value != null && typeof value.then == "function";
 }
 function getFilteredGlobals($global2) {
-  if (!$global2) return;
+  if (!$global2) return 0;
   let serializedGlobals = $global2.serializedGlobals;
-  if (!serializedGlobals) return;
-  let filtered;
+  if (!serializedGlobals) return 0;
+  let filtered = 0;
   if (Array.isArray(serializedGlobals))
     for (let key of serializedGlobals) {
       let value = $global2[key];