fix: Filter query root operators support for partials

src/mongo_types.ts

@@ -65,13 +65,15 @@ export type EnhancedOmit<TRecordOrUnion, KeyUnion> = string extends keyof TRecor
 export type WithoutId<TSchema> = Omit<TSchema, '_id'>;
 
 /** A MongoDB filter can be some portion of the schema or a set of operators @public */
-export type Filter<TSchema> =
+export type Filter<TSchema> = (
   | Partial<TSchema>
-  | ({
+  | {
       [Property in Join<NestedPaths<WithId<TSchema>>, '.'>]?: Condition<
         PropertyType<WithId<TSchema>, Property>
       >;
-    } & RootFilterOperators<WithId<TSchema>>);
+    }
+) &
+  RootFilterOperators<WithId<TSchema>>;
 
 /** @public */
 export type Condition<T> = AlternativeType<T> | FilterOperators<AlternativeType<T>>;

test/types/community/collection/findX-recursive-types.test-d.ts

@@ -1,6 +1,6 @@
 import { expectError } from 'tsd';
 
-import type { Collection } from '../../../../src';
+import type { Collection, Filter } from '../../../../src';
 
 /**
  * mutually recursive types are not supported and will not get type safety

test/types/community/collection/findX.test-d.ts

@@ -313,6 +313,16 @@ const fooObj: Foo = {
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const fooFilter: Filter<Foo> = fooObj;
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const fooFilterBuiltNow: Filter<Foo> = {
+  a: 'foo',
+  $or: [{ a: 'bar' }]
+};
+
+const fooFilterBuiltLater: Filter<Foo> = {};
+fooFilterBuiltLater.a = 'foo';
+fooFilterBuiltLater.$or = [{ a: 'bar' }];
+
 // Specifically test that arrays can be included as a part of an object
 //  ensuring that a bug reported in https://jira.mongodb.org/browse/NODE-3856 is addressed
 interface FooWithArray {