i18next-http-middleware 3.10.0 → 3.10.1

package/cjs/index.js

@@ -132,7 +132,7 @@ function handle(i18next) {
       i18next.services.languageDetector.cacheUserLanguage(req, res, lng);
     }
     if (!req.lng) return next();
-    i18next.loadLanguages(req.lng, function () {
+    i18n.loadLanguages(req.lng, function () {
       return next();
     });
   };
@@ -253,17 +253,16 @@ function getResourcesHandler(i18next) {
     }
     languages = languages.filter(utils.isSafeLangIdentifier);
     namespaces = namespaces.filter(utils.isSafeNsIdentifier);
-    namespaces.forEach(function (ns) {
-      if (i18next.options.ns && i18next.options.ns.indexOf(ns) < 0) {
-        i18next.options.ns.push(ns);
-      }
-    });
     var loaded = false;
     var onLoaded;
     i18next.services.backendConnector.load(languages, namespaces, function () {
       languages.forEach(function (lng) {
         namespaces.forEach(function (ns) {
-          utils.setPath(resources, [lng, ns], i18next.getResourceBundle(lng, ns));
+          var bundle = i18next.getResourceBundle(lng, ns);
+          if (bundle && i18next.options.ns && i18next.options.ns.indexOf(ns) < 0) {
+            i18next.options.ns.push(ns);
+          }
+          utils.setPath(resources, [lng, ns], bundle);
         });
       });
       loaded = true;

package/esm/index.js

@@ -115,7 +115,7 @@ export function handle(i18next) {
       i18next.services.languageDetector.cacheUserLanguage(req, res, lng);
     }
     if (!req.lng) return next();
-    i18next.loadLanguages(req.lng, function () {
+    i18n.loadLanguages(req.lng, function () {
       return next();
     });
   };
@@ -236,17 +236,16 @@ export function getResourcesHandler(i18next) {
     }
     languages = languages.filter(utils.isSafeLangIdentifier);
     namespaces = namespaces.filter(utils.isSafeNsIdentifier);
-    namespaces.forEach(function (ns) {
-      if (i18next.options.ns && i18next.options.ns.indexOf(ns) < 0) {
-        i18next.options.ns.push(ns);
-      }
-    });
     var loaded = false;
     var onLoaded;
     i18next.services.backendConnector.load(languages, namespaces, function () {
       languages.forEach(function (lng) {
         namespaces.forEach(function (ns) {
-          utils.setPath(resources, [lng, ns], i18next.getResourceBundle(lng, ns));
+          var bundle = i18next.getResourceBundle(lng, ns);
+          if (bundle && i18next.options.ns && i18next.options.ns.indexOf(ns) < 0) {
+            i18next.options.ns.push(ns);
+          }
+          utils.setPath(resources, [lng, ns], bundle);
         });
       });
       loaded = true;

package/lib/index.js

@@ -127,9 +127,11 @@ export function handle (i18next, options = {}) {
     if (i18next.services.languageDetector) {
       i18next.services.languageDetector.cacheUserLanguage(req, res, lng)
     }
-    // load resources
+    // load resources: through the request's clone, as loadLanguages() adds
+    // the language to options.preload, and every request on the shared
+    // instance pays for the length of that list until the process restarts
     if (!req.lng) return next()
-    i18next.loadLanguages(req.lng, () => next())
+    i18n.loadLanguages(req.lng, () => next())
   }
 }
 
@@ -265,23 +267,19 @@ export function getResourcesHandler (i18next, options = {}) {
     languages = languages.filter(utils.isSafeLangIdentifier)
     namespaces = namespaces.filter(utils.isSafeNsIdentifier)
 
-    // extend ns
-    namespaces.forEach(ns => {
-      if (i18next.options.ns && i18next.options.ns.indexOf(ns) < 0) {
-        i18next.options.ns.push(ns)
-      }
-    })
-
     let loaded = false
     let onLoaded
     i18next.services.backendConnector.load(languages, namespaces, function () {
       languages.forEach(lng => {
         namespaces.forEach(ns => {
-          utils.setPath(
-            resources,
-            [lng, ns],
-            i18next.getResourceBundle(lng, ns)
-          )
+          const bundle = i18next.getResourceBundle(lng, ns)
+          // extend ns only with a namespace the backend has: every request
+          // pays for the length of this shared list, and a made-up ns from
+          // the request would stay in it until the process restarts
+          if (bundle && i18next.options.ns && i18next.options.ns.indexOf(ns) < 0) {
+            i18next.options.ns.push(ns)
+          }
+          utils.setPath(resources, [lng, ns], bundle)
         })
       })
       loaded = true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-http-middleware",
-  "version": "3.10.0",
+  "version": "3.10.1",
   "private": false,
   "type": "module",
   "main": "./cjs/index.js",