nodester 0.2.2 → 0.2.3

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

@@ -125,8 +125,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:
@@ -192,6 +196,7 @@ module.exports = class QueryLexer {
 			}
 
 			// , can mean n-th value in value array,
+			// or it can be n-th key-value pair in subquery,
 			// or horizontal include:
 			if (char === ',') {
 				debug('char', char, { token, node: tree.node });
@@ -470,8 +475,7 @@ module.exports = class QueryLexer {
 				treeNode.order_by = token;
 				break;
 			case 'fields':
-				if (token)
-					value.push(token);
+				if (token) value.push(token);
 				treeNode.fields = value;
 				break;
 			case 'includes':
@@ -479,8 +483,7 @@ module.exports = class QueryLexer {
 				treeNode.include(node);
 				break;
 			default:
-				if (token)
-					value.push(token);
+				if (token) value.push(token);
 				treeNode.addWhere({ [param]: value });
 				break;
 		}

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.3",
   "description": "A versatile REST framework for Node.js",
   "exports": {
     ".": "./lib/application/index.js",