push down error check to decorate with collation

Author: HanaPearlman

src/operations/common_functions.ts

@@ -1,4 +1,4 @@
-import { MongoClientClosedError, MongoError } from '../error';
+import { MongoError } from '../error';
 import { applyRetryableWrites, applyWriteConcern, decorateWithCollation, Callback } from '../utils';
 import type { Document } from '../bson';
 import type { Db } from '../db';
@@ -152,7 +152,6 @@ export function removeDocuments(
 
   // Have we specified collation
   try {
-    if (!coll.topology) throw new MongoClientClosedError();
     decorateWithCollation(finalOptions, coll.topology, options);
   } catch (err) {
     return callback ? callback(err, null) : undefined;
@@ -244,7 +243,6 @@ export function updateDocuments(
 
   // Have we specified collation
   try {
-    if (!coll.topology) throw new MongoClientClosedError();
     decorateWithCollation(finalOptions, coll.topology, options);
   } catch (err) {
     return callback(err, null);

src/operations/count.ts

@@ -5,7 +5,6 @@ import type { Document } from '../bson';
 import type { Server } from '../sdam/server';
 import type { Collection } from '../collection';
 import type { Cursor } from '../cursor/cursor';
-import { MongoClientClosedError } from '../error';
 
 /** @public */
 export interface CountOptions extends CommandOperationOptions {
@@ -106,7 +105,6 @@ function buildCountCommand(
     }
     decorateWithCollation(cmd, collectionOrCursor.topology, collectionOrCursor.cmd);
   } else {
-    if (!collectionOrCursor.topology) throw new MongoClientClosedError();
     decorateWithCollation(cmd, collectionOrCursor.topology, options);
   }
 

src/operations/distinct.ts

@@ -4,7 +4,6 @@ import { decorateWithCollation, decorateWithReadConcern, Callback } from '../uti
 import type { Document } from '../bson';
 import type { Server } from '../sdam/server';
 import type { Collection } from '../collection';
-import { MongoClientClosedError } from '../error';
 
 /** @public */
 export type DistinctOptions = CommandOperationOptions;
@@ -56,7 +55,6 @@ export class DistinctOperation extends CommandOperation<DistinctOptions, Documen
 
     // Have we specified collation
     try {
-      if (!coll.topology) throw new MongoClientClosedError();
       decorateWithCollation(cmd, coll.topology, options);
     } catch (err) {
       return callback(err);

src/operations/find_and_modify.ts

@@ -7,7 +7,7 @@ import {
   hasAtomicOperators,
   Callback
 } from '../utils';
-import { MongoClientClosedError, MongoError } from '../error';
+import { MongoError } from '../error';
 import { CommandOperation, CommandOperationOptions } from './command';
 import { defineAspects, Aspect } from './operation';
 import type { Document } from '../bson';
@@ -127,7 +127,6 @@ export class FindAndModifyOperation extends CommandOperation<FindAndModifyOption
 
     // Have we specified collation
     try {
-      if (!coll.topology) throw new MongoClientClosedError();
       decorateWithCollation(cmd, coll.topology, options);
     } catch (err) {
       return callback(err);

src/operations/map_reduce.ts

@@ -12,7 +12,7 @@ import { CommandOperation, CommandOperationOptions } from './command';
 import type { Server } from '../sdam/server';
 import type { Collection } from '../collection';
 import type { Sort } from '../sort';
-import { MongoClientClosedError, MongoError } from '../error';
+import { MongoError } from '../error';
 import type { ObjectId } from '../bson';
 
 const exclusionList = [
@@ -144,7 +144,6 @@ export class MapReduceOperation extends CommandOperation<MapReduceOptions, Docum
 
     // Have we specified collation
     try {
-      if (!coll.topology) throw new MongoClientClosedError();
       decorateWithCollation(mapCommandHash, coll.topology, options);
     } catch (err) {
       return callback(err);

src/utils.ts

@@ -1,7 +1,7 @@
 import * as os from 'os';
 import * as crypto from 'crypto';
 import { PromiseProvider } from './promise_provider';
-import { MongoError, AnyError } from './error';
+import { MongoError, AnyError, MongoClientClosedError } from './error';
 import { WriteConcern, WriteConcernOptions, W, writeConcernKeys } from './write_concern';
 import type { Server } from './sdam/server';
 import type { Topology } from './sdam/topology';
@@ -438,9 +438,13 @@ export function isPromiseLike<T = any>(
  */
 export function decorateWithCollation(
   command: Document,
-  topology: Topology,
+  topology: Topology | undefined,
   options: AnyOptions
 ): void {
+  if (!topology) {
+    throw new MongoClientClosedError();
+  }
+
   const capabilities = topology.capabilities();
   if (options.collation && typeof options.collation === 'object') {
     if (capabilities && capabilities.commandsTakeCollation) {