Skip to content

feat: allow cursors that do not match the query filter #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
btravers wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: allow cursors that do not match the query filter #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,7 @@ data/

# Test Database
prisma/*.db
prisma/*.db-journal
prisma/*.db-journal

# JetBrains IDE
.idea
24 changes: 20 additions & 4 deletions src/cursor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ export const paginateWithCursor = async <R, C>(
model.findMany({
...query,
cursor,
skip: 1,
take: limit === null ? undefined : -limit - 1,
take: limit === null ? undefined : -limit - 2,
}),
model.findMany({
...query,
Expand All @@ -42,6 +41,15 @@ export const paginateWithCursor = async <R, C>(
}),
]);

if (
JSON.stringify(parseCursor(getCursor(results[results.length - 1]))) ===
JSON.stringify(cursor)
) {
results.pop();
} else if (limit !== null && results.length === limit + 2) {
results.shift();
}

if (limit !== null && results.length > limit) {
hasPreviousPage = Boolean(results.shift());
}
Expand All @@ -54,8 +62,7 @@ export const paginateWithCursor = async <R, C>(
model.findMany({
...query,
cursor,
skip: 1,
take: limit === null ? undefined : limit + 1,
take: limit === null ? undefined : limit + 2,
}),
model.findMany({
...query,
Expand All @@ -65,6 +72,15 @@ export const paginateWithCursor = async <R, C>(
}),
]);

if (
JSON.stringify(parseCursor(getCursor(results[0]))) ===
JSON.stringify(cursor)
) {
results.shift();
} else if (limit !== null && results.length === limit + 2) {
results.pop();
}

hasPreviousPage = Boolean(previousResult.length);
if (limit !== null && results.length > limit) {
hasNextPage = Boolean(results.pop());
Expand Down