marko 6.0.2 → 6.0.3

package/dist/debug/dom.js

@@ -276,6 +276,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         };
         const branchIds = /* @__PURE__ */ new Set();
         const parentBranchIds = /* @__PURE__ */ new Map();
+        let lastEffect;
         let currentBranchId;
         let $global;
         let lastScopeId = 0;
@@ -361,7 +362,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
               render.r = [];
               isResuming = 1;
               for (let i = 0; i < resumes.length; i++) {
-                const serialized = resumes[i];
+                let serialized = resumes[i];
                 if (typeof serialized === "function") {
                   for (const scope of serialized(serializeContext)) {
                     if (!$global) {
@@ -403,7 +404,11 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                     }
                   }
                 } else {
-                  registeredValues[resumes[++i]](
+                  if (typeof serialized === "string") {
+                    lastEffect = serialized;
+                    serialized = resumes[++i];
+                  }
+                  registeredValues[lastEffect](
                     scopeLookup[serialized],
                     scopeLookup[serialized]
                   );

package/dist/debug/dom.mjs

@@ -188,6 +188,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         };
         const branchIds = /* @__PURE__ */ new Set();
         const parentBranchIds = /* @__PURE__ */ new Map();
+        let lastEffect;
         let currentBranchId;
         let $global;
         let lastScopeId = 0;
@@ -273,7 +274,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
               render.r = [];
               isResuming = 1;
               for (let i = 0; i < resumes.length; i++) {
-                const serialized = resumes[i];
+                let serialized = resumes[i];
                 if (typeof serialized === "function") {
                   for (const scope of serialized(serializeContext)) {
                     if (!$global) {
@@ -315,7 +316,11 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                     }
                   }
                 } else {
-                  registeredValues[resumes[++i]](
+                  if (typeof serialized === "string") {
+                    lastEffect = serialized;
+                    serialized = resumes[++i];
+                  }
+                  registeredValues[lastEffect](
                     scopeLookup[serialized],
                     scopeLookup[serialized]
                   );

package/dist/debug/html.js

@@ -2197,7 +2197,7 @@ function tryCatch(content, catchContent) {
             cur.async = false;
             cur.next = bodyNext;
             cur.html = endMarker;
-            cur.scripts = cur.effects = "";
+            cur.scripts = cur.effects = cur.lastEffect = "";
             cur.placeholderBody = cur.placeholderRender = cur.reorderId = null;
           }
           cur = next;
@@ -2328,6 +2328,7 @@ var Chunk = class {
   html = "";
   scripts = "";
   effects = "";
+  lastEffect = "";
   async = false;
   consumed = false;
   reorderId = null;
@@ -2337,10 +2338,15 @@ var Chunk = class {
     this.html += html;
   }
   writeEffect(scopeId, registryId) {
-    this.effects = concatEffects(
-      this.effects,
-      scopeId + ',"' + registryId + '"'
-    );
+    if (this.lastEffect === registryId) {
+      this.effects += "," + scopeId;
+    } else {
+      this.effects = concatEffects(
+        this.effects,
+        '"' + registryId + '",' + scopeId
+      );
+    }
+    this.lastEffect = registryId;
   }
   writeScript(script) {
     this.scripts = concatScripts(this.scripts, script);
@@ -2349,6 +2355,7 @@ var Chunk = class {
     this.html += chunk.html;
     this.effects = concatEffects(this.effects, chunk.effects);
     this.scripts = concatScripts(this.scripts, chunk.scripts);
+    this.lastEffect = chunk.lastEffect || this.lastEffect;
   }
   flushPlaceholder() {
     if (this.placeholderBody) {
@@ -2378,17 +2385,20 @@ var Chunk = class {
       let html = "";
       let effects = "";
       let scripts = "";
+      let lastEffect = "";
       do {
         cur.flushPlaceholder();
         html += cur.html;
         effects = concatEffects(effects, cur.effects);
         scripts = concatScripts(scripts, cur.scripts);
+        lastEffect = cur.lastEffect || lastEffect;
         cur.consumed = true;
         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);
+      cur.lastEffect = lastEffect;
     }
     return cur;
   }
@@ -2467,7 +2477,7 @@ var Chunk = class {
               "#" /* ReorderMarker */,
               cur.reorderId = state.nextReorderId()
             );
-            cur.html = cur.effects = cur.scripts = "";
+            cur.html = cur.effects = cur.scripts = cur.lastEffect = "";
             cur.next = null;
           }
           if (next) {

package/dist/debug/html.mjs

@@ -2112,7 +2112,7 @@ function tryCatch(content, catchContent) {
             cur.async = false;
             cur.next = bodyNext;
             cur.html = endMarker;
-            cur.scripts = cur.effects = "";
+            cur.scripts = cur.effects = cur.lastEffect = "";
             cur.placeholderBody = cur.placeholderRender = cur.reorderId = null;
           }
           cur = next;
@@ -2243,6 +2243,7 @@ var Chunk = class {
   html = "";
   scripts = "";
   effects = "";
+  lastEffect = "";
   async = false;
   consumed = false;
   reorderId = null;
@@ -2252,10 +2253,15 @@ var Chunk = class {
     this.html += html;
   }
   writeEffect(scopeId, registryId) {
-    this.effects = concatEffects(
-      this.effects,
-      scopeId + ',"' + registryId + '"'
-    );
+    if (this.lastEffect === registryId) {
+      this.effects += "," + scopeId;
+    } else {
+      this.effects = concatEffects(
+        this.effects,
+        '"' + registryId + '",' + scopeId
+      );
+    }
+    this.lastEffect = registryId;
   }
   writeScript(script) {
     this.scripts = concatScripts(this.scripts, script);
@@ -2264,6 +2270,7 @@ var Chunk = class {
     this.html += chunk.html;
     this.effects = concatEffects(this.effects, chunk.effects);
     this.scripts = concatScripts(this.scripts, chunk.scripts);
+    this.lastEffect = chunk.lastEffect || this.lastEffect;
   }
   flushPlaceholder() {
     if (this.placeholderBody) {
@@ -2293,17 +2300,20 @@ var Chunk = class {
       let html = "";
       let effects = "";
       let scripts = "";
+      let lastEffect = "";
       do {
         cur.flushPlaceholder();
         html += cur.html;
         effects = concatEffects(effects, cur.effects);
         scripts = concatScripts(scripts, cur.scripts);
+        lastEffect = cur.lastEffect || lastEffect;
         cur.consumed = true;
         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);
+      cur.lastEffect = lastEffect;
     }
     return cur;
   }
@@ -2382,7 +2392,7 @@ var Chunk = class {
               "#" /* ReorderMarker */,
               cur.reorderId = state.nextReorderId()
             );
-            cur.html = cur.effects = cur.scripts = "";
+            cur.html = cur.effects = cur.scripts = cur.lastEffect = "";
             cur.next = null;
           }
           if (next) {

package/dist/dom.js

@@ -213,7 +213,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
       value: resumeRender = (renderId) => {
         let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, commentPrefixLen = render.i.length, branchStack = [], scopeLookup = render.s = {}, serializeContext = {
           _: registeredValues
-        }, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map(), currentBranchId, $global, lastScopeId = 0;
+        }, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map(), lastEffect, currentBranchId, $global, lastScopeId = 0;
         return render.w = () => {
           walk2.call(render);
           let visits = render.v, resumes = render.r;
@@ -287,7 +287,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                       }
                     }
                 else
-                  registeredValues[resumes[++i]](
+                  typeof serialized == "string" && (lastEffect = serialized, serialized = resumes[++i]), registeredValues[lastEffect](
                     scopeLookup[serialized],
                     scopeLookup[serialized]
                   );

package/dist/dom.mjs

@@ -128,7 +128,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
       value: resumeRender = (renderId) => {
         let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, commentPrefixLen = render.i.length, branchStack = [], scopeLookup = render.s = {}, serializeContext = {
           _: registeredValues
-        }, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map(), currentBranchId, $global, lastScopeId = 0;
+        }, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map(), lastEffect, currentBranchId, $global, lastScopeId = 0;
         return render.w = () => {
           walk2.call(render);
           let visits = render.v, resumes = render.r;
@@ -202,7 +202,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                       }
                     }
                 else
-                  registeredValues[resumes[++i]](
+                  typeof serialized == "string" && (lastEffect = serialized, serialized = resumes[++i]), registeredValues[lastEffect](
                     scopeLookup[serialized],
                     scopeLookup[serialized]
                   );

package/dist/html/writer.d.ts

@@ -108,6 +108,7 @@ export declare class Chunk {
     html: string;
     scripts: string;
     effects: string;
+    lastEffect: string;
     async: boolean;
     consumed: boolean;
     reorderId: string | null;

package/dist/html.js

@@ -1432,7 +1432,7 @@ function tryCatch(content, catchContent) {
           let cur = body, writeMarker = !0;
           do {
             let next = cur.next;
-            cur.boundary !== catchBoundary && cur.boundary.abort(catchBoundary.signal.reason), writeMarker && !cur.consumed && (writeMarker = !1, cur.async = !1, cur.next = bodyNext, cur.html = endMarker, cur.scripts = cur.effects = "", cur.placeholderBody = cur.placeholderRender = cur.reorderId = null), cur = next;
+            cur.boundary !== catchBoundary && cur.boundary.abort(catchBoundary.signal.reason), writeMarker && !cur.consumed && (writeMarker = !1, cur.async = !1, cur.next = bodyNext, cur.html = endMarker, cur.scripts = cur.effects = cur.lastEffect = "", cur.placeholderBody = cur.placeholderRender = cur.reorderId = null), cur = next;
           } while (cur !== bodyNext);
         }
         let catchChunk = new Chunk(boundary, null, chunk.context);
@@ -1513,6 +1513,7 @@ var State2 = class {
   html = "";
   scripts = "";
   effects = "";
+  lastEffect = "";
   async = !1;
   consumed = !1;
   reorderId = null;
@@ -1522,16 +1523,16 @@ var State2 = class {
     this.html += html;
   }
   writeEffect(scopeId, registryId) {
-    this.effects = concatEffects(
+    this.lastEffect === registryId ? this.effects += "," + scopeId : this.effects = concatEffects(
       this.effects,
-      scopeId + ',"' + registryId + '"'
-    );
+      '"' + registryId + '",' + scopeId
+    ), this.lastEffect = registryId;
   }
   writeScript(script) {
     this.scripts = concatScripts(this.scripts, script);
   }
   append(chunk) {
-    this.html += chunk.html, this.effects = concatEffects(this.effects, chunk.effects), this.scripts = concatScripts(this.scripts, chunk.scripts);
+    this.html += chunk.html, this.effects = concatEffects(this.effects, chunk.effects), this.scripts = concatScripts(this.scripts, chunk.scripts), this.lastEffect = chunk.lastEffect || this.lastEffect;
   }
   flushPlaceholder() {
     if (this.placeholderBody) {
@@ -1551,11 +1552,11 @@ var State2 = class {
   consume() {
     let cur = this;
     if (cur.next && !cur.async) {
-      let html = "", effects = "", scripts = "";
+      let html = "", effects = "", scripts = "", lastEffect = "";
       do
-        cur.flushPlaceholder(), html += cur.html, effects = concatEffects(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), lastEffect = cur.lastEffect || lastEffect, 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);
+      cur.html = html + cur.html, cur.effects = concatEffects(effects, cur.effects), cur.scripts = concatScripts(scripts, cur.scripts), cur.lastEffect = lastEffect;
     }
     return cur;
   }
@@ -1595,7 +1596,7 @@ var State2 = class {
           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)
+          ), cur.html = cur.effects = cur.scripts = cur.lastEffect = "", cur.next = null), next)
             cur = next;
           else
             break;

package/dist/html.mjs

@@ -1350,7 +1350,7 @@ function tryCatch(content, catchContent) {
           let cur = body, writeMarker = !0;
           do {
             let next = cur.next;
-            cur.boundary !== catchBoundary && cur.boundary.abort(catchBoundary.signal.reason), writeMarker && !cur.consumed && (writeMarker = !1, cur.async = !1, cur.next = bodyNext, cur.html = endMarker, cur.scripts = cur.effects = "", cur.placeholderBody = cur.placeholderRender = cur.reorderId = null), cur = next;
+            cur.boundary !== catchBoundary && cur.boundary.abort(catchBoundary.signal.reason), writeMarker && !cur.consumed && (writeMarker = !1, cur.async = !1, cur.next = bodyNext, cur.html = endMarker, cur.scripts = cur.effects = cur.lastEffect = "", cur.placeholderBody = cur.placeholderRender = cur.reorderId = null), cur = next;
           } while (cur !== bodyNext);
         }
         let catchChunk = new Chunk(boundary, null, chunk.context);
@@ -1431,6 +1431,7 @@ var State2 = class {
   html = "";
   scripts = "";
   effects = "";
+  lastEffect = "";
   async = !1;
   consumed = !1;
   reorderId = null;
@@ -1440,16 +1441,16 @@ var State2 = class {
     this.html += html;
   }
   writeEffect(scopeId, registryId) {
-    this.effects = concatEffects(
+    this.lastEffect === registryId ? this.effects += "," + scopeId : this.effects = concatEffects(
       this.effects,
-      scopeId + ',"' + registryId + '"'
-    );
+      '"' + registryId + '",' + scopeId
+    ), this.lastEffect = registryId;
   }
   writeScript(script) {
     this.scripts = concatScripts(this.scripts, script);
   }
   append(chunk) {
-    this.html += chunk.html, this.effects = concatEffects(this.effects, chunk.effects), this.scripts = concatScripts(this.scripts, chunk.scripts);
+    this.html += chunk.html, this.effects = concatEffects(this.effects, chunk.effects), this.scripts = concatScripts(this.scripts, chunk.scripts), this.lastEffect = chunk.lastEffect || this.lastEffect;
   }
   flushPlaceholder() {
     if (this.placeholderBody) {
@@ -1469,11 +1470,11 @@ var State2 = class {
   consume() {
     let cur = this;
     if (cur.next && !cur.async) {
-      let html = "", effects = "", scripts = "";
+      let html = "", effects = "", scripts = "", lastEffect = "";
       do
-        cur.flushPlaceholder(), html += cur.html, effects = concatEffects(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), lastEffect = cur.lastEffect || lastEffect, 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);
+      cur.html = html + cur.html, cur.effects = concatEffects(effects, cur.effects), cur.scripts = concatScripts(scripts, cur.scripts), cur.lastEffect = lastEffect;
     }
     return cur;
   }
@@ -1513,7 +1514,7 @@ var State2 = class {
           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)
+          ), cur.html = cur.effects = cur.scripts = cur.lastEffect = "", cur.next = null), next)
             cur = next;
           else
             break;

package/dist/translator/index.js

@@ -6405,7 +6405,7 @@ var for_default = {
             forAttrs.by || import_compiler33.types.numericLiteral(0),
             getScopeIdIdentifier(tagSection),
             getScopeAccessorLiteral(nodeBinding),
-            branchSerializeReason !== true && markerSerializeReason && markerSerializeReason !== true && !bindingUtil.isSuperset(
+            branchSerializeReason === true || markerSerializeReason === true ? import_compiler33.types.numericLiteral(1) : markerSerializeReason && !bindingUtil.isSuperset(
               branchSerializeReason,
               markerSerializeReason
             ) ? import_compiler33.types.logicalExpression(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",