feat(types): adds support for passing the type to the collection

Author: Bas950

lib/index.d.ts

@@ -1,14 +1,14 @@
 import { DataSource } from "apollo-datasource";
 import { KeyValueCache } from "apollo-server-caching";
-import { Collection, FindOptions } from "mongodb";
+import { Collection, Document, FindOptions } from "mongodb";
 declare type DataSourceOperation = "findOne" | "find" | "count";
-export default class MongoDataSource implements DataSource {
+export default class MongoDataSource<TSchema extends Document = Document> implements DataSource {
     cache?: KeyValueCache<string> | undefined;
     context: any;
-    collection: Collection<Document>;
+    collection: Collection<TSchema>;
     cachePrefix: string;
     private pendingResults;
-    constructor(collection: Collection<Document>, cache?: KeyValueCache<string> | undefined);
+    constructor(collection: Collection<TSchema>, cache?: KeyValueCache<string> | undefined);
     initialize({ cache }: {
         context: any;
         cache: KeyValueCache;
@@ -19,11 +19,11 @@ export default class MongoDataSource implements DataSource {
     find(fields?: any, options?: {
         ttl: number;
         findOptions?: FindOptions<Document>;
-    }): Promise<any[]>;
+    }): Promise<TSchema[]>;
     findOne(fields?: any, options?: {
         ttl: number;
-        findOptions?: FindOptions<Document>;
-    }): Promise<any>;
+        findOptions?: FindOptions;
+    }): Promise<TSchema | null>;
     delete(type: DataSourceOperation, fields: any, options?: {
         findOptions?: FindOptions<Document>;
     }): Promise<boolean | void | undefined>;

lib/index.js.map

@@ -1,6 +1,6 @@
 {
 	"name": "apollo-mongodb-datasource",
-	"version": "1.0.0",
+	"version": "1.0.1",
 	"description": "An Apollo GraphQL Datasource using MongoDB.",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",

package.json

@@ -1,18 +1,20 @@
 import { DataSource } from "apollo-datasource";
 import { KeyValueCache } from "apollo-server-caching";
-import { Collection, FindOptions } from "mongodb";
+import { Collection, Document, FindOptions } from "mongodb";
 
 type DataSourceOperation = "findOne" | "find" | "count";
 
-export default class MongoDataSource implements DataSource {
+export default class MongoDataSource<TSchema extends Document = Document>
+	implements DataSource
+{
 	context: any;
-	collection: Collection<Document>;
+	collection: Collection<TSchema>;
 
 	cachePrefix: string;
 
 	private pendingResults: { key: string; promise: Promise<any> }[] = [];
 
-	constructor(collection: Collection<Document>, public cache?: KeyValueCache) {
+	constructor(collection: Collection<TSchema>, public cache?: KeyValueCache) {
 		this.collection = collection;
 
 		this.cachePrefix = `mongo-${this.collection.dbName}-${this.collection.collectionName}-`;
@@ -42,7 +44,7 @@ export default class MongoDataSource implements DataSource {
 		options: { ttl: number; findOptions?: FindOptions<Document> } = {
 			ttl: 60
 		}
-	): Promise<any[]> {
+	): Promise<TSchema[]> {
 		const cacheKey = this.getCacheKey("find", fields, options),
 			cacheDoc = await this.cache?.get(cacheKey);
 
@@ -62,10 +64,10 @@ export default class MongoDataSource implements DataSource {
 
 	async findOne(
 		fields: any = {},
-		options: { ttl: number; findOptions?: FindOptions<Document> } = {
+		options: { ttl: number; findOptions?: FindOptions } = {
 			ttl: 60
 		}
-	) {
+	): Promise<TSchema | null> {
 		const cacheKey = this.getCacheKey("findOne", fields, options),
 			cacheDoc = await this.cache?.get(cacheKey);
 
@@ -84,15 +86,15 @@ export default class MongoDataSource implements DataSource {
 	async delete(
 		type: DataSourceOperation,
 		fields: any,
-		options: { findOptions?: FindOptions<Document> } = {}
+		options: { findOptions?: FindOptions } = {}
 	) {
 		return await this.cache?.delete(this.getCacheKey(type, fields, options));
 	}
 
 	private getCacheKey(
 		type: DataSourceOperation,
 		fields: any,
-		options: { findOptions?: FindOptions<Document> } = {}
+		options: { findOptions?: FindOptions } = {}
 	) {
 		return (
 			this.cachePrefix +