i18next-http-middleware 3.7.4 → 3.8.1

package/README.md

@@ -403,6 +403,7 @@ As with all modules you can either pass the constructor function (class) to the
   cookiePath: '/my/path',
   cookieSecure: true, // if need secure cookie
   cookieSameSite: 'strict', // 'strict', 'lax' or 'none'
+  cookieHttpOnly: true // prevent client-side script access to the cookie
 
   // optional conversion function used to modify the detected language code
   convertDetectedLanguage: 'Iso15897',

package/cjs/LanguageDetector.js

@@ -35,6 +35,13 @@ function getDefaults() {
     }
   });
 }
+function getFallbackLngs(fallbackLng) {
+  var fallbacks = fallbackLng;
+  if (typeof fallbacks === 'function') fallbacks = fallbacks();
+  if (typeof fallbacks === 'string') fallbacks = [fallbacks];
+  if (!fallbacks) fallbacks = [];
+  return fallbacks;
+}
 var LanguageDetector = function () {
   function LanguageDetector(services) {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -62,6 +69,7 @@ var LanguageDetector = function () {
       this.addDetector(_path.default);
       this.addDetector(_header.default);
       this.addDetector(_session.default);
+      this.fallbacks = getFallbackLngs(this.allOptions.fallbackLng);
     }
   }, {
     key: "addDetector",
@@ -89,11 +97,13 @@ var LanguageDetector = function () {
           found = _this.services.languageUtils.getBestMatchFromCodes(detections);
           if (found) {
             if (_this.options.ignoreCase) {
-              if (detections.map(function (d) {
+              if (detections.length === 0 || detections.map(function (d) {
+                return d.toLowerCase();
+              }).indexOf(found.toLowerCase()) < 0 && _this.fallbacks.map(function (d) {
                 return d.toLowerCase();
-              }).indexOf(found.toLowerCase()) < 0) found = undefined;
+              }).indexOf(found.toLowerCase()) > -1) found = undefined;
             } else {
-              if (detections.indexOf(found) < 0) found = undefined;
+              if (detections.length === 0 || detections.indexOf(found) < 0 && _this.fallbacks.indexOf(found) > -1) found = undefined;
             }
           }
           if (found) req.i18nextLookupName = detectorName;
@@ -102,10 +112,7 @@ var LanguageDetector = function () {
         }
       });
       if (!found) {
-        var fallbacks = this.allOptions.fallbackLng;
-        if (typeof fallbacks === 'function') fallbacks = fallbacks();
-        if (typeof fallbacks === 'string') fallbacks = [fallbacks];
-        if (!fallbacks) fallbacks = [];
+        var fallbacks = this.fallbacks;
         if (Object.prototype.toString.apply(fallbacks) === '[object Array]') {
           found = fallbacks[0];
         } else {

package/cjs/index.js

@@ -190,7 +190,7 @@ function getResourcesHandler(i18next) {
     }
     var resources = {};
     options.setContentType(res, 'application/json');
-    if (options.cache !== undefined ? options.cache : typeof process !== 'undefined' && process.env && process.env.NODE_ENV === 'production') {
+    if (options.cache !== undefined ? options.cache : typeof process !== 'undefined' && typeof process.env !== '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());
     } else {

package/cjs/languageLookups/cookie.js

@@ -69,6 +69,7 @@ var _default = exports.default = {
   cacheUserLanguage: function cacheUserLanguage(req, res, lng) {
     var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
     if (options.lookupCookie && req !== 'undefined') {
+      var _options$cookieHttpOn;
       var expirationDate = options.cookieExpirationDate;
       if (!expirationDate) {
         expirationDate = new Date();
@@ -78,7 +79,7 @@ var _default = exports.default = {
         expires: expirationDate,
         domain: options.cookieDomain,
         path: options.cookiePath,
-        httpOnly: false,
+        httpOnly: (_options$cookieHttpOn = options.cookieHttpOnly) !== null && _options$cookieHttpOn !== void 0 ? _options$cookieHttpOn : false,
         overwrite: true,
         sameSite: options.cookieSameSite
       };

package/esm/LanguageDetector.js

@@ -26,6 +26,13 @@ function getDefaults() {
     }
   });
 }
+function getFallbackLngs(fallbackLng) {
+  var fallbacks = fallbackLng;
+  if (typeof fallbacks === 'function') fallbacks = fallbacks();
+  if (typeof fallbacks === 'string') fallbacks = [fallbacks];
+  if (!fallbacks) fallbacks = [];
+  return fallbacks;
+}
 var LanguageDetector = function () {
   function LanguageDetector(services) {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -53,6 +60,7 @@ var LanguageDetector = function () {
       this.addDetector(pathLookup);
       this.addDetector(headerLookup);
       this.addDetector(sessionLookup);
+      this.fallbacks = getFallbackLngs(this.allOptions.fallbackLng);
     }
   }, {
     key: "addDetector",
@@ -80,11 +88,13 @@ var LanguageDetector = function () {
           found = _this.services.languageUtils.getBestMatchFromCodes(detections);
           if (found) {
             if (_this.options.ignoreCase) {
-              if (detections.map(function (d) {
+              if (detections.length === 0 || detections.map(function (d) {
+                return d.toLowerCase();
+              }).indexOf(found.toLowerCase()) < 0 && _this.fallbacks.map(function (d) {
                 return d.toLowerCase();
-              }).indexOf(found.toLowerCase()) < 0) found = undefined;
+              }).indexOf(found.toLowerCase()) > -1) found = undefined;
             } else {
-              if (detections.indexOf(found) < 0) found = undefined;
+              if (detections.length === 0 || detections.indexOf(found) < 0 && _this.fallbacks.indexOf(found) > -1) found = undefined;
             }
           }
           if (found) req.i18nextLookupName = detectorName;
@@ -93,10 +103,7 @@ var LanguageDetector = function () {
         }
       });
       if (!found) {
-        var fallbacks = this.allOptions.fallbackLng;
-        if (typeof fallbacks === 'function') fallbacks = fallbacks();
-        if (typeof fallbacks === 'string') fallbacks = [fallbacks];
-        if (!fallbacks) fallbacks = [];
+        var fallbacks = this.fallbacks;
         if (Object.prototype.toString.apply(fallbacks) === '[object Array]') {
           found = fallbacks[0];
         } else {

package/esm/index.js

@@ -173,7 +173,7 @@ export function getResourcesHandler(i18next) {
     }
     var resources = {};
     options.setContentType(res, 'application/json');
-    if (options.cache !== undefined ? options.cache : typeof process !== 'undefined' && process.env && process.env.NODE_ENV === 'production') {
+    if (options.cache !== undefined ? options.cache : typeof process !== 'undefined' && typeof process.env !== '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());
     } else {

package/esm/languageLookups/cookie.js

@@ -63,6 +63,7 @@ export default {
   cacheUserLanguage: function cacheUserLanguage(req, res, lng) {
     var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
     if (options.lookupCookie && req !== 'undefined') {
+      var _options$cookieHttpOn;
       var expirationDate = options.cookieExpirationDate;
       if (!expirationDate) {
         expirationDate = new Date();
@@ -72,7 +73,7 @@ export default {
         expires: expirationDate,
         domain: options.cookieDomain,
         path: options.cookiePath,
-        httpOnly: false,
+        httpOnly: (_options$cookieHttpOn = options.cookieHttpOnly) !== null && _options$cookieHttpOn !== void 0 ? _options$cookieHttpOn : false,
         overwrite: true,
         sameSite: options.cookieSameSite
       };

package/lib/LanguageDetector.js

@@ -26,6 +26,14 @@ function getDefaults () {
   })
 }
 
+function getFallbackLngs (fallbackLng) {
+  let fallbacks = fallbackLng
+  if (typeof fallbacks === 'function') fallbacks = fallbacks()
+  if (typeof fallbacks === 'string') fallbacks = [fallbacks]
+  if (!fallbacks) fallbacks = []
+  return fallbacks
+}
+
 class LanguageDetector {
   constructor (services, options = {}, allOptions = {}) {
     this.type = 'languageDetector'
@@ -48,6 +56,8 @@ class LanguageDetector {
     this.addDetector(pathLookup)
     this.addDetector(headerLookup)
     this.addDetector(sessionLookup)
+
+    this.fallbacks = getFallbackLngs(this.allOptions.fallbackLng)
   }
 
   addDetector (detector) {
@@ -74,9 +84,9 @@ class LanguageDetector {
         found = this.services.languageUtils.getBestMatchFromCodes(detections)
         if (found) {
           if (this.options.ignoreCase) {
-            if (detections.map(d => d.toLowerCase()).indexOf(found.toLowerCase()) < 0) found = undefined
+            if (detections.length === 0 || (detections.map(d => d.toLowerCase()).indexOf(found.toLowerCase()) < 0 && this.fallbacks.map(d => d.toLowerCase()).indexOf(found.toLowerCase()) > -1)) found = undefined
           } else {
-            if (detections.indexOf(found) < 0) found = undefined
+            if (detections.length === 0 || (detections.indexOf(found) < 0 && this.fallbacks.indexOf(found) > -1)) found = undefined
           }
         }
         if (found) req.i18nextLookupName = detectorName
@@ -86,10 +96,7 @@ class LanguageDetector {
     })
 
     if (!found) {
-      let fallbacks = this.allOptions.fallbackLng
-      if (typeof fallbacks === 'function') fallbacks = fallbacks()
-      if (typeof fallbacks === 'string') fallbacks = [fallbacks]
-      if (!fallbacks) fallbacks = []
+      const fallbacks = this.fallbacks
       if (Object.prototype.toString.apply(fallbacks) === '[object Array]') {
         found = fallbacks[0]
       } else {

package/lib/index.js

@@ -180,6 +180,7 @@ export function getResourcesHandler (i18next, options = {}) {
       options.cache !== undefined
         ? options.cache
         : typeof process !== 'undefined' &&
+          typeof process.env !== 'undefined' &&
           process.env &&
           process.env.NODE_ENV === 'production'
     ) {

package/lib/languageLookups/cookie.js

@@ -79,7 +79,7 @@ export default {
         expires: expirationDate,
         domain: options.cookieDomain,
         path: options.cookiePath,
-        httpOnly: false,
+        httpOnly: options.cookieHttpOnly ?? false,
         overwrite: true,
         sameSite: options.cookieSameSite
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-http-middleware",
-  "version": "3.7.4",
+  "version": "3.8.1",
   "private": false,
   "type": "module",
   "main": "./cjs/index.js",
@@ -45,8 +45,8 @@
     "eslint-plugin-standard": "5.0.0",
     "expect.js": "0.3.1",
     "express": "4.21.1",
-    "fastify": "5.1.0",
-    "i18next": "24.0.0",
+    "fastify": "5.3.2",
+    "i18next": "25.5.2",
     "mocha": "10.8.2",
     "supertest": "7.0.0",
     "tsd": "0.31.2",
@@ -75,7 +75,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 && npm run test:types",
-    "test:deno": "deno test --allow-net test/deno/*.js",
+    "test:deno": "deno test --allow-net --allow-env test/deno/*.js",
     "test:types": "tsd",
     "preversion": "npm run test && npm run build && git push",
     "postversion": "git push && git push --tags"