nodester 0.6.74 → 0.6.76

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

@@ -2,7 +2,7 @@
  * nodester
  * MIT Licensed
  */
- 
+
 'use strict';
 
 const ENCODES = require('./encodes');
@@ -12,49 +12,60 @@ module.exports = {
 	decodeQueryString: _decodeQueryString
 }
 
-function _decodeQueryString(queryString='') {
+function _decodeQueryString(queryString = '') {
 	let decoded = '';
+	let i = 0;
 
-	// Token is a String, accumulated char-by-char.
-	let token = '';
-
-	let isEcodedChar = false;
-	let encodedCharsCount = 0;
-
-	for (let i=0; i < queryString.length; i++) {
+	while (i < queryString.length) {
 		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;
+			// Collect all consecutive %XX tokens for multi-byte UTF-8 sequences
+			const percentTokens = [];
+			let j = i;
+
+			// Collect consecutive %XX patterns:
+			while (j < queryString.length && queryString[j] === '%' && j + 2 < queryString.length) {
+				const token = queryString.substring(j, j + 3);
+				percentTokens.push(token);
+				j += 3;
+			}
+
+			// Try single-byte dictionary lookup first (optimization for ASCII):
+			if (percentTokens.length === 1) {
+				const decodedChar = ENCODES[percentTokens[0]];
+				if (decodedChar) {
+					decoded += decodedChar;
+					i = j;
+					continue;
 				}
+			}
+
+			// Multi-byte sequence or unknown single byte - decode as UTF-8:
+			try {
+				const hexBytes = percentTokens.map(token => {
+					// Remove '%'.
+					const hex = token.substring(1);
+					return parseInt(hex, 16);
+				});
 
-				decoded += decodedChar;
-				// Reset:
-				token = '';
-				isEcodedChar = false;
-				encodedCharsCount = 0;
+				const buffer = Buffer.from(hexBytes);
+				const decodedString = buffer.toString('utf8');
+				decoded += decodedString;
+				i = j;
 			}
+			catch (error) {
+				const err = new Error(`Failed to decode UTF-8 sequence at index ${i}: ${percentTokens.join('')}`);
+				err.originalError = error;
+				throw err;
+			}
+		}
+		else {
+			// Regular character, just append.
+			decoded += char;
+			i++;
 		}
 	}
 
-	// Last chunk.
-	decoded += token;
-
 	return decoded;
 }

package/lib/structures/Params.js

@@ -2,7 +2,7 @@
  * nodester
  * MIT Licensed
  */
- 
+
 'use strict';
 
 const {
@@ -41,7 +41,20 @@ function Params(
 
 		// If String:
 		if (typeof defaultValuesList[key] === 'string') {
-			result[key] = `${ sourceObj[key] }`;
+			result[key] = `${sourceObj[key]}`;
+			continue;
+		}
+
+
+		// If Array:
+		if (Array.isArray(defaultValuesList[key])) {
+			if (Array.isArray(sourceObj[key])) {
+				result[key] = sourceObj[key];
+			}
+			else {
+				// Type mismatch!
+				result[key] = defaultValuesList[key];
+			}
 			continue;
 		}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodester",
-  "version": "0.6.74",
+  "version": "0.6.76",
   "description": "A versatile REST framework for Node.js",
   "directories": {
     "docs": "docs",
@@ -130,4 +130,4 @@
     "app",
     "api"
   ]
-}
+}

package/tests/decoding.test.js

@@ -0,0 +1,48 @@
+// Test utils.
+const {
+	describe,
+	it,
+	expect,
+	test
+} = require('@jest/globals');
+
+const { decodeQueryString } = require('../lib/middlewares/ql/sequelize/decoder');
+
+describe('decoding', () => {
+	describe('utf8mb4', () => {
+		const queries = {
+			cyrillic: encodeURIComponent(`name=like(книга)`),
+			diacritics: encodeURIComponent(`salad=like(šopska)`),
+			chinese: encodeURIComponent(`name=like(中)`),
+			emoji: encodeURIComponent(`emoji=like(🌸👍)`),
+		};
+
+		test('cyrillic', async () => {
+			const decoded = decodeQueryString(queries.cyrillic);
+			const expected = 'name=like(книга)';
+
+			expect(decoded).toBe(expected);
+		});
+
+		test('diacritics', async () => {
+			const decoded = decodeQueryString(queries.diacritics);
+			const expected = 'salad=like(šopska)';
+
+			expect(decoded).toBe(expected);
+		});
+
+		test('chinese', async () => {
+			const decoded = decodeQueryString(queries.chinese);
+			const expected = 'name=like(中)';
+
+			expect(decoded).toBe(expected);
+		});
+
+		test('emoji', async () => {
+			const decoded = decodeQueryString(queries.emoji);
+			const expected = 'emoji=like(🌸👍)';
+
+			expect(decoded).toBe(expected);
+		});
+	});
+});