nodester 0.1.0 → 0.1.4

package/Readme.md

@@ -30,12 +30,13 @@ app.listen(8080, function() {
 
 
 ### Core concepts
-[Go to core concepts documentaion](docs/CoreConcepts.md)
+[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:
 
-[Go to NQR documentaion](docs/Queries.md)
+[NQR documentaion ➡️](docs/Queries.md)
 
 
 ### Database

package/lib/application/index.js

@@ -27,7 +27,7 @@ const {
 } = require('../database/utils');
 
 const { merge } = require('../utils/objects.util');
-const consl = require('../logger/console');
+const consl = require('nodester/loggers/console');
 const debug = require('debug')('nodester:application');
 
 

package/lib/constants/ErrorCodes.js

@@ -0,0 +1,19 @@
+const Enum = require('nodester/enum');
+
+const NODESTER_QUERY_ERROR = 'NodesterQueryError';
+const UNAUTHORIZED_ERROR = 'Unauthorized';
+const NOT_FOUND_ERROR = 'NotFound';
+const VALIDATION_ERROR = 'ValidationError';
+const CONFLICT_ERROR = 'ConflictError';
+const SEQUELIZE_UNIQUE_CONSTRAINT_ERROR = 'SequelizeUniqueConstraintError';
+const INTERNAL_VALIDATION_ERROR = 'InternalValidationError';
+
+module.exports = new Enum({
+	NODESTER_QUERY_ERROR,
+	UNAUTHORIZED_ERROR,
+	NOT_FOUND_ERROR,
+	VALIDATION_ERROR,
+	CONFLICT_ERROR,
+	SEQUELIZE_UNIQUE_CONSTRAINT_ERROR,
+	INTERNAL_VALIDATION_ERROR,
+});

package/lib/constants/Operations.js

@@ -1,4 +1,4 @@
-const Enum = require('../enums/Enum');
+const Enum = require('nodester/enum');
 
 
 module.exports = new Enum({

package/lib/controllers/mixins/index.js

@@ -1,3 +1,13 @@
+const {
+	NODESTER_QUERY_ERROR,
+	UNAUTHORIZED_ERROR,
+	NOT_FOUND_ERROR,
+	VALIDATION_ERROR,
+	CONFLICT_ERROR,
+	SEQUELIZE_UNIQUE_CONSTRAINT_ERROR,
+	INTERNAL_VALIDATION_ERROR
+} = require('nodester/constants/ErrorCodes');
+
 const {
 	getOne,
 	getMany,
@@ -10,6 +20,8 @@ const {
 module.exports = {
 	withDefaultCRUD: _withDefaultCRUD,
 	withDefaultErrorProcessing: _withDefaultErrorProcessing,
+
+	setFacade: _setFacade,
 	setMethod: _setMethod
 }
 
@@ -42,18 +54,7 @@ function _withDefaultCRUD(controller, opts={}) {
 		throw err;
 	}
 
-	if (!facade) {
-		const err = new TypeError(`'opts.facade' argument is invalid.`);
-		throw err;
-	}
-
-	// Set main facade:
-	if (facade.constructor.name === 'Function') {
-		controller.facade = new facade();
-	}
-	else {
-		controller.facade = facade;
-	}
+	_setFacade(controller, facade);
 
 	// Set model info:
 	const model = facade.model;
@@ -143,34 +144,39 @@ function _withDefaultErrorProcessing(controller, opts={}) {
 		let errorResponse = {};
 
 		switch(error.name) {
-			case('Unauthorized'): {
+			case UNAUTHORIZED_ERROR: {
 				statusCode = 401;
 				errorResponse.details = { message: 'Unauthorized' };
 				break;
 			}
-			case('NotFound'): {
+			case NOT_FOUND_ERROR: {
 				statusCode = 404;
 				errorResponse.details = { message: errorMessage };
 				break;
 			}
-			case('ValidationError'): {
-				statusCode = 406;
+			case NODESTER_QUERY_ERROR: {
+				statusCode = 422;
+				errorResponse.details = { message: errorMessage };
+				break;
+			}
+			case VALIDATION_ERROR: {
+				statusCode = 422;
 				errorResponse.details = error?.details;
 				break;
 			}
-			case('ConflictError'): {
+			case CONFLICT_ERROR: {
 				statusCode = 409;
 				errorResponse.details = error?.details ?? error?.message;
 				break;
 			}
-			case('SequelizeUniqueConstraintError'): {
+			case SEQUELIZE_UNIQUE_CONSTRAINT_ERROR: {
 				statusCode = 409;
 				errorResponse.details = error?.errors;
 				break;
 			}
-			case('InternalValidationError'): {
+			case INTERNAL_VALIDATION_ERROR: {
 				statusCode = 500;
-				errorResponse.details = { message: 'Error' };
+				errorResponse.details = { message: errorMessage };
 				break;
 			}
 			default: {
@@ -201,6 +207,39 @@ function _withDefaultErrorProcessing(controller, opts={}) {
 }
 
 
+/**
+ * Sets one of or all of CRUD methods to Controller.
+ *
+ * @param {Function|Object} controller
+ * @param {Function|Object} facade
+ * @param {String} facadeName
+ *
+ * @return {Function|Object} controller
+ *
+ * @api public
+ * @alias setFacade
+ */
+function _setFacade(controller, facade, facadeName=null) {
+	if (!controller) {
+		const err = new TypeError(`'controller' argument is not provided.`);
+		throw err;
+	}
+
+	if (!facade) {
+		const err = new TypeError(`'facade' argument is invalid.`);
+		throw err;
+	}
+
+	// Set main facade:
+	if (facade.constructor.name === 'Function') {
+		controller[facadeName ?? 'facade'] = new facade();
+	}
+	else {
+		controller[facadeName ?? 'facade'] = facade;
+	}
+}
+
+
 /**
  * Sets one of CRUD methods to Controller.
  *

package/lib/facades/methods/index.js

@@ -1,5 +1,7 @@
 const Params = require('nodester/params');
 
+const log = require('nodester/loggers/dev');
+
 
 module.exports = {
 	getOne: _getOne,
@@ -29,11 +31,12 @@ async function _getOne(params) {
 
 		const result = {
 			[this.modelName.singular]: instance,
-			count: 0 + instance !== null
+			count: 0 + (instance !== null)
 		}
 		return Promise.resolve(result);
 	}
 	catch(error) {
+		log.error(`${ [this.modelName.singular] }Facade.getOne error:`, error);
 		return Promise.reject(error);
 	}
 }
@@ -63,6 +66,7 @@ async function _getMany(params) {
 		return Promise.resolve(result);
 	}
 	catch(error) {
+		log.error(`${ [this.modelName.singular] }Facade.getMany error:`, error);
 		return Promise.reject(error);
 	}
 }
@@ -96,7 +100,7 @@ async function _createOne(params) {
 
 		const result = {
 			[this.modelName.singular]: instance,
-			count: instance === null ? 0 : 1
+			count: 0 + (instance !== null)
 		}
 
 		// Call after create.
@@ -105,6 +109,7 @@ async function _createOne(params) {
 		return Promise.resolve(result);
 	}
 	catch(error) {
+		log.error(`${ [this.modelName.singular] }Facade.createOne error:`, error);
 		return Promise.reject(error);
 	}
 }
@@ -134,11 +139,12 @@ async function _updateOne(params) {
 		const result = {
 			success: isNewRecord === false,
 			[this.modelName.singular]: instance,
-			count: !!instance ? 1 : 0
+			count: 0 + (instance !== null)
 		}
 		return Promise.resolve(result);
 	}
 	catch(error) {
+		log.error(`${ [this.modelName.singular] }Facade.updateOne error:`, error);
 		return Promise.reject(error);
 	}
 }
@@ -168,6 +174,7 @@ async function _deleteOne(params) {
 		return Promise.resolve(result);
 	}
 	catch(error) {
+		log.error(`${ [this.modelName.singular] }Facade.deleteOne error:`, error);
 		return Promise.reject(error);
 	}
 }

package/lib/factories/errors/CustomError.js

@@ -1,3 +1,10 @@
+/*!
+ * /nodester
+ * MIT Licensed
+ */
+
+'use strict';
+
 
 module.exports = class CustomError extends Error {
 	constructor(message) {

package/lib/factories/errors/NodesterQueryError.js

@@ -0,0 +1,23 @@
+/*!
+ * /nodester
+ * MIT Licensed
+ */
+
+'use strict';
+
+const {
+	NODESTER_QUERY_ERROR,
+} = require('nodester/constants/ErrorCodes');
+
+
+module.exports = class NodesterQueryError extends Error {
+	constructor(message) {
+		super(message);
+
+		this.name = NODESTER_QUERY_ERROR;
+		this.status = 422;
+
+		// Remove constructor info from stack.
+		Error.captureStackTrace(this, this.constructor);
+	}
+}

package/lib/factories/errors/index.js

@@ -1,9 +1,16 @@
-/*
- * Add all your custom errors in this file.
+/*!
+ * /nodester
+ * MIT Licensed
  */
+
+'use strict';
+
+
 const Err = require('./CustomError');
+const NodesterQueryError = require('./NodesterQueryError');
 
 
 module.exports = {
-	Err
+	Err,
+	NodesterQueryError
 }

package/lib/loggers/dev.js

@@ -0,0 +1,28 @@
+/*!
+ * /nodester
+ * MIT Licensed
+ */
+
+'use strict';
+
+
+exports = module.exports = {
+	error: _error
+}
+
+/**
+ * Log error using console.error.
+ *
+ * @param {Array} args
+ *
+ * @alias error
+ * @public
+ */
+
+function _error(...args) {
+	const activeEnv = process.env.NODE_ENV
+
+	if (activeEnv === 'development' || activeEnv === 'testing') {
+  	console.error(...args);
+	}
+}

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

@@ -1,3 +1,9 @@
+/*!
+ * /nodester
+ * MIT Licensed
+ */
+'use strict';
+
 const debug = require('debug')('nodester:interpreter:ModelsTree');
 
 
@@ -7,10 +13,12 @@ class ModelsTreeNode {
 		this.parent = parent;
 		this.activeParam = null;
 		this.op = null;
+		this.fn = null;
 
 		// for override:
 		this.fields = [];
 		this._where = {};
+		this._functions = [];
 		this.skip = 0;
 		this.limit = -1; // No limit
 
@@ -35,6 +43,10 @@ class ModelsTreeNode {
 		return this._where;
 	}
 
+	get functions() {
+		return this._functions;
+	}
+
 	resetActiveParam() {
 		this.activeParam = null;
 	}
@@ -43,6 +55,10 @@ class ModelsTreeNode {
 		this.op = null;
 	}
 
+	resetFN() {
+		this.fn = null;
+	}
+
 	addWhere(condition={}) {
 		this._where = {
 			...this.where,
@@ -50,6 +66,10 @@ class ModelsTreeNode {
 		}
 	}
 
+	addFunction(fnParams={}) {
+		this._functions.push(fnParams);
+	}
+
 	include(modelTreeNode) {
 		modelTreeNode.parent = this;
 		this.includes.push(modelTreeNode);
@@ -60,13 +80,16 @@ class ModelsTreeNode {
 		return {
 			model: this.model,
 
+			fields: this.fields,
+			functions: this.functions,
+
 			where: this.where,
+
 			skip: this.skip,
 			limit: this.limit,
 			order: this.order,
 			order_by: this.order_by,
 			
-			fields: this.fields,
 
 			includes: this.includes.map(i => i.toObject())
 		}

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

@@ -1,3 +1,10 @@
+/*!
+ * /nodester
+ * MIT Licensed
+ */
+'use strict';
+
+
 const Enum = require('../../../../enums/Enum');
 const { ModelsTree, ModelsTreeNode } = require('./ModelsTree');
 const util = require('util');
@@ -21,6 +28,10 @@ const OP_TOKENS = new Enum({
 	LOWER_OR_EQUAL: 'lte'
 });
 
+const FN_TOKENS = new Enum({
+	COUNT: 'count',
+});
+
 
 module.exports = class QueryLexer {
 	constructor(queryString='') {
@@ -71,22 +82,29 @@ module.exports = class QueryLexer {
 					token = '';
 					continue;
 				}
-				// If model subquery:
-				else {
-					const model = token;
-					tree.use(model) ?? tree.include(model).use(model);
+				
+				// If FN token:
+				if (FN_TOKENS.asArray.indexOf(token) > -1) {
+					// Set function token.
+					tree.node.fn = token;
 					token = '';
+					continue;
+				}
 
-					// Process subquery:
-					i++;
-					const [ charsCount ] = this.parseIsolatedQuery(queryString, i, tree);
-					i += charsCount;
+				// If model subquery:
+				const model = token;
+				tree.use(model) ?? tree.include(model).use(model);
+				token = '';
 
-					previousActive = model;
-					tree.up();
+				// Process subquery:
+				i++;
+				const [ charsCount ] = this.parseIsolatedQuery(queryString, i, tree);
+				i += charsCount;
 
-					continue;
-				}
+				previousActive = model;
+				tree.up();
+
+				continue;
 			}
 
 			// ) can mean end of OP token params,
@@ -126,6 +144,40 @@ module.exports = class QueryLexer {
 					continue;
 				}
 
+				// If end of FN token:
+				if (!!tree.node.fn) {
+					// If token is empty, error:
+					if (token === '') {
+						const err = UnexpectedCharError(i, char);
+						throw err;
+					}
+
+					let fnParams = {};
+					switch (tree.node.fn) {
+						case 'count':
+							fnParams = {
+								fn: 'count',
+								args: [token]
+							};
+							break;
+						default:
+							fnParams = {
+								fn: [tree.node.fn],
+								args: [token]
+							};
+							break;
+					}
+
+					tree.node.addFunction(fnParams);
+
+					// Reset:
+					tree.node.resetFN();
+					tree.node.activeParam = 'includes';
+					token = '';
+					value = [];
+					continue;
+				}
+
 				// If end of subquery:
 				if (!!tree.node.activeParam && tree.node.activeParam !== 'includes') {
 					// Set value.

package/lib/queries/Colander.js

@@ -1,11 +1,20 @@
+/*!
+ * /nodester
+ * MIT Licensed
+ */
+'use strict';
+
 const CLAUSES = ['limit', 'skip', 'order', 'order_by'];
 
+const { isModel } = require('../utils/models');
+
 
 module.exports = class Colander {
 
 	/*
 	 *
 	 * @param {Object|Model} optsOrModelDefinition
+	 @ - @param {Model} model
 	 * - @param {Array} fields
 	 * - @param {Array} clauses
 	 * - @param {Object} includes
@@ -13,8 +22,10 @@ module.exports = class Colander {
 	 * -- @param {Object} attributes
 	 * -- @param {Object} clauses
 	 *
+	 * @param {Boolean} noLimit
+	 *
 	 */
-	constructor(optsOrModelDefinition) {
+	constructor(optsOrModelDefinition, noLimit=false) {
 		this._fields = [];
 		this._clauses = [];
 		this._includes = {};
@@ -25,24 +36,36 @@ module.exports = class Colander {
 				limit: 3
 			}
 		}
+		if (noLimit === true) {
+			delete this._statics.clauses.limit;
+		}
 
 		// If model:
-		if (!!optsOrModelDefinition.tableName && typeof optsOrModelDefinition._schema === 'object') {
+		if (isModel(optsOrModelDefinition)) {
 			this._fields = Object.keys(optsOrModelDefinition.tableAttributes);
 			this._clauses = CLAUSES;
 		}
 		// If options:
 		else {
 			const {
+				model,
 				fields,
 				clauses,
 				includes,
 				statics,
 			} = optsOrModelDefinition;
 
+
+			// 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/queries/NodesterQueryParams.js

@@ -1,3 +1,9 @@
+/*!
+ * /nodester
+ * MIT Licensed
+ */
+'use strict';
+
 // Dictionary of unsafe characters:
 const NOT_ALLOWED = [
 	'{',

package/lib/queries/traverse.js

@@ -1,10 +1,18 @@
+/*!
+ * /nodester
+ * MIT Licensed
+ */
+'use strict';
+
 const { Op } = require('sequelize');
+const NQueryError = require('../factories/errors/NodesterQueryError');
 
 
 module.exports = traverse;
 
 function traverse(queryNode, colander=null, model) {
 
+	const sequelize = model.sequelize;
 	const fieldsAvailable = Object.keys(model.tableAttributes);
 	const includesAvailable = model.getIncludesList();
 
@@ -18,6 +26,7 @@ function traverse(queryNode, colander=null, model) {
 		where,
 		includes,
 		fields,
+		functions,
 		clauses,
 	} = _disassembleQueryNode(queryNode);
 
@@ -67,6 +76,55 @@ function traverse(queryNode, colander=null, model) {
 	}
 	// Fields\
 
+	// Functions:
+	for (const fnParams of functions) {
+
+		// If COUNT() is requested:
+		if (fnParams.fn === 'count') {
+			const countParams = fnParams.args;
+
+			const [ countTarget ] = countParams;
+			const RootModelName = model.options.name;
+			// Count can be requested for this model,
+			// or for any of the available uncludes.
+			const isForRootModel = countTarget === RootModelName.plural.toLowerCase();
+
+			// Compile request:
+			//	Example:
+			// `(SELECT COUNT(*) FROM comments WHERE comments.morph_id=Morph.id)`
+
+			// Params for attribute:
+			let rawSQL = '(SELECT COUNT(*) FROM ';
+			let countAttribute = '_count';
+
+			// If request to count one of includes:
+			if (!isForRootModel) {
+				// Check if it's available:
+				if (
+						!colander
+						||
+						!colander?.includes[countTarget]
+						||
+						model.associations[countTarget] === undefined
+					) {
+					const err = new NQueryError(`Count for ${ countTarget } is not available.`);
+					throw err;
+				}
+
+				const {
+					foreignKey,
+					sourceKey
+				} = model.associations[countTarget];
+				rawSQL += `${ countTarget } where ${ countTarget }.${ foreignKey }=${ RootModelName.singular }.${ sourceKey })`;
+				countAttribute = `${ countTarget }_count`;
+			}
+
+			newQuery.attributes.push(
+				[sequelize.literal(rawSQL), countAttribute]
+			);
+		}
+	}
+	// Functions\
 
 	// Clauses:
 	const order = {};
@@ -87,6 +145,7 @@ function traverse(queryNode, colander=null, model) {
 
 				newQuery.limit = value;
 				continue;
+
 			case 'skip':
 				// Do not set if 0:
 				if (value === 0)
@@ -94,12 +153,15 @@ function traverse(queryNode, colander=null, model) {
 
 				newQuery.offset = value;
 				continue;
+
 			case 'order':
 				order.order = value;
 				continue;
+
 			case 'order_by':
 				order.by = value;
 				continue;
+				
 			default:
 				continue;
 		}
@@ -107,7 +169,10 @@ function traverse(queryNode, colander=null, model) {
 
 	//	"statics" override or set any query Clause:
 	if (colander !== null) {
-		for (let [clauseName, staticClauseValue] of Object.entries(colander.statics.clauses)) {
+		const staticClausesEntries = Object.entries(colander.statics.clauses);
+		for (let entry of staticClausesEntries) {
+			const [clauseName, staticClauseValue] = entry;
+
 			switch(clauseName) {
 				case 'limit':
 					newQuery.limit = staticClauseValue;
@@ -130,7 +195,6 @@ function traverse(queryNode, colander=null, model) {
 
 
 	// Order:
-	const sequelize = model.sequelize;
 	if ( ['rand', 'random'].indexOf(order.order) > -1) {
 		newQuery.order = sequelize.random();
 	}
@@ -150,6 +214,11 @@ function traverse(queryNode, colander=null, model) {
 				break;
 			// MAX/MIN\
 
+			case null:
+			case undefined:
+				newQuery.order = [ ['id', 'desc'] ];
+				break;
+
 			default:
 				newQuery.order = [ [order.by, order.order] ];
 				break;
@@ -189,7 +258,6 @@ function traverse(queryNode, colander=null, model) {
 	}
 	// Where\
 
-
 	return newQuery;
 }
 
@@ -252,9 +320,9 @@ function _addAssociationQuery(associationQuery, includeName, resultQuery) {
 
 function _parseWhereEntry(attribute, value, whereHolder, staticAttributes) {
 	let _value = value;
-	const static = staticAttributes[attribute];
+	const staticAttribute = staticAttributes[attribute];
 
-	// If attribute is Op (like, or, not, etc.):
+	// If attribute is Op (not, like, or, etc.):
 	if (attribute in Op) {
 		// Parse value:
 		_value = _parseValue(_value, attribute);
@@ -265,8 +333,8 @@ function _parseWhereEntry(attribute, value, whereHolder, staticAttributes) {
 	}
 	
 	// Static value overrides any other:
-	if (!!static) {
-		whereHolder[attribute] = static;
+	if (!!staticAttribute) {
+		whereHolder[attribute] = staticAttribute;
 		return;
 	}
 
@@ -279,6 +347,7 @@ function _disassembleQueryNode(queryNode) {
 		where,
 		includes,
 		fields,
+		functions,
 		...clauses
 	} = queryNode;
 	// delete queryNode.model;
@@ -287,6 +356,7 @@ function _disassembleQueryNode(queryNode) {
 		where: where ?? {},
 		includes: includes ?? [],
 		fields: fields ?? [],
+		functions: functions ?? [],
 		clauses: clauses ?? []
 	};
 }

package/lib/router/index.js

@@ -22,7 +22,7 @@ const Path = require('path');
 const fs = require('fs');
 const commonExtensions = require('common-js-file-extensions');
 //	Debug & console:
-const consl = require('../logger/console');
+const consl = require('nodester/loggers/console');
 const debug = require('debug')('nodester:router');
 
 

package/lib/stacks/MarkersStack.js

@@ -1,4 +1,4 @@
-const consl = require('../logger/console');
+const consl = require('nodester/loggers/console');
 const debug = require('debug')('nodester:MiddlewareStack');
 
 

package/lib/stacks/MiddlewareStack.js

@@ -1,5 +1,5 @@
 const finalhandler = require('finalhandler');
-const consl = require('../logger/console');
+const consl = require('nodester/loggers/console');
 const debug = require('debug')('nodester:MiddlewareStack');
 
 

package/lib/utils/models.js

@@ -0,0 +1,14 @@
+/*!
+ * /nodester
+ * MIT Licensed
+ */
+'use strict';
+
+
+module.exports = {
+	isModel: _isModel
+};
+
+function _isModel(arg=null) {
+	return !!arg.tableName && typeof arg._schema === 'object';
+}

package/package.json

@@ -1,29 +1,46 @@
 {
   "name": "nodester",
-  "version": "0.1.0",
+  "version": "0.1.4",
   "description": "A boilerplate framework for Node.js",
   "exports": {
     ".": "./lib/application/index.js",
+
+    "./constants/ErrorCodes": "./lib/constants/ErrorCodes.js",
+
     "./controllers/methods": "./lib/controllers/methods/index.js",
     "./controllers/mixins": "./lib/controllers/mixins/index.js",
+
     "./database/connection": "./lib/database/connection.js",
     "./database/migration": "./lib/database/migration.js",
     "./database/utils": "./lib/database/utils.js",
+
     "./enum": "./lib/enums/Enum.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",
+
     "./http/codes": "./lib/http/codes/index.js",
+    "./loggers/console": "./lib/loggers/console.js",
+    "./loggers/dev": "./lib/loggers/dev.js",
+
     "./middlewares/formidable": "./lib/middlewares/formidable/index.js",
+
     "./models/associate": "./lib/models/associate.js",
     "./models/define": "./lib/models/define.js",
+
     "./params": "./lib/params/Params.js",
+
     "./ql/sequelize": "./lib/middlewares/ql/sequelize",
     "./queries/Colander": "./lib/queries/Colander.js",
     "./queries/traverse": "./lib/queries/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"
   },
   "directories": {

package/lib/preprocessors/IncludesPreprocessor.js

@@ -1,55 +0,0 @@
-// Constants:
-const VISITOR = 'visitor';
-const DefaultAvailableParamsForRoles = { [VISITOR]: [] };
-const DefaultStaticParamsForRoles = { [VISITOR]: [] };
-
-// Custom error.
-const { Err } = require('nodester/factories/errors');
-
-
-module.exports = class IncludesPreprocessor {
-
-	constructor(
-		availableParamsForRoles,
-		staticParamsForRoles,
-		customProcessFunction=()=>{}
-	) {
-		this.availableParamsForRoles = availableParamsForRoles ?? DefaultAvailableParamsForRoles;
-		this.staticParamsForRoles = staticParamsForRoles ?? DefaultStaticParamsForRoles;
-
-		this.customProcessFunction = customProcessFunction ? customProcessFunction : ()=>{};
-	}
-
-	async extract(
-		req,
-		role
-	) {
-		const requestIncludes = req.query?.includes ?? [];
-
-		if (!requestQuery || typeof requestQuery !== '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 resultIncludes = [];
-
-		const params = this.availableParamsForRoles[_role] ?? [];
-		const staticValues = this.staticParamsForRoles[_role] ?? [];
-
-		params.forEach((param) => {
-			// If such param is set in query:
-			if (requestIncludes.indexOf(param) !== -1) {
-				resultIncludes.push(param);
-			}
-		});
-
-		// Make further preprocessing using custom defined function.
-		await this.customProcessFunction.call(this, req, role, resultIncludes);
-
-		return resultIncludes;
-	}
-}

package/lib/preprocessors/QueryPreprocessor.js

@@ -1,64 +0,0 @@
-// Constants:
-const VISITOR = 'visitor';
-const DefaultAvailableParamsForRoles = { [VISITOR]: [ 'skip', 'limit', 'order' ] };
-const DefaultStaticParamsForRoles = { [VISITOR]: { limit: 50 } };
-
-// Custom error.
-const { Err } = require('nodester/factories/errors');
-
-
-module.exports = class QueryPreprocessor {
-
-	constructor(
-		availableParamsForRoles,
-		staticParamsForRoles,
-		customProcessFunction
-	) {
-		this.availableParamsForRoles = availableParamsForRoles ?? DefaultAvailableParamsForRoles;
-		this.staticParamsForRoles = staticParamsForRoles ?? DefaultStaticParamsForRoles;
-
-		this.customProcessFunction = customProcessFunction ? customProcessFunction : ()=>{};
-	}
-
-	async extract(
-		req,
-		role
-	) {
-		try {
-			const requestQuery = req.query;
-
-			if (!requestQuery || typeof requestQuery !== '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 resultQuery = {};
-
-			const params = this.availableParamsForRoles[_role] ?? [];
-			const staticValues = this.staticParamsForRoles[_role] ?? {};
-
-			params.forEach((param) => {
-				// If such param is set in query:
-				if (!!requestQuery[param]) {
-					resultQuery[param] = staticValues[param] ?? requestQuery[param];
-				}
-				// If such param is not set, but we have a "static" for it:
-				else if (!requestQuery[param] && !!staticValues[param]) {
-					resultQuery[param] = staticValues[param];
-				}
-			});
-
-			// Make further preprocessing using customly defined function.
-			await this.customProcessFunction.call(this, req, role, resultQuery);
-
-			return Promise.resolve(resultQuery);
-		}
-		catch(error) {
-			return Promise.reject(error);
-		}
-	}
-}