Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 32 additions & 1 deletion src/functions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,37 @@ import {
} from "@tanstack/db"
import type { QueryClient, QueryMeta } from "@tanstack/query-core"

const mergeInFilters = (filters: SimpleComparison[]) => {
const mergedFilters: SimpleComparison[] = []
const filtersByField = new Map<string, SimpleComparison>()

for (const filter of filters) {
const field = filter.field?.join(".")
if (filter.operator !== "in" || !field) {
mergedFilters.push(filter)
continue
}

const values = Array.isArray(filter.value) ? filter.value : [filter.value]
const existingFilter = filtersByField.get(field)
if (existingFilter) {
existingFilter.value = Array.from(
new Set([...(existingFilter.value as unknown[]), ...values])
)
continue
}

const mergedFilter = {
...filter,
value: Array.from(new Set(values)),
}
mergedFilters.push(mergedFilter)
filtersByField.set(field, mergedFilter)
}

return mergedFilters
}

const buildQuery = (
baseQuery: PostgrestFilterBuilder<any, any, any, any>,
filter: SimpleComparison
Expand Down Expand Up @@ -145,7 +176,7 @@ export const supabaseQueryFn = async (
}

if (parsed.filters) {
;[...parsed.filters, ...cursorFilters].forEach((filter) => {
mergeInFilters([...parsed.filters, ...cursorFilters]).forEach((filter) => {
buildQuery(baseQuery, filter)
})
}
Expand Down
24 changes: 24 additions & 0 deletions tests/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,30 @@ describe("PostgREST query generation", () => {
expectFetchUrls(mockFetch, ["/rest/v1/users?select=*&id=in.(1,2,3)"])
})

test("merges IN filters for the same column", async () => {
await queryResult((q) =>
q
.from({ user: usersCollection })
.where(({ user }) =>
and(inArray(user.id, [1, 2]), inArray(user.id, [2, 3]))
)
)
expectFetchUrls(mockFetch, ["/rest/v1/users?select=*&id=in.(1,2,3)"])
})

test("keeps IN filters for different columns separate", async () => {
await queryResult((q) =>
q
.from({ user: usersCollection })
.where(({ user }) =>
and(inArray(user.id, [1, 2]), inArray(user.name, ["Alice", "Bob"]))
)
)
expectFetchUrls(mockFetch, [
"/rest/v1/users?select=*&id=in.(1,2)&name=in.(Alice,Bob)",
])
})

test("WHERE NOT(active = false)", async () => {
await queryResult((q) =>
q
Expand Down