Merge tag '2.1.6' into develop

Adds accents to the search filter.
nutes-uepb · Aug 5, 2020 · 7e61b3d · 7e61b3d
2 parents d92c0a5 + 47a340e
commit 7e61b3d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,5 @@
 language: node_js
 node_js:
-  - "8"
-  - "9"
   - "10"
   - "11"
   - "12"

diff --git a/README.md b/README.md
@@ -250,7 +250,7 @@ For informations and details about the supported query strings, access the [wiki
 [npm-url]: https://npmjs.org/package/query-strings-parser
 [downloads-image]: https://img.shields.io/npm/dt/query-strings-parser.svg?logo=npm
 [travis-image]: https://img.shields.io/travis/nutes-uepb/query-strings-parser.svg?logo=travis
-[travis-url]: https://travis-ci.org/nutes-uepb/query-strings-parser
+[travis-url]: https://travis-ci.com/nutes-uepb/query-strings-parser
 [coverage-image]: https://coveralls.io/repos/github/nutes-uepb/query-strings-parser/badge.svg
 [coverage-url]: https://coveralls.io/github/nutes-uepb/query-strings-parser?branch=master
 [known-vulnerabilities-image]: https://snyk.io/test/github/nutes-uepb/query-strings-parser/badge.svg?targetFile=package.json

diff --git a/lib/mapper/filters.js b/lib/mapper/filters.js
@@ -80,13 +80,23 @@ function splitByCommas(key, value) {
 
 function buildRegEx(value) {
     value = value.replace(/(^\*{2,})|\*{2,}$/gi, '*')
+    value = addAccentsRegex(value)
     const result = {'$options': 'i'}
     if (!value.startsWith('*') && value.endsWith('*')) result.$regex = '^'.concat(value.replace(/([*])/gi, ''))
     else if (value.startsWith('*') && !value.endsWith('*')) result.$regex = value.replace(/([*])/gi, '').concat('$')
     else result.$regex = value.replace(/([*])/gi, '')
+
     return result
 }
 
+function addAccentsRegex(string) {
+    return string.replace(/a/g, '[a,á,à,ä,â,ã]')
+        .replace(/e/g, '[e,é,ë,ê]')
+        .replace(/i/g, '[i,í,ï]')
+        .replace(/o/g, '[o,ó,ö,ò,ô]')
+        .replace(/u/g, '[u,ü,ú,ù]')
+}
+
 function parseDate(query, options) {
     const result = []
     if (query.start_at === 'today') query.start_at = normalizeDate(dateToString(new Date()), true)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "query-strings-parser",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "Middleware to transform query strings in a format that is recognized by the MongoDB, MySQL and other databases...",
   "license": "MIT",
   "main": "index.js",
@@ -44,7 +44,7 @@
   "devDependencies": {
     "chai": "^4.2.0",
     "express": "^4.17.1",
-    "mocha": "^7.2.0",
+    "mocha": "^8.1.1",
     "nyc": "^15.1.0",
     "supertest": "^4.0.2"
   }

diff --git a/test/integration/index.default.config.spec.js b/test/integration/index.default.config.spec.js
@@ -132,13 +132,13 @@ describe('queryFilter()', function () {
                 const expect_filters = {
                     '$and': [
                         {
-                            name: {'$options': 'i', '$regex': '^lucas'}
+                            name: { '$options': 'i', '$regex': '^l[u,ü,ú,ù]c[a,á,à,ä,â,ã]s' }
                         },
                         {
-                            name: {'$options': 'i', '$regex': 'douglas$'}
+                            name: { '$options': 'i', '$regex': 'd[o,ó,ö,ò,ô][u,ü,ú,ù]gl[a,á,à,ä,â,ã]s$' }
                         },
                         {
-                            name: {'$options': 'i', '$regex': 'jorge'}
+                            name: { '$options': 'i', '$regex': 'j[o,ó,ö,ò,ô]rg[e,é,ë,ê]' }
                         }],
                     'school.name': 'UEPB',
                     'timestamp': '2018-12-05T00:00:00',