Merge pull request #10 from canjs/index

Provide a default hydrator for basicquery

Author: matthewp

src/helpers.js

@@ -89,6 +89,13 @@ var helpers =  {
 
             return 0;
         };
-    }
+    },
+		valueHydrator: function(value){
+				if(canReflect.isBuiltIn(value)) {
+						return value;
+				} else {
+						throw new Error("can-query-logic doesn't support comparison operator: "+JSON.stringify(value));
+				}
+		}
 };
 module.exports = helpers;

src/serializers/basic-query-test.js

@@ -209,6 +209,25 @@ QUnit.test("gt and lt", function(){
 
 });
 
+QUnit.test("basicquery with no sort", function() {
+	var query = {};
+
+	var converter = makeBasicQueryConvert({
+		identity: ["id"],
+		type: "map",
+		keys: {
+			id: function(val) { return val; }
+		}
+	});
+	var basicQuery = converter.hydrate(query);
+
+	var objs = [{id: 0}, {id: 2}]
+	var item = {id: 1};
+
+	var res = basicQuery.index(item, objs);
+	QUnit.equal(res, 1, "inserted at 1");
+});
+
 /*
 QUnit.skip("nested properties within ors", function(){
     var query = {

src/serializers/basic-query.js

@@ -8,6 +8,7 @@ var is = require("../types/comparisons");
 var makeMaybe = require("../types/make-maybe");
 var makeEnum = require("../types/make-enum");
 var logDev = require("can-log/dev/dev");
+var helpers = require("../helpers");
 
 var setTypeSymbol = canSymbol.for("can.SetType");
 var schemaSymbol = canSymbol.for("can.getSchema");
@@ -292,13 +293,7 @@ module.exports = function(schema) {
             var filter = canReflect.serialize(data.filter);
 
             // this mutates
-            var filterAnd = hydrateFilter(filter, keys, function(value){
-                if(canReflect.isBuiltIn(value)) {
-                    return value;
-                } else {
-                    throw new Error("can-query-logic doesn't support comparison operator: "+JSON.stringify(value));
-                }
-            });
+            var filterAnd = hydrateFilter(filter, keys, helpers.valueHydrator);
 
             // Conver the filter arguments
 

src/types/basic-query.js

@@ -26,11 +26,13 @@ function makeSort(schemaKeys, hydrateAndValue){
         sorters[key] = {
             // valueA is GT valueB
             $gt: function(valueA, valueB) {
-                var $gt = hydrateAndValue({$gt: valueB}, key, schemaProp);
+                var $gt = hydrateAndValue({$gt: valueB}, key, schemaProp,
+									helpers.valueHydrator);
                 return $gt[isMemberSymbol](valueA);
             },
             $lt: function( valueA, valueB ){
-                var $lt = hydrateAndValue({$lt: valueB}, key, schemaProp);
+                var $lt = hydrateAndValue({$lt: valueB}, key, schemaProp,
+									helpers.valueHydrator);
                 return $lt[isMemberSymbol](valueA);
             }
         };