nodester 0.6.3 → 0.6.5

package/lib/middlewares/ql/sequelize/index.js

@@ -18,7 +18,7 @@ module.exports = function initNodesterQL() {
 	return nqlHandle;
 };
 
-function nqlHandle(req, res, next) {
+async function nqlHandle(req, res, next) {
 	// Object, which will be populated with parsed query.
 	req.nquery = {};
 
@@ -37,9 +37,10 @@ function nqlHandle(req, res, next) {
 
 		const decoded = decodeQueryString(queryString);
 		const lexer = new QueryLexer(decoded);
+		const nquery = await lexer.parse();
 
 		// Go on!
-		req.nquery = lexer.query;
+		req.nquery = nquery;
 		return next();
 	}
 	catch(error) {

package/lib/middlewares/ql/sequelize/interpreter/QueryLexer.js

@@ -74,27 +74,24 @@ const FN_TOKENS = new Enum({
 module.exports = class QueryLexer {
 	constructor(queryString='') {
 		this.tree = new ModelsTree();
-		this.query = !!queryString ?
-									this.parse(queryString).toObject()
-									:
-									{};
+		this.queryString = queryString;
 	}
 
-	parse(queryString='', tree=this.tree) {
+	async parse(queryString=this.queryString, tree=this.tree) {
 		if (typeof queryString !== 'string') {
 			const err = new TypeError(`Invalid 'queryString'.`);
-			throw err;
+			return Promise.reject(err);
 		}
 
 		// You never know if it's encoded or not.
 		const decoded = decodeURI(queryString);
 
-		this.parseIsolatedQuery(decoded, 0, this.tree);
+		await this.parseIsolatedQuery(decoded, 0, this.tree);
 
-		return this.tree.root;
+		return Promise.resolve(this.tree.root.toObject());
 	}
 
-	parseIsolatedQuery(queryString='', startAt=0, tree) {
+	async parseIsolatedQuery(queryString='', startAt=0, tree) {
 		const isSubQuery = tree.node.model !== 'root';
 
 		// Token is a String, accumulated char-by-char.
@@ -137,7 +134,7 @@ module.exports = class QueryLexer {
 
 				// Process subquery:
 				i++;
-				const [ charsCount ] = this.parseIsolatedQuery(queryString, i, tree);
+				const [ charsCount ] = await this.parseIsolatedQuery(queryString, i, tree);
 				i += charsCount;
 
 				previousActive = model;
@@ -159,7 +156,7 @@ module.exports = class QueryLexer {
 					// If token is empty, error:
 					if (token === '') {
 						const err = UnexpectedCharError(i, char);
-						throw err;
+						return Promise.reject(err);
 					}
 
 					// Structure of a value depends on OP:
@@ -183,18 +180,18 @@ module.exports = class QueryLexer {
 					// If this param is already in WHERE,
 					// treat it like SQL AND:
 					if (tree.node.where[tree.node.activeParam]) {
-						// If this OP is already in the set:
+						// If this OP is already in the set,
+						// concatenate arrays:
 						if (tree.node.where[tree.node.activeParam][tree.node.op]) {
-							tree.node.where[tree.node.activeParam][tree.node.op] = [
-								...tree.node.where[tree.node.activeParam][tree.node.op],
-								...fullOp[tree.node.activeParam][tree.node.op]
-							]
+							Array.prototype.push.apply(
+								tree.node.where[tree.node.activeParam][tree.node.op],
+								fullOp[tree.node.activeParam][tree.node.op]
+							);
 						}
 						else {
-							tree.node.where[tree.node.activeParam] = {
-								...tree.node.where[tree.node.activeParam],
-								...fullOp[tree.node.activeParam]
-							}
+							const existingOps = tree.node.where[tree.node.activeParam];
+							const newOps = fullOp[tree.node.activeParam];
+							tree.node.where[tree.node.activeParam] = Object.assign({}, existingOps, newOps);
 						}
 					}
 					else {
@@ -311,7 +308,7 @@ module.exports = class QueryLexer {
 				}
 
 				const err = UnexpectedCharError(i, char);
-				throw err;
+				return Promise.reject(err);
 			}
 
 			// . can mean:
@@ -342,7 +339,7 @@ module.exports = class QueryLexer {
 				}
 
 				const err = UnexpectedCharError(i, char);
-				throw err;
+				return Promise.reject(err);
 			}
 
 			// + can only mean horizontal include:
@@ -365,7 +362,7 @@ module.exports = class QueryLexer {
 
 				if (tree.node.hasParent === false) {
 					const err = UnexpectedCharError(i, char);
-					throw err;
+					return Promise.reject(err);
 				}
 
 				tree.up();
@@ -383,7 +380,7 @@ module.exports = class QueryLexer {
 				// If any OP at all:
 				if (!!tree.node.op) {
 					const err = MissingCharError(i+1, ')');
-					throw err;
+					return Promise.reject(err);
 				}
 
 				// If end of a key=value pair:
@@ -407,7 +404,7 @@ module.exports = class QueryLexer {
 					// then it's a syntactic error:
 					if (token.length > 0) {
 						const err = new NodesterQueryError(`unrecognized char at position ${ i }: Unknown token '${ token }'`);
-						throw err;
+						return Promise.reject(err);
 					}
 
 					// Reset:
@@ -455,7 +452,7 @@ module.exports = class QueryLexer {
 
 				// Unknown case:
 				const err = UnexpectedCharError(i, char);
-				throw err;
+				return Promise.reject(err);
 			}
 			
 			// [ can mean:
@@ -468,7 +465,7 @@ module.exports = class QueryLexer {
 					}
 					else {
 						const err = UnexpectedCharError(i - token.length, token);
-						throw err;
+						return Promise.reject(err);
 					}
 				}
 
@@ -487,7 +484,7 @@ module.exports = class QueryLexer {
 					tree.node.op !== OP_TOKENS.NOT_IN
 				) {
 					const err = UnexpectedCharError(i, char);
-					throw err;
+					return Promise.reject(err);
 				}
 
 				// Token is the last element in this array:
@@ -515,7 +512,7 @@ module.exports = class QueryLexer {
 
 				if (isSubQuery === true && param === PARAM_TOKENS.INCLUDES) {
 					const err = new NodesterQueryError(`'include' is forbidden inside subquery (position ${ i }). Use: 'model.submodel' or 'model.submodel1+submodel2'.`);
-					throw err;
+					return Promise.reject(err);
 				}
 
 				tree.node.activeParam = param;
@@ -533,19 +530,19 @@ module.exports = class QueryLexer {
 				// haven't up from 'in':
 				if (tree.node.op === 'in') {
 					const err = MissingCharError(i+1, ']');
-					throw err;
+					return Promise.reject(err);
 				}
 
 				// If any Function:
 				if (!!tree.node.fn) {
 					const err = MissingCharError(i+1, ')');
-					throw err;
+					return Promise.reject(err);
 				}
 
 				// If any OP at all:
 				if (!!tree.node.op) {
 					const err = MissingCharError(i+1, ')');
-					throw err;
+					return Promise.reject(err);
 				}
 				
 				this.setNodeParam(tree.node, token, value);
@@ -558,7 +555,8 @@ module.exports = class QueryLexer {
 			}
 		}
 
-		return [ queryString.length - startAt ];
+		// Must return it's portion of chars.
+		return Promise.resolve([ queryString.length - startAt ]);
 	}
 
 	parseParamFromToken(token) {

package/lib/models/mixins.js

@@ -212,10 +212,8 @@ async function _updateOne(
 
 		// Will contain data from parent instance and associations.
 		const fullInstanceData = instance.toJSON();
+		const parentData = { ...data };
 
-		const parentData = {
-			...data
-		}
 		for (let includeConfig of include) {
 			const { association } = includeConfig;
 
@@ -223,6 +221,7 @@ async function _updateOne(
 				continue;
 			}
 
+			// Remove association from parentData (handled separately)
 			delete parentData[association];
 
 			const associationDefinition = this.associations[association];
@@ -246,6 +245,15 @@ async function _updateOne(
 			// If association type is HasMany or HasOne (We don't work with any other):
 			switch(associationType) {
 				case 'HasMany': {
+					// Handle empty array (remove all old associations):
+					if (Array.isArray(includeData) && includeData.length === 0) {
+						const where = {
+							[foreignKey]: instance.id 
+						}
+						await associatedModel.destroy({ where });
+						fullInstanceData[association] = [];
+					}
+
 					const promises = includeData.map(singleData => {
 						// Note: for now we are only able to work with a model with single PrimaryKey:
 						const where = {
@@ -263,16 +271,25 @@ async function _updateOne(
 				}
 
 				case 'HasOne': {
-					// Note: for now we are only able to work with a model with single PrimaryKey:
-					const where = {
-						[pkField]: includeData[pkField]
+					// Handle null case (remove old association)
+					if (includeData === null) {
+						const where = {
+							[foreignKey]: instance.id
+						}
+						await associatedModel.destroy({ where });
+						fullInstanceData[association] = null;
+					}
+					else {
+						// Note: for now we are only able to work with a model with single PrimaryKey:
+						const where = {
+							[pkField]: includeData[pkField]
+						}
+						fullInstanceData[association] = await associatedModel.updateOne(
+																							where,
+																							includeData,
+																							associationUpdateOpts
+																						);
 					}
-					fullInstanceData[association] = await associatedModel.updateOne(
-																						where,
-																						includeData,
-																						associationUpdateOpts
-																					);
-
 					continue;
 				}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodester",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "description": "A versatile REST framework for Node.js",
   "directories": {
     "docs": "docs",

package/tests/nql.test.js

@@ -23,9 +23,9 @@ describe('nodester Query Language', () => {
 			'id=10&position=4&limit=3&skip=10&order=desc&order_by=index&a=id,content,position,created_at',
 		];
 
-		it('Simple where', () => {
+		it('Simple where', async () => {
 			const lexer = new QueryLexer( queryStrings[0] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.node.addWhere({ id: ['10'] });
@@ -34,9 +34,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		it('Only certain attributes', () => {
+		it('Only certain attributes', async () => {
 			const lexer = new QueryLexer( queryStrings[1] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.node.attributes = [ 'id', 'text' ];
@@ -45,9 +45,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('All possible params', () => {
+		test('All possible params', async () => {
 			const lexer = new QueryLexer( queryStrings[2] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 
 			const tree = new ModelsTree();
@@ -86,9 +86,9 @@ describe('nodester Query Language', () => {
 			'separated-includes': 'includes=comments(order=rand)&id=7&limit=3&includes=users(a=id,content)',
 		};
 
-		test('Simple includes', () => {
+		test('Simple includes', async () => {
 			const lexer = new QueryLexer( queryStrings['simple-includes'] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 
 			const tree = new ModelsTree();
@@ -99,9 +99,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('Include with all possible params', () => {
+		test('Include with all possible params', async () => {
 			const lexer = new QueryLexer( queryStrings['include-with-params'] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.include('comments').use('comments');
@@ -116,9 +116,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('2 horizontals', () => {
+		test('2 horizontals', async () => {
 			const lexer = new QueryLexer( queryStrings['2-horizontals'] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 
 			const tree = new ModelsTree();
@@ -130,11 +130,11 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('4 horizontals', () => {
+		test('4 horizontals', async () => {
 			// in=categories,replies.users,comments(order_by=position&order=desc),users.avatars
 
 			const lexer = new QueryLexer( queryStrings['4-horizontals'] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 
 			const tree = new ModelsTree();
@@ -161,9 +161,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('Horizontals queried', () => {
+		test('Horizontals queried', async () => {
 			const lexer = new QueryLexer( queryStrings['horizontals-queried'] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 
 			const tree = new ModelsTree();
@@ -181,9 +181,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('Horizontals queried №2', () => {
+		test('Horizontals queried №2', async () => {
 			const lexer = new QueryLexer( queryStrings['horizontals-queried-2'] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.include('comments').use('comments');
@@ -199,9 +199,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('Horizontals queried №3', () => {
+		test('Horizontals queried №3', async () => {
 			const lexer = new QueryLexer( queryStrings['horizontals-queried-3'] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.include('reactions');
@@ -226,9 +226,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('Separated includes"', () => {
+		test('Separated includes"', async () => {
 			const lexer = new QueryLexer( queryStrings['separated-includes'] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.node.addWhere({ id: ['7'] });
@@ -262,9 +262,9 @@ describe('nodester Query Language', () => {
 			'includes=comments(order=desc).users+likes(order=rand&order_by=position)&id=1000',
 		];
 
-		test('Simple subinclude', () => {
+		test('Simple subinclude', async () => {
 			const lexer = new QueryLexer( queryStrings[0] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 
 			const tree = new ModelsTree();
@@ -275,9 +275,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('Deep subincludes', () => {
+		test('Deep subincludes', async () => {
 			const lexer = new QueryLexer( queryStrings[1] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 
 			const tree = new ModelsTree();
@@ -291,9 +291,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('Simple horizontal subinclude, "+" syntaxis"', () => {
+		test('Simple horizontal subinclude, "+" syntaxis"', async () => {
 			const lexer = new QueryLexer( queryStrings[2] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 
 			const tree = new ModelsTree();
@@ -305,9 +305,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('Subinclude query', () => {
+		test('Subinclude query', async () => {
 			const lexer = new QueryLexer( queryStrings[3] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 
 			const tree = new ModelsTree();
@@ -320,9 +320,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('Complex subincludes query, "+" syntaxis', () => {
+		test('Complex subincludes query, "+" syntaxis', async () => {
 			const lexer = new QueryLexer( queryStrings[4] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 
 			const tree = new ModelsTree();
@@ -348,9 +348,9 @@ describe('nodester Query Language', () => {
 			'|(index=2,position=5)',
 		];
 
-		test('"OR" simple', () => {
+		test('"OR" simple', async () => {
 			const lexer = new QueryLexer( queryStrings[0] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.node.addWhere({ or: [ { index: ['2'] }, { position: ['5'] } ] });
@@ -359,9 +359,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('"OR" short', () => {
+		test('"OR" short', async () => {
 			const lexer = new QueryLexer( queryStrings[1] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.node.addWhere({ or: [ { index: ['2'] }, { position: ['5'] } ] });
@@ -381,9 +381,9 @@ describe('nodester Query Language', () => {
 			'includes=comments(id=not(7))'
 		];
 
-		test('"NOT" simple', () => {
+		test('"NOT" simple', async () => {
 			const lexer = new QueryLexer( queryStrings[0] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.node.addWhere({ key: { not: ['main'] } });
@@ -392,9 +392,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('"NOT" short', () => {
+		test('"NOT" short', async () => {
 			const lexer = new QueryLexer( queryStrings[1] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.node.addWhere({ key: { not: ['main'] } });
@@ -403,9 +403,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('"NOT" inside includes', () => {
+		test('"NOT" inside includes', async () => {
 			const lexer = new QueryLexer( queryStrings[2] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.include('comments').use('comments');
@@ -428,9 +428,9 @@ describe('nodester Query Language', () => {
 			'title=!like(some_text)',
 		];
 
-		test('"Like" simple', () => {
+		test('"Like" simple', async () => {
 			const lexer = new QueryLexer( queryStrings[0] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.node.addWhere({ title: { like: ['some_text'] }});
@@ -439,9 +439,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('"NotLike" simple', () => {
+		test('"NotLike" simple', async () => {
 			const lexer = new QueryLexer( queryStrings[1] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.node.addWhere({ title: { notLike: ['some_text'] }});
@@ -450,9 +450,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('"NotLike" short', () => {
+		test('"NotLike" short', async () => {
 			const lexer = new QueryLexer( queryStrings[2] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.node.addWhere({ title: { notLike: ['some_text'] }});
@@ -471,9 +471,9 @@ describe('nodester Query Language', () => {
 			'status=[REVIEWED,ANSWERED]&limit=3',
 		];
 
-		test('"IN" simple', () => {
+		test('"IN" simple', async () => {
 			const lexer = new QueryLexer( queryStrings[0] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.node.addWhere({ status: { in: ['REVIEWED', 'ANSWERED'] }});
@@ -482,9 +482,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('"IN" and "limit" clause', () => {
+		test('"IN" and "limit" clause', async () => {
 			const lexer = new QueryLexer( queryStrings[1] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.node.limit = 3;
@@ -513,9 +513,9 @@ describe('nodester Query Language', () => {
 			'in=comments.likes(index=gt(60))'
 		];
 
-		test('Greater than', () => {
+		test('Greater than', async () => {
 			const lexer = new QueryLexer( queryStrings[0] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 
 			const tree = new ModelsTree();
@@ -525,9 +525,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('Greater than or equal to', () => {
+		test('Greater than or equal to', async () => {
 			const lexer = new QueryLexer( queryStrings[1] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 
 			const tree = new ModelsTree();
@@ -537,9 +537,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('Lower than', () => {
+		test('Lower than', async () => {
 			const lexer = new QueryLexer( queryStrings[2] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 
 			const tree = new ModelsTree();
@@ -549,9 +549,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('Lower than or equal to', () => {
+		test('Lower than or equal to', async () => {
 			const lexer = new QueryLexer( queryStrings[3] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 
 			const tree = new ModelsTree();
@@ -561,9 +561,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('Greater than in subinclude', () => {
+		test('Greater than in subinclude', async () => {
 			const lexer = new QueryLexer( queryStrings[4] );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 
 			const tree = new ModelsTree();
@@ -586,9 +586,9 @@ describe('nodester Query Language', () => {
 			and_in_subincludes_2: 'title=like(book),notLike(book #3)&in=comments(text=like(hi),notLike(hi!))',
 		}
 
-		test('AND (simple)', () => {
+		test('AND (simple)', async () => {
 			const lexer = new QueryLexer( queryStrings.and_simple );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.node.addWhere({ id: { gte: ['2'], lt: ['5'] }});
@@ -597,9 +597,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('AND (more OP)', () => {
+		test('AND (more OP)', async () => {
 			const lexer = new QueryLexer( queryStrings.and_more_op );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.node.addWhere({
@@ -610,9 +610,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('AND (in subincludes #0)', () => {
+		test('AND (in subincludes #0)', async () => {
 			const lexer = new QueryLexer( queryStrings.and_in_subincludes_0 );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.include('comments').use('comments');
@@ -624,9 +624,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('AND (in subincludes #1)', () => {
+		test('AND (in subincludes #1)', async () => {
 			const lexer = new QueryLexer( queryStrings.and_in_subincludes_1 );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.node.addWhere({
@@ -641,9 +641,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('AND (in subincludes #2)', () => {
+		test('AND (in subincludes #2)', async () => {
 			const lexer = new QueryLexer( queryStrings.and_in_subincludes_2 );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 			const tree = new ModelsTree();
 			tree.node.addWhere({
@@ -668,9 +668,9 @@ describe('nodester Query Language', () => {
 			count_and_includes: 'fn=count(comments)&in=comments',
 		}
 
-		test('Count (full key name)', () => {
+		test('Count (full key name)', async () => {
 			const lexer = new QueryLexer( queryStrings.count_long );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 
 			const tree = new ModelsTree();
@@ -683,9 +683,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('Count (short key name)', () => {
+		test('Count (short key name)', async () => {
 			const lexer = new QueryLexer( queryStrings.count_long );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 
 			const tree = new ModelsTree();
@@ -698,9 +698,9 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('Count and includes', () => {
+		test('Count and includes', async () => {
 			const lexer = new QueryLexer( queryStrings.count_and_includes );
-			const result = lexer.query;
+			const result = await lexer.parse();
 
 
 			const tree = new ModelsTree();