From 13d92a2bac4f803de2afbfccc638c4ef1ad8e5e6 Mon Sep 17 00:00:00 2001 From: Daria Pardue <81593090+dariakp@users.noreply.github.com> Date: Thu, 29 Apr 2021 18:00:22 -0400 Subject: [PATCH] fix(NODE-3206): Make distinct use any[] type instead of Document[] --- src/collection.ts | 27 +++++++++++---------------- src/operations/distinct.ts | 4 ++-- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/collection.ts b/src/collection.ts index 188ddab24a..3736954ad7 100644 --- a/src/collection.ts +++ b/src/collection.ts @@ -1013,25 +1013,20 @@ export class Collection { * @param options - Optional settings for the command * @param callback - An optional callback, a Promise will be returned if none is provided */ - distinct(key: string): Promise; - distinct(key: string, callback: Callback): void; - distinct(key: string, query: Document): Promise; - distinct(key: string, query: Document, callback: Callback): void; - distinct(key: string, query: Document, options: DistinctOptions): Promise; + distinct(key: string): Promise; + distinct(key: string, callback: Callback): void; + distinct(key: string, query: Document): Promise; + distinct(key: string, query: Document, callback: Callback): void; + distinct(key: string, query: Document, options: DistinctOptions): Promise; + distinct(key: string, query: Document, options: DistinctOptions, callback: Callback): void; distinct( key: string, - query: Document, - options: DistinctOptions, - callback: Callback - ): void; - distinct( - key: string, - query?: Document | DistinctOptions | Callback, - options?: DistinctOptions | Callback, - callback?: Callback - ): Promise | void { + query?: Document | DistinctOptions | Callback, + options?: DistinctOptions | Callback, + callback?: Callback + ): Promise | void { if (typeof query === 'function') { - (callback = query as Callback), (query = {}), (options = {}); + (callback = query as Callback), (query = {}), (options = {}); } else { if (arguments.length === 3 && typeof options === 'function') { (callback = options), (options = {}); diff --git a/src/operations/distinct.ts b/src/operations/distinct.ts index 4faae4d705..88fefe69d1 100644 --- a/src/operations/distinct.ts +++ b/src/operations/distinct.ts @@ -14,7 +14,7 @@ export type DistinctOptions = CommandOperationOptions; * Return a list of distinct values for the given key across a collection. * @internal */ -export class DistinctOperation extends CommandOperation { +export class DistinctOperation extends CommandOperation { options: DistinctOptions; collection: Collection; /** Field of the document to find distinct values for. */ @@ -39,7 +39,7 @@ export class DistinctOperation extends CommandOperation { this.query = query; } - execute(server: Server, session: ClientSession, callback: Callback): void { + execute(server: Server, session: ClientSession, callback: Callback): void { const coll = this.collection; const key = this.key; const query = this.query;