feat: Upgrade mongodb to v6.0.0 (#569)

BREAKING CHANGE: `mongodb` minimum version is now v6.* BREAKING CHANGE: `node` minimum version is now v16.20.1
plexinc · Sep 5, 2023 · a95bfb4 · a95bfb4
1 parent 9462ac6
commit a95bfb4
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 56 deletions.
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
  ],
  "license": "MIT",
  "engines": {
- "node": ">=16.0.0"
+ "node": ">=16.20.1"
  },
  "type": "module",
  "types": "./esm/index.d.ts",
@@ -77,7 +77,7 @@
  "jsdoc-api": "8.0.0",
  "jsdoc-parse": "6.2.0",
  "lint-staged": "14.0.0",
- "mongodb": "5.8.0",
+ "mongodb": "6.0.0",
  "mongodb-memory-server": "8.15.1",
  "mongoose": "6.3.5",
  "pinst": "3.0.0",
@@ -88,7 +88,7 @@
  "typescript": "5.2.2"
  },
  "peerDependencies": {
- "mongodb": "^5.0.0"
+ "mongodb": "^6.0.0"
  },
  "commitlint": {
  "extends": [

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/__tests__/model.test.ts b/src/__tests__/model.test.ts
@@ -150,15 +150,9 @@ describe('model', () => {
  // @ts-expect-error Ignore mock function
  findOne: jest.fn().mockResolvedValue(doc),
  // @ts-expect-error Ignore mock function
- findOneAndDelete: jest.fn().mockResolvedValue({
- ok: 1,
- value: doc,
- }),
+ findOneAndDelete: jest.fn().mockResolvedValue(doc),
  // @ts-expect-error Ignore mock function
- findOneAndUpdate: jest.fn().mockResolvedValue({
- ok: 1,
- value: doc,
- }),
+ findOneAndUpdate: jest.fn().mockResolvedValue(doc),
  // @ts-expect-error Ignore mock function
  insertMany: jest.fn().mockResolvedValue({
  acknowledged: true,
@@ -1235,11 +1229,9 @@ describe('model', () => {
  });
 
  test('throws error on failure', async () => {
- (collection.findOneAndDelete as jest.Mocked<Collection['findOneAndDelete']>)
- // @ts-expect-error Ignore mock value
- .mockResolvedValue({
- ok: 0,
- });
+ (
+ collection.findOneAndDelete as jest.Mocked<Collection['findOneAndDelete']>
+ ).mockRejectedValueOnce(new Error('findOneAndDelete failed'));
 
  await expect(simpleModel.findOneAndDelete({ foo: 'bar' })).rejects.toThrow(
  'findOneAndDelete failed'
@@ -1288,9 +1280,9 @@ describe('model', () => {
  });
 
  test('throws error on failure', async () => {
- (collection.findOneAndUpdate as jest.Mocked<Collection['findOneAndUpdate']>)
- // @ts-expect-error Ignore mock value
-  .mockResolvedValue({ ok: 0 });
+ (
+ collection.findOneAndUpdate as jest.Mocked<Collection['findOneAndUpdate']>
+ ).mockRejectedValueOnce(new Error('findOneAndUpdate failed'));
 
  await expect(
  simpleModel.findOneAndUpdate({ foo: 'bar' }, { $set: { bar: 123 } })
@@ -2515,9 +2507,9 @@ describe('model', () => {
  });
 
  test('throws error on failure', async () => {
- (collection.findOneAndUpdate as jest.Mocked<Collection['findOneAndUpdate']>)
- // @ts-expect-error Ignore mock function
-  .mockResolvedValue({ ok: false });
+ (
+ collection.findOneAndUpdate as jest.Mocked<Collection['findOneAndUpdate']>
+ ).mockRejectedValueOnce(new Error('findOneAndUpdate failed'));
 
  await expect(simpleModel.upsert({ foo: 'foo' }, { $set: { bar: 123 } })).rejects.toThrow(
  'findOneAndUpdate failed'

diff --git a/src/__tests__/mongodbTypes.test.ts b/src/__tests__/mongodbTypes.test.ts
@@ -95,7 +95,7 @@ describe('mongodb types', () => {
  });
 
  // all BSON types can be used as query values
- expectType<PaprFilter<TestDocument>>({ binary: new Binary('', 2) });
+ expectType<PaprFilter<TestDocument>>({ binary: new Binary([], 2) });
  expectType<PaprFilter<TestDocument>>({ bsonSymbol: new BSONSymbol('hi') });
  expectType<PaprFilter<TestDocument>>({ code: new Code(() => true) });
  expectType<PaprFilter<TestDocument>>({ double: new Double(123.45) });
@@ -509,7 +509,7 @@ describe('mongodb types', () => {
  });
 
  // all BSON types can be used as update values
- expectType<PaprUpdateFilter<TestDocument>>({ $set: { binary: new Binary('', 2) } });
+ expectType<PaprUpdateFilter<TestDocument>>({ $set: { binary: new Binary([], 2) } });
  expectType<PaprUpdateFilter<TestDocument>>({
  $set: { bsonSymbol: new BSONSymbol('hi') },
  });

diff --git a/src/model.ts b/src/model.ts
@@ -779,11 +779,7 @@ export function build<TSchema extends BaseSchema, TOptions extends SchemaOptions
  } as FindOneAndDeleteOptions
  );
 
- if (result.ok === 1) {
- return result.value as ProjectionType<TSchema, TProjection>;
- }
-
- throw new Error('findOneAndDelete failed');
+ return result as ProjectionType<TSchema, TProjection>;
  });
 
  /**
@@ -848,11 +844,7 @@ export function build<TSchema extends BaseSchema, TOptions extends SchemaOptions
  } as FindOneAndUpdateOptions
  );
 
- if (result.ok === 1) {
- return result.value as ProjectionType<TSchema, TProjection>;
- }
-
- throw new Error('findOneAndUpdate failed');
+ return result as ProjectionType<TSchema, TProjection>;
  });
 
  /**

diff --git a/tests/cjs/package.json b/tests/cjs/package.json
@@ -2,6 +2,6 @@
  "type": "commonjs",
  "dependencies": {
  "papr": "file:../../build/package",
- "mongodb": "5.1.0"
+ "mongodb": "6.0.0"
  }
 }
diff --git a/tests/esm/package.json b/tests/esm/package.json
@@ -2,6 +2,6 @@
  "type": "module",
  "dependencies": {
  "papr": "file:../../build/package",
- "mongodb": "5.1.0"
+ "mongodb": "6.0.0"
  }
 }
diff --git a/tests/ts-nodenext/package.json b/tests/ts-nodenext/package.json
@@ -2,7 +2,7 @@
  "type": "module",
  "dependencies": {
  "papr": "file:../../build/package",
- "mongodb": "5.1.0",
+ "mongodb": "6.0.0",
  "ts-expect": "1.3.0",
  "typescript": "5.0.4"
  }

diff --git a/tests/ts/package.json b/tests/ts/package.json
@@ -2,7 +2,7 @@
  "type": "module",
  "dependencies": {
  "papr": "file:../../build/package",
- "mongodb": "5.1.0",
+ "mongodb": "6.0.0",
  "ts-expect": "1.3.0",
  "typescript": "5.0.4"
  }