feat: combine equalTo clauses with clauses

src/ParseQuery.js

@@ -344,7 +344,11 @@ class ParseQuery {
    */
   _addCondition(key: string, condition: string, value: mixed): ParseQuery {
     if (!this._where[key] || typeof this._where[key] === 'string') {
+      const prev = this._where[key];
       this._where[key] = {};
+      if (typeof this._where[key] === 'string') {
+        this._where[key]['$eq'] = prev;
+      }
     }
     this._where[key][condition] = encode(value, false, true);
     return this;
@@ -1222,7 +1226,11 @@ class ParseQuery {
       return this.doesNotExist(key);
     }
 
-    this._where[key] = encode(value, false, true);
+    if (typeof this._where[key] === 'undefined') {
+      this._where[key] = encode(value, false, true);
+    } else {
+      this._addCondition(key, '$eq', value);
+    }
     return this;
   }
 

src/__tests__/ParseQuery-test.js

@@ -807,6 +807,36 @@ describe('ParseQuery', () => {
     });
   });
 
+  it('can combine other clauses with equalTo', () => {
+    const q = new ParseQuery('Item');
+    q.exists('inStock');
+    q.equalTo('inStock', null);
+
+    expect(q.toJSON()).toEqual({
+      where: {
+        inStock: {
+          $eq: null,
+          $exists: true,
+        },
+      },
+    });
+  });
+
+  it('can combine equalTo clause with any other clause', () => {
+    const q = new ParseQuery('Item');
+    q.equalTo('inStock', null);
+    q.exists('inStock');
+
+    expect(q.toJSON()).toEqual({
+      where: {
+        inStock: {
+          $eq: null,
+          $exists: true,
+        },
+      },
+    });
+  });
+
   it('can specify ordering', () => {
     const q = new ParseQuery('Item');
     q.greaterThan('inStock', 0).ascending('createdAt');