ADD: OData nested filter unit tests, FIX: arrow function in nested query params; FIX: nested map modelbinder config

Author: borzav

src/Types/Expressions/EntityExpressions/CodeExpression.js

@@ -4,7 +4,7 @@ $C('$data.Expressions.CodeExpression', $data.Expressions.ExpressionNode, null, {
     constructor: function (source, parameters) {
         if (Container.resolveType(Container.getTypeName(source)) == $data.String && 
             source.replace(/^[\s\xA0]+/, "").match("^function") != "function" && 
-            source.replace(/^[\s\xA0]+/, "").match("=>") != "=>") 
+             !/^[^\.]*(=>)/.test(source.replace(/^[\s\xA0]+/, ""))) 
         {
             source = "function (it) { return " + source + "; }";
         }

src/Types/Queryable.js

@@ -776,7 +776,7 @@ $data.Class.define('$data.Queryable', null, null,
         ///	</signature>
 
         this._checkOperation('include');
-        if(typeof selector === 'string' && (selector.length < 3 || selector.substr(0, 3) !== 'it.')){
+        if(typeof selector === 'string' && (selector.length < 3 || selector.substr(0, 3) !== 'it.') && !/^[^\.]*(=>)/.test(selector)){
             selector = 'it.' + selector;
         }
         var expression = Container.createCodeExpression(selector, thisArg);

src/Types/StorageProviders/modelBinderConfigCompiler.js

@@ -43,18 +43,20 @@ $C('$data.modelBinder.FindProjectionVisitor', $data.Expressions.EntityExpression
 
             for (var i = 0; i < args.length; i++) {
                 var arg = args[i];
-                if (arg && arg.value instanceof $data.Queryable) {
+                
+                if (arg instanceof $data.Expressions.ConstantExpression && arg.value instanceof $data.Queryable) {
                     var preparator = Container.createQueryExpressionCreator(arg.value.entityContext);
-                    var prep_expression = preparator.Visit(arg.value.expression);
-                    
-                    var visitor = new $data.modelBinder.FindProjectionVisitor(this._inculdes);
-                    var visitorContext = { };
-                    var compiled = visitor.Visit(prep_expression, visitorContext);
+                    arg = preparator.Visit(arg.value.expression);
 
-                    if(context && visitorContext.projectionExpression){
-                        context.hasIncludeProjectionExpression = true;
-                        context.includeProjectionExpression = visitorContext.projectionExpression;
-                    }
+                }
+                
+                var visitor = new $data.modelBinder.FindProjectionVisitor(this._inculdes);
+                var visitorContext = { };
+                var compiled = visitor.Visit(arg, visitorContext);
+                
+                if(context && visitorContext.projectionExpression){
+                    context.hasIncludeProjectionExpression = true;
+                    context.includeProjectionExpression = visitorContext.projectionExpression;
                 }
             }
         }