nodester 0.6.1 → 0.6.3

package/Readme.md

@@ -40,7 +40,7 @@ const app = new nodester();
 app.set.database(db);
 
 // Optional beforeStart hook:
-app.beforeStart(async ()=>{
+app.beforeStart(async () => {
   // Do any asynchronous initializations
   // before app.listen
   // ...
@@ -71,7 +71,7 @@ process.once('SIGTERM', () => {
 
 
 ### 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.
+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 powerful tool for expressive and efficient data querying.
 
 Read more about it in the documentation:
 [NQL documentaion →](docs/nql/Introduction.md)
@@ -83,11 +83,11 @@ Supported drivers:
 - MySQL
 - PostgreSQL
 
-[How to setup a database →](docs/App.md#with-database)
+[How to setup a database →](docs/Application.md#with-database)
 
 
 ### Application
-[Application documentation →](docs/App.md)
+[Application documentation →](docs/Application.md)
 
 
 ### Comments

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

@@ -99,7 +99,7 @@ module.exports = class QueryLexer {
 
 		// Token is a String, accumulated char-by-char.
 		let token = '';
-		// Value of param ('id=10' OR 'attributes=id,text').
+		// Value of a param ('id=10' OR 'attributes=id,text').
 		let value = [];
 		// Model, that was active before a cursor went up in the tree.
 		let previousActive = null;
@@ -107,8 +107,10 @@ module.exports = class QueryLexer {
 		for (let i=startAt; i < queryString.length; i++) {
 			const char = queryString[i];
 
-			// ( can mean params of OP token,
-			// or subquery of a model:
+			// ( can mean:
+			// • params of OP token
+			// • arguments of a function
+			// • subquery of a model
 			if (char === '(') {
 				debug('char', char, { token, node: tree.node });
 
@@ -144,8 +146,10 @@ module.exports = class QueryLexer {
 				continue;
 			}
 
-			// ) can mean end of OP token params,
-			// or end of subquery:
+			// ) can mean:
+			// • end of OP token params
+			// • end of a function arguments
+			// • end of a subquery of a model
 			if (char === ')') {
 				debug('char', char, { token, node: tree.node });
 
@@ -176,11 +180,29 @@ module.exports = class QueryLexer {
 							break;
 					}
 
-					tree.node.addWhere(fullOp);
+					// 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 (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]
+							]
+						}
+						else {
+							tree.node.where[tree.node.activeParam] = {
+								...tree.node.where[tree.node.activeParam],
+								...fullOp[tree.node.activeParam]
+							}
+						}
+					}
+					else {
+						tree.node.addWhere(fullOp);
+					}
 
 					// Reset:
 					tree.node.resetOP();
-					tree.node.activeParam = PARAM_TOKENS.INCLUDES;
 					token = '';
 					value = [];
 					continue;
@@ -211,8 +233,10 @@ module.exports = class QueryLexer {
 
 				// If end of subquery:
 				if (!!tree.node.activeParam && tree.node.activeParam !== PARAM_TOKENS.INCLUDES) {
-					// Set value.
-					this.setNodeParam(tree.node, token, value);
+					// Set value:
+					if (token.length > 0) {
+						this.setNodeParam(tree.node, token, value);
+					}
 					
 					// Reset:
 					tree.node.resetActiveParam();
@@ -225,8 +249,10 @@ module.exports = class QueryLexer {
 				return [ numberOfProcessedChars ];
 			}
 
-			// , can mean n-th value in value array,
-			// or horizontal include:
+			// , can mean:
+			// • new param in a Op params array
+			// • new argument for a function
+			// • new horizontal include
 			if (char === ',') {
 				debug('char', char, { token, node: tree.node });
 
@@ -249,22 +275,22 @@ module.exports = class QueryLexer {
 					continue;
 				}
 
-				// If new function:
+				// If a new function:
 				if (tree.node.activeParam === PARAM_TOKENS.FUNCTIONS) {
-					// Prepare for new function:
+					// Prepare for a new function:
 					tree.node.resetFN();
 					continue;
 				}
 
-				// If param value:
-				if (tree.node.activeParam !== PARAM_TOKENS.INCLUDES) {
-					value.push(token);
-					token = '';
+				// Just quit from subquery:
+				if (token.length === 0) {
 					continue;
 				}
 
-				// Just quit from subquery:
-				if (token.length === 0) {
+				// If param is a value:
+				if (tree.node.activeParam !== PARAM_TOKENS.INCLUDES) {
+					value.push(token);
+					token = '';
 					continue;
 				}
 
@@ -274,7 +300,7 @@ module.exports = class QueryLexer {
 					tree.use(model) ?? tree.include(model);
 
 					// Last token (model) was included,
-					// now jump to root and proceed to collect next token (model).
+					// now jump to the root and proceed to collect the next token (model).
 					tree.node.resetActiveParam();
 					tree.upToRoot();
 
@@ -288,8 +314,9 @@ module.exports = class QueryLexer {
 				throw err;
 			}
 
-			// . can mean vertical include
-			// or it can be a part of param for "where":
+			// . can mean:
+			// • vertical include
+			// • or it can be a part of a param for "where"
 			if (char === '.') {
 				debug('char', char, { token, node: tree.node });
 
@@ -302,7 +329,7 @@ module.exports = class QueryLexer {
 					continue;
 				}
 
-				// If include of new model:
+				// If include of a new model:
 				if (token.length > 0) {
 					const model = token;
 					tree.use(model) ?? tree.include(model).use(model);
@@ -322,7 +349,7 @@ module.exports = class QueryLexer {
 			if (char === '+') {
 				debug('char', char, { token, node: tree.node });
 
-				// If include of new model:
+				// If include of a new model:
 				if (token.length > 0) {
 					const model = token;
 					// Include, but do not use:
@@ -347,8 +374,9 @@ module.exports = class QueryLexer {
 				continue;
 			}
 
-			// & can mean the end of key=value pair in root and sub query,
-			// or the end of subincludes:
+			// & can mean:
+			// • the end of key=value pair in root and sub query
+			// • the end of subincludes
 			if (char === '&') {
 				debug('char', char, { token, node: tree.node });
 
@@ -358,13 +386,16 @@ module.exports = class QueryLexer {
 					throw err;
 				}
 
-				// If end of key=value pair:
+				// If end of a key=value pair:
 				if (!!tree.node.activeParam
 						&& tree.node.activeParam !== PARAM_TOKENS.FUNCTIONS
 						&& tree.node.activeParam !== PARAM_TOKENS.INCLUDES
 					) {
-					// Set value.
-					this.setNodeParam(tree.node, token, value);
+					if (token.length > 0) {
+						// Set value.
+						this.setNodeParam(tree.node, token, value);
+					}
+
 					// Reset:
 					tree.node.resetActiveParam();
 					token = '';
@@ -427,8 +458,8 @@ module.exports = class QueryLexer {
 				throw err;
 			}
 			
-			// [ can mean start of 'in'/'notIn',
-			// or 'notIn':
+			// [ can mean:
+			// • start of 'in' / 'notIn'
 			if (char === '[') {
 				tree.node.op = OP_TOKENS.IN;
 				if (token.length > 0) {
@@ -446,7 +477,8 @@ module.exports = class QueryLexer {
 				continue;
 			}
 
-			// ] can mean end of 'in'/'notIn':
+			// ] can mean:
+			// • end of 'in' / 'notIn'
 			if (char === ']') {
 				// User missed first '[' :
 				if (
@@ -477,7 +509,7 @@ module.exports = class QueryLexer {
 				continue;
 			}
 			
-			// = can only mean the end of param name:
+			// = can only mean the end of a param name:
 			if (char === '=') {
 				const param = this.parseParamFromToken(token);
 

package/lib/query/traverse/index.js

@@ -153,6 +153,7 @@ function traverse(queryNode, filter=null, model=null, association=null) {
 
 					newQuery
 				);
+				break;
 			}
 			// Any other function:
 			default:
@@ -195,8 +196,8 @@ function traverse(queryNode, filter=null, model=null, association=null) {
 			case 'limit': {
 				const _value = _setValueWithBounds(value, 'number', filter.bounds.clauses.limit);
 
-				// Do not set if -1:
-				if (_value === -1) 
+				// Do not set if negative:
+				if (_value < 0) 
 					continue;
 
 				newQuery.limit = _value;
@@ -205,8 +206,8 @@ function traverse(queryNode, filter=null, model=null, association=null) {
 			case 'skip': {
 				const _value = _setValueWithBounds(value, 'number', filter.bounds.clauses.skip);
 
-				// Do not set if 0:
-				if (_value === 0)
+				// Do not set if 0 or negative:
+				if (_value <= 0)
 					continue;
 
 				newQuery.offset = _value;
@@ -329,14 +330,14 @@ function traverse(queryNode, filter=null, model=null, association=null) {
 
 	//	Set aatributes from Query:
 	const whereEntries = Object.entries(where);
-	for (let [ attribute, value ] of whereEntries) {
-		parseWhereEntry(attribute, value, newQuery.where);
+	for (const [ attribute, value ] of whereEntries) {
+		parseWhereEntry(attribute, value, newQuery.where, _model);
 	}
 
 	//	Static attributes override previously set attributes:
 	const staticAttributesEntries = Object.entries(filter.statics.attributes);
-	for (let [ attribute, staticValue ] of staticAttributesEntries) {
-		newQuery.where[attribute] = parseValue(staticValue, attribute);
+	for (const [ attribute, staticValue ] of staticAttributesEntries) {
+		newQuery.where[attribute] = parseValue(staticValue, attribute, _model);
 	}
 
 	//	If "where" was not set in any way,

package/lib/query/traverse/parsers.js

@@ -6,6 +6,7 @@
 'use strict';
 
 const { Op } = require('sequelize');
+const { DataTypes } = require('sequelize');
 
 
 module.exports = {
@@ -13,31 +14,50 @@ module.exports = {
 	parseWhereEntry: _parseWhereEntry,
 }
 
-function _parseValue(value, attribute) {
+function _parseValue(value, attribute, model) {
 	// If value is Object:
 	if (typeof value === 'object' && Array.isArray(value) === false) {
-		const [ opKey, rawValue ] = (Object.entries(value))[0];
-
-		const op = Op[opKey];
-		return { [op]: rawValue };
+		// Combine all OPs into one query:
+		const allOPs = {};
+		const entries = Object.entries(value);
+		for (const [ opKey, rawValue ] of entries) {
+			const op = Op[opKey];
+
+			let _value = rawValue;
+
+			// Sequilize does not allow Op comparisons of dates
+			// without converting the value to the Date object:
+			switch(model.tableAttributes[attribute].type.key) {
+				case DataTypes.DATE.key:
+				case DataTypes.DATEONLY.key:
+					_value = new Date(rawValue);
+					break;
+
+				default:
+					break;
+			}
+
+			allOPs[op] = _value;
+		}
+		return allOPs;
 	}
 
 	return value;
 }
 
-function _parseWhereEntry(attribute, value, whereHolder) {
+function _parseWhereEntry(attribute, value, whereHolder, model) {
 	let _value = value;
 
 	// If attribute is Op (not, like, or, etc.):
 	if (attribute in Op) {
 		// Parse value:
-		_value = _parseValue(_value, attribute);
+		_value = _parseValue(_value, attribute, model);
 
 		const op = Op[attribute];
 		whereHolder[op] = _value;
 		return;
 	}
 
-	whereHolder[attribute] = _parseValue(_value, attribute);
+	whereHolder[attribute] = _parseValue(_value, attribute, model);
 }
 

package/package.json

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

package/tests/nql.test.js

@@ -576,13 +576,96 @@ describe('nodester Query Language', () => {
 		});
 	});
 
+	describe('operators:and', () => {
+		const queryStrings = {
+			and_simple: 'id=gte(2),lt(5)',
+			and_more_op: 'title=like(book),notLike(book #3),notLike(book #4)',
+
+			and_in_subincludes_0: 'in=comments(text=like(hi),notLike(hi!))',
+			and_in_subincludes_1: 'id=4&in=comments(text=like(hi),notLike(hi!))',
+			and_in_subincludes_2: 'title=like(book),notLike(book #3)&in=comments(text=like(hi),notLike(hi!))',
+		}
+
+		test('AND (simple)', () => {
+			const lexer = new QueryLexer( queryStrings.and_simple );
+			const result = lexer.query;
+
+			const tree = new ModelsTree();
+			tree.node.addWhere({ id: { gte: ['2'], lt: ['5'] }});
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+
+		test('AND (more OP)', () => {
+			const lexer = new QueryLexer( queryStrings.and_more_op );
+			const result = lexer.query;
+
+			const tree = new ModelsTree();
+			tree.node.addWhere({
+				title: { like: ['book'], notLike: ['book #3', 'book #4'] }
+			});
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+
+		test('AND (in subincludes #0)', () => {
+			const lexer = new QueryLexer( queryStrings.and_in_subincludes_0 );
+			const result = lexer.query;
+
+			const tree = new ModelsTree();
+			tree.include('comments').use('comments');
+			tree.node.addWhere({
+				text: { like: ['hi'], notLike: ['hi!'] }
+			});
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+
+		test('AND (in subincludes #1)', () => {
+			const lexer = new QueryLexer( queryStrings.and_in_subincludes_1 );
+			const result = lexer.query;
+
+			const tree = new ModelsTree();
+			tree.node.addWhere({
+				id: ["4"]
+			});
+			tree.include('comments').use('comments');
+			tree.node.addWhere({
+				text: { like: ['hi'], notLike: ['hi!'] }
+			});
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+
+		test('AND (in subincludes #2)', () => {
+			const lexer = new QueryLexer( queryStrings.and_in_subincludes_2 );
+			const result = lexer.query;
+
+			const tree = new ModelsTree();
+			tree.node.addWhere({
+				title: { like: ['book'], notLike: ['book #3'] }
+			});
+			tree.include('comments').use('comments');
+			tree.node.addWhere({
+				text: { like: ['hi'], notLike: ['hi!'] }
+			});
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+	});
+
 
 	describe('functions', () => {
 		const queryStrings = {
-			count_long: '?functions=count(comments)',
-			count_short: '?fn=count(comments)',
+			count_long: 'functions=count(comments)',
+			count_short: 'fn=count(comments)',
 
-			count_and_includes: '?fn=count(comments)&in=comments',
+			count_and_includes: 'fn=count(comments)&in=comments',
 		}
 
 		test('Count (full key name)', () => {