react-markup 0.0.0-experimental-1eaccd82-20240816 → 0.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) {
@@ -869,10 +871,10 @@
         default:
           if (request.status === ABORTING$1)
             return (
+              request.abortableTasks.delete(newTask),
               (newTask.status = ABORTED$1),
               (task = stringify(serializeByValueID$1(request.fatalError))),
               emitModelChunk(request, newTask.id, task),
-              request.abortableTasks.delete(newTask),
               newTask.id
             );
           "string" !== typeof thenable.status &&
@@ -917,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),
@@ -936,19 +938,34 @@
       function error(reason) {
         if (!aborted) {
           aborted = !0;
-          request.abortListeners.delete(error);
+          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),
-              emitPostponeChunk(request, streamTask.id, reason);
+              request.type === PRERENDER
+                ? request.pendingChunks--
+                : (emitPostponeChunk(request, streamTask.id, reason),
+                  enqueueFlush(request));
           else {
             var digest = logRecoverableError$1(request, reason, streamTask);
-            emitErrorChunk(request, streamTask.id, digest, reason);
+            request.type === PRERENDER
+              ? request.pendingChunks--
+              : (emitErrorChunk(request, streamTask.id, digest, reason),
+                enqueueFlush(request));
           }
-          enqueueFlush(request);
           reader.cancel(reason).then(error, error);
         }
       }
@@ -976,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);
     }
@@ -984,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
@@ -1016,19 +1033,35 @@
       function error(reason) {
         if (!aborted) {
           aborted = !0;
-          request.abortListeners.delete(error);
+          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),
-              emitPostponeChunk(request, streamTask.id, reason);
+              request.type === PRERENDER
+                ? request.pendingChunks--
+                : (emitPostponeChunk(request, streamTask.id, reason),
+                  enqueueFlush(request));
           else {
             var digest = logRecoverableError$1(request, reason, streamTask);
-            emitErrorChunk(request, streamTask.id, digest, reason);
+            request.type === PRERENDER
+              ? request.pendingChunks--
+              : (emitErrorChunk(request, streamTask.id, digest, reason),
+                enqueueFlush(request));
           }
-          enqueueFlush(request);
           "function" === typeof iterator.throw &&
             iterator.throw(reason).then(error, error);
         }
@@ -1051,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);
     }
@@ -1563,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
@@ -1574,14 +1607,37 @@
       function error(reason) {
         if (!aborted) {
           aborted = !0;
-          request.abortListeners.delete(error);
+          request.abortListeners.delete(abortBlob);
           var digest = logRecoverableError$1(request, reason, newTask);
           emitErrorChunk(request, newTask.id, digest, reason);
-          request.abortableTasks.delete(newTask);
           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 {
+            var digest = logRecoverableError$1(request, reason, newTask);
+            request.type === PRERENDER
+              ? request.pendingChunks--
+              : (emitErrorChunk(request, newTask.id, digest, reason),
+                enqueueFlush(request));
+          }
+          reader.cancel(reason).then(error, error);
+        }
+      }
       var model = [blob.type],
         newTask = createTask(
           request,
@@ -1595,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);
     }
@@ -2454,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 = [];
@@ -2461,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();
         }
@@ -2550,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 (
@@ -2562,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
@@ -2577,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) {
@@ -2588,6 +2648,8 @@
             }
           });
           abortableTasks.clear();
+          var onAllReady = request.onAllReady;
+          onAllReady();
         }
         var abortListeners = request.abortListeners;
         if (0 < abortListeners.size) {
@@ -3143,6 +3205,49 @@
           );
       }
     }
+    function createFakeServerFunction(
+      name,
+      filename,
+      sourceMap,
+      line,
+      col,
+      environmentName,
+      innerFunction
+    ) {
+      name || (name = "<anonymous>");
+      var encodedName = JSON.stringify(name);
+      1 >= line
+        ? ((line = encodedName.length + 7),
+          (col =
+            "s=>({" +
+            encodedName +
+            " ".repeat(col < line ? 0 : col - line) +
+            ":(...args) => s(...args)})\n/* This module is a proxy to a Server Action. Turn on Source Maps to see the server source. */"))
+        : (col =
+            "/* This module is a proxy to a Server Action. Turn on Source Maps to see the server source. */" +
+            "\n".repeat(line - 2) +
+            "server=>({" +
+            encodedName +
+            ":\n" +
+            " ".repeat(1 > col ? 0 : col - 1) +
+            "(...args) => server(...args)})");
+      filename.startsWith("/") && (filename = "file://" + filename);
+      sourceMap
+        ? ((col +=
+            "\n//# sourceURL=rsc://React/" +
+            encodeURIComponent(environmentName) +
+            "/" +
+            filename +
+            "?s" +
+            fakeServerFunctionIdx++),
+          (col += "\n//# sourceMappingURL=" + sourceMap))
+        : filename && (col += "\n//# sourceURL=" + filename);
+      try {
+        return (0, eval)(col)(innerFunction)[name];
+      } catch (x) {
+        return innerFunction;
+      }
+    }
     function registerServerReference(
       proxy,
       reference$jscomp$0,
@@ -3197,6 +3302,52 @@
       }
       return newFn;
     }
+    function createBoundServerReference(
+      metaData,
+      callServer,
+      encodeFormAction,
+      findSourceMapURL
+    ) {
+      function action() {
+        var args = Array.prototype.slice.call(arguments);
+        return bound
+          ? "fulfilled" === bound.status
+            ? callServer(id, bound.value.concat(args))
+            : Promise.resolve(bound).then(function (boundArgs) {
+                return callServer(id, boundArgs.concat(args));
+              })
+          : callServer(id, args);
+      }
+      var id = metaData.id,
+        bound = metaData.bound,
+        location = metaData.location;
+      if (location) {
+        var functionName = metaData.name || "",
+          filename = location[1],
+          line = location[2];
+        location = location[3];
+        metaData = metaData.env || "Server";
+        findSourceMapURL =
+          null == findSourceMapURL
+            ? null
+            : findSourceMapURL(filename, metaData);
+        action = createFakeServerFunction(
+          functionName,
+          filename,
+          findSourceMapURL,
+          line,
+          location,
+          metaData,
+          action
+        );
+      }
+      registerServerReference(
+        action,
+        { id: id, bound: bound },
+        encodeFormAction
+      );
+      return action;
+    }
     function getComponentNameFromType(type) {
       if (null == type) return null;
       if ("function" === typeof type)
@@ -3253,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;
@@ -3279,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);
@@ -3320,7 +3471,7 @@
       }
     }
     function createResolvedIteratorResultChunk(response, value, done) {
-      return new Chunk(
+      return new ReactPromise(
         "resolved_model",
         (done ? '{"done":true,"value":' : '{"done":false,"value":') +
           value +
@@ -3511,20 +3662,12 @@
       return null;
     }
     function createServerReferenceProxy(response, metaData) {
-      function proxy() {
-        var args = Array.prototype.slice.call(arguments),
-          p = metaData.bound;
-        return p
-          ? "fulfilled" === p.status
-            ? callServer(metaData.id, p.value.concat(args))
-            : Promise.resolve(p).then(function (bound) {
-                return callServer(metaData.id, bound.concat(args));
-              })
-          : callServer(metaData.id, args);
-      }
-      var callServer = response._callServer;
-      registerServerReference(proxy, metaData, response._encodeFormAction);
-      return proxy;
+      return createBoundServerReference(
+        metaData,
+        response._callServer,
+        response._encodeFormAction,
+        response._debugFindSourceMapURL
+      );
     }
     function getOutlinedModel(response, reference, parentObject, key, map) {
       reference = reference.split(":");
@@ -3788,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;
@@ -3809,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)
@@ -3883,7 +4034,7 @@
               );
             if (nextReadIndex === buffer.length) {
               if (closed)
-                return new Chunk(
+                return new ReactPromise(
                   "fulfilled",
                   { done: !0, value: void 0 },
                   null,
@@ -3901,7 +4052,7 @@
         {
           enqueueValue: function (value) {
             if (nextWriteIndex === buffer.length)
-              buffer[nextWriteIndex] = new Chunk(
+              buffer[nextWriteIndex] = new ReactPromise(
                 "fulfilled",
                 { done: !1, value: value },
                 null,
@@ -4180,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
@@ -4190,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)),
@@ -8694,7 +8850,7 @@
             } else internalInstance.queue = null;
           }
           var nextChildren = callRenderInDEV(instance);
-          if (1 === request.status) throw AbortSigil;
+          if (1 === request.status) throw null;
           instance.props !== resolvedProps &&
             (didWarnAboutReassigningProps ||
               console.error(
@@ -8726,7 +8882,7 @@
             props,
             void 0
           );
-          if (1 === request.status) throw AbortSigil;
+          if (1 === request.status) throw null;
           var hasId = 0 !== localIdCounter,
             actionStateCount = actionStateCounter,
             actionStateMatchingIndex$jscomp$0 = actionStateMatchingIndex;
@@ -8966,8 +9122,7 @@
                     (boundarySegment.status = 1);
                 } catch (thrownValue) {
                   throw (
-                    ((boundarySegment.status =
-                      thrownValue === AbortSigil ? 3 : 4),
+                    ((boundarySegment.status = 1 === request.status ? 3 : 4),
                     thrownValue)
                   );
                 } finally {
@@ -9012,7 +9167,7 @@
                   }
                 } catch (thrownValue$6) {
                   newBoundary.status = 4;
-                  if (thrownValue$6 === AbortSigil) {
+                  if (1 === request.status) {
                     contentRootSegment.status = 3;
                     var error = request.fatalError;
                   } else
@@ -9173,7 +9328,7 @@
               return;
             case REACT_LAZY_TYPE:
               var Component = callLazyInitInDEV(type);
-              if (1 === request.status) throw AbortSigil;
+              if (1 === request.status) throw null;
               renderElement(request, task, keyPath, Component, props, ref);
               return;
           }
@@ -9464,7 +9619,7 @@
               );
             case REACT_LAZY_TYPE:
               node = callLazyInitInDEV(node);
-              if (1 === request.status) throw AbortSigil;
+              if (1 === request.status) throw null;
               renderNodeDestructive(request, task, node, childIndex);
               return;
           }
@@ -10386,7 +10541,9 @@
                     erroredReplay(
                       request$jscomp$0,
                       request.blockedBoundary,
-                      x === AbortSigil ? request$jscomp$0.fatalError : x,
+                      1 === request$jscomp$0.status
+                        ? request$jscomp$0.fatalError
+                        : x,
                       errorInfo,
                       request.replay.nodes,
                       request.replay.slots,
@@ -10431,7 +10588,7 @@
                     var x$jscomp$0 =
                       thrownValue === SuspenseException
                         ? getSuspendedThenable()
-                        : thrownValue === AbortSigil
+                        : 1 === request.status
                           ? request.fatalError
                           : thrownValue;
                     if ("object" === typeof x$jscomp$0 && null !== x$jscomp$0) {
@@ -11347,9 +11504,10 @@
         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,
       modelRoot = !1,
@@ -11358,14 +11516,15 @@
       ObjectPrototype = Object.prototype,
       knownServerReferences = new WeakMap(),
       boundCache = new WeakMap(),
+      fakeServerFunctionIdx = 0,
       FunctionBind = Function.prototype.bind,
       ArraySlice = Array.prototype.slice,
       REACT_CLIENT_REFERENCE = Symbol.for("react.client.reference"),
       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);
@@ -12319,7 +12478,6 @@
       },
       callLazyInitInDEV =
         callLazyInit["react-stack-bottom-frame"].bind(callLazyInit),
-      AbortSigil = {},
       didWarnAboutBadClass = {},
       didWarnAboutContextTypes = {},
       didWarnAboutContextTypeOnFunctionComponent = {},
@@ -12333,6 +12491,7 @@
           stashErrorIdx = 1,
           stashedErrors = new Map(),
           flightRequest = new RequestInstance$1(
+            20,
             children,
             null,
             function (error) {
@@ -12345,8 +12504,8 @@
             void 0,
             "Markup",
             void 0,
-            void 0,
-            void 0
+            noop$3,
+            noop$3
           ),
           flightResponse = new ResponseInstance(
             null,
@@ -12536,7 +12695,7 @@
                         ? triggerErrorOnChunk(error, rowTag)
                         : rowLength.set(
                             rowID,
-                            new Chunk("rejected", null, rowTag, i)
+                            new ReactPromise("rejected", null, rowTag, i)
                           );
                       break;
                     case 84:
@@ -12545,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:
@@ -12633,7 +12792,7 @@
                         ? triggerErrorOnChunk(error, rowTag)
                         : rowLength.set(
                             rowID,
-                            new Chunk("rejected", null, rowTag, i)
+                            new ReactPromise("rejected", null, rowTag, i)
                           );
                       break;
                     default:
@@ -12642,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;
@@ -12682,5 +12846,5 @@
         });
       });
     };
-    exports.version = "19.0.0-experimental-1eaccd82-20240816";
+    exports.version = "19.0.0-experimental-a960b92c-20240819";
   })();