nodester 0.4.2 → 0.4.4

package/lib/middlewares/ql/sequelize/decoder/encodes.js

@@ -0,0 +1,47 @@
+/**
+ * nodester
+ * MIT Licensed
+ */
+ 
+'use strict';
+
+const Enum = require('nodester/enum');
+
+
+module.exports = new Enum({
+	'%20': ' ',
+	'%22': '\\',
+	'%23': '#',
+	'%24': '$',
+	'%25': '%',
+	'%26': '&',
+	'%27': `'`,
+	"%28": '(',
+	"%29": ')',
+	
+	'%2A': '*',
+	'%2B': '+',
+	'%2C': ',',
+	'%2D': '-',
+	'%2E': '.',
+	'%2F': '/',
+	
+	'%3A': ':',
+	'%3B': ';',
+	'%3C': '<',
+	'%3D': '=',
+	'%3E': '>',
+	'%3F': '?',
+	
+	'%40': '@',
+
+	'%5B': '[',
+	'%5D': ']',
+	'%5E': '^',
+	'%5F': '_',
+
+	'%60': '`',
+
+	'%7B': '{',
+	'%7D': '}',
+});

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

@@ -0,0 +1,60 @@
+/**
+ * nodester
+ * MIT Licensed
+ */
+ 
+'use strict';
+
+const ENCODES = require('./encodes');
+
+
+module.exports = {
+	decodeQueryString: _decodeQueryString
+}
+
+function _decodeQueryString(queryString='') {
+	let decoded = '';
+
+	// Token is a String, accumulated char-by-char.
+	let token = '';
+
+	let isEcodedChar = false;
+	let encodedCharsCount = 0;
+
+	for (let i=0; i < queryString.length; i++) {
+		const char = queryString[i];
+
+		if (char === '%') {
+			isEcodedChar = true;
+			decoded += token;
+			token = '';
+		}
+	
+		// Continue accumulating token.
+		token += char;
+
+		if (isEcodedChar) {
+			encodedCharsCount++;
+
+			if (encodedCharsCount === 3) {
+				const decodedChar = ENCODES[token];
+				
+				if (!decodedChar) {
+					const err = new Error(`Uknown token '${ token }' at index ${ i }.`);
+					throw err;
+				}
+
+				decoded += decodedChar;
+				// Reset:
+				token = '';
+				isEcodedChar = false;
+				encodedCharsCount = 0;
+			}
+		}
+	}
+
+	// Last chunk.
+	decoded += token;
+
+	return decoded;
+}

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

@@ -9,6 +9,7 @@ const {
 	HTTP_CODE_UNPROCESSABLE_ENTITY
 } = require('nodester/http/codes');
 
+const { decodeQueryString } = require('./decoder');
 const QueryLexer = require('./interpreter/QueryLexer');
 const { createErrorResponse } = require('nodester/factories/responses/rest');
 
@@ -34,7 +35,8 @@ function nqlHandle(req, res, next) {
 	try {
 		const queryString = req.url.split('?')[1];
 
-		const lexer = new QueryLexer(queryString);
+		const decoded = decodeQueryString(queryString);
+		const lexer = new QueryLexer(decoded);
 
 		// Go on!
 		req.nquery = lexer.query;

package/lib/models/define.js

@@ -106,7 +106,7 @@ function _getIncludesTree(data=null) {
 	for (const [ associationName, associationDefinition ] of associationEntries) {
 		const formatted = { association: associationName };
 
-		if (typeof data === 'object') {
+		if (!!data && typeof data === 'object') {
 			// If data (for example during create)
 			// is set, go deeper:
 			const keys = Object.keys( data );

package/lib/query/traverse/index.js

@@ -34,10 +34,11 @@ module.exports = traverse;
  * @param {ModelsTreeNode} queryNode
  * @param {NodesterFilter} filter
  * @param {Model} model
+ * @param {Object} association (optional)
  *
  * @access public
  */
-function traverse(queryNode, filter=null, model=null) {
+function traverse(queryNode, filter=null, model=null, association=null) {
 	const _model = model ?? filter.model;
 
 	try {
@@ -236,21 +237,25 @@ function traverse(queryNode, filter=null, model=null) {
 		const staticClausesEntries = Object.entries(filter.statics.clauses);
 
 		for (let entry of staticClausesEntries) {
-			const [clauseName, staticClauseValue] = entry;
+			const [ clauseName, staticClauseValue ] = entry;
 
 			switch(clauseName) {
 				case 'limit':
 					newQuery.limit = staticClauseValue;
 					continue;
+				
 				case 'skip':
 					newQuery.offset = staticClauseValue;
 					continue;
+
 				case 'order':
 					order.order = staticClauseValue;
 					continue;
+
 				case 'order_by':
 					order.by = staticClauseValue;
 					continue;
+
 				default:
 					break;
 			}
@@ -378,7 +383,7 @@ function _traverseIncludes(includes, rootModel, filter, resultQuery) {
 
 		const includeModel = association.target;
 		// Build query for this include.
-		const associationQuery = traverse(include, filter.includes[includeName], includeModel);
+		const associationQuery = traverse(include, filter.includes[includeName], includeModel, association);
 
 		addAssociationQuery(associationQuery, includeName, resultQuery);
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodester",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "A versatile REST framework for Node.js",
   "directories": {
     "docs": "docs",