fix: toMongoDottedObject just dottify internals of logical operators with expressions: $or, $and, $not, $nor. Other operators will have unchanged internals: $in, $near, etc.

closes #201

Author: nodkz

src/utils/__tests__/toMongoDottedObject-test.js

@@ -87,6 +87,45 @@ describe('toMongoFilterDottedObject()', () => {
     });
   });
 
+  it('should dottify internals of logical operators: $or $and $not $nor', () => {
+    expect(
+      toMongoFilterDottedObject({
+        $and: [{ a: { b: 1 } }, { c: [1, 2] }],
+        $or: [{ a: { b: 1 } }, { c: [1, 2] }],
+        some: {
+          me: {
+            $nor: [{ a: { b: 1 } }, { c: [1, 2] }],
+            $not: { a: { b: 1 } },
+          },
+        },
+      })
+    ).toEqual({
+      $and: [{ 'a.b': 1 }, { 'c.0': 1, 'c.1': 2 }],
+      $or: [{ 'a.b': 1 }, { 'c.0': 1, 'c.1': 2 }],
+      'some.me': { $nor: [{ 'a.b': 1 }, { 'c.0': 1, 'c.1': 2 }], $not: { 'a.b': 1 } },
+    });
+  });
+
+  it('should keep $geometry as is', () => {
+    expect(
+      toMongoFilterDottedObject({
+        location: {
+          $near: {
+            $geometry: { type: 'Point', coordinates: [10.3222671, 36.88911649999999] },
+            $maxDistance: 50000,
+          },
+        },
+      })
+    ).toEqual({
+      location: {
+        $near: {
+          $geometry: { type: 'Point', coordinates: [10.3222671, 36.88911649999999] },
+          $maxDistance: 50000,
+        },
+      },
+    });
+  });
+
   it('should handle date object values as scalars', () => {
     expect(toMongoFilterDottedObject({ dateField: new Date(100) })).toEqual({
       dateField: new Date(100),

src/utils/toMongoDottedObject.js

@@ -4,6 +4,7 @@ import { Types } from 'mongoose';
 import { isObject } from 'graphql-compose';
 
 const primitives = [Types.ObjectId, Date, String, Number, Boolean, Types.Decimal128];
+const operatorsWithExpression = ['$or', '$and', '$not', '$nor'];
 
 function isPrimitive(value: any) {
   return primitives.some(p => value instanceof p);
@@ -17,9 +18,14 @@ function _toMongoDottedObject(obj, target = {}, path = [], filter = false) {
   /* eslint-disable */
   objKeys.forEach(key => {
     if (key.startsWith('$')) {
-      const val = Array.isArray(obj[key])
-        ? obj[key].map(v => _toMongoDottedObject(v, {}, [], filter))
-        : _toMongoDottedObject(obj[key], {}, [], filter);
+      let val;
+      if (operatorsWithExpression.includes(key)) {
+        val = Array.isArray(obj[key])
+          ? obj[key].map(v => _toMongoDottedObject(v, {}, [], filter))
+          : _toMongoDottedObject(obj[key], {}, [], filter);
+      } else {
+        val = obj[key];
+      }
       if (path.length === 0) {
         target[key] = val;
       } else {