i18next-http-middleware 2.1.1 → 3.0.2

package/lib/LanguageDetector.js

@@ -19,10 +19,6 @@ function getDefaults () {
     // cookieExpirationDate: new Date(),
     // cookieDomain: 'myDomain'
     // cookiePath: '/my/path'
-
-    checkWhitelist: true,
-    checkForSimilarInWhitelist: false,
-
     cookieSameSite: 'strict'
   })
 }
@@ -39,8 +35,6 @@ class LanguageDetector {
     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(cookieLookup)
     this.addDetector(querystringLookup)
@@ -65,18 +59,12 @@ class LanguageDetector {
       if (!detections) return
       if (!Array.isArray(detections)) detections = [detections]
 
-      detections.forEach((lng) => {
-        if (found || typeof lng !== 'string') return
-        const 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) { // new i18next v19.5.0
+        found = this.services.languageUtils.getBestMatchFromCodes(detections)
+        if (found) req.i18nextLookupName = detectorName
+      } else {
+        found = detections.length > 0 ? detections[0] : null // a little backward compatibility
+      }
     })
 
     if (!found) {
@@ -105,30 +93,6 @@ class LanguageDetector {
       }
     })
   }
-
-  getSimilarInWhitelist (cleanedLng) {
-    if (!this.i18nOptions.whitelist) return
-
-    if (cleanedLng.includes('-')) {
-      // i.e. es-MX should check if es is in whitelist
-      const prefix = cleanedLng.split('-')[0]
-
-      const 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
-    const similar = this.i18nOptions.whitelist.find((whitelistLng) => {
-      const cleanedWhitelistLng = this.services.languageUtils.formatLanguageCode(whitelistLng)
-      if (cleanedWhitelistLng.startsWith(cleanedLng)) return cleanedWhitelistLng
-    })
-
-    if (similar) return similar
-  }
 }
 
 LanguageDetector.type = 'languageDetector'

package/lib/languageLookups/header.js

@@ -1,3 +1,5 @@
+const specialCases = ['hans', 'hant', 'latn', 'cyrl', 'cans', 'mong', 'arab']
+
 export default {
   name: 'header',
 
@@ -12,8 +14,13 @@ 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
+        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
+        }
         const lngs = []; let i; let m
-        const rgx = /(([a-z]{2})-?([A-Z]{2})?)\s*;?\s*(q=([0-9.]+))?/gi
+        const rgx = options.lookupHeaderRegex || lookupRegex
 
         do {
           m = rgx.exec(acceptLanguage)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-http-middleware",
-  "version": "2.1.1",
+  "version": "3.0.2",
   "private": false,
   "type": "module",
   "main": "./cjs/index.js",
@@ -8,22 +8,25 @@
     "./package.json": "./package.json",
     ".": {
       "require": "./cjs/index.js",
-      "default": "./lib/index.js"
+      "default": "./esm/index.js"
     },
     "./cjs": {
       "default": "./cjs/index.js"
+    },
+    "./esm": {
+      "default": "./esm/index.js"
     }
   },
-  "module": "./lib/index.js",
+  "module": "./esm/index.js",
   "dependencies": {},
   "devDependencies": {
-    "@babel/cli": "7.10.1",
-    "@babel/core": "7.10.2",
-    "@babel/preset-env": "7.10.2",
+    "@babel/cli": "7.10.4",
+    "@babel/core": "7.10.4",
+    "@babel/preset-env": "7.10.4",
     "babel-plugin-add-module-exports": "1.0.2",
-    "eslint": "7.2.0",
+    "eslint": "7.3.1",
     "eslint-config-standard": "14.1.1",
-    "eslint-plugin-import": "2.21.2",
+    "eslint-plugin-import": "2.22.0",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-promise": "4.2.1",
     "eslint-plugin-require-path-exists": "1.1.9",
@@ -31,10 +34,10 @@
     "expect.js": "0.3.1",
     "express": "4.17.1",
     "fastify": "3.0.0-rc.1",
-    "i18next": "19.4.5",
-    "mocha": "7.2.0",
+    "i18next": "19.5.2",
+    "mocha": "8.0.1",
     "supertest": "4.0.2",
-    "uglify-js": "3.9.4"
+    "uglify-js": "3.10.0"
   },
   "description": "i18next-http-middleware is a middleware to be used with Node.js web frameworks like express or Fastify and also for Deno.",
   "keywords": [
@@ -59,7 +62,9 @@
   ],
   "scripts": {
     "lint": "eslint .",
-    "compile": "rm -rf cjs && mkdir cjs && babel lib -d cjs --presets=@babel/preset-env --plugins=add-module-exports && echo '{\"type\":\"commonjs\"}' > cjs/package.json",
+    "compile:esm": "rm -rf esm && mkdir esm && BABEL_ENV=esm babel lib -d esm",
+    "compile:cjs": "rm -rf cjs && mkdir cjs && BABEL_ENV=cjs babel lib -d cjs && echo '{\"type\":\"commonjs\"}' > cjs/package.json",
+    "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",
     "test:deno": "deno test test/deno/*.js --allow-net",