fix overloading of makeAddIdToDocument

as it turns out, `Document` is assignable to `Document[]`, so
overloading is not possible

Author: baileympearson

src/bulk/common.ts

@@ -1,33 +1,33 @@
 import { promisify } from 'util';
 
-import { ObjectId, resolveBSONOptions, type BSONSerializeOptions, type Document } from '../bson';
+import { type BSONSerializeOptions, type Document, resolveBSONOptions } from '../bson';
 import type { Collection } from '../collection';
 import {
-  MONGODB_ERROR_CODES,
+  type AnyError,
   MongoBatchReExecutionError,
+  MONGODB_ERROR_CODES,
   MongoInvalidArgumentError,
   MongoServerError,
-  MongoWriteConcernError,
-  type AnyError
+  MongoWriteConcernError
 } from '../error';
 import type { Filter, OneOrMore, OptionalId, UpdateFilter, WithoutId } from '../mongo_types';
 import type { CollationOptions, CommandOperationOptions } from '../operations/command';
 import { maybeAddIdToDocument } from '../operations/common_functions';
-import { DeleteOperation, makeDeleteStatement, type DeleteStatement } from '../operations/delete';
+import { DeleteOperation, type DeleteStatement, makeDeleteStatement } from '../operations/delete';
 import { executeOperation } from '../operations/execute_operation';
 import { InsertOperation } from '../operations/insert';
 import { AbstractOperation, type Hint } from '../operations/operation';
-import { UpdateOperation, makeUpdateStatement, type UpdateStatement } from '../operations/update';
+import { makeUpdateStatement, UpdateOperation, type UpdateStatement } from '../operations/update';
 import type { Server } from '../sdam/server';
 import type { Topology } from '../sdam/topology';
 import type { ClientSession } from '../sessions';
 import {
   applyRetryableWrites,
+  type Callback,
   getTopology,
   hasAtomicOperators,
-  resolveOptions,
-  type Callback,
-  type MongoDBNamespace
+  type MongoDBNamespace,
+  resolveOptions
 } from '../utils';
 import { WriteConcern } from '../write_concern';
 

src/operations/common_functions.ts

@@ -47,23 +47,15 @@ export function maybeAddIdToDocument(
   coll: Collection,
   docs: Document,
   options: { forceServerObjectId?: boolean }
-): Document;
-export function maybeAddIdToDocument(
+): Document {
+  return maybeAddIdToDocuments(coll, [docs], options)[0];
+}
+
+export function maybeAddIdToDocuments(
   coll: Collection,
   docs: Document[],
   options: { forceServerObjectId?: boolean }
-): Document[];
-/**
- * Adds an _id to a document or each document in an array, if the document doesn't have an _id
- * and forceServerObjectId is false.
- *
- * If a pkFactory has been set, this function creates ids using the pkFactory.
- */
-export function maybeAddIdToDocument(
-  coll: Collection,
-  docs: Document[] | Document,
-  options: { forceServerObjectId?: boolean }
-): Document[] | Document {
+): Document[] {
   const forceServerObjectId =
     typeof options.forceServerObjectId === 'boolean'
       ? options.forceServerObjectId
@@ -74,16 +66,11 @@ export function maybeAddIdToDocument(
     return docs;
   }
 
-  const createId = (doc: Document): Document => {
+  return docs.map((doc: Document): Document => {
     if (doc._id == null) {
       doc._id = coll.s.pkFactory.createPk();
     }
 
     return doc;
-  };
-
-  if (Array.isArray(docs)) {
-    return docs.map(createId);
-  }
-  return createId(docs);
+  });
 }

src/operations/insert.ts

@@ -9,7 +9,7 @@ import type { MongoDBNamespace } from '../utils';
 import { WriteConcern } from '../write_concern';
 import { BulkWriteOperation } from './bulk_write';
 import { CommandOperation, type CommandOperationOptions } from './command';
-import { maybeAddIdToDocument } from './common_functions';
+import { maybeAddIdToDocuments } from './common_functions';
 import { AbstractOperation, Aspect, defineAspects } from './operation';
 
 /** @internal */
@@ -69,7 +69,7 @@ export interface InsertOneResult<TSchema = Document> {
 
 export class InsertOneOperation extends InsertOperation {
   constructor(collection: Collection, doc: Document, options: InsertOneOptions) {
-    super(collection.s.namespace, maybeAddIdToDocument(collection, [doc], options), options);
+    super(collection.s.namespace, maybeAddIdToDocuments(collection, [doc], options), options);
   }
 
   override async execute(
@@ -131,7 +131,9 @@ export class InsertManyOperation extends AbstractOperation<InsertManyResult> {
     const writeConcern = WriteConcern.fromOptions(options);
     const bulkWriteOperation = new BulkWriteOperation(
       coll,
-      maybeAddIdToDocument(coll, this.docs, options).map(document => ({ insertOne: { document } })),
+      maybeAddIdToDocuments(coll, this.docs, options).map(document => ({
+        insertOne: { document }
+      })),
       options
     );
 

test/integration/crud/bulk.test.ts

@@ -3,13 +3,13 @@ import * as crypto from 'crypto';
 
 import {
   type Collection,
+  Double,
   Long,
   MongoBatchReExecutionError,
   MongoBulkWriteError,
   type MongoClient,
   MongoDriverError,
-  MongoInvalidArgumentError,
-  Double
+  MongoInvalidArgumentError
 } from '../../mongodb';
 import { assert as test, ignoreNsNotFound } from '../shared';