@steedos/odata-v4-mongodb 2.5.3-beta.11 → 2.5.3-beta.12

package/README.md

@@ -1,85 +1,85 @@
-<!--
- * @Author: baozhoutao@steedos.com
- * @Date: 2022-07-10 15:44:34
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-07-10 15:57:25
- * @Description: 
--->
-# OData V4 Service modules - MongoDB Connector
-
-Service OData v4 requests from a MongoDB data store.
-
-## Synopsis
-The OData V4 MongoDB Connector provides functionality to convert the various types of OData segments
-into MongoDB query objects, that you can execute over a MongoDB database.
-
-## Potential usage scenarios
-
-- Create high speed, standard compliant data sharing APIs
-
-## Usage as server - TypeScript
-```javascript
-import { createFilter } from '@steedos/odata-v4-mongodb'
-
-//example request:  GET /api/products?$filter=category/id eq 5 or color eq 'Red'
-app.get("/api/products", (req: Request, res: Response) => {
-    const filter = createFilter(req.query.$filter);
-    // collection instance from MongoDB Node.JS Driver
-    collection.find(filter, function(err, data){
-        res.json({
-        	'@odata.context': req.protocol + '://' + req.get('host') + '/api/$metadata#products',
-        	value: data
-        });
-    });
-});
-```
-
-## Usage ES5
-```javascript
-var createFilter = require('@steedos/odata-v4-mongodb').createFilter;
-
-app.get("/api/products", function(req, res) {
-    var filter = createFilter(req.query.$filter);
-    // collection instance from MongoDB Node.JS Driver
-    collection.find(filter, function(err, data){
-        res.json({
-        	'@odata.context': req.protocol + '://' + req.get('host') + '/api/$metadata#products',
-        	value: data
-        });
-    });
-})
-```
-
-## Supported OData segments
-
-For now **$filter**, **$select**, **$skip** and **$top**
-
-Support for **$expand** is next.
-
-### Supported $filter expressions
-
-The [OData v4 Parser](https://www.npmjs.com/package/odata-v4-parser) layer supports 100% of the specification.
-The Connector is supporting basic MongoDB queries.
-
-*We are into creating a comprehensive feature availability chart for V1 release*
-
-    √ expression 5.1.1.6.1: NullValue eq null
-    √ expression 5.1.1.6.1: TrueValue eq true
-    √ expression 5.1.1.6.1: FalseValue eq false
-    √ expression 5.1.1.6.1: IntegerValue lt -128
-    √ expression 5.1.1.6.1: DecimalValue eq 34.95
-    √ expression 5.1.1.6.1: StringValue eq 'Say Hello,then go'
-    √ expression 5.1.1.6.1: DurationValue eq duration'P12DT23H59M59.999999999999S'
-    √ expression 5.1.1.6.1: DateValue eq 2012-12-03
-    √ expression 5.1.1.6.1: DateTimeOffsetValue eq 2012-12-03T07:16:23Z
-    √ expression 5.1.1.6.1: GuidValue eq 01234567-89ab-cdef-0123-456789abcdef
-    √ expression 5.1.1.6.1: Int64Value eq 0
-    √ expression 5.1.1.6.1: A eq INF
-    √ expression 5.1.1.6.1: A eq 0.31415926535897931e1
-    √ expression 5.1.1.1.2: A ne 1
-    √ expression 5.1.1.1.3: A gt 2
-    √ expression 5.1.1.1.4: A ge 3
-    √ expression 5.1.1.1.5: A lt 2
-    √ expression 5.1.1.1.6: A le 2
-    √ expression: A/b eq 1
-    √ expression 5.1.1.3: (A/b eq 2) or (B/c lt 4) and ((E gt 5) or (E lt -1))
+<!--
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-07-10 15:44:34
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2022-07-10 15:57:25
+ * @Description: 
+-->
+# OData V4 Service modules - MongoDB Connector
+
+Service OData v4 requests from a MongoDB data store.
+
+## Synopsis
+The OData V4 MongoDB Connector provides functionality to convert the various types of OData segments
+into MongoDB query objects, that you can execute over a MongoDB database.
+
+## Potential usage scenarios
+
+- Create high speed, standard compliant data sharing APIs
+
+## Usage as server - TypeScript
+```javascript
+import { createFilter } from '@steedos/odata-v4-mongodb'
+
+//example request:  GET /api/products?$filter=category/id eq 5 or color eq 'Red'
+app.get("/api/products", (req: Request, res: Response) => {
+    const filter = createFilter(req.query.$filter);
+    // collection instance from MongoDB Node.JS Driver
+    collection.find(filter, function(err, data){
+        res.json({
+        	'@odata.context': req.protocol + '://' + req.get('host') + '/api/$metadata#products',
+        	value: data
+        });
+    });
+});
+```
+
+## Usage ES5
+```javascript
+var createFilter = require('@steedos/odata-v4-mongodb').createFilter;
+
+app.get("/api/products", function(req, res) {
+    var filter = createFilter(req.query.$filter);
+    // collection instance from MongoDB Node.JS Driver
+    collection.find(filter, function(err, data){
+        res.json({
+        	'@odata.context': req.protocol + '://' + req.get('host') + '/api/$metadata#products',
+        	value: data
+        });
+    });
+})
+```
+
+## Supported OData segments
+
+For now **$filter**, **$select**, **$skip** and **$top**
+
+Support for **$expand** is next.
+
+### Supported $filter expressions
+
+The [OData v4 Parser](https://www.npmjs.com/package/odata-v4-parser) layer supports 100% of the specification.
+The Connector is supporting basic MongoDB queries.
+
+*We are into creating a comprehensive feature availability chart for V1 release*
+
+    √ expression 5.1.1.6.1: NullValue eq null
+    √ expression 5.1.1.6.1: TrueValue eq true
+    √ expression 5.1.1.6.1: FalseValue eq false
+    √ expression 5.1.1.6.1: IntegerValue lt -128
+    √ expression 5.1.1.6.1: DecimalValue eq 34.95
+    √ expression 5.1.1.6.1: StringValue eq 'Say Hello,then go'
+    √ expression 5.1.1.6.1: DurationValue eq duration'P12DT23H59M59.999999999999S'
+    √ expression 5.1.1.6.1: DateValue eq 2012-12-03
+    √ expression 5.1.1.6.1: DateTimeOffsetValue eq 2012-12-03T07:16:23Z
+    √ expression 5.1.1.6.1: GuidValue eq 01234567-89ab-cdef-0123-456789abcdef
+    √ expression 5.1.1.6.1: Int64Value eq 0
+    √ expression 5.1.1.6.1: A eq INF
+    √ expression 5.1.1.6.1: A eq 0.31415926535897931e1
+    √ expression 5.1.1.1.2: A ne 1
+    √ expression 5.1.1.1.3: A gt 2
+    √ expression 5.1.1.1.4: A ge 3
+    √ expression 5.1.1.1.5: A lt 2
+    √ expression 5.1.1.1.6: A le 2
+    √ expression: A/b eq 1
+    √ expression 5.1.1.3: (A/b eq 2) or (B/c lt 4) and ((E gt 5) or (E lt -1))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/odata-v4-mongodb",
-  "version": "2.5.3-beta.11",
+  "version": "2.5.3-beta.12",
   "description": "Service OData requests from a MongoDB data store",
   "main": "lib/index.js",
   "directories": {
@@ -26,12 +26,12 @@
   },
   "homepage": "https://github.com/jaystack/odata-v4-mongodb#readme",
   "dependencies": {
-    "@steedos/odata-v4-parser": "2.5.3-beta.11",
+    "@steedos/odata-v4-parser": "2.5.3-beta.12",
     "odata-v4-literal": "^0.1.0"
   },
   "private": false,
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "90a5790974f858323e534c321f96643da576d260"
+  "gitHead": "79e9dfbd0bf19a0979f29d2a055cf6e2ea847997"
 }

package/src/index.ts

@@ -1,41 +1,41 @@
-/*
- * @Author: baozhoutao@steedos.com
- * @Date: 2022-07-10 15:44:34
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-07-10 17:09:22
- * @Description: 
- */
-import { Visitor } from "./visitor"
-import { filter, query } from "@steedos/odata-v4-parser"
-
-/**
- * Creates MongoDB collection, query, projection, sort, skip and limit from an OData URI string
- * @param {string} queryString - An OData query string
- * @return {Visitor} Visitor instance object with collection, query, projection, sort, skip and limit
- * @example
- * const query = createQuery("$filter=Size eq 4&$orderby=Orders&$skip=10&$top=5");
- * collections[query.collection].find(query.query).project(query.projection).sort(query.sort).skip(query.skip).limit(query.limit).toArray(function(err, data){ ... });
- */
-export function createQuery(odataQuery:string);
-export function createQuery(odataQuery:any);
-export function createQuery(odataQuery:string | any){
-    let ast:any = <any>(typeof odataQuery == "string" ? query(<string>odataQuery) : odataQuery);
-    return new Visitor().Visit(ast);
-}
-
-/**
- * Creates a MongoDB query object from an OData filter expression string
- * @param {string} odataFilter - A filter expression in OData $filter format
- * @return {Object}  MongoDB query object
- * @example
- * const filter = createFilter("Size eq 4 and Age gt 18");
- * collection.find(filter, function(err, data){ ... });
- */
-export function createFilter(odataFilter:string);
-export function createFilter(odataFilter:any);
-export function createFilter(odataFilter:string | any):Object{
-    let context = { query: {} };
-    let ast:any = <any>(typeof odataFilter == "string" ? filter(<string>odataFilter) : odataFilter);
-    new Visitor().Visit(ast, context);
-    return context.query;
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-07-10 15:44:34
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2022-07-10 17:09:22
+ * @Description: 
+ */
+import { Visitor } from "./visitor"
+import { filter, query } from "@steedos/odata-v4-parser"
+
+/**
+ * Creates MongoDB collection, query, projection, sort, skip and limit from an OData URI string
+ * @param {string} queryString - An OData query string
+ * @return {Visitor} Visitor instance object with collection, query, projection, sort, skip and limit
+ * @example
+ * const query = createQuery("$filter=Size eq 4&$orderby=Orders&$skip=10&$top=5");
+ * collections[query.collection].find(query.query).project(query.projection).sort(query.sort).skip(query.skip).limit(query.limit).toArray(function(err, data){ ... });
+ */
+export function createQuery(odataQuery:string);
+export function createQuery(odataQuery:any);
+export function createQuery(odataQuery:string | any){
+    let ast:any = <any>(typeof odataQuery == "string" ? query(<string>odataQuery) : odataQuery);
+    return new Visitor().Visit(ast);
+}
+
+/**
+ * Creates a MongoDB query object from an OData filter expression string
+ * @param {string} odataFilter - A filter expression in OData $filter format
+ * @return {Object}  MongoDB query object
+ * @example
+ * const filter = createFilter("Size eq 4 and Age gt 18");
+ * collection.find(filter, function(err, data){ ... });
+ */
+export function createFilter(odataFilter:string);
+export function createFilter(odataFilter:any);
+export function createFilter(odataFilter:string | any):Object{
+    let context = { query: {} };
+    let ast:any = <any>(typeof odataFilter == "string" ? filter(<string>odataFilter) : odataFilter);
+    new Visitor().Visit(ast, context);
+    return context.query;
 }

package/src/visitor.ts

@@ -1,312 +1,312 @@
-import { Literal } from "odata-v4-literal";
-
-export class Visitor{
-	query: any
-	sort: any
-	skip: number
-	limit: number
-	projection: any
-	collection: string
-	navigationProperty: string
-	includes:Visitor[]
-	inlinecount: boolean
-	ast:any
-
-	constructor(){
-		this.query = {};
-		this.sort = {};
-		this.projection = {};
-		this.includes = [];
-
-		let _ast;
-		Object.defineProperty(this, "ast", {
-			get: () => { return _ast; },
-			set: (v) => { _ast = v; },
-			enumerable: false
-		});
-	}
-
-	Visit(node:any, context?:any){
-		this.ast = this.ast || node;
-		context = context || {};
-
-		if (node){
-			var visitor = this[`Visit${node.type}`];
-			if (visitor) visitor.call(this, node, context);
-		}
-
-		return this;
-	}
-
-	protected VisitODataUri(node:any, context:any){
-		this.Visit(node.value.resource, context);
-		this.Visit(node.value.query, context);
-	}
-
-	protected VisitEntitySetName(node:any, context:any){
-		this.collection = node.value.name;
-	}
-
-	protected VisitExpand(node: any, context: any) {
-        var innerContexts:any = {};
-        node.value.items.forEach((item) => {
-            var expandPath = item.value.path.raw;
-            var innerVisitor = this.includes.filter(v => v.navigationProperty === expandPath)[0];
-            if (!innerVisitor){
-                innerVisitor = new Visitor();
-
-                innerContexts[expandPath] = {
-                    query: {},
-                    sort: {},
-                    projection: {},
-                    options: {}
-                };
-
-                this.includes.push(innerVisitor);
-            }
-
-            let innerContext:any = innerContexts[expandPath] || {};
-            innerVisitor.Visit(item, innerContext);
-
-            innerVisitor.query = innerContext.query || innerVisitor.query || {};
-            innerVisitor.sort = innerContext.sort || innerVisitor.sort;
-            innerVisitor.projection = innerContext.projection || innerVisitor.projection;
-        });
-    }
-
-    protected VisitExpandItem(node: any, context: any) {
-        this.Visit(node.value.path, context);
-        node.value.options && node.value.options.forEach((item) => this.Visit(item, context));
-    }
-
-    protected VisitExpandPath(node: any, context: any) {
-        this.navigationProperty = node.raw;
-    }
-
-	protected VisitQueryOptions(node:any, context:any){
-		context.options = {};
-		node.value.options.forEach((option) => this.Visit(option, context));
-
-		this.query = context.query || {};
-		delete context.query;
-
-		this.sort = context.sort;
-		delete context.sort;
-	}
-
-	protected VisitInlineCount(node:any, context:any){
-		this.inlinecount = Literal.convert(node.value.value, node.value.raw);
-	}
-
-	protected VisitFilter(node:any, context:any){
-		context.query = {};
-		this.Visit(node.value, context);
-		delete context.identifier;
-		delete context.literal;
-	}
-
-	protected VisitOrderBy(node:any, context:any){
-		context.sort = {};
-		node.value.items.forEach((item) => this.Visit(item, context));
-	}
-
-	protected VisitSkip(node:any, context:any){
-		this.skip = +node.value.raw;
-	}
-
-	protected VisitTop(node:any, context:any){
-		this.limit = +node.value.raw;
-	}
-
-	protected VisitOrderByItem(node:any, context:any){
-		this.Visit(node.value.expr, context);
-		if (context.identifier) context.sort[context.identifier] = node.value.direction;
-		delete context.identifier;
-		delete context.literal;
-	}
-
-	protected VisitSelect(node:any, context:any){
-		context.projection = {};
-		node.value.items.forEach((item) => this.Visit(item, context));
-
-		this.projection = context.projection;
-		delete context.projection;
-	}
-
-	protected VisitSelectItem(node:any, context:any){
-		context.projection[node.raw.replace(/\//g, '.')] = 1;
-	}
-
-	protected VisitAndExpression(node:any, context:any){
-		var query = context.query;
-		var leftQuery = {};
-		context.query = leftQuery;
-		this.Visit(node.value.left, context);
-
-		var rightQuery = {};
-		context.query = rightQuery;
-		this.Visit(node.value.right, context);
-
-		if (Object.keys(leftQuery).length > 0 && Object.keys(rightQuery).length > 0){
-			query.$and = [leftQuery, rightQuery];
-		}
-		context.query = query;
-	}
-
-	protected VisitOrExpression(node:any, context:any){
-		var query = context.query;
-		var leftQuery = {};
-		context.query = leftQuery;
-		this.Visit(node.value.left, context);
-
-		var rightQuery = {};
-		context.query = rightQuery;
-		this.Visit(node.value.right, context);
-
-		if (Object.keys(leftQuery).length > 0 && Object.keys(rightQuery).length > 0){
-			query.$or = [leftQuery, rightQuery];
-		}
-		context.query = query;
-	}
-
-	protected VisitBoolParenExpression(node:any, context:any){
-		this.Visit(node.value, context);
-	}
-
-	protected VisitCommonExpression(node:any, context:any){
-		this.Visit(node.value, context);
-	}
-
-	protected VisitFirstMemberExpression(node:any, context:any){
-		this.Visit(node.value, context);
-	}
-
-	protected VisitMemberExpression(node:any, context:any){
-		this.Visit(node.value, context);
-	}
-
-	protected VisitPropertyPathExpression(node:any, context:any){
-		if (node.value.current && node.value.next){
-			this.Visit(node.value.current, context);
-			if (context.identifier) context.identifier += ".";
-			this.Visit(node.value.next, context);
-		}else this.Visit(node.value, context);
-	}
-
-	protected VisitSingleNavigationExpression(node:any, context:any){
-		if (node.value.current && node.value.next){
-			this.Visit(node.value.current, context);
-			this.Visit(node.value.next, context);
-		}else this.Visit(node.value, context);
-	}
-
-	protected VisitODataIdentifier(node:any, context:any){
-		context.identifier = (context.identifier || "") + node.value.name;
-	}
-
-	protected VisitNotExpression(node:any, context:any){
-		this.Visit(node.value, context);
-		if (context.query){
-			for (var prop in context.query){
-				context.query[prop] = { $not: context.query[prop] };
-			}
-		}
-	}
-
-	protected VisitEqualsExpression(node:any, context:any){
-		this.Visit(node.value.left, context);
-		this.Visit(node.value.right, context);
-
-		if (context.identifier) context.query[context.identifier] = context.literal;
-		delete context.identifier;
-		delete context.literal;
-	}
-
-	protected VisitNotEqualsExpression(node:any, context:any){
-		this.Visit(node.value.left, context);
-		this.Visit(node.value.right, context);
-		if (context.identifier) context.query[context.identifier] = { $ne: context.literal };
-		delete context.identifier;
-		delete context.literal;
-	}
-
-	protected VisitInExpression(node:any, context:any){
-        this.Visit(node.value.left, context);
-        this.Visit(node.value.right, context);
-        if (context.identifier)
-            context.query[context.identifier] = {
-                $in: JSON.parse(`[${node.value.right.raw.replace(/\'/g, "\"").slice(1).slice(0, -1)}]`)
-            };
-        delete context.identifier;
-        delete context.literal;
-    };
-
-	protected VisitNotInExpression(node:any, context:any){
-        this.Visit(node.value.left, context);
-        this.Visit(node.value.right, context);
-        if (context.identifier)
-            context.query[context.identifier] = {
-                $nin: JSON.parse(`[${node.value.right.raw.replace(/\'/g, "\"").slice(1).slice(0, -1)}]`)
-            };
-        delete context.identifier;
-        delete context.literal;
-    };
-
-	protected VisitLesserThanExpression(node:any, context:any){
-		this.Visit(node.value.left, context);
-		this.Visit(node.value.right, context);
-		if (context.identifier) context.query[context.identifier] = { $lt: context.literal };
-		delete context.identifier;
-		delete context.literal;
-	}
-
-	protected VisitLesserOrEqualsExpression(node:any, context:any){
-		this.Visit(node.value.left, context);
-		this.Visit(node.value.right, context);
-		if (context.identifier) context.query[context.identifier] = { $lte: context.literal };
-		delete context.identifier;
-		delete context.literal;
-	}
-
-	protected VisitGreaterThanExpression(node:any, context:any){
-		this.Visit(node.value.left, context);
-		this.Visit(node.value.right, context);
-		if (context.identifier) context.query[context.identifier] = { $gt: context.literal };
-		delete context.identifier;
-		delete context.literal;
-	}
-
-	protected VisitGreaterOrEqualsExpression(node:any, context:any){
-		this.Visit(node.value.left, context);
-		this.Visit(node.value.right, context);
-		if (context.identifier) context.query[context.identifier] = { $gte: context.literal };
-		delete context.identifier;
-		delete context.literal;
-	}
-
-	protected VisitLiteral(node:any, context:any){
-		context.literal = Literal.convert(node.value, node.raw);
-	}
-
-	protected VisitMethodCallExpression(node: any, context: any) {
-		var method = node.value.method;
-		(node.value.parameters || []).forEach(p => this.Visit(p, context));
-		if (context.identifier) {
-			switch (method) {
-				case "contains":
-					context.query[context.identifier] = new RegExp(context.literal, "gi");
-					break;
-				case "endswith":
-					context.query[context.identifier] = new RegExp(context.literal + "$", "gi");
-					break;
-				case "startswith":
-					context.query[context.identifier] = new RegExp("^" + context.literal, "gi");
-					break;
-				default:
-					throw new Error("Method call not implemented.")
-			}
-			delete context.identifier;
-		}
-	}
-
-}
+import { Literal } from "odata-v4-literal";
+
+export class Visitor{
+	query: any
+	sort: any
+	skip: number
+	limit: number
+	projection: any
+	collection: string
+	navigationProperty: string
+	includes:Visitor[]
+	inlinecount: boolean
+	ast:any
+
+	constructor(){
+		this.query = {};
+		this.sort = {};
+		this.projection = {};
+		this.includes = [];
+
+		let _ast;
+		Object.defineProperty(this, "ast", {
+			get: () => { return _ast; },
+			set: (v) => { _ast = v; },
+			enumerable: false
+		});
+	}
+
+	Visit(node:any, context?:any){
+		this.ast = this.ast || node;
+		context = context || {};
+
+		if (node){
+			var visitor = this[`Visit${node.type}`];
+			if (visitor) visitor.call(this, node, context);
+		}
+
+		return this;
+	}
+
+	protected VisitODataUri(node:any, context:any){
+		this.Visit(node.value.resource, context);
+		this.Visit(node.value.query, context);
+	}
+
+	protected VisitEntitySetName(node:any, context:any){
+		this.collection = node.value.name;
+	}
+
+	protected VisitExpand(node: any, context: any) {
+        var innerContexts:any = {};
+        node.value.items.forEach((item) => {
+            var expandPath = item.value.path.raw;
+            var innerVisitor = this.includes.filter(v => v.navigationProperty === expandPath)[0];
+            if (!innerVisitor){
+                innerVisitor = new Visitor();
+
+                innerContexts[expandPath] = {
+                    query: {},
+                    sort: {},
+                    projection: {},
+                    options: {}
+                };
+
+                this.includes.push(innerVisitor);
+            }
+
+            let innerContext:any = innerContexts[expandPath] || {};
+            innerVisitor.Visit(item, innerContext);
+
+            innerVisitor.query = innerContext.query || innerVisitor.query || {};
+            innerVisitor.sort = innerContext.sort || innerVisitor.sort;
+            innerVisitor.projection = innerContext.projection || innerVisitor.projection;
+        });
+    }
+
+    protected VisitExpandItem(node: any, context: any) {
+        this.Visit(node.value.path, context);
+        node.value.options && node.value.options.forEach((item) => this.Visit(item, context));
+    }
+
+    protected VisitExpandPath(node: any, context: any) {
+        this.navigationProperty = node.raw;
+    }
+
+	protected VisitQueryOptions(node:any, context:any){
+		context.options = {};
+		node.value.options.forEach((option) => this.Visit(option, context));
+
+		this.query = context.query || {};
+		delete context.query;
+
+		this.sort = context.sort;
+		delete context.sort;
+	}
+
+	protected VisitInlineCount(node:any, context:any){
+		this.inlinecount = Literal.convert(node.value.value, node.value.raw);
+	}
+
+	protected VisitFilter(node:any, context:any){
+		context.query = {};
+		this.Visit(node.value, context);
+		delete context.identifier;
+		delete context.literal;
+	}
+
+	protected VisitOrderBy(node:any, context:any){
+		context.sort = {};
+		node.value.items.forEach((item) => this.Visit(item, context));
+	}
+
+	protected VisitSkip(node:any, context:any){
+		this.skip = +node.value.raw;
+	}
+
+	protected VisitTop(node:any, context:any){
+		this.limit = +node.value.raw;
+	}
+
+	protected VisitOrderByItem(node:any, context:any){
+		this.Visit(node.value.expr, context);
+		if (context.identifier) context.sort[context.identifier] = node.value.direction;
+		delete context.identifier;
+		delete context.literal;
+	}
+
+	protected VisitSelect(node:any, context:any){
+		context.projection = {};
+		node.value.items.forEach((item) => this.Visit(item, context));
+
+		this.projection = context.projection;
+		delete context.projection;
+	}
+
+	protected VisitSelectItem(node:any, context:any){
+		context.projection[node.raw.replace(/\//g, '.')] = 1;
+	}
+
+	protected VisitAndExpression(node:any, context:any){
+		var query = context.query;
+		var leftQuery = {};
+		context.query = leftQuery;
+		this.Visit(node.value.left, context);
+
+		var rightQuery = {};
+		context.query = rightQuery;
+		this.Visit(node.value.right, context);
+
+		if (Object.keys(leftQuery).length > 0 && Object.keys(rightQuery).length > 0){
+			query.$and = [leftQuery, rightQuery];
+		}
+		context.query = query;
+	}
+
+	protected VisitOrExpression(node:any, context:any){
+		var query = context.query;
+		var leftQuery = {};
+		context.query = leftQuery;
+		this.Visit(node.value.left, context);
+
+		var rightQuery = {};
+		context.query = rightQuery;
+		this.Visit(node.value.right, context);
+
+		if (Object.keys(leftQuery).length > 0 && Object.keys(rightQuery).length > 0){
+			query.$or = [leftQuery, rightQuery];
+		}
+		context.query = query;
+	}
+
+	protected VisitBoolParenExpression(node:any, context:any){
+		this.Visit(node.value, context);
+	}
+
+	protected VisitCommonExpression(node:any, context:any){
+		this.Visit(node.value, context);
+	}
+
+	protected VisitFirstMemberExpression(node:any, context:any){
+		this.Visit(node.value, context);
+	}
+
+	protected VisitMemberExpression(node:any, context:any){
+		this.Visit(node.value, context);
+	}
+
+	protected VisitPropertyPathExpression(node:any, context:any){
+		if (node.value.current && node.value.next){
+			this.Visit(node.value.current, context);
+			if (context.identifier) context.identifier += ".";
+			this.Visit(node.value.next, context);
+		}else this.Visit(node.value, context);
+	}
+
+	protected VisitSingleNavigationExpression(node:any, context:any){
+		if (node.value.current && node.value.next){
+			this.Visit(node.value.current, context);
+			this.Visit(node.value.next, context);
+		}else this.Visit(node.value, context);
+	}
+
+	protected VisitODataIdentifier(node:any, context:any){
+		context.identifier = (context.identifier || "") + node.value.name;
+	}
+
+	protected VisitNotExpression(node:any, context:any){
+		this.Visit(node.value, context);
+		if (context.query){
+			for (var prop in context.query){
+				context.query[prop] = { $not: context.query[prop] };
+			}
+		}
+	}
+
+	protected VisitEqualsExpression(node:any, context:any){
+		this.Visit(node.value.left, context);
+		this.Visit(node.value.right, context);
+
+		if (context.identifier) context.query[context.identifier] = context.literal;
+		delete context.identifier;
+		delete context.literal;
+	}
+
+	protected VisitNotEqualsExpression(node:any, context:any){
+		this.Visit(node.value.left, context);
+		this.Visit(node.value.right, context);
+		if (context.identifier) context.query[context.identifier] = { $ne: context.literal };
+		delete context.identifier;
+		delete context.literal;
+	}
+
+	protected VisitInExpression(node:any, context:any){
+        this.Visit(node.value.left, context);
+        this.Visit(node.value.right, context);
+        if (context.identifier)
+            context.query[context.identifier] = {
+                $in: JSON.parse(`[${node.value.right.raw.replace(/\'/g, "\"").slice(1).slice(0, -1)}]`)
+            };
+        delete context.identifier;
+        delete context.literal;
+    };
+
+	protected VisitNotInExpression(node:any, context:any){
+        this.Visit(node.value.left, context);
+        this.Visit(node.value.right, context);
+        if (context.identifier)
+            context.query[context.identifier] = {
+                $nin: JSON.parse(`[${node.value.right.raw.replace(/\'/g, "\"").slice(1).slice(0, -1)}]`)
+            };
+        delete context.identifier;
+        delete context.literal;
+    };
+
+	protected VisitLesserThanExpression(node:any, context:any){
+		this.Visit(node.value.left, context);
+		this.Visit(node.value.right, context);
+		if (context.identifier) context.query[context.identifier] = { $lt: context.literal };
+		delete context.identifier;
+		delete context.literal;
+	}
+
+	protected VisitLesserOrEqualsExpression(node:any, context:any){
+		this.Visit(node.value.left, context);
+		this.Visit(node.value.right, context);
+		if (context.identifier) context.query[context.identifier] = { $lte: context.literal };
+		delete context.identifier;
+		delete context.literal;
+	}
+
+	protected VisitGreaterThanExpression(node:any, context:any){
+		this.Visit(node.value.left, context);
+		this.Visit(node.value.right, context);
+		if (context.identifier) context.query[context.identifier] = { $gt: context.literal };
+		delete context.identifier;
+		delete context.literal;
+	}
+
+	protected VisitGreaterOrEqualsExpression(node:any, context:any){
+		this.Visit(node.value.left, context);
+		this.Visit(node.value.right, context);
+		if (context.identifier) context.query[context.identifier] = { $gte: context.literal };
+		delete context.identifier;
+		delete context.literal;
+	}
+
+	protected VisitLiteral(node:any, context:any){
+		context.literal = Literal.convert(node.value, node.raw);
+	}
+
+	protected VisitMethodCallExpression(node: any, context: any) {
+		var method = node.value.method;
+		(node.value.parameters || []).forEach(p => this.Visit(p, context));
+		if (context.identifier) {
+			switch (method) {
+				case "contains":
+					context.query[context.identifier] = new RegExp(context.literal, "gi");
+					break;
+				case "endswith":
+					context.query[context.identifier] = new RegExp(context.literal + "$", "gi");
+					break;
+				case "startswith":
+					context.query[context.identifier] = new RegExp("^" + context.literal, "gi");
+					break;
+				default:
+					throw new Error("Method call not implemented.")
+			}
+			delete context.identifier;
+		}
+	}
+
+}