Unverified Commit a2021b3e authored by Sebastian "Sebbie" Silbermann's avatar Sebastian "Sebbie" Silbermann Committed by GitHub

[lts-maintenance][react] Improve Server Component transport protocol (#194)

Co-authored-by: 's avatarHendrik Liebau <mail@hendrik-liebau.de>
Co-authored-by: 's avatarClaude Code (kimi-k3[1m]) <noreply@anthropic.com>
parent a836b531
...@@ -11,6 +11,17 @@ ...@@ -11,6 +11,17 @@
"use strict"; "use strict";
"production" !== process.env.NODE_ENV && "production" !== process.env.NODE_ENV &&
(function () { (function () {
function _defineProperty(obj, key, value) {
key in obj
? Object.defineProperty(obj, key, {
value: value,
enumerable: !0,
configurable: !0,
writable: !0
})
: (obj[key] = value);
return obj;
}
function resolveClientReference(bundlerConfig, metadata) { function resolveClientReference(bundlerConfig, metadata) {
if (bundlerConfig) { if (bundlerConfig) {
var moduleExports = bundlerConfig[metadata[0]]; var moduleExports = bundlerConfig[metadata[0]];
...@@ -336,11 +347,8 @@ ...@@ -336,11 +347,8 @@
entry.done entry.done
? ((entry = nextPartId++), ? ((entry = nextPartId++),
data.append(formFieldPrefix + entry, new Blob(buffer)), data.append(formFieldPrefix + entry, new Blob(buffer)),
data.append( data.append(streamPrefix, '"$o' + entry.toString(16) + '"'),
formFieldPrefix + streamId, data.append(streamPrefix, "C"),
'"$o' + entry.toString(16) + '"'
),
data.append(formFieldPrefix + streamId, "C"),
pendingParts--, pendingParts--,
0 === pendingParts && resolve(data)) 0 === pendingParts && resolve(data))
: (buffer.push(entry.value), : (buffer.push(entry.value),
...@@ -350,20 +358,21 @@ ...@@ -350,20 +358,21 @@
var data = formData; var data = formData;
pendingParts++; pendingParts++;
var streamId = nextPartId++, var streamId = nextPartId++,
buffer = []; buffer = [],
streamPrefix = formFieldPrefix + "S" + streamId;
reader.read(new Uint8Array(1024)).then(progress, reject); reader.read(new Uint8Array(1024)).then(progress, reject);
return "$r" + streamId.toString(16); return "$r" + streamId.toString(16);
} }
function serializeReader(reader) { function serializeReader(reader) {
function progress(entry) { function progress(entry) {
if (entry.done) if (entry.done)
data.append(formFieldPrefix + streamId, "C"), data.append(streamPrefix, "C"),
pendingParts--, pendingParts--,
0 === pendingParts && resolve(data); 0 === pendingParts && resolve(data);
else else
try { try {
var partJSON = JSON.stringify(entry.value, resolveToJSON); var partJSON = JSON.stringify(entry.value, resolveToJSON);
data.append(formFieldPrefix + streamId, partJSON); data.append(streamPrefix, partJSON);
reader.read().then(progress, reject); reader.read().then(progress, reject);
} catch (x) { } catch (x) {
reject(x); reject(x);
...@@ -372,7 +381,8 @@ ...@@ -372,7 +381,8 @@
null === formData && (formData = new FormData()); null === formData && (formData = new FormData());
var data = formData; var data = formData;
pendingParts++; pendingParts++;
var streamId = nextPartId++; var streamId = nextPartId++,
streamPrefix = formFieldPrefix + "S" + streamId;
reader.read().then(progress, reject); reader.read().then(progress, reject);
return "$R" + streamId.toString(16); return "$R" + streamId.toString(16);
} }
...@@ -387,12 +397,11 @@ ...@@ -387,12 +397,11 @@
function serializeAsyncIterable(iterable, iterator) { function serializeAsyncIterable(iterable, iterator) {
function progress(entry) { function progress(entry) {
if (entry.done) { if (entry.done) {
if (void 0 === entry.value) if (void 0 === entry.value) data.append(streamPrefix, "C");
data.append(formFieldPrefix + streamId, "C");
else else
try { try {
var partJSON = JSON.stringify(entry.value, resolveToJSON); var partJSON = JSON.stringify(entry.value, resolveToJSON);
data.append(formFieldPrefix + streamId, "C" + partJSON); data.append(streamPrefix, "C" + partJSON);
} catch (x) { } catch (x) {
reject(x); reject(x);
return; return;
...@@ -402,7 +411,7 @@ ...@@ -402,7 +411,7 @@
} else } else
try { try {
var _partJSON = JSON.stringify(entry.value, resolveToJSON); var _partJSON = JSON.stringify(entry.value, resolveToJSON);
data.append(formFieldPrefix + streamId, _partJSON); data.append(streamPrefix, _partJSON);
iterator.next().then(progress, reject); iterator.next().then(progress, reject);
} catch (x$0) { } catch (x$0) {
reject(x$0); reject(x$0);
...@@ -413,6 +422,7 @@ ...@@ -413,6 +422,7 @@
pendingParts++; pendingParts++;
var streamId = nextPartId++; var streamId = nextPartId++;
iterable = iterable === iterator; iterable = iterable === iterator;
var streamPrefix = formFieldPrefix + "S" + streamId;
iterator.next().then(progress, reject); iterator.next().then(progress, reject);
return "$" + (iterable ? "x" : "X") + streamId.toString(16); return "$" + (iterable ? "x" : "X") + streamId.toString(16);
} }
...@@ -1557,7 +1567,11 @@ ...@@ -1557,7 +1567,11 @@
} }
} }
function createResolvedModelChunk(response, value) { function createResolvedModelChunk(response, value) {
return new ReactPromise("resolved_model", value, response); return new ReactPromise(
"resolved_model",
value,
_defineProperty({}, RESPONSE_SYMBOL, response)
);
} }
function createResolvedIteratorResultChunk(response, value, done) { function createResolvedIteratorResultChunk(response, value, done) {
return new ReactPromise( return new ReactPromise(
...@@ -1565,7 +1579,7 @@ ...@@ -1565,7 +1579,7 @@
(done ? '{"done":true,"value":' : '{"done":false,"value":') + (done ? '{"done":true,"value":' : '{"done":false,"value":') +
value + value +
"}", "}",
response _defineProperty({}, RESPONSE_SYMBOL, response)
); );
} }
function resolveIteratorResultChunk(response, chunk, value, done) { function resolveIteratorResultChunk(response, chunk, value, done) {
...@@ -1585,7 +1599,7 @@ ...@@ -1585,7 +1599,7 @@
rejectListeners = chunk.reason; rejectListeners = chunk.reason;
chunk.status = "resolved_model"; chunk.status = "resolved_model";
chunk.value = value; chunk.value = value;
chunk.reason = response; chunk.reason = _defineProperty({}, RESPONSE_SYMBOL, response);
null !== resolveListeners && null !== resolveListeners &&
(initializeModelChunk(chunk), (initializeModelChunk(chunk),
wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners)); wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners));
...@@ -1725,7 +1739,7 @@ ...@@ -1725,7 +1739,7 @@
prevChunk = initializingChunk; prevChunk = initializingChunk;
initializingHandler = null; initializingHandler = null;
var resolvedModel = chunk.value, var resolvedModel = chunk.value,
response = chunk.reason; response = chunk.reason[RESPONSE_SYMBOL];
chunk.status = "blocked"; chunk.status = "blocked";
chunk.value = null; chunk.value = null;
chunk.reason = null; chunk.reason = null;
...@@ -2031,6 +2045,9 @@ ...@@ -2031,6 +2045,9 @@
return null; return null;
} }
function loadServerReference(response, metaData, parentObject, key) { function loadServerReference(response, metaData, parentObject, key) {
if ("then" === key) return null;
var id = metaData.id;
if ("string" !== typeof id) return null;
if (!response._serverReferenceConfig) if (!response._serverReferenceConfig)
return createBoundServerReference( return createBoundServerReference(
metaData, metaData,
...@@ -2040,17 +2057,18 @@ ...@@ -2040,17 +2057,18 @@
); );
var serverReference = resolveServerReference( var serverReference = resolveServerReference(
response._serverReferenceConfig, response._serverReferenceConfig,
metaData.id id
), ),
promise = preloadModule(serverReference); bound = metaData.bound;
if (promise) if ((metaData = preloadModule(serverReference)))
metaData.bound && (promise = Promise.all([promise, metaData.bound])); bound instanceof ReactPromise &&
else if (metaData.bound) promise = Promise.resolve(metaData.bound); (metaData = Promise.all([metaData, bound]));
else if (bound instanceof ReactPromise) metaData = Promise.resolve(bound);
else else
return ( return (
(promise = requireModule(serverReference)), (metaData = requireModule(serverReference)),
registerBoundServerReference(promise, metaData.id, metaData.bound), registerBoundServerReference(metaData, id, bound),
promise metaData
); );
if (initializingHandler) { if (initializingHandler) {
var handler = initializingHandler; var handler = initializingHandler;
...@@ -2064,19 +2082,21 @@ ...@@ -2064,19 +2082,21 @@
deps: 1, deps: 1,
errored: !1 errored: !1
}; };
promise.then( metaData.then(
function () { function () {
var resolvedValue = requireModule(serverReference); var resolvedValue = requireModule(serverReference);
if (metaData.bound) { if (bound) {
var boundArgs = metaData.bound.value.slice(0); var promiseValue = bound.value;
boundArgs.unshift(null); promiseValue = isArrayImpl(promiseValue)
resolvedValue = resolvedValue.bind.apply(resolvedValue, boundArgs); ? promiseValue.slice(0)
: [];
promiseValue.unshift(null);
resolvedValue = resolvedValue.bind.apply(
resolvedValue,
promiseValue
);
} }
registerBoundServerReference( registerBoundServerReference(resolvedValue, id, bound);
resolvedValue,
metaData.id,
metaData.bound
);
"__proto__" !== key && (parentObject[key] = resolvedValue); "__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && "" === key &&
null === handler.value && null === handler.value &&
...@@ -2087,23 +2107,23 @@ ...@@ -2087,23 +2107,23 @@
null !== handler.value && null !== handler.value &&
handler.value.$$typeof === REACT_ELEMENT_TYPE handler.value.$$typeof === REACT_ELEMENT_TYPE
) )
switch (((boundArgs = handler.value), key)) { switch (((promiseValue = handler.value), key)) {
case "3": case "3":
boundArgs.props = resolvedValue; promiseValue.props = resolvedValue;
break; break;
case "4": case "4":
boundArgs._owner = resolvedValue; promiseValue._owner = resolvedValue;
} }
handler.deps--; handler.deps--;
0 === handler.deps && 0 === handler.deps &&
((resolvedValue = handler.chunk), ((resolvedValue = handler.chunk),
null !== resolvedValue && null !== resolvedValue &&
"blocked" === resolvedValue.status && "blocked" === resolvedValue.status &&
((boundArgs = resolvedValue.value), ((promiseValue = resolvedValue.value),
(resolvedValue.status = "fulfilled"), (resolvedValue.status = "fulfilled"),
(resolvedValue.value = handler.value), (resolvedValue.value = handler.value),
(resolvedValue.reason = null), (resolvedValue.reason = null),
null !== boundArgs && wakeChunk(boundArgs, handler.value))); null !== promiseValue && wakeChunk(promiseValue, handler.value)));
}, },
function (error) { function (error) {
if (!handler.errored) { if (!handler.errored) {
...@@ -2315,8 +2335,8 @@ ...@@ -2315,8 +2335,8 @@
function extractIterator(response, model) { function extractIterator(response, model) {
return model[Symbol.iterator](); return model[Symbol.iterator]();
} }
function createModel(response, model) { function createModel(response, model, parentObject, key) {
return model; return "then" === key && "function" === typeof model ? null : model;
} }
function getInferredFunctionApproximate(code) { function getInferredFunctionApproximate(code) {
code = code.startsWith("Object.defineProperty(") code = code.startsWith("Object.defineProperty(")
...@@ -4415,7 +4435,8 @@ ...@@ -4415,7 +4435,8 @@
React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE || React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE ||
ReactSharedInteralsServer, ReactSharedInteralsServer,
ObjectPrototype = Object.prototype, ObjectPrototype = Object.prototype,
ArrayPrototype = Array.prototype; ArrayPrototype = Array.prototype,
RESPONSE_SYMBOL = Symbol();
ReactPromise.prototype = Object.create(Promise.prototype); ReactPromise.prototype = Object.create(Promise.prototype);
ReactPromise.prototype.then = function (resolve, reject) { ReactPromise.prototype.then = function (resolve, reject) {
var _this = this; var _this = this;
......
...@@ -11,6 +11,17 @@ ...@@ -11,6 +11,17 @@
"use strict"; "use strict";
"production" !== process.env.NODE_ENV && "production" !== process.env.NODE_ENV &&
(function () { (function () {
function _defineProperty(obj, key, value) {
key in obj
? Object.defineProperty(obj, key, {
value: value,
enumerable: !0,
configurable: !0,
writable: !0
})
: (obj[key] = value);
return obj;
}
function resolveClientReference(bundlerConfig, metadata) { function resolveClientReference(bundlerConfig, metadata) {
if (bundlerConfig) { if (bundlerConfig) {
var moduleExports = bundlerConfig[metadata[0]]; var moduleExports = bundlerConfig[metadata[0]];
...@@ -361,11 +372,8 @@ ...@@ -361,11 +372,8 @@
entry.done entry.done
? ((entry = nextPartId++), ? ((entry = nextPartId++),
data.append(formFieldPrefix + entry, new Blob(buffer)), data.append(formFieldPrefix + entry, new Blob(buffer)),
data.append( data.append(streamPrefix, '"$o' + entry.toString(16) + '"'),
formFieldPrefix + streamId, data.append(streamPrefix, "C"),
'"$o' + entry.toString(16) + '"'
),
data.append(formFieldPrefix + streamId, "C"),
pendingParts--, pendingParts--,
0 === pendingParts && resolve(data)) 0 === pendingParts && resolve(data))
: (buffer.push(entry.value), : (buffer.push(entry.value),
...@@ -375,20 +383,21 @@ ...@@ -375,20 +383,21 @@
var data = formData; var data = formData;
pendingParts++; pendingParts++;
var streamId = nextPartId++, var streamId = nextPartId++,
buffer = []; buffer = [],
streamPrefix = formFieldPrefix + "S" + streamId;
reader.read(new Uint8Array(1024)).then(progress, reject); reader.read(new Uint8Array(1024)).then(progress, reject);
return "$r" + streamId.toString(16); return "$r" + streamId.toString(16);
} }
function serializeReader(reader) { function serializeReader(reader) {
function progress(entry) { function progress(entry) {
if (entry.done) if (entry.done)
data.append(formFieldPrefix + streamId, "C"), data.append(streamPrefix, "C"),
pendingParts--, pendingParts--,
0 === pendingParts && resolve(data); 0 === pendingParts && resolve(data);
else else
try { try {
var partJSON = JSON.stringify(entry.value, resolveToJSON); var partJSON = JSON.stringify(entry.value, resolveToJSON);
data.append(formFieldPrefix + streamId, partJSON); data.append(streamPrefix, partJSON);
reader.read().then(progress, reject); reader.read().then(progress, reject);
} catch (x) { } catch (x) {
reject(x); reject(x);
...@@ -397,7 +406,8 @@ ...@@ -397,7 +406,8 @@
null === formData && (formData = new FormData()); null === formData && (formData = new FormData());
var data = formData; var data = formData;
pendingParts++; pendingParts++;
var streamId = nextPartId++; var streamId = nextPartId++,
streamPrefix = formFieldPrefix + "S" + streamId;
reader.read().then(progress, reject); reader.read().then(progress, reject);
return "$R" + streamId.toString(16); return "$R" + streamId.toString(16);
} }
...@@ -412,12 +422,11 @@ ...@@ -412,12 +422,11 @@
function serializeAsyncIterable(iterable, iterator) { function serializeAsyncIterable(iterable, iterator) {
function progress(entry) { function progress(entry) {
if (entry.done) { if (entry.done) {
if (void 0 === entry.value) if (void 0 === entry.value) data.append(streamPrefix, "C");
data.append(formFieldPrefix + streamId, "C");
else else
try { try {
var partJSON = JSON.stringify(entry.value, resolveToJSON); var partJSON = JSON.stringify(entry.value, resolveToJSON);
data.append(formFieldPrefix + streamId, "C" + partJSON); data.append(streamPrefix, "C" + partJSON);
} catch (x) { } catch (x) {
reject(x); reject(x);
return; return;
...@@ -427,7 +436,7 @@ ...@@ -427,7 +436,7 @@
} else } else
try { try {
var _partJSON = JSON.stringify(entry.value, resolveToJSON); var _partJSON = JSON.stringify(entry.value, resolveToJSON);
data.append(formFieldPrefix + streamId, _partJSON); data.append(streamPrefix, _partJSON);
iterator.next().then(progress, reject); iterator.next().then(progress, reject);
} catch (x$0) { } catch (x$0) {
reject(x$0); reject(x$0);
...@@ -438,6 +447,7 @@ ...@@ -438,6 +447,7 @@
pendingParts++; pendingParts++;
var streamId = nextPartId++; var streamId = nextPartId++;
iterable = iterable === iterator; iterable = iterable === iterator;
var streamPrefix = formFieldPrefix + "S" + streamId;
iterator.next().then(progress, reject); iterator.next().then(progress, reject);
return "$" + (iterable ? "x" : "X") + streamId.toString(16); return "$" + (iterable ? "x" : "X") + streamId.toString(16);
} }
...@@ -1769,7 +1779,11 @@ ...@@ -1769,7 +1779,11 @@
} }
} }
function createResolvedModelChunk(response, value) { function createResolvedModelChunk(response, value) {
return new ReactPromise("resolved_model", value, response); return new ReactPromise(
"resolved_model",
value,
_defineProperty({}, RESPONSE_SYMBOL, response)
);
} }
function createResolvedIteratorResultChunk(response, value, done) { function createResolvedIteratorResultChunk(response, value, done) {
return new ReactPromise( return new ReactPromise(
...@@ -1777,7 +1791,7 @@ ...@@ -1777,7 +1791,7 @@
(done ? '{"done":true,"value":' : '{"done":false,"value":') + (done ? '{"done":true,"value":' : '{"done":false,"value":') +
value + value +
"}", "}",
response _defineProperty({}, RESPONSE_SYMBOL, response)
); );
} }
function resolveIteratorResultChunk(response, chunk, value, done) { function resolveIteratorResultChunk(response, chunk, value, done) {
...@@ -1797,7 +1811,7 @@ ...@@ -1797,7 +1811,7 @@
rejectListeners = chunk.reason; rejectListeners = chunk.reason;
chunk.status = "resolved_model"; chunk.status = "resolved_model";
chunk.value = value; chunk.value = value;
chunk.reason = response; chunk.reason = _defineProperty({}, RESPONSE_SYMBOL, response);
null !== resolveListeners && null !== resolveListeners &&
(initializeModelChunk(chunk), (initializeModelChunk(chunk),
wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners)); wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners));
...@@ -1882,7 +1896,7 @@ ...@@ -1882,7 +1896,7 @@
prevChunk = initializingChunk; prevChunk = initializingChunk;
initializingHandler = null; initializingHandler = null;
var resolvedModel = chunk.value, var resolvedModel = chunk.value,
response = chunk.reason; response = chunk.reason[RESPONSE_SYMBOL];
chunk.status = "blocked"; chunk.status = "blocked";
chunk.value = null; chunk.value = null;
chunk.reason = null; chunk.reason = null;
...@@ -2188,6 +2202,9 @@ ...@@ -2188,6 +2202,9 @@
return null; return null;
} }
function loadServerReference(response, metaData, parentObject, key) { function loadServerReference(response, metaData, parentObject, key) {
if ("then" === key) return null;
var id = metaData.id;
if ("string" !== typeof id) return null;
if (!response._serverReferenceConfig) if (!response._serverReferenceConfig)
return createBoundServerReference( return createBoundServerReference(
metaData, metaData,
...@@ -2197,22 +2214,23 @@ ...@@ -2197,22 +2214,23 @@
); );
var serverReference = resolveServerReference( var serverReference = resolveServerReference(
response._serverReferenceConfig, response._serverReferenceConfig,
metaData.id id
), ),
promise = preloadModule(serverReference); bound = metaData.bound;
if (promise) if ((metaData = preloadModule(serverReference)))
metaData.bound && (promise = Promise.all([promise, metaData.bound])); bound instanceof ReactPromise &&
else if (metaData.bound) promise = Promise.resolve(metaData.bound); (metaData = Promise.all([metaData, bound]));
else if (bound instanceof ReactPromise) metaData = Promise.resolve(bound);
else else
return ( return (
(promise = requireModule(serverReference)), (metaData = requireModule(serverReference)),
registerBoundServerReference( registerBoundServerReference(
promise, metaData,
metaData.id, id,
metaData.bound, bound,
response._encodeFormAction response._encodeFormAction
), ),
promise metaData
); );
if (initializingHandler) { if (initializingHandler) {
var handler = initializingHandler; var handler = initializingHandler;
...@@ -2226,18 +2244,24 @@ ...@@ -2226,18 +2244,24 @@
deps: 1, deps: 1,
errored: !1 errored: !1
}; };
promise.then( metaData.then(
function () { function () {
var resolvedValue = requireModule(serverReference); var resolvedValue = requireModule(serverReference);
if (metaData.bound) { if (bound) {
var boundArgs = metaData.bound.value.slice(0); var promiseValue = bound.value;
boundArgs.unshift(null); promiseValue = isArrayImpl(promiseValue)
resolvedValue = resolvedValue.bind.apply(resolvedValue, boundArgs); ? promiseValue.slice(0)
: [];
promiseValue.unshift(null);
resolvedValue = resolvedValue.bind.apply(
resolvedValue,
promiseValue
);
} }
registerBoundServerReference( registerBoundServerReference(
resolvedValue, resolvedValue,
metaData.id, id,
metaData.bound, bound,
response._encodeFormAction response._encodeFormAction
); );
"__proto__" !== key && (parentObject[key] = resolvedValue); "__proto__" !== key && (parentObject[key] = resolvedValue);
...@@ -2250,23 +2274,23 @@ ...@@ -2250,23 +2274,23 @@
null !== handler.value && null !== handler.value &&
handler.value.$$typeof === REACT_ELEMENT_TYPE handler.value.$$typeof === REACT_ELEMENT_TYPE
) )
switch (((boundArgs = handler.value), key)) { switch (((promiseValue = handler.value), key)) {
case "3": case "3":
boundArgs.props = resolvedValue; promiseValue.props = resolvedValue;
break; break;
case "4": case "4":
boundArgs._owner = resolvedValue; promiseValue._owner = resolvedValue;
} }
handler.deps--; handler.deps--;
0 === handler.deps && 0 === handler.deps &&
((resolvedValue = handler.chunk), ((resolvedValue = handler.chunk),
null !== resolvedValue && null !== resolvedValue &&
"blocked" === resolvedValue.status && "blocked" === resolvedValue.status &&
((boundArgs = resolvedValue.value), ((promiseValue = resolvedValue.value),
(resolvedValue.status = "fulfilled"), (resolvedValue.status = "fulfilled"),
(resolvedValue.value = handler.value), (resolvedValue.value = handler.value),
(resolvedValue.reason = null), (resolvedValue.reason = null),
null !== boundArgs && wakeChunk(boundArgs, handler.value))); null !== promiseValue && wakeChunk(promiseValue, handler.value)));
}, },
function (error) { function (error) {
if (!handler.errored) { if (!handler.errored) {
...@@ -2478,8 +2502,8 @@ ...@@ -2478,8 +2502,8 @@
function extractIterator(response, model) { function extractIterator(response, model) {
return model[Symbol.iterator](); return model[Symbol.iterator]();
} }
function createModel(response, model) { function createModel(response, model, parentObject, key) {
return model; return "then" === key && "function" === typeof model ? null : model;
} }
function getInferredFunctionApproximate(code) { function getInferredFunctionApproximate(code) {
code = code.startsWith("Object.defineProperty(") code = code.startsWith("Object.defineProperty(")
...@@ -4449,7 +4473,8 @@ ...@@ -4449,7 +4473,8 @@
React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE || React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE ||
ReactSharedInteralsServer, ReactSharedInteralsServer,
ObjectPrototype = Object.prototype, ObjectPrototype = Object.prototype,
ArrayPrototype = Array.prototype; ArrayPrototype = Array.prototype,
RESPONSE_SYMBOL = Symbol();
ReactPromise.prototype = Object.create(Promise.prototype); ReactPromise.prototype = Object.create(Promise.prototype);
ReactPromise.prototype.then = function (resolve, reject) { ReactPromise.prototype.then = function (resolve, reject) {
var _this = this; var _this = this;
......
...@@ -11,6 +11,17 @@ ...@@ -11,6 +11,17 @@
"use strict"; "use strict";
"production" !== process.env.NODE_ENV && "production" !== process.env.NODE_ENV &&
(function () { (function () {
function _defineProperty(obj, key, value) {
key in obj
? Object.defineProperty(obj, key, {
value: value,
enumerable: !0,
configurable: !0,
writable: !0
})
: (obj[key] = value);
return obj;
}
function resolveClientReference(bundlerConfig, metadata) { function resolveClientReference(bundlerConfig, metadata) {
if (bundlerConfig) { if (bundlerConfig) {
var moduleExports = bundlerConfig[metadata[0]]; var moduleExports = bundlerConfig[metadata[0]];
...@@ -361,11 +372,8 @@ ...@@ -361,11 +372,8 @@
entry.done entry.done
? ((entry = nextPartId++), ? ((entry = nextPartId++),
data.append(formFieldPrefix + entry, new Blob(buffer)), data.append(formFieldPrefix + entry, new Blob(buffer)),
data.append( data.append(streamPrefix, '"$o' + entry.toString(16) + '"'),
formFieldPrefix + streamId, data.append(streamPrefix, "C"),
'"$o' + entry.toString(16) + '"'
),
data.append(formFieldPrefix + streamId, "C"),
pendingParts--, pendingParts--,
0 === pendingParts && resolve(data)) 0 === pendingParts && resolve(data))
: (buffer.push(entry.value), : (buffer.push(entry.value),
...@@ -375,20 +383,21 @@ ...@@ -375,20 +383,21 @@
var data = formData; var data = formData;
pendingParts++; pendingParts++;
var streamId = nextPartId++, var streamId = nextPartId++,
buffer = []; buffer = [],
streamPrefix = formFieldPrefix + "S" + streamId;
reader.read(new Uint8Array(1024)).then(progress, reject); reader.read(new Uint8Array(1024)).then(progress, reject);
return "$r" + streamId.toString(16); return "$r" + streamId.toString(16);
} }
function serializeReader(reader) { function serializeReader(reader) {
function progress(entry) { function progress(entry) {
if (entry.done) if (entry.done)
data.append(formFieldPrefix + streamId, "C"), data.append(streamPrefix, "C"),
pendingParts--, pendingParts--,
0 === pendingParts && resolve(data); 0 === pendingParts && resolve(data);
else else
try { try {
var partJSON = JSON.stringify(entry.value, resolveToJSON); var partJSON = JSON.stringify(entry.value, resolveToJSON);
data.append(formFieldPrefix + streamId, partJSON); data.append(streamPrefix, partJSON);
reader.read().then(progress, reject); reader.read().then(progress, reject);
} catch (x) { } catch (x) {
reject(x); reject(x);
...@@ -397,7 +406,8 @@ ...@@ -397,7 +406,8 @@
null === formData && (formData = new FormData()); null === formData && (formData = new FormData());
var data = formData; var data = formData;
pendingParts++; pendingParts++;
var streamId = nextPartId++; var streamId = nextPartId++,
streamPrefix = formFieldPrefix + "S" + streamId;
reader.read().then(progress, reject); reader.read().then(progress, reject);
return "$R" + streamId.toString(16); return "$R" + streamId.toString(16);
} }
...@@ -412,12 +422,11 @@ ...@@ -412,12 +422,11 @@
function serializeAsyncIterable(iterable, iterator) { function serializeAsyncIterable(iterable, iterator) {
function progress(entry) { function progress(entry) {
if (entry.done) { if (entry.done) {
if (void 0 === entry.value) if (void 0 === entry.value) data.append(streamPrefix, "C");
data.append(formFieldPrefix + streamId, "C");
else else
try { try {
var partJSON = JSON.stringify(entry.value, resolveToJSON); var partJSON = JSON.stringify(entry.value, resolveToJSON);
data.append(formFieldPrefix + streamId, "C" + partJSON); data.append(streamPrefix, "C" + partJSON);
} catch (x) { } catch (x) {
reject(x); reject(x);
return; return;
...@@ -427,7 +436,7 @@ ...@@ -427,7 +436,7 @@
} else } else
try { try {
var _partJSON = JSON.stringify(entry.value, resolveToJSON); var _partJSON = JSON.stringify(entry.value, resolveToJSON);
data.append(formFieldPrefix + streamId, _partJSON); data.append(streamPrefix, _partJSON);
iterator.next().then(progress, reject); iterator.next().then(progress, reject);
} catch (x$0) { } catch (x$0) {
reject(x$0); reject(x$0);
...@@ -438,6 +447,7 @@ ...@@ -438,6 +447,7 @@
pendingParts++; pendingParts++;
var streamId = nextPartId++; var streamId = nextPartId++;
iterable = iterable === iterator; iterable = iterable === iterator;
var streamPrefix = formFieldPrefix + "S" + streamId;
iterator.next().then(progress, reject); iterator.next().then(progress, reject);
return "$" + (iterable ? "x" : "X") + streamId.toString(16); return "$" + (iterable ? "x" : "X") + streamId.toString(16);
} }
...@@ -1769,7 +1779,11 @@ ...@@ -1769,7 +1779,11 @@
} }
} }
function createResolvedModelChunk(response, value) { function createResolvedModelChunk(response, value) {
return new ReactPromise("resolved_model", value, response); return new ReactPromise(
"resolved_model",
value,
_defineProperty({}, RESPONSE_SYMBOL, response)
);
} }
function createResolvedIteratorResultChunk(response, value, done) { function createResolvedIteratorResultChunk(response, value, done) {
return new ReactPromise( return new ReactPromise(
...@@ -1777,7 +1791,7 @@ ...@@ -1777,7 +1791,7 @@
(done ? '{"done":true,"value":' : '{"done":false,"value":') + (done ? '{"done":true,"value":' : '{"done":false,"value":') +
value + value +
"}", "}",
response _defineProperty({}, RESPONSE_SYMBOL, response)
); );
} }
function resolveIteratorResultChunk(response, chunk, value, done) { function resolveIteratorResultChunk(response, chunk, value, done) {
...@@ -1797,7 +1811,7 @@ ...@@ -1797,7 +1811,7 @@
rejectListeners = chunk.reason; rejectListeners = chunk.reason;
chunk.status = "resolved_model"; chunk.status = "resolved_model";
chunk.value = value; chunk.value = value;
chunk.reason = response; chunk.reason = _defineProperty({}, RESPONSE_SYMBOL, response);
null !== resolveListeners && null !== resolveListeners &&
(initializeModelChunk(chunk), (initializeModelChunk(chunk),
wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners)); wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners));
...@@ -1882,7 +1896,7 @@ ...@@ -1882,7 +1896,7 @@
prevChunk = initializingChunk; prevChunk = initializingChunk;
initializingHandler = null; initializingHandler = null;
var resolvedModel = chunk.value, var resolvedModel = chunk.value,
response = chunk.reason; response = chunk.reason[RESPONSE_SYMBOL];
chunk.status = "blocked"; chunk.status = "blocked";
chunk.value = null; chunk.value = null;
chunk.reason = null; chunk.reason = null;
...@@ -2188,6 +2202,9 @@ ...@@ -2188,6 +2202,9 @@
return null; return null;
} }
function loadServerReference(response, metaData, parentObject, key) { function loadServerReference(response, metaData, parentObject, key) {
if ("then" === key) return null;
var id = metaData.id;
if ("string" !== typeof id) return null;
if (!response._serverReferenceConfig) if (!response._serverReferenceConfig)
return createBoundServerReference( return createBoundServerReference(
metaData, metaData,
...@@ -2197,22 +2214,23 @@ ...@@ -2197,22 +2214,23 @@
); );
var serverReference = resolveServerReference( var serverReference = resolveServerReference(
response._serverReferenceConfig, response._serverReferenceConfig,
metaData.id id
), ),
promise = preloadModule(serverReference); bound = metaData.bound;
if (promise) if ((metaData = preloadModule(serverReference)))
metaData.bound && (promise = Promise.all([promise, metaData.bound])); bound instanceof ReactPromise &&
else if (metaData.bound) promise = Promise.resolve(metaData.bound); (metaData = Promise.all([metaData, bound]));
else if (bound instanceof ReactPromise) metaData = Promise.resolve(bound);
else else
return ( return (
(promise = requireModule(serverReference)), (metaData = requireModule(serverReference)),
registerBoundServerReference( registerBoundServerReference(
promise, metaData,
metaData.id, id,
metaData.bound, bound,
response._encodeFormAction response._encodeFormAction
), ),
promise metaData
); );
if (initializingHandler) { if (initializingHandler) {
var handler = initializingHandler; var handler = initializingHandler;
...@@ -2226,18 +2244,24 @@ ...@@ -2226,18 +2244,24 @@
deps: 1, deps: 1,
errored: !1 errored: !1
}; };
promise.then( metaData.then(
function () { function () {
var resolvedValue = requireModule(serverReference); var resolvedValue = requireModule(serverReference);
if (metaData.bound) { if (bound) {
var boundArgs = metaData.bound.value.slice(0); var promiseValue = bound.value;
boundArgs.unshift(null); promiseValue = isArrayImpl(promiseValue)
resolvedValue = resolvedValue.bind.apply(resolvedValue, boundArgs); ? promiseValue.slice(0)
: [];
promiseValue.unshift(null);
resolvedValue = resolvedValue.bind.apply(
resolvedValue,
promiseValue
);
} }
registerBoundServerReference( registerBoundServerReference(
resolvedValue, resolvedValue,
metaData.id, id,
metaData.bound, bound,
response._encodeFormAction response._encodeFormAction
); );
"__proto__" !== key && (parentObject[key] = resolvedValue); "__proto__" !== key && (parentObject[key] = resolvedValue);
...@@ -2250,23 +2274,23 @@ ...@@ -2250,23 +2274,23 @@
null !== handler.value && null !== handler.value &&
handler.value.$$typeof === REACT_ELEMENT_TYPE handler.value.$$typeof === REACT_ELEMENT_TYPE
) )
switch (((boundArgs = handler.value), key)) { switch (((promiseValue = handler.value), key)) {
case "3": case "3":
boundArgs.props = resolvedValue; promiseValue.props = resolvedValue;
break; break;
case "4": case "4":
boundArgs._owner = resolvedValue; promiseValue._owner = resolvedValue;
} }
handler.deps--; handler.deps--;
0 === handler.deps && 0 === handler.deps &&
((resolvedValue = handler.chunk), ((resolvedValue = handler.chunk),
null !== resolvedValue && null !== resolvedValue &&
"blocked" === resolvedValue.status && "blocked" === resolvedValue.status &&
((boundArgs = resolvedValue.value), ((promiseValue = resolvedValue.value),
(resolvedValue.status = "fulfilled"), (resolvedValue.status = "fulfilled"),
(resolvedValue.value = handler.value), (resolvedValue.value = handler.value),
(resolvedValue.reason = null), (resolvedValue.reason = null),
null !== boundArgs && wakeChunk(boundArgs, handler.value))); null !== promiseValue && wakeChunk(promiseValue, handler.value)));
}, },
function (error) { function (error) {
if (!handler.errored) { if (!handler.errored) {
...@@ -2478,8 +2502,8 @@ ...@@ -2478,8 +2502,8 @@
function extractIterator(response, model) { function extractIterator(response, model) {
return model[Symbol.iterator](); return model[Symbol.iterator]();
} }
function createModel(response, model) { function createModel(response, model, parentObject, key) {
return model; return "then" === key && "function" === typeof model ? null : model;
} }
function getInferredFunctionApproximate(code) { function getInferredFunctionApproximate(code) {
code = code.startsWith("Object.defineProperty(") code = code.startsWith("Object.defineProperty(")
...@@ -4462,7 +4486,8 @@ ...@@ -4462,7 +4486,8 @@
React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE || React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE ||
ReactSharedInteralsServer, ReactSharedInteralsServer,
ObjectPrototype = Object.prototype, ObjectPrototype = Object.prototype,
ArrayPrototype = Array.prototype; ArrayPrototype = Array.prototype,
RESPONSE_SYMBOL = Symbol();
ReactPromise.prototype = Object.create(Promise.prototype); ReactPromise.prototype = Object.create(Promise.prototype);
ReactPromise.prototype.then = function (resolve, reject) { ReactPromise.prototype.then = function (resolve, reject) {
var _this = this; var _this = this;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment