i18next-http-middleware 3.4.1 → 3.6.0

package/README.md

@@ -398,7 +398,11 @@ 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'
+  cookieSameSite: 'strict', // 'strict', 'lax' or 'none'
+
+  // optional conversion function used to modify the detected language code
+  convertDetectedLanguage: 'Iso15897',
+  convertDetectedLanguage: (lng) => lng.replace('-', '_')
 }
 ```
 

package/cjs/LanguageDetector.js

@@ -12,8 +12,8 @@ var _header = _interopRequireDefault(require("./languageLookups/header.js"));
 var _session = _interopRequireDefault(require("./languageLookups/session.js"));
 var _httpFunctions = require("./httpFunctions.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && 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 _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 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, _toPropertyKey(descriptor.key), descriptor); } }
@@ -29,7 +29,10 @@ function getDefaults() {
     lookupFromPathIndex: 0,
     caches: false,
     cookieSameSite: 'strict',
-    ignoreCase: true
+    ignoreCase: true,
+    convertDetectedLanguage: function convertDetectedLanguage(l) {
+      return l;
+    }
   });
 }
 var LanguageDetector = function () {
@@ -49,6 +52,11 @@ var LanguageDetector = function () {
       this.services = services;
       this.options = utils.defaults(options, this.options || {}, getDefaults());
       this.allOptions = allOptions;
+      if (typeof this.options.convertDetectedLanguage === 'string' && this.options.convertDetectedLanguage.indexOf('15897') > -1) {
+        this.options.convertDetectedLanguage = function (l) {
+          return l.replace('-', '_');
+        };
+      }
       this.addDetector(_cookie.default);
       this.addDetector(_querystring.default);
       this.addDetector(_path.default);
@@ -75,6 +83,9 @@ var LanguageDetector = function () {
         detections = detections.filter(function (d) {
           return d !== undefined && d !== null;
         });
+        detections = detections.map(function (d) {
+          return _this.options.convertDetectedLanguage(d);
+        });
         if (_this.services.languageUtils.getBestMatchFromCodes) {
           found = _this.services.languageUtils.getBestMatchFromCodes(detections);
           if (found) {

package/cjs/index.d.ts

@@ -115,6 +115,11 @@ interface LanguageDetectorOptions {
   caches?: LanguageDetectorCaches;
   cookieExpirationDate?: Date;
   cookieDomain?: string;
+
+  /**
+   * optional conversion function to use to modify the detected language code
+   */
+  convertDetectedLanguage?: 'Iso15897' | ((lng: string) => string);
 }
 interface LanguageDetectorAllOptions {
   fallbackLng: boolean | string | string[];

package/cjs/index.js

@@ -17,8 +17,8 @@ var utils = _interopRequireWildcard(require("./utils.js"));
 var _LanguageDetector = _interopRequireDefault(require("./LanguageDetector.js"));
 var _httpFunctions = require("./httpFunctions.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && 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 _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }

package/esm/LanguageDetector.js

@@ -20,7 +20,10 @@ function getDefaults() {
     lookupFromPathIndex: 0,
     caches: false,
     cookieSameSite: 'strict',
-    ignoreCase: true
+    ignoreCase: true,
+    convertDetectedLanguage: function convertDetectedLanguage(l) {
+      return l;
+    }
   });
 }
 var LanguageDetector = function () {
@@ -40,6 +43,11 @@ var LanguageDetector = function () {
       this.services = services;
       this.options = utils.defaults(options, this.options || {}, getDefaults());
       this.allOptions = allOptions;
+      if (typeof this.options.convertDetectedLanguage === 'string' && this.options.convertDetectedLanguage.indexOf('15897') > -1) {
+        this.options.convertDetectedLanguage = function (l) {
+          return l.replace('-', '_');
+        };
+      }
       this.addDetector(cookieLookup);
       this.addDetector(querystringLookup);
       this.addDetector(pathLookup);
@@ -66,6 +74,9 @@ var LanguageDetector = function () {
         detections = detections.filter(function (d) {
           return d !== undefined && d !== null;
         });
+        detections = detections.map(function (d) {
+          return _this.options.convertDetectedLanguage(d);
+        });
         if (_this.services.languageUtils.getBestMatchFromCodes) {
           found = _this.services.languageUtils.getBestMatchFromCodes(detections);
           if (found) {

package/esm/index.d.mts

@@ -0,0 +1 @@
+export * from './index.js';

package/esm/index.d.ts

@@ -115,6 +115,11 @@ interface LanguageDetectorOptions {
   caches?: LanguageDetectorCaches;
   cookieExpirationDate?: Date;
   cookieDomain?: string;
+
+  /**
+   * optional conversion function to use to modify the detected language code
+   */
+  convertDetectedLanguage?: 'Iso15897' | ((lng: string) => string);
 }
 interface LanguageDetectorAllOptions {
   fallbackLng: boolean | string | string[];

package/index.d.mts

@@ -0,0 +1 @@
+export * from './index.js';

package/index.d.ts

@@ -115,6 +115,11 @@ interface LanguageDetectorOptions {
   caches?: LanguageDetectorCaches;
   cookieExpirationDate?: Date;
   cookieDomain?: string;
+
+  /**
+   * optional conversion function to use to modify the detected language code
+   */
+  convertDetectedLanguage?: 'Iso15897' | ((lng: string) => string);
 }
 interface LanguageDetectorAllOptions {
   fallbackLng: boolean | string | string[];

package/lib/LanguageDetector.js

@@ -20,7 +20,9 @@ function getDefaults () {
     // cookieDomain: 'myDomain'
     // cookiePath: '/my/path'
     cookieSameSite: 'strict',
-    ignoreCase: true
+    ignoreCase: true,
+
+    convertDetectedLanguage: (l) => l
   })
 }
 
@@ -37,6 +39,10 @@ class LanguageDetector {
     this.options = utils.defaults(options, this.options || {}, getDefaults())
     this.allOptions = allOptions
 
+    if (typeof this.options.convertDetectedLanguage === 'string' && this.options.convertDetectedLanguage.indexOf('15897') > -1) {
+      this.options.convertDetectedLanguage = (l) => l.replace('-', '_')
+    }
+
     this.addDetector(cookieLookup)
     this.addDetector(querystringLookup)
     this.addDetector(pathLookup)
@@ -61,6 +67,7 @@ class LanguageDetector {
       if (!Array.isArray(detections)) detections = [detections]
 
       detections = detections.filter((d) => d !== undefined && d !== null)
+      detections = detections.map((d) => this.options.convertDetectedLanguage(d))
 
       if (this.services.languageUtils.getBestMatchFromCodes) { // new i18next v19.5.0
         found = this.services.languageUtils.getBestMatchFromCodes(detections)

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "i18next-http-middleware",
-  "version": "3.4.1",
+  "version": "3.6.0",
   "private": false,
   "type": "module",
   "main": "./cjs/index.js",
-  "types": "./index.d.ts",
+  "types": "./index.d.mts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
       "types": {
         "require": "./cjs/index.d.ts",
-        "import": "./esm/index.d.ts"
+        "import": "./esm/index.d.mts"
       },
       "module": "./esm/index.js",
       "import": "./esm/index.js",
@@ -22,31 +22,31 @@
       "default": "./cjs/index.js"
     },
     "./esm": {
-      "types": "./esm/index.d.ts",
+      "types": "./esm/index.d.mts",
       "default": "./esm/index.js"
     }
   },
   "module": "./esm/index.js",
   "devDependencies": {
     "@babel/cli": "7.23.0",
-    "@babel/core": "7.23.0",
-    "@babel/preset-env": "7.22.20",
+    "@babel/core": "7.23.3",
+    "@babel/preset-env": "7.23.3",
     "@hapi/hapi": "^21.3.2",
-    "@types/express-serve-static-core": "^4.17.37",
-    "@koa/router": "12.0.0",
+    "@types/express-serve-static-core": "^4.17.41",
+    "@koa/router": "12.0.1",
     "koa": "2.14.2",
     "babel-plugin-add-module-exports": "1.0.4",
-    "eslint": "8.50.0",
+    "eslint": "8.53.0",
     "eslint-config-standard": "17.1.0",
-    "eslint-plugin-import": "2.28.1",
-    "eslint-plugin-n": "16.1.0",
+    "eslint-plugin-import": "2.29.0",
+    "eslint-plugin-n": "16.3.1",
     "eslint-plugin-promise": "6.1.1",
     "eslint-plugin-require-path-exists": "1.1.9",
     "eslint-plugin-standard": "5.0.0",
     "expect.js": "0.3.1",
-    "express": "4.18.2",
-    "fastify": "4.23.2",
-    "i18next": "23.5.1",
+    "express": "4.19.2",
+    "fastify": "4.24.3",
+    "i18next": "23.7.1",
     "mocha": "10.2.0",
     "supertest": "6.3.3",
     "tsd": "0.29.0",
@@ -70,7 +70,7 @@
   "license": "MIT",
   "scripts": {
     "lint": "eslint .",
-    "compile:esm": "rm -rf esm && mkdir esm && BABEL_ENV=esm babel lib -d esm && cp index.d.ts esm/index.d.ts",
+    "compile:esm": "rm -rf esm && mkdir esm && BABEL_ENV=esm babel lib -d esm && cp index.d.ts esm/index.d.ts && cp index.d.mts esm/index.d.mts",
     "compile:cjs": "rm -rf cjs && mkdir cjs && BABEL_ENV=cjs babel lib -d cjs && cp index.d.ts cjs/index.d.ts && echo '{\"type\":\"commonjs\"}' > cjs/package.json",
     "compile": "npm run compile:esm && npm run compile:cjs",
     "build": "npm run compile",