@marko/runtime-tags 6.0.110 → 6.0.111

package/dist/debug/dom.js

@@ -535,19 +535,20 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         const serializeContext = {
           _: registeredValues
         };
-        const visitBranches = branchesEnabled && /* @__PURE__ */ (() => {
-          let curBranchScopes;
-          const branchScopesStack = [];
-          const branchStarts = [];
-          const orphanBranches = [];
-          const endBranch = (accessor, singleNode) => {
-            const parent = visit.parentNode;
-            let startVisit = visit;
-            let i = orphanBranches.length;
-            let branchId;
-            let branch;
-            let childBranch;
-            let endedBranches;
+        const visitBranches = branchesEnabled && /* @__PURE__ */ ((branchScopesStack = [], branchStarts = [], orphanBranches = [], curBranchScopes) => {
+          return (branchId, branch, childBranch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length) => {
+            if (visitType !== "[" /* BranchStart */) {
+              visitScope["Getter:" /* Getter */ + nextToken(
+                /* read accessor */
+              )] = /* @__PURE__ */ ((node) => () => node)(
+                visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? parent : visit
+              );
+              accessor = "BranchScopes:" /* BranchScopes */ + lastToken;
+              singleNode = visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */;
+              nextToken(
+                /* read optional first branchId */
+              );
+            }
             while (branchId = +lastToken) {
               (endedBranches ||= []).push(
                 branch = scopeLookup[branchId] ||= {
@@ -592,33 +593,16 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 visitScope[accessor] = endedBranches.length > 1 ? endedBranches.reverse() : endedBranches[0];
               }
             }
-          };
-          return () => {
             if (visitType === "[" /* BranchStart */) {
-              if (lastToken) {
-                endBranch();
-              } else {
+              if (!endedBranches) {
                 branchScopesStack.push(curBranchScopes);
                 curBranchScopes = void 0;
               }
               branchStarts.push(visit);
-            } else {
-              visitScope["Getter:" /* Getter */ + nextToken(
-                /* read accessor */
-              )] = /* @__PURE__ */ ((node) => () => node)(
-                visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? visit.parentNode : visit
-              );
-              endBranch(
-                "BranchScopes:" /* BranchScopes */ + lastToken,
-                (nextToken(
-                  /* read optional first branchId */
-                ), visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */)
-              );
             }
           };
         })();
         let $global;
-        let lastScopeId = 0;
         let lastEffect;
         let visits;
         let resumes;
@@ -628,12 +612,13 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         let visitScope;
         let lastToken;
         let lastTokenIndex;
+        let lastScopeId = 0;
         const nextToken = () => lastToken = visitText.slice(
           lastTokenIndex,
           // eslint-disable-next-line no-cond-assign
           (lastTokenIndex = visitText.indexOf(" ", lastTokenIndex) + 1) ? lastTokenIndex - 1 : visitText.length
         );
-        render.w = () => {
+        render.w = (effects = []) => {
           try {
             walk2();
             isResuming = 1;
@@ -641,11 +626,11 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
               if (typeof serialized === "string") {
                 lastEffect = serialized;
               } else if (typeof serialized === "number") {
-                queueEffect(
+                effects.push(
+                  registeredValues[lastEffect],
                   scopeLookup[serialized] ||= {
                     ["#Id" /* Id */]: serialized
-                  },
-                  registeredValues[lastEffect]
+                  }
                 );
               } else {
                 for (const scope of serialized(serializeContext)) {
@@ -680,7 +665,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 visitBranches();
               }
             }
-            run();
+            runEffects(effects);
           } finally {
             isResuming = visits.length = resumes.length = 0;
           }

package/dist/debug/dom.mjs

@@ -432,19 +432,20 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         const serializeContext = {
           _: registeredValues
         };
-        const visitBranches = branchesEnabled && /* @__PURE__ */ (() => {
-          let curBranchScopes;
-          const branchScopesStack = [];
-          const branchStarts = [];
-          const orphanBranches = [];
-          const endBranch = (accessor, singleNode) => {
-            const parent = visit.parentNode;
-            let startVisit = visit;
-            let i = orphanBranches.length;
-            let branchId;
-            let branch;
-            let childBranch;
-            let endedBranches;
+        const visitBranches = branchesEnabled && /* @__PURE__ */ ((branchScopesStack = [], branchStarts = [], orphanBranches = [], curBranchScopes) => {
+          return (branchId, branch, childBranch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length) => {
+            if (visitType !== "[" /* BranchStart */) {
+              visitScope["Getter:" /* Getter */ + nextToken(
+                /* read accessor */
+              )] = /* @__PURE__ */ ((node) => () => node)(
+                visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? parent : visit
+              );
+              accessor = "BranchScopes:" /* BranchScopes */ + lastToken;
+              singleNode = visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */;
+              nextToken(
+                /* read optional first branchId */
+              );
+            }
             while (branchId = +lastToken) {
               (endedBranches ||= []).push(
                 branch = scopeLookup[branchId] ||= {
@@ -489,33 +490,16 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 visitScope[accessor] = endedBranches.length > 1 ? endedBranches.reverse() : endedBranches[0];
               }
             }
-          };
-          return () => {
             if (visitType === "[" /* BranchStart */) {
-              if (lastToken) {
-                endBranch();
-              } else {
+              if (!endedBranches) {
                 branchScopesStack.push(curBranchScopes);
                 curBranchScopes = void 0;
               }
               branchStarts.push(visit);
-            } else {
-              visitScope["Getter:" /* Getter */ + nextToken(
-                /* read accessor */
-              )] = /* @__PURE__ */ ((node) => () => node)(
-                visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? visit.parentNode : visit
-              );
-              endBranch(
-                "BranchScopes:" /* BranchScopes */ + lastToken,
-                (nextToken(
-                  /* read optional first branchId */
-                ), visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */)
-              );
             }
           };
         })();
         let $global;
-        let lastScopeId = 0;
         let lastEffect;
         let visits;
         let resumes;
@@ -525,12 +509,13 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         let visitScope;
         let lastToken;
         let lastTokenIndex;
+        let lastScopeId = 0;
         const nextToken = () => lastToken = visitText.slice(
           lastTokenIndex,
           // eslint-disable-next-line no-cond-assign
           (lastTokenIndex = visitText.indexOf(" ", lastTokenIndex) + 1) ? lastTokenIndex - 1 : visitText.length
         );
-        render.w = () => {
+        render.w = (effects = []) => {
           try {
             walk2();
             isResuming = 1;
@@ -538,11 +523,11 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
               if (typeof serialized === "string") {
                 lastEffect = serialized;
               } else if (typeof serialized === "number") {
-                queueEffect(
+                effects.push(
+                  registeredValues[lastEffect],
                   scopeLookup[serialized] ||= {
                     ["#Id" /* Id */]: serialized
-                  },
-                  registeredValues[lastEffect]
+                  }
                 );
               } else {
                 for (const scope of serialized(serializeContext)) {
@@ -577,7 +562,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 visitBranches();
               }
             }
-            run();
+            runEffects(effects);
           } finally {
             isResuming = visits.length = resumes.length = 0;
           }

package/dist/dom.js

@@ -342,60 +342,51 @@ function init(runtimeId = "M") {
       value: resumeRender = ((renderId) => {
         let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, scopeLookup = render.s = {}, serializeContext = {
           _: registeredValues
-        }, visitBranches = branchesEnabled && /* @__PURE__ */ (() => {
-          let curBranchScopes, branchScopesStack = [], branchStarts = [], orphanBranches = [], endBranch = (accessor, singleNode) => {
-            let parent = visit.parentNode, startVisit = visit, i = orphanBranches.length, branchId, branch, childBranch, endedBranches;
-            for (; branchId = +lastToken; ) {
-              if ((endedBranches ||= []).push(
-                branch = scopeLookup[branchId] ||= {
-                  L: branchId
-                }
-              ), branch.F = branch, singleNode) {
-                for (; startVisit.previousSibling && ~visits.indexOf(
-                  startVisit = startVisit.previousSibling
-                ); ) ;
-                branch.K = branch.S = startVisit, visitType === "'" /* BranchEndNativeTag */ && (branch.a = startVisit);
-              } else
-                curBranchScopes = push(curBranchScopes, branch), accessor && (visitScope[accessor] = curBranchScopes, curBranchScopes = branchScopesStack.pop()), startVisit = branchStarts.pop(), parent !== startVisit.parentNode && parent.prepend(startVisit), branch.S = startVisit, branch.K = visit.previousSibling === startVisit ? startVisit : parent.insertBefore(new Text(), visit);
-              for (; i && orphanBranches[--i].L > branchId; )
-                (childBranch = orphanBranches.pop()).N = branch, (branch.D ||= /* @__PURE__ */ new Set()).add(
-                  childBranch
-                );
-              nextToken(
-                /* read optional next branchId */
+        }, visitBranches = branchesEnabled && /* @__PURE__ */ ((branchScopesStack = [], branchStarts = [], orphanBranches = [], curBranchScopes) => (branchId, branch, childBranch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length) => {
+          for (visitType !== "[" /* BranchStart */ && (visitScope["J" /* Getter */ + nextToken(
+            /* read accessor */
+          )] = /* @__PURE__ */ ((node) => () => node)(
+            visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? parent : visit
+          ), accessor = "A" /* BranchScopes */ + lastToken, singleNode = visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */, nextToken(
+            /* read optional first branchId */
+          )); branchId = +lastToken; ) {
+            if ((endedBranches ||= []).push(
+              branch = scopeLookup[branchId] ||= {
+                L: branchId
+              }
+            ), branch.F = branch, singleNode) {
+              for (; startVisit.previousSibling && ~visits.indexOf(
+                startVisit = startVisit.previousSibling
+              ); ) ;
+              branch.K = branch.S = startVisit, visitType === "'" /* BranchEndNativeTag */ && (branch.a = startVisit);
+            } else
+              curBranchScopes = push(curBranchScopes, branch), accessor && (visitScope[accessor] = curBranchScopes, curBranchScopes = branchScopesStack.pop()), startVisit = branchStarts.pop(), parent !== startVisit.parentNode && parent.prepend(startVisit), branch.S = startVisit, branch.K = visit.previousSibling === startVisit ? startVisit : parent.insertBefore(new Text(), visit);
+            for (; i && orphanBranches[--i].L > branchId; )
+              (childBranch = orphanBranches.pop()).N = branch, (branch.D ||= /* @__PURE__ */ new Set()).add(
+                childBranch
               );
-            }
-            endedBranches && (orphanBranches.push(...endedBranches), singleNode && (visitScope[accessor] = endedBranches.length > 1 ? endedBranches.reverse() : endedBranches[0]));
-          };
-          return () => {
-            visitType === "[" /* BranchStart */ ? (lastToken ? endBranch() : (branchScopesStack.push(curBranchScopes), curBranchScopes = void 0), branchStarts.push(visit)) : (visitScope["J" /* Getter */ + nextToken(
-              /* read accessor */
-            )] = /* @__PURE__ */ ((node) => () => node)(
-              visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? visit.parentNode : visit
-            ), endBranch(
-              "A" /* BranchScopes */ + lastToken,
-              (nextToken(
-                /* read optional first branchId */
-              ), visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */)
-            ));
-          };
-        })(), $global, lastScopeId = 0, lastEffect, visits, resumes, visit, visitText, visitType, visitScope, lastToken, lastTokenIndex, nextToken = () => lastToken = visitText.slice(
+            nextToken(
+              /* read optional next branchId */
+            );
+          }
+          endedBranches && (orphanBranches.push(...endedBranches), singleNode && (visitScope[accessor] = endedBranches.length > 1 ? endedBranches.reverse() : endedBranches[0])), visitType === "[" /* BranchStart */ && (endedBranches || (branchScopesStack.push(curBranchScopes), curBranchScopes = void 0), branchStarts.push(visit));
+        })(), $global, lastEffect, visits, resumes, visit, visitText, visitType, visitScope, lastToken, lastTokenIndex, lastScopeId = 0, nextToken = () => lastToken = visitText.slice(
           lastTokenIndex,
           // eslint-disable-next-line no-cond-assign
           (lastTokenIndex = visitText.indexOf(" ", lastTokenIndex) + 1) ? lastTokenIndex - 1 : visitText.length
         );
-        return render.w = () => {
+        return render.w = (effects = []) => {
           try {
             walk2(), isResuming = 1;
             for (let serialized of resumes = render.r || [])
               if (typeof serialized == "string")
                 lastEffect = serialized;
               else if (typeof serialized == "number")
-                queueEffect(
+                effects.push(
+                  registeredValues[lastEffect],
                   scopeLookup[serialized] ||= {
                     L: serialized
-                  },
-                  registeredValues[lastEffect]
+                  }
                 );
               else
                 for (let scope of serialized(serializeContext))
@@ -406,7 +397,7 @@ function init(runtimeId = "M") {
               )] ||= {
                 L: +lastToken
               }, visitType === "*" /* Node */ ? visitScope["J" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling) : branchesEnabled && visitBranches();
-            run();
+            runEffects(effects);
           } finally {
             isResuming = visits.length = resumes.length = 0;
           }

package/dist/dom.mjs

@@ -242,60 +242,51 @@ function init(runtimeId = "M") {
       value: resumeRender = ((renderId) => {
         let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, scopeLookup = render.s = {}, serializeContext = {
           _: registeredValues
-        }, visitBranches = branchesEnabled && /* @__PURE__ */ (() => {
-          let curBranchScopes, branchScopesStack = [], branchStarts = [], orphanBranches = [], endBranch = (accessor, singleNode) => {
-            let parent = visit.parentNode, startVisit = visit, i = orphanBranches.length, branchId, branch, childBranch, endedBranches;
-            for (; branchId = +lastToken; ) {
-              if ((endedBranches ||= []).push(
-                branch = scopeLookup[branchId] ||= {
-                  L: branchId
-                }
-              ), branch.F = branch, singleNode) {
-                for (; startVisit.previousSibling && ~visits.indexOf(
-                  startVisit = startVisit.previousSibling
-                ); ) ;
-                branch.K = branch.S = startVisit, visitType === "'" /* BranchEndNativeTag */ && (branch.a = startVisit);
-              } else
-                curBranchScopes = push(curBranchScopes, branch), accessor && (visitScope[accessor] = curBranchScopes, curBranchScopes = branchScopesStack.pop()), startVisit = branchStarts.pop(), parent !== startVisit.parentNode && parent.prepend(startVisit), branch.S = startVisit, branch.K = visit.previousSibling === startVisit ? startVisit : parent.insertBefore(new Text(), visit);
-              for (; i && orphanBranches[--i].L > branchId; )
-                (childBranch = orphanBranches.pop()).N = branch, (branch.D ||= /* @__PURE__ */ new Set()).add(
-                  childBranch
-                );
-              nextToken(
-                /* read optional next branchId */
+        }, visitBranches = branchesEnabled && /* @__PURE__ */ ((branchScopesStack = [], branchStarts = [], orphanBranches = [], curBranchScopes) => (branchId, branch, childBranch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length) => {
+          for (visitType !== "[" /* BranchStart */ && (visitScope["J" /* Getter */ + nextToken(
+            /* read accessor */
+          )] = /* @__PURE__ */ ((node) => () => node)(
+            visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? parent : visit
+          ), accessor = "A" /* BranchScopes */ + lastToken, singleNode = visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */, nextToken(
+            /* read optional first branchId */
+          )); branchId = +lastToken; ) {
+            if ((endedBranches ||= []).push(
+              branch = scopeLookup[branchId] ||= {
+                L: branchId
+              }
+            ), branch.F = branch, singleNode) {
+              for (; startVisit.previousSibling && ~visits.indexOf(
+                startVisit = startVisit.previousSibling
+              ); ) ;
+              branch.K = branch.S = startVisit, visitType === "'" /* BranchEndNativeTag */ && (branch.a = startVisit);
+            } else
+              curBranchScopes = push(curBranchScopes, branch), accessor && (visitScope[accessor] = curBranchScopes, curBranchScopes = branchScopesStack.pop()), startVisit = branchStarts.pop(), parent !== startVisit.parentNode && parent.prepend(startVisit), branch.S = startVisit, branch.K = visit.previousSibling === startVisit ? startVisit : parent.insertBefore(new Text(), visit);
+            for (; i && orphanBranches[--i].L > branchId; )
+              (childBranch = orphanBranches.pop()).N = branch, (branch.D ||= /* @__PURE__ */ new Set()).add(
+                childBranch
               );
-            }
-            endedBranches && (orphanBranches.push(...endedBranches), singleNode && (visitScope[accessor] = endedBranches.length > 1 ? endedBranches.reverse() : endedBranches[0]));
-          };
-          return () => {
-            visitType === "[" /* BranchStart */ ? (lastToken ? endBranch() : (branchScopesStack.push(curBranchScopes), curBranchScopes = void 0), branchStarts.push(visit)) : (visitScope["J" /* Getter */ + nextToken(
-              /* read accessor */
-            )] = /* @__PURE__ */ ((node) => () => node)(
-              visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? visit.parentNode : visit
-            ), endBranch(
-              "A" /* BranchScopes */ + lastToken,
-              (nextToken(
-                /* read optional first branchId */
-              ), visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */)
-            ));
-          };
-        })(), $global, lastScopeId = 0, lastEffect, visits, resumes, visit, visitText, visitType, visitScope, lastToken, lastTokenIndex, nextToken = () => lastToken = visitText.slice(
+            nextToken(
+              /* read optional next branchId */
+            );
+          }
+          endedBranches && (orphanBranches.push(...endedBranches), singleNode && (visitScope[accessor] = endedBranches.length > 1 ? endedBranches.reverse() : endedBranches[0])), visitType === "[" /* BranchStart */ && (endedBranches || (branchScopesStack.push(curBranchScopes), curBranchScopes = void 0), branchStarts.push(visit));
+        })(), $global, lastEffect, visits, resumes, visit, visitText, visitType, visitScope, lastToken, lastTokenIndex, lastScopeId = 0, nextToken = () => lastToken = visitText.slice(
           lastTokenIndex,
           // eslint-disable-next-line no-cond-assign
           (lastTokenIndex = visitText.indexOf(" ", lastTokenIndex) + 1) ? lastTokenIndex - 1 : visitText.length
         );
-        return render.w = () => {
+        return render.w = (effects = []) => {
           try {
             walk2(), isResuming = 1;
             for (let serialized of resumes = render.r || [])
               if (typeof serialized == "string")
                 lastEffect = serialized;
               else if (typeof serialized == "number")
-                queueEffect(
+                effects.push(
+                  registeredValues[lastEffect],
                   scopeLookup[serialized] ||= {
                     L: serialized
-                  },
-                  registeredValues[lastEffect]
+                  }
                 );
               else
                 for (let scope of serialized(serializeContext))
@@ -306,7 +297,7 @@ function init(runtimeId = "M") {
               )] ||= {
                 L: +lastToken
               }, visitType === "*" /* Node */ ? visitScope["J" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling) : branchesEnabled && visitBranches();
-            run();
+            runEffects(effects);
           } finally {
             isResuming = visits.length = resumes.length = 0;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/runtime-tags",
-  "version": "6.0.110",
+  "version": "6.0.111",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",