RJS-2765: Attempt to upgrade bson to v6

integration-tests/tests/src/tests/linking-objects.ts

@@ -338,19 +338,19 @@ describe("Linking objects", () => {
       // Create a manufacturer with 2 cars.
       this.realm.write(() => {
         const sentra = this.realm.create(Car, {
-          _id: new Realm.BSON.ObjectID(),
+          _id: new Realm.BSON.ObjectId(),
           model: "Sentra",
           miles: 1000,
         });
 
         const pathfinder = this.realm.create(Car, {
-          _id: new Realm.BSON.ObjectID(),
+          _id: new Realm.BSON.ObjectId(),
           model: "Pathfinder",
           miles: 500,
         });
 
         this.realm.create(Manufacturer, {
-          _id: new Realm.BSON.ObjectID(),
+          _id: new Realm.BSON.ObjectId(),
           name: "Nissan",
           cars: [sentra, pathfinder],
         });

package.json

@@ -75,6 +75,7 @@
     "@react-native/eslint-config": "0.74.83",
     "@react-native/eslint-plugin": "0.74.83",
     "@react-native/typescript-config": "0.74.83",
+    "@rollup/plugin-alias": "^5.1.0",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",

packages/realm-web/package.json

@@ -83,7 +83,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@realm/common": "^0.1.4",
-    "bson": "^4.5.4",
+    "bson": "^6.7.0",
     "detect-browser": "^5.2.1",
     "js-base64": "^3.7.6"
   },

packages/realm-web/rollup.config.mjs

@@ -16,12 +16,16 @@
 //
 ////////////////////////////////////////////////////////////////////////////
 
+import alias from "@rollup/plugin-alias";
 import commonjs from "@rollup/plugin-commonjs";
 import typescript from "@rollup/plugin-typescript";
 import nodeResolve from "@rollup/plugin-node-resolve";
 import replace from "@rollup/plugin-replace";
 import dts from "rollup-plugin-dts";
 
+import { createRequire } from "node:module";
+const require = createRequire(import.meta.url);
+
 import pkg from "./package.json" assert { type: "json" };
 
 const replacer = replace({
@@ -97,6 +101,15 @@ export default [
       },
     ],
     plugins: [
+      // Providing an alias for the "bson" package to pick the CJS bundle over ESM
+      alias({
+        entries: [
+          {
+            find: "bson",
+            replacement: require.resolve("bson"),
+          },
+        ],
+      }),
       commonjs(),
       typescript({
         tsconfig: "src/dom/tsconfig.json",

packages/realm-web/src/tests/MongoDBService.test.ts

@@ -17,7 +17,7 @@
 ////////////////////////////////////////////////////////////////////////////
 
 import { expect } from "chai";
-import { ObjectID } from "bson";
+import { ObjectId } from "bson";
 
 import { createService } from "../services/MongoDBService";
 
@@ -54,7 +54,7 @@ describe("MongoDB Remote service", () => {
       .collection<MyDocument>("my-collection")
       .find(
         {
-          _id: ObjectID.createFromHexString("deadbeefdeadbeefdeadbeef"),
+          _id: ObjectId.createFromHexString("deadbeefdeadbeefdeadbeef"),
         },
         { limit: 10 },
       );
@@ -107,7 +107,7 @@ describe("MongoDB Remote service", () => {
       .collection<MyDocument>("my-collection")
       .findOne(
         {
-          _id: ObjectID.createFromHexString("deadbeefdeadbeefdeadbeef"),
+          _id: ObjectId.createFromHexString("deadbeefdeadbeefdeadbeef"),
         },
         {
           projection: { name: 1 },

packages/realm-web/src/utils/ejson.ts

@@ -38,7 +38,9 @@ export function serialize<Obj extends SimpleObject>(obj: Obj): SimpleObject {
  * @param obj The object or array of objects in extended-JSON format.
  * @returns The object or array of objects with inflated BSON types.
  */
-export function deserialize(obj: SimpleObject | SimpleObject[]): EJSON.SerializableTypes {
+export function deserialize(
+  obj: SimpleObject | SimpleObject[],
+): unknown /* Return type of 'ReturnType<typeof EJSON.deserialize>' is 'any' */ {
   if (Array.isArray(obj)) {
     return obj.map((doc) => EJSON.deserialize(doc));
   } else {

packages/realm/package.json

@@ -305,7 +305,7 @@
   },
   "dependencies": {
     "@realm/fetch": "^0.1.1",
-    "bson": "^4.7.2",
+    "bson": "^6.7.0",
     "debug": "^4.3.4",
     "node-machine-id": "^1.1.12",
     "path-browserify": "^1.0.1",
@@ -357,4 +357,4 @@
       6
     ]
   }
-}
+}

packages/realm/src/bson.ts

@@ -26,8 +26,6 @@ import * as bson from "bson";
 export namespace BSON {
   export const ObjectId = bson.ObjectId;
   export type ObjectId = bson.ObjectId;
-  export const ObjectID = bson.ObjectID;
-  export type ObjectID = bson.ObjectID;
   export const Decimal128 = bson.Decimal128;
   export type Decimal128 = bson.Decimal128;
   export const UUID = bson.UUID;