nodester 0.4.9 → 0.5.1

package/lib/application/index.js

@@ -478,17 +478,26 @@ module.exports = class NodesterApplication extends Emitter {
 	/**
 	 * Stops server
 	 *
+	 * @param {Function} callback
+	 *
 	 * @access public
 	 */
-	stop() {
+	stop(callback) {
 		if (this._isListening !== true) {
-			console.warn('Nothing to stop. Server is not listening.');
+			consl.warn('nothing to stop. Server is not listening.');
 			return;
 		}
 
-		this.server.close();
-		this._isListening = false;
+		this.server.close(() => {
+			this._isListening = false;
+			this._router.unlock();
 
-		this._router.unlock();
+			if (typeof callback === 'function') {
+				callback();
+			}
+			else if (!!callback) {
+				consl.warn(`argument 'callback' in stop() must be of type: function.`);
+			}
+		});
 	}
 }

package/lib/body/extract.js

@@ -30,13 +30,14 @@ function extract(body, filter=null, model) {
 
 	const bodyEntries = Object.entries(body);
 
+	// Unwrap statics:
 	const { statics } = filter;
-
+	const staticAttributes = statics?.attributes ?? {};
 
 	// Result object.
 	const filteredBody = {};
 
-	for (const [key, value] of bodyEntries) {
+	for (const [ key, value ] of bodyEntries) {
 		const isInclude = availableIncludes.indexOf(key) > -1;
 		const isAttribute = modelAttributes.indexOf(key) > -1;
 
@@ -47,6 +48,14 @@ function extract(body, filter=null, model) {
 		}
 
 		if (isAttribute) {
+			// If this attribute must have a static value,
+			// skip it.
+			// The static value will be set later:
+			if (typeof staticAttributes[key] !== 'undefined') {
+				continue;
+			}
+
+			// Sanitize value from the body:
 			const column = model.rawAttributes[key];
 			const typeName = column.type.constructor.name;
 			// Optional validation.
@@ -99,6 +108,12 @@ function extract(body, filter=null, model) {
 		err.status = httpCodes.NOT_ACCEPTABLE;
 		throw err;
 	}
+
+	// Set all static attributes:
+	const staticAttributeEntries = Object.entries(staticAttributes);
+	for (const [ key, value ] of staticAttributeEntries) {
+		filteredBody[key] = staticAttributes[key];
+	}
 	
 	return filteredBody;
 }

package/lib/http/request/index.js

@@ -8,11 +8,8 @@
 const { IncomingMessage } = require('http');
 
 const isIP = require('net').isIP;
-const typeis = require('type-is');
 const fresh = require('fresh');
-const parseRange = require('range-parser');
 const parse = require('parseurl');
-const proxyaddr = require('proxy-addr');
 
 const { defineGetter } = require('./utils');
 

package/lib/loggers/console.js

@@ -7,7 +7,8 @@
 
 
 exports = module.exports = {
-	error: _error
+	error: _error,
+	warn: _warn
 }
 
 /**
@@ -19,5 +20,19 @@ exports = module.exports = {
  * @access public
  */
 function _error(err) {
-  console.error(err.stack || err.toString());
+	console.error(err.stack || err.toString());
+}
+
+
+/**
+ * Log warning with nodester prefix using console.warning.
+ *
+ * @param {Error} err
+ *
+ * @alias error
+ * @access public
+ */
+function _warn(...args) {
+	const prefix = '[nodester] warning:';
+	console.warn(prefix, ...args);
 }

package/lib/query/traverse/index.js

@@ -64,7 +64,7 @@ function traverse(queryNode, filter=null, model=null, association=null) {
 		where: {},
 		include: []
 	};
-	
+
 	const {
 		attributes,
 		clauses,
@@ -184,18 +184,19 @@ function traverse(queryNode, filter=null, model=null, association=null) {
 	const order = {};
 
 	const clausesEntries = Object.entries(clauses);
-	for (let [clauseName, value] of clausesEntries) {
+	for (const [ clauseName, value ] of clausesEntries) {
 
 		// If clause is not available:
 		if (filter != null) {
-			if (filter.clauses.indexOf(clauseName) === -1)
+			if (filter.clauses.indexOf(clauseName) === -1) {
 				continue;
+			}
 		}
 
 		switch(clauseName) {
 			case 'limit': {
 				const _value = _setValueWithBounds(value, 'number', filter.bounds.clauses.limit);
-				
+
 				// Do not set if -1:
 				if (_value === -1) 
 					continue;
@@ -226,7 +227,7 @@ function traverse(queryNode, filter=null, model=null, association=null) {
 
 				order.by = value;
 				continue;
-				
+
 			default:
 				continue;
 		}
@@ -243,7 +244,7 @@ function traverse(queryNode, filter=null, model=null, association=null) {
 				case 'limit':
 					newQuery.limit = staticClauseValue;
 					continue;
-				
+
 				case 'skip':
 					newQuery.offset = staticClauseValue;
 					continue;

package/lib/structures/Filter.js

@@ -11,6 +11,9 @@ const CLAUSES = require('../constants/Clauses');
 const { isModel } = require('../utils/models');
 const { ensure } = require('nodester/validators/arguments');
 
+// Console:
+const consl = require('nodester/loggers/console');
+
 
 /**
  * @class
@@ -107,12 +110,13 @@ module.exports = class NodesterFilter {
 					// Empty bounds:
 					if (!!includeFilter.statics.clauses.limit) {
 						const msg = [
-							`(nodester) warning: include "${ includeName }" has`,
-							`association type of "${ associationType }", but has a filter clause "limit",`,
+							`include "${ includeName }" has association type of`,
+							`"${ associationType }", but has a filter clause "limit",`,
 							`which is forbidden on any association type except for "HasMany".`,
-							`It was automatically removed from clauses.`
+							`It was automatically removed from clauses.`,
+							`Consider also removing it from your code.`
 						].join(' ');
-						console.warn(msg);
+						consl.warn(msg);
 					}
 					delete includeFilter.statics.clauses.limit;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodester",
-  "version": "0.4.9",
+  "version": "0.5.1",
   "description": "A versatile REST framework for Node.js",
   "directories": {
     "docs": "docs",
@@ -79,7 +79,7 @@
     "@js-temporal/polyfill": "^0.4.3",
     "body-parser": "^1.20.2",
     "common-js-file-extensions": "^1.0.4",
-    "cookie": "^0.5.0",
+    "cookie": "^1.0.0",
     "cookie-signature": "^1.2.0",
     "debug": "^4.3.4",
     "etag": "^1.8.1",
@@ -92,17 +92,13 @@
     "mysql2": "^3.6.0",
     "pg": "^8.11.3",
     "pg-hstore": "^2.3.4",
-    "proxy-addr": "^2.0.7",
     "qs": "^6.11.0",
-    "range-parser": "^1.2.1",
-    "sequelize": "^6.6.5",
-    "type-is": "^1.6.18",
-    "vary": "^1.1.2"
+    "sequelize": "^6.6.5"
   },
   "devDependencies": {
     "eslint": "^8.55.0",
     "eslint-plugin-jsdoc": "^46.9.0",
-    "jest": "^29.4.2"
+    "jest": "^29.7.0"
   },
   "engines": {
     "node": ">= 12.17.0"

package/tests/index.test.js

@@ -31,10 +31,10 @@ describe('nodester application', () => {
 			expect(app.isListening).toBe(true);
 			expect(app.middlewaresStack.length).toBe(4);
 
-			app.stop();
-
-			expect(app.isLocked).toBe(false);
-			expect(app.isListening).toBe(false);
+			app.stop(() => {
+				expect(app.isLocked).toBe(false);
+				expect(app.isListening).toBe(false);
+			});
 		});
 	});
 });