[Flight] Update stale blocked values in createModelResolver (#28669)

Alternative to #28620.

Instead of emitting lazy references to not-yet-emitted models in the
Flight Server, this fixes the observed issue in
unstubbable/ai-rsc-test#1 by adjusting the lazy
model resolution in the Flight Client to update stale blocked root
models, before assigning them as chunk values. In addition, the element
props are not outlined anymore in the Flight Server to avoid having to
also handle their staleness in blocked elements.

fixes #28595

DiffTrain build for [93f9179](93f9179)

Author: sebmarkbage

compiled/facebook-www/REVISION

@@ -1 +1 @@
-df95577db0d1d7ca383f281bc1d9e6ba5579bef2
+93f91795a0c71bae4aadd7f082b91de0068a0f91

compiled/facebook-www/ReactFlightDOMClient-dev.modern.js

@@ -673,7 +673,13 @@ if (__DEV__) {
       }
 
       return function (value) {
-        parentObject[key] = value;
+        parentObject[key] = value; // If this is the root object for a model reference, where `blocked.value`
+        // is a stale `null`, the resolved value can be used directly.
+
+        if (key === "" && blocked.value === null) {
+          blocked.value = value;
+        }
+
         blocked.deps--;
 
         if (blocked.deps === 0) {

compiled/facebook-www/ReactFlightDOMClient-prod.modern.js

@@ -202,6 +202,7 @@ function createModelResolver(chunk, parentObject, key, cyclic) {
     };
   return function (value) {
     parentObject[key] = value;
+    "" === key && null === blocked.value && (blocked.value = value);
     blocked.deps--;
     0 === blocked.deps &&
       "blocked" === chunk.status &&

compiled/facebook-www/ReactFlightDOMServer-dev.modern.js

@@ -1194,10 +1194,14 @@ if (__DEV__) {
     var ObjectPrototype = Object.prototype;
     var stringify = JSON.stringify; // Serializable values
     // Thenable<ReactClientValue>
+    // task status
 
     var PENDING = 0;
     var COMPLETED = 1;
-    var ERRORED = 4;
+    var ERRORED = 4; // object reference status
+
+    var SEEN_BUT_NOT_YET_OUTLINED = -1;
+    var NEVER_OUTLINED = -2;
     var ReactCurrentCache = ReactSharedServerInternals.ReactCurrentCache;
     var ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher;
 
@@ -1968,8 +1972,7 @@ if (__DEV__) {
           var existingId = writtenObjects.get(key);
 
           if (existingId === undefined) {
-            // Mark all object keys as seen so that they're always outlined.
-            writtenObjects.set(key, -1);
+            writtenObjects.set(key, SEEN_BUT_NOT_YET_OUTLINED);
           }
         }
       }
@@ -1989,8 +1992,7 @@ if (__DEV__) {
           var existingId = writtenObjects.get(key);
 
           if (existingId === undefined) {
-            // Mark all object keys as seen so that they're always outlined.
-            writtenObjects.set(key, -1);
+            writtenObjects.set(key, SEEN_BUT_NOT_YET_OUTLINED);
           }
         }
       }
@@ -2114,8 +2116,7 @@ if (__DEV__) {
                 // This is the ID we're currently emitting so we need to write it
                 // once but if we discover it again, we refer to it by id.
                 modelRoot = null;
-              } else if (_existingId === -1) {
-                // Seen but not yet outlined.
+              } else if (_existingId === SEEN_BUT_NOT_YET_OUTLINED) {
                 // TODO: If we throw here we can treat this as suspending which causes an outline
                 // but that is able to reuse the same task if we're already in one but then that
                 // will be a lazy future value rather than guaranteed to exist but maybe that's good.
@@ -2134,7 +2135,10 @@ if (__DEV__) {
             } else {
               // This is the first time we've seen this object. We may never see it again
               // so we'll inline it. Mark it as seen. If we see it again, we'll outline.
-              _writtenObjects.set(value, -1);
+              _writtenObjects.set(value, SEEN_BUT_NOT_YET_OUTLINED); // The element's props are marked as "never outlined" so that they are inlined into
+              // the same row as the element itself.
+
+              _writtenObjects.set(value.props, NEVER_OUTLINED);
             }
 
             var element = value;
@@ -2257,20 +2261,19 @@ if (__DEV__) {
             // This is the ID we're currently emitting so we need to write it
             // once but if we discover it again, we refer to it by id.
             modelRoot = null;
-          } else if (existingId === -1) {
-            // Seen but not yet outlined.
+          } else if (existingId === SEEN_BUT_NOT_YET_OUTLINED) {
             var _newId = outlineModel(request, value);
 
             return serializeByValueID(_newId);
-          } else {
+          } else if (existingId !== NEVER_OUTLINED) {
             // We've already emitted this as an outlined object, so we can
             // just refer to that by its existing ID.
             return serializeByValueID(existingId);
           }
         } else {
           // This is the first time we've seen this object. We may never see it again
           // so we'll inline it. Mark it as seen. If we see it again, we'll outline.
-          writtenObjects.set(value, -1);
+          writtenObjects.set(value, SEEN_BUT_NOT_YET_OUTLINED);
         }
 
         if (isArray(value)) {
@@ -2643,7 +2646,7 @@ if (__DEV__) {
           return serializeInfinitePromise();
         }
 
-        if (existingId !== undefined && existingId !== -1) {
+        if (existingId !== undefined && existingId >= 0) {
           // We've already emitted this as a real object, so we can
           // just refer to that by its existing ID.
           return serializeByValueID(existingId);

compiled/facebook-www/ReactFlightDOMServer-prod.modern.js

@@ -793,7 +793,7 @@ function renderModelDestructive(
                 ? ((request = outlineModel(request, value)),
                   serializeByValueID(request))
                 : serializeByValueID(parentPropertyName);
-        } else parent.set(value, -1);
+        } else parent.set(value, -1), parent.set(value.props, -2);
         parent = value.props;
         enableRefAsProp
           ? ((parentPropertyName = parent.ref),
@@ -838,11 +838,15 @@ function renderModelDestructive(
     }
     if (void 0 !== parentPropertyName)
       if (modelRoot === value) modelRoot = null;
-      else
-        return -1 === parentPropertyName
-          ? ((request = outlineModel(request, value)),
-            serializeByValueID(request))
-          : serializeByValueID(parentPropertyName);
+      else {
+        if (-1 === parentPropertyName)
+          return (
+            (request = outlineModel(request, value)),
+            serializeByValueID(request)
+          );
+        if (-2 !== parentPropertyName)
+          return serializeByValueID(parentPropertyName);
+      }
     else parent.set(value, -1);
     if (isArrayImpl(value)) return renderFragment(request, task, value);
     if (value instanceof Map) {