nodester 0.2.2 → 0.2.4

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

@@ -17,7 +17,7 @@ module.exports = function initNodesterQL() {
 	return nqlHandle;
 };
 
-async function nqlHandle(req, res, next) {
+function nqlHandle(req, res, next) {
 	// Object, which will be populated with parsed query.
 	req.nquery = {};
 

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

@@ -11,6 +11,15 @@ const { ModelsTree, ModelsTreeNode } = require('./ModelsTree');
 const util = require('util');
 const debug = require('debug')('nodester:interpreter:QueryLexer');
 
+const PARAM_TOKENS = new Enum({
+	FIELDS: Symbol('fields'),
+	INCLUDES: Symbol('includes'),
+	LIMIT: Symbol('limit'),
+	ORDER: Symbol('order'),
+	ORDER_BY: Symbol('order_by'),
+	SKIP: Symbol('skip'),
+});
+
 const OP_TOKENS = new Enum({
 	AND: 'and',
 	BETWEEN: 'between',
@@ -59,13 +68,12 @@ module.exports = class QueryLexer {
 
 	parseIsolatedQuery(queryString='', startAt=0, tree) {
 		const isSubQuery = tree.node.model !== 'root';
-		debug({ isSubQuery, startAt });
 
-		// Token is String, accumulated char-by-char.
+		// Token is a String, accumulated char-by-char.
 		let token = '';
 		// Value of param ('id=10' OR 'fields=id,text').
 		let value = [];
-		// Model, that was active before cursor went up in the tree.
+		// Model, that was active before a cursor went up in the tree.
 		let previousActive = null;
 
 		for (let i=startAt; i < queryString.length; i++) {
@@ -125,8 +133,12 @@ module.exports = class QueryLexer {
 					// Structure of a value depends on OP:
 					let fullOp = {};
 					switch (tree.node.op) {
-						case 'not':
-						case 'like':
+						case OP_TOKENS.NOT:
+						case OP_TOKENS.LIKE:
+						case OP_TOKENS.GREATER:
+						case OP_TOKENS.GREATER_OR_EQUAL:
+						case OP_TOKENS.LOWER:
+						case OP_TOKENS.LOWER_OR_EQUAL:
 							fullOp = { [tree.node.activeParam]: { [tree.node.op]: [token] } };
 							break;
 						default:
@@ -139,7 +151,7 @@ module.exports = class QueryLexer {
 
 					// Reset:
 					tree.node.resetOP();
-					tree.node.activeParam = 'includes';
+					tree.node.activeParam = PARAM_TOKENS.INCLUDES;
 					token = '';
 					value = [];
 					continue;
@@ -173,19 +185,23 @@ module.exports = class QueryLexer {
 
 					// Reset:
 					tree.node.resetFN();
-					tree.node.activeParam = 'includes';
+					tree.node.activeParam = PARAM_TOKENS.INCLUDES;
 					token = '';
 					value = [];
 					continue;
 				}
 
 				// If end of subquery:
-				if (!!tree.node.activeParam && tree.node.activeParam !== 'includes') {
+				if (!!tree.node.activeParam && tree.node.activeParam !== PARAM_TOKENS.INCLUDES) {
 					// Set value.
 					this.setNodeParam(tree.node, token, value);
+					
 					// Reset:
 					tree.node.resetActiveParam();
 					tree.node.resetOP();
+
+					// Lift from subquery.
+					tree.up();
 				}
 				const numberOfProcessedChars = i - startAt;
 				return [ numberOfProcessedChars ];
@@ -206,7 +222,7 @@ module.exports = class QueryLexer {
 				}
 
 				// If param value:
-				if (tree.node.activeParam !== 'includes') {
+				if (tree.node.activeParam !== PARAM_TOKENS.INCLUDES) {
 					value.push(token);
 					token = '';
 					continue;
@@ -218,7 +234,7 @@ module.exports = class QueryLexer {
 				}
 
 				// Horizontal include:
-				if (tree.node.activeParam === 'includes') {
+				if (tree.node.activeParam === PARAM_TOKENS.INCLUDES) {
 					const model = token;
 					tree.use(model) ?? tree.include(model);
 
@@ -227,7 +243,7 @@ module.exports = class QueryLexer {
 					tree.node.resetActiveParam();
 					tree.upToRoot();
 
-					tree.node.activeParam = 'includes';
+					tree.node.activeParam = PARAM_TOKENS.INCLUDES;
 
 					token = '';
 					continue;
@@ -245,7 +261,7 @@ module.exports = class QueryLexer {
 				// Vertical include:
 				if (!!previousActive) {
 					tree.use(previousActive);
-					tree.node.activeParam = 'includes';
+					tree.node.activeParam = PARAM_TOKENS.INCLUDES;
 					token = '';
 					continue;
 				}
@@ -256,7 +272,7 @@ module.exports = class QueryLexer {
 					tree.use(model) ?? tree.include(model).use(model);
 
 					// Prepare for more includes:
-					tree.node.activeParam = 'includes';
+					tree.node.activeParam = PARAM_TOKENS.INCLUDES;
 
 					token = '';
 					continue;
@@ -278,7 +294,7 @@ module.exports = class QueryLexer {
 					tree.up();
 
 					// Prepare for more includes:
-					tree.node.activeParam = 'includes';
+					tree.node.activeParam = PARAM_TOKENS.INCLUDES;
 
 					token = '';
 					continue;
@@ -290,12 +306,12 @@ module.exports = class QueryLexer {
 				}
 
 				tree.up();
-				tree.node.activeParam = 'includes';
+				tree.node.activeParam = PARAM_TOKENS.INCLUDES;
 
 				continue;
 			}
 
-			// & can mean the end of key=value pair,
+			// & can mean the end of key=value pair in root and sub query,
 			// or the end of subincludes:
 			if (char === '&') {
 				debug('char', char, { token, node: tree.node });
@@ -307,7 +323,7 @@ module.exports = class QueryLexer {
 				}
 
 				// If end of key=value pair:
-				if (!!tree.node.activeParam && tree.node.activeParam !== 'includes') {
+				if (!!tree.node.activeParam && tree.node.activeParam !== PARAM_TOKENS.INCLUDES) {
 					// Set value.
 					this.setNodeParam(tree.node, token, value);
 					// Reset:
@@ -316,13 +332,19 @@ module.exports = class QueryLexer {
 					value = [];
 					continue;
 				}
-				else if (tree.node.activeParam === 'includes') {
-					// If include of new model:
+				else if (tree.node.activeParam === PARAM_TOKENS.INCLUDES) {
+					// If token has some chars,
+					//	then it's include of a new model:
 					if (token.length > 0) {
 						const model = token;
 						// Just include, no use.
 						tree.include(model);
 					}
+					// If token is empty,
+					//	it's most possibly a subquery
+					else {
+						continue;
+					}
 
 					// Then jump to root.
 					tree.upToRoot();
@@ -382,7 +404,7 @@ module.exports = class QueryLexer {
 			if (char === '=') {
 				const param = this.parseParamFromToken(token);
 
-				if (isSubQuery === true && param === 'includes') {
+				if (isSubQuery === true && param === PARAM_TOKENS.INCLUDES) {
 					const err = new TypeError(`'include' is forbidden inside subquery (position ${ i }). Use: 'model.submodel' or 'model.submodel1+submodel2'.`);
 					throw err;
 				}
@@ -428,23 +450,29 @@ module.exports = class QueryLexer {
 		switch(token) {
 			case 'limit':
 			case 'l':
-				return 'limit';
+				return PARAM_TOKENS.LIMIT;
+
 			case 'skip':
 			case 's':
 			case 'offset':
-				return 'skip';
+				return PARAM_TOKENS.SKIP;
+
 			case 'order':
 			case 'o':
-				return 'order';
+				return PARAM_TOKENS.ORDER;
+
 			case 'order_by':
 			case 'o_by':
-				return 'order_by';
+				return PARAM_TOKENS.ORDER_BY;
+
 			case 'fields':
 			case 'f':
-				return 'fields';
+				return PARAM_TOKENS.FIELDS;
+
 			case 'includes':
 			case 'in':
-				return 'includes';
+				return PARAM_TOKENS.INCLUDES;
+
 			default:
 				return token;
 		}
@@ -453,34 +481,37 @@ module.exports = class QueryLexer {
 	setNodeParam(treeNode, token, value) {
 		const param = treeNode.activeParam;
 
-		debug(`set param ${ param }`, { token, value });
+		debug(`set param`, { param, token, value });
 
 		switch(param) {
-			case 'limit':
+			case PARAM_TOKENS.LIMIT:
 				treeNode.limit = parseInt(token);
 				break;
-			case 'skip':
-			case 'offset':
+
+			case PARAM_TOKENS.SKIP:
 				treeNode.skip = parseInt(token);
 				break;
-			case 'order':
+
+			case PARAM_TOKENS.ORDER:
 				treeNode.order = token;
 				break;
-			case 'order_by':
+
+			case PARAM_TOKENS.ORDER_BY:
 				treeNode.order_by = token;
 				break;
-			case 'fields':
-				if (token)
-					value.push(token);
+
+			case PARAM_TOKENS.FIELDS:
+				if (token) value.push(token);
 				treeNode.fields = value;
 				break;
-			case 'includes':
+
+			case PARAM_TOKENS.INCLUDES:
 				const node = new ModelsTreeNode(token);
 				treeNode.include(node);
 				break;
+
 			default:
-				if (token)
-					value.push(token);
+				if (token) value.push(token);
 				treeNode.addWhere({ [param]: value });
 				break;
 		}

package/lib/query/traverse.js

@@ -102,49 +102,57 @@ function traverse(queryNode, filter=null, model=null) {
 	// Functions:
 	for (const fnParams of functions) {
 
-		// If COUNT() is requested:
-		if (fnParams.fn === 'count') {
-			const countParams = fnParams.args;
-
-			const [ countTarget ] = countParams;
-			// Count can be requested for this model,
-			// or for any of the available uncludes.
-			const isForRootModel = countTarget === rootModelName.plural.toLowerCase();
-
-			// Compile request:
-			//	Example:
-			// `(SELECT COUNT(*) FROM comments WHERE comments.morph_id=Morph.id)`
-
-			// Params for attribute:
-			let rawSQL = '(SELECT COUNT(*) FROM ';
-			let countAttribute = '_count';
-
-			// If request to count one of the includes:
-			if (!isForRootModel) {
-				// Check if it's available:
-				if (
+		switch(fnParams.fn) {
+			// SQL COUNT():
+			case 'count': {
+				const countParams = fnParams.args;
+
+				const [ countTarget ] = countParams;
+				// Count can be requested for this model,
+				// or for any of the available uncludes.
+				const isForRootModel = countTarget === rootModelName.plural.toLowerCase();
+
+				// Compile request:
+				//	Example of desired SQL:
+				//	`(SELECT COUNT(*) FROM comments WHERE comments.post_id=Post.id)`
+				//
+				let rawSQL = '(SELECT COUNT(*) FROM ';
+				let countAttribute = 'count';
+
+				// If request to count one of the includes:
+				if (!isForRootModel) {
+					// Check if it's available:
+					if (
 						!filter
 						||
 						!filter?.includes[countTarget]
 						||
 						rootModelAssociations[countTarget] === undefined
 					) {
-					const err = new NodesterQueryError(`Count for '${ countTarget }' is not available.`);
-					Error.captureStackTrace(err, traverse);
-					throw err;
+						const err = new NodesterQueryError(`Count for '${ countTarget }' is not available.`);
+						Error.captureStackTrace(err, traverse);
+						throw err;
+					}
+
+					const {
+						as,
+						target,
+						foreignKey,
+						sourceKey
+					} = rootModelAssociations[countTarget];
+					const { tableName } = target;
+
+					rawSQL += `${ tableName } where ${ tableName }.${ foreignKey }=${ rootModelName.singular }.${ sourceKey })`;
+					countAttribute = `${ as }_count`;
 				}
 
-				const {
-					foreignKey,
-					sourceKey
-				} = rootModelAssociations[countTarget];
-				rawSQL += `${ countTarget } where ${ countTarget }.${ foreignKey }=${ rootModelName.singular }.${ sourceKey })`;
-				countAttribute = `${ countTarget }_count`;
+				newQuery.attributes.push(
+					[sequelize.literal(rawSQL), countAttribute]
+				);
 			}
-
-			newQuery.attributes.push(
-				[sequelize.literal(rawSQL), countAttribute]
-			);
+			// Unknow function:
+			default:
+				break;
 		}
 	}
 	// Functions\
@@ -194,7 +202,7 @@ function traverse(queryNode, filter=null, model=null) {
 		}
 	}
 
-	//	"statics" override or set any query in clauses:
+	//	Override clauses with "statics":
 	if (filter !== null) {
 		const staticClausesEntries = Object.entries(filter.statics.clauses);
 
@@ -228,7 +236,11 @@ function traverse(queryNode, filter=null, model=null) {
 
 
 	// Order:
-	if ( ['rand', 'random'].indexOf(order.order) > -1) {
+	if (
+		order.order === 'rand'
+		||
+		order.order === 'random'
+	) {
 		newQuery.order = sequelize.random();
 	}
 	else {
@@ -292,11 +304,21 @@ function traverse(queryNode, filter=null, model=null) {
 }
 
 
-function _traverseIncludes(includes, model, filter, resultQuery) {
+/**
+ * Traverses each include in the array.
+ *
+ * @param {Array} includes
+ * @param {Model} rootModel
+ * @param {NodesterFilter} filter
+ * @param {Object} resultQuery
+ *
+ * @api private
+ */
+function _traverseIncludes(includes, rootModel, filter, resultQuery) {
 	const filterIncludesEntries = Object.entries(filter.includes);
 	for (let [ includeName, includeFilter ] of filterIncludesEntries) {
 
-		const association = model.associations[includeName];
+		const association = rootModel.associations[includeName];
 
 		// If no such association:
 		if (!association) {

package/lib/stacks/MiddlewaresStack.js

@@ -31,7 +31,9 @@ module.exports = class MiddlewaresStack {
 
 		// Indicates whether we can add more middlewares or no.
 		this._isLocked = false;
-		this.finalhandlerEnabled = !!opts.finalhandlerEnabled;
+
+		// TODO: disable/enable it in the process().
+		this._finalhandlerEnabled = !!opts.finalhandlerEnabled;
 
 
 		const env = process.env.NODE_ENV || 'development';
@@ -139,7 +141,7 @@ module.exports = class MiddlewaresStack {
 	 * @api public
 	 */
 	lock() {
-		if (this.finalhandlerEnabled) {
+		if (this._finalhandlerEnabled) {
 			// Add final handler to the stack.
 			this.add((req, res)=>this.finalhandler(req, res)());
 		}
@@ -159,7 +161,7 @@ module.exports = class MiddlewaresStack {
 	unlock() {
 		this._isLocked = false;
 		
-		if (this.finalhandlerEnabled) {
+		if (this._finalhandlerEnabled) {
 			this._middlewares.pop();
 		}
 
@@ -185,7 +187,15 @@ module.exports = class MiddlewaresStack {
 					return next.call(null, req, res, next, ...args);
 				}
 				else if (!!fn) {
-					return await fn.call(null, req, res, _next, ...args);
+					// Check for a middleware (fn) type (async or sync):
+					//	👇 Why it's important
+					//	https://stackoverflow.com/questions/60330963/why-an-async-function-takes-more-time-to-execute-than-a-sync-one
+					if (fn.constructor.name === 'AsyncFunction') {
+						return await fn.call(null, req, res, _next, ...args);
+					}
+					else {
+						return fn.call(null, req, res, _next, ...args);
+					}
 				}
 			}
 			catch(error) {

package/lib/tools/nql.tool.js

@@ -22,10 +22,10 @@ function _toAST_ModelsTreeNode(node, spacing=0) {
 
 	ast += `${ spaces }model: ${ node.model }\n\n`;
 
-	ast += `${ spaces }fields: [\n${ node.fields.map(f => ` • ${ f },\n`) }`;
+	ast += `${ spaces }fields (${ node.fields.length }): [\n${ node.fields.map(f => ` • ${ f },\n`) }`;
 	ast += `${ spaces }]\n\n`;
 
-	ast += `${ spaces }functions: [\n${ node.functions.map(f => ` • ${ f },\n`) }`;
+	ast += `${ spaces }functions (${ node.functions.length }): [\n${ node.functions.map(f => ` • ${ f },\n`) }`;
 	ast += `${ spaces }]\n\n`;
 
 	ast += `${ spaces }where: ${ JSON.stringify(node.where) }\n\n`;
@@ -34,7 +34,7 @@ function _toAST_ModelsTreeNode(node, spacing=0) {
 		c =>  ast += `${ spaces }${ c }: ${ node[c] }\n\n`
 	);
 	
-	ast += `${ spaces }includes: [\n`
+	ast += `${ spaces }includes (${ node.includes.length }): [\n`
 	node.includes.map(n => ast += _toAST_ModelsTreeNode(n, spacing + 2));
 	ast += `${ spaces }]\n`;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodester",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "A versatile REST framework for Node.js",
   "exports": {
     ".": "./lib/application/index.js",

package/tests/nql.test.js

@@ -10,285 +10,354 @@ const {
 const { ModelsTree } = require('../lib/middlewares/ql/sequelize/interpreter/ModelsTree');
 const QueryLexer = require('../lib/middlewares/ql/sequelize/interpreter/QueryLexer');
 
-describe('nodester Query Language', () => {
-	const queryStrings = [
-		// Simple where.
-		'id=10',
-		// All possible params.
-		'id=10&position=4&limit=3&skip=10&order=desc&order_by=index&fields=id,content,position,created_at',
-		// Simple includes.
-		'includes=comments&id=7',
-		// Include with All possible params.
-		'includes=comments(id=10&position=4&limit=3&skip=10&order=desc&order_by=index&fields=id,content,position)',
-		
-		// Subinclude horizontal.
-		'includes=comments,users&id=1000',
-		// Subinclude horizontal (more entries).
-		'includes=comments(order=desc),users,likes(order=rand),reposts&id=1000',
-		// Subinclude horizontal (+ syntaxis).
-		'includes=comments(order=desc).users+likes(order=rand&order_by=position)&id=1000',
-
-		// Subinclude vertical.
-		'includes=comments.users&id=1000',
-		// Subinclude vertical (more entries).
-		'in=comments.users.avatars.sizes&position=200',
-
-		// Complex includes.
-		'includes=comments.users.avatars(fields=id,content&order=rand)&id=7&limit=3',
-
-		// Broken includes.
-		'includes=comments(order=rand)&id=7&limit=3&includes=users(fields=id,content)',
-
-		// OR simple.
-		'or(index=2,position=5)',
-		// OR shortened.
-		'|(index=2,position=5)',
-
-		// NOT inside include.
-		'includes=comments(id=not(7))',
-
-		// Like simple.
-		'title=like(some_text)',
-
-		// Subinclude and isolated Horizontal.
-		'in=comments.user,likes',
-	];
-
-	it('query "Simple where"', () => {
-		const lexer = new QueryLexer( queryStrings[0] );
-		const result = lexer.query;
-
-		const tree = new ModelsTree();
-		tree.node.addWhere({ id: ['10'] });
-		const expected = tree.root.toObject();
-
-		expect(result).toMatchObject(expected);
-	});
-
-	test('query "All possible params"', () => {
-		const lexer = new QueryLexer( queryStrings[1] );
-		const result = lexer.query;
 
 
-		const tree = new ModelsTree();
-		tree.node.addWhere({ id: ['10'], position: ['4'] });
-		tree.node.fields = [ 'id', 'content', 'position', 'created_at' ];
-		tree.node.limit = 3;
-		tree.node.skip = 10;
-		tree.node.order = 'desc';
-		tree.node.order_by = 'index';
-		const expected = tree.root.toObject();
+describe('nodester Query Language', () => {
+	describe('flat', () => {
+		const queryStrings = [
+			// Simple where.
+			'id=10',
+			// All possible params.
+			'id=10&position=4&limit=3&skip=10&order=desc&order_by=index&fields=id,content,position,created_at',
+		];
+
+		it('Simple where', () => {
+			const lexer = new QueryLexer( queryStrings[0] );
+			const result = lexer.query;
+
+			const tree = new ModelsTree();
+			tree.node.addWhere({ id: ['10'] });
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+
+		test('All possible params', () => {
+			const lexer = new QueryLexer( queryStrings[1] );
+			const result = lexer.query;
+
+
+			const tree = new ModelsTree();
+			tree.node.addWhere({ id: ['10'], position: ['4'] });
+			tree.node.fields = [ 'id', 'content', 'position', 'created_at' ];
+			tree.node.limit = 3;
+			tree.node.skip = 10;
+			tree.node.order = 'desc';
+			tree.node.order_by = 'index';
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+	});
 
-		expect(result).toMatchObject(expected);
+	describe('includes', () => {
+		const queryStrings = [
+			// Simple includes.
+			'includes=comments&id=7',
+			// Include with All possible params.
+			'includes=comments(id=10&position=4&limit=3&skip=10&order=desc&order_by=index&fields=id,content,position)',
+
+			// 2 horizontals
+			'includes=comments,users&id=1000',
+			
+			// Horizontals queried.
+			'includes=comments(order=desc),users,likes(order=rand),reposts&id=1000',
+			// Horizontals queried №2.
+			'in=reactions,comments(user_id=gte(4)&skip=10&limit=2).users,likes,reposts',
+
+			// Separated includes.
+			'includes=comments(order=rand)&id=7&limit=3&includes=users(fields=id,content)',
+		];
+
+		test('Simple includes', () => {
+			const lexer = new QueryLexer( queryStrings[0] );
+			const result = lexer.query;
+
+
+			const tree = new ModelsTree();
+			tree.node.addWhere({ id: ['7'] });
+			tree.include('comments');
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+
+		test('Include with all possible params', () => {
+			const lexer = new QueryLexer( queryStrings[1] );
+			const result = lexer.query;
+
+			const tree = new ModelsTree();
+			tree.include('comments').use('comments');
+			tree.node.addWhere({ id: ['10'], position: ['4'] });
+			tree.node.fields = [ 'id', 'content', 'position' ];
+			tree.node.limit = 3;
+			tree.node.skip = 10;
+			tree.node.order = 'desc';
+			tree.node.order_by = 'index';
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+
+		test('2 horizontals', () => {
+			const lexer = new QueryLexer( queryStrings[2] );
+			const result = lexer.query;
+
+
+			const tree = new ModelsTree();
+			tree.node.addWhere({ id: ['1000'] });
+			tree.include('comments');
+			tree.include('users');
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+
+		test('Horizontals queried', () => {
+			const lexer = new QueryLexer( queryStrings[3] );
+			const result = lexer.query;
+
+
+			const tree = new ModelsTree();
+			tree.node.addWhere({ id: ['1000'] });
+			tree.include('comments').use('comments');
+			tree.node.order = 'desc';
+			tree.up();
+			tree.include('users');
+			tree.include('likes') && tree.use('likes');
+			tree.node.order = 'rand';
+			tree.up();
+			tree.include('reposts');
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+
+		test('Horizontals queried №2', () => {
+			const lexer = new QueryLexer( queryStrings[4] );
+			const result = lexer.query;
+
+			const tree = new ModelsTree();
+			tree.include('reactions');
+
+			tree.include('comments').use('comments');
+			tree.node.addWhere({
+					user_id: {
+						gte: ['4']
+					}
+			});
+			tree.node.skip = 10;
+			tree.node.limit = 2;
+
+			tree.include('users');
+			tree.up();
+
+			tree.include('likes');
+			tree.include('reposts');
+
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+
+		test('Separated includes"', () => {
+			const lexer = new QueryLexer( queryStrings[5] );
+			const result = lexer.query;
+
+			const tree = new ModelsTree();
+			tree.node.addWhere({ id: ['7'] });
+			tree.node.limit = 3;
+			tree.include('comments').use('comments');
+			tree.node.order = 'rand';
+			tree.up();
+			tree.include('users').use('users');
+			tree.node.fields = [ 'id', 'content' ];
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
 	});
 
-	test('query "Simple includes"', () => {
-		const lexer = new QueryLexer( queryStrings[2] );
-		const result = lexer.query;
+	describe('subincludes', () => {
+		const queryStrings = [
+			// Simple subinclude.
+			'includes=comments.users',
 
+			// Deep subincludes.
+			'in=posts.comments.users.avatars.sizes&position=200',
 
-		const tree = new ModelsTree();
-		tree.node.addWhere({ id: ['7'] });
-		tree.include('comments');
-		const expected = tree.root.toObject();
+			// Simple horizontal subinclude, "+" syntaxis.
+			'includes=comments.users+likes',
 
-		expect(result).toMatchObject(expected);
-	});
+			// Subinclude query.
+			'includes=comments.users(order=rand&order_by=position)',
 
-	test('query "Include with all possible params"', () => {
-		const lexer = new QueryLexer( queryStrings[3] );
-		const result = lexer.query;
-
-		const tree = new ModelsTree();
-		tree.include('comments').use('comments');
-		tree.node.addWhere({ id: ['10'], position: ['4'] });
-		tree.node.fields = [ 'id', 'content', 'position' ];
-		tree.node.limit = 3;
-		tree.node.skip = 10;
-		tree.node.order = 'desc';
-		tree.node.order_by = 'index';
-		const expected = tree.root.toObject();
-
-		expect(result).toMatchObject(expected);
-	});
+			// Complex subincludes query, "+" syntaxis.
+			'includes=comments(order=desc).users+likes(order=rand&order_by=position)&id=1000',
+		];
 
+		test('Simple subinclude', () => {
+			const lexer = new QueryLexer( queryStrings[0] );
+			const result = lexer.query;
 
-	test('query "Subinclude horizontal"', () => {
-		const lexer = new QueryLexer( queryStrings[4] );
-		const result = lexer.query;
 
+			const tree = new ModelsTree();
+			tree.include('comments').use('comments');
+			tree.include('users');
+			const expected = tree.root.toObject();
 
-		const tree = new ModelsTree();
-		tree.node.addWhere({ id: ['1000'] });
-		tree.include('comments');
-		tree.include('users');
-		const expected = tree.root.toObject();
+			expect(result).toMatchObject(expected);
+		});
 
-		expect(result).toMatchObject(expected);
-	});
+		test('Deep subincludes', () => {
+			const lexer = new QueryLexer( queryStrings[1] );
+			const result = lexer.query;
 
-	test('query "Subinclude horizontal (complex)"', () => {
-		const lexer = new QueryLexer( queryStrings[5] );
-		const result = lexer.query;
 
+			const tree = new ModelsTree();
+			tree.include('posts').use('posts');
+			tree.include('comments').use('comments');
+			tree.include('users').use('users');
+			tree.include('avatars').use('avatars');
+			tree.include('sizes').use('sizes');
+			const expected = tree.root.toObject();
 
-		const tree = new ModelsTree();
-		tree.node.addWhere({ id: ['1000'] });
-		tree.include('comments').use('comments');
-		tree.node.order = 'desc';
-		tree.up();
-		tree.include('users');
-		tree.include('likes') && tree.use('likes');
-		tree.node.order = 'rand';
-		tree.up();
-		tree.include('reposts');
-		const expected = tree.root.toObject();
+			expect(result).toMatchObject(expected);
+		});
 
-		expect(result).toMatchObject(expected);
-	});
+		test('Simple horizontal subinclude, "+" syntaxis"', () => {
+			const lexer = new QueryLexer( queryStrings[2] );
+			const result = lexer.query;
 
 
-	test('query "Subinclude horizontal (+ syntaxis)"', () => {
-		const lexer = new QueryLexer( queryStrings[6] );
-		const result = lexer.query;
+			const tree = new ModelsTree();
+			tree.include('comments').use('comments');
+			tree.include('users');
+			tree.include('likes');
+			const expected = tree.root.toObject();
 
+			expect(result).toMatchObject(expected);
+		});
 
-		const tree = new ModelsTree();
-		tree.node.addWhere({ id: ['1000'] });
-		tree.include('comments').use('comments');
-		tree.node.order = 'desc';
-		tree.include('users');
-		tree.include('likes') && tree.use('likes');
-		tree.node.order = 'rand';
-		tree.node.order_by = 'position';
-		tree.up();
-		const expected = tree.root.toObject();
+		test('Subinclude query', () => {
+			const lexer = new QueryLexer( queryStrings[3] );
+			const result = lexer.query;
 
-		expect(result).toMatchObject(expected);
-	});
 
+			const tree = new ModelsTree();
+			tree.include('comments').use('comments');
+			tree.include('users').use('users');
+			tree.node.order = 'rand';
+			tree.node.order_by = 'position';
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
 
-	test('query "Subinclude vertical"', () => {
-		const lexer = new QueryLexer( queryStrings[7] );
-		const result = lexer.query;
+		test('Complex subincludes query, "+" syntaxis', () => {
+			const lexer = new QueryLexer( queryStrings[4] );
+			const result = lexer.query;
 
 
-		const tree = new ModelsTree();
-		tree.node.addWhere({ id: ['1000'] });
-		tree.include('comments').use('comments');
-		tree.include('users');
-		const expected = tree.root.toObject();
+			const tree = new ModelsTree();
+			tree.node.addWhere({ id: ['1000'] });
+			tree.include('comments').use('comments');
+			tree.node.order = 'desc';
+			tree.include('users');
+			tree.include('likes') && tree.use('likes');
+			tree.node.order = 'rand';
+			tree.node.order_by = 'position';
+			tree.up();
+			const expected = tree.root.toObject();
 
-		expect(result).toMatchObject(expected);
+			expect(result).toMatchObject(expected);
+		});
 	});
 
-	test('query "Subinclude vertical (complex)"', () => {
-		const lexer = new QueryLexer( queryStrings[8] );
-		const result = lexer.query;
+	describe('operations', () => {
+		const queryStrings = [
+			// OR simple.
+			'or(index=2,position=5)',
+			// OR short.
+			'|(index=2,position=5)',
 
+			// Not simple.
+			'key=not(main)',
+			// Not short.
+			'key=!(main)',
+			// NOT inside include.
+			'includes=comments(id=not(7))',
 
-		const tree = new ModelsTree();
-		tree.node.addWhere({ position: ['200'] });
-		tree.include('comments').use('comments');
-		tree.include('users').use('users');
-		tree.include('avatars').use('avatars');
-		tree.include('sizes').use('sizes');
-		const expected = tree.root.toObject();
+			// Like simple.
+			'title=like(some_text)',
+		];
 
-		expect(result).toMatchObject(expected);
-	});
+		test('"OR" simple', () => {
+			const lexer = new QueryLexer( queryStrings[0] );
+			const result = lexer.query;
 
-	test('query "Complex includes"', () => {
-		const lexer = new QueryLexer( queryStrings[9] );
-		const result = lexer.query;
-
-		const tree = new ModelsTree();
-		tree.node.addWhere({ id: ['7'] });
-		tree.node.limit = 3;
-		tree.include('comments').use('comments');
-		tree.include('users').use('users');
-		tree.include('avatars').use('avatars');
-		tree.node.fields = [ 'id', 'content' ];
-		tree.node.order = 'rand';
-		const expected = tree.root.toObject();
-
-		expect(result).toMatchObject(expected);
-	});
+			const tree = new ModelsTree();
+			tree.node.addWhere({ or: [ { index: ['2'] }, { position: ['5'] } ] });
+			const expected = tree.root.toObject();
 
-	test('query "Broken includes"', () => {
-		const lexer = new QueryLexer( queryStrings[10] );
-		const result = lexer.query;
-
-		const tree = new ModelsTree();
-		tree.node.addWhere({ id: ['7'] });
-		tree.node.limit = 3;
-		tree.include('comments').use('comments');
-		tree.node.order = 'rand';
-		tree.up();
-		tree.include('users').use('users');
-		tree.node.fields = [ 'id', 'content' ];
-		const expected = tree.root.toObject();
-
-		expect(result).toMatchObject(expected);
-	});
+			expect(result).toMatchObject(expected);
+		});
 
-	test('Token "OR" simple', () => {
-		const lexer = new QueryLexer( queryStrings[11] );
-		const result = lexer.query;
+		test('"OR" short', () => {
+			const lexer = new QueryLexer( queryStrings[1] );
+			const result = lexer.query;
 
-		const tree = new ModelsTree();
-		tree.node.addWhere({ or: [ { index: ['2'] }, { position: ['5'] } ] });
-		const expected = tree.root.toObject();
+			const tree = new ModelsTree();
+			tree.node.addWhere({ or: [ { index: ['2'] }, { position: ['5'] } ] });
+			const expected = tree.root.toObject();
 
-		expect(result).toMatchObject(expected);
-	});
+			expect(result).toMatchObject(expected);
+		});
 
-	test('Token "OR" shortened', () => {
-		const lexer = new QueryLexer( queryStrings[12] );
-		const result = lexer.query;
+		test('"NOT" simple', () => {
+			const lexer = new QueryLexer( queryStrings[2] );
+			const result = lexer.query;
 
-		const tree = new ModelsTree();
-		tree.node.addWhere({ or: [ { index: ['2'] }, { position: ['5'] } ] });
-		const expected = tree.root.toObject();
+			const tree = new ModelsTree();
+			tree.node.addWhere({ key: { not: ['main'] } });
+			const expected = tree.root.toObject();
 
-		expect(result).toMatchObject(expected);
-	});
+			expect(result).toMatchObject(expected);
+		});
 
-	test('Token "NOT"', () => {
-		const lexer = new QueryLexer( queryStrings[13] );
-		const result = lexer.query;
+		test('"NOT" short', () => {
+			const lexer = new QueryLexer( queryStrings[3] );
+			const result = lexer.query;
 
-		const tree = new ModelsTree();
-		tree.include('comments').use('comments');
-		tree.node.addWhere({ id: { not: ['7'] }});
-		const expected = tree.root.toObject();
+			const tree = new ModelsTree();
+			tree.node.addWhere({ key: { not: ['main'] } });
+			const expected = tree.root.toObject();
 
-		expect(result).toMatchObject(expected);
-	});
+			expect(result).toMatchObject(expected);
+		});
 
-	test('Token "Like" simple', () => {
-		const lexer = new QueryLexer( queryStrings[14] );
-		const result = lexer.query;
+		test('"NOT" inside includes', () => {
+			const lexer = new QueryLexer( queryStrings[4] );
+			const result = lexer.query;
 
-		const tree = new ModelsTree();
-		tree.node.addWhere({ title: { like: ['some_text'] }});
-		const expected = tree.root.toObject();
+			const tree = new ModelsTree();
+			tree.include('comments').use('comments');
+			tree.node.addWhere({ id: { not: ['7'] }});
+			const expected = tree.root.toObject();
 
-		expect(result).toMatchObject(expected);
-	});
+			expect(result).toMatchObject(expected);
+		});
 
-	it('query "Subinclude and isolated Horizontal"', () => {
-		const lexer = new QueryLexer( queryStrings[15] );
-		result = lexer.query;
+		test('"Like" simple', () => {
+			const lexer = new QueryLexer( queryStrings[5] );
+			const result = lexer.query;
 
-		const tree = new ModelsTree();
-		tree.include('comments').use('comments');
-		tree.include('user');
-		tree.up();
-		tree.include('likes');
-		const expected = tree.root.toObject();
+			const tree = new ModelsTree();
+			tree.node.addWhere({ title: { like: ['some_text'] }});
+			const expected = tree.root.toObject();
 
-		expect(result).toMatchObject(expected);
+			expect(result).toMatchObject(expected);
+		});
 	});
 
 });