Revert "insertone"

This reverts commit df24c85.

Author: baileympearson

src/collection.ts

@@ -16,12 +16,7 @@ import {
   type ListSearchIndexesOptions
 } from './cursor/list_search_indexes_cursor';
 import type { Db } from './db';
-import {
-  MongoAPIError,
-  MongoInvalidArgumentError,
-  MongoOperationTimeoutError,
-  MongoServerError
-} from './error';
+import { MongoAPIError, MongoInvalidArgumentError, MongoOperationTimeoutError } from './error';
 import type { MongoClient, PkFactory } from './mongo_client';
 import type {
   Abortable,
@@ -71,9 +66,9 @@ import {
 } from './operations/indexes';
 import {
   type InsertManyResult,
+  InsertOneOperation,
   type InsertOneOptions,
-  type InsertOneResult,
-  InsertOperation
+  type InsertOneResult
 } from './operations/insert';
 import type { Hint, OperationOptions } from './operations/operation';
 import { RenameOperation, type RenameOptions } from './operations/rename';
@@ -96,7 +91,6 @@ import { ReadPreference, type ReadPreferenceLike } from './read_preference';
 import { type Sort } from './sort';
 import {
   DEFAULT_PK_FACTORY,
-  maybeAddIdToDocuments,
   MongoDBCollectionNamespace,
   normalizeHintField,
   resolveOptions
@@ -290,27 +284,14 @@ export class Collection<TSchema extends Document = Document> {
     doc: OptionalUnlessRequiredId<TSchema>,
     options?: InsertOneOptions
   ): Promise<InsertOneResult<TSchema>> {
-    options = resolveOptions(this, options);
-
-    const operation = new InsertOperation(
-      this.fullNamespace,
-      [maybeAddIdToDocuments(this, doc, options)],
-      options
+    return await executeOperation(
+      this.client,
+      new InsertOneOperation(
+        this as TODO_NODE_3286,
+        doc,
+        resolveOptions(this, options)
+      ) as TODO_NODE_3286
     );
-
-    const acknowledged = operation.writeConcern?.w !== 0;
-
-    const response = await executeOperation(this.client, operation);
-    if (response.code) throw new MongoServerError(response);
-    if (response.writeErrors) {
-      // This should be a WriteError but we can't change it now because of error hierarchy
-      throw new MongoServerError(response.writeErrors[0]);
-    }
-
-    return {
-      acknowledged,
-      insertedId: doc._id
-    };
   }
 
   /**

src/operations/insert.ts

@@ -2,21 +2,17 @@ import { type Connection } from '..';
 import type { Document } from '../bson';
 import type { BulkWriteOptions } from '../bulk/common';
 import { MongoDBResponse } from '../cmap/wire_protocol/responses';
+import type { Collection } from '../collection';
+import { MongoServerError } from '../error';
 import type { InferIdType } from '../mongo_types';
+import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
-import { type MongoDBNamespace } from '../utils';
+import { type TimeoutContext } from '../timeout';
+import { maybeAddIdToDocuments, type MongoDBNamespace } from '../utils';
 import { type CommandOperationOptions, ModernizedCommandOperation } from './command';
 import { Aspect, defineAspects } from './operation';
-
 /** @internal */
-export interface InsertResult {
-  n: number;
-  code?: number;
-  writeErrors?: Document[];
-}
-
-/** @internal */
-export class InsertOperation extends ModernizedCommandOperation<InsertResult> {
+export class InsertOperation extends ModernizedCommandOperation<Document> {
   override SERVER_COMMAND_RESPONSE_TYPE = MongoDBResponse;
   override options: BulkWriteOptions;
 
@@ -72,6 +68,44 @@ export interface InsertOneResult<TSchema = Document> {
   insertedId: InferIdType<TSchema>;
 }
 
+export class InsertOneOperation extends InsertOperation {
+  constructor(collection: Collection, doc: Document, options: InsertOneOptions) {
+    super(collection.s.namespace, [maybeAddIdToDocuments(collection, doc, options)], options);
+  }
+
+  override async execute(
+    server: Server,
+    session: ClientSession | undefined,
+    timeoutContext: TimeoutContext
+  ): Promise<InsertOneResult> {
+    const res = await super.execute(server, session, timeoutContext);
+    if (res.code) throw new MongoServerError(res);
+    if (res.writeErrors) {
+      // This should be a WriteError but we can't change it now because of error hierarchy
+      throw new MongoServerError(res.writeErrors[0]);
+    }
+
+    return {
+      acknowledged: this.writeConcern?.w !== 0,
+      insertedId: this.documents[0]._id
+    };
+  }
+
+  override handleOk(response: InstanceType<typeof this.SERVER_COMMAND_RESPONSE_TYPE>): Document {
+    const res = super.handleOk(response);
+    if (res.code) throw new MongoServerError(res);
+    if (res.writeErrors) {
+      // This should be a WriteError but we can't change it now because of error hierarchy
+      throw new MongoServerError(res.writeErrors[0]);
+    }
+
+    return {
+      acknowledged: this.writeConcern?.w !== 0,
+      insertedId: this.documents[0]._id
+    };
+  }
+}
+
 /** @public */
 export interface InsertManyResult<TSchema = Document> {
   /** Indicates whether this write result was acknowledged. If not, then all other members of this result will be undefined */
@@ -83,3 +117,4 @@ export interface InsertManyResult<TSchema = Document> {
 }
 
 defineAspects(InsertOperation, [Aspect.RETRYABLE, Aspect.WRITE_OPERATION]);
+defineAspects(InsertOneOperation, [Aspect.RETRYABLE, Aspect.WRITE_OPERATION]);

src/utils.ts

@@ -1356,8 +1356,8 @@ export async function once<T>(ee: EventEmitter, name: string, options?: Abortabl
   }
 }
 
-export function maybeAddIdToDocuments<TSchema extends Document>(
-  collection: Collection<TSchema>,
+export function maybeAddIdToDocuments(
+  collection: Collection,
   document: Document,
   options: { forceServerObjectId?: boolean }
 ): Document {

test/integration/crud/abstract_operation.test.ts

@@ -145,6 +145,11 @@ describe('abstract operation', function () {
         subclassType: mongodb.InsertOperation,
         correctCommandName: 'insert'
       },
+      {
+        subclassCreator: () => new mongodb.InsertOneOperation(collection, { a: 1 }, {}),
+        subclassType: mongodb.InsertOneOperation,
+        correctCommandName: 'insert'
+      },
       {
         subclassCreator: () =>
           new mongodb.KillCursorsOperation(