Merge branch 'main' of https://github.com/Recodive/MongoDataSource

Author: =

lib/index.d.ts

@@ -1,5 +1,6 @@
 import { DataSource, DataSourceConfig } from "apollo-datasource";
 import { KeyValueCache } from "apollo-server-caching";
+
 import type { Collection, Document, FindOptions } from "mongodb";
 declare type DataSourceOperation = "findOne" | "find" | "count";
 export default abstract class MongoDataSource<TSchema extends Document = Document, TContext = any> extends DataSource<TContext> {
@@ -26,11 +27,11 @@ export default abstract class MongoDataSource<TSchema extends Document = Documen
     /**
      * MongoDB collection for the data source.
      */
-    collection: Collection<TSchema>, 
+    collection: Collection<TSchema>,
     /**
      * Cache instance
      */
-    cache?: KeyValueCache<string> | undefined, 
+    cache?: KeyValueCache<string> | undefined,
     /**
      * Options for the DataSource
      */

lib/index.js

@@ -77,7 +77,7 @@ export default abstract class MongoDataSource<
 
 	async find(
 		fields: any = {},
-		options: { ttl: number; findOptions?: FindOptions<Document> } = {
+		options: { ttl: number; findOptions?: FindOptions<TSchema> } = {
 			ttl: this.defaultTTL
 		}
 	): Promise<TSchema[]> {
@@ -100,7 +100,7 @@ export default abstract class MongoDataSource<
 
 	async findOne(
 		fields: any = {},
-		options: { ttl: number; findOptions?: FindOptions } = {
+		options: { ttl: number; findOptions?: FindOptions<TSchema> } = {
 			ttl: this.defaultTTL
 		}
 	): Promise<TSchema | null> {
@@ -122,15 +122,15 @@ export default abstract class MongoDataSource<
 	async delete(
 		type: DataSourceOperation,
 		fields: any = {},
-		options: { findOptions?: FindOptions } = {}
+		options: { findOptions?: FindOptions<TSchema> } = {}
 	) {
 		return await this.cache?.delete(this.getCacheKey(type, fields, options));
 	}
 
 	private getCacheKey(
 		type: DataSourceOperation,
 		fields: any,
-		options: { findOptions?: FindOptions } = {}
+		options: { findOptions?: FindOptions<TSchema> } = {}
 	) {
 		return (
 			this.cachePrefix +