fix(filter): Fixes $not operator in filters.

Disallows top level $not to align with Mongo.

BREAKING CHANGE: Disallows top level $not operator in filters.

Author: ryasmi

src/tests/utils/filterTest.ts

@@ -74,6 +74,6 @@ export default (opts: Opts) => {
 
   it('should filter correctly when using $not operator', async () => {
     await createTestEntities();
-    await opts.assertFirstEntityFilter({ $not: { stringProp: 'b' } });
+    await opts.assertFirstEntityFilter({ stringProp: { $not: 'b' } });
   });
 };

src/types/Filter.ts

@@ -2,16 +2,19 @@ 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>
+  EqualityFilter<Prop> |
+  NotFilter<Prop> |
+  Prop
 );
 
 export type EntityFilter<Entity> = {
-  readonly [P in keyof Entity]?: Entity[P] | PropFilter<Entity[P]>;
+  readonly [P in keyof Entity]?: PropFilter<Entity[P]>;
 };
 
 export interface AndFilter<Entity> {
@@ -22,15 +25,10 @@ export interface OrFilter<Entity> {
   readonly $or: Filter<Entity>[];
 }
 
-export interface NotFilter<Entity> {
-  readonly $not: Filter<Entity>;
-}
-
 export type Filter<Entity> = (
   EntityFilter<Entity> |
   AndFilter<Entity> |
-  OrFilter<Entity> |
-  NotFilter<Entity>
+  OrFilter<Entity>
 );
 
 export default Filter;