react-markup 0.0.0-experimental-3edc000d-20240926 → 0.0.0-experimental-d8c90fa4-20241001

package/cjs/react-markup.development.js

@@ -8625,5 +8625,5 @@
         });
       });
     };
-    exports.version = "19.0.0-experimental-3edc000d-20240926";
+    exports.version = "19.0.0-experimental-d8c90fa4-20241001";
   })();

package/cjs/react-markup.production.js

@@ -5703,4 +5703,4 @@ exports.experimental_renderToHTML = function (children, options) {
     });
   });
 };
-exports.version = "19.0.0-experimental-3edc000d-20240926";
+exports.version = "19.0.0-experimental-d8c90fa4-20241001";

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

@@ -1171,9 +1171,10 @@
           null === task.debugStack
             ? null
             : filterStackTrace(request, task.debugStack, 1);
+        componentDebugInfo.props = props;
         componentDebugInfo.debugStack = task.debugStack;
         componentDebugInfo.debugTask = task.debugTask;
-        outlineModel(request, componentDebugInfo);
+        outlineComponentInfo(request, componentDebugInfo);
         emitDebugChunk(request, componentDebugID, componentDebugInfo);
         task.environmentName = componentEnv;
         2 === validated &&
@@ -1383,6 +1384,7 @@
                   null === task.debugStack
                     ? null
                     : filterStackTrace(request, task.debugStack, 1),
+                props: props,
                 debugStack: task.debugStack,
                 debugTask: task.debugTask
               }),
@@ -1450,6 +1452,8 @@
         );
       ref = task.keyPath;
       null === key ? (key = ref) : null !== ref && (key = ref + "," + key);
+      null !== task.debugOwner &&
+        outlineComponentInfo(request, task.debugOwner);
       request = [
         REACT_ELEMENT_TYPE,
         type,
@@ -1657,18 +1661,6 @@
       reader.read().then(progress).catch(error);
       return "$B" + newTask.id.toString(16);
     }
-    function isReactComponentInfo(value) {
-      return (
-        (("object" === typeof value.debugTask &&
-          null !== value.debugTask &&
-          "function" === typeof value.debugTask.run) ||
-          value.debugStack instanceof Error) &&
-        (isArrayImpl(value.stack) || null === value.stack) &&
-        "string" === typeof value.name &&
-        "string" === typeof value.env &&
-        void 0 !== value.owner
-      );
-    }
     function renderModel(request, task, parent, key, value) {
       var prevKeyPath = task.keyPath,
         prevImplicitSlot = task.implicitSlot;
@@ -1877,6 +1869,7 @@
         if (value instanceof Set) return serializeSet(request, value);
         if ("function" === typeof FormData && value instanceof FormData)
           return serializeFormData(request, value);
+        if (value instanceof Error) return serializeErrorValue(request, value);
         if (value instanceof ArrayBuffer)
           return serializeTypedArray(request, "A", new Uint8Array(value));
         if (value instanceof Int8Array)
@@ -1931,17 +1924,6 @@
             "Only plain objects, and a few built-ins, can be passed to Client Components from Server Components. Classes or null prototypes are not supported." +
               describeObjectForErrorMessage(parent, parentPropertyName)
           );
-        if (isReactComponentInfo(value))
-          return (
-            (request = {
-              name: value.name,
-              env: value.env,
-              key: value.key,
-              owner: value.owner
-            }),
-            (request.stack = value.stack),
-            request
-          );
         if ("Object" !== objectName(value))
           callWithDebugContextInDEV(request, task, function () {
             console.error(
@@ -2119,6 +2101,27 @@
         "\n";
       request.completedErrorChunks.push(id);
     }
+    function serializeErrorValue(request, error) {
+      var env = (0, request.environmentName)();
+      try {
+        var message = String(error.message);
+        var stack = filterStackTrace(request, error, 0);
+        var errorEnv = error.environmentName;
+        "string" === typeof errorEnv && (env = errorEnv);
+      } catch (x) {
+        (message =
+          "An error occurred but serializing the error message failed."),
+          (stack = []);
+      }
+      return (
+        "$Z" +
+        outlineModel(request, {
+          message: message,
+          stack: stack,
+          env: env
+        }).toString(16)
+      );
+    }
     function emitErrorChunk(request, id, digest, error) {
       var env = (0, request.environmentName)();
       try {
@@ -2151,7 +2154,7 @@
       request.completedRegularChunks.push(id);
     }
     function emitDebugChunk(request, id, debugInfo) {
-      var counter = { objectCount: 0 };
+      var counter = { objectLimit: 500 };
       debugInfo = stringify(debugInfo, function (parentPropertyName, value) {
         return renderConsoleValue(
           request,
@@ -2164,6 +2167,33 @@
       id = id.toString(16) + ":D" + debugInfo + "\n";
       request.completedRegularChunks.push(id);
     }
+    function outlineComponentInfo(request, componentInfo) {
+      if (!request.writtenObjects.has(componentInfo)) {
+        null != componentInfo.owner &&
+          outlineComponentInfo(request, componentInfo.owner);
+        var objectLimit = 10;
+        null != componentInfo.stack &&
+          (objectLimit += componentInfo.stack.length);
+        objectLimit = { objectLimit: objectLimit };
+        var componentDebugInfo = {
+          name: componentInfo.name,
+          env: componentInfo.env,
+          key: componentInfo.key,
+          owner: componentInfo.owner
+        };
+        componentDebugInfo.stack = componentInfo.stack;
+        componentDebugInfo.props = componentInfo.props;
+        objectLimit = outlineConsoleValue(
+          request,
+          objectLimit,
+          componentDebugInfo
+        );
+        request.writtenObjects.set(
+          componentInfo,
+          serializeByValueID$1(objectLimit)
+        );
+      }
+    }
     function emitTypedArrayChunk(request, id, tag, typedArray) {
       TaintRegistryByteLengths.has(typedArray.byteLength) &&
         ((id = TaintRegistryValues.get(
@@ -2202,11 +2232,39 @@
           ((parent = request.temporaryReferences.get(value)), void 0 !== parent)
         )
           return "$T" + parent;
-        if (500 < counter.objectCount) return "$Y";
-        counter.objectCount++;
         parent = request.writtenObjects.get(value);
+        if (void 0 !== parent) return parent;
+        if (0 >= counter.objectLimit) return "$Y";
+        counter.objectLimit--;
+        switch (value.$$typeof) {
+          case REACT_ELEMENT_TYPE:
+            return (
+              null != value._owner &&
+                outlineComponentInfo(request, value._owner),
+              (counter = null),
+              null != value._debugStack &&
+                ((counter = filterStackTrace(request, value._debugStack, 1)),
+                (parent = outlineConsoleValue(
+                  request,
+                  { objectLimit: counter.length + 2 },
+                  counter
+                )),
+                request.writtenObjects.set(
+                  counter,
+                  serializeByValueID$1(parent)
+                )),
+              [
+                REACT_ELEMENT_TYPE,
+                value.type,
+                value.key,
+                value.props,
+                value._owner,
+                counter,
+                value._store.validated
+              ]
+            );
+        }
         if ("function" === typeof value.then) {
-          if (void 0 !== parent) return parent;
           switch (value.status) {
             case "fulfilled":
               return (
@@ -2228,20 +2286,19 @@
           }
           return "$@";
         }
-        return void 0 !== parent
-          ? parent
-          : isArrayImpl(value)
-            ? value
-            : value instanceof Map
+        return isArrayImpl(value)
+          ? value
+          : value instanceof Map
+            ? ((value = Array.from(value)),
+              "$Q" + outlineConsoleValue(request, counter, value).toString(16))
+            : value instanceof Set
               ? ((value = Array.from(value)),
-                "$Q" +
+                "$W" +
                   outlineConsoleValue(request, counter, value).toString(16))
-              : value instanceof Set
-                ? ((value = Array.from(value)),
-                  "$W" +
-                    outlineConsoleValue(request, counter, value).toString(16))
-                : "function" === typeof FormData && value instanceof FormData
-                  ? serializeFormData(request, value)
+              : "function" === typeof FormData && value instanceof FormData
+                ? serializeFormData(request, value)
+                : value instanceof Error
+                  ? serializeErrorValue(request, value)
                   : value instanceof ArrayBuffer
                     ? serializeTypedArray(request, "A", new Uint8Array(value))
                     : value instanceof Int8Array
@@ -2285,17 +2342,7 @@
                                               ? serializeBlob(request, value)
                                               : getIteratorFn(value)
                                                 ? Array.from(value)
-                                                : isReactComponentInfo(value)
-                                                  ? ((request = {
-                                                      name: value.name,
-                                                      env: value.env,
-                                                      key: value.key,
-                                                      owner: value.owner
-                                                    }),
-                                                    (request.stack =
-                                                      value.stack),
-                                                    request)
-                                                  : value;
+                                                : value;
       }
       if ("string" === typeof value) {
         if ("Z" === value[value.length - 1] && originalValue instanceof Date)
@@ -2348,7 +2395,10 @@
             value
           );
         } catch (x) {
-          return "unknown value";
+          return (
+            "Unknown Value: React could not send it from the server.\n" +
+            x.message
+          );
         }
       });
       request.pendingChunks++;
@@ -2365,8 +2415,9 @@
       stackTrace,
       args
     ) {
-      var counter = { objectCount: 0 },
-        env = (0, request.environmentName)();
+      var counter = { objectLimit: 500 };
+      null != owner && outlineComponentInfo(request, owner);
+      var env = (0, request.environmentName)();
       methodName = [methodName, stackTrace, owner, env];
       methodName.push.apply(methodName, args);
       args = stringify(methodName, function (parentPropertyName, value) {
@@ -2379,7 +2430,10 @@
             value
           );
         } catch (x) {
-          return "unknown value";
+          return (
+            "Unknown Value: React could not send it from the server.\n" +
+            x.message
+          );
         }
       });
       id = id.toString(16) + ":W" + args + "\n";
@@ -2389,7 +2443,7 @@
       for (var i = 0; i < debugInfo.length; i++)
         request.pendingChunks++,
           "string" === typeof debugInfo[i].name &&
-            outlineModel(request, debugInfo[i]),
+            outlineComponentInfo(request, debugInfo[i]),
           emitDebugChunk(request, id, debugInfo[i]);
     }
     function emitChunk(request, task, value) {
@@ -3870,6 +3924,17 @@
                 createFormData
               )
             );
+          case "Z":
+            return (
+              (value = value.slice(2)),
+              getOutlinedModel(
+                response,
+                value,
+                parentObject,
+                key,
+                resolveErrorDev
+              )
+            );
           case "i":
             return (
               (value = value.slice(2)),
@@ -3963,6 +4028,30 @@
       this._rootEnvironmentName = environmentName;
       this._fromJSON = createFromJSONCallback(this);
     }
+    function resolveModel(response, id, model) {
+      var chunks = response._chunks,
+        chunk = chunks.get(id);
+      chunk
+        ? resolveModelChunk(chunk, model)
+        : chunks.set(
+            id,
+            new ReactPromise("resolved_model", model, null, response)
+          );
+    }
+    function resolveText(response, id, text) {
+      var chunks = response._chunks,
+        chunk = chunks.get(id);
+      chunk && "pending" !== chunk.status
+        ? chunk.reason.enqueueValue(text)
+        : chunks.set(id, new ReactPromise("fulfilled", text, null, response));
+    }
+    function resolveModule(response, id, model) {
+      response._chunks.get(id);
+      JSON.parse(model, response._fromJSON);
+      throw Error(
+        "renderToHTML should not have emitted Client References. This is a bug in React."
+      );
+    }
     function resolveStream(response, id, stream, controller) {
       var chunks = response._chunks,
         chunk = chunks.get(id);
@@ -4154,6 +4243,46 @@
         }
       );
     }
+    function stopStream(response, id, row) {
+      (response = response._chunks.get(id)) &&
+        "fulfilled" === response.status &&
+        response.reason.close("" === row ? '"$undefined"' : row);
+    }
+    function resolveErrorDev(response, errorInfo) {
+      var env = errorInfo.env;
+      errorInfo = buildFakeCallStack(
+        response,
+        errorInfo.stack,
+        env,
+        Error.bind(
+          null,
+          errorInfo.message ||
+            "An error occurred in the Server Components render but no message was provided"
+        )
+      );
+      response = getRootTask(response, env);
+      response = null != response ? response.run(errorInfo) : errorInfo();
+      response.environmentName = env;
+      return response;
+    }
+    function resolvePostponeDev(response, id, reason, stack, env) {
+      reason = buildFakeCallStack(
+        response,
+        stack,
+        env,
+        Error.bind(null, reason || "")
+      );
+      stack = response._debugRootTask;
+      reason = null != stack ? stack.run(reason) : reason();
+      reason.$$typeof = REACT_POSTPONE_TYPE;
+      stack = response._chunks;
+      (env = stack.get(id))
+        ? triggerErrorOnChunk(env, reason)
+        : stack.set(id, new ReactPromise("rejected", null, reason, response));
+    }
+    function resolveHint(response, code, model) {
+      JSON.parse(model, response._fromJSON);
+    }
     function createFakeFunction(
       name,
       filename,
@@ -4295,10 +4424,100 @@
         null != debugInfo.owner &&
           initializeFakeStack(response, debugInfo.owner));
     }
+    function resolveDebugInfo(response, id, debugInfo) {
+      initializeFakeTask(
+        response,
+        debugInfo,
+        void 0 === debugInfo.env ? response._rootEnvironmentName : debugInfo.env
+      );
+      null === debugInfo.owner && null != response._debugRootOwner
+        ? ((debugInfo.owner = response._debugRootOwner),
+          (debugInfo.debugStack = response._debugRootStack))
+        : initializeFakeStack(response, debugInfo);
+      response = getChunk(response, id);
+      (response._debugInfo || (response._debugInfo = [])).push(debugInfo);
+    }
     function getCurrentStackInDEV$1() {
       var owner = currentOwnerInDEV;
       return null === owner ? "" : getOwnerStackByComponentInfoInDev(owner);
     }
+    function resolveConsoleEntry(response, value) {
+      if (response._replayConsole) {
+        var payload = JSON.parse(value, response._fromJSON);
+        value = payload[0];
+        var stackTrace = payload[1],
+          owner = payload[2],
+          env = payload[3];
+        payload = payload.slice(4);
+        replayConsoleWithCallStackInDEV(
+          response,
+          value,
+          stackTrace,
+          owner,
+          env,
+          payload
+        );
+      }
+    }
+    function processFullStringRow(response, id, tag, row) {
+      switch (tag) {
+        case 73:
+          resolveModule(response, id, row);
+          break;
+        case 72:
+          resolveHint(response, row[0], row.slice(1));
+          break;
+        case 69:
+          row = JSON.parse(row);
+          tag = resolveErrorDev(response, row);
+          tag.digest = row.digest;
+          row = response._chunks;
+          var chunk = row.get(id);
+          chunk
+            ? triggerErrorOnChunk(chunk, tag)
+            : row.set(id, new ReactPromise("rejected", null, tag, response));
+          break;
+        case 84:
+          resolveText(response, id, row);
+          break;
+        case 68:
+          tag = new ReactPromise("resolved_model", row, null, response);
+          initializeModelChunk(tag);
+          "fulfilled" === tag.status
+            ? resolveDebugInfo(response, id, tag.value)
+            : tag.then(
+                function (v) {
+                  return resolveDebugInfo(response, id, v);
+                },
+                function () {}
+              );
+          break;
+        case 87:
+          resolveConsoleEntry(response, row);
+          break;
+        case 82:
+          startReadableStream(response, id, void 0);
+          break;
+        case 114:
+          startReadableStream(response, id, "bytes");
+          break;
+        case 88:
+          startAsyncIterable(response, id, !1);
+          break;
+        case 120:
+          startAsyncIterable(response, id, !0);
+          break;
+        case 67:
+          stopStream(response, id, row);
+          break;
+        case 80:
+          tag = JSON.parse(row);
+          resolvePostponeDev(response, id, tag.reason, tag.stack, tag.env);
+          break;
+        default:
+          resolveModel(response, id, row);
+      }
+    }
     function createFromJSONCallback(response) {
       return function (key, value) {
         if ("string" === typeof value)
@@ -12855,143 +13074,8 @@
                     throw Error(
                       "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."
                     );
-                  rowLength = chunk.slice(i, lastIdx);
-                  i = flightResponse;
-                  switch (rowTag) {
-                    case 73:
-                      throw (
-                        (i._chunks.get(rowID),
-                        JSON.parse(rowLength, i._fromJSON),
-                        Error(
-                          "renderToHTML should not have emitted Client References. This is a bug in React."
-                        ))
-                      );
-                    case 72:
-                      rowID = rowLength.slice(1);
-                      JSON.parse(rowID, i._fromJSON);
-                      break;
-                    case 69:
-                      var error = JSON.parse(rowLength);
-                      rowTag = error.digest;
-                      rowLength = error.env;
-                      error = buildFakeCallStack(
-                        i,
-                        error.stack,
-                        rowLength,
-                        Error.bind(
-                          null,
-                          error.message ||
-                            "An error occurred in the Server Components render but no message was provided"
-                        )
-                      );
-                      var rootTask = getRootTask(i, rowLength);
-                      error = null != rootTask ? rootTask.run(error) : error();
-                      error.digest = rowTag;
-                      error.environmentName = rowLength;
-                      rowTag = error;
-                      rowLength = i._chunks;
-                      (error = rowLength.get(rowID))
-                        ? triggerErrorOnChunk(error, rowTag)
-                        : rowLength.set(
-                            rowID,
-                            new ReactPromise("rejected", null, rowTag, i)
-                          );
-                      break;
-                    case 84:
-                      rowTag = i._chunks;
-                      (error = rowTag.get(rowID)) && "pending" !== error.status
-                        ? error.reason.enqueueValue(rowLength)
-                        : rowTag.set(
-                            rowID,
-                            new ReactPromise("fulfilled", rowLength, null, i)
-                          );
-                      break;
-                    case 68:
-                      rowTag = JSON.parse(rowLength, i._fromJSON);
-                      initializeFakeTask(
-                        i,
-                        rowTag,
-                        void 0 === rowTag.env
-                          ? i._rootEnvironmentName
-                          : rowTag.env
-                      );
-                      null === rowTag.owner && null != i._debugRootOwner
-                        ? ((rowTag.owner = i._debugRootOwner),
-                          (rowTag.debugStack = i._debugRootStack))
-                        : initializeFakeStack(i, rowTag);
-                      i = getChunk(i, rowID);
-                      (i._debugInfo || (i._debugInfo = [])).push(rowTag);
-                      break;
-                    case 87:
-                      i._replayConsole &&
-                        ((rootTask = JSON.parse(rowLength, i._fromJSON)),
-                        (rowID = rootTask[0]),
-                        (rowTag = rootTask[1]),
-                        (rowLength = rootTask[2]),
-                        (error = rootTask[3]),
-                        (rootTask = rootTask.slice(4)),
-                        replayConsoleWithCallStackInDEV(
-                          i,
-                          rowID,
-                          rowTag,
-                          rowLength,
-                          error,
-                          rootTask
-                        ));
-                      break;
-                    case 82:
-                      startReadableStream(i, rowID, void 0);
-                      break;
-                    case 114:
-                      startReadableStream(i, rowID, "bytes");
-                      break;
-                    case 88:
-                      startAsyncIterable(i, rowID, !1);
-                      break;
-                    case 120:
-                      startAsyncIterable(i, rowID, !0);
-                      break;
-                    case 67:
-                      (i = i._chunks.get(rowID)) &&
-                        "fulfilled" === i.status &&
-                        i.reason.close(
-                          "" === rowLength ? '"$undefined"' : rowLength
-                        );
-                      break;
-                    case 80:
-                      rowTag = JSON.parse(rowLength);
-                      rowTag = buildFakeCallStack(
-                        i,
-                        rowTag.stack,
-                        rowTag.env,
-                        Error.bind(null, rowTag.reason || "")
-                      );
-                      rowLength = i._debugRootTask;
-                      rowTag =
-                        null != rowLength ? rowLength.run(rowTag) : rowTag();
-                      rowTag.$$typeof = REACT_POSTPONE_TYPE;
-                      rowLength = i._chunks;
-                      (error = rowLength.get(rowID))
-                        ? triggerErrorOnChunk(error, rowTag)
-                        : rowLength.set(
-                            rowID,
-                            new ReactPromise("rejected", null, rowTag, i)
-                          );
-                      break;
-                    default:
-                      (rowTag = i._chunks),
-                        (error = rowTag.get(rowID))
-                          ? resolveModelChunk(error, rowLength)
-                          : rowTag.set(
-                              rowID,
-                              new ReactPromise(
-                                "resolved_model",
-                                rowLength,
-                                null,
-                                i
-                              )
-                            );
-                  }
+                  i = chunk.slice(i, lastIdx);
+                  processFullStringRow(flightResponse, rowID, rowTag, i);
                   i = lastIdx;
                   3 === rowState && i++;
                   rowLength = rowID = rowTag = rowState = 0;
@@ -13029,5 +13113,5 @@
         });
       });
     };
-    exports.version = "19.0.0-experimental-3edc000d-20240926";
+    exports.version = "19.0.0-experimental-d8c90fa4-20241001";
   })();

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

@@ -1309,6 +1309,7 @@ function renderModelDestructive(
         (value = Array.from(value.entries())),
         "$K" + outlineModel(request, value).toString(16)
       );
+    if (value instanceof Error) return "$Z";
     if (value instanceof ArrayBuffer)
       return serializeTypedArray(request, "A", new Uint8Array(value));
     if (value instanceof Int8Array)
@@ -2762,6 +2763,8 @@ function parseModelString(response, parentObject, key, value) {
           (value = value.slice(2)),
           getOutlinedModel(response, value, parentObject, key, createFormData)
         );
+      case "Z":
+        return resolveErrorProd();
       case "i":
         return (
           (value = value.slice(2)),
@@ -2999,6 +3002,13 @@ function startAsyncIterable(response, id, iterator) {
     }
   );
 }
+function resolveErrorProd() {
+  var error = Error(
+    "An error occurred in the Server Components render. The specific message is omitted in production builds to avoid leaking sensitive details. A digest property is included on this error instance which may provide additional details about the nature of the error."
+  );
+  error.stack = "Error: " + error.message;
+  return error;
+}
 function createFromJSONCallback(response) {
   return function (key, value) {
     if ("string" === typeof value)
@@ -8460,12 +8470,9 @@ exports.experimental_renderToHTML = function (children, options) {
                     JSON.parse(rowID, flightResponse._fromJSON);
                     break;
                   case 69:
-                    rowTag = JSON.parse(i).digest;
-                    i = Error(
-                      "An error occurred in the Server Components render. The specific message is omitted in production builds to avoid leaking sensitive details. A digest property is included on this error instance which may provide additional details about the nature of the error."
-                    );
-                    i.stack = "Error: " + i.message;
-                    i.digest = rowTag;
+                    rowTag = JSON.parse(i);
+                    i = resolveErrorProd();
+                    i.digest = rowTag.digest;
                     rowTag = flightResponse._chunks;
                     (rowLength = rowTag.get(rowID))
                       ? triggerErrorOnChunk(rowLength, i)
@@ -8667,4 +8674,4 @@ exports.experimental_renderToHTML = function (children, options) {
     });
   });
 };
-exports.version = "19.0.0-experimental-3edc000d-20240926";
+exports.version = "19.0.0-experimental-d8c90fa4-20241001";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-markup",
-  "version": "0.0.0-experimental-3edc000d-20240926",
+  "version": "0.0.0-experimental-d8c90fa4-20241001",
   "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-3edc000d-20240926"
+    "react": "0.0.0-experimental-d8c90fa4-20241001"
   },
   "files": [
     "LICENSE",