{"patch":"diff --git a\/packages\/react-client\/src\/ReactFlightClient.js b\/packages\/react-client\/src\/ReactFlightClient.js\nindex 2eef555d36..0e22e3f294 100644\n--- a\/packages\/react-client\/src\/ReactFlightClient.js\n+++ b\/packages\/react-client\/src\/ReactFlightClient.js\n@@ -496,13 +496,14 @@ function createErrorChunk(\n function wakeChunk(\n listeners: Array mixed)>,\n value: T,\n+ chunk: SomeChunk,\n ): void {\n for (let i = 0; i < listeners.length; i++) {\n const listener = listeners[i];\n if (typeof listener === 'function') {\n listener(value);\n } else {\n- fulfillReference(listener, value);\n+ fulfillReference(listener, value, chunk);\n }\n }\n }\n@@ -555,7 +556,7 @@ function wakeChunkIfInitialized(\n ): void {\n switch (chunk.status) {\n case INITIALIZED:\n- wakeChunk(resolveListeners, chunk.value);\n+ wakeChunk(resolveListeners, chunk.value, chunk);\n break;\n case BLOCKED:\n \/\/ It is possible that we're blocked on our own chunk if it's a cycle.\n@@ -569,7 +570,7 @@ function wakeChunkIfInitialized(\n if (cyclicHandler !== null) {\n \/\/ This reference points back to this chunk. We can resolve the cycle by\n \/\/ using the value from that handler.\n- fulfillReference(reference, cyclicHandler.value);\n+ fulfillReference(reference, cyclicHandler.value, chunk);\n resolveListeners.splice(i, 1);\n i--;\n if (rejectListeners !== null) {\n@@ -637,7 +638,7 @@ function triggerErrorOnChunk(\n cyclicChunk.status = BLOCKED;\n cyclicChunk.value = null;\n cyclicChunk.reason = null;\n- if (enableProfilerTimer && enableComponentPerformanceTrack) {\n+ if ((enableProfilerTimer && enableComponentPerformanceTrack) || __DEV__) {\n initializingChunk = cyclicChunk;\n }\n try {\n@@ -919,7 +920,7 @@ function initializeModelChunk(chunk: ResolvedModelChunk): void {\n cyclicChunk.value = null;\n cyclicChunk.reason = null;\n \n- if (enableProfilerTimer && enableComponentPerformanceTrack) {\n+ if ((enableProfilerTimer && enableComponentPerformanceTrack) || __DEV__) {\n initializingChunk = cyclicChunk;\n }\n \n@@ -938,7 +939,7 @@ function initializeModelChunk(chunk: ResolvedModelChunk): void {\n if (resolveListeners !== null) {\n cyclicChunk.value = null;\n cyclicChunk.reason = null;\n- wakeChunk(resolveListeners, value);\n+ wakeChunk(resolveListeners, value, cyclicChunk);\n }\n if (initializingHandler !== null) {\n if (initializingHandler.errored) {\n@@ -961,7 +962,7 @@ function initializeModelChunk(chunk: ResolvedModelChunk): void {\n erroredChunk.reason = error;\n } finally {\n initializingHandler = prevHandler;\n- if (enableProfilerTimer && enableComponentPerformanceTrack) {\n+ if ((enableProfilerTimer && enableComponentPerformanceTrack) || __DEV__) {\n initializingChunk = prevChunk;\n }\n }\n@@ -1298,6 +1299,7 @@ function getChunk(response: Response, id: number): SomeChunk {\n function fulfillReference(\n reference: InitializationReference,\n value: any,\n+ fulfilledChunk: SomeChunk,\n ): void {\n const {response, handler, parentObject, key, map, path} = reference;\n \n@@ -1376,6 +1378,8 @@ function fulfillReference(\n const mappedValue = map(response, value, parentObject, key);\n parentObject[key] = mappedValue;\n \n+ transferReferencedDebugInfo(handler.chunk, fulfilledChunk, mappedValue);\n+\n \/\/ If this is the root object for a model reference, where `handler.value`\n \/\/ is a stale `null`, the resolved value can be used directly.\n if (key === '' && handler.value === null) {\n@@ -1422,7 +1426,7 @@ function fulfillReference(\n initializedChunk.value = handler.value;\n initializedChunk.reason = handler.reason; \/\/ Used by streaming chunks\n if (resolveListeners !== null) {\n- wakeChunk(resolveListeners, handler.value);\n+ wakeChunk(resolveListeners, handler.value, initializedChunk);\n }\n }\n }\n@@ -1669,7 +1673,7 @@ function loadServerReference, T>(\n initializedChunk.status = INITIALIZED;\n initializedChunk.value = handler.value;\n if (resolveListeners !== null) {\n- wakeChunk(resolveListeners, handler.value);\n+ wakeChunk(resolveListeners, handler.value, initializedChunk);\n }\n }\n }\n@@ -1728,6 +1732,49 @@ function loadServerReference, T>(\n return (null: any);\n }\n \n+function transferReferencedDebugInfo(\n+ parentChunk: null | SomeChunk,\n+ referencedChunk: SomeChunk,\n+ referencedValue: mixed,\n+): void {\n+ if (__DEV__ && referencedChunk._debugInfo) {\n+ const referencedDebugInfo = referencedChunk._debugInfo;\n+ \/\/ If we have a direct reference to an object that was rendered by a synchronous\n+ \/\/ server component, it might have some debug info about how it was rendered.\n+ \/\/ We forward this to the underlying object. This might be a React Element or\n+ \/\/ an Array fragment.\n+ \/\/ If this was a string \/ number return value we lose the debug info. We choose\n+ \/\/ that tradeoff to allow sync server components to return plain values and not\n+ \/\/ use them as React Nodes necessarily. We could otherwise wrap them in a Lazy.\n+ if (\n+ typeof referencedValue === 'object' &&\n+ referencedValue !== null &&\n+ (isArray(referencedValue) ||\n+ typeof referencedValue[ASYNC_ITERATOR] === 'function' ||\n+ referencedValue.$$typeof === REACT_ELEMENT_TYPE) &&\n+ !referencedValue._debugInfo\n+ ) {\n+ \/\/ We should maybe use a unique symbol for arrays but this is a React owned array.\n+ \/\/ $FlowFixMe[prop-missing]: This should be added to elements.\n+ Object.defineProperty((referencedValue: any), '_debugInfo', {\n+ configurable: false,\n+ enumerable: false,\n+ writable: true,\n+ value: referencedDebugInfo,\n+ });\n+ }\n+ \/\/ We also add it to the initializing chunk since the resolution of that promise is\n+ \/\/ also blocked by these. By adding it to both we can track it even if the array\/element\n+ \/\/ is extracted, or if the root is rendered as is.\n+ if (parentChunk !== null) {\n+ const parentDebugInfo =\n+ parentChunk._debugInfo || (parentChunk._debugInfo = []);\n+ \/\/ $FlowFixMe[method-unbinding]\n+ parentDebugInfo.push.apply(parentDebugInfo, referencedDebugInfo);\n+ }\n+ }\n+}\n+\n function getOutlinedModel(\n response: Response,\n reference: string,\n@@ -1825,32 +1872,7 @@ function getOutlinedModel(\n value = value[path[i]];\n }\n const chunkValue = map(response, value, parentObject, key);\n- if (__DEV__ && chunk._debugInfo) {\n- \/\/ If we have a direct reference to an object that was rendered by a synchronous\n- \/\/ server component, it might have some debug info about how it was rendered.\n- \/\/ We forward this to the underlying object. This might be a React Element or\n- \/\/ an Array fragment.\n- \/\/ If this was a string \/ number return value we lose the debug info. We choose\n- \/\/ that tradeoff to allow sync server components to return plain values and not\n- \/\/ use them as React Nodes necessarily. We could otherwise wrap them in a Lazy.\n- if (\n- typeof chunkValue === 'object' &&\n- chunkValue !== null &&\n- (isArray(chunkValue) ||\n- typeof chunkValue[ASYNC_ITERATOR] === 'function' ||\n- chunkValue.$$typeof === REACT_ELEMENT_TYPE) &&\n- !chunkValue._debugInfo\n- ) {\n- \/\/ We should maybe use a unique symbol for arrays but this is a React owned array.\n- \/\/ $FlowFixMe[prop-missing]: This should be added to elements.\n- Object.defineProperty((chunkValue: any), '_debugInfo', {\n- configurable: false,\n- enumerable: false,\n- writable: true,\n- value: chunk._debugInfo,\n- });\n- }\n- }\n+ transferReferencedDebugInfo(initializingChunk, chunk, chunkValue);\n return chunkValue;\n case PENDING:\n case BLOCKED:\n@@ -2621,7 +2643,7 @@ function resolveStream>(\n cyclicChunk.status = BLOCKED;\n cyclicChunk.value = null;\n cyclicChunk.reason = null;\n- if (enableProfilerTimer && enableComponentPerformanceTrack) {\n+ if ((enableProfilerTimer && enableComponentPerformanceTrack) || __DEV__) {\n initializingChunk = cyclicChunk;\n }\n try {\n@@ -2650,7 +2672,7 @@ function resolveStream>(\n resolvedChunk.value = stream;\n resolvedChunk.reason = controller;\n if (resolveListeners !== null) {\n- wakeChunk(resolveListeners, chunk.value);\n+ wakeChunk(resolveListeners, chunk.value, chunk);\n }\n }\n \ndiff --git a\/packages\/react-client\/src\/__tests__\/ReactFlight-test.js b\/packages\/react-client\/src\/__tests__\/ReactFlight-test.js\nindex 0fd9b869c6..01f37319bf 100644\n--- a\/packages\/react-client\/src\/__tests__\/ReactFlight-test.js\n+++ b\/packages\/react-client\/src\/__tests__\/ReactFlight-test.js\n@@ -2957,6 +2957,19 @@ describe('ReactFlight', () => {\n transport: expect.arrayContaining([]),\n },\n },\n+ {\n+ time: 16,\n+ },\n+ {\n+ env: 'third-party',\n+ key: null,\n+ name: 'ThirdPartyAsyncIterableComponent',\n+ props: {},\n+ stack: ' in Object. (at **)',\n+ },\n+ {\n+ time: 16,\n+ },\n {time: 17},\n ]\n : undefined,\n@@ -2976,6 +2989,19 @@ describe('ReactFlight', () => {\n children: {},\n },\n },\n+ {\n+ time: 19,\n+ },\n+ {\n+ time: 19,\n+ },\n+ {\n+ env: 'third-party',\n+ key: null,\n+ name: 'ThirdPartyAsyncIterableComponent',\n+ props: {},\n+ stack: ' in Object. (at **)',\n+ },\n {time: 19},\n ]\n : undefined,\n","body":"","parents":["d73b6f111057e09b9886e8edd2bc70fa56229489"],"files":[{"status":"M","path":"packages\/react-client\/src\/ReactFlightClient.js"},{"status":"M","path":"packages\/react-client\/src\/__tests__\/ReactFlight-test.js"}],"commit":{"revision":"253abc78a1db0caab1693ecf9407d9bc10dd6bd1","authoredAt":"2025-08-21T17:50:20-04:00","shortRevision":"253abc78a1","authorName":"Sebastian Markbåge","authorEmail":"sebastian@calyptus.eu","subject":"[Flight] Transfer Debug Info from a synchronous Reference to another Chunk (#34229)"}}

dillon1000/react

Files changed