nodester 0.2.9 → 0.3.1

package/dependencies/mysql2.js

@@ -0,0 +1,3 @@
+const mysql2 = require('mysql2');
+
+module.exports = mysql2;

package/dependencies/pg.js

@@ -0,0 +1,3 @@
+const pg = require('pg');
+
+module.exports = pg;

package/dependencies/sequelize.js

@@ -0,0 +1,3 @@
+const sequelize = require('sequelize');
+
+module.exports = sequelize;

package/lib/query/traverse.js

@@ -171,6 +171,7 @@ function traverse(queryNode, filter=null, model=null) {
 
 	const clausesEntries = Object.entries(clauses);
 	for (let [clauseName, value] of clausesEntries) {
+
 		// If clause is not available:
 		if (filter != null) {
 			if (filter.clauses.indexOf(clauseName) === -1)
@@ -270,7 +271,7 @@ function traverse(queryNode, filter=null, model=null) {
 
 			case null:
 			case undefined:
-				newQuery.order = [ ['id', 'desc'] ];
+				// newQuery.order = [ ['id', 'desc'] ];
 				break;
 
 			default:
@@ -298,13 +299,22 @@ function traverse(queryNode, filter=null, model=null) {
 
 
 	// Where:
+
+	//	Set aatributes from Query:
 	const whereEntries = Object.entries(where);
-	for (let [attribute, value] of whereEntries) {
-		_parseWhereEntry(attribute, value, newQuery.where, filter.statics.attributes);
+	for (let [ attribute, value ] of whereEntries) {
+		_parseWhereEntry(attribute, value, newQuery.where);
+	}
+
+	//	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);
 	}
 
-	// If "where" was not set:
-	if (whereEntries.length === 0) {
+	//	If "where" was not set in any way,
+	// 	remove it from the db query:
+	if (Object.entries(newQuery.where).length === 0) {
 		delete newQuery.where;
 	}
 	// Where\
@@ -360,9 +370,8 @@ function _addAssociationQuery(associationQuery, includeName, resultQuery) {
 }
 
 
-function _parseWhereEntry(attribute, value, whereHolder, staticAttributes) {
+function _parseWhereEntry(attribute, value, whereHolder) {
 	let _value = value;
-	const staticAttribute = staticAttributes[attribute];
 
 	// If attribute is Op (not, like, or, etc.):
 	if (attribute in Op) {
@@ -373,12 +382,6 @@ function _parseWhereEntry(attribute, value, whereHolder, staticAttributes) {
 		whereHolder[op] = _value;
 		return;
 	}
-	
-	// Static value overrides any other:
-	if (!!staticAttribute) {
-		whereHolder[attribute] = staticAttribute;
-		return;
-	}
 
 	whereHolder[attribute] = _parseValue(_value, attribute);
 }

package/lib/router/handlers.util.js

@@ -74,7 +74,7 @@ function _parseRouteHandler(routeHandler={}) {
 		result.actionName = `${ action }`;
 	}
 
-	if (typeOf(before) === 'function') {
+	if (!!before) {
 		result.before = before;
 	}
 

package/lib/router/index.js

@@ -331,10 +331,26 @@ 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 err = new TypeError(msg);
-				throw err;
+			if (handlerType === 'Object') {
+				if (!this.paths.controllers && !this.paths.providers) {
+					const msg = `Please set 'controllersPath' or 'providersPath' during Router initialization.`;
+					const err = new TypeError(msg);
+					throw err;
+				}
+
+				if (!!handler.before) {
+					ensure(handler.before, 'array|function', 'handler.before');
+
+					if ( Array.isArray(handler.before) ) {
+						const middlewares = [ ...handler.before ];
+						
+						handler.before = new MiddlewaresStack();
+
+						for (let middlewareBefore of middlewares) {
+							handler.before.add(middlewareBefore);
+						}
+					}
+				}
 			}
 
 			const wrapped = wrapRouteHandler.call(this, parsedRoute, handler);
@@ -412,8 +428,15 @@ module.exports = class NodesterRouter {
 			const markerFn = this._markers.get(markerName);
 
 			return {
-				route: (route, fn) => MarkerMethods.onlyRoute.call(self, route, fn, markerFn),
-				use: (fnOrRouter) => MarkerMethods.onlyUse.call(self, fnOrRouter, markerFn),
+				route: (route, fn) => {
+					ensure(route, 'object,required', 'route');
+					ensure(fn, 'object,required', 'fn');
+					return MarkerMethods.onlyRoute.call(self, route, fn, markerFn)
+				},
+				use: (fnOrRouter) => {
+					ensure(fnOrRouter, 'function|object,required', 'fnOrRouter');
+					return MarkerMethods.onlyUse.call(self, fnOrRouter, markerFn);
+				}
 			}
 		}
 		catch(error) {

package/lib/router/markers.js

@@ -53,7 +53,7 @@ function _onlyRoute(route, fn, markerFn) {
 
 /**
  * 
- * @param {Function} fnOrRouter
+ * @param {Function|NodesterRouter} fnOrRouter
  * @param {Function} markerFn
  *
  */
@@ -67,7 +67,7 @@ function _onlyUse(fnOrRouter, markerFn) {
 			return next();
 		}
 
-		const isRouter = fnOrRouter.constructor.name === 'NodesterRouter';
+		const isRouter = !!fnOrRouter.constructor && fnOrRouter.constructor?.name === 'NodesterRouter';
 
 		const fn = isRouter ? fnOrRouter.handle.bind(fnOrRouter) : fnOrRouter;
 		await fn.call(this, req, res, next);

package/lib/router/routes.util.js

@@ -5,6 +5,8 @@
 
 'use strict';
 
+const MiddlewaresStack = require('nodester/stacks/middlewares');
+
 // Utils:
 const { typeOf } = require('nodester/utils/types');
 const { parseRouteHandler } = require('./handlers.util');
@@ -38,6 +40,33 @@ function _validateParsedRouteMethood(parsedRoute) {
 function _wrapRouteHandler(routeInstance, handler) {
 	const handlerType = typeOf(handler);
 
+	let parsedHandler = null;
+	let providedAction = null;
+
+	if (handlerType === 'Object') {
+		parsedHandler = parseRouteHandler(handler);
+
+		// If Controller:
+		if (parsedHandler.controllerName !== undefined) {
+			// Get method (action) from Controller:
+			const controller = this._controllers.get(parsedHandler.controllerName);
+			const controllerAction = controller[parsedHandler.actionName];
+
+			providedAction = controllerAction;
+		}
+		// If Controller\
+
+		// If Provider:
+		else {
+			// Get method (action) from Provider:
+			const provider = this._providers.get(parsedHandler.providerName);
+			const providerAction = provider[parsedHandler.actionName];
+
+			providedAction = providerAction;
+		}
+		// If Provider\
+	}
+
 	const wrapped = async (req, res, next) => {
 		// Get route without SearchParams.
 		const route = req.url.split('?')[0];
@@ -57,34 +86,16 @@ function _wrapRouteHandler(routeInstance, handler) {
 		}
 		// If handler is an Object:
 		else {
-			const parsedHandler = parseRouteHandler(handler);
-
-			let providedAction = null;
-
-			// If Controller:
-			if (parsedHandler.controllerName !== undefined) {
-				// Get method (action) from Controller:
-				const controller = this._controllers.get(parsedHandler.controllerName);
-				const controllerAction = controller[parsedHandler.actionName];
-
-				providedAction = controllerAction;
-			}
-			// If Controller\
-
-			// If Provider:
-			else {
-				// Get method (action) from Provider:
-				const provider = this._providers.get(parsedHandler.providerName);
-				const providerAction = provider[parsedHandler.actionName];
-
-				providedAction = providerAction;
-			}
-			// If Provider\
-			
 			// If User set any middleware before:
-			if (typeOf(parsedHandler.before) === 'function') {
+			if (!!parsedHandler.before) {
 				const _next = () => providedAction(req, res);
-				await parsedHandler.before(req, res, _next);
+
+				if (typeOf(parsedHandler.before) === 'function') {
+					await parsedHandler.before(req, res, _next);
+				}
+				else if (parsedHandler.before instanceof MiddlewaresStack) {
+					await parsedHandler.before.process(req, res, _next);
+				}
 			}
 			// If response was not sent,
 			// perform action

package/lib/validators/arguments.js

@@ -82,7 +82,7 @@ function _ensure(argument, rules, argumentName) {
 	}
 
 	if (mismatchedTypesCount === types.length && argument !== undefined) {
-		const err = new TypeError(`${ name } must be of type ${ types.join('|') }.`);
+		const err = new TypeError(`${ name } must be of type: ${ types.join(' or ') }.`);
 		Error.captureStackTrace(err, _ensure);
 		throw err;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodester",
-  "version": "0.2.9",
+  "version": "0.3.1",
   "description": "A versatile REST framework for Node.js",
   "directories": {
     "docs": "docs",
@@ -19,6 +19,10 @@
 
     "./controllers/methods": "./lib/controllers/methods/index.js",
     "./controllers/mixins": "./lib/controllers/mixins/index.js",
+    
+    "./dependencies/mysql2": "./dependencies/mysql2.js",
+    "./dependencies/pg": "./dependencies/pg.js",
+    "./dependencies/sequelize": "./dependencies/sequelize.js",
 
     "./database/connection": "./lib/database/connection.js",
     "./database/migration": "./lib/database/migration.js",
@@ -61,6 +65,7 @@
     "./stacks/markers": "./lib/stacks/MarkersStack.js",
     "./stacks/middlewares": "./lib/stacks/MiddlewaresStack.js",
 
+    "./utils/dates": "./lib/utils/dates.js",
     "./utils/sql": "./lib/utils/sql.util.js",
     "./utils/strings": "./lib/utils/strings.util.js",
     "./utils/sanitizations": "./lib/utils/sanitizations.util.js",