NODE-2253: Support Regex and DBRef as legacy

mongodb · Dec 16, 2019 · 900550d · mvasilkov · Dec 16, 2019 · durran
1 parent fd5ce66
commit 900550d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/lib/db_ref.js b/lib/db_ref.js
@@ -65,6 +65,7 @@ class DBRef {
    * @ignore
    */
   static fromExtendedJSON(doc) {
+    console.log('.fromExtendedJSON', doc);
     var copy = Object.assign({}, doc);
     ['$ref', '$id', '$db'].forEach(k => delete copy[k]);
     return new DBRef(doc.$ref, doc.$id, doc.$db, copy);

diff --git a/lib/extended_json.js b/lib/extended_json.js
@@ -32,6 +32,7 @@ const keysToCodecs = {
   $numberLong: Long,
   $minKey: MinKey,
   $maxKey: MaxKey,
+  $regex: BSONRegExp,
   $regularExpression: BSONRegExp,
   $timestamp: Timestamp
 };

diff --git a/lib/regexp.js b/lib/regexp.js
@@ -39,6 +39,15 @@ class BSONRegExp {
     }
   }
 
+  static parseOptions(options) {
+    return options
+      ? options
+          .split('')
+          .sort()
+          .join('')
+      : '';
+  }
+
   /**
    * @ignore
    */
@@ -53,12 +62,16 @@ class BSONRegExp {
    * @ignore
    */
   static fromExtendedJSON(doc) {
+    if (doc.$regex) {
+      // This is for $regex query operators that have extended json values.
+      if (doc.$regex._bsontype === 'BSONRegExp') {
+        return doc;
+      }
+      return new BSONRegExp(doc.$regex, BSONRegExp.parseOptions(doc.$options));
+    }
     return new BSONRegExp(
       doc.$regularExpression.pattern,
-      doc.$regularExpression.options
-        .split('')
-        .sort()
-        .join('')
+      BSONRegExp.parseOptions(doc.$regularExpression.options)
     );
   }
 }

diff --git a/test/node/extended_json_tests.js b/test/node/extended_json_tests.js
@@ -615,7 +615,7 @@ describe('Extended JSON', function() {
       });
 
       context('when deserializing regex', function() {
-        it.skip('parses $regex and $options', function() {
+        it('parses $regex and $options', function() {
           const regexp = new BSONRegExp('hello world', 'i');
           const doc = { field: regexp };
           const bson = EJSON.parse('{"field":{"$regex":"hello world","$options":"i"}}', {
@@ -626,8 +626,8 @@ describe('Extended JSON', function() {
       });
 
       context('when deserializing dbref', function() {
-        it.skip('parses $ref and $id', function() {
-          const dbRef = new DBRef('tests', new Int32(1));
+        it('parses $ref and $id', function() {
+          const dbRef = new DBRef('tests', 1);
           const doc = { field: dbRef };
           const bson = EJSON.parse('{"field":{"$ref":"tests","$id":1}}', {
             legacy: true