nodester 0.2.4 → 0.2.6

package/Readme.md

@@ -3,9 +3,13 @@
 [![NPM version](https://img.shields.io/npm/v/nodester)](https://www.npmjs.com/package/nodester)
 [![License](https://img.shields.io/npm/l/nodester)](https://www.npmjs.com/package/nodester)
 
-> **nodester** is a modern and versatile Node.js framework designed to streamline the development of robust and scalable web applications.
+> **nodester** is a Node.js framework designed to solve the problem of a complex data querying over HTTP.
 
-The main reason of nodester's existence is the [nodester Query Language (NQL)](docs/Queries.md), an extension of standard REST API syntax, it lets you craft complex queries with hierarchical associations.
+The main reason of nodester's existence is the [nodester Query Language (NQL) ➡️](docs/nql/Introduction.md), an extension of standard REST API syntax, it lets you craft complex queries with hierarchical associations.
+
+Building an application which allows users to build their own REST queries raises huge security concerns.
+That's why nodester was not developped as a middleware. It's a framework equipped which set of technologies enabling you to fully customize the request-response flow down to the specific user to only give them access to the data you intended.
+Check out [core concepts documentation ➡️](docs/CoreConcepts.md) for more info.
 
 
 ## Installation
@@ -49,11 +53,11 @@ app.listen(8080, function() {
 [Core concepts documentation ➡️](docs/CoreConcepts.md)
 
 
-### Queries & Querying - Nodester Query Language (NQL)
+### Queries & Querying - nodester Query Language (NQL)
 The true strength of nodester lies in its query language. Serving as an extension of standard REST API syntax, it brings many aspects of SQL into REST requests, providing developers with a simple yet potent tool for expressive and efficient data querying.
 
 Read more about it in the documentation:
-[NQL documentaion ➡️](docs/Queries.md)
+[NQL documentaion ➡️](docs/nql/Introduction.md)
 
 
 ### Database

package/lib/body/extract.js

@@ -25,7 +25,7 @@ module.exports = extract;
 function extract(body, filter=null, model) {
 
 	const sequelize = model.sequelize;
-	const modelFields = Object.keys(model.tableAttributes);
+	const modelAttributes = Object.keys(model.tableAttributes);
 	const availableIncludes = Object.keys(model.associations);
 
 	const bodyEntries = Object.entries(body);
@@ -38,15 +38,15 @@ function extract(body, filter=null, model) {
 
 	for (const [key, value] of bodyEntries) {
 		const isInclude = availableIncludes.indexOf(key) > -1;
-		const isField = modelFields.indexOf(key) > -1;
+		const isAttribute = modelAttributes.indexOf(key) > -1;
 
-		if ((!isField || filter.fields.indexOf(key) === -1) && !isInclude) {
-			const err = new Error(`Field '${ key }' is not available.`);
+		if ((!isAttribute || filter.attributes.indexOf(key) === -1) && !isInclude) {
+			const err = new Error(`Attribute '${ key }' is not available.`);
 			err.status = httpCodes.NOT_ACCEPTABLE;
 			throw err;
 		}
 
-		if (isField) {
+		if (isAttribute) {
 			const column = model.rawAttributes[key];
 			const typeName = column.type.constructor.name;
 			// Optional validation.
@@ -80,7 +80,7 @@ function extract(body, filter=null, model) {
 			continue;
 		}
 
-		const err = new Error(`Unknown field '${ key }'.`);
+		const err = new Error(`Unknown attribute '${ key }'.`);
 		err.status = httpCodes.NOT_ACCEPTABLE;
 		throw err;
 	}

package/lib/factories/responses/rest.js

@@ -62,29 +62,27 @@ function _createGenericResponse(res, options) {
 
 			switch(error.name) {
 				case 'Unauthorized': {
-					statusCode = 401;
+					status = 401;
 					break;
 				}
 				case 'NotFound': {
-					statusCode = 404;
+					status = 404;
 					break;
 				}
 				case 'ValidationError': {
-					statusCode = 422;
+					status = 422;
 					break;
 				}
 				case 'ConflictError': {
-					statusCode = 409;
+					status = 409;
 					break;
 				}
 				case 'SequelizeUniqueConstraintError': {
-					statusCode = 409;
+					status = 409;
 					details.errors = error?.errors;
 					break;
 				}
 				default:
-					statusCode = status;
-
 					if (!!error?.errors) {
 						details.errors = error?.errors;
 					}
@@ -121,8 +119,7 @@ function _createGenericResponse(res, options) {
  * @api public
  */
 function _createOKResponse(res, options={}) {
-
-	return this.createGenericResponse(res, { 
+	return _createGenericResponse(res, { 
 		...options,
 		status: options?.status ?? 200,
 	});
@@ -143,8 +140,7 @@ function _createOKResponse(res, options={}) {
  * @api public
  */
 function _createErrorResponse(res, options) {
-
-	return this.createGenericResponse(res, {
+	return _createGenericResponse(res, {
 		...options,
 		status: options?.status ?? 500,
 	});

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

@@ -17,7 +17,7 @@ class ModelsTreeNode {
 		this.fn = null;
 
 		// for override:
-		this.fields = [];
+		this._attributes = [];
 		this._where = {};
 		this._functions = [];
 		this.skip = 0;
@@ -28,6 +28,11 @@ class ModelsTreeNode {
 		this.order_by = opts.order_by ?? 'id';
 	}
 
+	// Getters:
+	get attributes() {
+		return this._attributes;
+	}
+
 	get where() {
 		return this._where;
 	}
@@ -51,6 +56,12 @@ class ModelsTreeNode {
 	get hasIncludes() {
 		return this.includesCount > 0;
 	}
+	// Getters\
+
+	// Setters:
+	set attributes(array) {
+		this._attributes = array;
+	}
 
 	resetActiveParam() {
 		this.activeParam = null;
@@ -85,7 +96,7 @@ class ModelsTreeNode {
 		return {
 			model: this.model,
 
-			fields: this.fields,
+			attributes: this.attributes,
 			functions: this.functions,
 
 			where: this.where,

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

@@ -12,26 +12,37 @@ const util = require('util');
 const debug = require('debug')('nodester:interpreter:QueryLexer');
 
 const PARAM_TOKENS = new Enum({
-	FIELDS: Symbol('fields'),
-	INCLUDES: Symbol('includes'),
+	ATTRIBUTES: Symbol('attributes'),
+	
 	LIMIT: Symbol('limit'),
 	ORDER: Symbol('order'),
 	ORDER_BY: Symbol('order_by'),
 	SKIP: Symbol('skip'),
+
+	INCLUDES: Symbol('includes'),
 });
 
 const OP_TOKENS = new Enum({
 	AND: 'and',
+
 	BETWEEN: 'between',
 	NOT_BETWEEN: 'notBetween',
 	BETWEEN_MARK: '~',
+
 	OR: 'or',
-	OR_MARK: '|',
+	OR_SHORT: '|',
 	XOR: 'xor',
+
 	NOT: 'not',
-	NOT_MARK: '!',
+	NOT_SHORT: '!',
+
+	IN: 'in',
 	NOT_IN: 'notIn',
+	
 	LIKE: 'like',
+	NOT_LIKE: 'notLike',
+	NOT_LIKE_SHORT: '!like',
+	
 	GREATER: 'gt',
 	GREATER_OR_EQUAL: 'gte',
 	LOWER: 'lt',
@@ -71,7 +82,7 @@ module.exports = class QueryLexer {
 
 		// Token is a String, accumulated char-by-char.
 		let token = '';
-		// Value of param ('id=10' OR 'fields=id,text').
+		// Value of param ('id=10' OR 'attributes=id,text').
 		let value = [];
 		// Model, that was active before a cursor went up in the tree.
 		let previousActive = null;
@@ -86,7 +97,7 @@ module.exports = class QueryLexer {
 
 				// If OP token:
 				if (OP_TOKENS.asArray.indexOf(token) > -1) {
-					// Set operation token.
+					// Set operator token.
 					tree.node.op = this.parseOP(token);
 					token = '';
 					continue;
@@ -135,6 +146,7 @@ module.exports = class QueryLexer {
 					switch (tree.node.op) {
 						case OP_TOKENS.NOT:
 						case OP_TOKENS.LIKE:
+						case OP_TOKENS.NOT_LIKE:
 						case OP_TOKENS.GREATER:
 						case OP_TOKENS.GREATER_OR_EQUAL:
 						case OP_TOKENS.LOWER:
@@ -214,9 +226,19 @@ module.exports = class QueryLexer {
 
 				// If OP token:
 				if (!!tree.node.op) {
-					value.push({
-						[tree.node.activeParam]: [token]
-					});
+					switch(tree.node.op) {
+						case OP_TOKENS.NOT_IN:
+						case OP_TOKENS.IN:
+							value.push(token);
+							break;
+						default:
+							value.push({
+								[tree.node.activeParam]: [token]
+							});
+							break;
+					}
+
+					// Reset.
 					token = '';
 					continue;
 				}
@@ -374,27 +396,51 @@ module.exports = class QueryLexer {
 				throw err;
 			}
 			
-			// [ can only mean start of 'in':
+			// [ can mean start of 'in'/'notIn',
+			// or 'notIn':
 			if (char === '[') {
-				tree.node.op = 'in';
+				tree.node.op = OP_TOKENS.IN;
+				if (token.length > 0) {
+					if (token === '!' || token === 'not') {
+						tree.node.op = OP_TOKENS.NOT_IN;
+					}
+					else {
+						const err = UnexpectedCharError(i - token.length, token);
+						throw err;
+					}
+				}
+
+				// Reset:
+				token = '';
 				continue;
 			}
 
-			// ] can only mean end if 'in':
+			// ] can mean end of 'in'/'notIn':
 			if (char === ']') {
 				// User missed first '[' :
-				if (tree.node.op !== 'in') {
+				if (
+					tree.node.op !== OP_TOKENS.IN
+					&&
+					tree.node.op !== OP_TOKENS.NOT_IN
+				) {
 					const err = UnexpectedCharError(i, char);
 					throw err;
 				}
 
+				// Token is the last element in this array:
+				if (token.length > 0) {
+					value.push(token);
+				}
+
 				tree.node.addWhere({
 					[tree.node.activeParam]: {
 						[tree.node.op]: value
 					}
 				});
+
 				// Reset:
 				tree.node.resetOP();
+				tree.node.resetActiveParam();
 				value = [];
 				token = '';
 				continue;
@@ -448,13 +494,16 @@ module.exports = class QueryLexer {
 
 	parseParamFromToken(token) {
 		switch(token) {
+			case 'attributes':
+			case 'a':
+				return PARAM_TOKENS.ATTRIBUTES;
+
 			case 'limit':
 			case 'l':
 				return PARAM_TOKENS.LIMIT;
 
 			case 'skip':
 			case 's':
-			case 'offset':
 				return PARAM_TOKENS.SKIP;
 
 			case 'order':
@@ -462,13 +511,9 @@ module.exports = class QueryLexer {
 				return PARAM_TOKENS.ORDER;
 
 			case 'order_by':
-			case 'o_by':
+			case 'oby':
 				return PARAM_TOKENS.ORDER_BY;
 
-			case 'fields':
-			case 'f':
-				return PARAM_TOKENS.FIELDS;
-
 			case 'includes':
 			case 'in':
 				return PARAM_TOKENS.INCLUDES;
@@ -484,6 +529,11 @@ module.exports = class QueryLexer {
 		debug(`set param`, { param, token, value });
 
 		switch(param) {
+			case PARAM_TOKENS.ATTRIBUTES:
+				if (token) value.push(token);
+				treeNode.attributes = value;
+				break;
+
 			case PARAM_TOKENS.LIMIT:
 				treeNode.limit = parseInt(token);
 				break;
@@ -500,11 +550,6 @@ module.exports = class QueryLexer {
 				treeNode.order_by = token;
 				break;
 
-			case PARAM_TOKENS.FIELDS:
-				if (token) value.push(token);
-				treeNode.fields = value;
-				break;
-
 			case PARAM_TOKENS.INCLUDES:
 				const node = new ModelsTreeNode(token);
 				treeNode.include(node);
@@ -521,10 +566,16 @@ module.exports = class QueryLexer {
 		switch(opToken) {
 			case '|':
 			case 'or':
-				return 'or';
+				return OP_TOKENS.OR;
+
+			case '!like':
+			case 'notLike':
+				return OP_TOKENS.NOT_LIKE;
+
 			case 'not':
 			case '!':
-				return 'not';
+				return OP_TOKENS.NOT;
+
 			default:
 				return opToken;
 		}

package/lib/query/traverse.js

@@ -35,7 +35,7 @@ function traverse(queryNode, filter=null, model=null) {
 	const rootModelName = _model.options.name;
 	const rootModelAssociations = _model.associations;
 	const { sequelize } = _model;
-	const fieldsAvailable = Object.keys(_model.tableAttributes);
+	const attributesAvailable = Object.keys(_model.tableAttributes);
 
 	const newQuery = {
 		attributes: [],
@@ -44,60 +44,61 @@ function traverse(queryNode, filter=null, model=null) {
 	};
 	
 	const {
+		attributes,
+		clauses,
+		functions,
 		where,
+
 		includes,
-		fields,
-		functions,
-		clauses,
 	} = _disassembleQueryNode(queryNode);
 
 
-	// Fields:
+	// Attribute:
 	//
 	//	If Filter is not set,
-	//	use every available field:
+	//	use every available attribute:
 	if (filter === null) {
-		for (let field of fieldsAvailable) {
-			// If no query filter or field is requested:
-			if (fields.length === 0 || fields.indexOf(field) > -1) {
-				newQuery.attributes.push(field);
+		for (let attribute of attributesAvailable) {
+			// If no query filter or attribute is requested:
+			if (attributes.length === 0 || attributes.indexOf(attribute) > -1) {
+				newQuery.attributes.push(attribute);
 				continue;
 			}
 		}
 	}
 	//	Filter is present:
 	else {
-		// If no query fields were set,
+		// If no query attributes were set,
 		//	use the ones from Filter,
-		// If query fields were set,
+		// If query attributes were set,
 		//	put them through Filter:
-		for (let field of filter.fields) {
-			if (fieldsAvailable.indexOf(field) === -1) {
-				const err = new NodesterQueryError(`Field '${ field }' is not present in model.`);
+		for (let attribute of filter.attributes) {
+			if (attributesAvailable.indexOf(attribute) === -1) {
+				const err = new NodesterQueryError(`Field '${ attribute }' is not present in model.`);
 				Error.captureStackTrace(err, traverse);
 				throw err;
 			}
 
-			// If field is not in available set:
-			// if (filter.fields.indexOf(field) === -1) {
+			// If attribute is not in available set:
+			// if (filter.attributes.indexOf(attribute) === -1) {
 			// 	continue;
 			// }
 
-			// If no query filter or field is requested:
-			if (fields.length === 0 || fields.indexOf(field) > -1) {
-				newQuery.attributes.push(field);
+			// If no query filter or attribute is requested:
+			if (attributes.length === 0 || attributes.indexOf(attribute) > -1) {
+				newQuery.attributes.push(attribute);
 				continue;
 			}
 		}
 	}
 	
-	//	At least 1 field is mandatory:
+	//	At least 1 attribute is mandatory:
 	if (newQuery.attributes.length === 0) {
-		const err = new NodesterQueryError(`No fields were selected.`);
+		const err = new NodesterQueryError(`No attributes were selected.`);
 		Error.captureStackTrace(err, traverse);
 		throw err;
 	}
-	// Fields\
+	// Attribute\
 
 	// Functions:
 	for (const fnParams of functions) {
@@ -377,37 +378,29 @@ function _parseWhereEntry(attribute, value, whereHolder, staticAttributes) {
 function _disassembleQueryNode(queryNode) {
 	// Disassemble current query node:
 	const {
+		attributes,
+		functions,
 		where,
 		includes,
-		fields,
-		functions,
 		...clauses
 	} = queryNode;
-	// delete queryNode.model;
 
 	return {
+		attributes: attributes ?? [],
+		clauses: clauses ?? [],
+		functions: functions ?? [],
 		where: where ?? {},
 		includes: includes ?? [],
-		fields: fields ?? [],
-		functions: functions ?? [],
-		clauses: clauses ?? []
 	};
 }
 
 function _parseValue(value, attribute) {
 	// If value is Object:
 	if (typeof value === 'object' && Array.isArray(value) === false) {
-		const [opKey, rawValue] = (Object.entries(value))[0];
+		const [ opKey, rawValue ] = (Object.entries(value))[0];
 
-		// If operation is "in":
-		if (opKey === 'in') {
-			// Unwrap rawValue.
-			return rawValue[0][attribute];
-		}
-		else {
-			const op = Op[opKey];
-			return { [op]: rawValue };
-		}
+		const op = Op[opKey];
+		return { [op]: rawValue };
 	}
 
 	return value;

package/lib/structures/Filter.js

@@ -18,12 +18,12 @@ module.exports = class NodesterFilter {
 	 *
 	 * @param {Model} model
 	 * @param {Object} options
-	 * @param {Array}  options.fields
+	 * @param {Array}  options.attributes
 	 * @param {Array}  options.clauses
 	 * @param {Object} options.includes
 	 *
 	 * @param {Object} options.bounds
-	 * @param {Object} options.bounds.fields
+	 * @param {Object} options.bounds.attributes
 	 * @param {Object} options.bounds.clauses
 	 *
 	 * @param {Object} options.statics
@@ -37,12 +37,12 @@ module.exports = class NodesterFilter {
 		
 		this._model = model;
 
-		this._fields = [];
+		this._attributes = [];
 		this._clauses = [];
 		this._includes = {};
 
 		this._bounds = {
-			fields: {},
+			attributes: {},
 			clauses: {}
 		}
 		
@@ -53,7 +53,7 @@ module.exports = class NodesterFilter {
 
 		// If model is present:
 		if (isModel(this.model)) {
-			this._fields = Object.keys(this.model.tableAttributes);
+			this._attributes = Object.keys(this.model.tableAttributes);
 			this._clauses = CLAUSES.asArray;
 
 			// ...and no 'bounds' and 'statics' are provided,
@@ -67,7 +67,7 @@ module.exports = class NodesterFilter {
 		}
 		
 		const {
-			fields,
+			attributes,
 			clauses,
 			includes,
 			bounds,
@@ -75,9 +75,9 @@ module.exports = class NodesterFilter {
 		} = options;
 
 
-		// If fields are array:
-		if (Array.isArray(fields)) {
-			this._fields = fields;
+		// If attributes are array:
+		if (Array.isArray(attributes)) {
+			this._attributes = attributes;
 		}
 
 		if (Array.isArray(clauses)) {
@@ -124,8 +124,8 @@ module.exports = class NodesterFilter {
 	}
 
 	// Getters:
-	get fields() {
-		return this._fields;
+	get attributes() {
+		return this._attributes;
 	}
 
 	get clauses() {

package/lib/tools/nql.tool.js

@@ -5,41 +5,54 @@
 
 'use strict';
 
+// Arguments validator.
+const { ensure } = require('nodester/validators/arguments');
+
 
 module.exports = {
-	toAST_ModelsTreeNode: _toAST_ModelsTreeNode
+	AST_ModelsTree: _AST_ModelsTree,
+	AST_ModelsTreeNode: _AST_ModelsTreeNode
+}
+
+function _AST_ModelsTree(modelsTree) {
+	ensure(modelsTree, 'object,required', 'modelsTree');
+	return _AST_ModelsTreeNode(modelsTree.root);
 }
 
-function _toAST_ModelsTreeNode(node, spacing=0) {
-	let spaces = '';
+function _AST_ModelsTreeNode(node, spacing=0) {
+	ensure(node, 'object,required', 'node');
+	ensure(spacing, 'number,required', 'spacing');
+
+	let spaces = ' ';
 	for (let i = 0; i < spacing; i++) {
 		spaces += ' ';
 	}
 
-	let ast = `${ spaces }[TreeNode]\n`;
-
-	spaces += ' ';
+	let ast = `${ spaces }┏ TreeNode\n`;
+	ast += `${ spaces }┃\n`;
 
-	ast += `${ spaces }model: ${ node.model }\n\n`;
+	ast += `${ spaces }┣ model: ${ node.model }\n`;
+	ast += `${ spaces }┃\n`;
 
-	ast += `${ spaces }fields (${ node.fields.length }): [\n${ node.fields.map(f => ` • ${ f },\n`) }`;
-	ast += `${ spaces }]\n\n`;
+	ast += `${ spaces }┣ fields (${ node.fields.length }): [\n${ node.fields.map(f => ` • ${ f },\n`) }`;
+	ast += `${ spaces }┃ ]\n`;
+	ast += `${ spaces }┃\n`;
 
-	ast += `${ spaces }functions (${ node.functions.length }): [\n${ node.functions.map(f => ` • ${ f },\n`) }`;
-	ast += `${ spaces }]\n\n`;
+	ast += `${ spaces }┣ functions (${ node.functions.length }): [\n${ node.functions.map(f => ` • ${ f },\n`) }`;
+	ast += `${ spaces }┃ ]\n`;
+	ast += `${ spaces }┃\n`;
 
-	ast += `${ spaces }where: ${ JSON.stringify(node.where) }\n\n`;
+	ast += `${ spaces }┣ where: ${ JSON.stringify(node.where) }\n`;
+	ast += `${ spaces }┃\n`;
 
-	['skip','limit','order','order_by'].map(
-		c =>  ast += `${ spaces }${ c }: ${ node[c] }\n\n`
-	);
+	['skip','limit','order','order_by'].map(c => {
+		ast += `${ spaces }┣ ${ c }: ${ node[c] }\n`;
+		ast += `${ spaces }┃\n`;
+	});
 	
-	ast += `${ spaces }includes (${ node.includes.length }): [\n`
-	node.includes.map(n => ast += _toAST_ModelsTreeNode(n, spacing + 2));
-	ast += `${ spaces }]\n`;
-
-	spaces.slice(-1);
-	ast += `${ spaces }[TreeNode END]\n\n`;
+	ast += `${ spaces }┗ includes (${ node.includes.length }): [\n`
+	node.includes.map(n => ast += _AST_ModelsTreeNode(n, spacing + 2));
+	ast += `${ spaces }  ]\n`;
 
 	return ast;
 }

package/package.json

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

package/tests/ast.js

@@ -1,5 +1,5 @@
 const { ModelsTree } = require('../lib/middlewares/ql/sequelize/interpreter/ModelsTree');
-const { toAST_ModelsTreeNode } = require('../lib/tools/nql.tool');
+const { AST_ModelsTree } = require('../lib/tools/nql.tool');
 
 const tree = new ModelsTree();
 tree.node.addWhere({ id: ['1000'] });
@@ -12,5 +12,7 @@ tree.node.order = 'rand';
 tree.up();
 tree.include('reposts');
 
-console.debug(toAST_ModelsTreeNode(tree.root));
+console.debug(
+	AST_ModelsTree(tree)
+);
 

package/tests/nql.test.js

@@ -17,8 +17,10 @@ describe('nodester Query Language', () => {
 		const queryStrings = [
 			// Simple where.
 			'id=10',
+			// Only certain attributes.
+			'a=id,text',
 			// All possible params.
-			'id=10&position=4&limit=3&skip=10&order=desc&order_by=index&fields=id,content,position,created_at',
+			'id=10&position=4&limit=3&skip=10&order=desc&order_by=index&a=id,content,position,created_at',
 		];
 
 		it('Simple where', () => {
@@ -32,14 +34,25 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
-		test('All possible params', () => {
+		it('Only certain attributes', () => {
 			const lexer = new QueryLexer( queryStrings[1] );
 			const result = lexer.query;
 
+			const tree = new ModelsTree();
+			tree.node.attributes = [ 'id', 'text' ];
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+
+		test('All possible params', () => {
+			const lexer = new QueryLexer( queryStrings[2] );
+			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.attributes = [ 'id', 'content', 'position', 'created_at' ];
 			tree.node.limit = 3;
 			tree.node.skip = 10;
 			tree.node.order = 'desc';
@@ -55,7 +68,7 @@ describe('nodester Query Language', () => {
 			// 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)',
+			'includes=comments(id=10&position=4&limit=3&skip=10&order=desc&order_by=index&a=id,content,position)',
 
 			// 2 horizontals
 			'includes=comments,users&id=1000',
@@ -66,7 +79,7 @@ describe('nodester Query Language', () => {
 			'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)',
+			'includes=comments(order=rand)&id=7&limit=3&includes=users(a=id,content)',
 		];
 
 		test('Simple includes', () => {
@@ -89,7 +102,7 @@ describe('nodester Query Language', () => {
 			const tree = new ModelsTree();
 			tree.include('comments').use('comments');
 			tree.node.addWhere({ id: ['10'], position: ['4'] });
-			tree.node.fields = [ 'id', 'content', 'position' ];
+			tree.node.attributes = [ 'id', 'content', 'position' ];
 			tree.node.limit = 3;
 			tree.node.skip = 10;
 			tree.node.order = 'desc';
@@ -171,7 +184,7 @@ describe('nodester Query Language', () => {
 			tree.node.order = 'rand';
 			tree.up();
 			tree.include('users').use('users');
-			tree.node.fields = [ 'id', 'content' ];
+			tree.node.attributes = [ 'id', 'content' ];
 			const expected = tree.root.toObject();
 
 			expect(result).toMatchObject(expected);
@@ -274,22 +287,12 @@ describe('nodester Query Language', () => {
 		});
 	});
 
-	describe('operations', () => {
+	describe('operators:or', () => {
 		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))',
-
-			// Like simple.
-			'title=like(some_text)',
 		];
 
 		test('"OR" simple', () => {
@@ -313,9 +316,20 @@ describe('nodester Query Language', () => {
 
 			expect(result).toMatchObject(expected);
 		});
+	});
+
+	describe('operators:not', () => {
+		const queryStrings = [
+			// Not simple.
+			'key=not(main)',
+			// Not short.
+			'key=!(main)',
+			// NOT inside include.
+			'includes=comments(id=not(7))'
+		];
 
 		test('"NOT" simple', () => {
-			const lexer = new QueryLexer( queryStrings[2] );
+			const lexer = new QueryLexer( queryStrings[0] );
 			const result = lexer.query;
 
 			const tree = new ModelsTree();
@@ -326,7 +340,7 @@ describe('nodester Query Language', () => {
 		});
 
 		test('"NOT" short', () => {
-			const lexer = new QueryLexer( queryStrings[3] );
+			const lexer = new QueryLexer( queryStrings[1] );
 			const result = lexer.query;
 
 			const tree = new ModelsTree();
@@ -337,7 +351,7 @@ describe('nodester Query Language', () => {
 		});
 
 		test('"NOT" inside includes', () => {
-			const lexer = new QueryLexer( queryStrings[4] );
+			const lexer = new QueryLexer( queryStrings[2] );
 			const result = lexer.query;
 
 			const tree = new ModelsTree();
@@ -348,8 +362,21 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
+	});
+
+	describe('operators:like', () => {
+		const queryStrings = [
+			// Like simple.
+			'title=like(some_text)',
+
+			// Not like simple.
+			'title=notLike(some_text)',
+			// Not like short.
+			'title=!like(some_text)',
+		];
+
 		test('"Like" simple', () => {
-			const lexer = new QueryLexer( queryStrings[5] );
+			const lexer = new QueryLexer( queryStrings[0] );
 			const result = lexer.query;
 
 			const tree = new ModelsTree();
@@ -358,6 +385,141 @@ describe('nodester Query Language', () => {
 
 			expect(result).toMatchObject(expected);
 		});
+
+		test('"NotLike" simple', () => {
+			const lexer = new QueryLexer( queryStrings[1] );
+			const result = lexer.query;
+
+			const tree = new ModelsTree();
+			tree.node.addWhere({ title: { notLike: ['some_text'] }});
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+
+		test('"NotLike" short', () => {
+			const lexer = new QueryLexer( queryStrings[2] );
+			const result = lexer.query;
+
+			const tree = new ModelsTree();
+			tree.node.addWhere({ title: { notLike: ['some_text'] }});
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
 	});
 
+	describe('operators:in', () => {
+		const queryStrings = [
+			// IN simple.
+			'status=[REVIEWED,ANSWERED]',
+
+			// IN and limit clause.
+			'status=[REVIEWED,ANSWERED]&limit=3',
+		];
+
+		test('"IN" simple', () => {
+			const lexer = new QueryLexer( queryStrings[0] );
+			const result = lexer.query;
+
+			const tree = new ModelsTree();
+			tree.node.addWhere({ status: { in: ['REVIEWED', 'ANSWERED'] }});
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+
+		test('"IN" and "limit" clause', () => {
+			const lexer = new QueryLexer( queryStrings[1] );
+			const result = lexer.query;
+
+			const tree = new ModelsTree();
+			tree.node.limit = 3;
+			tree.node.addWhere({ status: { in: ['REVIEWED', 'ANSWERED'] }});
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+	});
+
+	describe('operators:inequality', () => {
+		const queryStrings = [
+			// Greater than.
+			'created_at=gt(2022)',
+
+			// Greater than or equal to.
+			'created_at=gte(2023-12-08)',
+
+			// Lower than.
+			'index=lt(10)',
+
+			// Lower than or equal to.
+			'index=lte(9)',
+
+			// Greater than in subinclude.
+			'in=comments.likes(index=gt(60))'
+		];
+
+		test('Greater than', () => {
+			const lexer = new QueryLexer( queryStrings[0] );
+			const result = lexer.query;
+
+
+			const tree = new ModelsTree();
+			tree.node.addWhere({ created_at: { gt: ['2022'] }});
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+
+		test('Greater than or equal to', () => {
+			const lexer = new QueryLexer( queryStrings[1] );
+			const result = lexer.query;
+
+
+			const tree = new ModelsTree();
+			tree.node.addWhere({ created_at: { gte: ['2023-12-08'] }});
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+
+		test('Lower than', () => {
+			const lexer = new QueryLexer( queryStrings[2] );
+			const result = lexer.query;
+
+
+			const tree = new ModelsTree();
+			tree.node.addWhere({ index: { lt: ['10'] }});
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+
+		test('Lower than or equal to', () => {
+			const lexer = new QueryLexer( queryStrings[3] );
+			const result = lexer.query;
+
+
+			const tree = new ModelsTree();
+			tree.node.addWhere({ index: { lte: ['9'] }});
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+
+		test('Greater than in subinclude', () => {
+			const lexer = new QueryLexer( queryStrings[4] );
+			const result = lexer.query;
+
+
+			const tree = new ModelsTree();
+			tree.include('comments').use('comments');
+			tree.include('likes').use('likes');
+			tree.node.addWhere({ index: { gt: ['60'] }});
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+	});
 });