fixes so maybe types with nested or types get fully expanded

Author: justinbmeyer

can-query-logic-test.js

@@ -60,6 +60,8 @@ QUnit.test("difference", function(){
             name: "Ramiya",
         }
     });
+
+    
 });
 
 QUnit.test("subset", function(){

src/serializers/basic-query.js

@@ -193,7 +193,17 @@ function hydrateOrs(values, schemaProperties, hydrateUnknown ) {
     return new BasicQuery.Or(comparisons);
 }
 
-
+function recursivelyAddOrs(ors, value, serializer, key){
+    value.orValues().forEach(function(orValue){
+        if(typeof orValue.orValues === "function") {
+            recursivelyAddOrs(ors, orValue, serializer, key);
+        } else {
+            var result = {};
+            result[key] = serializer(orValue);
+            ors.push( result );
+        }
+    });
+}
 
 module.exports = function(schema) {
 
@@ -212,16 +222,7 @@ module.exports = function(schema) {
             var result = {};
             canReflect.eachKey(and.values, function(value, key){
                 // is value universal ... if not, we don't need to add anything
-
-                if(typeof value.orValues === "function") {
-                    canReflect.addValues( ors, value.orValues().map(function(orValue){
-                        var result = {};
-                        result[key] = serializer(orValue);
-                        return result;
-                    }) );
-                } else {
-                    result[key] = serializer(value);
-                }
+                recursivelyAddOrs(ors, value, serializer, key);
             });
             if(ors.length) {
                 if(ors.length === 1 ) {

test/maybe-type-test.js

@@ -48,6 +48,22 @@ QUnit.test("basics", function(){
     var serialized = todoQueryLogic.serialize(query);
     QUnit.deepEqual( serialized, {filter: {age: 21}}, "can serialize back to what was provided" );
 
+    res = todoQueryLogic.difference({},{
+        filter: {
+            age: {
+                $gt: 3,
+                $lt: 7
+            }
+        }
+    });
+
+    QUnit.deepEqual(res.filter,
+        {$or: [
+            {age: {$gte: 7} },
+            {age: {$lte: 3} },
+            {age: {$in: [undefined, null]}}
+        ]});
+
 });