nodester 0.2.0 → 0.2.2

package/Readme.md

@@ -1,9 +1,12 @@
 # nodester
->  A robust and flexible boilerplate framework that makes iterative development easy.
 
 [![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.
+
+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.
+
 
 ## Installation
 
@@ -18,7 +21,6 @@ npm install -S nodester
 
 - [Usage](#usage)
 - [Documentation](#documentation)
-- [Extending App](#extending-application-functionality)
 - [Philosophy](#philosophy)
 - [License](#license)
 - [Copyright](#copyright)
@@ -47,10 +49,11 @@ app.listen(8080, function() {
 [Core concepts documentation ➡️](docs/CoreConcepts.md)
 
 
-### Queries & Querying - Nodester Query Language (NQR)
-One of the main power points of nodester is it's query language. It's an extension of a REST API syntaxis for a broader integration with a database SQL. Read more about it in the documentation:
+### 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.
 
-[NQR documentaion ➡️](docs/Queries.md)
+Read more about it in the documentation:
+[NQL documentaion ➡️](docs/Queries.md)
 
 
 ### Database
@@ -70,7 +73,7 @@ The Philosophy of `nodester` is to provide a developer with a tool that can buil
 
 ### Goal
 
-The goal of `nodester` is to be a robust and flexible framework that makes development in iteratations easy, and further scale possible.
+The goal of `nodester` is to be a robust and flexible framework that makes development in iteratations easy, while laying the foundation for seamless scalability in the future.
 
 
 ## LICENSE

package/lib/application/index.js

@@ -30,7 +30,7 @@ const {
 const { merge } = require('../utils/objects.util');
 
 // Arguments validator.
-const { ensure } = require('../validators/arguments');
+const { ensure } = require('nodester/validators/arguments');
 
 // Console:
 const consl = require('nodester/loggers/console');
@@ -134,6 +134,17 @@ module.exports = class NodesterApplication extends Emitter {
 		return this._router.isLocked;
 	}
 
+	/**
+	 * Indicates whether app is awaiting requests.
+	 *
+	 * @return {Boolean} isListening
+	 *
+	 * @api public
+	 */
+	get isListening() {
+		return this._isListening;
+	}
+
 	// Getters\
 
 	/*

package/lib/controllers/mixins/index.js

@@ -24,7 +24,7 @@ const {
 } = require('../methods');
 
 // Arguments validator.
-const { ensure } = require('../../validators/arguments');
+const { ensure } = require('nodester/validators/arguments');
 
 
 module.exports = {

package/lib/database/migration.js

@@ -7,6 +7,9 @@
 
 const { associateModels } = require('nodester/models/associate');
 
+// Arguments validator.
+const { ensure } = require('nodester/validators/arguments');
+
 
 module.exports = {
 	migrate: _migrate
@@ -14,11 +17,7 @@ module.exports = {
 
 async function _migrate(databaseConnection, force=false) {
 	try {
-		// Validation of 'force' parameter.
-		if (typeof force !== 'boolean') {
-			const err = new Error('Wrong "force" parameter; must be boolean.');
-			throw err;
-		}
+		ensure(force, 'boolean', 'force');
 
 		// Test connection.
 		await databaseConnection.authenticate();
@@ -44,7 +43,7 @@ async function _migrate(databaseConnection, force=false) {
 		return Promise.resolve(output);
 	}
 	catch(error) {
-		console.error(' Migration failed!');
+		console.error('Migration failed!');
 		console.error(error);
 		return Promise.reject(error);
 	}

package/lib/errors/NodesterError.js

@@ -0,0 +1,18 @@
+/*!
+ * /nodester
+ * MIT Licensed
+ */
+
+'use strict';
+
+
+module.exports = class NodesterError extends Error {
+	constructor(message, status) {
+		super(message);
+		
+		this.name = this.constructor.name;
+		this.status = status;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+}

package/lib/{factories/errors → errors}/NodesterQueryError.js

@@ -8,16 +8,19 @@
 const {
 	NODESTER_QUERY_ERROR,
 } = require('nodester/constants/ErrorCodes');
+const {
+	NOT_ACCEPTABLE
+} = require('nodester/http/codes');
+
+const NodesterError = require('./NodesterError');
 
 
-module.exports = class NodesterQueryError extends Error {
+module.exports = class NodesterQueryError extends NodesterError {
 	constructor(message) {
 		super(message);
 
-		this.name = NODESTER_QUERY_ERROR;
-		this.status = 422;
+		this.status = NOT_ACCEPTABLE;
 
-		// Remove constructor info from stack.
 		Error.captureStackTrace(this, this.constructor);
 	}
 }

package/lib/{factories/errors → errors}/index.js

@@ -7,10 +7,12 @@
 
 
 const Err = require('./CustomError');
+const NodesterError = require('./NodesterError');
 const NodesterQueryError = require('./NodesterQueryError');
 
 
 module.exports = {
 	Err,
+	NodesterError,
 	NodesterQueryError
 }

package/lib/facades/methods/index.js

@@ -21,7 +21,8 @@ module.exports = {
 
 /*
  *
- * @param {Object} params
+ * @param {Object} [params]
+ * @param {Object} params.query
  *
  * @alias getOne
  * @api public
@@ -40,6 +41,10 @@ async function _getOne(params) {
 			[this.outputName.singular]: instance,
 			count: 0 + (instance !== null)
 		}
+
+		// Hook (checkout facades/mixins).
+		await this.afterGetOne(instance, params, result);
+
 		return Promise.resolve(result);
 	}
 	catch(error) {
@@ -51,7 +56,8 @@ async function _getOne(params) {
 
 /*
  *
- * @param {Object} params
+ * @param {Object} [params]
+ * @param {Object} params.query
  *
  * @alias getMany
  * @api public
@@ -70,6 +76,10 @@ async function _getMany(params) {
 			[this.outputName.plural]: instances,
 			count: instances.length
 		}
+
+		// Hook (checkout facades/mixins).
+		await this.afterGetMany(instances, params, result);
+
 		return Promise.resolve(result);
 	}
 	catch(error) {
@@ -81,7 +91,8 @@ async function _getMany(params) {
 
 /*
  *
- * @param {Object} params
+ * @param {Object} [params]
+ * @param {Object} params.data
  *
  * @alias createOne
  * @api public
@@ -103,7 +114,7 @@ async function _createOne(params) {
 			count: 0 + (instance !== null)
 		}
 
-		// Call after create.
+		// Hook (checkout facades/mixins).
 		await this.afterCreateOne(instance, params, result);
 
 		return Promise.resolve(result);
@@ -117,7 +128,9 @@ async function _createOne(params) {
 
 /*
  *
- * @param {Object} params
+ * @param {Object} [params]
+ * @param {Object} params.query
+ * @param {Object} params.data
  *
  * @alias updateOne
  * @api public
@@ -141,6 +154,10 @@ async function _updateOne(params) {
 			[this.outputName.singular]: instance,
 			count: 0 + (instance !== null)
 		}
+
+		// Hook (checkout facades/mixins).
+		await this.afterUpdateOne(instance, params, result);
+
 		return Promise.resolve(result);
 	}
 	catch(error) {
@@ -152,7 +169,8 @@ async function _updateOne(params) {
 
 /*
  *
- * @param {Object} params
+ * @param {Object} [params]
+ * @param {Object} params.query
  *
  * @alias deleteOne
  * @api public
@@ -171,6 +189,10 @@ async function _deleteOne(params) {
 			success: count > 0,
 			count: count
 		};
+
+		// Hook (checkout facades/mixins).
+		await this.afterDeleteOne(null, params, result);
+
 		return Promise.resolve(result);
 	}
 	catch(error) {

package/lib/facades/mixins/index.js

@@ -18,7 +18,7 @@ const { Sequelize } = require('sequelize');
 const { lowerCaseFirstLetter } = require('nodester/utils/strings');
 
 // Arguments validator.
-const { ensure } = require('../../validators/arguments');
+const { ensure } = require('nodester/validators/arguments');
 
 
 module.exports = {
@@ -70,6 +70,7 @@ function _withDefaultCRUD(facade, options={}) {
 		},
 		writable: false
 	});
+	// Model info\
 
 	// Set name of this facade:
 	Object.defineProperty(facade, 'name', {
@@ -138,7 +139,7 @@ function _withDefaultCRUD(facade, options={}) {
 		facade.afterGetMany   = async () => {};
 		facade.afterCreateOne = async () => {};
 		facade.afterUpdateOne = async () => {};
-		facade.afterDeleteOe  = async () => {};
+		facade.afterDeleteOne = async () => {};
 	}
 
 	return facade;

package/lib/factories/responses/rest.js

@@ -8,8 +8,8 @@
 /*
  * REST response factory.
  */
-
-const ResponseFormats = require('../../constants/ResponseFormats');
+const Params = require('nodester/params');
+const { NodesterError } = require('nodester/errors');
 
 
 module.exports = {
@@ -26,52 +26,83 @@ module.exports = {
  * }
  * Status code is sent in header.
  * 	
- * If error is not present, error should be null.
+ * If error is not present, error must be null.
  * If error is present, content can be null (But it's not required).
  *
  * @param {ServerResponse} res
- * @param {Object} options
+ * @param {Object} [options]
  * @param {Object} options.error
  * @param {Object} options.content (optional)
  * @param {Int}    options.status
- * @param {String} options.format
  *
  * @alias createGenericResponse
  * @api public
 */
-function _createGenericResponse(
-	res,
-	options = {
-		status: 200,
-		content: {},
-		error: null,
-		format: ResponseFormats.JSON
-	}
-) {
+function _createGenericResponse(res, options) {
 	try {
+		let {
+			status,
+			content,
+			error
+		} = Params(options, {
+			status: 200,
+			content: {},
+			error: null
+		});
+
 		const data = {
 			content: options?.content ?? null,
-			error: options?.error ?? null
+			error: null,
 		};
 
-		switch(options?.format) {
-			case ResponseFormats.JSON: {
-				return res.json(data);
+		if (!!error) {
+			const details = {
+				message: error?.message
 			}
-			case ResponseFormats.XML: {
-				// TODO: format data into XML.
-				return res.send(data);
+
+			switch(error.name) {
+				case 'Unauthorized': {
+					statusCode = 401;
+					break;
+				}
+				case 'NotFound': {
+					statusCode = 404;
+					break;
+				}
+				case 'ValidationError': {
+					statusCode = 422;
+					break;
+				}
+				case 'ConflictError': {
+					statusCode = 409;
+					break;
+				}
+				case 'SequelizeUniqueConstraintError': {
+					statusCode = 409;
+					details.errors = error?.errors;
+					break;
+				}
+				default:
+					statusCode = status;
+
+					if (!!error?.errors) {
+						details.errors = error?.errors;
+					}
+					break;
 			}
-			default: {
-				const err = new TypeError("No format specified.");
-				throw err;
+
+			data.error = {
+				details: details,
+				code: error.name
 			}
 		}
+
+		res.status(status);
+		return res.json(data);
 	}
 	catch(error) {
-		const err = new Error(`Could not create generic response: ${error.message}`);
-		err.name = error?.name;
-		err.code = error?.code;
+		const err = new NodesterError(`Could not create generic response: ${ error.message }`);
+		Error.captureStackTrace(err, _createGenericResponse);
 		throw err;
 	}
 }
@@ -82,8 +113,9 @@ function _createGenericResponse(
  * Should be called on all successful respones.
  *
  * @param {ServerResponse} res
+ * @param {Object} [options]
  * @param {Object} options.content (optional)
- * @param {String} options.format
+ * @param {Object} options.status (optional)
  *
  * @alias createOKResponse
  * @api public
@@ -92,8 +124,7 @@ function _createOKResponse(res, options={}) {
 
 	return this.createGenericResponse(res, { 
 		...options,
-		status: 200,
-		format: options?.format ?? ResponseFormats.JSON
+		status: options?.status ?? 200,
 	});
 }
 
@@ -103,11 +134,10 @@ function _createOKResponse(res, options={}) {
  * Should be called on all failed respones.
  *
  * @param {ServerResponse} res
- * @param {Object} options
+ * @param {Object} [options]
  * @param {Object} options.error
  * @param {Object} options.content (optional)
  * @param {Int}    options.status
- * @param {String} options.format
  *
  * @alias createErrorResponse
  * @api public
@@ -117,6 +147,5 @@ function _createErrorResponse(res, options) {
 	return this.createGenericResponse(res, {
 		...options,
 		status: options?.status ?? 500,
-		format: options?.format ?? ResponseFormats.JSON
 	});
 }

package/lib/http/codes/index.js

@@ -79,4 +79,5 @@ module.exports = new Enum({
 	LOOP_DETECTED: 508,
 	NOT_EXTENDED: 510,
 	NETWORK_AUTHENTICATION_REQUIRED: 511,
-});
+})
+.withKeyPrefix('HTTP_CODE_');

package/lib/middlewares/cookies/index.js

@@ -5,9 +5,15 @@
  
 'use strict';
 
+const {
+	HTTP_CODE_UNPROCESSABLE_ENTITY
+} = require('nodester/http/codes');
+
 const cookie = require('cookie');
 const cookieSignature = require('cookie-signature');
 
+const { createErrorResponse } = require('nodester/factories/responses/rest');
+
 
 module.exports = function initCookiesMiddleware(options={}) {
 	const context = {
@@ -26,19 +32,12 @@ function cookiesHandle(req, res, next) {
 		const cookies = cookie.parse(req.headers.cookie);
 		req.cookies = cookies;
 
-		next();
+		return next();
 	}
 	catch(error) {
-		console.error(error);
-
-		const statusCode = error.status || 406;
-		res.status(statusCode);
-		res.json({
-			error: {
-				message: error.message,
-				code: statusCode
-			},
-			status: statusCode
+		return createErrorResponse(res, {
+			error: error,
+			status: error.status ?? HTTP_CODE_UNPROCESSABLE_ENTITY
 		});
 	}
 }

package/lib/middlewares/formidable/index.js

@@ -5,8 +5,14 @@
  
 'use strict';
 
+const {
+	HTTP_CODE_NOT_ACCEPTABLE
+} = require('nodester/http/codes');
+
 const { formidable } = require('formidable');
 
+const { createErrorResponse } = require('nodester/factories/responses/rest');
+
 
 module.exports = function initFormidableMiddleware(formidableOptions={}) {
 	const context = {
@@ -26,17 +32,12 @@ async function formidableHandle(req, res, next) {
 			files
 		};
 
-		next();
+		return next();
 	}
 	catch(error) {
-		const statusCode = error.status || 406;
-		res.status(statusCode);
-		res.json({
-			error: {
-				message: error.message,
-				code: statusCode
-			},
-			status: statusCode
-		});
+		return createErrorResponse(res, {
+			error: error,
+			status: error.status ?? HTTP_CODE_NOT_ACCEPTABLE
+		})
 	}
 }

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

@@ -5,8 +5,12 @@
  
 'use strict';
 
+const {
+	HTTP_CODE_UNPROCESSABLE_ENTITY
+} = require('nodester/http/codes');
+
 const QueryLexer = require('./interpreter/QueryLexer');
-const httpCodes = require('nodester/http/codes');
+const { createErrorResponse } = require('nodester/factories/responses/rest');
 
 
 module.exports = function initNodesterQL() {
@@ -34,10 +38,12 @@ async function nqlHandle(req, res, next) {
 
 		// Go on!
 		req.nquery = lexer.query;
-		next();
+		return next();
 	}
 	catch(error) {
-		res.status(error.status ?? httpCodes.UNPROCESSABLE_ENTITY);
-		res.json({ error: error.toString() });
+		return createErrorResponse(res, {
+			error: error,
+			status: error.status ?? HTTP_CODE_UNPROCESSABLE_ENTITY
+		});
 	}
 }

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

@@ -2,6 +2,7 @@
  * /nodester
  * MIT Licensed
  */
+
 'use strict';
 
 const debug = require('debug')('nodester:interpreter:ModelsTree');
@@ -22,15 +23,27 @@ class ModelsTreeNode {
 		this.skip = 0;
 		this.limit = -1; // No limit
 
-		this.includes = opts.includes ?? [];
+		this._includes = opts.includes ?? [];
 		this.order = opts.order ?? 'asc';
 		this.order_by = opts.order_by ?? 'id';
 	}
 
+	get where() {
+		return this._where;
+	}
+
+	get functions() {
+		return this._functions;
+	}
+
 	get hasParent() {
 		return this.parent !== null;
 	}
 
+	get includes() {
+		return this._includes;
+	}
+
 	get includesCount() {
 		return Object.values(this.includes).length;
 	}
@@ -39,14 +52,6 @@ class ModelsTreeNode {
 		return this.includesCount > 0;
 	}
 
-	get where() {
-		return this._where;
-	}
-
-	get functions() {
-		return this._functions;
-	}
-
 	resetActiveParam() {
 		this.activeParam = null;
 	}
@@ -72,7 +77,7 @@ class ModelsTreeNode {
 
 	include(modelTreeNode) {
 		modelTreeNode.parent = this;
-		this.includes.push(modelTreeNode);
+		this._includes.push(modelTreeNode);
 		return modelTreeNode;
 	}
 

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

@@ -222,6 +222,13 @@ module.exports = class QueryLexer {
 					const model = token;
 					tree.use(model) ?? tree.include(model);
 
+					// Last token (model) was included,
+					// now jump to root and proceed to collect next token (model).
+					tree.node.resetActiveParam();
+					tree.upToRoot();
+
+					tree.node.activeParam = 'includes';
+
 					token = '';
 					continue;
 				}
@@ -376,7 +383,7 @@ module.exports = class QueryLexer {
 				const param = this.parseParamFromToken(token);
 
 				if (isSubQuery === true && param === 'includes') {
-					const err = new TypeError(`'include' is forbidden inside subquery (position ${ i }). Use: 'model.model1' or 'model.model1+model2'.`);
+					const err = new TypeError(`'include' is forbidden inside subquery (position ${ i }). Use: 'model.submodel' or 'model.submodel1+submodel2'.`);
 					throw err;
 				}
 
@@ -403,7 +410,7 @@ module.exports = class QueryLexer {
 					const err = MissingCharError(i+1, ')');
 					throw err;
 				}
-
+				
 				this.setNodeParam(tree.node, token, value);
 
 				// If end of subquery:

package/lib/query/traverse.js

@@ -8,10 +8,10 @@
 const BOUNDS = require('../constants/Bounds');
 
 const { Op } = require('sequelize');
-const NQueryError = require('../factories/errors/NodesterQueryError');
+const { NodesterQueryError } = require('nodester/errors');
 const httpCodes = require('nodester/http/codes');
 
-const { ensure } = require('../validators/arguments');
+const { ensure } = require('nodester/validators/arguments');
 
 
 module.exports = traverse;
@@ -73,8 +73,8 @@ function traverse(queryNode, filter=null, model=null) {
 		//	put them through Filter:
 		for (let field of filter.fields) {
 			if (fieldsAvailable.indexOf(field) === -1) {
-				const err = new TypeError(`Field '${ field }' is not present in model.`);
-				err.status = httpCodes.NOT_ACCEPTABLE;
+				const err = new NodesterQueryError(`Field '${ field }' is not present in model.`);
+				Error.captureStackTrace(err, traverse);
 				throw err;
 			}
 
@@ -93,8 +93,8 @@ function traverse(queryNode, filter=null, model=null) {
 	
 	//	At least 1 field is mandatory:
 	if (newQuery.attributes.length === 0) {
-		const err = new TypeError(`No fields were selected.`);
-		err.status = httpCodes.NOT_ACCEPTABLE;
+		const err = new NodesterQueryError(`No fields were selected.`);
+		Error.captureStackTrace(err, traverse);
 		throw err;
 	}
 	// Fields\
@@ -119,7 +119,7 @@ function traverse(queryNode, filter=null, model=null) {
 			let rawSQL = '(SELECT COUNT(*) FROM ';
 			let countAttribute = '_count';
 
-			// If request to count one of includes:
+			// If request to count one of the includes:
 			if (!isForRootModel) {
 				// Check if it's available:
 				if (
@@ -129,8 +129,8 @@ function traverse(queryNode, filter=null, model=null) {
 						||
 						rootModelAssociations[countTarget] === undefined
 					) {
-					const err = new NQueryError(`Count for '${ countTarget }' is not available.`);
-					err.status = httpCodes.NOT_ACCEPTABLE;
+					const err = new NodesterQueryError(`Count for '${ countTarget }' is not available.`);
+					Error.captureStackTrace(err, traverse);
 					throw err;
 				}
 
@@ -261,12 +261,12 @@ function traverse(queryNode, filter=null, model=null) {
 
 
 	// Includes:
-	// 	If requested includes are not available:
+	// 	Validate, if requested includes are available:
 	for (let include of includes) {
 		const includeName = include.model;
+
 		if (rootModelAssociations[includeName] === undefined) {
-			const err = new NQueryError(`No include named '${ includeName }'.`);
-			err.status = httpCodes.NOT_ACCEPTABLE;
+			const err = new NodesterQueryError(`No include named '${ includeName }'`);			
 			Error.captureStackTrace(err, traverse);
 			throw err;
 		}
@@ -300,8 +300,7 @@ function _traverseIncludes(includes, model, filter, resultQuery) {
 
 		// If no such association:
 		if (!association) {
-			const err = new NQueryError(`No include named '${ includeName }'.`);
-			err.status = httpCodes.NOT_ACCEPTABLE;
+			const err = new NodesterQueryError(`No include named '${ includeName }'`);			
 			Error.captureStackTrace(err, _traverseIncludes);
 			throw err;
 		}

package/lib/router/index.js

@@ -25,7 +25,7 @@ const fs = require('fs');
 const commonExtensions = require('common-js-file-extensions');
 
 // Arguments validator.
-const { ensure } = require('../validators/arguments');
+const { ensure } = require('nodester/validators/arguments');
 
 // Console:
 const consl = require('nodester/loggers/console');

package/lib/router/route.js

@@ -9,7 +9,7 @@
 const { typeOf } = require('../utils/types.util');
 
 // Arguments validator.
-const { ensure } = require('../validators/arguments');
+const { ensure } = require('nodester/validators/arguments');
 
 
 module.exports = class NodesterRoute {

package/lib/stacks/MarkersStack.js

@@ -6,7 +6,7 @@
 'use strict';
 
 // Arguments validator.
-const { ensure } = require('../validators/arguments');
+const { ensure } = require('nodester/validators/arguments');
 
 // Console:
 const consl = require('nodester/loggers/console');

package/lib/stacks/MiddlewaresStack.js

@@ -8,7 +8,7 @@
 const finalhandler = require('finalhandler');
 
 // Arguments validator.
-const { ensure } = require('../validators/arguments');
+const { ensure } = require('nodester/validators/arguments');
 
 // Console:
 const consl = require('nodester/loggers/console');
@@ -175,17 +175,17 @@ module.exports = class MiddlewaresStack {
 	process(req, res, next) {
 		let middlewareOffset = -1;
 
-		const _next = (...args) => {
+		const _next = async (...args) => {
 			middlewareOffset += 1;
 			const fn = this._middlewares[middlewareOffset];
 
 			try {
 				if (!fn && !!next) {
-					// Middleware stack is finished:
+					// Middlewares stack is finished:
 					return next.call(null, req, res, next, ...args);
 				}
 				else if (!!fn) {
-					return fn.call(null, req, res, _next, ...args);
+					return await fn.call(null, req, res, _next, ...args);
 				}
 			}
 			catch(error) {

package/lib/structures/Filter.js

@@ -9,7 +9,7 @@ const BOUNDS = require('../constants/Bounds');
 const CLAUSES = require('../constants/Clauses');
 
 const { isModel } = require('../utils/models');
-const { ensure } = require('../validators/arguments');
+const { ensure } = require('nodester/validators/arguments');
 
 
 module.exports = class NodesterFilter {
@@ -97,7 +97,8 @@ module.exports = class NodesterFilter {
 				}
 
 				// If singular association:
-				if (['HasMany', 'HasOne'].indexOf(association.associationType) === -1) {
+				// Fix of "Only HasMany associations support include.separate"
+				if ('HasMany' !== association.associationType) {
 					// Empty bounds.
 					includeFilter.noBounds = true;
 				}

package/lib/tools/nql.tool.js

@@ -0,0 +1,45 @@
+/*!
+ * /nodester
+ * MIT Licensed
+ */
+
+'use strict';
+
+
+module.exports = {
+	toAST_ModelsTreeNode: _toAST_ModelsTreeNode
+}
+
+function _toAST_ModelsTreeNode(node, spacing=0) {
+	let spaces = '';
+	for (let i = 0; i < spacing; i++) {
+		spaces += ' ';
+	}
+
+	let ast = `${ spaces }[TreeNode]\n`;
+
+	spaces += ' ';
+
+	ast += `${ spaces }model: ${ node.model }\n\n`;
+
+	ast += `${ spaces }fields: [\n${ node.fields.map(f => ` • ${ f },\n`) }`;
+	ast += `${ spaces }]\n\n`;
+
+	ast += `${ spaces }functions: [\n${ node.functions.map(f => ` • ${ f },\n`) }`;
+	ast += `${ spaces }]\n\n`;
+
+	ast += `${ spaces }where: ${ JSON.stringify(node.where) }\n\n`;
+
+	['skip','limit','order','order_by'].map(
+		c =>  ast += `${ spaces }${ c }: ${ node[c] }\n\n`
+	);
+	
+	ast += `${ spaces }includes: [\n`
+	node.includes.map(n => ast += _toAST_ModelsTreeNode(n, spacing + 2));
+	ast += `${ spaces }]\n`;
+
+	spaces.slice(-1);
+	ast += `${ spaces }[TreeNode END]\n\n`;
+
+	return ast;
+}

package/lib/utils/objects.util.js

@@ -6,7 +6,7 @@
 'use strict';
 
 // Arguments validator.
-const { ensure } = require('../validators/arguments');
+const { ensure } = require('nodester/validators/arguments');
 
 
 module.exports = {

package/lib/validators/arguments.js

@@ -17,7 +17,7 @@ module.exports = {
  * @param {String} rules
  * @param {String} argumentName
  *
- * @api private
+ * @api public
  * @alias ensure
  */
 function _ensure(argument, rules, argumentName) {
@@ -40,7 +40,9 @@ function _ensure(argument, rules, argumentName) {
 
 		if (rule === 'required') {
 			if (argument === undefined || argument === null) {
-				throw new Error(`${ name } is required.`);
+				const err = new TypeError(`${ name } is required.`);
+				Error.captureStackTrace(err, _ensure);
+				throw err;
 			}
 
 			isRequired = true;
@@ -61,7 +63,9 @@ function _ensure(argument, rules, argumentName) {
 	}
 
 	if (mismatchedTypesCount === types.length && argument !== undefined) {
-		throw new TypeError(`${ name } must be of type ${ types.join('|') }.`);
+		const err = new TypeError(`${ name } must be of type ${ types.join('|') }.`);
+		Error.captureStackTrace(err, _ensure);
+		throw err;
 	}
 
 	return true;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nodester",
-  "version": "0.2.0",
-  "description": "A boilerplate framework for Node.js",
+  "version": "0.2.2",
+  "description": "A versatile REST framework for Node.js",
   "exports": {
     ".": "./lib/application/index.js",
 
@@ -18,11 +18,12 @@
 
     "./enum": "./lib/structures/Enum.js",
 
+    "./errors": "./lib/errors/index.js",
+
     "./facades/methods": "./lib/facades/methods/index.js",
     "./facades/mixins": "./lib/facades/mixins/index.js",
 
-    "./factories/errors": "./lib/factories/errors/index.js",
-    "./factories/responses/rest": "./lib/factories/responses/rest/index.js",
+    "./factories/responses/rest": "./lib/factories/responses/rest.js",
 
     "./filter": "./lib/structures/Filter.js",
 
@@ -53,10 +54,14 @@
 
     "./utils/sql": "./lib/utils/sql.util.js",
     "./utils/strings": "./lib/utils/strings.util.js",
-    "./utils/sanitizations": "./lib/utils/sanitizations.util.js"
+    "./utils/sanitizations": "./lib/utils/sanitizations.util.js",
+
+    "./validators/arguments": "./lib/validators/arguments.js"
   },
   "directories": {
-    "doc": "docs"
+    "docs": "docs",
+    "lib": "lib",
+    "tests": "tests"
   },
   "source": [
     "lib"
@@ -67,7 +72,10 @@
   },
   "author": "Mark Khramko <markkhramko@gmail.com>",
   "license": "MIT",
-  "repository": "MarkKhramko/nodester",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/MarkKhramko/nodester.git"
+  },
   "private": false,
   "bugs": {
     "url": "https://github.com/MarkKhramko/nodester/issues"

package/tests/ast.test.js

@@ -0,0 +1,16 @@
+const { ModelsTree } = require('../lib/middlewares/ql/sequelize/interpreter/ModelsTree');
+const { toAST_ModelsTreeNode } = require('../lib/tools/nql.tool');
+
+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');
+
+console.debug(toAST_ModelsTreeNode(tree.root));
+

package/tests/index.test.js

@@ -27,13 +27,13 @@ describe('nodester application', () => {
 	test('Application start', () => {
 		app.listen(PORT, function() {
 			expect(app.port).toBe(PORT);
-			expect(app.router._middlewares.isLocked).toBe(true);
-			expect(app.router._middlewares.length).toBe(2);
+			expect(app.isLocked).toBe(true);
+			expect(app.isListening).toBe(true);
+			expect(app.middlewaresStack.length).toBe(4);
 
 			app.stop();
 
-			expect(app.router._middlewares.length).toBe(0);
-			expect(app.router._middlewares.isLocked).toBe(false);
+			expect(app.isLocked).toBe(false);
 			expect(app.isListening).toBe(false);
 		});
 	});

package/tests/nql.test.js

@@ -49,6 +49,9 @@ describe('nodester Query Language', () => {
 
 		// Like simple.
 		'title=like(some_text)',
+
+		// Subinclude and isolated Horizontal.
+		'in=comments.user,likes',
 	];
 
 	it('query "Simple where"', () => {
@@ -262,7 +265,6 @@ describe('nodester Query Language', () => {
 
 		expect(result).toMatchObject(expected);
 	});
-	
 
 	test('Token "Like" simple', () => {
 		const lexer = new QueryLexer( queryStrings[14] );
@@ -274,4 +276,19 @@ describe('nodester Query Language', () => {
 
 		expect(result).toMatchObject(expected);
 	});
+
+	it('query "Subinclude and isolated Horizontal"', () => {
+		const lexer = new QueryLexer( queryStrings[15] );
+		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();
+
+		expect(result).toMatchObject(expected);
+	});
+
 });