i18next-http-middleware 3.2.1 → 3.3.0

package/cjs/languageLookups/cookie.js

@@ -5,97 +5,75 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 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;
 };
-
 var _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/cjs/languageLookups/header.js

@@ -9,36 +9,29 @@ var _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,
@@ -47,19 +40,15 @@ var _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/cjs/languageLookups/path.js

@@ -8,28 +8,22 @@ var _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/cjs/languageLookups/querystring.js

@@ -8,24 +8,19 @@ var _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 {
@@ -35,7 +30,6 @@ var _default = {
         }
       }
     }
-
     return found;
   }
 };

package/cjs/languageLookups/session.js

@@ -4,23 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 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); }
-
 var _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/cjs/utils.js

@@ -7,29 +7,23 @@ exports.defaults = defaults;
 exports.extend = extend;
 exports.removeLngFromUrl = removeLngFromUrl;
 exports.setPath = setPath;
-
 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;
 }
-
 var arr = [];
 var each = arr.forEach;
 var slice = arr.slice;
-
 function defaults(obj) {
   each.call(slice.call(arguments, 1), function (source) {
     if (source) {
@@ -40,7 +34,6 @@ function defaults(obj) {
   });
   return obj;
 }
-
 function extend(obj) {
   each.call(slice.call(arguments, 1), function (source) {
     if (source) {
@@ -51,11 +44,9 @@ function extend(obj) {
   });
   return obj;
 }
-
 function removeLngFromUrl(url, lookupFromPathIndex) {
   var first = '';
   var pos = lookupFromPathIndex;
-
   if (url[0] === '/') {
     pos++;
     first = '/';

package/esm/LanguageDetector.js

@@ -1,9 +1,6 @@
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-
 import * as utils from './utils.js';
 import cookieLookup from './languageLookups/cookie.js';
 import querystringLookup from './languageLookups/querystring.js';
@@ -11,7 +8,6 @@ import pathLookup from './languageLookups/path.js';
 import headerLookup from './languageLookups/header.js';
 import sessionLookup from './languageLookups/session.js';
 import { extendOptionsWithDefaults } from './httpFunctions.js';
-
 function getDefaults() {
   return extendOptionsWithDefaults({
     order: ['querystring', 'cookie', 'header'],
@@ -24,19 +20,15 @@ function getDefaults() {
     ignoreCase: true
   });
 }
-
 var LanguageDetector = function () {
   function LanguageDetector(services) {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     var allOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-
     _classCallCheck(this, LanguageDetector);
-
     this.type = 'languageDetector';
     this.detectors = {};
     this.init(services, options, allOptions);
   }
-
   _createClass(LanguageDetector, [{
     key: "init",
     value: function init(services) {
@@ -60,24 +52,19 @@ var LanguageDetector = function () {
     key: "detect",
     value: function detect(req, res, detectionOrder) {
       var _this = this;
-
       if (arguments.length < 2) return;
       if (!detectionOrder) detectionOrder = this.options.order;
       var found;
       detectionOrder.forEach(function (detectorName) {
         if (found || !_this.detectors[detectorName]) return;
-
         var detections = _this.detectors[detectorName].lookup(req, res, _this.options);
-
         if (!detections) return;
         if (!Array.isArray(detections)) detections = [detections];
         detections = detections.filter(function (d) {
           return d !== undefined && d !== null;
         });
-
         if (_this.services.languageUtils.getBestMatchFromCodes) {
           found = _this.services.languageUtils.getBestMatchFromCodes(detections);
-
           if (found) {
             if (_this.options.ignoreCase) {
               if (detections.map(function (d) {
@@ -87,7 +74,6 @@ var LanguageDetector = function () {
               if (detections.indexOf(found) < 0) found = undefined;
             }
           }
-
           if (found) req.i18nextLookupName = detectorName;
         } else {
           found = detections.length > 0 ? detections[0] : null;
@@ -99,14 +85,12 @@ var LanguageDetector = function () {
         if (typeof fallbacks === 'function') fallbacks = fallbacks();
         if (typeof fallbacks === 'string') fallbacks = [fallbacks];
         if (!fallbacks) fallbacks = [];
-
         if (Object.prototype.toString.apply(fallbacks) === '[object Array]') {
           found = fallbacks[0];
         } else {
           found = fallbacks[0] || fallbacks.default && fallbacks.default[0];
         }
       }
-
       ;
       return found;
     }
@@ -114,22 +98,18 @@ var LanguageDetector = function () {
     key: "cacheUserLanguage",
     value: function cacheUserLanguage(req, res, lng, caches) {
       var _this2 = this;
-
       if (arguments.length < 3) return;
       if (!caches) caches = this.options.caches;
       if (!caches) return;
       caches.forEach(function (cacheName) {
         if (_this2.detectors[cacheName] && _this2.detectors[cacheName].cacheUserLanguage && res.cachedUserLanguage !== lng) {
           _this2.detectors[cacheName].cacheUserLanguage(req, res, lng, _this2.options);
-
           res.cachedUserLanguage = lng;
         }
       });
     }
   }]);
-
   return LanguageDetector;
 }();
-
 LanguageDetector.type = 'languageDetector';
 export default LanguageDetector;

package/esm/httpFunctions.js

@@ -15,7 +15,6 @@ export var setUrl = function setUrl(req, url) {
     req.url = url;
     return;
   }
-
   console.log('no possibility found to get url');
 };
 export var getOriginalUrl = function getOriginalUrl(req) {
@@ -27,7 +26,6 @@ export var getQuery = function getQuery(req) {
   if (req.query && typeof req.query.entries === 'function' && typeof Object.fromEntries === 'function' && typeof req.query[Symbol.iterator] === 'function') {
     return Object.fromEntries(req.query);
   }
-
   if (req.query) return req.query;
   if (req.searchParams) return req.searchParams;
   if (req.raw && req.raw.query) return req.raw.query;
@@ -50,7 +48,6 @@ export var getHeaders = function getHeaders(req) {
 };
 export var getCookies = function getCookies(req) {
   if (req.cookies) return req.cookies;
-
   if (getHeaders(req)) {
     var list = {};
     var rc = getHeaders(req).cookie;
@@ -60,14 +57,12 @@ export var getCookies = function getCookies(req) {
     });
     return list;
   }
-
   console.log('no possibility found to get cookies');
 };
 export var getBody = function getBody(req) {
   if (req.ctx && typeof req.ctx.body === 'function') {
     return req.ctx.body.bind(req.ctx);
   }
-
   if (req.ctx && req.ctx.body) return req.ctx.body;
   if (req.json) return req.json;
   if (req.body) return req.body;
@@ -86,15 +81,12 @@ export var setHeader = function setHeader(res, name, value) {
   if (res._headerSent || res.headersSent) return;
   if (typeof res.setHeader === 'function') return res.setHeader(name, value);
   if (typeof res.header === 'function') return res.header(name, value);
-
   if (res.responseHeaders && typeof res.responseHeaders.set === 'function') {
     return res.responseHeaders.set(name, value);
   }
-
   if (res.headers && typeof res.headers.set === 'function') {
     return res.headers.set(name, value);
   }
-
   console.log('no possibility found to set header');
 };
 export var setContentType = function setContentType(res, type) {

package/esm/index.js

@@ -1,14 +1,10 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import * as utils from './utils.js';
 import LD from './LanguageDetector.js';
 import { extendOptionsWithDefaults } from './httpFunctions.js';
 export var LanguageDetector = LD;
-
 var checkForCombinedReqRes = function checkForCombinedReqRes(req, res, next) {
   if (!res) {
     if (req.request && req.response) {
@@ -21,82 +17,70 @@ var checkForCombinedReqRes = function checkForCombinedReqRes(req, res, next) {
       if (!next) next = function next() {};
     }
   }
-
   return {
     req: req,
     res: res,
     next: next
   };
 };
-
 export function handle(i18next) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   extendOptionsWithDefaults(options);
   return function i18nextMiddleware(rq, rs, n) {
     var _checkForCombinedReqR = checkForCombinedReqRes(rq, rs, n),
-        req = _checkForCombinedReqR.req,
-        res = _checkForCombinedReqR.res,
-        next = _checkForCombinedReqR.next;
-
+      req = _checkForCombinedReqR.req,
+      res = _checkForCombinedReqR.res,
+      next = _checkForCombinedReqR.next;
     if (typeof options.ignoreRoutes === 'function') {
       if (options.ignoreRoutes(req, res, options, i18next)) {
         return next();
       }
     } else {
       var ignores = options.ignoreRoutes instanceof Array && options.ignoreRoutes || [];
-
       for (var i = 0; i < ignores.length; i++) {
         if (options.getPath(req).indexOf(ignores[i]) > -1) return next();
       }
     }
-
     var i18n = i18next.cloneInstance({
       initImmediate: false
     });
     i18n.on('languageChanged', function (lng) {
       req.language = req.locale = req.lng = lng;
       if (options.attachLocals) res.locals = res.locals || {};
-
       if (res.locals) {
         res.locals.language = lng;
         res.locals.languageDir = i18next.dir(lng);
       }
-
       if (lng && options.getHeader(res, 'Content-Language') !== lng) {
         options.setHeader(res, 'Content-Language', lng);
       }
-
       req.languages = i18next.services.languageUtils.toResolveHierarchy(lng);
-
       if (i18next.services.languageDetector) {
         i18next.services.languageDetector.cacheUserLanguage(req, res, lng);
       }
     });
     var lng = req.lng;
-
     if (!lng && i18next.services.languageDetector) {
       lng = i18next.services.languageDetector.detect(req, res);
     }
 
     req.language = req.locale = req.lng = lng;
-
     if (lng && options.getHeader(res, 'Content-Language') !== lng) {
       options.setHeader(res, 'Content-Language', lng);
     }
-
     req.languages = i18next.services.languageUtils.toResolveHierarchy(lng);
-    i18n.changeLanguage(lng || i18next.options.fallbackLng[0]);
 
+    i18n.changeLanguage(lng || i18next.options.fallbackLng[0]);
     if (req.i18nextLookupName === 'path' && options.removeLngFromUrl) {
       options.setUrl(req, utils.removeLngFromUrl(options.getUrl(req), i18next.services.languageDetector.options.lookupFromPathIndex));
     }
-
     var t = i18n.t.bind(i18n);
     var exists = i18n.exists.bind(i18n);
+
     req.i18n = i18n;
     req.t = t;
-    if (options.attachLocals) res.locals = res.locals || {};
 
+    if (options.attachLocals) res.locals = res.locals || {};
     if (res.locals) {
       res.locals.t = t;
       res.locals.exists = exists;
@@ -104,11 +88,9 @@ export function handle(i18next) {
       res.locals.language = lng;
       res.locals.languageDir = i18next.dir(lng);
     }
-
     if (i18next.services.languageDetector) {
       i18next.services.languageDetector.cacheUserLanguage(req, res, lng);
     }
-
     if (!req.lng) return next();
     i18next.loadLanguages(req.lng, function () {
       return next();
@@ -144,17 +126,14 @@ export function getResourcesHandler(i18next) {
   var maxAge = options.maxAge || 60 * 60 * 24 * 30;
   return function (rq, rs) {
     var _checkForCombinedReqR2 = checkForCombinedReqRes(rq, rs),
-        req = _checkForCombinedReqR2.req,
-        res = _checkForCombinedReqR2.res;
-
+      req = _checkForCombinedReqR2.req,
+      res = _checkForCombinedReqR2.res;
     if (!i18next.services.backendConnector) {
       options.setStatus(res, 404);
       return options.send(res, 'i18next-express-middleware:: no backend configured');
     }
-
     var resources = {};
     options.setContentType(res, 'application/json');
-
     if (options.cache !== undefined ? options.cache : typeof process !== 'undefined' && process.env && process.env.NODE_ENV === 'production') {
       options.setHeader(res, 'Cache-Control', 'public, max-age=' + maxAge);
       options.setHeader(res, 'Expires', new Date(new Date().getTime() + maxAge * 1000).toUTCString());
@@ -165,6 +144,12 @@ export function getResourcesHandler(i18next) {
 
     var languages = options.getQuery(req)[options.lngParam || 'lng'] ? options.getQuery(req)[options.lngParam || 'lng'].split(' ') : [];
     var namespaces = options.getQuery(req)[options.nsParam || 'ns'] ? options.getQuery(req)[options.nsParam || 'ns'].split(' ') : [];
+
+    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(' ') : [];
+    }
+
     namespaces.forEach(function (ns) {
       if (i18next.options.ns && i18next.options.ns.indexOf(ns) < 0) {
         i18next.options.ns.push(ns);
@@ -185,39 +170,31 @@ export function missingKeyHandler(i18next) {
   extendOptionsWithDefaults(options);
   return function (rq, rs) {
     var _checkForCombinedReqR3 = checkForCombinedReqRes(rq, rs),
-        req = _checkForCombinedReqR3.req,
-        res = _checkForCombinedReqR3.res;
-
+      req = _checkForCombinedReqR3.req,
+      res = _checkForCombinedReqR3.res;
     var lng = options.getParams(req)[options.lngParam || 'lng'];
     var ns = options.getParams(req)[options.nsParam || 'ns'];
-
     if (!i18next.services.backendConnector) {
       options.setStatus(res, 404);
       return options.send(res, 'i18next-express-middleware:: no backend configured');
     }
-
     var body = options.getBody(req);
-
     if (typeof body === 'function') {
       var promise = body();
-
       if (promise && typeof promise.then === 'function') {
         return new Promise(function (resolve) {
           promise.then(function (b) {
             for (var m in b) {
               i18next.services.backendConnector.saveMissing([lng], ns, m, b[m]);
             }
-
             resolve(options.send(res, 'ok'));
           });
         });
       }
     }
-
     for (var m in body) {
       i18next.services.backendConnector.saveMissing([lng], ns, m, body[m]);
     }
-
     return options.send(res, 'ok');
   };
 }
@@ -228,14 +205,11 @@ export function addRoute(i18next, route, lngs, app, verb, fc) {
   }
 
   var callbacks = [fc].concat(Array.prototype.slice.call(arguments, 6));
-
   for (var i = 0, li = lngs.length; i < li; i++) {
     var parts = String(route).split('/');
     var locRoute = [];
-
     for (var y = 0, ly = parts.length; y < ly; y++) {
       var part = parts[y];
-
       if (part === ':lng') {
         locRoute.push(lngs[i]);
       } else if (part.indexOf(':') === 0 || part === '') {
@@ -246,7 +220,6 @@ export function addRoute(i18next, route, lngs, app, verb, fc) {
         }));
       }
     }
-
     var routes = [locRoute.join('/')];
     app[verb || 'get'].apply(app, routes.concat(callbacks));
   }