Serialize Provider as an inline JSON string instead of special row

We still emit it as a separate row in case it's reused but it's not needed.
facebook · Jan 31, 2023 · 70963f8 · 70963f8
1 parent d407b90
commit 70963f8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 55 deletions.
diff --git a/packages/react-client/src/ReactFlightClient.js b/packages/react-client/src/ReactFlightClient.js
@@ -201,14 +201,6 @@ function createErrorChunk<T>(
   return new Chunk(ERRORED, null, error, response);
 }
 
-function createInitializedChunk<T>(
-  response: Response,
-  value: T,
-): InitializedChunk<T> {
-  // $FlowFixMe Flow doesn't support functions as constructors
-  return new Chunk(INITIALIZED, value, null, response);
-}
-
 function wakeChunk<T>(listeners: Array<(T) => mixed>, value: T): void {
   for (let i = 0; i < listeners.length; i++) {
     const listener = listeners[i];
@@ -504,6 +496,9 @@ export function parseModelString(
       case 'S': {
         return Symbol.for(value.substring(2));
       }
+      case 'P': {
+        return getOrCreateServerContext(value.substring(2)).Provider;
+      }
       default: {
         // We assume that anything else is a reference ID.
         const id = parseInt(value.substring(1), 16);
@@ -574,21 +569,6 @@ export function resolveModel(
   }
 }
 
-export function resolveProvider(
-  response: Response,
-  id: number,
-  contextName: string,
-): void {
-  const chunks = response._chunks;
-  chunks.set(
-    id,
-    createInitializedChunk(
-      response,
-      getOrCreateServerContext(contextName).Provider,
-    ),
-  );
-}
-
 export function resolveModule(
   response: Response,
   id: number,

diff --git a/packages/react-client/src/ReactFlightClientStream.js b/packages/react-client/src/ReactFlightClientStream.js
@@ -14,7 +14,6 @@ import type {BundlerConfig} from './ReactFlightClientHostConfig';
 import {
   resolveModule,
   resolveModel,
-  resolveProvider,
   resolveErrorProd,
   resolveErrorDev,
   createResponse as createResponseBase,
@@ -47,10 +46,6 @@ function processFullRow(response: Response, row: string): void {
       resolveModule(response, id, row.substring(colon + 2));
       return;
     }
-    case 'P': {
-      resolveProvider(response, id, row.substring(colon + 2));
-      return;
-    }
     case 'E': {
       const errorInfo = JSON.parse(row.substring(colon + 2));
       if (__DEV__) {

diff --git a/packages/react-server-dom-relay/src/ReactFlightDOMRelayServerHostConfig.js b/packages/react-server-dom-relay/src/ReactFlightDOMRelayServerHostConfig.js
@@ -171,14 +171,6 @@ export function processModuleChunk(
   return ['I', id, moduleMetaData];
 }
 
-export function processProviderChunk(
-  request: Request,
-  id: number,
-  contextName: string,
-): Chunk {
-  return ['P', id, contextName];
-}
-
 export function scheduleWork(callback: () => void) {
   callback();
 }

diff --git a/packages/react-server-native-relay/src/ReactFlightNativeRelayServerHostConfig.js b/packages/react-server-native-relay/src/ReactFlightNativeRelayServerHostConfig.js
@@ -166,14 +166,6 @@ export function processModuleChunk(
   return ['I', id, moduleMetaData];
 }
 
-export function processProviderChunk(
-  request: Request,
-  id: number,
-  contextName: string,
-): Chunk {
-  return ['P', id, contextName];
-}
-
 export function scheduleWork(callback: () => void) {
   callback();
 }

diff --git a/packages/react-server/src/ReactFlightServer.js b/packages/react-server/src/ReactFlightServer.js
@@ -38,7 +38,6 @@ import {
   closeWithError,
   processModelChunk,
   processModuleChunk,
-  processProviderChunk,
   processErrorChunkProd,
   processErrorChunkDev,
   processReferenceChunk,
@@ -423,6 +422,10 @@ function serializeSymbolReference(name: string): string {
   return '$S' + name;
 }
 
+function serializeProviderReference(name: string): string {
+  return '$P' + name;
+}
+
 function serializeClientReference(
   request: Request,
   parent: {+[key: string | number]: ReactModel} | $ReadOnlyArray<ReactModel>,
@@ -1122,7 +1125,8 @@ function emitProviderChunk(
   id: number,
   contextName: string,
 ): void {
-  const processedChunk = processProviderChunk(request, id, contextName);
+  const contextReference = serializeProviderReference(contextName);
+  const processedChunk = processReferenceChunk(request, id, contextReference);
   request.completedJSONChunks.push(processedChunk);
 }
 

diff --git a/packages/react-server/src/ReactFlightServerConfigStream.js b/packages/react-server/src/ReactFlightServerConfigStream.js
@@ -151,15 +151,6 @@ export function processModuleChunk(
   return stringToChunk(row);
 }
 
-export function processProviderChunk(
-  request: Request,
-  id: number,
-  contextName: string,
-): Chunk {
-  const row = serializeRowHeader('P', id) + contextName + '\n';
-  return stringToChunk(row);
-}
-
 export {
   scheduleWork,
   flushBuffered,