fixup: use WithoutId instead of OptionalId

Author: tusbar

src/bulk/common.ts

@@ -33,7 +33,7 @@ import type { Collection } from '../collection';
 import type { Topology } from '../sdam/topology';
 import type { CommandOperationOptions, CollationOptions } from '../operations/command';
 import type { Hint } from '../operations/operation';
-import type { Filter, OneOrMore, OptionalId, UpdateFilter } from '../mongo_types';
+import type { Filter, OneOrMore, WithoutId, OptionalId, UpdateFilter } from '../mongo_types';
 
 /** @internal */
 const kServerError = Symbol('serverError');
@@ -79,7 +79,7 @@ export interface ReplaceOneModel<TSchema extends Document = Document> {
   /** The filter to limit the replaced document. */
   filter: Filter<TSchema>;
   /** The document with which to replace the matched document. */
-  replacement: OptionalId<TSchema>;
+  replacement: WithoutId<TSchema>;
   /** Specifies a collation. */
   collation?: CollationOptions;
   /** The index to use. If specified, then the query system will only consider plans using the hinted index. */

src/collection.ts

@@ -93,6 +93,7 @@ import type {
   TODO_NODE_3286,
   UpdateFilter,
   WithId,
+  WithoutId,
   OptionalId,
   Flatten
 } from './mongo_types';
@@ -461,27 +462,27 @@ export class Collection<TSchema extends Document = Document> {
    */
   replaceOne(
     filter: Filter<TSchema>,
-    replacement: OptionalId<TSchema>
+    replacement: WithoutId<TSchema>
   ): Promise<UpdateResult | Document>;
   replaceOne(
     filter: Filter<TSchema>,
-    replacement: OptionalId<TSchema>,
+    replacement: WithoutId<TSchema>,
     callback: Callback<UpdateResult | Document>
   ): void;
   replaceOne(
     filter: Filter<TSchema>,
-    replacement: OptionalId<TSchema>,
+    replacement: WithoutId<TSchema>,
     options: ReplaceOptions
   ): Promise<UpdateResult | Document>;
   replaceOne(
     filter: Filter<TSchema>,
-    replacement: OptionalId<TSchema>,
+    replacement: WithoutId<TSchema>,
     options: ReplaceOptions,
     callback: Callback<UpdateResult | Document>
   ): void;
   replaceOne(
     filter: Filter<TSchema>,
-    replacement: OptionalId<TSchema>,
+    replacement: WithoutId<TSchema>,
     options?: ReplaceOptions | Callback<UpdateResult | Document>,
     callback?: Callback<UpdateResult | Document>
   ): Promise<UpdateResult | Document> | void {
@@ -1282,26 +1283,29 @@ export class Collection<TSchema extends Document = Document> {
    * @param options - Optional settings for the command
    * @param callback - An optional callback, a Promise will be returned if none is provided
    */
-  findOneAndReplace(filter: Filter<TSchema>, replacement: Document): Promise<ModifyResult<TSchema>>;
   findOneAndReplace(
     filter: Filter<TSchema>,
-    replacement: Document,
+    replacement: WithoutId<TSchema>
+  ): Promise<ModifyResult<TSchema>>;
+  findOneAndReplace(
+    filter: Filter<TSchema>,
+    replacement: WithoutId<TSchema>,
     callback: Callback<ModifyResult<TSchema>>
   ): void;
   findOneAndReplace(
     filter: Filter<TSchema>,
-    replacement: Document,
+    replacement: WithoutId<TSchema>,
     options: FindOneAndReplaceOptions
   ): Promise<ModifyResult<TSchema>>;
   findOneAndReplace(
     filter: Filter<TSchema>,
-    replacement: Document,
+    replacement: WithoutId<TSchema>,
     options: FindOneAndReplaceOptions,
     callback: Callback<ModifyResult<TSchema>>
   ): void;
   findOneAndReplace(
     filter: Filter<TSchema>,
-    replacement: Document,
+    replacement: WithoutId<TSchema>,
     options?: FindOneAndReplaceOptions | Callback<ModifyResult<TSchema>>,
     callback?: Callback<ModifyResult<TSchema>>
   ): Promise<ModifyResult<TSchema>> | void {

test/types/community/collection/bulkWrite.test-d.ts

@@ -181,7 +181,7 @@ collectionType.bulkWrite([
     }
   }
 ]);
-// allow a replacement doc without an _id
+// allow a literal replacement doc without an _id
 collectionType.bulkWrite([
   {
     replaceOne: {
@@ -199,6 +199,20 @@ collectionType.bulkWrite([
     }
   }
 ]);
+// disallow a literal replacement doc with an _id
+expectError(
+  collectionType.bulkWrite([
+    {
+      replaceOne: {
+        filter: {},
+        replacement: {
+          _id: new ObjectId()
+        },
+        upsert: true
+      }
+    }
+  ])
+);
 
 expectError(
   collectionType.bulkWrite([

test/types/community/collection/replaceX.test-d.ts

@@ -12,11 +12,8 @@ interface TestModel {
 
 const collection = db.collection<TestModel>('testCollection');
 
-// should accept a replacement doc with an _id
-await collection.replaceOne({}, { _id: new ObjectId(), stringField: 'a' });
-
 // should accept a replacement doc without an _id
 await collection.replaceOne({}, { stringField: 'b' });
 
-// should not allow _id with a non-ObjectId type
-expectError(await collection.replaceOne({}, { _id: 1, stringField: 'c' }));
+// should not accept a literal replacement doc with an _id
+expectError(await collection.replaceOne({}, { _id: new ObjectId(), stringField: 'a' }));