[RSC @ Meta] Simplify implementation of isClientReference, getClientReferenceKey, resolveClientReferenceMetadata

packages/react-server-dom-fb/src/ReactFlightDOMServerFB.js

@@ -13,7 +13,8 @@ import type {
   Chunk,
   PrecomputedChunk,
 } from 'react-server/src/ReactServerStreamConfig';
-import type {ClientManifest} from './ReactFlightReferencesFB';
+
+import {setCheckIsClientReference} from './ReactFlightReferencesFB';
 
 import {
   createRequest,
@@ -28,6 +29,7 @@ export {
   registerServerReference,
   getRequestedClientReferencesKeys,
   clearRequestedClientReferencesKeysSet,
+  setCheckIsClientReference,
 } from './ReactFlightReferencesFB';
 
 type Options = {
@@ -37,7 +39,6 @@ type Options = {
 function renderToDestination(
   destination: Destination,
   model: ReactClientValue,
-  bundlerConfig: ClientManifest,
   options?: Options,
 ): void {
   if (!configured) {
@@ -47,7 +48,7 @@ function renderToDestination(
   }
   const request = createRequest(
     model,
-    bundlerConfig,
+    null,
     options ? options.onError : undefined,
   );
   startWork(request);
@@ -56,12 +57,14 @@ function renderToDestination(
 
 type Config = {
   byteLength: (chunk: Chunk | PrecomputedChunk) => number,
+  isClientReference: (reference: mixed) => boolean,
 };
 
 let configured = false;
 
 function setConfig(config: Config): void {
   setByteLengthOfChunkImplementation(config.byteLength);
+  setCheckIsClientReference(config.isClientReference);
   configured = true;
 }
 

packages/react-server-dom-fb/src/ReactFlightReferencesFB.js

@@ -7,15 +7,16 @@
  * @flow
  */
 
-export opaque type ClientManifest = mixed;
+export type ClientManifest = null;
 
 // eslint-disable-next-line no-unused-vars
 export type ServerReference<T> = string;
 
 // eslint-disable-next-line no-unused-vars
-export type ClientReference<T> = string;
+export type ClientReference<T> = {
+  getModuleId(): ClientReferenceKey,
+};
 
-const registeredClientReferences = new Map<mixed, ClientReferenceMetadata>();
 const requestedClientReferencesKeys = new Set<ClientReferenceKey>();
 
 export type ClientReferenceKey = string;
@@ -26,54 +27,45 @@ export type ClientReferenceMetadata = {
 
 export type ServerReferenceId = string;
 
+let checkIsClientReference: (clientReference: mixed) => boolean;
+
+export function setCheckIsClientReference(
+  impl: (clientReference: mixed) => boolean,
+): void {
+  checkIsClientReference = impl;
+}
+
 export function registerClientReference<T>(
   clientReference: ClientReference<T>,
-  moduleId: ClientReferenceKey,
-): ClientReference<T> {
-  const exportName = 'default'; // Currently, we only support modules with `default` export
-  registeredClientReferences.set(clientReference, {
-    moduleId,
-    exportName,
-  });
-
-  return clientReference;
-}
+): void {}
 
-export function isClientReference<T>(reference: T): boolean {
-  return registeredClientReferences.has(reference);
+export function isClientReference(reference: mixed): boolean {
+  if (checkIsClientReference == null) {
+    throw new Error('Expected implementation for checkIsClientReference.');
+  }
+  return checkIsClientReference(reference);
 }
 
 export function getClientReferenceKey<T>(
   clientReference: ClientReference<T>,
 ): ClientReferenceKey {
-  const reference = registeredClientReferences.get(clientReference);
-  if (reference != null) {
-    requestedClientReferencesKeys.add(reference.moduleId);
-    return reference.moduleId;
-  }
+  const moduleId = clientReference.getModuleId();
+  requestedClientReferencesKeys.add(moduleId);
 
-  throw new Error(
-    'Expected client reference ' + clientReference + ' to be registered.',
-  );
+  return clientReference.getModuleId();
 }
 
 export function resolveClientReferenceMetadata<T>(
   config: ClientManifest,
   clientReference: ClientReference<T>,
 ): ClientReferenceMetadata {
-  const metadata = registeredClientReferences.get(clientReference);
-  if (metadata != null) {
-    return metadata;
-  }
-
-  throw new Error(
-    'Expected client reference ' + clientReference + ' to be registered.',
-  );
+  return {moduleId: clientReference.getModuleId(), exportName: 'default'};
 }
 
 export function registerServerReference<T>(
   serverReference: ServerReference<T>,
-  exportName: string,
+  id: string,
+  exportName: null | string,
 ): ServerReference<T> {
   throw new Error('registerServerReference: Not Implemented.');
 }

packages/react-server-dom-fb/src/__tests__/ReactFlightDOMServerFB-test.internal.js

@@ -28,7 +28,6 @@ let ReactDOMClient;
 let ReactServerDOMServer;
 let ReactServerDOMClient;
 let Suspense;
-let registerClientReference;
 
 class Destination {
   #buffer = '';
@@ -57,14 +56,22 @@ class Destination {
   onError() {}
 }
 
+class ClientReferenceImpl {
+  constructor(moduleId) {
+    this.moduleId = moduleId;
+  }
+
+  getModuleId() {
+    return this.moduleId;
+  }
+}
+
 describe('ReactFlightDOM for FB', () => {
   beforeEach(() => {
     // For this first reset we are going to load the dom-node version of react-server-dom-turbopack/server
     // This can be thought of as essentially being the React Server Components scope with react-server
     // condition
     jest.resetModules();
-    registerClientReference =
-      require('../ReactFlightReferencesFB').registerClientReference;
 
     jest.mock('react', () => require('react/src/ReactSharedSubsetFB'));
 
@@ -78,8 +85,7 @@ describe('ReactFlightDOM for FB', () => {
     });
 
     clientExports = value => {
-      registerClientReference(value, value.name);
-      return value;
+      return new ClientReferenceImpl(value.name);
     };
 
     moduleMap = {
@@ -91,6 +97,7 @@ describe('ReactFlightDOM for FB', () => {
     ReactServerDOMServer = require('../ReactFlightDOMServerFB');
     ReactServerDOMServer.setConfig({
       byteLength: str => Buffer.byteLength(str),
+      isClientReference: reference => reference instanceof ClientReferenceImpl,
     });
 
     // This reset is to load modules for the SSR/Browser scope.