Move isArray check higher

It's much more likely to be an array than Map or TypedArray.
facebook · Oct 11, 2023 · ff89f2b · ff89f2b
1 parent 748ab8a
commit ff89f2b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/packages/react-client/src/ReactFlightReplyClient.js b/packages/react-client/src/ReactFlightReplyClient.js
@@ -230,6 +230,10 @@ export function processReply(
         );
         return serializePromiseID(promiseId);
       }
+      if (isArray(value)) {
+        // $FlowFixMe[incompatible-return]
+        return value;
+      }
       // TODO: Should we the Object.prototype.toString.call() to test for cross-realm objects?
       if (value instanceof FormData) {
         if (formData === null) {
@@ -266,10 +270,6 @@ export function processReply(
         formData.append(formFieldPrefix + setId, partJSON);
         return serializeSetID(setId);
       }
-      if (isArray(value)) {
-        // $FlowFixMe[incompatible-return]
-        return value;
-      }
       const iteratorFn = getIteratorFn(value);
       if (iteratorFn) {
         return Array.from((value: any));

diff --git a/packages/react-server/src/ReactFlightServer.js b/packages/react-server/src/ReactFlightServer.js
@@ -1049,6 +1049,11 @@ function resolveModelToJSON(
       return (undefined: any);
     }
 
+    if (isArray(value)) {
+      // $FlowFixMe[incompatible-return]
+      return value;
+    }
+
     if (value instanceof Map) {
       return serializeMap(request, value);
     }
@@ -1110,11 +1115,6 @@ function resolveModelToJSON(
       }
     }
 
-    if (isArray(value)) {
-      // $FlowFixMe[incompatible-return]
-      return value;
-    }
-
     const iteratorFn = getIteratorFn(value);
     if (iteratorFn) {
       return Array.from((value: any));