move getTopology to topology file

Author: HanaPearlman

src/admin.ts

@@ -11,10 +11,11 @@ import {
 } from './operations/list_databases';
 import { executeOperation } from './operations/execute_operation';
 import { RunCommandOperation, RunCommandOptions } from './operations/run_command';
-import { Callback, getTopology } from './utils';
+import type { Callback } from './utils';
 import type { Document } from './bson';
 import type { CommandOperationOptions } from './operations/command';
 import type { Db } from './db';
+import { getTopology } from './sdam/topology';
 
 /** @internal */
 export interface AdminPrivate {

src/bulk/common.ts

@@ -8,16 +8,15 @@ import {
   hasAtomicOperators,
   Callback,
   MongoDBNamespace,
-  maxWireVersion,
-  getTopology
+  maxWireVersion
 } from '../utils';
 import { executeOperation } from '../operations/execute_operation';
 import { InsertOperation } from '../operations/insert';
 import { UpdateOperation } from '../operations/update';
 import { DeleteOperation } from '../operations/delete';
 import { WriteConcern } from '../write_concern';
 import type { Collection } from '../collection';
-import type { Topology } from '../sdam/topology';
+import { getTopology, Topology } from '../sdam/topology';
 import type { CommandOperationOptions } from '../operations/command';
 import type { CollationOptions } from '../cmap/wire_protocol/write_command';
 import type { Hint } from '../operations/operation';

src/change_stream.ts

@@ -11,12 +11,11 @@ import {
   now,
   maybePromise,
   MongoDBNamespace,
-  Callback,
-  getTopology
+  Callback
 } from './utils';
 import type { ReadPreference } from './read_preference';
 import type { Timestamp, Document } from './bson';
-import type { Topology } from './sdam/topology';
+import { getTopology, Topology } from './sdam/topology';
 import type { OperationParent } from './operations/command';
 import type { CollationOptions } from './cmap/wire_protocol/write_command';
 const kResumeQueue = Symbol('resumeQueue');

src/collection.ts

@@ -1,4 +1,4 @@
-import { emitDeprecatedOptionWarning, getTopology } from './utils';
+import { emitDeprecatedOptionWarning } from './utils';
 import { ReadPreference, ReadPreferenceLike } from './read_preference';
 import { deprecate } from 'util';
 import {
@@ -86,6 +86,7 @@ import type { PkFactory } from './mongo_client';
 import type { Logger, LoggerOptions } from './logger';
 import type { OperationParent } from './operations/command';
 import type { Sort } from './sort';
+import { getTopology } from './sdam/topology';
 
 /** @public */
 export interface Collection {

src/db.ts

@@ -1,5 +1,5 @@
 import { deprecate } from 'util';
-import { emitDeprecatedOptionWarning, Callback, getTopology } from './utils';
+import { emitDeprecatedOptionWarning, Callback } from './utils';
 import { loadAdmin } from './dynamic_loaders';
 import { AggregationCursor, CommandCursor } from './cursor';
 import { ObjectId, Code, Document, BSONSerializeOptions, resolveBSONOptions } from './bson';
@@ -53,7 +53,7 @@ import { executeOperation } from './operations/execute_operation';
 import { EvalOperation, EvalOptions } from './operations/eval';
 import type { IndexInformationOptions } from './operations/common_functions';
 import type { MongoClient, PkFactory } from './mongo_client';
-import type { Topology } from './sdam/topology';
+import { getTopology, Topology } from './sdam/topology';
 import type { OperationParent } from './operations/command';
 import type { Admin } from './admin';
 

src/gridfs-stream/index.ts

@@ -6,7 +6,7 @@ import {
   GridFSBucketReadStreamOptionsWithRevision
 } from './download';
 import { GridFSBucketWriteStream, GridFSBucketWriteStreamOptions, TFileId } from './upload';
-import { executeLegacyOperation, Callback, getTopology } from '../utils';
+import { executeLegacyOperation, Callback } from '../utils';
 import { WriteConcernOptions, WriteConcern } from '../write_concern';
 import type { Document } from '../bson';
 import type { Db } from '../db';
@@ -16,6 +16,7 @@ import type { Cursor } from './../cursor/cursor';
 import type { FindOptions } from './../operations/find';
 import type { Sort } from '../sort';
 import type { Logger } from '../logger';
+import { getTopology } from '../sdam/topology';
 
 const DEFAULT_GRIDFS_BUCKET_OPTIONS: {
   bucketName: string;

src/operations/add_user.ts

@@ -2,10 +2,11 @@ import * as crypto from 'crypto';
 import { Aspect, defineAspects } from './operation';
 import { CommandOperation, CommandOperationOptions } from './command';
 import { MongoClientClosedError, MongoError } from '../error';
-import { Callback, getTopology } from '../utils';
+import type { Callback } from '../utils';
 import type { Document } from '../bson';
 import type { Server } from '../sdam/server';
 import type { Db } from '../db';
+import { getTopology } from '../sdam/topology';
 
 /** @public */
 export interface AddUserOptions extends CommandOperationOptions {

src/operations/common_functions.ts

@@ -1,11 +1,5 @@
 import { MongoError } from '../error';
-import {
-  applyRetryableWrites,
-  applyWriteConcern,
-  decorateWithCollation,
-  Callback,
-  getTopology
-} from '../utils';
+import { applyRetryableWrites, applyWriteConcern, decorateWithCollation, Callback } from '../utils';
 import type { Document } from '../bson';
 import type { Db } from '../db';
 import type { ClientSession } from '../sessions';
@@ -15,6 +9,7 @@ import type { Collection } from '../collection';
 import type { UpdateOptions } from './update';
 import type { WriteCommandOptions } from '../cmap/wire_protocol/write_command';
 import type { DeleteOptions } from './delete';
+import { getTopology } from '../sdam/topology';
 
 /** @internal */
 export interface IndexInformationOptions {

src/operations/count.ts

@@ -1,10 +1,11 @@
 import { Aspect, defineAspects } from './operation';
 import { CommandOperation, CommandOperationOptions } from './command';
-import { decorateWithCollation, decorateWithReadConcern, Callback, getTopology } from '../utils';
+import { decorateWithCollation, decorateWithReadConcern, Callback } from '../utils';
 import type { Document } from '../bson';
 import type { Server } from '../sdam/server';
 import type { Collection } from '../collection';
 import type { Cursor } from '../cursor/cursor';
+import { getTopology } from '../sdam/topology';
 
 /** @public */
 export interface CountOptions extends CommandOperationOptions {

src/operations/distinct.ts

@@ -1,9 +1,10 @@
 import { Aspect, defineAspects } from './operation';
 import { CommandOperation, CommandOperationOptions } from './command';
-import { decorateWithCollation, decorateWithReadConcern, Callback, getTopology } from '../utils';
+import { decorateWithCollation, decorateWithReadConcern, Callback } from '../utils';
 import type { Document } from '../bson';
 import type { Server } from '../sdam/server';
 import type { Collection } from '../collection';
+import { getTopology } from '../sdam/topology';
 
 /** @public */
 export type DistinctOptions = CommandOperationOptions;

src/operations/find_and_modify.ts

@@ -5,8 +5,7 @@ import {
   decorateWithCollation,
   applyWriteConcern,
   hasAtomicOperators,
-  Callback,
-  getTopology
+  Callback
 } from '../utils';
 import { MongoError } from '../error';
 import { CommandOperation, CommandOperationOptions } from './command';
@@ -15,6 +14,7 @@ import type { Document } from '../bson';
 import type { Server } from '../sdam/server';
 import type { Collection } from '../collection';
 import { Sort, formatSort } from '../sort';
+import { getTopology } from '../sdam/topology';
 
 /** @public */
 export interface FindAndModifyOptions extends CommandOperationOptions {

src/operations/map_reduce.ts

@@ -5,8 +5,7 @@ import {
   decorateWithCollation,
   decorateWithReadConcern,
   isObject,
-  Callback,
-  getTopology
+  Callback
 } from '../utils';
 import { ReadPreference, ReadPreferenceMode } from '../read_preference';
 import { CommandOperation, CommandOperationOptions } from './command';
@@ -15,6 +14,7 @@ import type { Collection } from '../collection';
 import type { Sort } from '../sort';
 import { MongoError } from '../error';
 import type { ObjectId } from '../bson';
+import { getTopology } from '../sdam/topology';
 
 const exclusionList = [
   'readPreference',

src/sdam/topology.ts

@@ -57,6 +57,7 @@ import { DestroyOptions, Connection } from '../cmap/connection';
 import { RunCommandOperation } from '../operations/run_command';
 import type { CursorOptions } from '../cursor/cursor';
 import type { MongoClientOptions } from '../mongo_client';
+import { Db, Collection, MongoClient } from '..';
 
 // Global state
 let globalTopologyCounter = 0;
@@ -1053,3 +1054,9 @@ export class ServerCapabilities {
     return this.maxWireVersion >= 5;
   }
 }
+
+export function getTopology(provider: MongoClient | Db | Collection): Topology | undefined {
+  if (provider instanceof MongoClient) return provider.topology;
+  if (provider instanceof Db) return provider.s.client.topology;
+  if (provider instanceof Collection) return provider.s.db.s.client.topology;
+}

src/utils.ts

@@ -16,8 +16,6 @@ import { readFileSync } from 'fs';
 import { resolve } from 'path';
 import type { Document } from './bson';
 import type { IndexSpecification, IndexDirection } from './operations/indexes';
-import type { MongoClient } from './mongo_client';
-import { loadCollection, loadDb, loadMongoClient } from './dynamic_loaders';
 
 /** @public MongoDB Driver style callback */
 export type Callback<T = any> = (error?: AnyError, result?: T) => void;
@@ -712,16 +710,6 @@ export function maxWireVersion(topologyOrServer?: Connection | Topology | Server
   return 0;
 }
 
-export function getTopology(provider: MongoClient | Db | Collection): Topology | undefined {
-  const Collection = loadCollection();
-  const Db = loadDb();
-  const MongoClient = loadMongoClient();
-
-  if (provider instanceof MongoClient) return provider.topology;
-  if (provider instanceof Db) return provider.s.client.topology;
-  if (provider instanceof Collection) return provider.s.db.s.client.topology;
-}
-
 /**
  * Checks that collation is supported by server.
  * @internal