Type params for query funcs

This commit is contained in:
Erik 2023-04-14 19:54:01 +03:00
parent fb5c680804
commit ffcdc003ad
Signed by: Navy.gif
GPG Key ID: 2532FBBB61C65A68

View File

@ -1,5 +1,5 @@
import { inspect } from "node:util";
import { MongoClient, MongoClientOptions, Db } from "mongodb";
import { MongoClient, MongoClientOptions, Db, Document, WithId } from "mongodb";
import { IServer, ILogger, LoggerClientOptions } from "./interfaces/index.js";
type Credentials = {
@ -120,7 +120,7 @@ class MongoDB {
* @returns {Array} An array containing the corresponding objects for the query
* @memberof Database
*/
async find (db: string, query: object, options: object) {
async find<T extends Document> (db: string, query: object, options: object): Promise<WithId<T>[]> {
if (!this.#db)
throw new Error(`MongoDB not connected`);
@ -130,7 +130,7 @@ class MongoDB {
this.#logger.debug(`Incoming find query for ${db} with parameters ${inspect(query)}`);
const cursor = this.#db.collection(db).find(query, options);
const cursor = this.#db.collection<T>(db).find(query, options);
return cursor.toArray();
}
@ -143,7 +143,7 @@ class MongoDB {
* @returns {Object} An object containing the queried data
* @memberof Database
*/
async findOne (db: string, query: object, options = {}) {
async findOne<T extends Document> (db: string, query: object, options = {}): Promise<WithId<T> | null> {
if (!this.#db)
throw new Error(`MongoDB not connected`);
@ -151,7 +151,7 @@ class MongoDB {
throw new TypeError('Expecting collection name for the first argument');
this.#logger.debug(`Incoming findOne query for ${db} with parameters ${inspect(query)}`);
const result = await this.#db.collection(db).findOne(query, options);
const result = await this.#db.collection<T>(db).findOne(query, options);
return result;
}
@ -299,7 +299,7 @@ class MongoDB {
return this.#db.collection(coll);
}
async ensureIndex (collection: string, indices = []) {
async ensureIndex (collection: string, indices: string[] = []) {
if (!this.#db)
throw new Error(`MongoDB not connected`);
if (!(indices instanceof Array))