@matthamlin/react-client 0.0.0-experimental-d331ba04-20250307 → 0.0.0-experimental-6aa8254b-20250312

package/cjs/react-client-flight.development.js

@@ -576,7 +576,10 @@
           parentReference = knownServerReferences.get(value);
           if (void 0 !== parentReference)
             return (
-              (key = JSON.stringify(parentReference, resolveToJSON)),
+              (key = JSON.stringify(
+                { id: parentReference.id, bound: parentReference.bound },
+                resolveToJSON
+              )),
               null === formData && (formData = new FormData()),
               (parentReference = nextPartId++),
               formData.set(formFieldPrefix + parentReference, key),
@@ -672,41 +675,45 @@
       return thenable;
     }
     function defaultEncodeFormAction(identifierPrefix) {
-      var reference = knownServerReferences.get(this);
-      if (!reference)
+      var referenceClosure = knownServerReferences.get(this);
+      if (!referenceClosure)
         throw Error(
           "Tried to encode a Server Action from a different instance than the encoder is from. This is a bug in React."
         );
       var data = null;
-      if (null !== reference.bound) {
-        data = boundCache.get(reference);
+      if (null !== referenceClosure.bound) {
+        data = boundCache.get(referenceClosure);
         data ||
-          ((data = encodeFormData(reference)), boundCache.set(reference, data));
+          ((data = encodeFormData({
+            id: referenceClosure.id,
+            bound: referenceClosure.bound
+          })),
+          boundCache.set(referenceClosure, data));
         if ("rejected" === data.status) throw data.reason;
         if ("fulfilled" !== data.status) throw data;
-        reference = data.value;
+        referenceClosure = data.value;
         var prefixedData = new FormData();
-        reference.forEach(function (value, key) {
+        referenceClosure.forEach(function (value, key) {
           prefixedData.append("$ACTION_" + identifierPrefix + ":" + key, value);
         });
         data = prefixedData;
-        reference = "$ACTION_REF_" + identifierPrefix;
-      } else reference = "$ACTION_ID_" + reference.id;
+        referenceClosure = "$ACTION_REF_" + identifierPrefix;
+      } else referenceClosure = "$ACTION_ID_" + referenceClosure.id;
       return {
-        name: reference,
+        name: referenceClosure,
         method: "POST",
         encType: "multipart/form-data",
         data: data
       };
     }
     function isSignatureEqual(referenceId, numberOfBoundArgs) {
-      var reference = knownServerReferences.get(this);
-      if (!reference)
+      var referenceClosure = knownServerReferences.get(this);
+      if (!referenceClosure)
         throw Error(
           "Tried to encode a Server Action from a different instance than the encoder is from. This is a bug in React."
         );
-      if (reference.id !== referenceId) return !1;
-      var boundPromise = reference.bound;
+      if (referenceClosure.id !== referenceId) return !1;
+      var boundPromise = referenceClosure.bound;
       if (null === boundPromise) return 0 === numberOfBoundArgs;
       switch (boundPromise.status) {
         case "fulfilled":
@@ -777,58 +784,64 @@
       }
     }
     function registerBoundServerReference(
-      reference$jscomp$0,
+      reference,
       id,
       bound,
       encodeFormAction
     ) {
-      Object.defineProperties(reference$jscomp$0, {
-        $$FORM_ACTION: {
-          value:
-            void 0 === encodeFormAction
-              ? defaultEncodeFormAction
-              : function () {
-                  var reference = knownServerReferences.get(this);
-                  if (!reference)
-                    throw Error(
-                      "Tried to encode a Server Action from a different instance than the encoder is from. This is a bug in React."
-                    );
-                  var boundPromise = reference.bound;
-                  null === boundPromise && (boundPromise = Promise.resolve([]));
-                  return encodeFormAction(reference.id, boundPromise);
-                }
-        },
+      knownServerReferences.has(reference) ||
+        (knownServerReferences.set(reference, {
+          id: id,
+          originalBind: reference.bind,
+          bound: bound
+        }),
+        Object.defineProperties(reference, {
+          $$FORM_ACTION: {
+            value:
+              void 0 === encodeFormAction
+                ? defaultEncodeFormAction
+                : function () {
+                    var referenceClosure = knownServerReferences.get(this);
+                    if (!referenceClosure)
+                      throw Error(
+                        "Tried to encode a Server Action from a different instance than the encoder is from. This is a bug in React."
+                      );
+                    var boundPromise = referenceClosure.bound;
+                    null === boundPromise &&
+                      (boundPromise = Promise.resolve([]));
+                    return encodeFormAction(referenceClosure.id, boundPromise);
+                  }
+          },
+          $$IS_SIGNATURE_EQUAL: { value: isSignatureEqual },
+          bind: { value: bind }
+        }));
+    }
+    function bind() {
+      var referenceClosure = knownServerReferences.get(this);
+      if (!referenceClosure) return FunctionBind.apply(this, arguments);
+      var newFn = referenceClosure.originalBind.apply(this, arguments);
+      null != arguments[0] &&
+        console.error(
+          'Cannot bind "this" of a Server Action. Pass null or undefined as the first argument to .bind().'
+        );
+      var args = ArraySlice.call(arguments, 1),
+        boundPromise = null;
+      boundPromise =
+        null !== referenceClosure.bound
+          ? Promise.resolve(referenceClosure.bound).then(function (boundArgs) {
+              return boundArgs.concat(args);
+            })
+          : Promise.resolve(args);
+      knownServerReferences.set(newFn, {
+        id: referenceClosure.id,
+        originalBind: newFn.bind,
+        bound: boundPromise
+      });
+      Object.defineProperties(newFn, {
+        $$FORM_ACTION: { value: this.$$FORM_ACTION },
         $$IS_SIGNATURE_EQUAL: { value: isSignatureEqual },
         bind: { value: bind }
       });
-      knownServerReferences.set(reference$jscomp$0, { id: id, bound: bound });
-    }
-    function bind() {
-      var newFn = FunctionBind.apply(this, arguments),
-        reference = knownServerReferences.get(this);
-      if (reference) {
-        null != arguments[0] &&
-          console.error(
-            'Cannot bind "this" of a Server Action. Pass null or undefined as the first argument to .bind().'
-          );
-        var args = ArraySlice.call(arguments, 1),
-          boundPromise = null;
-        boundPromise =
-          null !== reference.bound
-            ? Promise.resolve(reference.bound).then(function (boundArgs) {
-                return boundArgs.concat(args);
-              })
-            : Promise.resolve(args);
-        Object.defineProperties(newFn, {
-          $$FORM_ACTION: { value: this.$$FORM_ACTION },
-          $$IS_SIGNATURE_EQUAL: { value: isSignatureEqual },
-          bind: { value: bind }
-        });
-        knownServerReferences.set(newFn, {
-          id: reference.id,
-          bound: boundPromise
-        });
-      }
       return newFn;
     }
     function createBoundServerReference(
@@ -2780,7 +2793,7 @@
         version: rendererVersion,
         rendererPackageName: rendererPackageName,
         currentDispatcherRef: ReactSharedInternals,
-        reconcilerVersion: "19.1.0-experimental-d331ba04-20250307",
+        reconcilerVersion: "19.1.0-experimental-6aa8254b-20250312",
         getCurrentComponentInfo: getCurrentOwnerInDEV
       };
       if ("undefined" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__)

package/cjs/react-client-flight.production.js

@@ -338,7 +338,10 @@ module.exports = function ($$$config) {
         parentReference = knownServerReferences.get(value);
         if (void 0 !== parentReference)
           return (
-            (key = JSON.stringify(parentReference, resolveToJSON)),
+            (key = JSON.stringify(
+              { id: parentReference.id, bound: parentReference.bound },
+              resolveToJSON
+            )),
             null === formData && (formData = new FormData()),
             (parentReference = nextPartId++),
             formData.set(formFieldPrefix + parentReference, key),
@@ -425,35 +428,39 @@ module.exports = function ($$$config) {
     return thenable;
   }
   function defaultEncodeFormAction(identifierPrefix) {
-    var reference = knownServerReferences.get(this);
-    if (!reference) throw Error(formatProdErrorMessage(481));
+    var referenceClosure = knownServerReferences.get(this);
+    if (!referenceClosure) throw Error(formatProdErrorMessage(481));
     var data = null;
-    if (null !== reference.bound) {
-      data = boundCache.get(reference);
+    if (null !== referenceClosure.bound) {
+      data = boundCache.get(referenceClosure);
       data ||
-        ((data = encodeFormData(reference)), boundCache.set(reference, data));
+        ((data = encodeFormData({
+          id: referenceClosure.id,
+          bound: referenceClosure.bound
+        })),
+        boundCache.set(referenceClosure, data));
       if ("rejected" === data.status) throw data.reason;
       if ("fulfilled" !== data.status) throw data;
-      reference = data.value;
+      referenceClosure = data.value;
       var prefixedData = new FormData();
-      reference.forEach(function (value, key) {
+      referenceClosure.forEach(function (value, key) {
         prefixedData.append("$ACTION_" + identifierPrefix + ":" + key, value);
       });
       data = prefixedData;
-      reference = "$ACTION_REF_" + identifierPrefix;
-    } else reference = "$ACTION_ID_" + reference.id;
+      referenceClosure = "$ACTION_REF_" + identifierPrefix;
+    } else referenceClosure = "$ACTION_ID_" + referenceClosure.id;
     return {
-      name: reference,
+      name: referenceClosure,
       method: "POST",
       encType: "multipart/form-data",
       data: data
     };
   }
   function isSignatureEqual(referenceId, numberOfBoundArgs) {
-    var reference = knownServerReferences.get(this);
-    if (!reference) throw Error(formatProdErrorMessage(481));
-    if (reference.id !== referenceId) return !1;
-    var boundPromise = reference.bound;
+    var referenceClosure = knownServerReferences.get(this);
+    if (!referenceClosure) throw Error(formatProdErrorMessage(481));
+    if (referenceClosure.id !== referenceId) return !1;
+    var boundPromise = referenceClosure.bound;
     if (null === boundPromise) return 0 === numberOfBoundArgs;
     switch (boundPromise.status) {
       case "fulfilled":
@@ -481,51 +488,57 @@ module.exports = function ($$$config) {
     }
   }
   function registerBoundServerReference(
-    reference$jscomp$0,
+    reference,
     id,
     bound,
     encodeFormAction
   ) {
-    Object.defineProperties(reference$jscomp$0, {
-      $$FORM_ACTION: {
-        value:
-          void 0 === encodeFormAction
-            ? defaultEncodeFormAction
-            : function () {
-                var reference = knownServerReferences.get(this);
-                if (!reference) throw Error(formatProdErrorMessage(481));
-                var boundPromise = reference.bound;
-                null === boundPromise && (boundPromise = Promise.resolve([]));
-                return encodeFormAction(reference.id, boundPromise);
-              }
-      },
+    knownServerReferences.has(reference) ||
+      (knownServerReferences.set(reference, {
+        id: id,
+        originalBind: reference.bind,
+        bound: bound
+      }),
+      Object.defineProperties(reference, {
+        $$FORM_ACTION: {
+          value:
+            void 0 === encodeFormAction
+              ? defaultEncodeFormAction
+              : function () {
+                  var referenceClosure = knownServerReferences.get(this);
+                  if (!referenceClosure)
+                    throw Error(formatProdErrorMessage(481));
+                  var boundPromise = referenceClosure.bound;
+                  null === boundPromise && (boundPromise = Promise.resolve([]));
+                  return encodeFormAction(referenceClosure.id, boundPromise);
+                }
+        },
+        $$IS_SIGNATURE_EQUAL: { value: isSignatureEqual },
+        bind: { value: bind }
+      }));
+  }
+  function bind() {
+    var referenceClosure = knownServerReferences.get(this);
+    if (!referenceClosure) return FunctionBind.apply(this, arguments);
+    var newFn = referenceClosure.originalBind.apply(this, arguments),
+      args = ArraySlice.call(arguments, 1),
+      boundPromise = null;
+    boundPromise =
+      null !== referenceClosure.bound
+        ? Promise.resolve(referenceClosure.bound).then(function (boundArgs) {
+            return boundArgs.concat(args);
+          })
+        : Promise.resolve(args);
+    knownServerReferences.set(newFn, {
+      id: referenceClosure.id,
+      originalBind: newFn.bind,
+      bound: boundPromise
+    });
+    Object.defineProperties(newFn, {
+      $$FORM_ACTION: { value: this.$$FORM_ACTION },
       $$IS_SIGNATURE_EQUAL: { value: isSignatureEqual },
       bind: { value: bind }
     });
-    knownServerReferences.set(reference$jscomp$0, { id: id, bound: bound });
-  }
-  function bind() {
-    var newFn = FunctionBind.apply(this, arguments),
-      reference = knownServerReferences.get(this);
-    if (reference) {
-      var args = ArraySlice.call(arguments, 1),
-        boundPromise = null;
-      boundPromise =
-        null !== reference.bound
-          ? Promise.resolve(reference.bound).then(function (boundArgs) {
-              return boundArgs.concat(args);
-            })
-          : Promise.resolve(args);
-      Object.defineProperties(newFn, {
-        $$FORM_ACTION: { value: this.$$FORM_ACTION },
-        $$IS_SIGNATURE_EQUAL: { value: isSignatureEqual },
-        bind: { value: bind }
-      });
-      knownServerReferences.set(newFn, {
-        id: reference.id,
-        bound: boundPromise
-      });
-    }
     return newFn;
   }
   function createBoundServerReference(metaData, callServer, encodeFormAction) {
@@ -1587,7 +1600,7 @@ module.exports = function ($$$config) {
       version: rendererVersion,
       rendererPackageName: rendererPackageName,
       currentDispatcherRef: ReactSharedInternals,
-      reconcilerVersion: "19.1.0-experimental-d331ba04-20250307",
+      reconcilerVersion: "19.1.0-experimental-6aa8254b-20250312",
       getCurrentComponentInfo: getCurrentOwnerInDEV
     };
     if ("undefined" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@matthamlin/react-client",
   "description": "React package for consuming streaming models.",
-  "version": "0.0.0-experimental-d331ba04-20250307",
+  "version": "0.0.0-experimental-6aa8254b-20250312",
   "keywords": [
     "react"
   ],
@@ -23,6 +23,6 @@
     "node": ">=0.10.0"
   },
   "peerDependencies": {
-    "react": "0.0.0-experimental-d331ba04-20250307"
+    "react": "0.0.0-experimental-6aa8254b-20250312"
   }
 }