Simplify relayStylePagination to avoid optional chaining syntax.

apollographql · Sep 9, 2020 · 7a6feae · 7a6feae
1 parent 608e09c
commit 7a6feae
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/src/utilities/policies/pagination.ts b/src/utilities/policies/pagination.ts
@@ -79,36 +79,35 @@ export function relayStylePagination<TNode = Reference>(
     },
 
     merge(existing = makeEmptyData(), incoming, { args }) {
-      const incomingEdges = incoming.edges?.slice(0);
-      if (incoming.pageInfo && incomingEdges) {
+      const incomingEdges = incoming.edges ? incoming.edges.slice(0) : [];
+      if (incoming.pageInfo) {
         updateCursor(incomingEdges, 0, incoming.pageInfo.startCursor);
         updateCursor(incomingEdges, -1, incoming.pageInfo.endCursor);
       }
 
       let prefix = existing.edges;
       let suffix: typeof prefix = [];
 
-      if (args?.after) {
+      if (args && args.after) {
         const index = prefix.findIndex(edge => edge.cursor === args.after);
         if (index >= 0) {
           prefix = prefix.slice(0, index + 1);
           // suffix = []; // already true
         }
-      } else if (args?.before) {
+      } else if (args && args.before) {
         const index = prefix.findIndex(edge => edge.cursor === args.before);
         suffix = index < 0 ? prefix : prefix.slice(index);
         prefix = [];
-      } else {
+      } else if (incoming.edges) {
         // If we have neither args.after nor args.before, the incoming
         // edges cannot be spliced into the existing edges, so they must
         // replace the existing edges. See #6592 for a motivating example.
-        if(incomingEdges)
-          prefix = [];
+        prefix = [];
       }
 
       const edges = [
         ...prefix,
-        ...(incomingEdges || []),
+        ...incomingEdges,
         ...suffix,
       ];