dont go or unless you need to

Author: justinbmeyer

src/serializers/basic-query.js

@@ -224,11 +224,15 @@ module.exports = function(schema) {
                 }
             });
             if(ors.length) {
-                return {
-                    $or: ors.map(function(orPart){
-                        return canReflect.assign( canReflect.serialize(result), orPart);
-                    })
-                };
+                if(ors.length === 1 ) {
+                    return ors[0];
+                } else {
+                    return {
+                        $or: ors.map(function(orPart){
+                            return canReflect.assign( canReflect.serialize(result), orPart);
+                        })
+                    };
+                }
             } else {
                 return result;
             }

src/types/make-maybe-test.js

@@ -411,7 +411,22 @@ QUnit.test("can make a maybe type from a ComparisonSetType", function() {
 });
 
 
+QUnit.test("orValues", function() {
+	var res = new MaybeDateStringSet({
+		range: new is.In([3]),
+		enum: set.EMPTY
+	});
+
+	QUnit.deepEqual(res.orValues(),[new is.In([3])] ,"only got range");
 
+	res = new MaybeDateStringSet({
+		range: set.EMPTY,
+		enum: new is.In([null])
+	});
+
+	QUnit.deepEqual(res.orValues(),[new is.In([null])] ,"only got enum");
+
+});
 
 /*
 QUnit.test("intersection", function(){
@@ -453,4 +468,4 @@ QUnit.test("difference", function(){
     QUnit.deepEqual(res,);
 
 });
-*/
+*/

src/types/make-maybe.js

@@ -97,7 +97,14 @@ function makeMaybe(inValues, makeChildType) {
 		}
 	}
 	Maybe.prototype.orValues = function() {
-		return [this.range, this.enum]
+		var values = [];
+		if( this.range !== set.EMPTY ) {
+			values.push(this.range);
+		}
+		if( this.enum !== set.EMPTY ) {
+			values.push(this.enum);
+		}
+		return values;
 	};
 	Maybe.prototype[isMemberSymbol] = function isMember() {
 		var rangeIsMember = this.range[isMemberSymbol] || this.range.isMember,

test/maybe-type-test.js

@@ -43,6 +43,11 @@ QUnit.test("basics", function(){
         ]},
         "difference works");
 
+    var query = todoQueryLogic.hydrate({filter: {age: 21}});
+
+    var serialized = todoQueryLogic.serialize(query);
+    QUnit.deepEqual( serialized, {filter: {age: 21}}, "can serialize back to what was provided" );
+
 });