fix: in/out of order await nesting

marko-js · Feb 21, 2025 · d08be40 · d08be40
1 parent 136bb14
commit d08be40
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/.changeset/sour-cherries-allow.md b/.changeset/sour-cherries-allow.md
@@ -0,0 +1,5 @@
+---
+"marko": patch
+---
+
+Fix issue with nesting out of order awaits inside of in order awaits.
diff --git a/packages/runtime-class/src/core-tags/core/await/renderer.js b/packages/runtime-class/src/core-tags/core/await/renderer.js
@@ -113,6 +113,7 @@ module.exports = function awaitTag(input, out) {
     clientReorderContext =
       out.global.___clientReorderContext ||
       (out.global.___clientReorderContext = {
+        handleAwait: undefined,
         instances: [],
         nextId: 0,
       });
@@ -158,7 +159,9 @@ module.exports = function awaitTag(input, out) {
       oldEmit.apply(asyncOut, arguments);
     };
 
-    if (clientReorderContext.instances) {
+    if (clientReorderContext.handleAwait) {
+      clientReorderContext.handleAwait(awaitInfo);
+    } else {
       clientReorderContext.instances.push(awaitInfo);
     }
 

diff --git a/packages/runtime-class/src/core-tags/core/await/reorderer-renderer.js b/packages/runtime-class/src/core-tags/core/await/reorderer-renderer.js
@@ -143,14 +143,13 @@ module.exports = function (input, out) {
     }
 
     awaitContext.instances.forEach(handleAwait);
-
-    out.on("await:clientReorder", function (awaitInfo) {
+    awaitContext.handleAwait = function (awaitInfo) {
       remaining++;
       handleAwait(awaitInfo);
-    });
+    };
 
     // Now that we have a listener attached, we want to receive any additional
-    // out-of-sync instances via an event
-    delete awaitContext.instances;
+    // out-of-sync instances via the method
+    awaitContext.instances = undefined;
   });
 };