react-markup 0.0.0-experimental-4b7d4530-20241218 → 0.0.0-experimental-65e06cb7-20241218

package/cjs/react-markup.development.js

@@ -8635,5 +8635,5 @@
         });
       });
     };
-    exports.version = "19.0.0-experimental-4b7d4530-20241218";
+    exports.version = "19.0.0-experimental-65e06cb7-20241218";
   })();

package/cjs/react-markup.production.js

@@ -5710,4 +5710,4 @@ exports.experimental_renderToHTML = function (children, options) {
     });
   });
 };
-exports.version = "19.0.0-experimental-4b7d4530-20241218";
+exports.version = "19.0.0-experimental-65e06cb7-20241218";

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

@@ -179,6 +179,14 @@
       suspendedThenable$1 = null;
       return thenable;
     }
+    function prepareToUseHooksForComponent(
+      prevThenableState,
+      componentDebugInfo
+    ) {
+      thenableIndexCounter$1 = 0;
+      thenableState$1 = prevThenableState;
+      currentComponentDebugInfo = componentDebugInfo;
+    }
     function getThenableStateAfterSuspending$1() {
       var state = thenableState$1 || [];
       state._componentDebugInfo = currentComponentDebugInfo;
@@ -1140,71 +1148,6 @@
         currentOwner = null;
       }
     }
-    function processServerComponentReturnValue(
-      request,
-      task,
-      Component,
-      result
-    ) {
-      if (
-        "object" !== typeof result ||
-        null === result ||
-        isClientReference(result)
-      )
-        return result;
-      if ("function" === typeof result.then)
-        return (
-          result.then(function (resolvedValue) {
-            "object" === typeof resolvedValue &&
-              null !== resolvedValue &&
-              resolvedValue.$$typeof === REACT_ELEMENT_TYPE &&
-              (resolvedValue._store.validated = 1);
-          }, voidHandler),
-          "fulfilled" === result.status
-            ? result.value
-            : createLazyWrapperAroundWakeable(result)
-        );
-      result.$$typeof === REACT_ELEMENT_TYPE && (result._store.validated = 1);
-      var iteratorFn = getIteratorFn(result);
-      if (iteratorFn) {
-        var multiShot = _defineProperty({}, Symbol.iterator, function () {
-          var iterator = iteratorFn.call(result);
-          iterator !== result ||
-            ("[object GeneratorFunction]" ===
-              Object.prototype.toString.call(Component) &&
-              "[object Generator]" ===
-                Object.prototype.toString.call(result)) ||
-            callWithDebugContextInDEV(request, task, function () {
-              console.error(
-                "Returning an Iterator from a Server Component is not supported since it cannot be looped over more than once. "
-              );
-            });
-          return iterator;
-        });
-        multiShot._debugInfo = result._debugInfo;
-        return multiShot;
-      }
-      return "function" !== typeof result[ASYNC_ITERATOR] ||
-        ("function" === typeof ReadableStream &&
-          result instanceof ReadableStream)
-        ? result
-        : ((multiShot = _defineProperty({}, ASYNC_ITERATOR, function () {
-            var iterator = result[ASYNC_ITERATOR]();
-            iterator !== result ||
-              ("[object AsyncGeneratorFunction]" ===
-                Object.prototype.toString.call(Component) &&
-                "[object AsyncGenerator]" ===
-                  Object.prototype.toString.call(result)) ||
-              callWithDebugContextInDEV(request, task, function () {
-                console.error(
-                  "Returning an AsyncIterator from a Server Component is not supported since it cannot be looped over more than once. "
-                );
-              });
-            return iterator;
-          })),
-          (multiShot._debugInfo = result._debugInfo),
-          multiShot);
-    }
     function renderFunctionComponent$1(
       request,
       task,
@@ -1242,9 +1185,7 @@
         2 === validated &&
           warnForMissingKey$1(request, key, componentDebugInfo, task.debugTask);
       }
-      thenableIndexCounter$1 = 0;
-      thenableState$1 = prevThenableState;
-      currentComponentDebugInfo = componentDebugInfo;
+      prepareToUseHooksForComponent(prevThenableState, componentDebugInfo);
       props = task.debugTask
         ? task.debugTask.run(
             callComponentInDEV$1.bind(
@@ -1264,21 +1205,74 @@
             props.then(voidHandler, voidHandler),
           null)
         );
-      props = processServerComponentReturnValue(
-        request,
-        task,
-        Component,
-        props
-      );
-      Component = task.keyPath;
-      validated = task.implicitSlot;
+      if (
+        "object" === typeof props &&
+        null !== props &&
+        !isClientReference(props)
+      ) {
+        if ("function" === typeof props.then) {
+          validated = props;
+          validated.then(function (resolvedValue) {
+            "object" === typeof resolvedValue &&
+              null !== resolvedValue &&
+              resolvedValue.$$typeof === REACT_ELEMENT_TYPE &&
+              (resolvedValue._store.validated = 1);
+          }, voidHandler);
+          if ("fulfilled" === validated.status) return validated.value;
+          props = createLazyWrapperAroundWakeable(props);
+        }
+        var iteratorFn = getIteratorFn(props);
+        if (iteratorFn) {
+          var iterableChild = props;
+          props = _defineProperty({}, Symbol.iterator, function () {
+            var iterator = iteratorFn.call(iterableChild);
+            iterator !== iterableChild ||
+              ("[object GeneratorFunction]" ===
+                Object.prototype.toString.call(Component) &&
+                "[object Generator]" ===
+                  Object.prototype.toString.call(iterableChild)) ||
+              callWithDebugContextInDEV(request, task, function () {
+                console.error(
+                  "Returning an Iterator from a Server Component is not supported since it cannot be looped over more than once. "
+                );
+              });
+            return iterator;
+          });
+          props._debugInfo = iterableChild._debugInfo;
+        } else if (
+          "function" !== typeof props[ASYNC_ITERATOR] ||
+          ("function" === typeof ReadableStream &&
+            props instanceof ReadableStream)
+        )
+          props.$$typeof === REACT_ELEMENT_TYPE && (props._store.validated = 1);
+        else {
+          var _iterableChild = props;
+          props = _defineProperty({}, ASYNC_ITERATOR, function () {
+            var iterator = _iterableChild[ASYNC_ITERATOR]();
+            iterator !== _iterableChild ||
+              ("[object AsyncGeneratorFunction]" ===
+                Object.prototype.toString.call(Component) &&
+                "[object AsyncGenerator]" ===
+                  Object.prototype.toString.call(_iterableChild)) ||
+              callWithDebugContextInDEV(request, task, function () {
+                console.error(
+                  "Returning an AsyncIterator from a Server Component is not supported since it cannot be looped over more than once. "
+                );
+              });
+            return iterator;
+          });
+          props._debugInfo = _iterableChild._debugInfo;
+        }
+      }
+      validated = task.keyPath;
+      prevThenableState = task.implicitSlot;
       null !== key
-        ? (task.keyPath = null === Component ? key : Component + "," + key)
-        : null === Component && (task.implicitSlot = !0);
-      request = renderModelDestructive(request, task, emptyRoot, "", props);
-      task.keyPath = Component;
-      task.implicitSlot = validated;
-      return request;
+        ? (task.keyPath = null === validated ? key : validated + "," + key)
+        : null === validated && (task.implicitSlot = !0);
+      key = renderModelDestructive(request, task, emptyRoot, "", props);
+      task.keyPath = validated;
+      task.implicitSlot = prevThenableState;
+      return key;
     }
     function warnForMissingKey$1(request, key, componentDebugInfo, debugTask) {
       function logKeyError() {
@@ -4485,17 +4479,15 @@
           initializeFakeStack(response, debugInfo.owner));
     }
     function resolveDebugInfo(response, id, debugInfo) {
-      var env =
-        void 0 === debugInfo.env
-          ? response._rootEnvironmentName
-          : debugInfo.env;
-      void 0 !== debugInfo.stack &&
-        initializeFakeTask(response, debugInfo, env);
+      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))
-        : void 0 !== debugInfo.stack &&
-          initializeFakeStack(response, debugInfo);
+        : initializeFakeStack(response, debugInfo);
       response = getChunk(response, id);
       (response._debugInfo || (response._debugInfo = [])).push(debugInfo);
     }
@@ -13177,5 +13169,5 @@
         });
       });
     };
-    exports.version = "19.0.0-experimental-4b7d4530-20241218";
+    exports.version = "19.0.0-experimental-65e06cb7-20241218";
   })();

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

@@ -889,57 +889,63 @@ function createLazyWrapperAroundWakeable(wakeable) {
   return { $$typeof: REACT_LAZY_TYPE, _payload: wakeable, _init: readThenable };
 }
 function voidHandler() {}
-function processServerComponentReturnValue(request, task, Component, result) {
-  if (
-    "object" !== typeof result ||
-    null === result ||
-    result.$$typeof === CLIENT_REFERENCE_TAG$1
-  )
-    return result;
-  if ("function" === typeof result.then)
-    return "fulfilled" === result.status
-      ? result.value
-      : createLazyWrapperAroundWakeable(result);
-  var iteratorFn = getIteratorFn(result);
-  return iteratorFn
-    ? ((request = {}),
-      (request[Symbol.iterator] = function () {
-        return iteratorFn.call(result);
-      }),
-      request)
-    : "function" !== typeof result[ASYNC_ITERATOR] ||
-        ("function" === typeof ReadableStream &&
-          result instanceof ReadableStream)
-      ? result
-      : ((request = {}),
-        (request[ASYNC_ITERATOR] = function () {
-          return result[ASYNC_ITERATOR]();
-        }),
-        request);
-}
 function renderFunctionComponent$1(request, task, key, Component, props) {
   var prevThenableState = task.thenableState;
   task.thenableState = null;
   thenableIndexCounter$1 = 0;
   thenableState$1 = prevThenableState;
-  props = Component(props, void 0);
+  Component = Component(props, void 0);
   if (12 === request.status)
     throw (
-      ("object" === typeof props &&
-        null !== props &&
-        "function" === typeof props.then &&
-        props.$$typeof !== CLIENT_REFERENCE_TAG$1 &&
-        props.then(voidHandler, voidHandler),
+      ("object" === typeof Component &&
+        null !== Component &&
+        "function" === typeof Component.then &&
+        Component.$$typeof !== CLIENT_REFERENCE_TAG$1 &&
+        Component.then(voidHandler, voidHandler),
       null)
     );
-  props = processServerComponentReturnValue(request, task, Component, props);
-  Component = task.keyPath;
+  if (
+    "object" === typeof Component &&
+    null !== Component &&
+    Component.$$typeof !== CLIENT_REFERENCE_TAG$1
+  ) {
+    if ("function" === typeof Component.then) {
+      props = Component;
+      if ("fulfilled" === props.status) return props.value;
+      Component = createLazyWrapperAroundWakeable(Component);
+    }
+    var iteratorFn = getIteratorFn(Component);
+    if (iteratorFn) {
+      var iterableChild = Component;
+      Component = {};
+      Component =
+        ((Component[Symbol.iterator] = function () {
+          return iteratorFn.call(iterableChild);
+        }),
+        Component);
+    } else if (
+      !(
+        "function" !== typeof Component[ASYNC_ITERATOR] ||
+        ("function" === typeof ReadableStream &&
+          Component instanceof ReadableStream)
+      )
+    ) {
+      var iterableChild$13 = Component;
+      Component = {};
+      Component =
+        ((Component[ASYNC_ITERATOR] = function () {
+          return iterableChild$13[ASYNC_ITERATOR]();
+        }),
+        Component);
+    }
+  }
+  props = task.keyPath;
   prevThenableState = task.implicitSlot;
   null !== key
-    ? (task.keyPath = null === Component ? key : Component + "," + key)
-    : null === Component && (task.implicitSlot = !0);
-  request = renderModelDestructive(request, task, emptyRoot, "", props);
-  task.keyPath = Component;
+    ? (task.keyPath = null === props ? key : props + "," + key)
+    : null === props && (task.implicitSlot = !0);
+  request = renderModelDestructive(request, task, emptyRoot, "", Component);
+  task.keyPath = props;
   task.implicitSlot = prevThenableState;
   return request;
 }
@@ -8690,4 +8696,4 @@ exports.experimental_renderToHTML = function (children, options) {
     });
   });
 };
-exports.version = "19.0.0-experimental-4b7d4530-20241218";
+exports.version = "19.0.0-experimental-65e06cb7-20241218";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-markup",
-  "version": "0.0.0-experimental-4b7d4530-20241218",
+  "version": "0.0.0-experimental-65e06cb7-20241218",
   "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-4b7d4530-20241218"
+    "react": "0.0.0-experimental-65e06cb7-20241218"
   },
   "files": [
     "LICENSE",