Added support for newer Mongo drivers (renamed ObjectID -> ObjectId)

- OkanjoApp.js: updated flattenData to support newer MongoDB drivers - package.json: Bumped to 3.2.1
Okanjo · Mar 31, 2022 · 30c9661 · 30c9661
1 parent e7ac117
commit 30c9661
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/OkanjoApp.js b/OkanjoApp.js
@@ -206,7 +206,7 @@ class OkanjoApp extends EventEmitter {
                     } else {
                         output[key] = input[key]; // as-is
                     }
-                } else if (typeof input[key] === "object" && input[key] && input[key].constructor && input[key].constructor.name === "ObjectID") { // Object.create(null) is truthy, but .constructor is undefined
+                } else if (typeof input[key] === "object" && input[key] && input[key].constructor && (input[key].constructor.name === "ObjectID" || input[key].constructor.name === "ObjectId")) { // Object.create(null) is truthy, but .constructor is undefined
                     output[key] = input[key].toString();
                 } else if (typeof input[key] === 'object') {
                     // Make child objects flat too (always returns object so Object.keys is safe)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okanjo-app",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Okanjo application framework",
   "main": "OkanjoApp.js",
   "scripts": {

diff --git a/test/app-test.js b/test/app-test.js
@@ -597,6 +597,9 @@ describe('OkanjoApp', function() {
             function ObjectID(value = "ffffffffffffffffffffffff") {
                 this.value = value;
             }
+            function ObjectId(value = "ffffffffffffffffffffffff") {
+                this.value = value;
+            }
 
             ObjectID.prototype.toString = function() {
                 return this.value;
@@ -618,7 +621,8 @@ describe('OkanjoApp', function() {
                 },
                 d: new ObjectID(),
                 e: new Date(),
-                f: ctorLessObj
+                f: ctorLessObj,
+                g: new ObjectId(),
             };
 
             const expected = {
@@ -631,7 +635,8 @@ describe('OkanjoApp', function() {
                 c_c_b_c_b_b: undefined,
                 d: source.d.toString(),
                 e: source.e,
-                f_z: "asdf"
+                f_z: "asdf",
+                g: source.g.toString(),
             };
 
             OkanjoApp.flattenData(source).should.deepEqual(expected);