react-server-dom-webpack 19.0.0-beta-b498834eab-20240506 → 19.0.0-beta-6946ebe620-20240508

package/cjs/react-server-dom-webpack-server.browser.development.js

@@ -1905,9 +1905,8 @@ function renderFragment(request, task, children) {
 
 function renderClientElement(task, type, key, props, owner) // DEV-only
 {
+  // We prepend the terminal client element that actually gets serialized with
   // the keys of any Server Components which are not serialized.
-
-
   var keyPath = task.keyPath;
 
   if (key === null) {
@@ -2051,7 +2050,7 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) {
   if (typeof model === 'object' && model !== null) {
     // If we're about to write this into a new task we can assign it an ID early so that
     // any other references can refer to the value we're about to write.
-    if ((keyPath !== null || implicitSlot)) ; else {
+    if (keyPath !== null || implicitSlot) ; else {
       request.writtenObjects.set(model, id);
     }
   }
@@ -2393,7 +2392,7 @@ function renderModelDestructive(request, task, parent, parentPropertyName, value
           var _existingId = _writtenObjects.get(value);
 
           if (_existingId !== undefined) {
-            if ((task.keyPath !== null || task.implicitSlot)) ; else if (modelRoot === value) {
+            if (task.keyPath !== null || task.implicitSlot) ; else if (modelRoot === value) {
               // This is the ID we're currently emitting so we need to write it
               // once but if we discover it again, we refer to it by id.
               modelRoot = null;
@@ -2498,7 +2497,7 @@ function renderModelDestructive(request, task, parent, parentPropertyName, value
 
     if (typeof value.then === 'function') {
       if (existingId !== undefined) {
-        if ((task.keyPath !== null || task.implicitSlot)) {
+        if (task.keyPath !== null || task.implicitSlot) {
           // If we're in some kind of context we can't reuse the result of this render or
           // previous renders of this element. We only reuse Promises if they're not wrapped
           // by another Server Component.
@@ -3663,7 +3662,7 @@ function loadServerReference$1(response, id, bound, parentChunk, parentObject, k
     }
   }
 
-  promise.then(createModelResolver(parentChunk, parentObject, key), createModelReject(parentChunk)); // We need a placeholder value that will be replaced later.
+  promise.then(createModelResolver(parentChunk, parentObject, key, false, response, createModel), createModelReject(parentChunk)); // We need a placeholder value that will be replaced later.
 
   return null;
 }
@@ -3740,21 +3739,24 @@ function getChunk(response, id) {
   return chunk;
 }
 
-function createModelResolver(chunk, parentObject, key) {
+function createModelResolver(chunk, parentObject, key, cyclic, response, map) {
   var blocked;
 
   if (initializingChunkBlockedModel) {
     blocked = initializingChunkBlockedModel;
-    blocked.deps++;
+
+    if (!cyclic) {
+      blocked.deps++;
+    }
   } else {
     blocked = initializingChunkBlockedModel = {
-      deps: 1,
+      deps: cyclic ? 0 : 1,
       value: null
     };
   }
 
   return function (value) {
-    parentObject[key] = value; // If this is the root object for a model reference, where `blocked.value`
+    parentObject[key] = map(response, value); // If this is the root object for a model reference, where `blocked.value`
     // is a stale `null`, the resolved value can be used directly.
 
     if (key === '' && blocked.value === null) {
@@ -3786,19 +3788,46 @@ function createModelReject(chunk) {
   };
 }
 
-function getOutlinedModel(response, id) {
+function getOutlinedModel(response, id, parentObject, key, map) {
   var chunk = getChunk(response, id);
 
-  if (chunk.status === RESOLVED_MODEL) {
-    initializeModelChunk(chunk);
-  }
+  switch (chunk.status) {
+    case RESOLVED_MODEL:
+      initializeModelChunk(chunk);
+      break;
+  } // The status might have changed after initialization.
 
-  if (chunk.status !== INITIALIZED) {
-    // We know that this is emitted earlier so otherwise it's an error.
-    throw chunk.reason;
+
+  switch (chunk.status) {
+    case INITIALIZED:
+      return map(response, chunk.value);
+
+    case PENDING:
+    case BLOCKED:
+      var parentChunk = initializingChunk;
+      chunk.then(createModelResolver(parentChunk, parentObject, key, false, response, map), createModelReject(parentChunk));
+      return null;
+
+    default:
+      throw chunk.reason;
   }
+}
+
+function createMap(response, model) {
+  return new Map(model);
+}
+
+function createSet(response, model) {
+  return new Set(model);
+}
 
-  return chunk.value;
+function extractIterator(response, model) {
+  // $FlowFixMe[incompatible-use]: This uses raw Symbols because we're extracting from a native array.
+  return model[Symbol.iterator]();
+}
+
+function createModel(response, model) {
+  return model;
 }
 
 function parseModelString(response, obj, key, value) {
@@ -3815,9 +3844,8 @@ function parseModelString(response, obj, key, value) {
           // Promise
           var _id = parseInt(value.slice(2), 16);
 
-          var _chunk2 = getChunk(response, _id);
-
-          return _chunk2;
+          var chunk = getChunk(response, _id);
+          return chunk;
         }
 
       case 'F':
@@ -3826,7 +3854,7 @@ function parseModelString(response, obj, key, value) {
           var _id2 = parseInt(value.slice(2), 16); // TODO: Just encode this in the reference inline instead of as a model.
 
 
-          var metaData = getOutlinedModel(response, _id2);
+          var metaData = getOutlinedModel(response, _id2, obj, key, createModel);
           return loadServerReference$1(response, metaData.id, metaData.bound, initializingChunk, obj, key);
         }
 
@@ -3841,8 +3869,7 @@ function parseModelString(response, obj, key, value) {
           // Map
           var _id3 = parseInt(value.slice(2), 16);
 
-          var data = getOutlinedModel(response, _id3);
-          return new Map(data);
+          return getOutlinedModel(response, _id3, obj, key, createMap);
         }
 
       case 'W':
@@ -3850,9 +3877,7 @@ function parseModelString(response, obj, key, value) {
           // Set
           var _id4 = parseInt(value.slice(2), 16);
 
-          var _data = getOutlinedModel(response, _id4);
-
-          return new Set(_data);
+          return getOutlinedModel(response, _id4, obj, key, createSet);
         }
 
       case 'K':
@@ -3860,9 +3885,7 @@ function parseModelString(response, obj, key, value) {
           // FormData
           var stringId = value.slice(2);
           var formPrefix = response._prefix + stringId + '_';
-
-          var _data2 = new FormData();
-
+          var data = new FormData();
           var backingFormData = response._formData; // We assume that the reference to FormData always comes after each
           // entry that it references so we can assume they all exist in the
           // backing store already.
@@ -3870,10 +3893,10 @@ function parseModelString(response, obj, key, value) {
 
           backingFormData.forEach(function (entry, entryKey) {
             if (entryKey.startsWith(formPrefix)) {
-              _data2.append(entryKey.slice(formPrefix.length), entry);
+              data.append(entryKey.slice(formPrefix.length), entry);
             }
           });
-          return _data2;
+          return data;
         }
 
       case 'i':
@@ -3881,9 +3904,7 @@ function parseModelString(response, obj, key, value) {
           // Iterator
           var _id5 = parseInt(value.slice(2), 16);
 
-          var _data3 = getOutlinedModel(response, _id5);
-
-          return _data3[Symbol.iterator]();
+          return getOutlinedModel(response, _id5, obj, key, extractIterator);
         }
 
       case 'I':
@@ -3930,28 +3951,7 @@ function parseModelString(response, obj, key, value) {
 
 
     var id = parseInt(value.slice(1), 16);
-    var chunk = getChunk(response, id);
-
-    switch (chunk.status) {
-      case RESOLVED_MODEL:
-        initializeModelChunk(chunk);
-        break;
-    } // The status might have changed after initialization.
-
-
-    switch (chunk.status) {
-      case INITIALIZED:
-        return chunk.value;
-
-      case PENDING:
-      case BLOCKED:
-        var parentChunk = initializingChunk;
-        chunk.then(createModelResolver(parentChunk, obj, key), createModelReject(parentChunk));
-        return null;
-
-      default:
-        throw chunk.reason;
-    }
+    return getOutlinedModel(response, id, obj, key, createModel);
   }
 
   return value;

package/cjs/react-server-dom-webpack-server.browser.production.js

@@ -1597,20 +1597,27 @@ function loadServerReference$1(
   key
 ) {
   var serverReference = resolveServerReference(response._bundlerConfig, id);
-  response = preloadModule(serverReference);
+  id = preloadModule(serverReference);
   if (bound)
-    bound = Promise.all([bound, response]).then(function (_ref) {
+    bound = Promise.all([bound, id]).then(function (_ref) {
       _ref = _ref[0];
       var fn = requireModule(serverReference);
       return fn.bind.apply(fn, [null].concat(_ref));
     });
-  else if (response)
-    bound = Promise.resolve(response).then(function () {
+  else if (id)
+    bound = Promise.resolve(id).then(function () {
       return requireModule(serverReference);
     });
   else return requireModule(serverReference);
   bound.then(
-    createModelResolver(parentChunk, parentObject, key),
+    createModelResolver(
+      parentChunk,
+      parentObject,
+      key,
+      !1,
+      response,
+      createModel
+    ),
     createModelReject(parentChunk)
   );
   return null;
@@ -1655,13 +1662,17 @@ function getChunk(response, id) {
     chunks.set(id, chunk));
   return chunk;
 }
-function createModelResolver(chunk, parentObject, key) {
+function createModelResolver(chunk, parentObject, key, cyclic, response, map) {
   if (initializingChunkBlockedModel) {
     var blocked = initializingChunkBlockedModel;
-    blocked.deps++;
-  } else blocked = initializingChunkBlockedModel = { deps: 1, value: null };
+    cyclic || blocked.deps++;
+  } else
+    blocked = initializingChunkBlockedModel = {
+      deps: cyclic ? 0 : 1,
+      value: null
+    };
   return function (value) {
-    parentObject[key] = value;
+    parentObject[key] = map(response, value);
     "" === key && null === blocked.value && (blocked.value = parentObject[key]);
     blocked.deps--;
     0 === blocked.deps &&
@@ -1677,11 +1688,38 @@ function createModelReject(chunk) {
     return triggerErrorOnChunk(chunk, error);
   };
 }
-function getOutlinedModel(response, id) {
-  response = getChunk(response, id);
-  "resolved_model" === response.status && initializeModelChunk(response);
-  if ("fulfilled" !== response.status) throw response.reason;
-  return response.value;
+function getOutlinedModel(response, id, parentObject, key, map) {
+  id = getChunk(response, id);
+  switch (id.status) {
+    case "resolved_model":
+      initializeModelChunk(id);
+  }
+  switch (id.status) {
+    case "fulfilled":
+      return map(response, id.value);
+    case "pending":
+    case "blocked":
+      var parentChunk = initializingChunk;
+      id.then(
+        createModelResolver(parentChunk, parentObject, key, !1, response, map),
+        createModelReject(parentChunk)
+      );
+      return null;
+    default:
+      throw id.reason;
+  }
+}
+function createMap(response, model) {
+  return new Map(model);
+}
+function createSet(response, model) {
+  return new Set(model);
+}
+function extractIterator(response, model) {
+  return model[Symbol.iterator]();
+}
+function createModel(response, model) {
+  return model;
 }
 function parseModelString(response, obj, key, value) {
   if ("$" === value[0]) {
@@ -1693,7 +1731,7 @@ function parseModelString(response, obj, key, value) {
       case "F":
         return (
           (value = parseInt(value.slice(2), 16)),
-          (value = getOutlinedModel(response, value)),
+          (value = getOutlinedModel(response, value, obj, key, createModel)),
           loadServerReference$1(
             response,
             value.id,
@@ -1707,29 +1745,27 @@ function parseModelString(response, obj, key, value) {
         return createTemporaryReference(value.slice(2));
       case "Q":
         return (
-          (obj = parseInt(value.slice(2), 16)),
-          (response = getOutlinedModel(response, obj)),
-          new Map(response)
+          (value = parseInt(value.slice(2), 16)),
+          getOutlinedModel(response, value, obj, key, createMap)
         );
       case "W":
         return (
-          (obj = parseInt(value.slice(2), 16)),
-          (response = getOutlinedModel(response, obj)),
-          new Set(response)
+          (value = parseInt(value.slice(2), 16)),
+          getOutlinedModel(response, value, obj, key, createSet)
         );
       case "K":
         obj = value.slice(2);
         var formPrefix = response._prefix + obj + "_",
-          data$23 = new FormData();
+          data = new FormData();
         response._formData.forEach(function (entry, entryKey) {
           entryKey.startsWith(formPrefix) &&
-            data$23.append(entryKey.slice(formPrefix.length), entry);
+            data.append(entryKey.slice(formPrefix.length), entry);
         });
-        return data$23;
+        return data;
       case "i":
         return (
-          (obj = parseInt(value.slice(2), 16)),
-          getOutlinedModel(response, obj)[Symbol.iterator]()
+          (value = parseInt(value.slice(2), 16)),
+          getOutlinedModel(response, value, obj, key, extractIterator)
         );
       case "I":
         return Infinity;
@@ -1745,27 +1781,7 @@ function parseModelString(response, obj, key, value) {
         return BigInt(value.slice(2));
     }
     value = parseInt(value.slice(1), 16);
-    response = getChunk(response, value);
-    switch (response.status) {
-      case "resolved_model":
-        initializeModelChunk(response);
-    }
-    switch (response.status) {
-      case "fulfilled":
-        return response.value;
-      case "pending":
-      case "blocked":
-        return (
-          (value = initializingChunk),
-          response.then(
-            createModelResolver(value, obj, key),
-            createModelReject(value)
-          ),
-          null
-        );
-      default:
-        throw response.reason;
-    }
+    return getOutlinedModel(response, value, obj, key, createModel);
   }
   return value;
 }

package/cjs/react-server-dom-webpack-server.edge.development.js

@@ -1926,9 +1926,8 @@ function renderFragment(request, task, children) {
 
 function renderClientElement(task, type, key, props, owner) // DEV-only
 {
+  // We prepend the terminal client element that actually gets serialized with
   // the keys of any Server Components which are not serialized.
-
-
   var keyPath = task.keyPath;
 
   if (key === null) {
@@ -2072,7 +2071,7 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) {
   if (typeof model === 'object' && model !== null) {
     // If we're about to write this into a new task we can assign it an ID early so that
     // any other references can refer to the value we're about to write.
-    if ((keyPath !== null || implicitSlot)) ; else {
+    if (keyPath !== null || implicitSlot) ; else {
       request.writtenObjects.set(model, id);
     }
   }
@@ -2414,7 +2413,7 @@ function renderModelDestructive(request, task, parent, parentPropertyName, value
           var _existingId = _writtenObjects.get(value);
 
           if (_existingId !== undefined) {
-            if ((task.keyPath !== null || task.implicitSlot)) ; else if (modelRoot === value) {
+            if (task.keyPath !== null || task.implicitSlot) ; else if (modelRoot === value) {
               // This is the ID we're currently emitting so we need to write it
               // once but if we discover it again, we refer to it by id.
               modelRoot = null;
@@ -2519,7 +2518,7 @@ function renderModelDestructive(request, task, parent, parentPropertyName, value
 
     if (typeof value.then === 'function') {
       if (existingId !== undefined) {
-        if ((task.keyPath !== null || task.implicitSlot)) {
+        if (task.keyPath !== null || task.implicitSlot) {
           // If we're in some kind of context we can't reuse the result of this render or
           // previous renders of this element. We only reuse Promises if they're not wrapped
           // by another Server Component.
@@ -3675,7 +3674,7 @@ function loadServerReference$1(response, id, bound, parentChunk, parentObject, k
     }
   }
 
-  promise.then(createModelResolver(parentChunk, parentObject, key), createModelReject(parentChunk)); // We need a placeholder value that will be replaced later.
+  promise.then(createModelResolver(parentChunk, parentObject, key, false, response, createModel), createModelReject(parentChunk)); // We need a placeholder value that will be replaced later.
 
   return null;
 }
@@ -3752,21 +3751,24 @@ function getChunk(response, id) {
   return chunk;
 }
 
-function createModelResolver(chunk, parentObject, key) {
+function createModelResolver(chunk, parentObject, key, cyclic, response, map) {
   var blocked;
 
   if (initializingChunkBlockedModel) {
     blocked = initializingChunkBlockedModel;
-    blocked.deps++;
+
+    if (!cyclic) {
+      blocked.deps++;
+    }
   } else {
     blocked = initializingChunkBlockedModel = {
-      deps: 1,
+      deps: cyclic ? 0 : 1,
       value: null
     };
   }
 
   return function (value) {
-    parentObject[key] = value; // If this is the root object for a model reference, where `blocked.value`
+    parentObject[key] = map(response, value); // If this is the root object for a model reference, where `blocked.value`
     // is a stale `null`, the resolved value can be used directly.
 
     if (key === '' && blocked.value === null) {
@@ -3798,19 +3800,46 @@ function createModelReject(chunk) {
   };
 }
 
-function getOutlinedModel(response, id) {
+function getOutlinedModel(response, id, parentObject, key, map) {
   var chunk = getChunk(response, id);
 
-  if (chunk.status === RESOLVED_MODEL) {
-    initializeModelChunk(chunk);
-  }
+  switch (chunk.status) {
+    case RESOLVED_MODEL:
+      initializeModelChunk(chunk);
+      break;
+  } // The status might have changed after initialization.
 
-  if (chunk.status !== INITIALIZED) {
-    // We know that this is emitted earlier so otherwise it's an error.
-    throw chunk.reason;
+
+  switch (chunk.status) {
+    case INITIALIZED:
+      return map(response, chunk.value);
+
+    case PENDING:
+    case BLOCKED:
+      var parentChunk = initializingChunk;
+      chunk.then(createModelResolver(parentChunk, parentObject, key, false, response, map), createModelReject(parentChunk));
+      return null;
+
+    default:
+      throw chunk.reason;
   }
+}
+
+function createMap(response, model) {
+  return new Map(model);
+}
+
+function createSet(response, model) {
+  return new Set(model);
+}
 
-  return chunk.value;
+function extractIterator(response, model) {
+  // $FlowFixMe[incompatible-use]: This uses raw Symbols because we're extracting from a native array.
+  return model[Symbol.iterator]();
+}
+
+function createModel(response, model) {
+  return model;
 }
 
 function parseModelString(response, obj, key, value) {
@@ -3827,9 +3856,8 @@ function parseModelString(response, obj, key, value) {
           // Promise
           var _id = parseInt(value.slice(2), 16);
 
-          var _chunk2 = getChunk(response, _id);
-
-          return _chunk2;
+          var chunk = getChunk(response, _id);
+          return chunk;
         }
 
       case 'F':
@@ -3838,7 +3866,7 @@ function parseModelString(response, obj, key, value) {
           var _id2 = parseInt(value.slice(2), 16); // TODO: Just encode this in the reference inline instead of as a model.
 
 
-          var metaData = getOutlinedModel(response, _id2);
+          var metaData = getOutlinedModel(response, _id2, obj, key, createModel);
           return loadServerReference$1(response, metaData.id, metaData.bound, initializingChunk, obj, key);
         }
 
@@ -3853,8 +3881,7 @@ function parseModelString(response, obj, key, value) {
           // Map
           var _id3 = parseInt(value.slice(2), 16);
 
-          var data = getOutlinedModel(response, _id3);
-          return new Map(data);
+          return getOutlinedModel(response, _id3, obj, key, createMap);
         }
 
       case 'W':
@@ -3862,9 +3889,7 @@ function parseModelString(response, obj, key, value) {
           // Set
           var _id4 = parseInt(value.slice(2), 16);
 
-          var _data = getOutlinedModel(response, _id4);
-
-          return new Set(_data);
+          return getOutlinedModel(response, _id4, obj, key, createSet);
         }
 
       case 'K':
@@ -3872,9 +3897,7 @@ function parseModelString(response, obj, key, value) {
           // FormData
           var stringId = value.slice(2);
           var formPrefix = response._prefix + stringId + '_';
-
-          var _data2 = new FormData();
-
+          var data = new FormData();
           var backingFormData = response._formData; // We assume that the reference to FormData always comes after each
           // entry that it references so we can assume they all exist in the
           // backing store already.
@@ -3882,10 +3905,10 @@ function parseModelString(response, obj, key, value) {
 
           backingFormData.forEach(function (entry, entryKey) {
             if (entryKey.startsWith(formPrefix)) {
-              _data2.append(entryKey.slice(formPrefix.length), entry);
+              data.append(entryKey.slice(formPrefix.length), entry);
             }
           });
-          return _data2;
+          return data;
         }
 
       case 'i':
@@ -3893,9 +3916,7 @@ function parseModelString(response, obj, key, value) {
           // Iterator
           var _id5 = parseInt(value.slice(2), 16);
 
-          var _data3 = getOutlinedModel(response, _id5);
-
-          return _data3[Symbol.iterator]();
+          return getOutlinedModel(response, _id5, obj, key, extractIterator);
         }
 
       case 'I':
@@ -3942,28 +3963,7 @@ function parseModelString(response, obj, key, value) {
 
 
     var id = parseInt(value.slice(1), 16);
-    var chunk = getChunk(response, id);
-
-    switch (chunk.status) {
-      case RESOLVED_MODEL:
-        initializeModelChunk(chunk);
-        break;
-    } // The status might have changed after initialization.
-
-
-    switch (chunk.status) {
-      case INITIALIZED:
-        return chunk.value;
-
-      case PENDING:
-      case BLOCKED:
-        var parentChunk = initializingChunk;
-        chunk.then(createModelResolver(parentChunk, obj, key), createModelReject(parentChunk));
-        return null;
-
-      default:
-        throw chunk.reason;
-    }
+    return getOutlinedModel(response, id, obj, key, createModel);
   }
 
   return value;