github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-29 03:08:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

SDK: Fix type arrays on filter (#10133)

Browse Source 
* support arrays as types for _in, _nin, etc.

* improve type definition on filters
This commit is contained in:
José Varela
2021-12-01 19:04:55 +00:00
committed by GitHub
parent 1c8181c6c1
commit 2fa2a75b60
1 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
packages/sdk/src/items.ts
View File

@@ -49,36 +49,35 @@ export type DeepQueryMany<T> = {
export type Sort<T> = (`${Extract<keyof T, string>}` | `-${Extract<keyof T, string>}`)[];
export type FilterOperators =
| '_eq'
| '_neq'
| '_contains'
| '_ncontains'
| '_in'
| '_nin'
| '_gt'
| '_gte'
| '_lt'
| '_lte'
| '_null'
| '_nnull'
| '_empty'
| '_nempty'
| '_intersects'
| '_nintersects'
| '_intersects_bbox'
| '_nintersects_bbox';
export type FilterOperators<T> = {
_eq?: T;
_neq?: T;
_gt?: T;
_gte?: T;
_lt?: T;
_lte?: T;
_in?: T[];
_nin?: T[];
_between?: [T, T];
_nbetween?: [T, T];
_contains?: T;
_ncontains?: T;
_empty?: boolean;
_nempty?: boolean;
_nnull?: boolean;
_null?: boolean;
_intersects?: T;
_nintersects?: T;
_intersects_bbox?: T;
_nintersects_bbox?: T;
};
export type LogicalFilterAnd<T> = { _and: Filter<T>[] };
export type LogicalFilterOr<T> = { _or: Filter<T>[] };
export type LogicalFilter<T> = LogicalFilterAnd<T> | LogicalFilterOr<T>;
export type FieldFilterOperator<T, K extends keyof T> = {
[O in FilterOperators]?: T[K];
};
export type FieldFilter<T> = {
[K in keyof T]?: FieldFilterOperator<T, K> | FieldFilter<T[K]>;
[K in keyof T]?: FilterOperators<T[K]> | FieldFilter<T[K]>;
};
export type Filter<T> = LogicalFilter<T> | FieldFilter<T extends Array<unknown> ? T[number] : T>;