react-server-dom-turbopack 19.1.9 → 19.1.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -385,11 +385,8 @@
385
385
  entry.done
386
386
  ? ((entry = nextPartId++),
387
387
  data.append(formFieldPrefix + entry, new Blob(buffer)),
388
- data.append(
389
- formFieldPrefix + streamId,
390
- '"$o' + entry.toString(16) + '"'
391
- ),
392
- data.append(formFieldPrefix + streamId, "C"),
388
+ data.append(streamPrefix, '"$o' + entry.toString(16) + '"'),
389
+ data.append(streamPrefix, "C"),
393
390
  pendingParts--,
394
391
  0 === pendingParts && resolve(data))
395
392
  : (buffer.push(entry.value),
@@ -399,20 +396,21 @@
399
396
  var data = formData;
400
397
  pendingParts++;
401
398
  var streamId = nextPartId++,
402
- buffer = [];
399
+ buffer = [],
400
+ streamPrefix = formFieldPrefix + "S" + streamId;
403
401
  reader.read(new Uint8Array(1024)).then(progress, reject);
404
402
  return "$r" + streamId.toString(16);
405
403
  }
406
404
  function serializeReader(reader) {
407
405
  function progress(entry) {
408
406
  if (entry.done)
409
- data.append(formFieldPrefix + streamId, "C"),
407
+ data.append(streamPrefix, "C"),
410
408
  pendingParts--,
411
409
  0 === pendingParts && resolve(data);
412
410
  else
413
411
  try {
414
412
  var partJSON = JSON.stringify(entry.value, resolveToJSON);
415
- data.append(formFieldPrefix + streamId, partJSON);
413
+ data.append(streamPrefix, partJSON);
416
414
  reader.read().then(progress, reject);
417
415
  } catch (x) {
418
416
  reject(x);
@@ -421,7 +419,8 @@
421
419
  null === formData && (formData = new FormData());
422
420
  var data = formData;
423
421
  pendingParts++;
424
- var streamId = nextPartId++;
422
+ var streamId = nextPartId++,
423
+ streamPrefix = formFieldPrefix + "S" + streamId;
425
424
  reader.read().then(progress, reject);
426
425
  return "$R" + streamId.toString(16);
427
426
  }
@@ -436,12 +435,11 @@
436
435
  function serializeAsyncIterable(iterable, iterator) {
437
436
  function progress(entry) {
438
437
  if (entry.done) {
439
- if (void 0 === entry.value)
440
- data.append(formFieldPrefix + streamId, "C");
438
+ if (void 0 === entry.value) data.append(streamPrefix, "C");
441
439
  else
442
440
  try {
443
441
  var partJSON = JSON.stringify(entry.value, resolveToJSON);
444
- data.append(formFieldPrefix + streamId, "C" + partJSON);
442
+ data.append(streamPrefix, "C" + partJSON);
445
443
  } catch (x) {
446
444
  reject(x);
447
445
  return;
@@ -451,7 +449,7 @@
451
449
  } else
452
450
  try {
453
451
  var _partJSON = JSON.stringify(entry.value, resolveToJSON);
454
- data.append(formFieldPrefix + streamId, _partJSON);
452
+ data.append(streamPrefix, _partJSON);
455
453
  iterator.next().then(progress, reject);
456
454
  } catch (x$0) {
457
455
  reject(x$0);
@@ -462,6 +460,7 @@
462
460
  pendingParts++;
463
461
  var streamId = nextPartId++;
464
462
  iterable = iterable === iterator;
463
+ var streamPrefix = formFieldPrefix + "S" + streamId;
465
464
  iterator.next().then(progress, reject);
466
465
  return "$" + (iterable ? "x" : "X") + streamId.toString(16);
467
466
  }
@@ -1222,13 +1221,21 @@
1222
1221
  null !== listeners && wakeChunk(listeners, error);
1223
1222
  }
1224
1223
  }
1224
+ function createResolvedModelChunk(response, value) {
1225
+ return new ReactPromise(
1226
+ "resolved_model",
1227
+ value,
1228
+ _defineProperty({}, RESPONSE_SYMBOL, response),
1229
+ response
1230
+ );
1231
+ }
1225
1232
  function createResolvedIteratorResultChunk(response, value, done) {
1226
1233
  return new ReactPromise(
1227
1234
  "resolved_model",
1228
1235
  (done ? '{"done":true,"value":' : '{"done":false,"value":') +
1229
1236
  value +
1230
1237
  "}",
1231
- null,
1238
+ _defineProperty({}, RESPONSE_SYMBOL, response),
1232
1239
  response
1233
1240
  );
1234
1241
  }
@@ -1247,6 +1254,7 @@
1247
1254
  rejectListeners = chunk.reason;
1248
1255
  chunk.status = "resolved_model";
1249
1256
  chunk.value = value;
1257
+ chunk.reason = _defineProperty({}, RESPONSE_SYMBOL, chunk._response);
1250
1258
  null !== resolveListeners &&
1251
1259
  (initializeModelChunk(chunk),
1252
1260
  wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners));
@@ -1267,12 +1275,13 @@
1267
1275
  function initializeModelChunk(chunk) {
1268
1276
  var prevHandler = initializingHandler;
1269
1277
  initializingHandler = null;
1270
- var resolvedModel = chunk.value;
1278
+ var resolvedModel = chunk.value,
1279
+ response = chunk.reason[RESPONSE_SYMBOL];
1271
1280
  chunk.status = "blocked";
1272
1281
  chunk.value = null;
1273
1282
  chunk.reason = null;
1274
1283
  try {
1275
- var value = JSON.parse(resolvedModel, chunk._response._fromJSON),
1284
+ var value = JSON.parse(resolvedModel, response._fromJSON),
1276
1285
  resolveListeners = chunk.value;
1277
1286
  null !== resolveListeners &&
1278
1287
  ((chunk.value = null),
@@ -1452,6 +1461,9 @@
1452
1461
  return null;
1453
1462
  }
1454
1463
  function loadServerReference(response, metaData, parentObject, key) {
1464
+ if ("then" === key) return null;
1465
+ var id = metaData.id;
1466
+ if ("string" !== typeof id) return null;
1455
1467
  if (!response._serverReferenceConfig)
1456
1468
  return createBoundServerReference(
1457
1469
  metaData,
@@ -1461,22 +1473,23 @@
1461
1473
  );
1462
1474
  var serverReference = resolveServerReference(
1463
1475
  response._serverReferenceConfig,
1464
- metaData.id
1476
+ id
1465
1477
  ),
1466
- promise = preloadModule(serverReference);
1467
- if (promise)
1468
- metaData.bound && (promise = Promise.all([promise, metaData.bound]));
1469
- else if (metaData.bound) promise = Promise.resolve(metaData.bound);
1478
+ bound = metaData.bound;
1479
+ if ((metaData = preloadModule(serverReference)))
1480
+ bound instanceof ReactPromise &&
1481
+ (metaData = Promise.all([metaData, bound]));
1482
+ else if (bound instanceof ReactPromise) metaData = Promise.resolve(bound);
1470
1483
  else
1471
1484
  return (
1472
- (promise = requireModule(serverReference)),
1485
+ (metaData = requireModule(serverReference)),
1473
1486
  registerBoundServerReference(
1474
- promise,
1475
- metaData.id,
1476
- metaData.bound,
1487
+ metaData,
1488
+ id,
1489
+ bound,
1477
1490
  response._encodeFormAction
1478
1491
  ),
1479
- promise
1492
+ metaData
1480
1493
  );
1481
1494
  if (initializingHandler) {
1482
1495
  var handler = initializingHandler;
@@ -1489,18 +1502,24 @@
1489
1502
  deps: 1,
1490
1503
  errored: !1
1491
1504
  };
1492
- promise.then(
1505
+ metaData.then(
1493
1506
  function () {
1494
1507
  var resolvedValue = requireModule(serverReference);
1495
- if (metaData.bound) {
1496
- var boundArgs = metaData.bound.value.slice(0);
1497
- boundArgs.unshift(null);
1498
- resolvedValue = resolvedValue.bind.apply(resolvedValue, boundArgs);
1508
+ if (bound) {
1509
+ var promiseValue = bound.value;
1510
+ promiseValue = isArrayImpl(promiseValue)
1511
+ ? promiseValue.slice(0)
1512
+ : [];
1513
+ promiseValue.unshift(null);
1514
+ resolvedValue = resolvedValue.bind.apply(
1515
+ resolvedValue,
1516
+ promiseValue
1517
+ );
1499
1518
  }
1500
1519
  registerBoundServerReference(
1501
1520
  resolvedValue,
1502
- metaData.id,
1503
- metaData.bound,
1521
+ id,
1522
+ bound,
1504
1523
  response._encodeFormAction
1505
1524
  );
1506
1525
  "__proto__" !== key && (parentObject[key] = resolvedValue);
@@ -1513,23 +1532,23 @@
1513
1532
  null !== handler.value &&
1514
1533
  handler.value.$$typeof === REACT_ELEMENT_TYPE
1515
1534
  )
1516
- switch (((boundArgs = handler.value), key)) {
1535
+ switch (((promiseValue = handler.value), key)) {
1517
1536
  case "3":
1518
- boundArgs.props = resolvedValue;
1537
+ promiseValue.props = resolvedValue;
1519
1538
  break;
1520
1539
  case "4":
1521
- boundArgs._owner = resolvedValue;
1540
+ promiseValue._owner = resolvedValue;
1522
1541
  }
1523
1542
  handler.deps--;
1524
1543
  0 === handler.deps &&
1525
1544
  ((resolvedValue = handler.chunk),
1526
1545
  null !== resolvedValue &&
1527
1546
  "blocked" === resolvedValue.status &&
1528
- ((boundArgs = resolvedValue.value),
1547
+ ((promiseValue = resolvedValue.value),
1529
1548
  (resolvedValue.status = "fulfilled"),
1530
1549
  (resolvedValue.value = handler.value),
1531
1550
  (resolvedValue.reason = null),
1532
- null !== boundArgs && wakeChunk(boundArgs, handler.value)));
1551
+ null !== promiseValue && wakeChunk(promiseValue, handler.value)));
1533
1552
  },
1534
1553
  function (error) {
1535
1554
  if (!handler.errored) {
@@ -1648,8 +1667,8 @@
1648
1667
  function extractIterator(response, model) {
1649
1668
  return model[Symbol.iterator]();
1650
1669
  }
1651
- function createModel(response, model) {
1652
- return model;
1670
+ function createModel(response, model, parentObject, key) {
1671
+ return "then" === key && "function" === typeof model ? null : model;
1653
1672
  }
1654
1673
  function parseModelString(response, parentObject, key, value) {
1655
1674
  if ("$" === value[0]) {
@@ -1841,10 +1860,7 @@
1841
1860
  chunk = chunks.get(id);
1842
1861
  chunk
1843
1862
  ? resolveModelChunk(chunk, model)
1844
- : chunks.set(
1845
- id,
1846
- new ReactPromise("resolved_model", model, null, response)
1847
- );
1863
+ : chunks.set(id, createResolvedModelChunk(response, model));
1848
1864
  }
1849
1865
  function resolveText(response, id, text) {
1850
1866
  var chunks = response._chunks,
@@ -1936,12 +1952,7 @@
1936
1952
  },
1937
1953
  enqueueModel: function (json) {
1938
1954
  if (null === previousBlockedChunk) {
1939
- var chunk = new ReactPromise(
1940
- "resolved_model",
1941
- json,
1942
- null,
1943
- response
1944
- );
1955
+ var chunk = createResolvedModelChunk(response, json);
1945
1956
  initializeModelChunk(chunk);
1946
1957
  "fulfilled" === chunk.status
1947
1958
  ? controller.enqueue(chunk.value)
@@ -2517,7 +2528,7 @@
2517
2528
  break;
2518
2529
  case 78:
2519
2530
  case 68:
2520
- tag = new ReactPromise("resolved_model", row, null, response);
2531
+ tag = createResolvedModelChunk(response, row);
2521
2532
  initializeModelChunk(tag);
2522
2533
  "fulfilled" === tag.status
2523
2534
  ? resolveDebugInfo(response, id, tag.value)
@@ -2714,7 +2725,8 @@
2714
2725
  React.__SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE,
2715
2726
  ReactSharedInternals =
2716
2727
  React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE ||
2717
- ReactSharedInteralsServer;
2728
+ ReactSharedInteralsServer,
2729
+ RESPONSE_SYMBOL = Symbol();
2718
2730
  ReactPromise.prototype = Object.create(Promise.prototype);
2719
2731
  ReactPromise.prototype.then = function (resolve, reject) {
2720
2732
  switch (this.status) {
@@ -178,11 +178,8 @@ function processReply(
178
178
  entry.done
179
179
  ? ((entry = nextPartId++),
180
180
  data.append(formFieldPrefix + entry, new Blob(buffer)),
181
- data.append(
182
- formFieldPrefix + streamId,
183
- '"$o' + entry.toString(16) + '"'
184
- ),
185
- data.append(formFieldPrefix + streamId, "C"),
181
+ data.append(streamPrefix, '"$o' + entry.toString(16) + '"'),
182
+ data.append(streamPrefix, "C"),
186
183
  pendingParts--,
187
184
  0 === pendingParts && resolve(data))
188
185
  : (buffer.push(entry.value),
@@ -192,20 +189,21 @@ function processReply(
192
189
  var data = formData;
193
190
  pendingParts++;
194
191
  var streamId = nextPartId++,
195
- buffer = [];
192
+ buffer = [],
193
+ streamPrefix = formFieldPrefix + "S" + streamId;
196
194
  reader.read(new Uint8Array(1024)).then(progress, reject);
197
195
  return "$r" + streamId.toString(16);
198
196
  }
199
197
  function serializeReader(reader) {
200
198
  function progress(entry) {
201
199
  if (entry.done)
202
- data.append(formFieldPrefix + streamId, "C"),
200
+ data.append(streamPrefix, "C"),
203
201
  pendingParts--,
204
202
  0 === pendingParts && resolve(data);
205
203
  else
206
204
  try {
207
205
  var partJSON = JSON.stringify(entry.value, resolveToJSON);
208
- data.append(formFieldPrefix + streamId, partJSON);
206
+ data.append(streamPrefix, partJSON);
209
207
  reader.read().then(progress, reject);
210
208
  } catch (x) {
211
209
  reject(x);
@@ -214,7 +212,8 @@ function processReply(
214
212
  null === formData && (formData = new FormData());
215
213
  var data = formData;
216
214
  pendingParts++;
217
- var streamId = nextPartId++;
215
+ var streamId = nextPartId++,
216
+ streamPrefix = formFieldPrefix + "S" + streamId;
218
217
  reader.read().then(progress, reject);
219
218
  return "$R" + streamId.toString(16);
220
219
  }
@@ -229,12 +228,11 @@ function processReply(
229
228
  function serializeAsyncIterable(iterable, iterator) {
230
229
  function progress(entry) {
231
230
  if (entry.done) {
232
- if (void 0 === entry.value)
233
- data.append(formFieldPrefix + streamId, "C");
231
+ if (void 0 === entry.value) data.append(streamPrefix, "C");
234
232
  else
235
233
  try {
236
234
  var partJSON = JSON.stringify(entry.value, resolveToJSON);
237
- data.append(formFieldPrefix + streamId, "C" + partJSON);
235
+ data.append(streamPrefix, "C" + partJSON);
238
236
  } catch (x) {
239
237
  reject(x);
240
238
  return;
@@ -243,11 +241,11 @@ function processReply(
243
241
  0 === pendingParts && resolve(data);
244
242
  } else
245
243
  try {
246
- var partJSON$22 = JSON.stringify(entry.value, resolveToJSON);
247
- data.append(formFieldPrefix + streamId, partJSON$22);
244
+ var partJSON$25 = JSON.stringify(entry.value, resolveToJSON);
245
+ data.append(streamPrefix, partJSON$25);
248
246
  iterator.next().then(progress, reject);
249
- } catch (x$23) {
250
- reject(x$23);
247
+ } catch (x$26) {
248
+ reject(x$26);
251
249
  }
252
250
  }
253
251
  null === formData && (formData = new FormData());
@@ -255,6 +253,7 @@ function processReply(
255
253
  pendingParts++;
256
254
  var streamId = nextPartId++;
257
255
  iterable = iterable === iterator;
256
+ var streamPrefix = formFieldPrefix + "S" + streamId;
258
257
  iterator.next().then(progress, reject);
259
258
  return "$" + (iterable ? "x" : "X") + streamId.toString(16);
260
259
  }
@@ -292,20 +291,20 @@ function processReply(
292
291
  "function" === typeof x.then
293
292
  ) {
294
293
  pendingParts++;
295
- var lazyId$24 = nextPartId++;
294
+ var lazyId$27 = nextPartId++;
296
295
  parentReference = function () {
297
296
  try {
298
- var partJSON$25 = serializeModel(value, lazyId$24),
299
- data$26 = formData;
300
- data$26.append(formFieldPrefix + lazyId$24, partJSON$25);
297
+ var partJSON$28 = serializeModel(value, lazyId$27),
298
+ data$29 = formData;
299
+ data$29.append(formFieldPrefix + lazyId$27, partJSON$28);
301
300
  pendingParts--;
302
- 0 === pendingParts && resolve(data$26);
301
+ 0 === pendingParts && resolve(data$29);
303
302
  } catch (reason) {
304
303
  reject(reason);
305
304
  }
306
305
  };
307
306
  x.then(parentReference, parentReference);
308
- return "$" + lazyId$24.toString(16);
307
+ return "$" + lazyId$27.toString(16);
309
308
  }
310
309
  reject(x);
311
310
  return null;
@@ -326,12 +325,12 @@ function processReply(
326
325
  value.then(function (partValue) {
327
326
  try {
328
327
  var previousReference = writtenObjects.get(partValue);
329
- var partJSON$28 =
328
+ var partJSON$31 =
330
329
  void 0 !== previousReference
331
330
  ? JSON.stringify(previousReference)
332
331
  : serializeModel(partValue, promiseId);
333
332
  partValue = formData;
334
- partValue.append(formFieldPrefix + promiseId, partJSON$28);
333
+ partValue.append(formFieldPrefix + promiseId, partJSON$31);
335
334
  pendingParts--;
336
335
  0 === pendingParts && resolve(partValue);
337
336
  } catch (reason) {
@@ -354,11 +353,11 @@ function processReply(
354
353
  if (isArrayImpl(value)) return value;
355
354
  if (value instanceof FormData) {
356
355
  null === formData && (formData = new FormData());
357
- var data$32 = formData;
356
+ var data$35 = formData;
358
357
  key = nextPartId++;
359
358
  var prefix = formFieldPrefix + "_" + key + "_";
360
359
  value.forEach(function (originalValue, originalKey) {
361
- data$32.append(prefix + originalKey, originalValue);
360
+ data$35.append(prefix + originalKey, originalValue);
362
361
  });
363
362
  return "$K" + key.toString(16);
364
363
  }
@@ -700,6 +699,7 @@ function createServerReference$1(id, callServer, encodeFormAction) {
700
699
  registerBoundServerReference(action, id, null, encodeFormAction);
701
700
  return action;
702
701
  }
702
+ var RESPONSE_SYMBOL = Symbol();
703
703
  function ReactPromise(status, value, reason, response) {
704
704
  this.status = status;
705
705
  this.value = value;
@@ -789,11 +789,21 @@ function triggerErrorOnChunk(chunk, error) {
789
789
  null !== listeners && wakeChunk(listeners, error);
790
790
  }
791
791
  }
792
+ function createResolvedModelChunk(response, value) {
793
+ var $jscomp$compprop0 = {};
794
+ return new ReactPromise(
795
+ "resolved_model",
796
+ value,
797
+ (($jscomp$compprop0[RESPONSE_SYMBOL] = response), $jscomp$compprop0),
798
+ response
799
+ );
800
+ }
792
801
  function createResolvedIteratorResultChunk(response, value, done) {
802
+ var $jscomp$compprop1 = {};
793
803
  return new ReactPromise(
794
804
  "resolved_model",
795
805
  (done ? '{"done":true,"value":' : '{"done":false,"value":') + value + "}",
796
- null,
806
+ (($jscomp$compprop1[RESPONSE_SYMBOL] = response), $jscomp$compprop1),
797
807
  response
798
808
  );
799
809
  }
@@ -810,6 +820,8 @@ function resolveModelChunk(chunk, value) {
810
820
  rejectListeners = chunk.reason;
811
821
  chunk.status = "resolved_model";
812
822
  chunk.value = value;
823
+ value = {};
824
+ chunk.reason = ((value[RESPONSE_SYMBOL] = chunk._response), value);
813
825
  null !== resolveListeners &&
814
826
  (initializeModelChunk(chunk),
815
827
  wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners));
@@ -831,12 +843,13 @@ var initializingHandler = null;
831
843
  function initializeModelChunk(chunk) {
832
844
  var prevHandler = initializingHandler;
833
845
  initializingHandler = null;
834
- var resolvedModel = chunk.value;
846
+ var resolvedModel = chunk.value,
847
+ response = chunk.reason[RESPONSE_SYMBOL];
835
848
  chunk.status = "blocked";
836
849
  chunk.value = null;
837
850
  chunk.reason = null;
838
851
  try {
839
- var value = JSON.parse(resolvedModel, chunk._response._fromJSON),
852
+ var value = JSON.parse(resolvedModel, response._fromJSON),
840
853
  resolveListeners = chunk.value;
841
854
  null !== resolveListeners &&
842
855
  ((chunk.value = null),
@@ -970,6 +983,9 @@ function waitForReference(
970
983
  return null;
971
984
  }
972
985
  function loadServerReference(response, metaData, parentObject, key) {
986
+ if ("then" === key) return null;
987
+ var id = metaData.id;
988
+ if ("string" !== typeof id) return null;
973
989
  if (!response._serverReferenceConfig)
974
990
  return createBoundServerReference(
975
991
  metaData,
@@ -978,22 +994,23 @@ function loadServerReference(response, metaData, parentObject, key) {
978
994
  );
979
995
  var serverReference = resolveServerReference(
980
996
  response._serverReferenceConfig,
981
- metaData.id
997
+ id
982
998
  ),
983
- promise = preloadModule(serverReference);
984
- if (promise)
985
- metaData.bound && (promise = Promise.all([promise, metaData.bound]));
986
- else if (metaData.bound) promise = Promise.resolve(metaData.bound);
999
+ bound = metaData.bound;
1000
+ if ((metaData = preloadModule(serverReference)))
1001
+ bound instanceof ReactPromise &&
1002
+ (metaData = Promise.all([metaData, bound]));
1003
+ else if (bound instanceof ReactPromise) metaData = Promise.resolve(bound);
987
1004
  else
988
1005
  return (
989
- (promise = requireModule(serverReference)),
1006
+ (metaData = requireModule(serverReference)),
990
1007
  registerBoundServerReference(
991
- promise,
992
- metaData.id,
993
- metaData.bound,
1008
+ metaData,
1009
+ id,
1010
+ bound,
994
1011
  response._encodeFormAction
995
1012
  ),
996
- promise
1013
+ metaData
997
1014
  );
998
1015
  if (initializingHandler) {
999
1016
  var handler = initializingHandler;
@@ -1006,18 +1023,19 @@ function loadServerReference(response, metaData, parentObject, key) {
1006
1023
  deps: 1,
1007
1024
  errored: !1
1008
1025
  };
1009
- promise.then(
1026
+ metaData.then(
1010
1027
  function () {
1011
1028
  var resolvedValue = requireModule(serverReference);
1012
- if (metaData.bound) {
1013
- var boundArgs = metaData.bound.value.slice(0);
1014
- boundArgs.unshift(null);
1015
- resolvedValue = resolvedValue.bind.apply(resolvedValue, boundArgs);
1029
+ if (bound) {
1030
+ var promiseValue = bound.value;
1031
+ promiseValue = isArrayImpl(promiseValue) ? promiseValue.slice(0) : [];
1032
+ promiseValue.unshift(null);
1033
+ resolvedValue = resolvedValue.bind.apply(resolvedValue, promiseValue);
1016
1034
  }
1017
1035
  registerBoundServerReference(
1018
1036
  resolvedValue,
1019
- metaData.id,
1020
- metaData.bound,
1037
+ id,
1038
+ bound,
1021
1039
  response._encodeFormAction
1022
1040
  );
1023
1041
  "__proto__" !== key && (parentObject[key] = resolvedValue);
@@ -1028,20 +1046,20 @@ function loadServerReference(response, metaData, parentObject, key) {
1028
1046
  null !== handler.value &&
1029
1047
  handler.value.$$typeof === REACT_ELEMENT_TYPE
1030
1048
  )
1031
- switch (((boundArgs = handler.value), key)) {
1049
+ switch (((promiseValue = handler.value), key)) {
1032
1050
  case "3":
1033
- boundArgs.props = resolvedValue;
1051
+ promiseValue.props = resolvedValue;
1034
1052
  }
1035
1053
  handler.deps--;
1036
1054
  0 === handler.deps &&
1037
1055
  ((resolvedValue = handler.chunk),
1038
1056
  null !== resolvedValue &&
1039
1057
  "blocked" === resolvedValue.status &&
1040
- ((boundArgs = resolvedValue.value),
1058
+ ((promiseValue = resolvedValue.value),
1041
1059
  (resolvedValue.status = "fulfilled"),
1042
1060
  (resolvedValue.value = handler.value),
1043
1061
  (resolvedValue.reason = null),
1044
- null !== boundArgs && wakeChunk(boundArgs, handler.value)));
1062
+ null !== promiseValue && wakeChunk(promiseValue, handler.value)));
1045
1063
  },
1046
1064
  function (error) {
1047
1065
  if (!handler.errored) {
@@ -1123,8 +1141,8 @@ function createFormData(response, model) {
1123
1141
  function extractIterator(response, model) {
1124
1142
  return model[Symbol.iterator]();
1125
1143
  }
1126
- function createModel(response, model) {
1127
- return model;
1144
+ function createModel(response, model, parentObject, key) {
1145
+ return "then" === key && "function" === typeof model ? null : model;
1128
1146
  }
1129
1147
  function parseModelString(response, parentObject, key, value) {
1130
1148
  if ("$" === value[0]) {
@@ -1329,7 +1347,7 @@ function startReadableStream(response, id, type) {
1329
1347
  },
1330
1348
  enqueueModel: function (json) {
1331
1349
  if (null === previousBlockedChunk) {
1332
- var chunk = new ReactPromise("resolved_model", json, null, response);
1350
+ var chunk = createResolvedModelChunk(response, json);
1333
1351
  initializeModelChunk(chunk);
1334
1352
  "fulfilled" === chunk.status
1335
1353
  ? controller.enqueue(chunk.value)
@@ -1344,8 +1362,8 @@ function startReadableStream(response, id, type) {
1344
1362
  (previousBlockedChunk = chunk));
1345
1363
  } else {
1346
1364
  chunk = previousBlockedChunk;
1347
- var chunk$53 = createPendingChunk(response);
1348
- chunk$53.then(
1365
+ var chunk$56 = createPendingChunk(response);
1366
+ chunk$56.then(
1349
1367
  function (v) {
1350
1368
  return controller.enqueue(v);
1351
1369
  },
@@ -1353,10 +1371,10 @@ function startReadableStream(response, id, type) {
1353
1371
  return controller.error(e);
1354
1372
  }
1355
1373
  );
1356
- previousBlockedChunk = chunk$53;
1374
+ previousBlockedChunk = chunk$56;
1357
1375
  chunk.then(function () {
1358
- previousBlockedChunk === chunk$53 && (previousBlockedChunk = null);
1359
- resolveModelChunk(chunk$53, json);
1376
+ previousBlockedChunk === chunk$56 && (previousBlockedChunk = null);
1377
+ resolveModelChunk(chunk$56, json);
1360
1378
  });
1361
1379
  }
1362
1380
  },
@@ -1397,9 +1415,9 @@ function startAsyncIterable(response, id, iterator) {
1397
1415
  var buffer = [],
1398
1416
  closed = !1,
1399
1417
  nextWriteIndex = 0,
1400
- $jscomp$compprop0 = {};
1401
- $jscomp$compprop0 =
1402
- (($jscomp$compprop0[ASYNC_ITERATOR] = function () {
1418
+ $jscomp$compprop3 = {};
1419
+ $jscomp$compprop3 =
1420
+ (($jscomp$compprop3[ASYNC_ITERATOR] = function () {
1403
1421
  var nextReadIndex = 0;
1404
1422
  return createIterator(function (arg) {
1405
1423
  if (void 0 !== arg)
@@ -1419,11 +1437,11 @@ function startAsyncIterable(response, id, iterator) {
1419
1437
  return buffer[nextReadIndex++];
1420
1438
  });
1421
1439
  }),
1422
- $jscomp$compprop0);
1440
+ $jscomp$compprop3);
1423
1441
  resolveStream(
1424
1442
  response,
1425
1443
  id,
1426
- iterator ? $jscomp$compprop0[ASYNC_ITERATOR]() : $jscomp$compprop0,
1444
+ iterator ? $jscomp$compprop3[ASYNC_ITERATOR]() : $jscomp$compprop3,
1427
1445
  {
1428
1446
  enqueueValue: function (value) {
1429
1447
  if (nextWriteIndex === buffer.length)
@@ -1501,8 +1519,8 @@ function mergeBuffer(buffer, lastChunk) {
1501
1519
  for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++)
1502
1520
  byteLength += buffer[i].byteLength;
1503
1521
  byteLength = new Uint8Array(byteLength);
1504
- for (var i$54 = (i = 0); i$54 < l; i$54++) {
1505
- var chunk = buffer[i$54];
1522
+ for (var i$57 = (i = 0); i$57 < l; i$57++) {
1523
+ var chunk = buffer[i$57];
1506
1524
  byteLength.set(chunk, i);
1507
1525
  i += chunk.byteLength;
1508
1526
  }
@@ -1673,10 +1691,7 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) {
1673
1691
  (tag = response._chunks),
1674
1692
  (chunk = tag.get(id))
1675
1693
  ? resolveModelChunk(chunk, buffer)
1676
- : tag.set(
1677
- id,
1678
- new ReactPromise("resolved_model", buffer, null, response)
1679
- );
1694
+ : tag.set(id, createResolvedModelChunk(response, buffer));
1680
1695
  }
1681
1696
  }
1682
1697
  function createFromJSONCallback(response) {