fix: calculate object size and test for error case

src/extended_json.ts

@@ -1,7 +1,13 @@
 import { Binary } from './binary';
 import type { Document } from './bson';
 import { Code } from './code';
-import { BSON_INT32_MAX, BSON_INT32_MIN, BSON_INT64_MAX, BSON_INT64_MIN } from './constants';
+import {
+  BSON_INT32_MAX,
+  BSON_INT32_MIN,
+  BSON_INT64_MAX,
+  BSON_INT64_MIN,
+  BSON_MAJOR_VERSION
+} from './constants';
 import { DBRef, isDBRefLike } from './db_ref';
 import { Decimal128 } from './decimal128';
 import { Double } from './double';
@@ -310,7 +316,7 @@ function serializeDocument(doc: any, options: EJSONSerializeOptions) {
     doc != null &&
     typeof doc === 'object' &&
     typeof doc._bsontype === 'string' &&
-    doc[Symbol.for('@@mdb.bson.version')] == null
+    doc[Symbol.for('@@mdb.bson.version')] !== BSON_MAJOR_VERSION
   ) {
     throw new BSONError('Unsupported BSON version, bson types must be from bson 5.0 or later');
   } else if (isBSONType(doc)) {

src/parser/calculate_size.ts

@@ -1,5 +1,6 @@
 import { Binary } from '../binary';
 import type { Document } from '../bson';
+import { BSONError } from '../error';
 import * as constants from '../constants';
 import { ByteUtils } from '../utils/byte_utils';
 import { isAnyArrayBuffer, isDate, isRegExp } from './utils';
@@ -77,7 +78,17 @@ function calculateElement(
     case 'boolean':
       return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (1 + 1);
     case 'object':
-      if (value == null || value['_bsontype'] === 'MinKey' || value['_bsontype'] === 'MaxKey') {
+      if (
+        value != null &&
+        typeof value._bsontype === 'string' &&
+        value[Symbol.for('@@mdb.bson.version')] !== constants.BSON_MAJOR_VERSION
+      ) {
+        throw new BSONError('Unsupported BSON version, bson types must be from bson 5.0 or later');
+      } else if (
+        value == null ||
+        value['_bsontype'] === 'MinKey' ||
+        value['_bsontype'] === 'MaxKey'
+      ) {
         return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + 1;
       } else if (value['_bsontype'] === 'ObjectId') {
         return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (12 + 1);

src/parser/serializer.ts

@@ -706,7 +706,10 @@ export function serializeInto(
           ignoreUndefined,
           path
         );
-      } else if (typeof value === 'object' && value[Symbol.for('@@mdb.bson.version')] == null) {
+      } else if (
+        typeof value === 'object' &&
+        value[Symbol.for('@@mdb.bson.version')] !== constants.BSON_MAJOR_VERSION
+      ) {
         throw new BSONError('Unsupported BSON version, bson types must be from bson 5.0 or later');
       } else if (value._bsontype === 'ObjectId') {
         index = serializeObjectId(buffer, key, value, index);
@@ -809,7 +812,10 @@ export function serializeInto(
           ignoreUndefined,
           path
         );
-      } else if (typeof value === 'object' && value[Symbol.for('@@mdb.bson.version')] == null) {
+      } else if (
+        typeof value === 'object' &&
+        value[Symbol.for('@@mdb.bson.version')] !== constants.BSON_MAJOR_VERSION
+      ) {
         throw new BSONError('Unsupported BSON version, bson types must be from bson 5.0 or later');
       } else if (value._bsontype === 'ObjectId') {
         index = serializeObjectId(buffer, key, value, index);
@@ -916,7 +922,10 @@ export function serializeInto(
           ignoreUndefined,
           path
         );
-      } else if (typeof value === 'object' && value[Symbol.for('@@mdb.bson.version')] == null) {
+      } else if (
+        typeof value === 'object' &&
+        value[Symbol.for('@@mdb.bson.version')] !== constants.BSON_MAJOR_VERSION
+      ) {
         throw new BSONError('Unsupported BSON version, bson types must be from bson 5.0 or later');
       } else if (value._bsontype === 'ObjectId') {
         index = serializeObjectId(buffer, key, value, index);

test/node/extended_json.test.ts

@@ -550,4 +550,12 @@ describe('Extended JSON', function () {
     const result = JSON.parse(string);
     expect(result).to.deep.equal({ a: 1 });
   });
+
+  it(`throws if Symbol.for('@@mdb.bson.version') is the wrong version in EJSON.stringify`, () => {
+    expect(() =>
+      EJSON.stringify({
+        a: { _bsontype: 'Int32', value: 2, [Symbol.for('@@mdb.bson.version')]: 1 }
+      })
+    ).to.throw(BSONError, /Unsupported BSON version/i);
+  });
 });

test/node/parser/calculate_size.test.ts

@@ -1,10 +1,19 @@
 import * as BSON from '../../register-bson';
 import { expect } from 'chai';
+import { BSONError } from '../../register-bson';
 
 describe('calculateSize()', () => {
   it('should only enumerate own property keys from input objects', () => {
     const input = { a: 1 };
     Object.setPrototypeOf(input, { b: 2 });
     expect(BSON.calculateObjectSize(input)).to.equal(12);
   });
+
+  it(`throws if Symbol.for('@@mdb.bson.version') is the wrong version`, () => {
+    expect(() =>
+      BSON.calculateObjectSize({
+        a: { _bsontype: 'Int32', value: 2, [Symbol.for('@@mdb.bson.version')]: 1 }
+      })
+    ).to.throw(BSONError, /Unsupported BSON version/i);
+  });
 });

test/node/parser/serializer.test.ts

@@ -1,6 +1,7 @@
 import * as BSON from '../../register-bson';
 import { bufferFromHexArray } from '../tools/utils';
 import { expect } from 'chai';
+import { BSONError } from '../../register-bson';
 
 describe('serialize()', () => {
   it('should only enumerate own property keys from input objects', () => {
@@ -90,5 +91,13 @@ describe('serialize()', () => {
       expect(() => BSON.serialize(Buffer.alloc(2))).to.throw(/cannot be BSON documents/);
       expect(() => BSON.serialize(new Uint8Array(3))).to.throw(/cannot be BSON documents/);
     });
+
+    it(`throws if Symbol.for('@@mdb.bson.version') is the wrong version`, () => {
+      expect(() =>
+        BSON.serialize({
+          a: { _bsontype: 'Int32', value: 2, [Symbol.for('@@mdb.bson.version')]: 1 }
+        })
+      ).to.throw(BSONError, /Unsupported BSON version/i);
+    });
   });
 });