smaller diff

Author: aditi-khare-mongoDB

src/error.ts

@@ -1158,30 +1158,14 @@ export class MongoServerSelectionError extends MongoSystemError {
   }
 }
 
-/**
- * The type of the result property of MongoWriteConcernError
- * @public
- */
-export interface WriteConcernErrorResult {
-  writeConcernError: {
-    code: number;
-    errmsg: string;
-    codeName?: string;
-    errInfo?: Document;
-  };
-  ok: 0 | 1;
-  code?: number;
-  [x: string | number]: unknown;
-}
-
 /**
  * An error thrown when the server reports a writeConcernError
  * @public
  * @category Error
  */
 export class MongoWriteConcernError extends MongoServerError {
   /** The result document */
-  result: WriteConcernErrorResult;
+  result: Document;
 
   /**
    * **Do not use this constructor!**
@@ -1194,9 +1178,18 @@ export class MongoWriteConcernError extends MongoServerError {
    *
    * @public
    **/
-  constructor(result: WriteConcernErrorResult) {
-    super(result);
-    this.errInfo = result.writeConcernError?.errInfo;
+  constructor(result: {
+    writeConcernError: {
+      code: number;
+      errmsg: string;
+      codeName?: string;
+      errInfo?: Document;
+    };
+    errorLabels?: string[];
+    code?: number;
+  }) {
+    super({ ...result, ...result.writeConcernError });
+    this.errInfo = result.writeConcernError.errInfo;
     this.result = result;
     this.code = result.code ? result.code : undefined;
   }

test/unit/error.test.ts

@@ -30,8 +30,7 @@ import {
   setDifference,
   type TopologyDescription,
   type TopologyOptions,
-  WaitQueueTimeoutError as MongoWaitQueueTimeoutError,
-  WriteConcernErrorResult
+  WaitQueueTimeoutError as MongoWaitQueueTimeoutError
 } from '../mongodb';
 import { ReplSetFixture } from '../tools/common';
 import { cleanup } from '../tools/mongodb-mock/index';
@@ -745,7 +744,7 @@ describe('MongoErrors', () => {
   describe('MongoWriteConcernError constructor', function () {
     context('when no top-level code is provided and writeConcernError.code exists', function () {
       it('error.code remains undefined', function () {
-        const res: WriteConcernErrorResult = {
+        const res = {
           writeConcernError: {
             code: 81, // nested code
             errmsg: 'fake msg'
@@ -758,7 +757,7 @@ describe('MongoErrors', () => {
     context('when top-level code is provided and  writeConcernError.code exists', function () {
       it('error.code equals the top-level code', function () {
         const topLevelCode = 10;
-        const res: WriteConcernErrorResult = {
+        const res = {
           writeConcernError: {
             code: 81, // nested code
             errmsg: 'fake msg'

test/unit/mongo_client.test.ts

@@ -737,7 +737,7 @@ describe('MongoClient', function () {
     expect(error).to.have.property('code', 'EBADNAME');
   });
 
-  it.only('srvServiceName should not error if it is greater than 15 characters as long as the DNS query limit is not surpassed', async () => {
+  it('srvServiceName should not error if it is greater than 15 characters as long as the DNS query limit is not surpassed', async () => {
     const options = parseOptions('mongodb+srv://localhost.a.com', {
       srvServiceName: 'a'.repeat(16)
     });