fix(Filter): Simplifies filter type.

Author: ryasmi

src/types/Filter.ts

@@ -1,38 +1,28 @@
-export type GreaterFilter<Prop> = { readonly $gt: Prop } | { readonly $gte: Prop };
-export type LesserFilter<Prop> = { readonly $lt: Prop } | { readonly $lte: Prop };
-export type InFilter<Prop> = { readonly $in: Prop[] } | { readonly $nin: Prop[] };
-export type EqualityFilter<Prop> = { readonly $eq: Prop } | { readonly $ne: Prop };
-export interface NotFilter<Prop> { readonly $not: PropFilter<Prop>; }
-
-export type PropFilter<Prop> = (
-  GreaterFilter<Prop> |
-  LesserFilter<Prop> |
-  InFilter<Prop> |
-  EqualityFilter<Prop> |
-  NotFilter<Prop>
-);
+export interface PropFilter<Prop> {
+  readonly $gt?: Prop;
+  readonly $gte?: Prop;
+  readonly $lt?: Prop;
+  readonly $lte?: Prop;
+  readonly $in?: Prop[];
+  readonly $nin?: Prop[];
+  readonly $eq?: Prop;
+  readonly $ne?: Prop;
+  readonly $not?: PropFilter<Prop>;
+}
 
 export type EntityFilter<Entity> = {
   readonly [P in keyof Entity]?: Entity[P] | PropFilter<Entity[P]>;
 };
 
-export interface AndFilter<Entity> {
-  readonly $and: Filter<Entity>[];
-}
-
-export interface OrFilter<Entity> {
-  readonly $or: Filter<Entity>[];
-}
-
-export interface NorFilter<Entity> {
-  readonly $nor: Filter<Entity>[];
+export interface ConditionFilter<Entity> {
+  readonly $and?: Filter<Entity>[];
+  readonly $or?: Filter<Entity>[];
+  readonly $nor?: Filter<Entity>[];
 }
 
 export type Filter<Entity> = (
-  EntityFilter<Entity> |
-  AndFilter<Entity> |
-  OrFilter<Entity> |
-  NorFilter<Entity>
+  EntityFilter<Entity> &
+  ConditionFilter<Entity>
 );
 
 export default Filter;

src/utils/createPaginationFilter/index.ts

@@ -1,7 +1,7 @@
 import * as atob from 'atob';
 import { get, mapValues } from 'lodash';
 // tslint:disable-next-line:no-unused
-import Filter, { AndFilter, NorFilter, NotFilter, OrFilter } from '../../types/Filter';
+import Filter, { ConditionFilter, EntityFilter } from '../../types/Filter';
 import Pagination from '../../types/Pagination';
 import Sort from '../../types/Sort';