react-markup 0.0.0-experimental-5d87cd22-20250704 → 0.0.0-experimental-befc1246-20250708

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

@@ -661,8 +661,11 @@ function serializeThenable(request, task, thenable) {
         return (
           request.abortableTasks.delete(newTask),
           21 === request.type
-            ? haltTask(newTask, request)
-            : abortTask$1(newTask, request, request.fatalError),
+            ? (haltTask(newTask),
+              3 === newTask.status && request.pendingChunks--)
+            : ((task = request.fatalError),
+              abortTask$1(newTask),
+              finishAbortedTask(newTask, request, task)),
           newTask.id
         );
       "string" !== typeof thenable.status &&
@@ -729,8 +732,7 @@ function serializeReadableStream(request, task, stream) {
       signal.removeEventListener("abort", abortStream);
       signal = signal.reason;
       21 === request.type
-        ? (haltTask(streamTask, request),
-          request.abortableTasks.delete(streamTask))
+        ? (haltTask(streamTask), request.abortableTasks.delete(streamTask))
         : (erroredTask$1(request, streamTask, signal), enqueueFlush(request));
       reader.cancel(signal).then(error, error);
     }
@@ -812,8 +814,7 @@ function serializeAsyncIterable(request, task, iterable, iterator) {
       signal.removeEventListener("abort", abortIterable);
       var reason = signal.reason;
       21 === request.type
-        ? (haltTask(streamTask, request),
-          request.abortableTasks.delete(streamTask))
+        ? (haltTask(streamTask), request.abortableTasks.delete(streamTask))
         : (erroredTask$1(request, streamTask, signal.reason),
           enqueueFlush(request));
       "function" === typeof iterator.throw &&
@@ -1124,7 +1125,7 @@ function outlineModel(request, value) {
 function serializeTypedArray(request, tag, typedArray) {
   request.pendingChunks++;
   var bufferId = request.nextChunkId++;
-  emitTypedArrayChunk(request, bufferId, tag, typedArray);
+  emitTypedArrayChunk(request, bufferId, tag, typedArray, !1);
   return serializeByValueID$1(bufferId);
 }
 function serializeBlob(request, blob) {
@@ -1151,7 +1152,7 @@ function serializeBlob(request, blob) {
       signal.removeEventListener("abort", abortBlob);
       signal = signal.reason;
       21 === request.type
-        ? haltTask(newTask, request)
+        ? haltTask(newTask)
         : (erroredTask$1(request, newTask, signal), enqueueFlush(request));
       reader.cancel(signal).then(error, error);
     }
@@ -1509,7 +1510,7 @@ function emitErrorChunk(request, id, digest) {
   id = id.toString(16) + ":E" + stringify(digest) + "\n";
   request.completedErrorChunks.push(id);
 }
-function emitTypedArrayChunk(request, id, tag, typedArray) {
+function emitTypedArrayChunk(request, id, tag, typedArray, debug) {
   TaintRegistryByteLengths.has(typedArray.byteLength) &&
     ((id = TaintRegistryValues.get(
       String.fromCharCode.apply(
@@ -1522,37 +1523,37 @@ function emitTypedArrayChunk(request, id, tag, typedArray) {
       )
     )),
     void 0 !== id && throwTaintViolation(id.message));
-  request.pendingChunks++;
+  debug ? request.pendingDebugChunks++ : request.pendingChunks++;
   throw Error("Not implemented.");
 }
 function emitChunk(request, task, value) {
   var id = task.id;
   value instanceof ArrayBuffer
-    ? emitTypedArrayChunk(request, id, "A", new Uint8Array(value))
+    ? emitTypedArrayChunk(request, id, "A", new Uint8Array(value), !1)
     : value instanceof Int8Array
-      ? emitTypedArrayChunk(request, id, "O", value)
+      ? emitTypedArrayChunk(request, id, "O", value, !1)
       : value instanceof Uint8Array
-        ? emitTypedArrayChunk(request, id, "o", value)
+        ? emitTypedArrayChunk(request, id, "o", value, !1)
         : value instanceof Uint8ClampedArray
-          ? emitTypedArrayChunk(request, id, "U", value)
+          ? emitTypedArrayChunk(request, id, "U", value, !1)
           : value instanceof Int16Array
-            ? emitTypedArrayChunk(request, id, "S", value)
+            ? emitTypedArrayChunk(request, id, "S", value, !1)
             : value instanceof Uint16Array
-              ? emitTypedArrayChunk(request, id, "s", value)
+              ? emitTypedArrayChunk(request, id, "s", value, !1)
               : value instanceof Int32Array
-                ? emitTypedArrayChunk(request, id, "L", value)
+                ? emitTypedArrayChunk(request, id, "L", value, !1)
                 : value instanceof Uint32Array
-                  ? emitTypedArrayChunk(request, id, "l", value)
+                  ? emitTypedArrayChunk(request, id, "l", value, !1)
                   : value instanceof Float32Array
-                    ? emitTypedArrayChunk(request, id, "G", value)
+                    ? emitTypedArrayChunk(request, id, "G", value, !1)
                     : value instanceof Float64Array
-                      ? emitTypedArrayChunk(request, id, "g", value)
+                      ? emitTypedArrayChunk(request, id, "g", value, !1)
                       : value instanceof BigInt64Array
-                        ? emitTypedArrayChunk(request, id, "M", value)
+                        ? emitTypedArrayChunk(request, id, "M", value, !1)
                         : value instanceof BigUint64Array
-                          ? emitTypedArrayChunk(request, id, "m", value)
+                          ? emitTypedArrayChunk(request, id, "m", value, !1)
                           : value instanceof DataView
-                            ? emitTypedArrayChunk(request, id, "V", value)
+                            ? emitTypedArrayChunk(request, id, "V", value, !1)
                             : ((value = stringify(value, task.toJSON)),
                               (task =
                                 task.id.toString(16) + ":" + value + "\n"),
@@ -1603,11 +1604,17 @@ function retryTask$1(request, task) {
       callOnAllReadyIfReady(request);
     } catch (thrownValue) {
       if (12 === request.status)
-        request.abortableTasks.delete(task),
+        if (
+          (request.abortableTasks.delete(task),
           (task.status = 0),
-          21 === request.type
-            ? haltTask(task, request)
-            : abortTask$1(task, request, request.fatalError);
+          21 === request.type)
+        )
+          haltTask(task), 3 === task.status && request.pendingChunks--;
+        else {
+          var errorId = request.fatalError;
+          abortTask$1(task);
+          finishAbortedTask(task, request, errorId);
+        }
       else {
         var x =
           thrownValue === SuspenseException$1
@@ -1657,15 +1664,17 @@ function performWork$1(request) {
       (currentRequest = prevRequest);
   }
 }
-function abortTask$1(task, request, errorId) {
-  5 !== task.status &&
-    ((task.status = 3),
-    (errorId = serializeByValueID$1(errorId)),
+function abortTask$1(task) {
+  0 === task.status && (task.status = 3);
+}
+function finishAbortedTask(task, request, errorId) {
+  3 === task.status &&
+    ((errorId = serializeByValueID$1(errorId)),
     (task = encodeReferenceChunk(request, task.id, errorId)),
     request.completedErrorChunks.push(task));
 }
-function haltTask(task, request) {
-  5 !== task.status && ((task.status = 3), request.pendingChunks--);
+function haltTask(task) {
+  0 === task.status && (task.status = 3);
 }
 function flushCompletedChunks(request, destination) {
   try {
@@ -1734,59 +1743,92 @@ function callOnAllReadyIfReady(request) {
   0 === request.abortableTasks.size &&
     ((request = request.onAllReady), request());
 }
-function abort$1(request, reason) {
+function finishHalt(request, abortedTasks) {
   try {
-    11 >= request.status &&
-      ((request.status = 12),
-      request.cacheController.abort(reason),
-      callOnAllReadyIfReady(request));
-    var abortableTasks = request.abortableTasks;
-    if (0 < abortableTasks.size) {
-      if (21 === request.type)
-        abortableTasks.forEach(function (task) {
-          return haltTask(task, request);
-        });
-      else if (
-        "object" === typeof reason &&
-        null !== reason &&
-        reason.$$typeof === REACT_POSTPONE_TYPE
-      ) {
-        logPostpone$1(request, reason.message, null);
-        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
-              ? Error("The render was aborted by the server without a reason.")
-              : "object" === typeof reason &&
-                  null !== reason &&
-                  "function" === typeof reason.then
-                ? Error("The render was aborted by the server with a promise.")
-                : reason,
-          digest = logRecoverableError$1(request, error, null),
-          errorId$28 = request.nextChunkId++;
-        request.fatalError = errorId$28;
-        request.pendingChunks++;
-        emitErrorChunk(request, errorId$28, digest, error, !1);
-        abortableTasks.forEach(function (task) {
-          return abortTask$1(task, request, errorId$28);
-        });
-      }
-      abortableTasks.clear();
-      callOnAllReadyIfReady(request);
-    }
+    abortedTasks.forEach(function (task) {
+      3 === task.status && request.pendingChunks--;
+    });
+    var onAllReady = request.onAllReady;
+    onAllReady();
     null !== request.destination &&
       flushCompletedChunks(request, request.destination);
-  } catch (error$29) {
-    logRecoverableError$1(request, error$29, null),
-      fatalError$1(request, error$29);
+  } catch (error) {
+    logRecoverableError$1(request, error, null), fatalError$1(request, error);
+  }
+}
+function finishAbort(request, abortedTasks, errorId) {
+  try {
+    abortedTasks.forEach(function (task) {
+      return finishAbortedTask(task, request, errorId);
+    });
+    var onAllReady = request.onAllReady;
+    onAllReady();
+    null !== request.destination &&
+      flushCompletedChunks(request, request.destination);
+  } catch (error) {
+    logRecoverableError$1(request, error, null), fatalError$1(request, error);
   }
 }
+function abort$1(request, reason) {
+  if (!(11 < request.status))
+    try {
+      request.status = 12;
+      request.cacheController.abort(reason);
+      var abortableTasks = request.abortableTasks;
+      if (0 < abortableTasks.size)
+        if (21 === request.type)
+          abortableTasks.forEach(function (task) {
+            return haltTask(task, request);
+          }),
+            finishHalt(request, abortableTasks);
+        else if (
+          "object" === typeof reason &&
+          null !== reason &&
+          reason.$$typeof === REACT_POSTPONE_TYPE
+        ) {
+          logPostpone$1(request, reason.message, null);
+          var errorId = request.nextChunkId++;
+          request.fatalError = errorId;
+          request.pendingChunks++;
+          emitPostponeChunk(request, errorId, reason);
+          abortableTasks.forEach(function (task) {
+            return abortTask$1(task, request, errorId);
+          });
+          finishAbort(request, abortableTasks, errorId);
+        } else {
+          var error =
+              void 0 === reason
+                ? Error(
+                    "The render was aborted by the server without a reason."
+                  )
+                : "object" === typeof reason &&
+                    null !== reason &&
+                    "function" === typeof reason.then
+                  ? Error(
+                      "The render was aborted by the server with a promise."
+                    )
+                  : reason,
+            digest = logRecoverableError$1(request, error, null),
+            errorId$28 = request.nextChunkId++;
+          request.fatalError = errorId$28;
+          request.pendingChunks++;
+          emitErrorChunk(request, errorId$28, digest, error, !1);
+          abortableTasks.forEach(function (task) {
+            return abortTask$1(task, request, errorId$28);
+          });
+          finishAbort(request, abortableTasks, errorId$28);
+        }
+      else {
+        var onAllReady = request.onAllReady;
+        onAllReady();
+        null !== request.destination &&
+          flushCompletedChunks(request, request.destination);
+      }
+    } catch (error$29) {
+      logRecoverableError$1(request, error$29, null),
+        fatalError$1(request, error$29);
+    }
+}
 var bind$1 = Function.prototype.bind,
   ObjectPrototype = Object.prototype,
   knownServerReferences = new WeakMap();
@@ -2511,15 +2553,13 @@ function wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners) {
       rejectListeners && rejectChunk(rejectListeners, chunk.reason);
   }
 }
-function triggerErrorOnChunk(chunk, error) {
-  if ("pending" !== chunk.status && "blocked" !== chunk.status)
-    chunk.reason.error(error);
-  else {
-    var listeners = chunk.reason;
-    chunk.status = "rejected";
-    chunk.reason = error;
-    null !== listeners && rejectChunk(listeners, error);
-  }
+function triggerErrorOnChunk(response, chunk, error) {
+  "pending" !== chunk.status && "blocked" !== chunk.status
+    ? chunk.reason.error(error)
+    : ((response = chunk.reason),
+      (chunk.status = "rejected"),
+      (chunk.reason = error),
+      null !== response && rejectChunk(response, error));
 }
 function createResolvedIteratorResultChunk(response, value, done) {
   return new ReactPromise(
@@ -2589,11 +2629,12 @@ function initializeModuleChunk(chunk) {
     (chunk.status = "rejected"), (chunk.reason = error);
   }
 }
-function reportGlobalError(response, error) {
-  response._closed = !0;
-  response._closedReason = error;
-  response._chunks.forEach(function (chunk) {
-    "pending" === chunk.status && triggerErrorOnChunk(chunk, error);
+function reportGlobalError(weakResponse, error) {
+  weakResponse._closed = !0;
+  weakResponse._closedReason = error;
+  weakResponse._chunks.forEach(function (chunk) {
+    "pending" === chunk.status &&
+      triggerErrorOnChunk(weakResponse, chunk, error);
   });
 }
 function createLazyChunkWrapper(chunk) {
@@ -2684,14 +2725,15 @@ function fulfillReference(reference, value) {
       null !== parentObject && wakeChunk(parentObject, handler.value)));
 }
 function rejectReference(reference, error) {
-  reference = reference.handler;
-  reference.errored ||
-    ((reference.errored = !0),
-    (reference.value = error),
-    (reference = reference.chunk),
-    null !== reference &&
-      "blocked" === reference.status &&
-      triggerErrorOnChunk(reference, error));
+  var handler = reference.handler;
+  reference = reference.response;
+  handler.errored ||
+    ((handler.errored = !0),
+    (handler.value = error),
+    (handler = handler.chunk),
+    null !== handler &&
+      "blocked" === handler.status &&
+      triggerErrorOnChunk(reference, handler, error));
 }
 function waitForReference(
   referencedChunk,
@@ -3174,7 +3216,7 @@ function startAsyncIterable(response, id, iterator) {
           nextWriteIndex < buffer.length;
 
         )
-          triggerErrorOnChunk(buffer[nextWriteIndex++], error);
+          triggerErrorOnChunk(response, buffer[nextWriteIndex++], error);
       }
     }
   );
@@ -6664,6 +6706,13 @@ function pushComponentStack(task) {
         task.componentStack = { parent: task.componentStack, type: node.type };
     }
 }
+function replaceSuspenseComponentStackWithSuspenseFallbackStack(
+  componentStack
+) {
+  return null === componentStack
+    ? null
+    : { parent: componentStack.parent, type: "Suspense Fallback" };
+}
 function getThrownInfo(node$jscomp$0) {
   var errorInfo = {};
   node$jscomp$0 &&
@@ -7125,25 +7174,14 @@ function renderElement(request, task, keyPath, type, props, ref) {
           !1
         );
         segment.preambleChildren.push(preambleSegment);
-        var preambleTask = createRenderTask(
-          request,
-          null,
-          JSCompiler_inline_result$jscomp$2,
-          -1,
-          task.blockedBoundary,
-          preambleSegment,
-          task.blockedPreamble,
-          task.hoistableState,
-          request.abortableTasks,
-          task.keyPath,
-          task.formatContext,
-          task.context,
-          task.treeContext,
-          task.row,
-          task.componentStack
-        );
-        pushComponentStack(preambleTask);
-        request.pingedTasks.push(preambleTask);
+        task.blockedSegment = preambleSegment;
+        try {
+          (preambleSegment.status = 6),
+            renderNode(request, task, JSCompiler_inline_result$jscomp$2, -1),
+            (preambleSegment.status = 1);
+        } finally {
+          task.blockedSegment = segment;
+        }
       } else renderNode(request, task, JSCompiler_inline_result$jscomp$2, -1);
       task.formatContext = prevContext$97;
       task.keyPath = prevKeyPath$98;
@@ -7411,7 +7449,8 @@ function renderElement(request, task, keyPath, type, props, ref) {
           );
           contentRootSegment.parentFlushed = !0;
           if (null !== request.trackedPostpones) {
-            var fallbackKeyPath = [keyPath[0], "Suspense Fallback", keyPath[2]],
+            var suspenseComponentStack = task.componentStack,
+              fallbackKeyPath = [keyPath[0], "Suspense Fallback", keyPath[2]],
               fallbackReplayNode = [
                 fallbackKeyPath[1],
                 fallbackKeyPath[2],
@@ -7430,6 +7469,10 @@ function renderElement(request, task, keyPath, type, props, ref) {
               request.resumableState,
               prevContext$jscomp$1
             );
+            task.componentStack =
+              replaceSuspenseComponentStackWithSuspenseFallbackStack(
+                suspenseComponentStack
+              );
             boundarySegment.status = 6;
             try {
               renderNode(request, task, fallback, -1),
@@ -7463,7 +7506,7 @@ function renderElement(request, task, keyPath, type, props, ref) {
               task.context,
               task.treeContext,
               null,
-              task.componentStack
+              suspenseComponentStack
             );
             pushComponentStack(suspendedPrimaryTask);
             request.pingedTasks.push(suspendedPrimaryTask);
@@ -7544,7 +7587,9 @@ function renderElement(request, task, keyPath, type, props, ref) {
               task.context,
               task.treeContext,
               task.row,
-              task.componentStack
+              replaceSuspenseComponentStackWithSuspenseFallbackStack(
+                task.componentStack
+              )
             );
             pushComponentStack(suspendedFallbackTask);
             request.pingedTasks.push(suspendedFallbackTask);
@@ -7859,7 +7904,9 @@ function retryNode(request, task) {
                         task.context,
                         task.treeContext,
                         task.row,
-                        task.componentStack
+                        replaceSuspenseComponentStackWithSuspenseFallbackStack(
+                          task.componentStack
+                        )
                       );
                       pushComponentStack(task);
                       request.pingedTasks.push(task);
@@ -9578,12 +9625,13 @@ exports.experimental_renderToHTML = function (children, options) {
         push: function (chunk) {
           if (null !== chunk) {
             for (
-              var i = 0,
-                rowState = flightResponse._rowState,
-                rowID = flightResponse._rowID,
-                rowTag = flightResponse._rowTag,
-                rowLength = flightResponse._rowLength,
-                buffer = flightResponse._buffer,
+              var response = flightResponse,
+                i = 0,
+                rowState = response._rowState,
+                rowID = response._rowID,
+                rowTag = response._rowTag,
+                rowLength = response._rowLength,
+                buffer = response._buffer,
                 chunkLength = chunk.length;
               i < chunkLength;
 
@@ -9652,27 +9700,27 @@ exports.experimental_renderToHTML = function (children, options) {
                 switch (rowTag) {
                   case 73:
                     throw (
-                      (flightResponse._chunks.get(rowID),
-                      JSON.parse(i, flightResponse._fromJSON),
+                      (response._chunks.get(rowID),
+                      JSON.parse(i, response._fromJSON),
                       Error(
                         "renderToHTML should not have emitted Client References. This is a bug in React."
                       ))
                     );
                   case 72:
                     rowID = i.slice(1);
-                    JSON.parse(rowID, flightResponse._fromJSON);
+                    JSON.parse(rowID, response._fromJSON);
                     break;
                   case 69:
                     rowTag = JSON.parse(i);
                     i = resolveErrorProd();
                     i.digest = rowTag.digest;
-                    rowTag = flightResponse._chunks;
+                    rowTag = response._chunks;
                     (rowLength = rowTag.get(rowID))
-                      ? triggerErrorOnChunk(rowLength, i)
-                      : rowTag.set(rowID, createErrorChunk(flightResponse, i));
+                      ? triggerErrorOnChunk(response, rowLength, i)
+                      : rowTag.set(rowID, createErrorChunk(response, i));
                     break;
                   case 84:
-                    rowTag = flightResponse._chunks;
+                    rowTag = response._chunks;
                     (rowLength = rowTag.get(rowID)) &&
                     "pending" !== rowLength.status
                       ? rowLength.reason.enqueueValue(i)
@@ -9689,19 +9737,19 @@ exports.experimental_renderToHTML = function (children, options) {
                       "Failed to read a RSC payload created by a development version of React on the server while using a production version on the client. Always use matching versions on the server and the client."
                     );
                   case 82:
-                    startReadableStream(flightResponse, rowID, void 0);
+                    startReadableStream(response, rowID, void 0);
                     break;
                   case 114:
-                    startReadableStream(flightResponse, rowID, "bytes");
+                    startReadableStream(response, rowID, "bytes");
                     break;
                   case 88:
-                    startAsyncIterable(flightResponse, rowID, !1);
+                    startAsyncIterable(response, rowID, !1);
                     break;
                   case 120:
-                    startAsyncIterable(flightResponse, rowID, !0);
+                    startAsyncIterable(response, rowID, !0);
                     break;
                   case 67:
-                    (rowID = flightResponse._chunks.get(rowID)) &&
+                    (rowID = response._chunks.get(rowID)) &&
                       "fulfilled" === rowID.status &&
                       rowID.reason.close("" === i ? '"$undefined"' : i);
                     break;
@@ -9711,22 +9759,18 @@ exports.experimental_renderToHTML = function (children, options) {
                     );
                     i.$$typeof = REACT_POSTPONE_TYPE;
                     i.stack = "Error: " + i.message;
-                    rowTag = flightResponse._chunks;
+                    rowTag = response._chunks;
                     (rowLength = rowTag.get(rowID))
-                      ? triggerErrorOnChunk(rowLength, i)
-                      : rowTag.set(rowID, createErrorChunk(flightResponse, i));
+                      ? triggerErrorOnChunk(response, rowLength, i)
+                      : rowTag.set(rowID, createErrorChunk(response, i));
                     break;
                   default:
-                    (rowTag = flightResponse._chunks),
+                    (rowTag = response._chunks),
                       (rowLength = rowTag.get(rowID))
-                        ? resolveModelChunk(flightResponse, rowLength, i)
+                        ? resolveModelChunk(response, rowLength, i)
                         : rowTag.set(
                             rowID,
-                            new ReactPromise(
-                              "resolved_model",
-                              i,
-                              flightResponse
-                            )
+                            new ReactPromise("resolved_model", i, response)
                           );
                 }
                 i = lastIdx;
@@ -9738,10 +9782,10 @@ exports.experimental_renderToHTML = function (children, options) {
                   "String chunks need to be passed in their original shape. Not split into smaller string chunks. This is a bug in the wiring of the React streams."
                 );
             }
-            flightResponse._rowState = rowState;
-            flightResponse._rowID = rowID;
-            flightResponse._rowTag = rowTag;
-            flightResponse._rowLength = rowLength;
+            response._rowState = rowState;
+            response._rowID = rowID;
+            response._rowTag = rowTag;
+            response._rowLength = rowLength;
           } else reportGlobalError(flightResponse, Error("Connection closed."));
           return !0;
         },
@@ -9861,4 +9905,4 @@ exports.experimental_renderToHTML = function (children, options) {
     });
   });
 };
-exports.version = "19.2.0-experimental-5d87cd22-20250704";
+exports.version = "19.2.0-experimental-befc1246-20250708";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-markup",
-  "version": "0.0.0-experimental-5d87cd22-20250704",
+  "version": "0.0.0-experimental-befc1246-20250708",
   "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-5d87cd22-20250704"
+    "react": "0.0.0-experimental-befc1246-20250708"
   },
   "files": [
     "LICENSE",