fix bug

Author: aditi-khare-mongoDB

src/operations/update.ts

@@ -4,22 +4,11 @@ import { MongoAPIError, MongoCompatibilityError, MongoInvalidArgumentError, Mong
 import type { InferIdType, TODO_NODE_3286 } from '../mongo_types';
 import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
+import { formatSort, SortForCmd } from '../sort';
 import { hasAtomicOperators, type MongoDBNamespace } from '../utils';
 import { type CollationOptions, CommandOperation, type CommandOperationOptions } from './command';
 import { Aspect, defineAspects, type Hint } from './operation';
 
-
-/** @public */
-export interface UpdateOneOptions extends UpdateOptions {
-  /**
-   * Specify which document the operation updates if the query matches multiple
-   * documents. The first document matched by the sort order will be updated.
-   *
-   * This option is only supported by servers >= 8.0. Older servers will report an error for using this option.
-  */
-  sort?: Document;
-}
-
 /** @public */
 export interface UpdateOptions extends CommandOperationOptions {
   /** A set of filters specifying to which array elements an update should apply */
@@ -34,6 +23,15 @@ export interface UpdateOptions extends CommandOperationOptions {
   upsert?: boolean;
   /** Map of parameter names and values that can be accessed using $$var (requires MongoDB 5.0). */
   let?: Document;
+  /**
+   * Specify which document the operation updates if the query matches multiple
+   * documents. The first document matched by the sort order will be updated.
+   *
+   * The server will report an error if the caller explicitly provides a value with updateMany().
+   * 
+   * This option is only supported by servers >= 8.0. Older servers will report an error for using this option.
+  */
+  sort?: Document;
 }
 
 /**
@@ -53,12 +51,6 @@ export interface UpdateResult<TSchema extends Document = Document> {
   upsertedId: InferIdType<TSchema> | null;
 }
 
-/** @public */
-export interface UpdateOneStatement extends UpdateStatement {
-  /** If the query matches multiple documents, the first document matched by the sort order will be updated. */
-  sort?: Document;
-}
-
 /** @public */
 export interface UpdateStatement {
   /** The query that matches documents to update. */
@@ -75,6 +67,8 @@ export interface UpdateStatement {
   arrayFilters?: Document[];
   /** A document or string that specifies the index to use to support the query predicate. */
   hint?: Hint;
+  /** If the query matches multiple documents, the first document matched by the sort order will be updated. */
+  sort?: SortForCmd;
 }
 
 /**
@@ -147,7 +141,7 @@ export class UpdateOperation extends CommandOperation<Document> {
 
 /** @internal */
 export class UpdateOneOperation extends UpdateOperation {
-  constructor(collection: Collection, filter: Document, update: Document, options: UpdateOneOptions) {
+  constructor(collection: Collection, filter: Document, update: Document, options: UpdateOptions) {
     super(
       collection.s.namespace,
       [makeUpdateStatement(filter, update, { ...options, multi: false })],
@@ -213,17 +207,6 @@ export class UpdateManyOperation extends UpdateOperation {
   }
 }
 
-/** @public */
-export interface ReplaceOneOptions extends ReplaceOptions {
-  /** 
-   * Specify which document the operation replaces if the query matches multiple
-   * documents. The first document matched by the sort order will be replaced.
-   * 
-   * This option is only supported by servers >= 8.0. Older servers will report an error for using this option.
-  */
-  sort?: Document;
-}
-
 /** @public */
 export interface ReplaceOptions extends CommandOperationOptions {
   /** If true, allows the write to opt-out of document level validation */
@@ -236,6 +219,15 @@ export interface ReplaceOptions extends CommandOperationOptions {
   upsert?: boolean;
   /** Map of parameter names and values that can be accessed using $$var (requires MongoDB 5.0). */
   let?: Document;
+  /** 
+   * Specify which document the operation replaces if the query matches multiple
+   * documents. The first document matched by the sort order will be replaced.
+   * 
+   * The server will report an error if the caller explicitly provides a value with replaceMany().
+   * 
+   * This option is only supported by servers >= 8.0. Older servers will report an error for using this option.
+  */
+  sort?: Document;
 }
 
 /** @internal */
@@ -244,7 +236,7 @@ export class ReplaceOneOperation extends UpdateOperation {
     collection: Collection,
     filter: Document,
     replacement: Document,
-    options: ReplaceOneOptions
+    options: ReplaceOptions
   ) {
     super(
       collection.s.namespace,
@@ -280,8 +272,8 @@ export class ReplaceOneOperation extends UpdateOperation {
 export function makeUpdateStatement(
   filter: Document,
   update: Document | Document[],
-  options: UpdateOneOptions & { multi?: boolean }
-): UpdateOneStatement {
+  options: UpdateOptions & { multi?: boolean }
+): UpdateStatement {
   if (filter == null || typeof filter !== 'object') {
     throw new MongoInvalidArgumentError('Selector must be a valid JavaScript object');
   }
@@ -297,8 +289,10 @@ export function makeUpdateStatement(
 
   if (options.multi) {
     op.multi = options.multi;
-  } else {
-    op.sort = options?.sort;
+  } 
+
+  if (options.sort) {
+    op.sort = formatSort(options?.sort);
   }
 
   if (options.hint) {

test/integration/crud/crud.spec.test.ts

@@ -55,13 +55,17 @@ const loadBalancedCollationTests = [
   'Distinct with a collation'
 ];
 
-describe.only('CRUD unified', function () {
+describe('CRUD unified', function () {
   runUnifiedSuite(
     loadSpecTests(path.join('crud', 'unified')),
     ({ description }, { isLoadBalanced }) => {
-      return description === 'BulkWrite replaceOne with sort option unsupported (server-side error)'
-      ? false
-      : 'skipping you';
+      return description.match(clientBulkWriteTests)
+        ? 'TODO(NODE-6257): implement client level bulk write'
+        : unacknowledgedHintTests.includes(description)
+          ? `TODO(NODE-3541)`
+          : isLoadBalanced && loadBalancedCollationTests.includes(description)
+            ? `TODO(NODE-6280): fix collation for find and modify commands on load balanced mode`
+            : false;
     }
   );
 });