i18next-http-middleware 2.1.1 → 3.0.2

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [v3.0.2](https://github.com/i18next/i18next-http-middleware/compare/v3.0.1...v3.0.2)
+- transpile also esm
+
+## [v3.0.1](https://github.com/i18next/i18next-http-middleware/compare/v3.0.0...v3.0.1)
+- introduce lookupHeaderRegex option
+
+## [v3.0.0](https://github.com/i18next/i18next-http-middleware/compare/v2.1.2...v3.0.0)
+- **BREAKING** needs i18next >= 19.5.0
+- let i18next figure out which detected lng is best match
+
+## [v2.1.2](https://github.com/i18next/i18next-http-middleware/compare/v2.1.1...v2.1.2)
+- fix: get whitelist from correct property
+
 ## [v2.1.1](https://github.com/i18next/i18next-http-middleware/compare/v2.1.0...v2.1.1)
 - extend httpFunctions getQuery to handle some edge cases
 

package/README.md

@@ -288,6 +288,7 @@ As with all modules you can either pass the constructor function (class) to the
   lookupQuerystring: 'lng',
   lookupCookie: 'i18next',
   lookupHeader: 'accept-language',
+  lookupHeaderRegex: /(([a-z]{2})-?([A-Z]{2})?)\s*;?\s*(q=([0-9.]+))?/gi,
   lookupSession: 'lng',
   lookupPath: 'lng',
   lookupFromPathIndex: 0,
@@ -300,17 +301,7 @@ As with all modules you can either pass the constructor function (class) to the
   cookieDomain: 'myDomain',
   cookiePath: '/my/path',
   cookieSecure: true, // if need secure cookie
-  cookieSameSite: 'strict', // 'strict', 'lax' or 'none'
-
-  // only detect languages that are in the whitelist
-  checkWhitelist: true,
-
-  // fallback to a similar whitelist language
-  // Example 1: Browser language is 'es'
-  // if 'es' is not found in whitelist, first fallback to any whitelist language that starts with 'es-', then fallback to fallbackLng ('es' -> 'es-*' -> fallbackLng)
-  // Example 2: Browser language is 'es-MX'
-  // if 'es-MX' is not found in whitelist, first fallback to 'es', then fallback to 'es-*', then fallback to fallbackLng ('es-MX' -> 'es' -> 'es-*' -> fallbackLng)
-  checkForSimilarInWhitelist: false
+  cookieSameSite: 'strict' // 'strict', 'lax' or 'none'
 }
 ```
 

package/cjs/LanguageDetector.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.default = void 0;
 
 var utils = _interopRequireWildcard(require("./utils.js"));
 
@@ -21,11 +21,11 @@ var _session = _interopRequireDefault(require("./languageLookups/session.js"));
 
 var _httpFunctions = require("./httpFunctions.js");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -35,26 +35,17 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 
 function getDefaults() {
   return (0, _httpFunctions.extendOptionsWithDefaults)({
-    order: [
-    /* 'path', 'session' */
-    'querystring', 'cookie', 'header'],
+    order: ['querystring', 'cookie', 'header'],
     lookupQuerystring: 'lng',
     lookupCookie: 'i18next',
     lookupSession: 'lng',
     lookupFromPathIndex: 0,
-    // cache user language
     caches: false,
-    // ['cookie']
-    // cookieExpirationDate: new Date(),
-    // cookieDomain: 'myDomain'
-    // cookiePath: '/my/path'
-    checkWhitelist: true,
-    checkForSimilarInWhitelist: false,
     cookieSameSite: 'strict'
   });
 }
 
-var LanguageDetector = /*#__PURE__*/function () {
+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] : {};
@@ -73,14 +64,12 @@ var LanguageDetector = /*#__PURE__*/function () {
       var allOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       this.services = services;
       this.options = utils.defaults(options, this.options || {}, getDefaults());
-      this.allOptions = allOptions; // if checking for similar, user needs to check whitelist
-
-      if (this.options.checkForSimilarInWhitelist) this.options.checkWhitelist = true;
-      this.addDetector(_cookie["default"]);
-      this.addDetector(_querystring["default"]);
-      this.addDetector(_path["default"]);
-      this.addDetector(_header["default"]);
-      this.addDetector(_session["default"]);
+      this.allOptions = allOptions;
+      this.addDetector(_cookie.default);
+      this.addDetector(_querystring.default);
+      this.addDetector(_path.default);
+      this.addDetector(_header.default);
+      this.addDetector(_session.default);
     }
   }, {
     key: "addDetector",
@@ -102,20 +91,13 @@ var LanguageDetector = /*#__PURE__*/function () {
 
         if (!detections) return;
         if (!Array.isArray(detections)) detections = [detections];
-        detections.forEach(function (lng) {
-          if (found || typeof lng !== 'string') return;
 
-          var cleanedLng = _this.services.languageUtils.formatLanguageCode(lng);
-
-          if (!_this.options.checkWhitelist || _this.services.languageUtils.isWhitelisted(cleanedLng)) {
-            found = cleanedLng;
-            req.i18nextLookupName = detectorName;
-          }
-
-          if (!found && _this.options.checkForSimilarInWhitelist) {
-            found = _this.getSimilarInWhitelist(cleanedLng);
-          }
-        });
+        if (_this.services.languageUtils.getBestMatchFromCodes) {
+          found = _this.services.languageUtils.getBestMatchFromCodes(detections);
+          if (found) req.i18nextLookupName = detectorName;
+        } else {
+          found = detections.length > 0 ? detections[0] : null;
+        }
       });
 
       if (!found) {
@@ -126,7 +108,7 @@ var LanguageDetector = /*#__PURE__*/function () {
         if (Object.prototype.toString.apply(fallbacks) === '[object Array]') {
           found = fallbacks[0];
         } else {
-          found = fallbacks[0] || fallbacks["default"] && fallbacks["default"][0];
+          found = fallbacks[0] || fallbacks.default && fallbacks.default[0];
         }
       }
 
@@ -149,30 +131,6 @@ var LanguageDetector = /*#__PURE__*/function () {
         }
       });
     }
-  }, {
-    key: "getSimilarInWhitelist",
-    value: function getSimilarInWhitelist(cleanedLng) {
-      var _this3 = this;
-
-      if (!this.i18nOptions.whitelist) return;
-
-      if (cleanedLng.includes('-')) {
-        // i.e. es-MX should check if es is in whitelist
-        var prefix = cleanedLng.split('-')[0];
-        var cleanedPrefix = this.services.languageUtils.formatLanguageCode(prefix);
-        if (this.services.languageUtils.isWhitelisted(cleanedPrefix)) return cleanedPrefix; // if reached here, nothing found. continue to search for similar using only prefix
-
-        cleanedLng = cleanedPrefix;
-      } // i.e. 'pt' should return 'pt-BR'. If multiple in whitelist with 'pt-', then use first one in whitelist
-
-
-      var similar = this.i18nOptions.whitelist.find(function (whitelistLng) {
-        var cleanedWhitelistLng = _this3.services.languageUtils.formatLanguageCode(whitelistLng);
-
-        if (cleanedWhitelistLng.startsWith(cleanedLng)) return cleanedWhitelistLng;
-      });
-      if (similar) return similar;
-    }
   }]);
 
   return LanguageDetector;
@@ -180,5 +138,5 @@ var LanguageDetector = /*#__PURE__*/function () {
 
 LanguageDetector.type = 'languageDetector';
 var _default = LanguageDetector;
-exports["default"] = _default;
+exports.default = _default;
 module.exports = exports.default;

package/cjs/httpFunctions.js

@@ -129,8 +129,7 @@ var setContentType = function setContentType(res, type) {
 exports.setContentType = setContentType;
 
 var setStatus = function setStatus(res, code) {
-  if (typeof res.status === 'function') return res.status(code); // eslint-disable-next-line no-return-assign
-
+  if (typeof res.status === 'function') return res.status(code);
   if (res.status) return res.status = code;
   console.log('no possibility found to set status');
 };

package/cjs/index.js

@@ -10,7 +10,7 @@ exports.plugin = plugin;
 exports.getResourcesHandler = getResourcesHandler;
 exports.missingKeyHandler = missingKeyHandler;
 exports.addRoute = addRoute;
-exports["default"] = exports.LanguageDetector = void 0;
+exports.default = exports.LanguageDetector = void 0;
 
 var utils = _interopRequireWildcard(require("./utils.js"));
 
@@ -18,13 +18,13 @@ var _LanguageDetector = _interopRequireDefault(require("./LanguageDetector.js"))
 
 var _httpFunctions = require("./httpFunctions.js");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var LanguageDetector = _LanguageDetector["default"];
+var LanguageDetector = _LanguageDetector.default;
 exports.LanguageDetector = LanguageDetector;
 
 var checkForCombinedReqRes = function checkForCombinedReqRes(req, res, next) {
@@ -72,7 +72,6 @@ function handle(i18next) {
       initImmediate: false
     });
     i18n.on('languageChanged', function (lng) {
-      // Keep language in sync
       req.language = req.locale = req.lng = lng;
 
       if (res.locals) {
@@ -91,16 +90,14 @@ function handle(i18next) {
       }
     });
     var lng = req.lng;
-    if (!lng && i18next.services.languageDetector) lng = i18next.services.languageDetector.detect(req, res); // set locale
-
+    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); // trigger sync to instance - might trigger async load!
-
+    req.languages = i18next.services.languageUtils.toResolveHierarchy(lng);
     i18n.changeLanguage(lng || i18next.options.fallbackLng[0]);
 
     if (req.i18nextLookupName === 'path' && options.removeLngFromUrl) {
@@ -108,10 +105,9 @@ function handle(i18next) {
     }
 
     var t = i18n.t.bind(i18n);
-    var exists = i18n.exists.bind(i18n); // assert for req
-
+    var exists = i18n.exists.bind(i18n);
     req.i18n = i18n;
-    req.t = t; // assert for res -> template
+    req.t = t;
 
     if (res.locals) {
       res.locals.t = t;
@@ -121,8 +117,7 @@ function handle(i18next) {
       res.locals.languageDir = i18next.dir(lng);
     }
 
-    if (i18next.services.languageDetector) i18next.services.languageDetector.cacheUserLanguage(req, res, lng); // load resources
-
+    if (i18next.services.languageDetector) i18next.services.languageDetector.cacheUserLanguage(req, res, lng);
     if (!req.lng) return next();
     i18next.loadLanguages(req.lng, function () {
       return next();
@@ -138,7 +133,7 @@ function plugin(instance, options, next) {
   return next();
 }
 
-plugin[Symbol["for"]('skip-override')] = true;
+plugin[Symbol.for('skip-override')] = true;
 
 function getResourcesHandler(i18next) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -166,8 +161,7 @@ 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(' ') : []; // extend ns
-
+    var namespaces = options.getQuery(req)[options.nsParam || 'ns'] ? options.getQuery(req)[options.nsParam || 'ns'].split(' ') : [];
     namespaces.forEach(function (ns) {
       if (i18next.options.ns && i18next.options.ns.indexOf(ns) < 0) i18next.options.ns.push(ns);
     });
@@ -228,8 +222,7 @@ function addRoute(i18next, route, lngs, app, verb, fc) {
   if (typeof verb === 'function') {
     fc = verb;
     verb = 'get';
-  } // Combine `fc` and possible more callbacks to one array
-
+  }
 
   var callbacks = [fc].concat(Array.prototype.slice.call(arguments, 6));
 
@@ -238,8 +231,7 @@ function addRoute(i18next, route, lngs, app, verb, fc) {
     var locRoute = [];
 
     for (var y = 0, ly = parts.length; y < ly; y++) {
-      var part = parts[y]; // if the route includes the parameter :lng
-      // this is replaced with the value of the language
+      var part = parts[y];
 
       if (part === ':lng') {
         locRoute.push(lngs[i]);
@@ -265,4 +257,4 @@ var _default = {
   addRoute: addRoute,
   LanguageDetector: LanguageDetector
 };
-exports["default"] = _default;
+exports.default = _default;

package/cjs/languageLookups/cookie.js

@@ -3,8 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
-// eslint-disable-next-line no-control-regex
+exports.default = void 0;
 var fieldContentRegExp = /^[\u0009\u0020-\u007e\u0080-\u00ff]+$/;
 
 var serializeCookie = function serializeCookie(name, val, options) {
@@ -117,5 +116,5 @@ var _default = {
     }
   }
 };
-exports["default"] = _default;
+exports.default = _default;
 module.exports = exports.default;

package/cjs/languageLookups/header.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.default = void 0;
+var specialCases = ['hans', 'hant', 'latn', 'cyrl', 'cans', 'mong', 'arab'];
 var _default = {
   name: 'header',
   lookup: function lookup(req, res, options) {
@@ -16,10 +17,19 @@ var _default = {
       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;
+
+        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;
+        }
+
         var lngs = [];
         var i;
         var m;
-        var rgx = /(([a-z]{2})-?([A-Z]{2})?)\s*;?\s*(q=([0-9.]+))?/gi;
+        var rgx = options.lookupHeaderRegex || lookupRegex;
 
         do {
           m = rgx.exec(acceptLanguage);
@@ -53,5 +63,5 @@ var _default = {
     return found;
   }
 };
-exports["default"] = _default;
+exports.default = _default;
 module.exports = exports.default;

package/cjs/languageLookups/path.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.default = void 0;
 var _default = {
   name: 'path',
   lookup: function lookup(req, res, options) {
@@ -22,7 +22,6 @@ var _default = {
       var parts = path.split('/');
 
       if (parts[0] === '') {
-        // Handle paths that start with a slash, i.e., '/foo' -> ['', 'foo']
         parts.shift();
       }
 
@@ -34,5 +33,5 @@ var _default = {
     return found;
   }
 };
-exports["default"] = _default;
+exports.default = _default;
 module.exports = exports.default;

package/cjs/languageLookups/querystring.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.default = void 0;
 var _default = {
   name: 'querystring',
   lookup: function lookup(req, res, options) {
@@ -39,5 +39,5 @@ var _default = {
     return found;
   }
 };
-exports["default"] = _default;
+exports.default = _default;
 module.exports = exports.default;

package/cjs/languageLookups/session.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.default = void 0;
 
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
@@ -26,5 +26,5 @@ var _default = {
     }
   }
 };
-exports["default"] = _default;
+exports.default = _default;
 module.exports = exports.default;

package/cjs/utils.js

@@ -59,8 +59,7 @@ function removeLngFromUrl(url, lookupFromPathIndex) {
   if (url[0] === '/') {
     pos++;
     first = '/';
-  } // Build new url
-
+  }
 
   var parts = url.split('/');
   parts.splice(pos, 1);

package/esm/LanguageDetector.js

@@ -0,0 +1,119 @@
+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); return Constructor; }
+
+import * as utils from './utils.js';
+import cookieLookup from './languageLookups/cookie.js';
+import querystringLookup from './languageLookups/querystring.js';
+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'],
+    lookupQuerystring: 'lng',
+    lookupCookie: 'i18next',
+    lookupSession: 'lng',
+    lookupFromPathIndex: 0,
+    caches: false,
+    cookieSameSite: 'strict'
+  });
+}
+
+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) {
+      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var allOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      this.services = services;
+      this.options = utils.defaults(options, this.options || {}, getDefaults());
+      this.allOptions = allOptions;
+      this.addDetector(cookieLookup);
+      this.addDetector(querystringLookup);
+      this.addDetector(pathLookup);
+      this.addDetector(headerLookup);
+      this.addDetector(sessionLookup);
+    }
+  }, {
+    key: "addDetector",
+    value: function addDetector(detector) {
+      this.detectors[detector.name] = detector;
+    }
+  }, {
+    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];
+
+        if (_this.services.languageUtils.getBestMatchFromCodes) {
+          found = _this.services.languageUtils.getBestMatchFromCodes(detections);
+          if (found) req.i18nextLookupName = detectorName;
+        } else {
+          found = detections.length > 0 ? detections[0] : null;
+        }
+      });
+
+      if (!found) {
+        var fallbacks = this.allOptions.fallbackLng;
+        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;
+    }
+  }, {
+    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;