react-markup 0.0.0-experimental-6ebfd5b0-20240818 → 0.0.0-experimental-a960b92c-20240819

package/cjs/react-markup.development.js

@@ -8511,5 +8511,5 @@
         });
       });
     };
-    exports.version = "19.0.0-experimental-6ebfd5b0-20240818";
+    exports.version = "19.0.0-experimental-a960b92c-20240819";
   })();

package/cjs/react-markup.production.js

@@ -5617,4 +5617,4 @@ exports.experimental_renderToHTML = function (children, options) {
     });
   });
 };
-exports.version = "19.0.0-experimental-6ebfd5b0-20240818";
+exports.version = "19.0.0-experimental-a960b92c-20240819";

package/cjs/react-markup.react-server.development.js

@@ -760,6 +760,7 @@
     }
     function defaultPostponeHandler() {}
     function RequestInstance$1(
+      type,
       model,
       bundlerConfig,
       onError,
@@ -784,7 +785,8 @@
         pingedTasks = [],
         cleanupQueue = [];
       TaintRegistryPendingRequests.add(cleanupQueue);
-      this.status = 0;
+      this.type = type;
+      this.status = 10;
       this.flushScheduled = !1;
       this.destination = this.fatalError = null;
       this.bundlerConfig = bundlerConfig;
@@ -809,8 +811,8 @@
       this.onError = void 0 === onError ? defaultErrorHandler$1 : onError;
       this.onPostpone =
         void 0 === onPostpone ? defaultPostponeHandler : onPostpone;
-      this.onAllReady = void 0 === onAllReady ? noop$3 : onAllReady;
-      this.onFatalError = void 0 === onFatalError ? noop$3 : onFatalError;
+      this.onAllReady = onAllReady;
+      this.onFatalError = onFatalError;
       this.environmentName =
         void 0 === environmentName
           ? function () {
@@ -826,8 +828,8 @@
           ? defaultFilterStackFrame
           : filterStackFrame;
       this.didWarnForKey = null;
-      model = createTask(this, model, null, !1, abortSet, null, null, null);
-      pingedTasks.push(model);
+      type = createTask(this, model, null, !1, abortSet, null, null, null);
+      pingedTasks.push(type);
     }
     function noop$3() {}
     function serializeThenable(request, task, thenable) {
@@ -871,14 +873,8 @@
             return (
               request.abortableTasks.delete(newTask),
               (newTask.status = ABORTED$1),
-              request.fatalError === haltSymbol
-                ? emitModelChunk(
-                    request,
-                    newTask.id,
-                    reusableInfinitePromiseModel
-                  )
-                : ((task = stringify(serializeByValueID$1(request.fatalError))),
-                  emitModelChunk(request, newTask.id, task)),
+              (task = stringify(serializeByValueID$1(request.fatalError))),
+              emitModelChunk(request, newTask.id, task),
               newTask.id
             );
           "string" !== typeof thenable.status &&
@@ -923,7 +919,7 @@
       function progress(entry) {
         if (!aborted)
           if (entry.done)
-            request.abortListeners.delete(error),
+            request.abortListeners.delete(abortStream),
               (entry = streamTask.id.toString(16) + ":C\n"),
               request.completedRegularChunks.push(entry),
               enqueueFlush(request),
@@ -942,25 +938,35 @@
       function error(reason) {
         if (!aborted) {
           aborted = !0;
-          request.abortListeners.delete(error);
-          if (request.fatalError === haltSymbol) var cancelWith = reason;
+          request.abortListeners.delete(abortStream);
+          var digest = logRecoverableError$1(request, reason, streamTask);
+          emitErrorChunk(request, streamTask.id, digest, reason);
+          enqueueFlush(request);
+          reader.cancel(reason).then(error, error);
+        }
+      }
+      function abortStream(reason) {
+        if (!aborted) {
+          aborted = !0;
+          request.abortListeners.delete(abortStream);
+          if (
+            "object" === typeof reason &&
+            null !== reason &&
+            reason.$$typeof === REACT_POSTPONE_TYPE
+          )
+            logPostpone$1(request, reason.message, streamTask),
+              request.type === PRERENDER
+                ? request.pendingChunks--
+                : (emitPostponeChunk(request, streamTask.id, reason),
+                  enqueueFlush(request));
           else {
-            if (
-              "object" === typeof reason &&
-              null !== reason &&
-              reason.$$typeof === REACT_POSTPONE_TYPE
-            )
-              (cancelWith = reason),
-                logPostpone$1(request, reason.message, streamTask),
-                emitPostponeChunk(request, streamTask.id, reason);
-            else {
-              cancelWith = reason;
-              var digest = logRecoverableError$1(request, reason, streamTask);
-              emitErrorChunk(request, streamTask.id, digest, reason);
-            }
-            enqueueFlush(request);
+            var digest = logRecoverableError$1(request, reason, streamTask);
+            request.type === PRERENDER
+              ? request.pendingChunks--
+              : (emitErrorChunk(request, streamTask.id, digest, reason),
+                enqueueFlush(request));
           }
-          reader.cancel(cancelWith).then(error, error);
+          reader.cancel(reason).then(error, error);
         }
       }
       var supportsBYOB = stream.supportsBYOB;
@@ -987,7 +993,7 @@
         streamTask.id.toString(16) + ":" + (supportsBYOB ? "r" : "R") + "\n";
       request.completedRegularChunks.push(task);
       var aborted = !1;
-      request.abortListeners.add(error);
+      request.abortListeners.add(abortStream);
       reader.read().then(progress, error);
       return serializeByValueID$1(streamTask.id);
     }
@@ -995,7 +1001,7 @@
       function progress(entry) {
         if (!aborted)
           if (entry.done) {
-            request.abortListeners.delete(error);
+            request.abortListeners.delete(abortIterable);
             if (void 0 === entry.value)
               var endStreamRow = streamTask.id.toString(16) + ":C\n";
             else
@@ -1027,26 +1033,37 @@
       function error(reason) {
         if (!aborted) {
           aborted = !0;
-          request.abortListeners.delete(error);
-          if (request.fatalError === haltSymbol) var throwWith = reason;
+          request.abortListeners.delete(abortIterable);
+          var digest = logRecoverableError$1(request, reason, streamTask);
+          emitErrorChunk(request, streamTask.id, digest, reason);
+          enqueueFlush(request);
+          "function" === typeof iterator.throw &&
+            iterator.throw(reason).then(error, error);
+        }
+      }
+      function abortIterable(reason) {
+        if (!aborted) {
+          aborted = !0;
+          request.abortListeners.delete(abortIterable);
+          if (
+            "object" === typeof reason &&
+            null !== reason &&
+            reason.$$typeof === REACT_POSTPONE_TYPE
+          )
+            logPostpone$1(request, reason.message, streamTask),
+              request.type === PRERENDER
+                ? request.pendingChunks--
+                : (emitPostponeChunk(request, streamTask.id, reason),
+                  enqueueFlush(request));
           else {
-            if (
-              "object" === typeof reason &&
-              null !== reason &&
-              reason.$$typeof === REACT_POSTPONE_TYPE
-            )
-              (throwWith = reason),
-                logPostpone$1(request, reason.message, streamTask),
-                emitPostponeChunk(request, streamTask.id, reason);
-            else {
-              throwWith = reason;
-              var digest = logRecoverableError$1(request, reason, streamTask);
-              emitErrorChunk(request, streamTask.id, digest, reason);
-            }
-            enqueueFlush(request);
+            var digest = logRecoverableError$1(request, reason, streamTask);
+            request.type === PRERENDER
+              ? request.pendingChunks--
+              : (emitErrorChunk(request, streamTask.id, digest, reason),
+                enqueueFlush(request));
           }
           "function" === typeof iterator.throw &&
-            iterator.throw(throwWith).then(error, error);
+            iterator.throw(reason).then(error, error);
         }
       }
       var isIterator = iterable === iterator,
@@ -1067,7 +1084,7 @@
       (iterable = iterable._debugInfo) &&
         forwardDebugInfo(request, streamTask.id, iterable);
       var aborted = !1;
-      request.abortListeners.add(error);
+      request.abortListeners.add(abortIterable);
       callIteratorInDEV(iterator, progress, error);
       return serializeByValueID$1(streamTask.id);
     }
@@ -1579,7 +1596,7 @@
       function progress(entry) {
         if (!aborted)
           if (entry.done)
-            request.abortListeners.delete(error),
+            request.abortListeners.delete(abortBlob),
               (aborted = !0),
               pingTask$1(request, newTask);
           else
@@ -1590,16 +1607,35 @@
       function error(reason) {
         if (!aborted) {
           aborted = !0;
-          request.abortListeners.delete(error);
-          if (request.fatalError === haltSymbol) var cancelWith = reason;
+          request.abortListeners.delete(abortBlob);
+          var digest = logRecoverableError$1(request, reason, newTask);
+          emitErrorChunk(request, newTask.id, digest, reason);
+          enqueueFlush(request);
+          reader.cancel(reason).then(error, error);
+        }
+      }
+      function abortBlob(reason) {
+        if (!aborted) {
+          aborted = !0;
+          request.abortListeners.delete(abortBlob);
+          if (
+            "object" === typeof reason &&
+            null !== reason &&
+            reason.$$typeof === REACT_POSTPONE_TYPE
+          )
+            logPostpone$1(request, reason.message, newTask),
+              request.type === PRERENDER
+                ? request.pendingChunks--
+                : (emitPostponeChunk(request, newTask.id, reason),
+                  enqueueFlush(request));
           else {
-            cancelWith = reason;
             var digest = logRecoverableError$1(request, reason, newTask);
-            emitErrorChunk(request, newTask.id, digest, reason);
-            request.abortableTasks.delete(newTask);
-            enqueueFlush(request);
+            request.type === PRERENDER
+              ? request.pendingChunks--
+              : (emitErrorChunk(request, newTask.id, digest, reason),
+                enqueueFlush(request));
           }
-          reader.cancel(cancelWith).then(error, error);
+          reader.cancel(reason).then(error, error);
         }
       }
       var model = [blob.type],
@@ -1615,7 +1651,7 @@
         ),
         reader = blob.stream().getReader(),
         aborted = !1;
-      request.abortListeners.add(error);
+      request.abortListeners.add(abortBlob);
       reader.read().then(progress).catch(error);
       return "$B" + newTask.id.toString(16);
     }
@@ -1649,14 +1685,12 @@
             : thrownValue;
         if ("object" === typeof key && null !== key) {
           if ("function" === typeof key.then) {
-            if (request.status === ABORTING$1) {
-              task.status = ABORTED$1;
-              if (request.fatalError === haltSymbol) return "$@";
-              task = request.fatalError;
-              return parent
-                ? "$L" + task.toString(16)
-                : serializeByValueID$1(task);
-            }
+            if (request.status === ABORTING$1)
+              return (
+                (task.status = ABORTED$1),
+                (task = request.fatalError),
+                parent ? "$L" + task.toString(16) : serializeByValueID$1(task)
+              );
             request = createTask(
               request,
               task.model,
@@ -1687,12 +1721,12 @@
               parent ? "$L" + value.toString(16) : serializeByValueID$1(value)
             );
         }
-        if (request.status === ABORTING$1) {
-          task.status = ABORTED$1;
-          if (request.fatalError === haltSymbol) return "$@";
-          task = request.fatalError;
-          return parent ? "$L" + task.toString(16) : serializeByValueID$1(task);
-        }
+        if (request.status === ABORTING$1)
+          return (
+            (task.status = ABORTED$1),
+            (task = request.fatalError),
+            parent ? "$L" + task.toString(16) : serializeByValueID$1(task)
+          );
         task.keyPath = prevKeyPath;
         task.implicitSlot = prevImplicitSlot;
         request.pendingChunks++;
@@ -2428,18 +2462,8 @@
               if (request.status === ABORTING$1) {
                 request.abortableTasks.delete(task);
                 task.status = ABORTED$1;
-                if (request.fatalError === haltSymbol)
-                  emitModelChunk(
-                    request,
-                    task.id,
-                    reusableInfinitePromiseModel
-                  );
-                else {
-                  var model = stringify(
-                    serializeByValueID$1(request.fatalError)
-                  );
-                  emitModelChunk(request, task.id, model);
-                }
+                var model = stringify(serializeByValueID$1(request.fatalError));
+                emitModelChunk(request, task.id, model);
                 return;
               }
               task.status = PENDING$3;
@@ -2456,18 +2480,12 @@
               return;
             }
           }
-          if (request.status === ABORTING$1)
-            if (
-              (request.abortableTasks.delete(task),
-              (task.status = ABORTED$1),
-              request.fatalError === haltSymbol)
-            )
-              emitModelChunk(request, task.id, reusableInfinitePromiseModel);
-            else {
-              var _model = stringify(serializeByValueID$1(request.fatalError));
-              emitModelChunk(request, task.id, _model);
-            }
-          else {
+          if (request.status === ABORTING$1) {
+            request.abortableTasks.delete(task);
+            task.status = ABORTED$1;
+            var _model = stringify(serializeByValueID$1(request.fatalError));
+            emitModelChunk(request, task.id, _model);
+          } else {
             request.abortableTasks.delete(task);
             task.status = ERRORED$2;
             var digest = logRecoverableError$1(request, x, task);
@@ -2492,6 +2510,7 @@
       ReactSharedInternalsServer.H = HooksDispatcher$1;
       var prevRequest = currentRequest;
       currentRequest$1 = currentRequest = request;
+      var hadAbortableTasks = 0 < request.abortableTasks.size;
       try {
         var pingedTasks = request.pingedTasks;
         request.pingedTasks = [];
@@ -2499,7 +2518,7 @@
           retryTask$1(request, pingedTasks[i]);
         null !== request.destination &&
           flushCompletedChunks(request, request.destination);
-        if (0 === request.abortableTasks.size) {
+        if (hadAbortableTasks && 0 === request.abortableTasks.size) {
           var onAllReady = request.onAllReady;
           onAllReady();
         }
@@ -2588,10 +2607,9 @@
     }
     function abort$1(request, reason) {
       try {
-        0 === request.status && (request.status = ABORTING$1);
+        10 === request.status && (request.status = ABORTING$1);
         var abortableTasks = request.abortableTasks;
         if (0 < abortableTasks.size) {
-          request.pendingChunks++;
           var errorId = request.nextChunkId++;
           request.fatalError = errorId;
           if (
@@ -2600,7 +2618,9 @@
             reason.$$typeof === REACT_POSTPONE_TYPE
           )
             logPostpone$1(request, reason.message, null),
-              emitPostponeChunk(request, errorId, reason);
+              request.type === PRERENDER &&
+                (request.pendingChunks++,
+                emitPostponeChunk(request, errorId, reason));
           else {
             var error =
                 void 0 === reason
@@ -2615,7 +2635,9 @@
                       )
                     : reason,
               digest = logRecoverableError$1(request, error, null);
-            emitErrorChunk(request, errorId, digest, error);
+            20 === request.type &&
+              (request.pendingChunks++,
+              emitErrorChunk(request, errorId, digest, error));
           }
           abortableTasks.forEach(function (task) {
             if (task.status !== RENDERING$1) {
@@ -2626,6 +2648,8 @@
             }
           });
           abortableTasks.clear();
+          var onAllReady = request.onAllReady;
+          onAllReady();
         }
         var abortListeners = request.abortListeners;
         if (0 < abortListeners.size) {
@@ -3380,7 +3404,7 @@
         }
       return null;
     }
-    function Chunk(status, value, reason, response) {
+    function ReactPromise(status, value, reason, response) {
       this.status = status;
       this.value = value;
       this.reason = reason;
@@ -3406,7 +3430,7 @@
       }
     }
     function createPendingChunk(response) {
-      return new Chunk("pending", null, null, response);
+      return new ReactPromise("pending", null, null, response);
     }
     function wakeChunk(listeners, value) {
       for (var i = 0; i < listeners.length; i++) (0, listeners[i])(value);
@@ -3447,7 +3471,7 @@
       }
     }
     function createResolvedIteratorResultChunk(response, value, done) {
-      return new Chunk(
+      return new ReactPromise(
         "resolved_model",
         (done ? '{"done":true,"value":' : '{"done":false,"value":') +
           value +
@@ -3907,7 +3931,10 @@
           (chunk.value = stream),
           (chunk.reason = controller),
           null !== response && wakeChunk(response, chunk.value))
-        : chunks.set(id, new Chunk("fulfilled", stream, controller, response));
+        : chunks.set(
+            id,
+            new ReactPromise("fulfilled", stream, controller, response)
+          );
     }
     function startReadableStream(response, id, type) {
       var controller = null;
@@ -3928,7 +3955,12 @@
         },
         enqueueModel: function (json) {
           if (null === previousBlockedChunk) {
-            var chunk = new Chunk("resolved_model", json, null, response);
+            var chunk = new ReactPromise(
+              "resolved_model",
+              json,
+              null,
+              response
+            );
             initializeModelChunk(chunk);
             "fulfilled" === chunk.status
               ? controller.enqueue(chunk.value)
@@ -4002,7 +4034,7 @@
               );
             if (nextReadIndex === buffer.length) {
               if (closed)
-                return new Chunk(
+                return new ReactPromise(
                   "fulfilled",
                   { done: !0, value: void 0 },
                   null,
@@ -4020,7 +4052,7 @@
         {
           enqueueValue: function (value) {
             if (nextWriteIndex === buffer.length)
-              buffer[nextWriteIndex] = new Chunk(
+              buffer[nextWriteIndex] = new ReactPromise(
                 "fulfilled",
                 { done: !1, value: value },
                 null,
@@ -4299,7 +4331,12 @@
               ? ((stack = initializingHandler),
                 (initializingHandler = stack.parent),
                 stack.errored
-                  ? ((key = new Chunk("rejected", null, stack.value, response)),
+                  ? ((key = new ReactPromise(
+                      "rejected",
+                      null,
+                      stack.value,
+                      response
+                    )),
                     (stack = {
                       name: getComponentNameFromType(value.type) || "",
                       owner: value._owner
@@ -4309,7 +4346,7 @@
                     (key._debugInfo = [stack]),
                     (value = createLazyChunkWrapper(key)))
                   : 0 < stack.deps &&
-                    ((key = new Chunk("blocked", null, null, response)),
+                    ((key = new ReactPromise("blocked", null, null, response)),
                     (stack.value = value),
                     (stack.chunk = key),
                     (value = Object.freeze.bind(Object, value.props)),
@@ -11467,15 +11504,14 @@
         ReactSharedInternalsServer.TaintRegistryByteLengths,
       TaintRegistryPendingRequests =
         ReactSharedInternalsServer.TaintRegistryPendingRequests,
-      ABORTING$1 = 1,
-      CLOSING$1 = 2,
-      CLOSED$1 = 3,
+      ABORTING$1 = 11,
+      CLOSING$1 = 12,
+      CLOSED$1 = 13,
+      PRERENDER = 21,
       currentRequest = null,
       debugID = null,
-      reusableInfinitePromiseModel = stringify("$@"),
       modelRoot = !1,
       emptyRoot = {},
-      haltSymbol = Symbol("halt"),
       bind$1 = Function.prototype.bind,
       ObjectPrototype = Object.prototype,
       knownServerReferences = new WeakMap(),
@@ -11487,8 +11523,8 @@
       ReactSharedInternals =
         React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE ||
         React.__SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE;
-    Chunk.prototype = Object.create(Promise.prototype);
-    Chunk.prototype.then = function (resolve, reject) {
+    ReactPromise.prototype = Object.create(Promise.prototype);
+    ReactPromise.prototype.then = function (resolve, reject) {
       switch (this.status) {
         case "resolved_model":
           initializeModelChunk(this);
@@ -12455,6 +12491,7 @@
           stashErrorIdx = 1,
           stashedErrors = new Map(),
           flightRequest = new RequestInstance$1(
+            20,
             children,
             null,
             function (error) {
@@ -12467,8 +12504,8 @@
             void 0,
             "Markup",
             void 0,
-            void 0,
-            void 0
+            noop$3,
+            noop$3
           ),
           flightResponse = new ResponseInstance(
             null,
@@ -12658,7 +12695,7 @@
                         ? triggerErrorOnChunk(error, rowTag)
                         : rowLength.set(
                             rowID,
-                            new Chunk("rejected", null, rowTag, i)
+                            new ReactPromise("rejected", null, rowTag, i)
                           );
                       break;
                     case 84:
@@ -12667,7 +12704,7 @@
                         ? error.reason.enqueueValue(rowLength)
                         : rowTag.set(
                             rowID,
-                            new Chunk("fulfilled", rowLength, null, i)
+                            new ReactPromise("fulfilled", rowLength, null, i)
                           );
                       break;
                     case 68:
@@ -12755,7 +12792,7 @@
                         ? triggerErrorOnChunk(error, rowTag)
                         : rowLength.set(
                             rowID,
-                            new Chunk("rejected", null, rowTag, i)
+                            new ReactPromise("rejected", null, rowTag, i)
                           );
                       break;
                     default:
@@ -12764,7 +12801,12 @@
                           ? resolveModelChunk(error, rowLength)
                           : rowTag.set(
                               rowID,
-                              new Chunk("resolved_model", rowLength, null, i)
+                              new ReactPromise(
+                                "resolved_model",
+                                rowLength,
+                                null,
+                                i
+                              )
                             );
                   }
                   i = lastIdx;
@@ -12804,5 +12846,5 @@
         });
       });
     };
-    exports.version = "19.0.0-experimental-6ebfd5b0-20240818";
+    exports.version = "19.0.0-experimental-a960b92c-20240819";
   })();

package/cjs/react-markup.react-server.production.js

@@ -560,6 +560,7 @@ function defaultErrorHandler$1(error) {
 }
 function defaultPostponeHandler() {}
 function RequestInstance$1(
+  type,
   model,
   bundlerConfig,
   onError,
@@ -581,7 +582,8 @@ function RequestInstance$1(
   environmentName = [];
   var cleanupQueue = [];
   TaintRegistryPendingRequests.add(cleanupQueue);
-  this.status = 0;
+  this.type = type;
+  this.status = 10;
   this.flushScheduled = !1;
   this.destination = this.fatalError = null;
   this.bundlerConfig = bundlerConfig;
@@ -605,10 +607,10 @@ function RequestInstance$1(
   this.taintCleanupQueue = cleanupQueue;
   this.onError = void 0 === onError ? defaultErrorHandler$1 : onError;
   this.onPostpone = void 0 === onPostpone ? defaultPostponeHandler : onPostpone;
-  this.onAllReady = void 0 === onAllReady ? noop$3 : onAllReady;
-  this.onFatalError = void 0 === onFatalError ? noop$3 : onFatalError;
-  model = createTask(this, model, null, !1, filterStackFrame);
-  environmentName.push(model);
+  this.onAllReady = onAllReady;
+  this.onFatalError = onFatalError;
+  type = createTask(this, model, null, !1, filterStackFrame);
+  environmentName.push(type);
 }
 function noop$3() {}
 var currentRequest = null;
@@ -642,14 +644,12 @@ function serializeThenable(request, task, thenable) {
         newTask.id
       );
     default:
-      if (1 === request.status)
+      if (11 === request.status)
         return (
           request.abortableTasks.delete(newTask),
           (newTask.status = 3),
-          request.fatalError === haltSymbol
-            ? emitModelChunk(request, newTask.id, reusableInfinitePromiseModel)
-            : ((task = stringify(serializeByValueID$1(request.fatalError))),
-              emitModelChunk(request, newTask.id, task)),
+          (task = stringify(serializeByValueID$1(request.fatalError))),
+          emitModelChunk(request, newTask.id, task),
           newTask.id
         );
       "string" !== typeof thenable.status &&
@@ -690,7 +690,7 @@ function serializeReadableStream(request, task, stream) {
   function progress(entry) {
     if (!aborted)
       if (entry.done)
-        request.abortListeners.delete(error),
+        request.abortListeners.delete(abortStream),
           (entry = streamTask.id.toString(16) + ":C\n"),
           request.completedRegularChunks.push(entry),
           enqueueFlush(request),
@@ -709,20 +709,35 @@ function serializeReadableStream(request, task, stream) {
   function error(reason) {
     if (!aborted) {
       aborted = !0;
-      request.abortListeners.delete(error);
-      if (request.fatalError === haltSymbol) var cancelWith = reason;
-      else
+      request.abortListeners.delete(abortStream);
+      var digest = logRecoverableError$1(request, reason, streamTask);
+      emitErrorChunk(request, streamTask.id, digest);
+      enqueueFlush(request);
+      reader.cancel(reason).then(error, error);
+    }
+  }
+  function abortStream(reason) {
+    if (!aborted) {
+      aborted = !0;
+      request.abortListeners.delete(abortStream);
+      if (
         "object" === typeof reason &&
         null !== reason &&
         reason.$$typeof === REACT_POSTPONE_TYPE
-          ? ((cancelWith = reason),
-            logPostpone$1(request, reason.message, streamTask),
-            emitPostponeChunk(request, streamTask.id))
-          : ((cancelWith = reason),
-            (reason = logRecoverableError$1(request, reason, streamTask)),
-            emitErrorChunk(request, streamTask.id, reason)),
-          enqueueFlush(request);
-      reader.cancel(cancelWith).then(error, error);
+      )
+        logPostpone$1(request, reason.message, streamTask),
+          21 === request.type
+            ? request.pendingChunks--
+            : (emitPostponeChunk(request, streamTask.id),
+              enqueueFlush(request));
+      else {
+        var digest = logRecoverableError$1(request, reason, streamTask);
+        21 === request.type
+          ? request.pendingChunks--
+          : (emitErrorChunk(request, streamTask.id, digest),
+            enqueueFlush(request));
+      }
+      reader.cancel(reason).then(error, error);
     }
   }
   var supportsBYOB = stream.supportsBYOB;
@@ -745,7 +760,7 @@ function serializeReadableStream(request, task, stream) {
   task = streamTask.id.toString(16) + ":" + (supportsBYOB ? "r" : "R") + "\n";
   request.completedRegularChunks.push(task);
   var aborted = !1;
-  request.abortListeners.add(error);
+  request.abortListeners.add(abortStream);
   reader.read().then(progress, error);
   return serializeByValueID$1(streamTask.id);
 }
@@ -753,7 +768,7 @@ function serializeAsyncIterable(request, task, iterable, iterator) {
   function progress(entry) {
     if (!aborted)
       if (entry.done) {
-        request.abortListeners.delete(error);
+        request.abortListeners.delete(abortIterable);
         if (void 0 === entry.value)
           var endStreamRow = streamTask.id.toString(16) + ":C\n";
         else
@@ -785,21 +800,37 @@ function serializeAsyncIterable(request, task, iterable, iterator) {
   function error(reason) {
     if (!aborted) {
       aborted = !0;
-      request.abortListeners.delete(error);
-      if (request.fatalError === haltSymbol) var throwWith = reason;
-      else
+      request.abortListeners.delete(abortIterable);
+      var digest = logRecoverableError$1(request, reason, streamTask);
+      emitErrorChunk(request, streamTask.id, digest);
+      enqueueFlush(request);
+      "function" === typeof iterator.throw &&
+        iterator.throw(reason).then(error, error);
+    }
+  }
+  function abortIterable(reason) {
+    if (!aborted) {
+      aborted = !0;
+      request.abortListeners.delete(abortIterable);
+      if (
         "object" === typeof reason &&
         null !== reason &&
         reason.$$typeof === REACT_POSTPONE_TYPE
-          ? ((throwWith = reason),
-            logPostpone$1(request, reason.message, streamTask),
-            emitPostponeChunk(request, streamTask.id))
-          : ((throwWith = reason),
-            (reason = logRecoverableError$1(request, reason, streamTask)),
-            emitErrorChunk(request, streamTask.id, reason)),
-          enqueueFlush(request);
+      )
+        logPostpone$1(request, reason.message, streamTask),
+          21 === request.type
+            ? request.pendingChunks--
+            : (emitPostponeChunk(request, streamTask.id),
+              enqueueFlush(request));
+      else {
+        var digest = logRecoverableError$1(request, reason, streamTask);
+        21 === request.type
+          ? request.pendingChunks--
+          : (emitErrorChunk(request, streamTask.id, digest),
+            enqueueFlush(request));
+      }
       "function" === typeof iterator.throw &&
-        iterator.throw(throwWith).then(error, error);
+        iterator.throw(reason).then(error, error);
     }
   }
   iterable = iterable === iterator;
@@ -815,7 +846,7 @@ function serializeAsyncIterable(request, task, iterable, iterator) {
   task = streamTask.id.toString(16) + ":" + (iterable ? "x" : "X") + "\n";
   request.completedRegularChunks.push(task);
   var aborted = !1;
-  request.abortListeners.add(error);
+  request.abortListeners.add(abortIterable);
   iterator.next().then(progress, error);
   return serializeByValueID$1(streamTask.id);
 }
@@ -853,7 +884,7 @@ function renderFunctionComponent$1(request, task, key, Component, props) {
   thenableIndexCounter$1 = 0;
   thenableState$1 = prevThenableState;
   Component = Component(props, void 0);
-  if (1 === request.status)
+  if (11 === request.status)
     throw (
       ("object" === typeof Component &&
         null !== Component &&
@@ -952,7 +983,7 @@ function renderElement$1(request, task, type, key, ref, props) {
       case REACT_LAZY_TYPE:
         var init = type._init;
         type = init(type._payload);
-        if (1 === request.status) throw null;
+        if (11 === request.status) throw null;
         return renderElement$1(request, task, type, key, ref, props);
       case REACT_FORWARD_REF_TYPE:
         return renderFunctionComponent$1(
@@ -1009,7 +1040,6 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) {
 function serializeByValueID$1(id) {
   return "$" + id.toString(16);
 }
-var reusableInfinitePromiseModel = stringify("$@");
 function encodeReferenceChunk(request, id, reference) {
   request = stringify(reference);
   return id.toString(16) + ":" + request + "\n";
@@ -1034,7 +1064,7 @@ function serializeBlob(request, blob) {
   function progress(entry) {
     if (!aborted)
       if (entry.done)
-        request.abortListeners.delete(error),
+        request.abortListeners.delete(abortBlob),
           (aborted = !0),
           pingTask$1(request, newTask);
       else
@@ -1045,22 +1075,41 @@ function serializeBlob(request, blob) {
   function error(reason) {
     if (!aborted) {
       aborted = !0;
-      request.abortListeners.delete(error);
-      if (request.fatalError === haltSymbol) var cancelWith = reason;
-      else
-        (cancelWith = reason),
-          (reason = logRecoverableError$1(request, reason, newTask)),
-          emitErrorChunk(request, newTask.id, reason),
-          request.abortableTasks.delete(newTask),
-          enqueueFlush(request);
-      reader.cancel(cancelWith).then(error, error);
+      request.abortListeners.delete(abortBlob);
+      var digest = logRecoverableError$1(request, reason, newTask);
+      emitErrorChunk(request, newTask.id, digest);
+      enqueueFlush(request);
+      reader.cancel(reason).then(error, error);
+    }
+  }
+  function abortBlob(reason) {
+    if (!aborted) {
+      aborted = !0;
+      request.abortListeners.delete(abortBlob);
+      if (
+        "object" === typeof reason &&
+        null !== reason &&
+        reason.$$typeof === REACT_POSTPONE_TYPE
+      )
+        logPostpone$1(request, reason.message, newTask),
+          21 === request.type
+            ? request.pendingChunks--
+            : (emitPostponeChunk(request, newTask.id), enqueueFlush(request));
+      else {
+        var digest = logRecoverableError$1(request, reason, newTask);
+        21 === request.type
+          ? request.pendingChunks--
+          : (emitErrorChunk(request, newTask.id, digest),
+            enqueueFlush(request));
+      }
+      reader.cancel(reason).then(error, error);
     }
   }
   var model = [blob.type],
     newTask = createTask(request, model, null, !1, request.abortableTasks),
     reader = blob.stream().getReader(),
     aborted = !1;
-  request.abortListeners.add(error);
+  request.abortListeners.add(abortBlob);
   reader.read().then(progress).catch(error);
   return "$B" + newTask.id.toString(16);
 }
@@ -1083,12 +1132,12 @@ function renderModel(request, task, parent, key, value) {
         : thrownValue;
     if ("object" === typeof key && null !== key) {
       if ("function" === typeof key.then) {
-        if (1 === request.status) {
-          task.status = 3;
-          if (request.fatalError === haltSymbol) return "$@";
-          task = request.fatalError;
-          return parent ? "$L" + task.toString(16) : serializeByValueID$1(task);
-        }
+        if (11 === request.status)
+          return (
+            (task.status = 3),
+            (task = request.fatalError),
+            parent ? "$L" + task.toString(16) : serializeByValueID$1(task)
+          );
         request = createTask(
           request,
           task.model,
@@ -1116,12 +1165,12 @@ function renderModel(request, task, parent, key, value) {
           parent ? "$L" + value.toString(16) : serializeByValueID$1(value)
         );
     }
-    if (1 === request.status) {
-      task.status = 3;
-      if (request.fatalError === haltSymbol) return "$@";
-      task = request.fatalError;
-      return parent ? "$L" + task.toString(16) : serializeByValueID$1(task);
-    }
+    if (11 === request.status)
+      return (
+        (task.status = 3),
+        (task = request.fatalError),
+        parent ? "$L" + task.toString(16) : serializeByValueID$1(task)
+      );
     task.keyPath = prevKeyPath;
     task.implicitSlot = prevImplicitSlot;
     request.pendingChunks++;
@@ -1180,7 +1229,7 @@ function renderModelDestructive(
         task.thenableState = null;
         parentPropertyName = value._init;
         value = parentPropertyName(value._payload);
-        if (1 === request.status) throw null;
+        if (11 === request.status) throw null;
         return renderModelDestructive(request, task, emptyRoot, "", value);
       case REACT_LEGACY_ELEMENT_TYPE:
         throw Error(
@@ -1452,8 +1501,8 @@ function fatalError$1(request, error) {
   onFatalError(error);
   cleanupTaintQueue(request);
   null !== request.destination
-    ? ((request.status = 3), request.destination.destroy(error))
-    : ((request.status = 2), (request.fatalError = error));
+    ? ((request.status = 13), request.destination.destroy(error))
+    : ((request.status = 12), (request.fatalError = error));
 }
 function emitPostponeChunk(request, id) {
   id = id.toString(16) + ":P\n";
@@ -1550,15 +1599,11 @@ function retryTask$1(request, task) {
           : thrownValue;
       if ("object" === typeof x && null !== x) {
         if ("function" === typeof x.then) {
-          if (1 === request.status) {
+          if (11 === request.status) {
             request.abortableTasks.delete(task);
             task.status = 3;
-            if (request.fatalError === haltSymbol)
-              emitModelChunk(request, task.id, reusableInfinitePromiseModel);
-            else {
-              var model = stringify(serializeByValueID$1(request.fatalError));
-              emitModelChunk(request, task.id, model);
-            }
+            var model = stringify(serializeByValueID$1(request.fatalError));
+            emitModelChunk(request, task.id, model);
             return;
           }
           task.status = 0;
@@ -1575,18 +1620,12 @@ function retryTask$1(request, task) {
           return;
         }
       }
-      if (1 === request.status)
-        if (
-          (request.abortableTasks.delete(task),
-          (task.status = 3),
-          request.fatalError === haltSymbol)
-        )
-          emitModelChunk(request, task.id, reusableInfinitePromiseModel);
-        else {
-          var model$25 = stringify(serializeByValueID$1(request.fatalError));
-          emitModelChunk(request, task.id, model$25);
-        }
-      else {
+      if (11 === request.status) {
+        request.abortableTasks.delete(task);
+        task.status = 3;
+        var model$25 = stringify(serializeByValueID$1(request.fatalError));
+        emitModelChunk(request, task.id, model$25);
+      } else {
         request.abortableTasks.delete(task);
         task.status = 4;
         var digest = logRecoverableError$1(request, x, task);
@@ -1601,6 +1640,7 @@ function performWork$1(request) {
   ReactSharedInternalsServer.H = HooksDispatcher$1;
   var prevRequest = currentRequest;
   currentRequest$1 = currentRequest = request;
+  var hadAbortableTasks = 0 < request.abortableTasks.size;
   try {
     var pingedTasks = request.pingedTasks;
     request.pingedTasks = [];
@@ -1608,7 +1648,7 @@ function performWork$1(request) {
       retryTask$1(request, pingedTasks[i]);
     null !== request.destination &&
       flushCompletedChunks(request, request.destination);
-    if (0 === request.abortableTasks.size) {
+    if (hadAbortableTasks && 0 === request.abortableTasks.size) {
       var onAllReady = request.onAllReady;
       onAllReady();
     }
@@ -1662,7 +1702,7 @@ function flushCompletedChunks(request, destination) {
   }
   0 === request.pendingChunks &&
     (cleanupTaintQueue(request),
-    (request.status = 3),
+    (request.status = 13),
     destination.push(null),
     (request.destination = null));
 }
@@ -1679,10 +1719,9 @@ function enqueueFlush(request) {
 }
 function abort$1(request, reason) {
   try {
-    0 === request.status && (request.status = 1);
+    10 === request.status && (request.status = 11);
     var abortableTasks = request.abortableTasks;
     if (0 < abortableTasks.size) {
-      request.pendingChunks++;
       var errorId = request.nextChunkId++;
       request.fatalError = errorId;
       if (
@@ -1691,7 +1730,9 @@ function abort$1(request, reason) {
         reason.$$typeof === REACT_POSTPONE_TYPE
       )
         logPostpone$1(request, reason.message, null),
-          emitPostponeChunk(request, errorId, reason);
+          21 === request.type &&
+            (request.pendingChunks++,
+            emitPostponeChunk(request, errorId, reason));
       else {
         var error =
             void 0 === reason
@@ -1702,7 +1743,9 @@ function abort$1(request, reason) {
                 ? Error("The render was aborted by the server with a promise.")
                 : reason,
           digest = logRecoverableError$1(request, error, null);
-        emitErrorChunk(request, errorId, digest, error);
+        20 === request.type &&
+          (request.pendingChunks++,
+          emitErrorChunk(request, errorId, digest, error));
       }
       abortableTasks.forEach(function (task) {
         if (5 !== task.status) {
@@ -1713,6 +1756,8 @@ function abort$1(request, reason) {
         }
       });
       abortableTasks.clear();
+      var onAllReady = request.onAllReady;
+      onAllReady();
     }
     var abortListeners = request.abortListeners;
     if (0 < abortListeners.size) {
@@ -1740,8 +1785,7 @@ function abort$1(request, reason) {
       fatalError$1(request, error$33);
   }
 }
-var haltSymbol = Symbol("halt"),
-  bind$1 = Function.prototype.bind,
+var bind$1 = Function.prototype.bind,
   ObjectPrototype = Object.prototype,
   knownServerReferences = new WeakMap();
 function serializeNumber(number) {
@@ -2313,14 +2357,14 @@ function getComponentNameFromType(type) {
     }
   return null;
 }
-function Chunk(status, value, reason, response) {
+function ReactPromise(status, value, reason, response) {
   this.status = status;
   this.value = value;
   this.reason = reason;
   this._response = response;
 }
-Chunk.prototype = Object.create(Promise.prototype);
-Chunk.prototype.then = function (resolve, reject) {
+ReactPromise.prototype = Object.create(Promise.prototype);
+ReactPromise.prototype.then = function (resolve, reject) {
   switch (this.status) {
     case "resolved_model":
       initializeModelChunk(this);
@@ -2362,7 +2406,7 @@ function readChunk(chunk) {
   }
 }
 function createPendingChunk(response) {
-  return new Chunk("pending", null, null, response);
+  return new ReactPromise("pending", null, null, response);
 }
 function wakeChunk(listeners, value) {
   for (var i = 0; i < listeners.length; i++) (0, listeners[i])(value);
@@ -2403,7 +2447,7 @@ function triggerErrorOnChunk(chunk, error) {
   }
 }
 function createResolvedIteratorResultChunk(response, value, done) {
-  return new Chunk(
+  return new ReactPromise(
     "resolved_model",
     (done ? '{"done":true,"value":' : '{"done":false,"value":') + value + "}",
     null,
@@ -2754,7 +2798,10 @@ function resolveStream(response, id, stream, controller) {
       (chunk.value = stream),
       (chunk.reason = controller),
       null !== response && wakeChunk(response, chunk.value))
-    : chunks.set(id, new Chunk("fulfilled", stream, controller, response));
+    : chunks.set(
+        id,
+        new ReactPromise("fulfilled", stream, controller, response)
+      );
 }
 function startReadableStream(response, id, type) {
   var controller = null;
@@ -2775,7 +2822,7 @@ function startReadableStream(response, id, type) {
     },
     enqueueModel: function (json) {
       if (null === previousBlockedChunk) {
-        var chunk = new Chunk("resolved_model", json, null, response);
+        var chunk = new ReactPromise("resolved_model", json, null, response);
         initializeModelChunk(chunk);
         "fulfilled" === chunk.status
           ? controller.enqueue(chunk.value)
@@ -2851,7 +2898,7 @@ function startAsyncIterable(response, id, iterator) {
           );
         if (nextReadIndex === buffer.length) {
           if (closed)
-            return new Chunk(
+            return new ReactPromise(
               "fulfilled",
               { done: !0, value: void 0 },
               null,
@@ -2870,7 +2917,7 @@ function startAsyncIterable(response, id, iterator) {
     {
       enqueueValue: function (value) {
         if (nextWriteIndex === buffer.length)
-          buffer[nextWriteIndex] = new Chunk(
+          buffer[nextWriteIndex] = new ReactPromise(
             "fulfilled",
             { done: !1, value: value },
             null,
@@ -2947,10 +2994,15 @@ function createFromJSONCallback(response) {
             (initializingHandler = value.parent),
             value.errored)
           )
-            (key = new Chunk("rejected", null, value.value, response)),
+            (key = new ReactPromise("rejected", null, value.value, response)),
               (key = createLazyChunkWrapper(key));
           else if (0 < value.deps) {
-            var blockedChunk = new Chunk("blocked", null, null, response);
+            var blockedChunk = new ReactPromise(
+              "blocked",
+              null,
+              null,
+              response
+            );
             value.value = key;
             value.chunk = blockedChunk;
             key = createLazyChunkWrapper(blockedChunk);
@@ -8308,7 +8360,7 @@ exports.experimental_renderToHTML = function (children, options) {
                       ? triggerErrorOnChunk(rowLength, i)
                       : rowTag.set(
                           rowID,
-                          new Chunk("rejected", null, i, flightResponse)
+                          new ReactPromise("rejected", null, i, flightResponse)
                         );
                     break;
                   case 84:
@@ -8318,7 +8370,7 @@ exports.experimental_renderToHTML = function (children, options) {
                       ? rowLength.reason.enqueueValue(i)
                       : rowTag.set(
                           rowID,
-                          new Chunk("fulfilled", i, null, flightResponse)
+                          new ReactPromise("fulfilled", i, null, flightResponse)
                         );
                     break;
                   case 68:
@@ -8354,7 +8406,7 @@ exports.experimental_renderToHTML = function (children, options) {
                       ? triggerErrorOnChunk(rowLength, i)
                       : rowTag.set(
                           rowID,
-                          new Chunk("rejected", null, i, flightResponse)
+                          new ReactPromise("rejected", null, i, flightResponse)
                         );
                     break;
                   default:
@@ -8363,7 +8415,12 @@ exports.experimental_renderToHTML = function (children, options) {
                         ? resolveModelChunk(rowLength, i)
                         : rowTag.set(
                             rowID,
-                            new Chunk("resolved_model", i, null, flightResponse)
+                            new ReactPromise(
+                              "resolved_model",
+                              i,
+                              null,
+                              flightResponse
+                            )
                           );
                 }
                 i = lastIdx;
@@ -8391,6 +8448,7 @@ exports.experimental_renderToHTML = function (children, options) {
       stashErrorIdx = 1,
       stashedErrors = new Map(),
       flightRequest = new RequestInstance$1(
+        20,
         children,
         null,
         function (error) {
@@ -8403,8 +8461,8 @@ exports.experimental_renderToHTML = function (children, options) {
         void 0,
         "Markup",
         void 0,
-        void 0,
-        void 0
+        noop$3,
+        noop$3
       ),
       flightResponse = new ResponseInstance(
         null,
@@ -8465,10 +8523,13 @@ exports.experimental_renderToHTML = function (children, options) {
     }
     flightRequest.flushScheduled = null !== flightRequest.destination;
     performWork$1(flightRequest);
-    if (2 === flightRequest.status)
-      (flightRequest.status = 3),
+    if (12 === flightRequest.status)
+      (flightRequest.status = 13),
         flightDestination.destroy(flightRequest.fatalError);
-    else if (3 !== flightRequest.status && null === flightRequest.destination) {
+    else if (
+      13 !== flightRequest.status &&
+      null === flightRequest.destination
+    ) {
       flightRequest.destination = flightDestination;
       try {
         flushCompletedChunks(flightRequest, flightDestination);
@@ -8493,4 +8554,4 @@ exports.experimental_renderToHTML = function (children, options) {
     });
   });
 };
-exports.version = "19.0.0-experimental-6ebfd5b0-20240818";
+exports.version = "19.0.0-experimental-a960b92c-20240819";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-markup",
-  "version": "0.0.0-experimental-6ebfd5b0-20240818",
+  "version": "0.0.0-experimental-a960b92c-20240819",
   "description": "React package generating embedded markup such as e-mails with support for Server Components.",
   "main": "index.js",
   "repository": {
@@ -17,7 +17,7 @@
   },
   "homepage": "https://react.dev/",
   "peerDependencies": {
-    "react": "0.0.0-experimental-6ebfd5b0-20240818"
+    "react": "0.0.0-experimental-a960b92c-20240819"
   },
   "files": [
     "LICENSE",