marko 5.36.2 → 5.36.4

package/dist/runtime/html/AsyncStream.js

@@ -147,29 +147,50 @@ var proto = AsyncStream.prototype = {
       };
     } else {
       let done = false;
-      let pending = deferred();
+      let error = noop; // Used as a identity object reference.
+      let pending;
       const stream = {
         write(data) {
           buffer += data;
         },
         end() {
           done = true;
-          pending.resolve({
-            value: "",
-            done
-          });
+
+          if (pending) {
+            pending.resolve(
+              buffer ?
+              {
+                value: buffer,
+                done: false
+              } :
+              {
+                value: undefined,
+                done: true
+              }
+            );
+            pending = undefined;
+          }
         },
         flush() {
-          pending.resolve({
-            value: buffer,
-            done: false
-          });
-          buffer = "";
-          pending = deferred();
+          if (pending) {
+            pending.resolve({
+              value: buffer,
+              done: false
+            });
+            buffer = "";
+            pending = undefined;
+          }
         }
       };
 
-      this.on("error", pending.reject);
+      this.once("error", (err) => {
+        error = err;
+
+        if (pending) {
+          pending.reject(error);
+          pending = undefined;
+        }
+      });
 
       const writer = new BufferedWriter(stream);
       writer.stream = originalWriter.stream;
@@ -182,11 +203,20 @@ var proto = AsyncStream.prototype = {
       this._state.writer = writer;
 
       iteratorNextFn = async () => {
-        if (buffer || done) {
+        if (error !== noop) {
+          throw error;
+        } else if (buffer) {
           const value = buffer;
           buffer = "";
-          return { value, done };
+          return { value, done: false };
+        } else if (done) {
+          return { value: undefined, done: true };
+        }
+
+        if (!pending) {
+          pending = deferred();
         }
+
         return pending.promise;
       };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "5.36.2",
+  "version": "5.36.4",
   "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
   "keywords": [
     "front-end",
@@ -66,8 +66,8 @@
     "build": "babel ./src --out-dir ./dist --extensions .js --copy-files --config-file ../../babel.config.js --env-name=production"
   },
   "dependencies": {
-    "@marko/compiler": "^5.38.2",
-    "@marko/translator-default": "^6.1.1",
+    "@marko/compiler": "^5.38.3",
+    "@marko/translator-default": "^6.1.2",
     "app-module-path": "^2.2.0",
     "argly": "^1.2.0",
     "browser-refresh-client": "1.1.4",

package/src/runtime/html/AsyncStream.js

@@ -147,29 +147,50 @@ var proto = (AsyncStream.prototype = {
       };
     } else {
       let done = false;
-      let pending = deferred();
+      let error = noop; // Used as a identity object reference.
+      let pending;
       const stream = {
         write(data) {
           buffer += data;
         },
         end() {
           done = true;
-          pending.resolve({
-            value: "",
-            done,
-          });
+
+          if (pending) {
+            pending.resolve(
+              buffer
+                ? {
+                    value: buffer,
+                    done: false,
+                  }
+                : {
+                    value: undefined,
+                    done: true,
+                  },
+            );
+            pending = undefined;
+          }
         },
         flush() {
-          pending.resolve({
-            value: buffer,
-            done: false,
-          });
-          buffer = "";
-          pending = deferred();
+          if (pending) {
+            pending.resolve({
+              value: buffer,
+              done: false,
+            });
+            buffer = "";
+            pending = undefined;
+          }
         },
       };
 
-      this.on("error", pending.reject);
+      this.once("error", (err) => {
+        error = err;
+
+        if (pending) {
+          pending.reject(error);
+          pending = undefined;
+        }
+      });
 
       const writer = new BufferedWriter(stream);
       writer.stream = originalWriter.stream;
@@ -182,11 +203,20 @@ var proto = (AsyncStream.prototype = {
       this._state.writer = writer;
 
       iteratorNextFn = async () => {
-        if (buffer || done) {
+        if (error !== noop) {
+          throw error;
+        } else if (buffer) {
           const value = buffer;
           buffer = "";
-          return { value, done };
+          return { value, done: false };
+        } else if (done) {
+          return { value: undefined, done: true };
+        }
+
+        if (!pending) {
+          pending = deferred();
         }
+
         return pending.promise;
       };
     }