nodester 0.1.4 → 0.1.5

package/lib/body/extract.js

@@ -0,0 +1,78 @@
+/*!
+ * /nodester
+ * MIT Licensed
+ */
+'use strict';
+
+const httpCodes = require('nodester/http/codes');
+
+const Sanitizations = require('nodester/utils/sanitizations');
+
+
+module.exports = extract;
+
+function extract(body, filter=null, model) {
+
+	const sequelize = model.sequelize;
+	const modelFields = Object.keys(model.tableAttributes);
+	const availableIncludes = Object.keys(model.associations);
+
+	const bodyEntries = Object.entries(body);
+
+	const { statics } = filter;
+
+
+	// Result object.
+	const newBody = {};
+
+	for (const [key, value] of bodyEntries) {
+		const isInclude = availableIncludes.indexOf(key) > -1;
+		const isField = modelFields.indexOf(key) > -1;
+
+		if ((!isField || filter.fields.indexOf(key) === -1) && !isInclude) {
+			const err = new Error(`Field '${ key }' is not available.`);
+			err.status = httpCodes.NOT_ACCEPTABLE;
+			throw err;
+		}
+
+		if (isField) {
+			const column = model.rawAttributes[key];
+			const typeName = column.type.constructor.name;
+			// Optional validation.
+			const { validation } = column;
+			
+			const sanitizationOptions = {
+				fallback: column.defaultValue ?? undefined,
+				min: validation?.min ?? undefined,
+				max: validation?.max ?? undefined
+			}
+			const sanitized = Sanitizations[typeName](value, sanitizationOptions);
+
+			newBody[key] = sanitized;
+
+			continue;
+		}
+
+		if (isInclude) {
+			const filterIncludes = Object.keys(filter.includes);
+
+			if (filterIncludes.indexOf(key) === -1) {
+				const err = new Error(`Include '${ key }' is not available.`);
+				err.status = httpCodes.NOT_ACCEPTABLE;
+				throw err;
+			}
+
+			const association = model.associations[key];
+	
+			newBody[key] = extract(value[0], filter.includes[key], association.target);
+
+			continue;
+		}
+
+		const err = new Error(`Unknown field '${ key }'.`);
+		err.status = httpCodes.NOT_ACCEPTABLE;
+		throw err;
+	}
+	
+	return newBody;
+}

package/lib/facades/methods/index.js

@@ -1,3 +1,9 @@
+/*!
+ * /nodester
+ * MIT Licensed
+ */
+'use strict';
+
 const Params = require('nodester/params');
 
 const log = require('nodester/loggers/dev');
@@ -83,21 +89,14 @@ async function _createOne(params) {
 	try {
 		const {
 			data,
-			includes,
 		} = Params(params, {
 			data: null,
-			includes: null,
 		});
 
 		const instance = await this.model.create({ ...data }, {
 			include: this.model.getIncludesList(data)
 		});
 
-		// If includes are set, "find" this record with includes:
-		if (!!includes && includes?.length > 0) {
-			await instance.reload({ include: includes });
-		}
-
 		const result = {
 			[this.modelName.singular]: instance,
 			count: 0 + (instance !== null)

package/lib/{queries/Colander.js → filters/Filter.js}

@@ -9,12 +9,12 @@ const CLAUSES = ['limit', 'skip', 'order', 'order_by'];
 const { isModel } = require('../utils/models');
 
 
-module.exports = class Colander {
+module.exports = class Filter {
 
 	/*
 	 *
-	 * @param {Object|Model} optsOrModelDefinition
-	 @ - @param {Model} model
+	 * @param {Model} model
+	 * @param {Object} opts
 	 * - @param {Array} fields
 	 * - @param {Array} clauses
 	 * - @param {Object} includes
@@ -25,47 +25,49 @@ module.exports = class Colander {
 	 * @param {Boolean} noLimit
 	 *
 	 */
-	constructor(optsOrModelDefinition, noLimit=false) {
+	constructor(model=null, opts=null) {
+		this._model = model;
+
 		this._fields = [];
 		this._clauses = [];
 		this._includes = {};
 		
 		this._statics = {
 			attributes: {},
-			clauses: {
-				limit: 3
-			}
-		}
-		if (noLimit === true) {
-			delete this._statics.clauses.limit;
+			clauses: {}
 		}
 
-		// If model:
-		if (isModel(optsOrModelDefinition)) {
-			this._fields = Object.keys(optsOrModelDefinition.tableAttributes);
+		// noLimit=false
+		// if (noLimit === true) {
+		// 	delete this._statics.clauses.limit;
+		// }
+
+		// If model is present:
+		if (isModel(this._model)) {
+			this._fields = Object.keys(this._model.tableAttributes);
 			this._clauses = CLAUSES;
+
+			// ...and no options are provided,
+			// set default statics:
+			if (!opts) {
+				this.statics.clauses.limit = 3;
+			}
 		}
-		// If options:
-		else {
+		
+		// If options are defined:
+		if (!!opts) {
 			const {
-				model,
 				fields,
 				clauses,
 				includes,
 				statics,
-			} = optsOrModelDefinition;
+			} = opts;
 
 
 			// If fields are array:
 			if (Array.isArray(fields)) {
 				this._fields = fields;
 			}
-			// If fields were not provided,
-			// but we have full model definition:
-			else if (isModel(model)) {
-				this._fields = Object.keys(model.tableAttributes);
-			}
-
 
 			if (Array.isArray(clauses)) {
 				this._clauses = clauses;

package/lib/http/codes/descriptions.js

@@ -0,0 +1,82 @@
+/*!
+ * /nodester
+ * MIT Licensed
+ */
+'use strict';
+
+const Enum = require('nodester/enum');
+
+
+module.exports = new Enum({
+	// Informational:
+	100: 'Continue',
+	101: 'Switching Protocols',
+	102: 'Processing',
+	103: 'Early Hints',
+
+	// Success:
+	200: 'OK',
+	201: 'Created',
+	202: 'Accepted',
+	203: 'Non-Authoritative Information',
+	204: 'No Content',
+	205: 'Reset Content',
+	206: 'Partial Content',
+	207: 'Multi-Status',
+	208: 'Already Reported',
+	226: 'IM Used',
+
+	// Redirections:
+	300: 'Multiple Choices',
+	301: 'Moved Permanently',
+	302: 'Found',
+	303: 'See Other',
+	304: 'Not Modified',
+	305: 'Use Proxy',
+	307: 'Temporary Redirect',
+	308: 'Permanent Redirect',
+
+	// Client Errors:
+	400: 'Bad Request',
+	401: 'Unauthorized',
+	402: 'Payment Required',
+	403: 'Forbidden',
+	404: 'Not Found',
+	405: 'Method Not Allowed',
+	406: 'Not Acceptable',
+	407: 'Proxy Authentication Required',
+	408: 'Request Timeout',
+	409: 'Conflict',
+	410: 'Gone',
+	411: 'Length Required',
+	412: 'Precondition Failed',
+	413: 'Payload Too Large',
+	414: 'URI Too Long',
+	415: 'Unsupported Media Type',
+	416: 'Range Not Satisfiable',
+	417: 'Expectation Failed',
+	418: 'I\'m a teapot',
+	421: 'Misdirected Request',
+	422: 'Unprocessable Entity',
+	423: 'Locked',
+	424: 'Failed Dependency',
+	425: 'Too Early',
+	426: 'Upgrade Required',
+	428: 'Precondition Required',
+	429: 'Too Many Requests',
+	431: 'Request Header Fields Too Large',
+	451: 'Unavailable For Legal Reasons',
+
+	// Server Errors:
+	500: 'Internal Server Error',
+	501: 'Not Implemented',
+	502: 'Bad Gateway',
+	503: 'Service Unavailable',
+	504: 'Gateway Timeout',
+	505: 'HTTP Version Not Supported',
+	506: 'Variant Also Negotiates',
+	507: 'Insufficient Storage',
+	508: 'Loop Detected',
+	510: 'Not Extended',
+	511: 'Network Authentication Required'
+});

package/lib/http/codes/index.js

@@ -1,157 +1,82 @@
-const symbolsByTag = {
-	// Informational:
-	CONTINUE: Symbol('100: Continue'),
-	SWITCHING_PROTOCOLS: Symbol('101: Switching Protocols'),
-	PROCESSING: Symbol('102: Processing'),
-	EARLY_HINTS: Symbol('103: Early Hints'),
+/*!
+ * /nodester
+ * MIT Licensed
+ */
+'use strict';
 
-	// Success:
-	OK: Symbol('200: OK'),
-	CREATED: Symbol('201: Created'),
-	ACCEPTED: Symbol('202: Accepted'),
-	NON_AUTHORITATIVE_INFORMATION: Symbol('203: Non-Authoritative Information'),
-	NO_CONTENT: Symbol('204: No Content'),
-	RESET_CONTENT: Symbol('205: Reset Content'),
-	PARTIAL_CONTENT: Symbol('206: Partial Content'),
-	MULTI_STATUS: Symbol('207: Multi-Status'),
-	ALREADY_REPORTED: Symbol('208: Already Reported'),
-	IM_USED: Symbol('226: IM Used'),
+const Enum = require('nodester/enum');
 
-	// Redirections:
-	MULTIPLE_CHOICES: Symbol('300: Multiple Choices'),
-	MOVED_PERMANENTLY: Symbol('301: Moved Permanently'),
-	FOUND: Symbol('302: Found'),
-	SEE_OTHER: Symbol('303: See Other'),
-	NOT_MODIFIED: Symbol('304: Not Modified'),
-	USE_PROXY: Symbol('305: Use Proxy'),
-	TEMPORARY_REDIRECT: Symbol('307: Temporary Redirect'),
-	PERMANENT_REDIRECT: Symbol('308: Permanent Redirect'),
-
-	// Client Errors:
-	BAD_REQUEST: Symbol('400: Bad Request'),
-	UNAUTHORIZED: Symbol('401: Unauthorized'),
-	PAYMENT_REQUIRED: Symbol('402: Payment Required'),
-	FORBIDDEN: Symbol('403: Forbidden'),
-	NOT_FOUND: Symbol('404: Not Found'),
-	METHOD_NOT_ALLOWED: Symbol('405: Method Not Allowed'),
-	NOT_ACCEPTABLE: Symbol('406: Not Acceptable'),
-	PROXY_AUTHENTICATION_REQUIRED: Symbol('407: Proxy Authentication Required'),
-	REQUEST_TIMEOUT: Symbol('408: Request Timeout'),
-	CONFLICT: Symbol('409: Conflict'),
-	GONE: Symbol('410: Gone'),
-	LENGTH_REQUIRED: Symbol('411: Length Required'),
-	PRECONDITION_FAILED: Symbol('412: Precondition Failed'),
-	PAYLOAD_TOO_LARGE: Symbol('413: Payload Too Large'),
-	URI_TOO_LONG: Symbol('414: URI Too Long'),
-	UNSUPPORTED_MEDIA_TYPE: Symbol('415: Unsupported Media Type'),
-	RANGE_NOT_SATISFIABLE: Symbol('416: Range Not Satisfiable'),
-	EXPECTATION_FAILED: Symbol('417: Expectation Failed'),
-	IM_A_TEAPOT: Symbol("418: I'm a teapot"),
-	MISDIRECTED_REQUEST: Symbol('421: Misdirected Request'),
-	UNPROCESSABLE_ENTITY: Symbol('422: Unprocessable Entity'),
-	LOCKED: Symbol('423: Locked'),
-	FAILED_DEPENDENCY: Symbol('424: Failed Dependency'),
-	TOO_EARLY: Symbol('425: Too Early'),
-	UPGRADE_REQUIRED: Symbol('426: Upgrade Required'),
-	PRECONDITION_REQUIRED: Symbol('428: Precondition Required'),
-	TOO_MANY_REQUESTS: Symbol('429: Too Many Requests'),
-	REQUEST_HEADER_FIELDS_TOO_LARGE: Symbol('431: Request Header Fields Too Large'),
-	UNAVAILABLE_FOR_LEGAL_REASONS: Symbol('451: Unavailable For Legal Reasons'),
 
-	// Server Errors:
-	INTERNAL_SERVER_ERROR: Symbol('500: Internal Server Error'),
-	NOT_IMPLEMENTED: Symbol('501: Not Implemented'),
-	BAD_GATEWAY: Symbol('502: Bad Gateway'),
-	SERVICE_UNAVAILABLE: Symbol('503: Service Unavailable'),
-	GATEWAY_TIMEOUT: Symbol('504: Gateway Timeout'),
-	HTTP_VERSION_NOT_SUPPORTED: Symbol('505: HTTP Version Not Supported'),
-	VARIANT_ALSO_NEGOTIATES: Symbol('506: Variant Also Negotiates'),
-	INSUFFICIENT_STORAGE: Symbol('507: Insufficient Storage'),
-	LOOP_DETECTED: Symbol('508: Loop Detected'),
-	NOT_EXTENDED: Symbol('510: Not Extended'),
-	NETWORK_AUTHENTICATION_REQUIRED: Symbol('511: Network Authentication Required')
-}
-
-const descriptionsByCode = {
+module.exports = new Enum({
 	// Informational:
-	100: 'Continue',
-	101: 'Switching Protocols',
-	102: 'Processing',
-	103: 'Early Hints',
+	CONTINUE: 100,
+	SWITCHING_PROTOCOLS: 101,
+	PROCESSING: 102,
+	EARLY_HINTS: 103,
 
 	// Success:
-	200: 'OK',
-	201: 'Created',
-	202: 'Accepted',
-	203: 'Non-Authoritative Information',
-	204: 'No Content',
-	205: 'Reset Content',
-	206: 'Partial Content',
-	207: 'Multi-Status',
-	208: 'Already Reported',
-	226: 'IM Used',
+	OK: 200,
+	CREATED: 201,
+	ACCEPTED: 202,
+	NON_AUTHORITATIVE_INFORMATION: 203,
+	NO_CONTENT: 204,
+	RESET_CONTENT: 205,
+	PARTIAL_CONTENT: 206,
+	MULTI_STATUS: 207,
+	ALREADY_REPORTED: 208,
+	IM_USED: 226,
 
 	// Redirections:
-	300: 'Multiple Choices',
-	301: 'Moved Permanently',
-	302: 'Found',
-	303: 'See Other',
-	304: 'Not Modified',
-	305: 'Use Proxy',
-	307: 'Temporary Redirect',
-	308: 'Permanent Redirect',
+	MULTIPLE_CHOICES: 300,
+	MOVED_PERMANENTLY: 301,
+	FOUND: 302,
+	SEE_OTHER: 303,
+	NOT_MODIFIED: 304,
+	USE_PROXY: 305,
+	TEMPORARY_REDIRECT: 307,
+	PERMANENT_REDIRECT: 308,
 
 	// Client Errors:
-	400: 'Bad Request',
-	401: 'Unauthorized',
-	402: 'Payment Required',
-	403: 'Forbidden',
-	404: 'Not Found',
-	405: 'Method Not Allowed',
-	406: 'Not Acceptable',
-	407: 'Proxy Authentication Required',
-	408: 'Request Timeout',
-	409: 'Conflict',
-	410: 'Gone',
-	411: 'Length Required',
-	412: 'Precondition Failed',
-	413: 'Payload Too Large',
-	414: 'URI Too Long',
-	415: 'Unsupported Media Type',
-	416: 'Range Not Satisfiable',
-	417: 'Expectation Failed',
-	418: 'I\'m a teapot',
-	421: 'Misdirected Request',
-	422: 'Unprocessable Entity',
-	423: 'Locked',
-	424: 'Failed Dependency',
-	425: 'Too Early',
-	426: 'Upgrade Required',
-	428: 'Precondition Required',
-	429: 'Too Many Requests',
-	431: 'Request Header Fields Too Large',
-	451: 'Unavailable For Legal Reasons',
+	BAD_REQUEST: 400,
+	UNAUTHORIZED: 401,
+	PAYMENT_REQUIRED: 402,
+	FORBIDDEN: 403,
+	NOT_FOUND: 404,
+	METHOD_NOT_ALLOWED: 405,
+	NOT_ACCEPTABLE: 406,
+	PROXY_AUTHENTICATION_REQUIRED: 407,
+	REQUEST_TIMEOUT: 408,
+	CONFLICT: 409,
+	GONE: 410,
+	LENGTH_REQUIRED: 411,
+	PRECONDITION_FAILED: 412,
+	PAYLOAD_TOO_LARGE: 413,
+	URI_TOO_LONG: 414,
+	UNSUPPORTED_MEDIA_TYPE: 415,
+	RANGE_NOT_SATISFIABLE: 416,
+	EXPECTATION_FAILED: 417,
+	IM_A_TEAPOT: 418,
+	MISDIRECTED_REQUEST: 421,
+	UNPROCESSABLE_ENTITY: 422,
+	LOCKED: 423,
+	FAILED_DEPENDENCY: 424,
+	TOO_EARLY: 425,
+	UPGRADE_REQUIRED: 426,
+	PRECONDITION_REQUIRED: 428,
+	TOO_MANY_REQUESTS: 429,
+	REQUEST_HEADER_FIELDS_TOO_LARGE: 431,
+	UNAVAILABLE_FOR_LEGAL_REASONS: 451,
 
 	// Server Errors:
-	500: 'Internal Server Error',
-	501: 'Not Implemented',
-	502: 'Bad Gateway',
-	503: 'Service Unavailable',
-	504: 'Gateway Timeout',
-	505: 'HTTP Version Not Supported',
-	506: 'Variant Also Negotiates',
-	507: 'Insufficient Storage',
-	508: 'Loop Detected',
-	510: 'Not Extended',
-	511: 'Network Authentication Required'
-};
-
-module.exports = {
-	descriptions: {
-		byCode: descriptionsByCode
-	},
-
-	symbols: {
-		byTag: symbolsByTag
-	}
-}
+	INTERNAL_SERVER_ERROR: 500,
+	NOT_IMPLEMENTED: 501,
+	BAD_GATEWAY: 502,
+	SERVICE_UNAVAILABLE: 503,
+	GATEWAY_TIMEOUT: 504,
+	HTTP_VERSION_NOT_SUPPORTED: 505,
+	VARIANT_ALSO_NEGOTIATES: 506,
+	INSUFFICIENT_STORAGE: 507,
+	LOOP_DETECTED: 508,
+	NOT_EXTENDED: 510,
+	NETWORK_AUTHENTICATION_REQUIRED: 511,
+});

package/lib/http/codes/symbols.js

@@ -0,0 +1,82 @@
+/*!
+ * /nodester
+ * MIT Licensed
+ */
+'use strict';
+
+const Enum = require('nodester/enum');
+
+
+module.exports = new Enum({
+	// Informational:
+	CONTINUE: Symbol('100: Continue'),
+	SWITCHING_PROTOCOLS: Symbol('101: Switching Protocols'),
+	PROCESSING: Symbol('102: Processing'),
+	EARLY_HINTS: Symbol('103: Early Hints'),
+
+	// Success:
+	OK: Symbol('200: OK'),
+	CREATED: Symbol('201: Created'),
+	ACCEPTED: Symbol('202: Accepted'),
+	NON_AUTHORITATIVE_INFORMATION: Symbol('203: Non-Authoritative Information'),
+	NO_CONTENT: Symbol('204: No Content'),
+	RESET_CONTENT: Symbol('205: Reset Content'),
+	PARTIAL_CONTENT: Symbol('206: Partial Content'),
+	MULTI_STATUS: Symbol('207: Multi-Status'),
+	ALREADY_REPORTED: Symbol('208: Already Reported'),
+	IM_USED: Symbol('226: IM Used'),
+
+	// Redirections:
+	MULTIPLE_CHOICES: Symbol('300: Multiple Choices'),
+	MOVED_PERMANENTLY: Symbol('301: Moved Permanently'),
+	FOUND: Symbol('302: Found'),
+	SEE_OTHER: Symbol('303: See Other'),
+	NOT_MODIFIED: Symbol('304: Not Modified'),
+	USE_PROXY: Symbol('305: Use Proxy'),
+	TEMPORARY_REDIRECT: Symbol('307: Temporary Redirect'),
+	PERMANENT_REDIRECT: Symbol('308: Permanent Redirect'),
+
+	// Client Errors:
+	BAD_REQUEST: Symbol('400: Bad Request'),
+	UNAUTHORIZED: Symbol('401: Unauthorized'),
+	PAYMENT_REQUIRED: Symbol('402: Payment Required'),
+	FORBIDDEN: Symbol('403: Forbidden'),
+	NOT_FOUND: Symbol('404: Not Found'),
+	METHOD_NOT_ALLOWED: Symbol('405: Method Not Allowed'),
+	NOT_ACCEPTABLE: Symbol('406: Not Acceptable'),
+	PROXY_AUTHENTICATION_REQUIRED: Symbol('407: Proxy Authentication Required'),
+	REQUEST_TIMEOUT: Symbol('408: Request Timeout'),
+	CONFLICT: Symbol('409: Conflict'),
+	GONE: Symbol('410: Gone'),
+	LENGTH_REQUIRED: Symbol('411: Length Required'),
+	PRECONDITION_FAILED: Symbol('412: Precondition Failed'),
+	PAYLOAD_TOO_LARGE: Symbol('413: Payload Too Large'),
+	URI_TOO_LONG: Symbol('414: URI Too Long'),
+	UNSUPPORTED_MEDIA_TYPE: Symbol('415: Unsupported Media Type'),
+	RANGE_NOT_SATISFIABLE: Symbol('416: Range Not Satisfiable'),
+	EXPECTATION_FAILED: Symbol('417: Expectation Failed'),
+	IM_A_TEAPOT: Symbol("418: I'm a teapot"),
+	MISDIRECTED_REQUEST: Symbol('421: Misdirected Request'),
+	UNPROCESSABLE_ENTITY: Symbol('422: Unprocessable Entity'),
+	LOCKED: Symbol('423: Locked'),
+	FAILED_DEPENDENCY: Symbol('424: Failed Dependency'),
+	TOO_EARLY: Symbol('425: Too Early'),
+	UPGRADE_REQUIRED: Symbol('426: Upgrade Required'),
+	PRECONDITION_REQUIRED: Symbol('428: Precondition Required'),
+	TOO_MANY_REQUESTS: Symbol('429: Too Many Requests'),
+	REQUEST_HEADER_FIELDS_TOO_LARGE: Symbol('431: Request Header Fields Too Large'),
+	UNAVAILABLE_FOR_LEGAL_REASONS: Symbol('451: Unavailable For Legal Reasons'),
+
+	// Server Errors:
+	INTERNAL_SERVER_ERROR: Symbol('500: Internal Server Error'),
+	NOT_IMPLEMENTED: Symbol('501: Not Implemented'),
+	BAD_GATEWAY: Symbol('502: Bad Gateway'),
+	SERVICE_UNAVAILABLE: Symbol('503: Service Unavailable'),
+	GATEWAY_TIMEOUT: Symbol('504: Gateway Timeout'),
+	HTTP_VERSION_NOT_SUPPORTED: Symbol('505: HTTP Version Not Supported'),
+	VARIANT_ALSO_NEGOTIATES: Symbol('506: Variant Also Negotiates'),
+	INSUFFICIENT_STORAGE: Symbol('507: Insufficient Storage'),
+	LOOP_DETECTED: Symbol('508: Loop Detected'),
+	NOT_EXTENDED: Symbol('510: Not Extended'),
+	NETWORK_AUTHENTICATION_REQUIRED: Symbol('511: Network Authentication Required')
+});

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

@@ -1,4 +1,5 @@
 const QueryLexer = require('./interpreter/QueryLexer');
+const httpCodes = require('nodester/http/codes');
 
 
 module.exports = NodesterQL;
@@ -18,7 +19,6 @@ async function NodesterQL(req, res, next) {
 	}
 
 	try {
-		// Convert to URLSearchParams.
 		const queryString = req.url.split('?')[1];
 
 		const lexer = new QueryLexer(queryString);
@@ -28,7 +28,7 @@ async function NodesterQL(req, res, next) {
 		next();
 	}
 	catch(error) {
-		res.status(422);
+		res.status(error.status ?? httpCodes.UNPROCESSABLE_ENTITY);
 		res.json({ error: error.toString() });
 	}
 }

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

@@ -5,7 +5,7 @@
 'use strict';
 
 
-const Enum = require('../../../../enums/Enum');
+const Enum = require('nodester/enum');
 const { ModelsTree, ModelsTreeNode } = require('./ModelsTree');
 const util = require('util');
 const debug = require('debug')('nodester:interpreter:QueryLexer');
@@ -60,7 +60,7 @@ module.exports = class QueryLexer {
 		const isSubQuery = tree.node.model !== 'root';
 		debug({ isSubQuery, startAt });
 
-		// Token is accumulated char-by-char.
+		// Token is String, accumulated char-by-char.
 		let token = '';
 		// Value of param ('id=10' OR 'fields=id,text').
 		let value = [];
@@ -375,7 +375,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.model' or 'model.model+model'.`);
+					const err = new TypeError(`'include' is forbidden inside subquery (position ${ i }). Use: 'model.model1' or 'model.model1+model2'.`);
 					throw err;
 				}
 

package/lib/models/define.js

@@ -1,9 +1,13 @@
+/*!
+ * /nodester
+ * MIT Licensed
+ */
+'use strict';
+
 // CRUD mixins.
 const { implementsCRUD } = require('./mixins');
 // ORM.
 const { DataTypes } = require('sequelize');
-// NQL.
-const Colander = require('../queries/Colander');
 
 
 module.exports = defineModel;
@@ -52,7 +56,7 @@ function defineModel(
 		implementsCRUD(model);
 	}
 
-	// Association helpers:
+	// Associations:
 	model.associate = (models) => {};
 	model.getIncludesList = _getIncludesList.bind(model);
 
@@ -61,7 +65,6 @@ function defineModel(
 		const values = { ...this.get() };
 		return values;
 	}
-	// Instance methods\
 
 	return model;
 }

package/lib/models/mixins.js

@@ -10,7 +10,7 @@ const {
 
 // Nodester query:
 const NQLexer = require('../middlewares/ql/sequelize/interpreter/QueryLexer');
-const traverseNQuery = require('../queries/traverse');
+const traverseNQuery = require('nodester/query/traverse');
 
 
 module.exports = {

package/lib/{queries → query}/traverse.js

@@ -6,11 +6,12 @@
 
 const { Op } = require('sequelize');
 const NQueryError = require('../factories/errors/NodesterQueryError');
+const httpCodes = require('nodester/http/codes');
 
 
 module.exports = traverse;
 
-function traverse(queryNode, colander=null, model) {
+function traverse(queryNode, filter=null, model) {
 
 	const sequelize = model.sequelize;
 	const fieldsAvailable = Object.keys(model.tableAttributes);
@@ -33,9 +34,9 @@ function traverse(queryNode, colander=null, model) {
 
 	// Fields:
 	//
-	//	If Colander is not set,
+	//	If Filter is not set,
 	//	use every available field:
-	if (colander === null) {
+	if (filter === null) {
 		for (let field of fieldsAvailable) {
 			// If no query filter or field is requested:
 			if (fields.length === 0 || fields.indexOf(field) > -1) {
@@ -44,20 +45,21 @@ function traverse(queryNode, colander=null, model) {
 			}
 		}
 	}
-	//	Colander is present:
+	//	Filter is present:
 	else {
 		// If no query fields were set,
-		//	use the ones from Colander,
+		//	use the ones from Filter,
 		// If query fields were set,
-		//	put them through Colander:
-		for (let field of colander.fields) {
+		//	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.`);
+				const err = new TypeError(`Field '${ field }' is not present in model.`);
+				err.status = httpCodes.NOT_ACCEPTABLE;
 				throw err;
 			}
 
 			// If field is not in available set:
-			// if (colander.fields.indexOf(field) === -1) {
+			// if (filter.fields.indexOf(field) === -1) {
 			// 	continue;
 			// }
 
@@ -72,6 +74,7 @@ function traverse(queryNode, colander=null, model) {
 	//	At least 1 field is mandatory:
 	if (newQuery.attributes.length === 0) {
 		const err = new TypeError(`No fields were selected.`);
+		err.status = httpCodes.NOT_ACCEPTABLE;
 		throw err;
 	}
 	// Fields\
@@ -101,13 +104,14 @@ function traverse(queryNode, colander=null, model) {
 			if (!isForRootModel) {
 				// Check if it's available:
 				if (
-						!colander
+						!filter
 						||
-						!colander?.includes[countTarget]
+						!filter?.includes[countTarget]
 						||
 						model.associations[countTarget] === undefined
 					) {
-					const err = new NQueryError(`Count for ${ countTarget } is not available.`);
+					const err = new NQueryError(`Count for '${ countTarget }' is not available.`);
+					err.status = httpCodes.NOT_ACCEPTABLE;
 					throw err;
 				}
 
@@ -132,8 +136,8 @@ function traverse(queryNode, colander=null, model) {
 	const clausesEntries = Object.entries(clauses);
 	for (let [clauseName, value] of clausesEntries) {
 		// If clause is not available:
-		if (colander != null) {
-			if (colander.clauses.indexOf(clauseName) === -1)
+		if (filter != null) {
+			if (filter.clauses.indexOf(clauseName) === -1)
 				continue;
 		}
 
@@ -168,8 +172,9 @@ function traverse(queryNode, colander=null, model) {
 	}
 
 	//	"statics" override or set any query Clause:
-	if (colander !== null) {
-		const staticClausesEntries = Object.entries(colander.statics.clauses);
+	if (filter !== null) {
+		const staticClausesEntries = Object.entries(filter.statics.clauses);
+
 		for (let entry of staticClausesEntries) {
 			const [clauseName, staticClauseValue] = entry;
 
@@ -235,21 +240,22 @@ function traverse(queryNode, colander=null, model) {
 
 		const includeIndex = leftIncludes.indexOf(includeName);
 		if (includeIndex === -1) {
-			const err = new TypeError(`No include named ${ includeName }`);
+			const err = new TypeError(`No include named '${ includeName }'`);
+			err.status = httpCodes.NOT_ACCEPTABLE;
 			throw err;
 		}
 
 		leftIncludes.splice(includeIndex, 1);
 	}
 
-	_traverseIncludes(includes, model, colander, newQuery)
+	_traverseIncludes(includes, model, filter, newQuery)
 	// Includes\
 
 
 	// Where:
 	const whereEntries = Object.entries(where);
 	for (let [attribute, value] of whereEntries) {
-		_parseWhereEntry(attribute, value, newQuery.where, colander.statics.attributes);
+		_parseWhereEntry(attribute, value, newQuery.where, filter.statics.attributes);
 	}
 
 	// If "where" was not set:
@@ -262,16 +268,17 @@ function traverse(queryNode, colander=null, model) {
 }
 
 
-function _traverseIncludes(includes, model, colander, resultQuery) {
-	// If no Colander:
-	if (colander === null) {
+function _traverseIncludes(includes, model, filter=null, resultQuery) {
+	// If no Filter:
+	if (filter === null) {
 		for (let include of includes) {
 			const includeName = include.model;
 			const association = model.associations[includeName];
 
 			// If no such association:
 			if (!association) {
-				const err = new TypeError(`No include ${ includeName }`);
+				const err = new TypeError(`No include '${ includeName }'`);
+				err.status = httpCodes.NOT_ACCEPTABLE;
 				throw err;
 			}
 
@@ -282,14 +289,15 @@ function _traverseIncludes(includes, model, colander, resultQuery) {
 			_addAssociationQuery(associationQuery, includeName, resultQuery);
 		}
 	}
-	//	Colander is present:
+	//	Filter is present:
 	else {
-		const colanderIncludeEntries = Object.entries(colander.includes);
-		for (let [includeName, includeColander] of colanderIncludeEntries) {			
+		const filterIncludeEntries = Object.entries(filter.includes);
+		for (let [includeName, includeFilter] of filterIncludeEntries) {			
 			const association = model.associations[includeName];
 			// If no such association:
 			if (!association) {
 				const err = new TypeError(`No include ${ includeName }`);
+				err.status = httpCodes.NOT_ACCEPTABLE;
 				throw err;
 			}
 
@@ -300,7 +308,7 @@ function _traverseIncludes(includes, model, colander, resultQuery) {
 
 			const includeModel = association.target;
 			// Build query for this include.
-			const associationQuery = traverse(include, colander.includes[includeName], includeModel);
+			const associationQuery = traverse(include, filter.includes[includeName], includeModel);
 
 			_addAssociationQuery(associationQuery, includeName, resultQuery);
 		}

package/lib/router/index.js

@@ -257,7 +257,7 @@ module.exports = class NodesterRouter {
 		const handlerType = typeOf(handler);
 
 		if (handlerType === 'Object' && !this.paths.controllers && !this.paths.providers) {
-			const msg = `Please set "controllersPath" or "providersPath" during Router initialization.`;
+			const msg = `Please set 'controllersPath' or 'providersPath' during Router initialization.`;
 			const err = new TypeError(msg);
 			throw err;
 		}
@@ -396,7 +396,7 @@ module.exports = class NodesterRouter {
 	extend(key='', fnOrProperty) {
 		const keys = Object.keys(this);
 		if (keys.indexOf(key) > -1) {
-			const err = new TypeError(`Key ${ key } is already present in Router instance`);
+			const err = new TypeError(`Key '${ key }' is already present in Router instance.`);
 			throw err;
 		}
 

package/lib/router/routes.util.js

@@ -88,7 +88,11 @@ function _wrapRouteHandler(routeInstance, handler) {
 				await parsedHandler.before(req.nquery, req, res);
 			}
 
-			await providedAction(req, res);
+			// If response was not sent,
+			// perform action
+			if (res.headersSent === false) {
+				await providedAction(req, res);
+			}
 		}
 	};
 

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "nodester",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "A boilerplate framework for Node.js",
   "exports": {
     ".": "./lib/application/index.js",
 
+    "./body/extract": "./lib/body/extract.js",
+
     "./constants/ErrorCodes": "./lib/constants/ErrorCodes.js",
 
     "./controllers/methods": "./lib/controllers/methods/index.js",
@@ -22,7 +24,12 @@
     "./factories/errors": "./lib/factories/errors/index.js",
     "./factories/responses/rest": "./lib/factories/responses/rest/index.js",
 
+    "./filter": "./lib/filters/Filter.js",
+
     "./http/codes": "./lib/http/codes/index.js",
+    "./http/codes/descriptions": "./lib/http/codes/descriptions.js",
+    "./http/codes/symbols": "./lib/http/codes/symbols.js",
+
     "./loggers/console": "./lib/loggers/console.js",
     "./loggers/dev": "./lib/loggers/dev.js",
 
@@ -34,14 +41,14 @@
     "./params": "./lib/params/Params.js",
 
     "./ql/sequelize": "./lib/middlewares/ql/sequelize",
-    "./queries/Colander": "./lib/queries/Colander.js",
-    "./queries/traverse": "./lib/queries/traverse.js",
+    "./query/traverse": "./lib/query/traverse.js",
 
     "./route": "./lib/router/route.js",
     "./router": "./lib/router/index.js",
 
     "./utils/sql": "./lib/utils/sql.util.js",
-    "./utils/strings": "./lib/utils/strings.util.js"
+    "./utils/strings": "./lib/utils/strings.util.js",
+    "./utils/sanitizations": "./lib/utils/sanitizations.util.js"
   },
   "directories": {
     "doc": "docs"

package/lib/preprocessors/BodyPreprocessor.js

@@ -1,61 +0,0 @@
-// Constants.
-const VISITOR = 'visitor';
-
-// Custom error.
-const { Err } = require('nodester/factories/errors');
-
-
-module.exports = class BodyPreprocessor {
-	constructor(
-		availableParamsForRoles,
-		staticParamsForRoles,
-		customProcessFunction
-	) {
-		this.availableParamsForRoles = availableParamsForRoles ?? {};
-		this.staticParamsForRoles = staticParamsForRoles ?? {};
-
-		this.customProcessFunction = customProcessFunction ? customProcessFunction : ()=>{};
-	}
-
-	async extract(
-		req,
-		role
-	) {
-		try {
-			const requestBody = req.body;
-
-			if (!requestBody || typeof requestBody !== 'object') {
-				const err = new Err();
-				err.name = 'ValidationError';
-				throw err;
-			}
-
-			// Get role or set "visitor"
-			const _role = typeof role === 'string' && role.length > 1 ? role : VISITOR;
-
-			const resultBody = {};
-
-			const params = this.availableParamsForRoles[_role] ?? [];
-			const staticValues = this.staticParamsForRoles[_role] ?? {};
-
-			params.forEach((param) => {
-				// If such param is set in body:
-				if (!!requestBody[param]) {
-					resultBody[param] = staticValues[param] ?? requestBody[param];
-				}
-				// If such param is not set, but we have a "static" for it:
-				else if (!requestBody[param] && !!staticValues[param]) {
-					resultBody[param] = staticValues[param];
-				}
-			});
-
-			// Make further preprocessing using customly defined function.
-			await this.customProcessFunction.call(this, req, role, resultBody);
-
-			return Promise.resolve(resultBody);
-		}
-		catch(error) {
-			return Promise.reject(error);
-		}
-	}
-}

package/lib/queries/NodesterQueryParams.js

@@ -1,145 +0,0 @@
-/*!
- * /nodester
- * MIT Licensed
- */
-'use strict';
-
-// Dictionary of unsafe characters:
-const NOT_ALLOWED = [
-	'{',
-	'}',
-	// `\`,
-	'^',
-	'~',
-	'[',
-	']',
-	'`'
-];
-
-const util = require('util');
-
-/*
- * NodesterQueryParams is a ready-to-use replacement for URLSearchParams.
- * The only difference is that NodesterQueryParams
- * respects nested "&" during parsing.
- */
-module.exports = class NodesterQueryParams {
-	constructor(queryString='') {
-		// Type validateion:
-		if (typeof queryString !== 'string') {
-			const err = new TypeError(`'query' must be a String.`);
-			throw err;
-		}
-
-		// You never know if it's encoded or not.
-		const decoded = decodeURI(queryString);
-
-		// Indicates, how deep the char is inside different ().
-		let deep = 0;
-
-		const paramLevels = {};
-
-		// Current query parameter.
-		let param = '';
-
-		// Current query token.
-		let token = '';
-
-		this._map = new Map();
-
-		for (let i=0; i < decoded.length; i++) {
-			const char = decoded[i];
-
-			// Validate char:
-			if (NOT_ALLOWED.indexOf(char) > -1) {
-				const err = new TypeError(`Invalid query token at ${ i }: '${ char }'`);
-				throw err;
-			}
-
-			if (char === '(') {
-				// Error If there is nothing behind:
-				if (param.length === 0) {
-					const err = new TypeError(`Invalid query token at ${ i }: '${ char }'`);
-					throw err;
-				}
-
-				// If not special token, go deeper:
-				if (['and', 'or', 'xor', 'not', '!', '|', 'like'].indexOf(token) === -1) {
-					this.append(param, token);
-					deep++;
-				}
-
-				// will set ( in token later.
-			}
-
-			if (char === ')') {
-				// If sub-level:
-				if (deep > 0) {
-					deep--
-				}
-			}
-
-			// & can mean the end of key=value pair:
-			if (char === '&') {
-				// If top-level:
-				if (deep === 0) {
-					this.append(param, token);
-					param = '';
-					token = '';
-					continue;
-				}
-
-				// If sub-level do nothing.
-			}
-			
-			// = can mean the end of param name:
-			if (char === '=') {
-				// If top-level:
-				if (deep === 0) {
-					param = token;
-					token = '';
-				}
-			}
-			
-			// Continue building token:
-			if (char !== '=' || deep > 0 ) {
-				token += char;
-			}
-
-			// If last char:
-			if (i === decoded.length-1) {
-				// Validate:
-				if (deep > 0) {
-					const err = new TypeError(`Missing ')' at ${ i }`);
-					throw err;
-				}
-
-				this.append(param, token);
-			}
-		}
-	}
-
-	append(...args) {
-		return this._map.set(...args);
-	}
-
-	get(...args) {
-		return this._map.get(...args);
-	}
-
-	delete(...args) {
-		return this._map.delete(...args);
-	}
-
-	entries(...args) {
-		return this._map.entries(...args);
-	}
-
-	toString() {
-		return this._map.toString();
-	}
-
-	[util.inspect.custom](depth, opts) {
-		return this._map;
-	}
-}