bson 6.10.2 → 6.10.4

package/package.json

@@ -14,7 +14,7 @@
     "vendor"
   ],
   "types": "bson.d.ts",
-  "version": "6.10.2",
+  "version": "6.10.4",
   "author": {
     "name": "The MongoDB NodeJS Team",
     "email": "dbx-node@mongodb.com"
@@ -27,40 +27,40 @@
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "@microsoft/api-extractor": "^7.47.5",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-typescript": "^11.1.6",
+    "@microsoft/api-extractor": "^7.52.5",
+    "@rollup/plugin-node-resolve": "^16.0.1",
+    "@rollup/plugin-typescript": "^12.1.2",
     "@types/chai": "^4.3.17",
     "@types/mocha": "^10.0.7",
-    "@types/node": "^22.1.0",
-    "@types/sinon": "^17.0.3",
+    "@types/node": "^22.15.3",
+    "@types/sinon": "^17.0.4",
     "@types/sinon-chai": "^3.2.12",
-    "@typescript-eslint/eslint-plugin": "^8.0.1",
-    "@typescript-eslint/parser": "^8.0.1",
+    "@typescript-eslint/eslint-plugin": "^8.31.1",
+    "@typescript-eslint/parser": "^8.31.1",
     "benchmark": "^2.1.4",
     "chai": "^4.4.1",
     "chalk": "^5.3.0",
-    "dbx-js-tools": "github:mongodb-js/dbx-js-tools",
-    "eslint": "^9.8.0",
-    "eslint-config-prettier": "^9.1.0",
+    "dbx-js-tools": "github:mongodb-js/dbx-js-tools#main",
+    "eslint": "^9.25.1",
+    "eslint-config-prettier": "^10.1.2",
     "eslint-plugin-no-bigint-usage": "file:etc/eslint/no-bigint-usage",
-    "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-tsdoc": "^0.3.0",
+    "eslint-plugin-prettier": "^5.2.6",
+    "eslint-plugin-tsdoc": "^0.4.0",
     "magic-string": "^0.30.11",
     "mocha": "^10.7.0",
     "node-fetch": "^3.3.2",
     "nyc": "^15.1.0",
-    "prettier": "^3.3.3",
-    "rollup": "^4.20.0",
+    "prettier": "^3.5.3",
+    "rollup": "^4.40.1",
     "sinon": "^18.0.0",
     "sinon-chai": "^3.7.0",
     "source-map-support": "^0.5.21",
     "tar": "^7.4.3",
     "ts-node": "^10.9.2",
     "tsd": "^0.31.1",
-    "typescript": "^5.5.4",
+    "typescript": "^5.8.3",
     "typescript-cached-transpile": "0.0.6",
-    "uuid": "^10.0.0"
+    "uuid": "^11.1.0"
   },
   "tsd": {
     "directory": "test/types",
@@ -75,18 +75,18 @@
     "native": false
   },
   "main": "./lib/bson.cjs",
-  "module": "./lib/bson.mjs",
+  "module": "./lib/bson.node.mjs",
   "exports": {
-    "import": {
+    "browser": {
       "types": "./bson.d.ts",
       "default": "./lib/bson.mjs"
     },
-    "require": {
-      "types": "./bson.d.ts",
-      "default": "./lib/bson.cjs"
-    },
     "react-native": "./lib/bson.rn.cjs",
-    "browser": "./lib/bson.mjs"
+    "default": {
+      "types": "./bson.d.ts",
+      "import": "./lib/bson.node.mjs",
+      "require": "./lib/bson.cjs"
+    }
   },
   "compass:exports": {
     "import": "./lib/bson.cjs",
@@ -102,18 +102,19 @@
     "check:tsd": "npm run build:dts && tsd",
     "check:web": "WEB=true mocha test/node",
     "check:web-no-bigint": "WEB=true NO_BIGINT=true mocha test/node",
-    "check:granular-bench": "npm run build:bench && node ./test/bench/etc/run_granular_benchmarks.js",
-    "check:spec-bench": "npm run build:bench && node ./test/bench/lib/spec/bsonBench.js",
-    "check:custom-bench": "npm run build && node ./test/bench/custom/main.mjs",
+    "check:granular-bench": "npm run build:bench && npm run check:baseline-bench && node ./test/bench/etc/run_granular_benchmarks.js",
+    "check:spec-bench": "npm run build:bench && npm run check:baseline-bench && node ./test/bench/lib/spec/bsonBench.js",
+    "check:custom-bench": "npm run build && npm run check:baseline-bench && node ./test/bench/custom/main.mjs",
+    "check:baseline-bench": "node ./test/bench/etc/cpuBaseline.js",
     "build:bench": "cd test/bench && npx tsc",
     "build:ts": "node ./node_modules/typescript/bin/tsc",
     "build:dts": "npm run build:ts && api-extractor run --typescript-compiler-folder node_modules/typescript --local && node etc/clean_definition_files.cjs",
     "build:bundle": "rollup -c rollup.config.mjs",
     "build": "npm run build:dts && npm run build:bundle",
     "check:lint": "ESLINT_USE_FLAT_CONFIG=false eslint -v && ESLINT_USE_FLAT_CONFIG=false eslint --ext '.js,.ts' --max-warnings=0 src test && npm run build:dts && npm run check:tsd",
-    "format": "eslint --ext '.js,.ts' src test --fix",
+    "format": "ESLINT_USE_FLAT_CONFIG=false eslint --ext '.js,.ts' src test --fix",
     "check:coverage": "nyc --check-coverage npm run check:node",
     "prepare": "node etc/prepare.js",
     "release": "standard-version -i HISTORY.md"
   }
-}
+}

package/src/binary.ts

@@ -341,6 +341,8 @@ export class Binary extends BSONValue {
       throw new BSONError('Binary datatype field is not Int8');
     }
 
+    validateBinaryVector(this);
+
     return new Int8Array(
       this.buffer.buffer.slice(this.buffer.byteOffset + 2, this.buffer.byteOffset + this.position)
     );
@@ -361,6 +363,8 @@ export class Binary extends BSONValue {
       throw new BSONError('Binary datatype field is not Float32');
     }
 
+    validateBinaryVector(this);
+
     const floatBytes = new Uint8Array(
       this.buffer.buffer.slice(this.buffer.byteOffset + 2, this.buffer.byteOffset + this.position)
     );
@@ -387,6 +391,8 @@ export class Binary extends BSONValue {
       throw new BSONError('Binary datatype field is not packed bit');
     }
 
+    validateBinaryVector(this);
+
     return new Uint8Array(
       this.buffer.buffer.slice(this.buffer.byteOffset + 2, this.buffer.byteOffset + this.position)
     );
@@ -409,6 +415,8 @@ export class Binary extends BSONValue {
       throw new BSONError('Binary datatype field is not packed bit');
     }
 
+    validateBinaryVector(this);
+
     const byteCount = this.length() - 2;
     const bitCount = byteCount * 8 - this.buffer[1];
     const bits = new Int8Array(bitCount);
@@ -434,7 +442,9 @@ export class Binary extends BSONValue {
     buffer[1] = 0;
     const intBytes = new Uint8Array(array.buffer, array.byteOffset, array.byteLength);
     buffer.set(intBytes, 2);
-    return new this(buffer, this.SUBTYPE_VECTOR);
+    const bin = new this(buffer, this.SUBTYPE_VECTOR);
+    validateBinaryVector(bin);
+    return bin;
   }
 
   /** Constructs a Binary representing an Float32 Vector. */
@@ -448,7 +458,9 @@ export class Binary extends BSONValue {
 
     if (NumberUtils.isBigEndian) ByteUtils.swap32(new Uint8Array(binaryBytes.buffer, 2));
 
-    return new this(binaryBytes, this.SUBTYPE_VECTOR);
+    const bin = new this(binaryBytes, this.SUBTYPE_VECTOR);
+    validateBinaryVector(bin);
+    return bin;
   }
 
   /**
@@ -461,7 +473,9 @@ export class Binary extends BSONValue {
     buffer[0] = Binary.VECTOR_TYPE.PackedBit;
     buffer[1] = padding;
     buffer.set(array, 2);
-    return new this(buffer, this.SUBTYPE_VECTOR);
+    const bin = new this(buffer, this.SUBTYPE_VECTOR);
+    validateBinaryVector(bin);
+    return bin;
   }
 
   /**
@@ -517,6 +531,12 @@ export function validateBinaryVector(vector: Binary): void {
     throw new BSONError('Invalid Vector: padding must be zero for int8 and float32 vectors');
   }
 
+  if (datatype === Binary.VECTOR_TYPE.Float32) {
+    if (size !== 0 && size - 2 !== 0 && (size - 2) % 4 !== 0) {
+      throw new BSONError('Invalid Vector: Float32 vector must contain a multiple of 4 bytes');
+    }
+  }
+
   if (datatype === Binary.VECTOR_TYPE.PackedBit && padding !== 0 && size === 2) {
     throw new BSONError(
       'Invalid Vector: padding must be zero for packed bit vectors that are empty'

package/src/parser/on_demand/parse_to_elements.ts

@@ -9,29 +9,31 @@ import { NumberUtils } from '../../utils/number_utils';
  * - `minKey` is set to 255 so unsigned comparisons succeed
  * - Modify with caution, double check the bundle contains literals
  */
-const enum BSONElementType {
-  double = 1,
-  string = 2,
-  object = 3,
-  array = 4,
-  binData = 5,
-  undefined = 6,
-  objectId = 7,
-  bool = 8,
-  date = 9,
-  null = 10,
-  regex = 11,
-  dbPointer = 12,
-  javascript = 13,
-  symbol = 14,
-  javascriptWithScope = 15,
-  int = 16,
-  timestamp = 17,
-  long = 18,
-  decimal = 19,
-  minKey = 255,
-  maxKey = 127
-}
+const BSONElementType = {
+  double: 1,
+  string: 2,
+  object: 3,
+  array: 4,
+  binData: 5,
+  undefined: 6,
+  objectId: 7,
+  bool: 8,
+  date: 9,
+  null: 10,
+  regex: 11,
+  dbPointer: 12,
+  javascript: 13,
+  symbol: 14,
+  javascriptWithScope: 15,
+  int: 16,
+  timestamp: 17,
+  long: 18,
+  decimal: 19,
+  minKey: 255,
+  maxKey: 127
+} as const;
+
+type BSONElementType = (typeof BSONElementType)[keyof typeof BSONElementType];
 
 /**
  * @public

package/src/parser/serializer.ts

@@ -726,8 +726,8 @@ export function serializeInto(
       if (done) continue;
 
       // Get the entry values
-      const key = entry.value[0];
-      let value = entry.value[1];
+      const key = entry.value ? entry.value[0] : undefined;
+      let value = entry.value ? entry.value[1] : undefined;
 
       if (typeof value?.toBSON === 'function') {
         value = value.toBSON();

package/src/utils/number_utils.ts

@@ -83,14 +83,23 @@ export const NumberUtils: NumberUtils = {
 
   /** Reads a little-endian 64-bit integer from source */
   getBigInt64LE(source: Uint8Array, offset: number): bigint {
-    const lo = NumberUtils.getUint32LE(source, offset);
-    const hi = NumberUtils.getUint32LE(source, offset + 4);
-
-    /*
-      eslint-disable-next-line no-restricted-globals
-      -- This is allowed since this helper should not be called unless bigint features are enabled
-     */
-    return (BigInt(hi) << BigInt(32)) + BigInt(lo);
+    // eslint-disable-next-line no-restricted-globals
+    const hi = BigInt(
+      source[offset + 4] +
+        source[offset + 5] * 256 +
+        source[offset + 6] * 65536 +
+        (source[offset + 7] << 24)
+    ); // Overflow
+
+    // eslint-disable-next-line no-restricted-globals
+    const lo = BigInt(
+      source[offset] +
+        source[offset + 1] * 256 +
+        source[offset + 2] * 65536 +
+        source[offset + 3] * 16777216
+    );
+    // eslint-disable-next-line no-restricted-globals
+    return (hi << BigInt(32)) + lo;
   },
 
   /** Reads a little-endian 64-bit float from source */