Split out ServerReferenceMetadata into Id and Bound Arguments (#26351)

This is just moving some stuff around and renaming things.
This tuple is opaque to the Flight implementation and we should probably
encode it separately as a single string instead of a model object.
The term "Metadata" isn't the same as when used for ClientReferences so
it's not really the right term anyway.
I also made it optional since a bound function with no arguments bound
is technically different than a raw instance of that function (it's a
clone).
I also renamed the type ReactModel to ReactClientValue. This is the
generic serializable type for something that can pass through the
serializable boundary from server to client. There will be another one
for client to server.
I also filled in missing classes and ensure the serializable sub-types
are explicit. E.g. Array and Thenable.

Author: sebmarkbage

packages/react-client/src/ReactFlightClient.js

@@ -15,7 +15,7 @@ import type {
 ClientReferenceMetadata,
 UninitializedModel,
 Response,
-BundlerConfig,
+SSRManifest,
 }from'./ReactFlightClientHostConfig';
 
 import{
@@ -149,7 +149,7 @@ Chunk.prototype.then = function <T>(
 };
 
 exporttypeResponseBase={
-_bundlerConfig: BundlerConfig,
+_bundlerConfig: SSRManifest,
 _callServer: CallServerCallback,
 _chunks: Map<number,SomeChunk<any>>,
  ...
@@ -473,13 +473,16 @@ function createModelReject<T>(chunk: SomeChunk<T>): (error: mixed) => void {
 
 function createServerReferenceProxy<A: Iterable<any>, T>(
 response: Response,
-metaData: {id: any,bound: Thenable<Array<any>>},
+metaData: {id: any,bound: null|Thenable<Array<any>>},
 ): (...A) =>Promise<T>{
 constcallServer=response._callServer;
 constproxy=function(): Promise<T>{
 // $FlowFixMe[method-unbinding]
 constargs=Array.prototype.slice.call(arguments);
 constp=metaData.bound;
+if(!p){
+returncallServer(metaData.id,args);
+}
 if(p.status===INITIALIZED){
 const bound =p.value;
 returncallServer(metaData.id,bound.concat(args));
@@ -608,7 +611,7 @@ function missingCall() {
 }
 
 exportfunctioncreateResponse(
-bundlerConfig: BundlerConfig,
+bundlerConfig: SSRManifest,
 callServer: void|CallServerCallback,
 ): ResponseBase{
 constchunks: Map<number,SomeChunk<any>>=newMap();

packages/react-client/src/ReactFlightClientStream.js

@@ -9,7 +9,7 @@
 
 importtype{CallServerCallback}from'./ReactFlightClient';
 importtype{Response}from'./ReactFlightClientHostConfigStream';
-importtype{BundlerConfig}from'./ReactFlightClientHostConfig';
+importtype{SSRManifest}from'./ReactFlightClientHostConfig';
 
 import{
 resolveModule,
@@ -121,7 +121,7 @@ function createFromJSONCallback(response: Response) {
 }
 
 exportfunctioncreateResponse(
-bundlerConfig: BundlerConfig,
+bundlerConfig: SSRManifest,
 callServer: void|CallServerCallback,
 ): Response{
 // NOTE: CHECK THE COMPILER OUTPUT EACH TIME YOU CHANGE THIS.

packages/react-client/src/forks/ReactFlightClientHostConfig.custom.js

@@ -26,7 +26,7 @@
 declarevar $$$hostConfig: any;
 
 exporttypeResponse=any;
-exportopaquetypeBundlerConfig=mixed;
+exportopaquetypeSSRManifest=mixed;
 exportopaquetypeClientReferenceMetadata=mixed;
 exportopaquetypeClientReference<T>=mixed;// eslint-disable-line no-unused-vars
 exportconstresolveClientReference=$$$hostConfig.resolveClientReference;

packages/react-client/src/forks/ReactFlightClientHostConfig.dom-bun.js

@@ -11,7 +11,7 @@ export * from 'react-client/src/ReactFlightClientHostConfigBrowser';
 export*from'react-client/src/ReactFlightClientHostConfigStream';
 
 exporttypeResponse=any;
-exportopaquetypeBundlerConfig=mixed;
+exportopaquetypeSSRManifest=mixed;
 exportopaquetypeClientReferenceMetadata=mixed;
 exportopaquetypeClientReference<T>=mixed;// eslint-disable-line no-unused-vars
 exportconstresolveClientReference: any=null;

packages/react-noop-renderer/src/ReactNoopFlightServer.js

@@ -14,7 +14,7 @@
  * environment.
  */
 
-importtype{ReactModel}from'react-server/src/ReactFlightServer';
+importtype{ReactClientValue}from'react-server/src/ReactFlightServer';
 importtype{ServerContextJSONValue}from'shared/ReactTypes';
 
 import{saveModule}from'react-noop-renderer/flight-modules';
@@ -71,7 +71,7 @@ type Options = {
 identifierPrefix?: string,
 };
 
-functionrender(model: ReactModel,options?: Options): Destination{
+functionrender(model: ReactClientValue,options?: Options): Destination{
 constdestination: Destination=[];
 constbundlerConfig=undefined;
 constrequest=ReactNoopFlightServer.createRequest(

packages/react-server-dom-relay/src/ReactFlightDOMRelayClientHostConfig.js

@@ -31,14 +31,14 @@ import isArray from 'shared/isArray';
 
 exporttype{ClientReferenceMetadata}from'ReactFlightDOMRelayClientIntegration';
 
-exporttypeBundlerConfig=null;
+exporttypeSSRManifest=null;
 
 exporttypeUninitializedModel=JSONValue;
 
 exporttypeResponse=ResponseBase;
 
 exportfunctionresolveClientReference<T>(
-bundlerConfig: BundlerConfig,
+bundlerConfig: SSRManifest,
 metadata: ClientReferenceMetadata,
 ): ClientReference<T>{
 returnresolveClientReferenceImpl(metadata);

packages/react-server-dom-relay/src/ReactFlightDOMRelayServer.js

@@ -7,9 +7,9 @@
  * @flow
  */
 
-importtype{ReactModel}from'react-server/src/ReactFlightServer';
+importtype{ReactClientValue}from'react-server/src/ReactFlightServer';
 importtype{
-BundlerConfig,
+ClientManifest,
 Destination,
 }from'./ReactFlightDOMRelayServerHostConfig';
 
@@ -25,9 +25,9 @@ type Options = {
 };
 
 functionrender(
-model: ReactModel,
+model: ReactClientValue,
 destination: Destination,
-config: BundlerConfig,
+config: ClientManifest,
 options?: Options,
 ): void{
 const request =createRequest(

packages/react-server-dom-relay/src/ReactFlightDOMRelayServerHostConfig.js

@@ -9,7 +9,10 @@
 
 importtype{RowEncoding,JSONValue}from'./ReactFlightDOMRelayProtocol';
 
-importtype{Request,ReactModel}from'react-server/src/ReactFlightServer';
+importtype{
+Request,
+ReactClientValue,
+}from'react-server/src/ReactFlightServer';
 
 importtype{JSResourceReference}from'JSResourceReference';
 importJSResourceReferenceImplfrom'JSResourceReferenceImpl';
@@ -23,7 +26,7 @@ export type ServerReferenceId = {};
 
 importtype{
 Destination,
-BundlerConfig,
+BundlerConfigasClientManifest,
 ClientReferenceMetadata,
 }from'ReactFlightDOMRelayServerIntegration';
 
@@ -37,7 +40,7 @@ import {
 
 exporttype{
 Destination,
-BundlerConfig,
+BundlerConfigasClientManifest,
 ClientReferenceMetadata,
 }from'ReactFlightDOMRelayServerIntegration';
 
@@ -60,16 +63,23 @@ export function getClientReferenceKey(
 }
 
 exportfunctionresolveClientReferenceMetadata<T>(
-config: BundlerConfig,
+config: ClientManifest,
 resource: ClientReference<T>,
 ): ClientReferenceMetadata{
 returnresolveClientReferenceMetadataImpl(config,resource);
 }
 
-exportfunctionresolveServerReferenceMetadata<T>(
-config: BundlerConfig,
+exportfunctiongetServerReferenceId<T>(
+config: ClientManifest,
+resource: ServerReference<T>,
+): ServerReferenceId{
+thrownewError('Not implemented.');
+}
+
+exportfunctiongetServerReferenceBoundArguments<T>(
+config: ClientManifest,
 resource: ServerReference<T>,
-): {id: ServerReferenceId,bound: Promise<Array<any>>}{
+): Array<ReactClientValue>{
 thrownewError('Not implemented.');
 }
 
@@ -125,9 +135,9 @@ export function processErrorChunkDev(
 
 functionconvertModelToJSON(
 request: Request,
-parent: {+[key: string]: ReactModel}|$ReadOnlyArray<ReactModel>,
+parent: {+[key: string]: ReactClientValue}|$ReadOnlyArray<ReactClientValue>,
 key: string,
-model: ReactModel,
+model: ReactClientValue,
 ): JSONValue{
 constjson=resolveModelToJSON(request,parent,key,model);
 if(typeofjson==='object'&&json!==null){
@@ -160,7 +170,7 @@ function convertModelToJSON(
 exportfunctionprocessModelChunk(
 request: Request,
 id: number,
-model: ReactModel,
+model: ReactClientValue,
 ): Chunk{
 // $FlowFixMe no good way to define an empty exact object
 constjson=convertModelToJSON(request,{},'',model);

packages/react-server-dom-webpack/src/ReactFlightClientNodeBundlerConfig.js

@@ -13,14 +13,12 @@ import type {
 RejectedThenable,
 }from'shared/ReactTypes';
 
-exporttypeWebpackSSRMap={
+exporttypeSSRManifest={
 [clientId: string]: {
 [clientExportName: string]: ClientReference<any>,
 },
 };
 
-exporttypeBundlerConfig=WebpackSSRMap;
-
 exportopaquetypeClientReferenceMetadata={
 id: string,
 chunks: Array<string>,
@@ -34,7 +32,7 @@ export opaque type ClientReference<T> = {
 };
 
 exportfunctionresolveClientReference<T>(
-bundlerConfig: BundlerConfig,
+bundlerConfig: SSRManifest,
 metadata: ClientReferenceMetadata,
 ): ClientReference<T>{
 const resolvedModuleData =bundlerConfig[metadata.id][metadata.name];

packages/react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig.js

@@ -13,14 +13,12 @@ import type {
 RejectedThenable,
 }from'shared/ReactTypes';
 
-exporttypeWebpackSSRMap={
+exporttypeSSRManifest=null|{
 [clientId: string]: {
 [clientExportName: string]: ClientReferenceMetadata,
 },
 };
 
-exporttypeBundlerConfig=null|WebpackSSRMap;
-
 exportopaquetypeClientReferenceMetadata={
 id: string,
 chunks: Array<string>,
@@ -32,7 +30,7 @@ export opaque type ClientReferenceMetadata = {
 exportopaquetypeClientReference<T>=ClientReferenceMetadata;
 
 exportfunctionresolveClientReference<T>(
-bundlerConfig: BundlerConfig,
+bundlerConfig: SSRManifest,
 metadata: ClientReferenceMetadata,
 ): ClientReference<T>{
 if(bundlerConfig){