Skip to content
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

fix: also validate enums in views #591

Merged
merged 1 commit into from
Jan 8, 2025
Merged

fix: also validate enums in views #591

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
34 changes: 18 additions & 16 deletions src/PostgrestFilterBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PostgrestTransformBuilder from './PostgrestTransformBuilder'
import { GenericSchema, GenericTable } from './types'
import { GenericSchema } from './types'

type FilterOperator =
| 'eq'
Expand Down Expand Up @@ -31,28 +31,30 @@ type FilterOperator =
// assume that all tables have valid relationships to each other, despite
// nonexistent foreign keys.
type ResolveFilterValue<
Tables extends Record<string, GenericTable>,
Schema extends GenericSchema,
Row extends Record<string, unknown>,
ColumnName extends string
> = ColumnName extends `${infer RelationshipTable}.${infer Remainder}`
? Remainder extends `${infer _}.${infer _}`
? ResolveFilterValue<Tables, Row, Remainder>
: ResolveFilterRelationshipValue<Tables, RelationshipTable, Remainder>
? ResolveFilterValue<Schema, Row, Remainder>
: ResolveFilterRelationshipValue<Schema, RelationshipTable, Remainder>
: ColumnName extends keyof Row
? Row[ColumnName]
: never

type ResolveFilterRelationshipValue<
Tables extends Record<string, GenericTable>,
Schema extends GenericSchema,
RelationshipTable extends string,
RelationshipColumn extends string
> = RelationshipTable extends keyof Tables
? 'Row' extends keyof Tables[RelationshipTable]
? RelationshipColumn extends keyof Tables[RelationshipTable]['Row']
? Tables[RelationshipTable]['Row'][RelationshipColumn]
> = Schema['Tables'] & Schema['Views'] extends infer TablesAndViews
? RelationshipTable extends keyof TablesAndViews
? 'Row' extends keyof TablesAndViews[RelationshipTable]
? RelationshipColumn extends keyof TablesAndViews[RelationshipTable]['Row']
? TablesAndViews[RelationshipTable]['Row'][RelationshipColumn]
: unknown
: unknown
: unknown
: unknown
: never

export default class PostgrestFilterBuilder<
Schema extends GenericSchema,
Expand All @@ -71,9 +73,9 @@ export default class PostgrestFilterBuilder<
*/
eq<ColumnName extends string>(
column: ColumnName,
value: ResolveFilterValue<Schema['Tables'], Row, ColumnName> extends never
value: ResolveFilterValue<Schema, Row, ColumnName> extends never
? NonNullable<unknown>
: NonNullable<ResolveFilterValue<Schema['Tables'], Row, ColumnName>>
: NonNullable<ResolveFilterValue<Schema, Row, ColumnName>>
): this {
this.url.searchParams.append(column, `eq.${value}`)
return this
Expand All @@ -87,9 +89,9 @@ export default class PostgrestFilterBuilder<
*/
neq<ColumnName extends string>(
column: ColumnName,
value: ResolveFilterValue<Schema['Tables'], Row, ColumnName> extends never
value: ResolveFilterValue<Schema, Row, ColumnName> extends never
? unknown
: ResolveFilterValue<Schema['Tables'], Row, ColumnName>
: ResolveFilterValue<Schema, Row, ColumnName>
): this {
this.url.searchParams.append(column, `neq.${value}`)
return this
Expand Down Expand Up @@ -267,9 +269,9 @@ export default class PostgrestFilterBuilder<
*/
in<ColumnName extends string>(
column: ColumnName,
values: ResolveFilterValue<Schema['Tables'], Row, ColumnName> extends never
values: ResolveFilterValue<Schema, Row, ColumnName> extends never
? unknown[]
: ReadonlyArray<ResolveFilterValue<Schema['Tables'], Row, ColumnName>>
: ReadonlyArray<ResolveFilterValue<Schema, Row, ColumnName>>
): this {
const cleanedValues = Array.from(new Set(values))
.map((s) => {
Expand Down