Skip to content

fix: update filter operators #10

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

Merged
ngocphuongnb merged 1 commit into from
Sep 18, 2025
Merged

fix: update filter operators #10

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
45 changes: 30 additions & 15 deletions src/libs/types/query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,48 @@ export interface ListOptions {
select?: string;
}

export type FilterOperator = '$eq' | '$neq' | '$gt' | '$gte' | '$lt' | '$lte' | '$like' | '$in' | '$nin' | '$null';

export type FilterValue = string | number | boolean | null | string[] | number[] | boolean[] | null[];
export type FilterOperator =
| '$eq'
| '$neq'
| '$gt'
| '$gte'
| '$lt'
| '$lte'
| '$notlike'
| '$contains'
| '$notcontains'
| '$containsfold'
| '$notcontainsfold'
| '$like'
| '$in'
| '$nin'
| '$null';
export type FilterValue =
| string
| number
| boolean
| null
| string[]
| number[]
| boolean[]
| null[];

export interface FilterFieldsObject {
[key: string]: FilterObject | FilterValue | Filter[];
}

export interface FilterAndOr {
'$or'?: Filter[];
'$and'?: Filter[];
$or?: Filter[];
$and?: Filter[];
}

export type FilterMixedFieldsAndOr = FilterFieldsObject & FilterAndOr;

export type Filter = FilterMixedFieldsAndOr | FilterFieldsObject;

// export interface Filter {
// [key: string]: FilterObject | FilterValue | Filter[] | undefined;
// '$or'?: Filter[];
// '$and'?: Filter[];
// }

export type FilterObject = {
[k in FilterOperator]: FilterValue;
}

[k in FilterOperator]?: FilterValue;
};

export interface PaginationMeta {
total: number;
Expand All @@ -43,6 +58,6 @@ export interface PaginationMeta {
last_page: number;
}

export interface Pagination<T = Content> extends PaginationMeta{
export interface Pagination<T = Content> extends PaginationMeta {
items: T[];
}
Loading