Fix hasPreviousPage in resolveCursorConnection

hayes · Aug 11, 2023 · b7954d4 · b7954d4 · vercel · Aug 11, 2023
1 parent cd9ffb5
commit b7954d4
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 2 deletions.
diff --git a/.changeset/eleven-rules-sing.md b/.changeset/eleven-rules-sing.md
@@ -0,0 +1,5 @@
+---
+'@pothos/plugin-relay': patch
+---
+
+Fix hasPreviousPage in resolveCursorConnection
diff --git a/packages/plugin-relay/src/utils/connections.ts b/packages/plugin-relay/src/utils/connections.ts
@@ -214,8 +214,8 @@ function parseCurserArgs(options: ResolveOffsetConnectionOptions) {
     limit,
     expectedSize: limit - 1,
     inverted,
-    hasPreviousPage: (resultSize: number) => !!after || (resultSize >= limit && !first),
-    hasNextPage: (resultSize: number) => !!before || (!last && resultSize >= limit),
+    hasPreviousPage: (resultSize: number) => (inverted ? resultSize >= limit : !!after),
+    hasNextPage: (resultSize: number) => (inverted ? !!before : resultSize >= limit),
   };
 }
 

diff --git a/packages/plugin-relay/tests/__snapshots__/cursors.test.ts.snap b/packages/plugin-relay/tests/__snapshots__/cursors.test.ts.snap
@@ -268,6 +268,41 @@ exports[`cursor based connection > queries 1`] = `
         "startCursor": "38",
       },
     },
+    "noArgs": {
+      "edges": [
+        {
+          "node": {
+            "id": "1",
+          },
+        },
+        {
+          "node": {
+            "id": "2",
+          },
+        },
+        {
+          "node": {
+            "id": "3",
+          },
+        },
+        {
+          "node": {
+            "id": "4",
+          },
+        },
+        {
+          "node": {
+            "id": "5",
+          },
+        },
+      ],
+      "pageInfo": {
+        "endCursor": "5",
+        "hasNextPage": true,
+        "hasPreviousPage": false,
+        "startCursor": "1",
+      },
+    },
   },
 }
 `;
diff --git a/packages/plugin-relay/tests/cursors.test.ts b/packages/plugin-relay/tests/cursors.test.ts
@@ -6,6 +6,19 @@ describe('cursor based connection', () => {
   it('queries', async () => {
     const query = gql`
       query {
+        noArgs: cursorConnection {
+          pageInfo {
+            startCursor
+            endCursor
+            hasNextPage
+            hasPreviousPage
+          }
+          edges {
+            node {
+              id
+            }
+          }
+        }
         after: cursorConnection(after: 98) {
           pageInfo {
             startCursor