Skip to content

Commit 15979a8

Browse files
committed
rename Rename BulkWriteError to MongoBulkWriteError
1 parent b1e15a8 commit 15979a8

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

src/bulk/common.ts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,9 @@ function executeCommands(
551551
function resultHandler(err?: AnyError, result?: Document) {
552552
// Error is a driver related error not a bulk op error, return early
553553
if (err && 'message' in err && !(err instanceof MongoWriteConcernError)) {
554-
return callback(new BulkWriteError(err, new BulkWriteResult(bulkOperation.s.bulkResult)));
554+
return callback(
555+
new MongoBulkWriteError(err, new BulkWriteResult(bulkOperation.s.bulkResult))
556+
);
555557
}
556558

557559
if (err instanceof MongoWriteConcernError) {
@@ -651,7 +653,10 @@ function handleMongoWriteConcernError(
651653
);
652654

653655
callback(
654-
new BulkWriteError(new MongoError(wrappedWriteConcernError), new BulkWriteResult(bulkResult))
656+
new MongoBulkWriteError(
657+
new MongoError(wrappedWriteConcernError),
658+
new BulkWriteResult(bulkResult)
659+
)
655660
);
656661
}
657662

@@ -660,15 +665,15 @@ function handleMongoWriteConcernError(
660665
* @public
661666
* @category Error
662667
*/
663-
export class BulkWriteError extends MongoError {
668+
export class MongoBulkWriteError extends MongoError {
664669
result?: BulkWriteResult;
665670

666671
/** Creates a new BulkWriteError */
667672
constructor(error?: AnyError, result?: BulkWriteResult) {
668673
super(error as Error);
669674
Object.assign(this, error);
670675

671-
this.name = 'BulkWriteError';
676+
this.name = 'MongoBulkWriteError';
672677
this.result = result;
673678
}
674679
}
@@ -1214,7 +1219,7 @@ export abstract class BulkOperationBase {
12141219
: 'write operation failed';
12151220

12161221
callback(
1217-
new BulkWriteError(
1222+
new MongoBulkWriteError(
12181223
new MongoError({
12191224
message: msg,
12201225
code: this.s.bulkResult.writeErrors[0].code,
@@ -1229,7 +1234,7 @@ export abstract class BulkOperationBase {
12291234

12301235
const writeConcernError = writeResult.getWriteConcernError();
12311236
if (writeConcernError) {
1232-
callback(new BulkWriteError(new MongoError(writeConcernError), writeResult));
1237+
callback(new MongoBulkWriteError(new MongoError(writeConcernError), writeResult));
12331238
return true;
12341239
}
12351240
}

src/index.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,7 @@ export {
5757
MongoParseError,
5858
MongoWriteConcernError
5959
} from './error';
60-
export {
61-
BulkWriteError as MongoBulkWriteError,
62-
BulkWriteOptions,
63-
AnyBulkWriteOperation
64-
} from './bulk/common';
60+
export { MongoBulkWriteError, BulkWriteOptions, AnyBulkWriteOperation } from './bulk/common';
6561
export {
6662
// Utils
6763
instrument,

test/functional/crud_spec.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const chai = require('chai');
66
const expect = chai.expect;
77
chai.use(require('chai-subset'));
88

9-
const BulkWriteError = require('../../src/bulk/common').BulkWriteError;
9+
const { MongoBulkWriteError } = require('../../src/bulk/common');
1010

1111
const TestRunnerContext = require('./spec-runner').TestRunnerContext;
1212
const gatherTestSuites = require('./spec-runner').gatherTestSuites;
@@ -153,7 +153,7 @@ describe('CRUD spec', function () {
153153
function assertWriteExpectations(collection, outcome) {
154154
return function (result) {
155155
// TODO: when we fix our bulk write errors, get rid of this
156-
if (result instanceof BulkWriteError) {
156+
if (result instanceof MongoBulkWriteError) {
157157
result = transformBulkWriteResult(result.result);
158158
}
159159

0 commit comments

Comments
 (0)