Skip to content

Fix/postgrest not null narrowing #2028

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
DevanshTyagi04 wants to merge 2 commits into
base: master
Choose a base branch
from
+36 −27
Open

Fix/postgrest not null narrowing #2028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56045b7
fix(postgrest): correct order() overload typing for referenced tables
DevanshTyagi04 Jan 16, 2026
25e4da5
fix(postgrest): infer non-nullable types after is(null) filter
DevanshTyagi04 Jan 17, 2026
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
52 changes: 36 additions & 16 deletions packages/core/postgrest-js/src/PostgrestFilterBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ type ResolveFilterRelationshipValue<

export type InvalidMethodError<S extends string> = { Error: S }

type NonNullableColumn<Row, Column extends keyof Row> = Omit<Row, Column> & {
[K in Column]-?: NonNullable<Row[K]>
}

export default class PostgrestFilterBuilder<
ClientOptions extends ClientServerOptions,
Schema extends GenericSchema,
Expand Down Expand Up @@ -610,28 +614,44 @@ export default class PostgrestFilterBuilder<
return this
}

// overload 1 – narrows null
not<ColumnName extends keyof Row>(
column: ColumnName,
operator: 'is',
value: null
): PostgrestFilterBuilder<
ClientOptions,
Schema,
NonNullableColumn<Row, ColumnName>,
Result,
RelationName,
Relationships,
Method
>

// overload 2 – fallback
not<ColumnName extends string & keyof Row>(
column: ColumnName,
operator: FilterOperator,
value: Row[ColumnName]
): this
not(column: string, operator: string, value: unknown): this
/**
* Match only rows which doesn't satisfy the filter.
*
* Unlike most filters, `opearator` and `value` are used as-is and need to
* follow [PostgREST
* syntax](https://postgrest.org/en/stable/api.html#operators). You also need
* to make sure they are properly sanitized.
*
* @param column - The column to filter on
* @param operator - The operator to be negated to filter with, following
* PostgREST syntax
* @param value - The value to filter with, following PostgREST syntax
*/
not(column: string, operator: string, value: unknown): this {

// ✅ implementation (widened return)
not(
column: string,
operator: string,
value: unknown
): PostgrestFilterBuilder<
ClientOptions,
Schema,
any,
Result,
RelationName,
Relationships,
Method
> {
this.url.searchParams.append(column, `not.${operator}.${value}`)
return this
return this as any
}

/**
Expand Down
11 changes: 0 additions & 11 deletions packages/core/postgrest-js/src/PostgrestTransformBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,21 +72,10 @@ export default class PostgrestTransformBuilder<
>
}

order<ColumnName extends string & keyof Row>(
column: ColumnName,
options?: { ascending?: boolean; nullsFirst?: boolean; referencedTable?: undefined }
): this
order(
column: string,
options?: { ascending?: boolean; nullsFirst?: boolean; referencedTable?: string }
): this
/**
* @deprecated Use `options.referencedTable` instead of `options.foreignTable`
*/
order<ColumnName extends string & keyof Row>(
column: ColumnName,
options?: { ascending?: boolean; nullsFirst?: boolean; foreignTable?: undefined }
): this
/**
* @deprecated Use `options.referencedTable` instead of `options.foreignTable`
*/
Expand Down