react-markup 0.0.0-experimental-a960b92c-20240819 → 0.0.0-experimental-1d989965-20240821

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

@@ -873,8 +873,10 @@
             return (
               request.abortableTasks.delete(newTask),
               (newTask.status = ABORTED$1),
-              (task = stringify(serializeByValueID$1(request.fatalError))),
-              emitModelChunk(request, newTask.id, task),
+              request.type === PRERENDER
+                ? request.pendingChunks--
+                : ((task = stringify(serializeByValueID$1(request.fatalError))),
+                  emitModelChunk(request, newTask.id, task)),
               newTask.id
             );
           "string" !== typeof thenable.status &&
@@ -1679,37 +1681,45 @@
           null !== parent &&
           (parent.$$typeof === REACT_ELEMENT_TYPE ||
             parent.$$typeof === REACT_LAZY_TYPE);
+        if (request.status === ABORTING$1) {
+          task.status = ABORTED$1;
+          if (request.type === PRERENDER)
+            return (
+              (task = request.nextChunkId++),
+              (task = parent
+                ? "$L" + task.toString(16)
+                : serializeByValueID$1(task)),
+              task
+            );
+          task = request.fatalError;
+          return parent ? "$L" + task.toString(16) : serializeByValueID$1(task);
+        }
         key =
           thrownValue === SuspenseException$1
             ? getSuspendedThenable$1()
             : thrownValue;
         if ("object" === typeof key && null !== key) {
-          if ("function" === typeof key.then) {
-            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,
-              task.keyPath,
-              task.implicitSlot,
-              request.abortableTasks,
-              task.debugOwner,
-              task.debugStack,
-              task.debugTask
+          if ("function" === typeof key.then)
+            return (
+              (request = createTask(
+                request,
+                task.model,
+                task.keyPath,
+                task.implicitSlot,
+                request.abortableTasks,
+                task.debugOwner,
+                task.debugStack,
+                task.debugTask
+              )),
+              (value = request.ping),
+              key.then(value, value),
+              (request.thenableState = getThenableStateAfterSuspending$1()),
+              (task.keyPath = prevKeyPath),
+              (task.implicitSlot = prevImplicitSlot),
+              parent
+                ? "$L" + request.id.toString(16)
+                : serializeByValueID$1(request.id)
             );
-            value = request.ping;
-            key.then(value, value);
-            request.thenableState = getThenableStateAfterSuspending$1();
-            task.keyPath = prevKeyPath;
-            task.implicitSlot = prevImplicitSlot;
-            return parent
-              ? "$L" + request.id.toString(16)
-              : serializeByValueID$1(request.id);
-          }
           if (key.$$typeof === REACT_POSTPONE_TYPE)
             return (
               request.pendingChunks++,
@@ -1721,12 +1731,6 @@
               parent ? "$L" + value.toString(16) : serializeByValueID$1(value)
             );
         }
-        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++;
@@ -2453,39 +2457,38 @@
           request.abortableTasks.delete(task);
           task.status = COMPLETED$1;
         } catch (thrownValue) {
-          var x =
-            thrownValue === SuspenseException$1
-              ? getSuspendedThenable$1()
-              : thrownValue;
-          if ("object" === typeof x && null !== x) {
-            if ("function" === typeof x.then) {
-              if (request.status === ABORTING$1) {
+          if (request.status === ABORTING$1)
+            if (
+              (request.abortableTasks.delete(task),
+              (task.status = ABORTED$1),
+              request.type === PRERENDER)
+            )
+              request.pendingChunks--;
+            else {
+              var model = stringify(serializeByValueID$1(request.fatalError));
+              emitModelChunk(request, task.id, model);
+            }
+          else {
+            var x =
+              thrownValue === SuspenseException$1
+                ? getSuspendedThenable$1()
+                : thrownValue;
+            if ("object" === typeof x && null !== x) {
+              if ("function" === typeof x.then) {
+                task.status = PENDING$3;
+                task.thenableState = getThenableStateAfterSuspending$1();
+                var ping = task.ping;
+                x.then(ping, ping);
+                return;
+              }
+              if (x.$$typeof === REACT_POSTPONE_TYPE) {
                 request.abortableTasks.delete(task);
-                task.status = ABORTED$1;
-                var model = stringify(serializeByValueID$1(request.fatalError));
-                emitModelChunk(request, task.id, model);
+                task.status = ERRORED$2;
+                logPostpone$1(request, x.message, task);
+                emitPostponeChunk(request, task.id, x);
                 return;
               }
-              task.status = PENDING$3;
-              task.thenableState = getThenableStateAfterSuspending$1();
-              var ping = task.ping;
-              x.then(ping, ping);
-              return;
             }
-            if (x.$$typeof === REACT_POSTPONE_TYPE) {
-              request.abortableTasks.delete(task);
-              task.status = ERRORED$2;
-              logPostpone$1(request, x.message, task);
-              emitPostponeChunk(request, task.id, x);
-              return;
-            }
-          }
-          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);
@@ -2531,6 +2534,13 @@
           (currentRequest = prevRequest);
       }
     }
+    function abortTask$1(task, request, errorId) {
+      task.status !== RENDERING$1 &&
+        ((task.status = ABORTED$1),
+        (errorId = serializeByValueID$1(errorId)),
+        (task = encodeReferenceChunk(request, task.id, errorId)),
+        request.completedErrorChunks.push(task));
+    }
     function flushCompletedChunks(request, destination) {
       try {
         for (
@@ -2610,17 +2620,28 @@
         10 === request.status && (request.status = ABORTING$1);
         var abortableTasks = request.abortableTasks;
         if (0 < abortableTasks.size) {
-          var errorId = request.nextChunkId++;
-          request.fatalError = errorId;
           if (
             "object" === typeof reason &&
             null !== reason &&
             reason.$$typeof === REACT_POSTPONE_TYPE
           )
-            logPostpone$1(request, reason.message, null),
-              request.type === PRERENDER &&
-                (request.pendingChunks++,
-                emitPostponeChunk(request, errorId, reason));
+            if (
+              (logPostpone$1(request, reason.message, null),
+              request.type === PRERENDER)
+            )
+              abortableTasks.forEach(function (task) {
+                task.status !== RENDERING$1 &&
+                  ((task.status = ABORTED$1), request.pendingChunks--);
+              });
+            else {
+              var errorId = request.nextChunkId++;
+              request.fatalError = errorId;
+              request.pendingChunks++;
+              emitPostponeChunk(request, errorId, reason);
+              abortableTasks.forEach(function (task) {
+                return abortTask$1(task, request, errorId);
+              });
+            }
           else {
             var error =
                 void 0 === reason
@@ -2635,18 +2656,21 @@
                       )
                     : reason,
               digest = logRecoverableError$1(request, error, null);
-            20 === request.type &&
-              (request.pendingChunks++,
-              emitErrorChunk(request, errorId, digest, error));
-          }
-          abortableTasks.forEach(function (task) {
-            if (task.status !== RENDERING$1) {
-              task.status = ABORTED$1;
-              var ref = serializeByValueID$1(errorId);
-              task = encodeReferenceChunk(request, task.id, ref);
-              request.completedErrorChunks.push(task);
+            if (request.type === PRERENDER)
+              abortableTasks.forEach(function (task) {
+                task.status !== RENDERING$1 &&
+                  ((task.status = ABORTED$1), request.pendingChunks--);
+              });
+            else {
+              var _errorId2 = request.nextChunkId++;
+              request.fatalError = _errorId2;
+              request.pendingChunks++;
+              emitErrorChunk(request, _errorId2, digest, error);
+              abortableTasks.forEach(function (task) {
+                return abortTask$1(task, request, _errorId2);
+              });
             }
-          });
+          }
           abortableTasks.clear();
           var onAllReady = request.onAllReady;
           onAllReady();
@@ -10292,8 +10316,13 @@
                     )),
                     logRecoverableError(request, task, boundary, null),
                     fatalError(request, task, boundary, null)))
-              : (logRecoverableError(request, error, boundary, null),
-                fatalError(request, error, boundary, null));
+              : null !== request.trackedPostpones && null !== segment
+                ? ((replay = request.trackedPostpones),
+                  logRecoverableError(request, error, boundary, null),
+                  trackPostpone(request, replay, task, segment),
+                  finishedTask(request, null, segment))
+                : (logRecoverableError(request, error, boundary, null),
+                  fatalError(request, error, boundary, null));
             return;
           }
           replay.pendingTasks--;
@@ -10318,25 +10347,54 @@
           request.pendingRootTasks--;
           0 === request.pendingRootTasks && completeShell(request);
         }
-      } else
-        boundary.pendingTasks--,
-          4 !== boundary.status &&
-            ((boundary.status = 4),
-            (task = getThrownInfo(task.componentStack)),
+      } else {
+        boundary.pendingTasks--;
+        replay = getThrownInfo(task.componentStack);
+        var _trackedPostpones2 = request.trackedPostpones;
+        if (4 !== boundary.status) {
+          if (null !== _trackedPostpones2 && null !== segment)
+            return (
+              "object" === typeof error &&
+              null !== error &&
+              error.$$typeof === REACT_POSTPONE_TYPE
+                ? logPostpone(request, error.message, replay, null)
+                : logRecoverableError(request, error, replay, null),
+              trackPostpone(request, _trackedPostpones2, task, segment),
+              boundary.fallbackAbortableTasks.forEach(function (fallbackTask) {
+                return abortTask(fallbackTask, request, error);
+              }),
+              boundary.fallbackAbortableTasks.clear(),
+              finishedTask(request, boundary, segment)
+            );
+          boundary.status = 4;
+          if (
             "object" === typeof error &&
             null !== error &&
             error.$$typeof === REACT_POSTPONE_TYPE
-              ? (logPostpone(request, error.message, task, null),
-                (segment = "POSTPONE"))
-              : (segment = logRecoverableError(request, error, task, null)),
-            encodeErrorForBoundary(boundary, segment, error, task, !0),
-            untrackBoundary(request, boundary),
-            boundary.parentFlushed &&
-              request.clientRenderedBoundaries.push(boundary)),
-          boundary.fallbackAbortableTasks.forEach(function (fallbackTask) {
-            return abortTask(fallbackTask, request, error);
-          }),
-          boundary.fallbackAbortableTasks.clear();
+          ) {
+            logPostpone(request, error.message, replay, null);
+            if (null !== request.trackedPostpones && null !== segment) {
+              trackPostpone(request, request.trackedPostpones, task, segment);
+              finishedTask(request, task.blockedBoundary, segment);
+              boundary.fallbackAbortableTasks.forEach(function (fallbackTask) {
+                return abortTask(fallbackTask, request, error);
+              });
+              boundary.fallbackAbortableTasks.clear();
+              return;
+            }
+            task = "POSTPONE";
+          } else task = logRecoverableError(request, error, replay, null);
+          boundary.status = 4;
+          encodeErrorForBoundary(boundary, task, error, replay, !0);
+          untrackBoundary(request, boundary);
+          boundary.parentFlushed &&
+            request.clientRenderedBoundaries.push(boundary);
+        }
+        boundary.fallbackAbortableTasks.forEach(function (fallbackTask) {
+          return abortTask(fallbackTask, request, error);
+        });
+        boundary.fallbackAbortableTasks.clear();
+      }
       request.allPendingTasks--;
       0 === request.allPendingTasks && completeAll(request);
     }
@@ -10591,89 +10649,129 @@
                         : 1 === request.status
                           ? request.fatalError
                           : thrownValue;
-                    if ("object" === typeof x$jscomp$0 && null !== x$jscomp$0) {
-                      if ("function" === typeof x$jscomp$0.then) {
-                        segment$jscomp$0.status = 0;
-                        task$jscomp$0.thenableState =
-                          getThenableStateAfterSuspending();
-                        var ping$jscomp$0 = task$jscomp$0.ping;
-                        x$jscomp$0.then(ping$jscomp$0, ping$jscomp$0);
-                        break a;
-                      }
-                      if (
-                        null !== request.trackedPostpones &&
-                        x$jscomp$0.$$typeof === REACT_POSTPONE_TYPE
-                      ) {
-                        var trackedPostpones = request.trackedPostpones;
-                        task$jscomp$0.abortSet.delete(task$jscomp$0);
-                        var postponeInfo = getThrownInfo(
+                    if (
+                      1 === request.status &&
+                      null !== request.trackedPostpones
+                    ) {
+                      var trackedPostpones = request.trackedPostpones,
+                        thrownInfo = getThrownInfo(
                           task$jscomp$0.componentStack
                         );
-                        logPostpone(
-                          request,
-                          x$jscomp$0.message,
-                          postponeInfo,
-                          task$jscomp$0.debugTask
-                        );
-                        trackPostpone(
-                          request,
-                          trackedPostpones,
-                          task$jscomp$0,
-                          segment$jscomp$0
-                        );
-                        finishedTask(
-                          request,
-                          task$jscomp$0.blockedBoundary,
-                          segment$jscomp$0
-                        );
-                        break a;
-                      }
-                    }
-                    var errorInfo$jscomp$0 = getThrownInfo(
-                      task$jscomp$0.componentStack
-                    );
-                    task$jscomp$0.abortSet.delete(task$jscomp$0);
-                    segment$jscomp$0.status = 4;
-                    var boundary = task$jscomp$0.blockedBoundary,
-                      debugTask = task$jscomp$0.debugTask;
-                    "object" === typeof x$jscomp$0 &&
-                    null !== x$jscomp$0 &&
-                    x$jscomp$0.$$typeof === REACT_POSTPONE_TYPE
-                      ? (logPostpone(
-                          request,
-                          x$jscomp$0.message,
-                          errorInfo$jscomp$0,
-                          debugTask
-                        ),
-                        (prevTaskInDEV = "POSTPONE"))
-                      : (prevTaskInDEV = logRecoverableError(
-                          request,
-                          x$jscomp$0,
-                          errorInfo$jscomp$0,
-                          debugTask
-                        ));
-                    null === boundary
-                      ? fatalError(
-                          request,
-                          x$jscomp$0,
-                          errorInfo$jscomp$0,
-                          debugTask
-                        )
-                      : (boundary.pendingTasks--,
-                        4 !== boundary.status &&
-                          ((boundary.status = 4),
-                          encodeErrorForBoundary(
-                            boundary,
-                            prevTaskInDEV,
+                      task$jscomp$0.abortSet.delete(task$jscomp$0);
+                      "object" === typeof x$jscomp$0 &&
+                      null !== x$jscomp$0 &&
+                      x$jscomp$0.$$typeof === REACT_POSTPONE_TYPE
+                        ? logPostpone(
+                            request,
+                            x$jscomp$0.message,
+                            thrownInfo,
+                            task$jscomp$0.debugTask
+                          )
+                        : logRecoverableError(
+                            request,
                             x$jscomp$0,
+                            thrownInfo,
+                            task$jscomp$0.debugTask
+                          );
+                      trackPostpone(
+                        request,
+                        trackedPostpones,
+                        task$jscomp$0,
+                        segment$jscomp$0
+                      );
+                      finishedTask(
+                        request,
+                        task$jscomp$0.blockedBoundary,
+                        segment$jscomp$0
+                      );
+                    } else {
+                      if (
+                        "object" === typeof x$jscomp$0 &&
+                        null !== x$jscomp$0
+                      ) {
+                        if ("function" === typeof x$jscomp$0.then) {
+                          segment$jscomp$0.status = 0;
+                          task$jscomp$0.thenableState =
+                            getThenableStateAfterSuspending();
+                          var ping$jscomp$0 = task$jscomp$0.ping;
+                          x$jscomp$0.then(ping$jscomp$0, ping$jscomp$0);
+                          break a;
+                        }
+                        if (
+                          null !== request.trackedPostpones &&
+                          x$jscomp$0.$$typeof === REACT_POSTPONE_TYPE
+                        ) {
+                          var _trackedPostpones3 = request.trackedPostpones;
+                          task$jscomp$0.abortSet.delete(task$jscomp$0);
+                          var postponeInfo = getThrownInfo(
+                            task$jscomp$0.componentStack
+                          );
+                          logPostpone(
+                            request,
+                            x$jscomp$0.message,
+                            postponeInfo,
+                            task$jscomp$0.debugTask
+                          );
+                          trackPostpone(
+                            request,
+                            _trackedPostpones3,
+                            task$jscomp$0,
+                            segment$jscomp$0
+                          );
+                          finishedTask(
+                            request,
+                            task$jscomp$0.blockedBoundary,
+                            segment$jscomp$0
+                          );
+                          break a;
+                        }
+                      }
+                      var errorInfo$jscomp$0 = getThrownInfo(
+                        task$jscomp$0.componentStack
+                      );
+                      task$jscomp$0.abortSet.delete(task$jscomp$0);
+                      segment$jscomp$0.status = 4;
+                      var boundary = task$jscomp$0.blockedBoundary,
+                        debugTask = task$jscomp$0.debugTask;
+                      "object" === typeof x$jscomp$0 &&
+                      null !== x$jscomp$0 &&
+                      x$jscomp$0.$$typeof === REACT_POSTPONE_TYPE
+                        ? (logPostpone(
+                            request,
+                            x$jscomp$0.message,
                             errorInfo$jscomp$0,
-                            !1
+                            debugTask
                           ),
-                          untrackBoundary(request, boundary),
-                          boundary.parentFlushed &&
-                            request.clientRenderedBoundaries.push(boundary)));
-                    request.allPendingTasks--;
-                    0 === request.allPendingTasks && completeAll(request);
+                          (prevTaskInDEV = "POSTPONE"))
+                        : (prevTaskInDEV = logRecoverableError(
+                            request,
+                            x$jscomp$0,
+                            errorInfo$jscomp$0,
+                            debugTask
+                          ));
+                      null === boundary
+                        ? fatalError(
+                            request,
+                            x$jscomp$0,
+                            errorInfo$jscomp$0,
+                            debugTask
+                          )
+                        : (boundary.pendingTasks--,
+                          4 !== boundary.status &&
+                            ((boundary.status = 4),
+                            encodeErrorForBoundary(
+                              boundary,
+                              prevTaskInDEV,
+                              x$jscomp$0,
+                              errorInfo$jscomp$0,
+                              !1
+                            ),
+                            untrackBoundary(request, boundary),
+                            boundary.parentFlushed &&
+                              request.clientRenderedBoundaries.push(boundary)));
+                      request.allPendingTasks--;
+                      0 === request.allPendingTasks && completeAll(request);
+                    }
                   } finally {
                     currentTaskInDEV = request$jscomp$0;
                   }
@@ -11227,9 +11325,10 @@
     }
     function startWork(request) {
       request.flushScheduled = null !== request.destination;
-      performWork(request);
-      null === request.trackedPostpones &&
-        safelyEmitEarlyPreloads(request, 0 === request.pendingRootTasks);
+      null !== request.trackedPostpones
+        ? performWork(request)
+        : (performWork(request),
+          safelyEmitEarlyPreloads(request, 0 === request.pendingRootTasks));
     }
     function startFlowing(request, destination) {
       if (2 === request.status)
@@ -12846,5 +12945,5 @@
         });
       });
     };
-    exports.version = "19.0.0-experimental-a960b92c-20240819";
+    exports.version = "19.0.0-experimental-1d989965-20240821";
   })();