fix: create start and end cursors even if edges are null

hayes · Jul 29, 2021 · 64b9d2f · 64b9d2f
1 parent a38003b
commit 64b9d2f
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 18 deletions.
diff --git a/packages/deno/packages/plugin-relay/utils/connections.ts b/packages/deno/packages/plugin-relay/utils/connections.ts
@@ -72,8 +72,8 @@ export async function resolveOffsetConnection<T>(options: ResolveOffsetConnectio
     return {
         edges: trimmed,
         pageInfo: {
-            startCursor: trimmed[0]?.cursor ?? null,
-            endCursor: trimmed[trimmed.length - 1]?.cursor ?? null,
+            startCursor: offsetToCursor(offset),
+            endCursor: offsetToCursor(offset + trimmed.length - 1),
             hasPreviousPage,
             hasNextPage: hasNextPage(nodes.length),
         },
@@ -102,8 +102,8 @@ export function resolveArrayConnection<T>(options: ResolveArrayConnectionOptions
     return {
         edges: trimmed,
         pageInfo: {
-            startCursor: trimmed[0]?.cursor ?? null,
-            endCursor: trimmed[trimmed.length - 1]?.cursor ?? null,
+            startCursor: offsetToCursor(offset),
+            endCursor: offsetToCursor(offset + trimmed.length - 1),
             hasPreviousPage,
             hasNextPage: hasNextPage(nodes.length),
         },

diff --git a/packages/plugin-relay/src/utils/connections.ts b/packages/plugin-relay/src/utils/connections.ts
@@ -94,8 +94,8 @@ export async function resolveOffsetConnection<T>(
   return {
     edges: trimmed,
     pageInfo: {
-      startCursor: trimmed[0]?.cursor ?? null,
-      endCursor: trimmed[trimmed.length - 1]?.cursor ?? null,
+      startCursor: offsetToCursor(offset),
+      endCursor: offsetToCursor(offset + trimmed.length - 1),
       hasPreviousPage,
       hasNextPage: hasNextPage(nodes.length),
     },
@@ -138,8 +138,8 @@ export function resolveArrayConnection<T>(
   return {
     edges: trimmed,
     pageInfo: {
-      startCursor: trimmed[0]?.cursor ?? null,
-      endCursor: trimmed[trimmed.length - 1]?.cursor ?? null,
+      startCursor: offsetToCursor(offset),
+      endCursor: offsetToCursor(offset + trimmed.length - 1),
       hasPreviousPage,
       hasNextPage: hasNextPage(nodes.length),
     },

diff --git a/packages/plugin-relay/tests/__snapshots__/index.test.ts.snap b/packages/plugin-relay/tests/__snapshots__/index.test.ts.snap
@@ -739,6 +739,29 @@ Object {
         "startCursor": "T2Zmc2V0Q29ubmVjdGlvbjo3",
       },
     },
+    "moreOddNumbers": Object {
+      "edges": Array [
+        Object {
+          "cursor": "T2Zmc2V0Q29ubmVjdGlvbjox",
+          "node": Object {
+            "number": 1,
+          },
+        },
+        null,
+        Object {
+          "cursor": "T2Zmc2V0Q29ubmVjdGlvbjoz",
+          "node": Object {
+            "number": 3,
+          },
+        },
+      ],
+      "pageInfo": Object {
+        "endCursor": "T2Zmc2V0Q29ubmVjdGlvbjoz",
+        "hasNextPage": true,
+        "hasPreviousPage": true,
+        "startCursor": "T2Zmc2V0Q29ubmVjdGlvbjox",
+      },
+    },
     "numbers": Object {
       "edges": Array [
         Object {
@@ -769,25 +792,20 @@ Object {
     },
     "oddNumbers": Object {
       "edges": Array [
+        null,
         Object {
           "cursor": "T2Zmc2V0Q29ubmVjdGlvbjox",
           "node": Object {
             "number": 1,
           },
         },
         null,
-        Object {
-          "cursor": "T2Zmc2V0Q29ubmVjdGlvbjoz",
-          "node": Object {
-            "number": 3,
-          },
-        },
       ],
       "pageInfo": Object {
-        "endCursor": "T2Zmc2V0Q29ubmVjdGlvbjoz",
+        "endCursor": "T2Zmc2V0Q29ubmVjdGlvbjoy",
         "hasNextPage": true,
-        "hasPreviousPage": true,
-        "startCursor": "T2Zmc2V0Q29ubmVjdGlvbjox",
+        "hasPreviousPage": false,
+        "startCursor": "T2Zmc2V0Q29ubmVjdGlvbjow",
       },
     },
     "sharedConnection": Object {

diff --git a/packages/plugin-relay/tests/index.test.ts b/packages/plugin-relay/tests/index.test.ts
@@ -30,7 +30,21 @@ describe('relay example schema', () => {
               }
             }
           }
-          oddNumbers(first: 3, after: "T2Zmc2V0Q29ubmVjdGlvbjow") {
+          oddNumbers(first: 3) {
+            pageInfo {
+              hasNextPage
+              hasPreviousPage
+              startCursor
+              endCursor
+            }
+            edges {
+              cursor
+              node {
+                number
+              }
+            }
+          }
+          moreOddNumbers: oddNumbers(first: 3, after: "T2Zmc2V0Q29ubmVjdGlvbjow") {
             pageInfo {
               hasNextPage
               hasPreviousPage