i18next-http-middleware 3.2.1 → 3.3.0

package/esm/languageLookups/cookie.js

@@ -1,95 +1,74 @@
-var fieldContentRegExp = /^[\u0009\u0020-\u007e\u0080-\u00ff]+$/;
 
+var fieldContentRegExp = /^[\u0009\u0020-\u007e\u0080-\u00ff]+$/;
 var serializeCookie = function serializeCookie(name, val, options) {
   var opt = options || {};
   opt.path = opt.path || '/';
   var value = encodeURIComponent(val);
   var str = name + '=' + value;
-
   if (opt.maxAge > 0) {
     var maxAge = opt.maxAge - 0;
     if (isNaN(maxAge)) throw new Error('maxAge should be a Number');
     str += '; Max-Age=' + Math.floor(maxAge);
   }
-
   if (opt.domain) {
     if (!fieldContentRegExp.test(opt.domain)) {
       throw new TypeError('option domain is invalid');
     }
-
     str += '; Domain=' + opt.domain;
   }
-
   if (opt.path) {
     if (!fieldContentRegExp.test(opt.path)) {
       throw new TypeError('option path is invalid');
     }
-
     str += '; Path=' + opt.path;
   }
-
   if (opt.expires) {
     if (typeof opt.expires.toUTCString !== 'function') {
       throw new TypeError('option expires is invalid');
     }
-
     str += '; Expires=' + opt.expires.toUTCString();
   }
-
   if (opt.httpOnly) str += '; HttpOnly';
   if (opt.secure) str += '; Secure';
-
   if (opt.sameSite) {
     var sameSite = typeof opt.sameSite === 'string' ? opt.sameSite.toLowerCase() : opt.sameSite;
-
     switch (sameSite) {
       case true:
         str += '; SameSite=Strict';
         break;
-
       case 'lax':
         str += '; SameSite=Lax';
         break;
-
       case 'strict':
         str += '; SameSite=Strict';
         break;
-
       case 'none':
         str += '; SameSite=None';
         break;
-
       default:
         throw new TypeError('option sameSite is invalid');
     }
   }
-
   return str;
 };
-
 export default {
   name: 'cookie',
   lookup: function lookup(req, res, options) {
     var found;
-
     if (options.lookupCookie && typeof req !== 'undefined') {
       var cookies = options.getCookies(req);
       if (cookies) found = cookies[options.lookupCookie];
     }
-
     return found;
   },
   cacheUserLanguage: function cacheUserLanguage(req, res, lng) {
     var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-
     if (options.lookupCookie && req !== 'undefined') {
       var expirationDate = options.cookieExpirationDate;
-
       if (!expirationDate) {
         expirationDate = new Date();
         expirationDate.setFullYear(expirationDate.getFullYear() + 1);
       }
-
       var cookieOptions = {
         expires: expirationDate,
         domain: options.cookieDomain,

package/esm/languageLookups/header.js

@@ -3,36 +3,29 @@ export default {
   name: 'header',
   lookup: function lookup(req, res, options) {
     var found;
-
     if (typeof req !== 'undefined') {
       var headers = options.getHeaders(req);
       if (!headers) return found;
       var locales = [];
       var acceptLanguage = options.lookupHeader ? headers[options.lookupHeader] : headers['accept-language'];
-
       if (acceptLanguage) {
-        var lookupRegex = /(([a-z]{2})-?([A-Z]{2})?)\s*;?\s*(q=([0-9.]+))?/gi;
-
+        var lookupRegex = /(([a-z]{2,3})-?([A-Z]{2})?)\s*;?\s*(q=([0-9.]+))?/gi;
         if (acceptLanguage.indexOf('-') > 0) {
           var foundSpecialCase = specialCases.find(function (s) {
             return acceptLanguage.toLowerCase().indexOf("-".concat(s)) > 0;
           });
-          if (foundSpecialCase) lookupRegex = /(([a-z]{2})-?([A-Z]{4})?)\s*;?\s*(q=([0-9.]+))?/gi;
+          if (foundSpecialCase) lookupRegex = /(([a-z]{2,3})-?([A-Z]{4})?)\s*;?\s*(q=([0-9.]+))?/gi;
         }
-
         var lngs = [];
         var i;
         var m;
         var rgx = options.lookupHeaderRegex || lookupRegex;
-
         do {
           m = rgx.exec(acceptLanguage);
-
           if (m) {
             var lng = m[1];
             var weight = m[5] || '1';
             var q = Number(weight);
-
             if (lng && !isNaN(q)) {
               lngs.push({
                 lng: lng,
@@ -41,19 +34,15 @@ export default {
             }
           }
         } while (m);
-
         lngs.sort(function (a, b) {
           return b.q - a.q;
         });
-
         for (i = 0; i < lngs.length; i++) {
           locales.push(lngs[i].lng);
         }
-
         if (locales.length) found = locales;
       }
     }
-
     return found;
   }
 };

package/esm/languageLookups/path.js

@@ -2,28 +2,22 @@ export default {
   name: 'path',
   lookup: function lookup(req, res, options) {
     var found;
-
     if (req === undefined) {
       return found;
     }
-
     if (options.lookupPath !== undefined && req.params) {
       found = options.getParams(req)[options.lookupPath];
     }
-
     if (!found && typeof options.lookupFromPathIndex === 'number' && options.getOriginalUrl(req)) {
       var path = options.getOriginalUrl(req).split('?')[0];
       var parts = path.split('/');
-
       if (parts[0] === '') {
         parts.shift();
       }
-
       if (parts.length > options.lookupFromPathIndex) {
         found = parts[options.lookupFromPathIndex];
       }
     }
-
     return found;
   }
 };

package/esm/languageLookups/querystring.js

@@ -2,24 +2,19 @@ export default {
   name: 'querystring',
   lookup: function lookup(req, res, options) {
     var found;
-
     if (options.lookupQuerystring !== undefined && typeof req !== 'undefined') {
       if (options.getQuery(req)) {
         found = options.getQuery(req)[options.lookupQuerystring];
       }
-
       if (!found && options.getUrl(req) && options.getUrl(req).indexOf('?')) {
         var lastPartOfUri = options.getUrl(req).substring(options.getUrl(req).indexOf('?'));
-
         if (typeof URLSearchParams !== 'undefined') {
           var urlParams = new URLSearchParams(lastPartOfUri);
           found = urlParams.get(options.lookupQuerystring);
         } else {
           var indexOfQsStart = lastPartOfUri.indexOf("".concat(options.lookupQuerystring, "="));
-
           if (indexOfQsStart > -1) {
             var restOfUri = lastPartOfUri.substring(options.lookupQuerystring.length + 2);
-
             if (restOfUri.indexOf('&') < 0) {
               found = restOfUri;
             } else {
@@ -29,7 +24,6 @@ export default {
         }
       }
     }
-
     return found;
   }
 };

package/esm/languageLookups/session.js

@@ -1,19 +1,15 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 export default {
   name: 'session',
   lookup: function lookup(req, res, options) {
     var found;
-
     if (options.lookupSession !== undefined && _typeof(req) && options.getSession(req)) {
       found = options.getSession(req)[options.lookupSession];
     }
-
     return found;
   },
   cacheUserLanguage: function cacheUserLanguage(req, res, lng) {
     var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-
     if (options.lookupSession && req && options.getSession(req)) {
       options.getSession(req)[options.lookupSession] = lng;
     }

package/esm/utils.js

@@ -2,15 +2,12 @@ export function setPath(object, path, newValue) {
   var stack;
   if (typeof path !== 'string') stack = [].concat(path);
   if (typeof path === 'string') stack = path.split('.');
-
   while (stack.length > 1) {
     var _key = stack.shift();
-
     if (_key.indexOf('###') > -1) _key = _key.replace(/###/g, '.');
     if (!object[_key]) object[_key] = {};
     object = object[_key];
   }
-
   var key = stack.shift();
   if (key.indexOf('###') > -1) key = key.replace(/###/g, '.');
   object[key] = newValue;
@@ -41,7 +38,6 @@ export function extend(obj) {
 export function removeLngFromUrl(url, lookupFromPathIndex) {
   var first = '';
   var pos = lookupFromPathIndex;
-
   if (url[0] === '/') {
     pos++;
     first = '/';

package/lib/index.js

@@ -176,13 +176,24 @@ export function getResourcesHandler (i18next, options = {}) {
       options.setHeader(res, 'Cache-Control', 'no-cache')
     }
 
-    const languages = options.getQuery(req)[options.lngParam || 'lng']
+    // first check query
+    let languages = options.getQuery(req)[options.lngParam || 'lng']
       ? options.getQuery(req)[options.lngParam || 'lng'].split(' ')
       : []
-    const namespaces = options.getQuery(req)[options.nsParam || 'ns']
+    let namespaces = options.getQuery(req)[options.nsParam || 'ns']
       ? options.getQuery(req)[options.nsParam || 'ns'].split(' ')
       : []
 
+    // then check route params
+    if (languages.length === 0 && namespaces.length === 0) {
+      languages = options.getParams(req)[options.lngParam || 'lng']
+        ? options.getParams(req)[options.lngParam || 'lng'].split(' ')
+        : []
+      namespaces = options.getParams(req)[options.nsParam || 'ns']
+        ? options.getParams(req)[options.nsParam || 'ns'].split(' ')
+        : []
+    }
+
     // extend ns
     namespaces.forEach(ns => {
       if (i18next.options.ns && i18next.options.ns.indexOf(ns) < 0) {

package/lib/languageLookups/header.js

@@ -14,10 +14,10 @@ export default {
       const acceptLanguage = options.lookupHeader ? headers[options.lookupHeader] : headers['accept-language']
 
       if (acceptLanguage) {
-        let lookupRegex = /(([a-z]{2})-?([A-Z]{2})?)\s*;?\s*(q=([0-9.]+))?/gi
+        let lookupRegex = /(([a-z]{2,3})-?([A-Z]{2})?)\s*;?\s*(q=([0-9.]+))?/gi
         if (acceptLanguage.indexOf('-') > 0) {
           const foundSpecialCase = specialCases.find((s) => acceptLanguage.toLowerCase().indexOf(`-${s}`) > 0)
-          if (foundSpecialCase) lookupRegex = /(([a-z]{2})-?([A-Z]{4})?)\s*;?\s*(q=([0-9.]+))?/gi
+          if (foundSpecialCase) lookupRegex = /(([a-z]{2,3})-?([A-Z]{4})?)\s*;?\s*(q=([0-9.]+))?/gi
         }
         const lngs = []; let i; let m
         const rgx = options.lookupHeaderRegex || lookupRegex

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-http-middleware",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "private": false,
   "type": "module",
   "main": "./cjs/index.js",
@@ -21,27 +21,27 @@
   "module": "./esm/index.js",
   "dependencies": {},
   "devDependencies": {
-    "@babel/cli": "7.16.0",
-    "@babel/core": "7.16.5",
-    "@babel/preset-env": "7.16.5",
-    "@hapi/hapi": "^20.2.1",
-    "@types/express-serve-static-core": "^4.17.27",
+    "@babel/cli": "7.19.3",
+    "@babel/core": "7.19.6",
+    "@babel/preset-env": "7.19.4",
+    "@hapi/hapi": "^20.2.2",
+    "@types/express-serve-static-core": "^4.17.31",
     "babel-plugin-add-module-exports": "1.0.4",
-    "eslint": "7.29.0",
-    "eslint-config-standard": "16.0.3",
-    "eslint-plugin-import": "2.25.3",
-    "eslint-plugin-node": "11.1.0",
-    "eslint-plugin-promise": "5.1.0",
+    "eslint": "8.26.0",
+    "eslint-config-standard": "17.0.0",
+    "eslint-plugin-import": "2.26.0",
+    "eslint-plugin-n": "15.3.0",
+    "eslint-plugin-promise": "6.1.1",
     "eslint-plugin-require-path-exists": "1.1.9",
     "eslint-plugin-standard": "5.0.0",
     "expect.js": "0.3.1",
-    "express": "4.17.2",
-    "fastify": "3.25.2",
-    "i18next": "21.6.3",
-    "mocha": "9.1.3",
-    "supertest": "6.1.6",
-    "tsd": "0.19.0",
-    "uglify-js": "3.14.5"
+    "express": "4.18.2",
+    "fastify": "4.9.2",
+    "i18next": "22.0.2",
+    "mocha": "10.1.0",
+    "supertest": "6.3.1",
+    "tsd": "0.24.1",
+    "uglify-js": "3.17.4"
   },
   "description": "i18next-http-middleware is a middleware to be used with Node.js web frameworks like express or Fastify and also for Deno.",
   "keywords": [