i18next-http-middleware 3.0.2 → 3.0.6

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [v3.0.6](https://github.com/i18next/i18next-http-middleware/compare/v3.0.5...v3.0.6)
+- ignoreCase option true by default
+
+## [v3.0.5](https://github.com/i18next/i18next-http-middleware/compare/v3.0.4...v3.0.5)
+- introduce ignoreCase option
+
+## [v3.0.4](https://github.com/i18next/i18next-http-middleware/compare/v3.0.3...v3.0.4)
+- fix language detection algorithm to handle fallbackLng correctly
+
+## [v3.0.3](https://github.com/i18next/i18next-http-middleware/compare/v3.0.2...v3.0.3)
+- prevent URIError with cookie language detector
+
 ## [v3.0.2](https://github.com/i18next/i18next-http-middleware/compare/v3.0.1...v3.0.2)
 - transpile also esm
 

package/README.md

@@ -13,7 +13,7 @@ It's based on the deprecated [i18next-express-middleware](https://github.com/i18
 
 # Getting started
 
-```
+```bash
 # npm package
 $ npm install i18next-http-middleware
 ```
@@ -296,6 +296,8 @@ As with all modules you can either pass the constructor function (class) to the
   // cache user language
   caches: false, // ['cookie']
 
+  ignoreCase: true, // ignore case of detected language
+
   // optional expire and domain for set cookie
   cookieExpirationDate: new Date(),
   cookieDomain: 'myDomain',

package/cjs/LanguageDetector.js

@@ -41,7 +41,8 @@ function getDefaults() {
     lookupSession: 'lng',
     lookupFromPathIndex: 0,
     caches: false,
-    cookieSameSite: 'strict'
+    cookieSameSite: 'strict',
+    ignoreCase: true
   });
 }
 
@@ -94,6 +95,17 @@ var LanguageDetector = function () {
 
         if (_this.services.languageUtils.getBestMatchFromCodes) {
           found = _this.services.languageUtils.getBestMatchFromCodes(detections);
+
+          if (found) {
+            if (_this.options.ignoreCase) {
+              if (detections.map(function (d) {
+                return d.toLowerCase();
+              }).indexOf(found.toLowerCase()) < 0) found = undefined;
+            } else {
+              if (detections.indexOf(found) < 0) found = undefined;
+            }
+          }
+
           if (found) req.i18nextLookupName = detectorName;
         } else {
           found = detections.length > 0 ? detections[0] : null;

package/cjs/httpFunctions.js

@@ -79,7 +79,7 @@ var getCookies = function getCookies(req) {
     var rc = getHeaders(req).cookie;
     rc && rc.split(';').forEach(function (cookie) {
       var parts = cookie.split('=');
-      list[parts.shift().trim()] = decodeURI(parts.join('='));
+      list[parts.shift().trim()] = decodeURI(encodeURI(parts.join('=')));
     });
     return list;
   }

package/cjs/languageLookups/cookie.js

@@ -80,7 +80,7 @@ var _default = {
 
     if (options.lookupCookie && typeof req !== 'undefined') {
       var cookies = options.getCookies(req);
-      found = cookies[options.lookupCookie];
+      if (cookies) found = cookies[options.lookupCookie];
     }
 
     return found;

package/esm/LanguageDetector.js

@@ -20,7 +20,8 @@ function getDefaults() {
     lookupSession: 'lng',
     lookupFromPathIndex: 0,
     caches: false,
-    cookieSameSite: 'strict'
+    cookieSameSite: 'strict',
+    ignoreCase: true
   });
 }
 
@@ -73,6 +74,17 @@ var LanguageDetector = function () {
 
         if (_this.services.languageUtils.getBestMatchFromCodes) {
           found = _this.services.languageUtils.getBestMatchFromCodes(detections);
+
+          if (found) {
+            if (_this.options.ignoreCase) {
+              if (detections.map(function (d) {
+                return d.toLowerCase();
+              }).indexOf(found.toLowerCase()) < 0) found = undefined;
+            } else {
+              if (detections.indexOf(found) < 0) found = undefined;
+            }
+          }
+
           if (found) req.i18nextLookupName = detectorName;
         } else {
           found = detections.length > 0 ? detections[0] : null;

package/esm/httpFunctions.js

@@ -51,7 +51,7 @@ export var getCookies = function getCookies(req) {
     var rc = getHeaders(req).cookie;
     rc && rc.split(';').forEach(function (cookie) {
       var parts = cookie.split('=');
-      list[parts.shift().trim()] = decodeURI(parts.join('='));
+      list[parts.shift().trim()] = decodeURI(encodeURI(parts.join('=')));
     });
     return list;
   }

package/esm/languageLookups/cookie.js

@@ -74,7 +74,7 @@ export default {
 
     if (options.lookupCookie && typeof req !== 'undefined') {
       var cookies = options.getCookies(req);
-      found = cookies[options.lookupCookie];
+      if (cookies) found = cookies[options.lookupCookie];
     }
 
     return found;

package/lib/LanguageDetector.js

@@ -19,7 +19,8 @@ function getDefaults () {
     // cookieExpirationDate: new Date(),
     // cookieDomain: 'myDomain'
     // cookiePath: '/my/path'
-    cookieSameSite: 'strict'
+    cookieSameSite: 'strict',
+    ignoreCase: true
   })
 }
 
@@ -61,6 +62,13 @@ class LanguageDetector {
 
       if (this.services.languageUtils.getBestMatchFromCodes) { // new i18next v19.5.0
         found = this.services.languageUtils.getBestMatchFromCodes(detections)
+        if (found) {
+          if (this.options.ignoreCase) {
+            if (detections.map(d => d.toLowerCase()).indexOf(found.toLowerCase()) < 0) found = undefined
+          } else {
+            if (detections.indexOf(found) < 0) found = undefined
+          }
+        }
         if (found) req.i18nextLookupName = detectorName
       } else {
         found = detections.length > 0 ? detections[0] : null // a little backward compatibility

package/lib/httpFunctions.js

@@ -49,7 +49,7 @@ export const getCookies = (req) => {
     const rc = getHeaders(req).cookie
     rc && rc.split(';').forEach((cookie) => {
       const parts = cookie.split('=')
-      list[parts.shift().trim()] = decodeURI(parts.join('='))
+      list[parts.shift().trim()] = decodeURI(encodeURI(parts.join('=')))
     })
     return list
   }

package/lib/languageLookups/cookie.js

@@ -61,7 +61,7 @@ export default {
 
     if (options.lookupCookie && typeof req !== 'undefined') {
       const cookies = options.getCookies(req)
-      found = cookies[options.lookupCookie]
+      if (cookies) found = cookies[options.lookupCookie]
     }
 
     return found

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-http-middleware",
-  "version": "3.0.2",
+  "version": "3.0.6",
   "private": false,
   "type": "module",
   "main": "./cjs/index.js",
@@ -20,11 +20,11 @@
   "module": "./esm/index.js",
   "dependencies": {},
   "devDependencies": {
-    "@babel/cli": "7.10.4",
-    "@babel/core": "7.10.4",
-    "@babel/preset-env": "7.10.4",
+    "@babel/cli": "7.10.5",
+    "@babel/core": "7.11.4",
+    "@babel/preset-env": "7.11.0",
     "babel-plugin-add-module-exports": "1.0.2",
-    "eslint": "7.3.1",
+    "eslint": "7.7.0",
     "eslint-config-standard": "14.1.1",
     "eslint-plugin-import": "2.22.0",
     "eslint-plugin-node": "11.1.0",
@@ -33,11 +33,11 @@
     "eslint-plugin-standard": "4.0.1",
     "expect.js": "0.3.1",
     "express": "4.17.1",
-    "fastify": "3.0.0-rc.1",
-    "i18next": "19.5.2",
-    "mocha": "8.0.1",
+    "fastify": "3.3.0",
+    "i18next": "19.7.0",
+    "mocha": "8.1.3",
     "supertest": "4.0.2",
-    "uglify-js": "3.10.0"
+    "uglify-js": "3.10.3"
   },
   "description": "i18next-http-middleware is a middleware to be used with Node.js web frameworks like express or Fastify and also for Deno.",
   "keywords": [
@@ -67,7 +67,7 @@
     "compile": "npm run compile:esm && npm run compile:cjs",
     "build": "npm run compile",
     "test": "npm run lint && npm run build && mocha test -R spec --exit --experimental-modules",
-    "test:deno": "deno test test/deno/*.js --allow-net",
+    "test:deno": "deno test test/deno/*.js --allow-net --no-check",
     "preversion": "npm run test && npm run build && git push",
     "postversion": "git push && git push --tags"
   }