i18next-http-middleware 3.3.0 → 3.3.2

package/README.md

@@ -36,7 +36,8 @@ i18next.use(middleware.LanguageDetector).init({
 var app = express()
 app.use(
   middleware.handle(i18next, {
-    ignoreRoutes: ['/foo'] // or function(req, res, options, i18next) { /* return true to ignore */ }
+    ignoreRoutes: ['/foo'], // or function(req, res, options, i18next) { /* return true to ignore */ }
+    removeLngFromUrl: false // removes the language from the url when language detected in path
   })
 )
 
@@ -226,6 +227,11 @@ app.use('/locales', express.static('locales'))
 app.get('/locales/:lng/:ns', middleware.getResourcesHandler(i18next))
 // GET /locales/en/translation
 // loadPath for client: http://localhost:8080/locales/{{lng}}/{{ns}}
+
+app.get('/locales/:lng/:ns', middleware.getResourcesHandler(i18next, {
+  maxAge: 60 * 60 * 24 * 30, // adds appropriate cache header if cache option is passed or NODE_ENV === 'production', defaults to 30 days
+  cache: true // defaults to false
+}))
 ```
 
 ## add localized routes

package/cjs/LanguageDetector.js

@@ -1,6 +1,5 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -15,9 +14,12 @@ 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 _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 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 _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); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function getDefaults() {
   return (0, _httpFunctions.extendOptionsWithDefaults)({
     order: ['querystring', 'cookie', 'header'],
@@ -89,7 +91,6 @@ var LanguageDetector = function () {
           found = detections.length > 0 ? detections[0] : null;
         }
       });
-
       if (!found) {
         var fallbacks = this.allOptions.fallbackLng;
         if (typeof fallbacks === 'function') fallbacks = fallbacks();

package/cjs/httpFunctions.js

@@ -40,6 +40,7 @@ var getQuery = function getQuery(req) {
   if (req.searchParams) return req.searchParams;
   if (req.raw && req.raw.query) return req.raw.query;
   if (req.ctx && req.ctx.queryParams) return req.ctx.queryParams;
+  if (req.url && req.url.searchParams) return req.url.searchParams;
   var url = req.url || req.raw && req.raw.url;
   if (url && url.indexOf('?') < 0) return {};
   console.log('no possibility found to get query');

package/cjs/index.d.ts

@@ -0,0 +1,179 @@
+import {
+  Application,
+  Handler,
+  NextFunction,
+  Request,
+  RequestHandler,
+  Response,
+  Router,
+} from "express-serve-static-core";
+import * as i18next from "i18next";
+
+/// <reference types="express-serve-static-core" />
+
+type I18next = i18next.i18n;
+type App = Application | Router;
+
+type I18NextRequest = {
+  language: string;
+  languages: string[];
+  i18n: i18next.i18n;
+  t: i18next.TFunction;
+};
+
+declare global {
+  namespace Express {
+    interface Request extends I18NextRequest {}
+  }
+}
+
+declare module 'fastify' {
+  interface FastifyRequest extends I18NextRequest {}
+}
+
+interface ExtendedOptions extends Object {
+  getPath?: (req: Request) => string;
+  getOriginalUrl?: (req: Request) => string;
+  getUrl?: (req: Request) => string;
+  setUrl?: (req: Request, url: string) => void;
+  getParams?: (req: Request) => Object;
+  getSession?: (req: Request) => Object;
+  getQuery?: (req: Request) => Object;
+  getCookies?: (req: Request) => Object;
+  getBody?: (req: Request) => Object;
+  getHeaders?: (req: Request) => Object;
+  getHeader?: (res: Response, name: string) => Object;
+  setHeader?: (res: Response, name: string, value: string) => void;
+  setContentType?: (res: Response, type: string) => void;
+  setStatus?: (res: Response, code: number) => void;
+  send?: (res: Response, body: any) => void;
+}
+
+interface HandleOptions extends ExtendedOptions {
+  ignoreRoutes?: string[] | IgnoreRoutesFunction;
+  removeLngFromUrl?: boolean;
+}
+
+interface GetResourcesHandlerOptions extends ExtendedOptions {
+  maxAge?: number;
+  cache?: boolean;
+  lngParam?: string;
+  nsParam?: string;
+}
+
+interface MissingKeyHandlerOptions extends ExtendedOptions {
+  lngParam?: string;
+  nsParam?: string;
+}
+
+type IgnoreRoutesFunction = (
+  req: Request,
+  res: Response,
+  options: HandleOptions,
+  i18next: I18next
+) => boolean;
+
+export function handle(i18next: I18next, options?: HandleOptions): Handler;
+
+export function plugin(
+  instance: any,
+  options: HandleOptions & { i18next?: I18next },
+  next: NextFunction
+): Handler;
+
+export function getResourcesHandler(
+  i18next: I18next,
+  options?: GetResourcesHandlerOptions
+): Handler;
+
+export function missingKeyHandler(
+  i18next: I18next,
+  options?: MissingKeyHandlerOptions
+): Handler;
+
+export function addRoute(
+  i18next: I18next,
+  route: string,
+  lngs: string[],
+  app: App,
+  verb: string,
+  fc: RequestHandler
+): void;
+
+// LanguageDetector
+type LanguageDetectorServices = any;
+type LanguageDetectorOrder = string[];
+type LanguageDetectorCaches = boolean | string[];
+interface LanguageDetectorOptions {
+  order?: LanguageDetectorOrder;
+  lookupQuerystring?: string;
+  lookupCookie?: string;
+  lookupSession?: string;
+  lookupFromPathIndex?: number;
+  caches?: LanguageDetectorCaches;
+  cookieExpirationDate?: Date;
+  cookieDomain?: string;
+}
+interface LanguageDetectorAllOptions {
+  fallbackLng: boolean | string | string[];
+}
+interface LanguageDetectorInterfaceOptions {
+  [name: string]: any;
+}
+interface LanguageDetectorInterface {
+  name: string;
+
+  lookup: (
+    req: Request,
+    res: Response,
+    options?: LanguageDetectorInterfaceOptions
+  ) => string | string[] | undefined;
+
+  cacheUserLanguage?: (
+    req: Request,
+    res: Response,
+    lng: string,
+    options?: Object
+  ) => void;
+}
+
+export class LanguageDetector implements i18next.Module {
+  type: "languageDetector";
+
+  constructor(
+    services: LanguageDetectorServices,
+    options?: LanguageDetectorOptions,
+    allOptions?: LanguageDetectorAllOptions
+  );
+
+  constructor(
+    options?: LanguageDetectorOptions,
+    allOptions?: LanguageDetectorAllOptions
+  );
+
+  init(
+    services: LanguageDetectorServices,
+    options?: LanguageDetectorOptions,
+    allOptions?: LanguageDetectorAllOptions
+  ): void;
+
+  init(
+    options?: LanguageDetectorOptions,
+    allOptions?: LanguageDetectorAllOptions
+  ): void;
+
+  addDetector(detector: LanguageDetectorInterface): void;
+
+  detect(
+    req: Request,
+    res: Response,
+    detectionOrder: LanguageDetectorOrder
+  ): void;
+
+  cacheUserLanguage(
+    req: Request,
+    res: Response,
+    lng: string,
+    caches: LanguageDetectorCaches
+  ): void;
+}

package/cjs/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -18,9 +17,12 @@ 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 _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 var LanguageDetector = _LanguageDetector.default;
 exports.LanguageDetector = LanguageDetector;
 var checkForCombinedReqRes = function checkForCombinedReqRes(req, res, next) {
@@ -81,23 +83,19 @@ function handle(i18next) {
     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);
-
     i18n.changeLanguage(lng || i18next.options.fallbackLng[0]);
     if (req.i18nextLookupName === 'path' && options.removeLngFromUrl) {
       options.setUrl(req, utils.removeLngFromUrl(options.getUrl(req), i18next.services.languageDetector.options.lookupFromPathIndex));
     }
     var t = i18n.t.bind(i18n);
     var exists = i18n.exists.bind(i18n);
-
     req.i18n = i18n;
     req.t = t;
-
     if (options.attachLocals) res.locals = res.locals || {};
     if (res.locals) {
       res.locals.t = t;
@@ -160,15 +158,12 @@ function getResourcesHandler(i18next) {
       options.setHeader(res, 'Pragma', 'no-cache');
       options.setHeader(res, 'Cache-Control', 'no-cache');
     }
-
     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(' ') : [];
-
     if (languages.length === 0 && namespaces.length === 0) {
       languages = options.getParams(req)[options.lngParam || 'lng'] ? options.getParams(req)[options.lngParam || 'lng'].split(' ') : [];
       namespaces = options.getParams(req)[options.nsParam || 'ns'] ? options.getParams(req)[options.nsParam || 'ns'].split(' ') : [];
     }
-
     namespaces.forEach(function (ns) {
       if (i18next.options.ns && i18next.options.ns.indexOf(ns) < 0) {
         i18next.options.ns.push(ns);
@@ -222,7 +217,6 @@ function addRoute(i18next, route, lngs, app, verb, fc) {
     fc = verb;
     verb = 'get';
   }
-
   var callbacks = [fc].concat(Array.prototype.slice.call(arguments, 6));
   for (var i = 0, li = lngs.length; i < li; i++) {
     var parts = String(route).split('/');

package/cjs/utils.js

@@ -51,7 +51,6 @@ function removeLngFromUrl(url, lookupFromPathIndex) {
     pos++;
     first = '/';
   }
-
   var parts = url.split('/');
   parts.splice(pos, 1);
   url = parts.join('/');

package/esm/LanguageDetector.js

@@ -1,6 +1,9 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 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 _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); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import * as utils from './utils.js';
 import cookieLookup from './languageLookups/cookie.js';
 import querystringLookup from './languageLookups/querystring.js';
@@ -79,7 +82,6 @@ var LanguageDetector = function () {
           found = detections.length > 0 ? detections[0] : null;
         }
       });
-
       if (!found) {
         var fallbacks = this.allOptions.fallbackLng;
         if (typeof fallbacks === 'function') fallbacks = fallbacks();

package/esm/httpFunctions.js

@@ -30,6 +30,7 @@ export var getQuery = function getQuery(req) {
   if (req.searchParams) return req.searchParams;
   if (req.raw && req.raw.query) return req.raw.query;
   if (req.ctx && req.ctx.queryParams) return req.ctx.queryParams;
+  if (req.url && req.url.searchParams) return req.url.searchParams;
   var url = req.url || req.raw && req.raw.url;
   if (url && url.indexOf('?') < 0) return {};
   console.log('no possibility found to get query');

package/esm/index.d.ts

@@ -0,0 +1,179 @@
+import {
+  Application,
+  Handler,
+  NextFunction,
+  Request,
+  RequestHandler,
+  Response,
+  Router,
+} from "express-serve-static-core";
+import * as i18next from "i18next";
+
+/// <reference types="express-serve-static-core" />
+
+type I18next = i18next.i18n;
+type App = Application | Router;
+
+type I18NextRequest = {
+  language: string;
+  languages: string[];
+  i18n: i18next.i18n;
+  t: i18next.TFunction;
+};
+
+declare global {
+  namespace Express {
+    interface Request extends I18NextRequest {}
+  }
+}
+
+declare module 'fastify' {
+  interface FastifyRequest extends I18NextRequest {}
+}
+
+interface ExtendedOptions extends Object {
+  getPath?: (req: Request) => string;
+  getOriginalUrl?: (req: Request) => string;
+  getUrl?: (req: Request) => string;
+  setUrl?: (req: Request, url: string) => void;
+  getParams?: (req: Request) => Object;
+  getSession?: (req: Request) => Object;
+  getQuery?: (req: Request) => Object;
+  getCookies?: (req: Request) => Object;
+  getBody?: (req: Request) => Object;
+  getHeaders?: (req: Request) => Object;
+  getHeader?: (res: Response, name: string) => Object;
+  setHeader?: (res: Response, name: string, value: string) => void;
+  setContentType?: (res: Response, type: string) => void;
+  setStatus?: (res: Response, code: number) => void;
+  send?: (res: Response, body: any) => void;
+}
+
+interface HandleOptions extends ExtendedOptions {
+  ignoreRoutes?: string[] | IgnoreRoutesFunction;
+  removeLngFromUrl?: boolean;
+}
+
+interface GetResourcesHandlerOptions extends ExtendedOptions {
+  maxAge?: number;
+  cache?: boolean;
+  lngParam?: string;
+  nsParam?: string;
+}
+
+interface MissingKeyHandlerOptions extends ExtendedOptions {
+  lngParam?: string;
+  nsParam?: string;
+}
+
+type IgnoreRoutesFunction = (
+  req: Request,
+  res: Response,
+  options: HandleOptions,
+  i18next: I18next
+) => boolean;
+
+export function handle(i18next: I18next, options?: HandleOptions): Handler;
+
+export function plugin(
+  instance: any,
+  options: HandleOptions & { i18next?: I18next },
+  next: NextFunction
+): Handler;
+
+export function getResourcesHandler(
+  i18next: I18next,
+  options?: GetResourcesHandlerOptions
+): Handler;
+
+export function missingKeyHandler(
+  i18next: I18next,
+  options?: MissingKeyHandlerOptions
+): Handler;
+
+export function addRoute(
+  i18next: I18next,
+  route: string,
+  lngs: string[],
+  app: App,
+  verb: string,
+  fc: RequestHandler
+): void;
+
+// LanguageDetector
+type LanguageDetectorServices = any;
+type LanguageDetectorOrder = string[];
+type LanguageDetectorCaches = boolean | string[];
+interface LanguageDetectorOptions {
+  order?: LanguageDetectorOrder;
+  lookupQuerystring?: string;
+  lookupCookie?: string;
+  lookupSession?: string;
+  lookupFromPathIndex?: number;
+  caches?: LanguageDetectorCaches;
+  cookieExpirationDate?: Date;
+  cookieDomain?: string;
+}
+interface LanguageDetectorAllOptions {
+  fallbackLng: boolean | string | string[];
+}
+interface LanguageDetectorInterfaceOptions {
+  [name: string]: any;
+}
+interface LanguageDetectorInterface {
+  name: string;
+
+  lookup: (
+    req: Request,
+    res: Response,
+    options?: LanguageDetectorInterfaceOptions
+  ) => string | string[] | undefined;
+
+  cacheUserLanguage?: (
+    req: Request,
+    res: Response,
+    lng: string,
+    options?: Object
+  ) => void;
+}
+
+export class LanguageDetector implements i18next.Module {
+  type: "languageDetector";
+
+  constructor(
+    services: LanguageDetectorServices,
+    options?: LanguageDetectorOptions,
+    allOptions?: LanguageDetectorAllOptions
+  );
+
+  constructor(
+    options?: LanguageDetectorOptions,
+    allOptions?: LanguageDetectorAllOptions
+  );
+
+  init(
+    services: LanguageDetectorServices,
+    options?: LanguageDetectorOptions,
+    allOptions?: LanguageDetectorAllOptions
+  ): void;
+
+  init(
+    options?: LanguageDetectorOptions,
+    allOptions?: LanguageDetectorAllOptions
+  ): void;
+
+  addDetector(detector: LanguageDetectorInterface): void;
+
+  detect(
+    req: Request,
+    res: Response,
+    detectionOrder: LanguageDetectorOrder
+  ): void;
+
+  cacheUserLanguage(
+    req: Request,
+    res: Response,
+    lng: string,
+    caches: LanguageDetectorCaches
+  ): void;
+}

package/esm/index.js

@@ -1,6 +1,9 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import * as utils from './utils.js';
 import LD from './LanguageDetector.js';
 import { extendOptionsWithDefaults } from './httpFunctions.js';
@@ -63,23 +66,19 @@ export function handle(i18next) {
     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);
-
     i18n.changeLanguage(lng || i18next.options.fallbackLng[0]);
     if (req.i18nextLookupName === 'path' && options.removeLngFromUrl) {
       options.setUrl(req, utils.removeLngFromUrl(options.getUrl(req), i18next.services.languageDetector.options.lookupFromPathIndex));
     }
     var t = i18n.t.bind(i18n);
     var exists = i18n.exists.bind(i18n);
-
     req.i18n = i18n;
     req.t = t;
-
     if (options.attachLocals) res.locals = res.locals || {};
     if (res.locals) {
       res.locals.t = t;
@@ -141,15 +140,12 @@ export function getResourcesHandler(i18next) {
       options.setHeader(res, 'Pragma', 'no-cache');
       options.setHeader(res, 'Cache-Control', 'no-cache');
     }
-
     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(' ') : [];
-
     if (languages.length === 0 && namespaces.length === 0) {
       languages = options.getParams(req)[options.lngParam || 'lng'] ? options.getParams(req)[options.lngParam || 'lng'].split(' ') : [];
       namespaces = options.getParams(req)[options.nsParam || 'ns'] ? options.getParams(req)[options.nsParam || 'ns'].split(' ') : [];
     }
-
     namespaces.forEach(function (ns) {
       if (i18next.options.ns && i18next.options.ns.indexOf(ns) < 0) {
         i18next.options.ns.push(ns);
@@ -203,7 +199,6 @@ export function addRoute(i18next, route, lngs, app, verb, fc) {
     fc = verb;
     verb = 'get';
   }
-
   var callbacks = [fc].concat(Array.prototype.slice.call(arguments, 6));
   for (var i = 0, li = lngs.length; i < li; i++) {
     var parts = String(route).split('/');

package/esm/languageLookups/cookie.js

@@ -1,4 +1,3 @@
-
 var fieldContentRegExp = /^[\u0009\u0020-\u007e\u0080-\u00ff]+$/;
 var serializeCookie = function serializeCookie(name, val, options) {
   var opt = options || {};

package/esm/utils.js

@@ -42,7 +42,6 @@ export function removeLngFromUrl(url, lookupFromPathIndex) {
     pos++;
     first = '/';
   }
-
   var parts = url.split('/');
   parts.splice(pos, 1);
   url = parts.join('/');

package/lib/httpFunctions.js

@@ -35,6 +35,7 @@ export const getQuery = (req) => {
   if (req.searchParams) return req.searchParams
   if (req.raw && req.raw.query) return req.raw.query
   if (req.ctx && req.ctx.queryParams) return req.ctx.queryParams
+  if (req.url && req.url.searchParams) return req.url.searchParams
   const url = req.url || (req.raw && req.raw.url)
   if (url && url.indexOf('?') < 0) return {}
   console.log('no possibility found to get query')

package/licence

@@ -1,4 +1,4 @@
-Copyright (c) 2022 i18next
+Copyright (c) 2023 i18next
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-http-middleware",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "private": false,
   "type": "module",
   "main": "./cjs/index.js",
@@ -8,39 +8,47 @@
   "exports": {
     "./package.json": "./package.json",
     ".": {
+      "types": {
+        "require": "./cjs/index.d.ts",
+        "import": "./esm/index.d.ts"
+      },
+      "module": "./esm/index.js",
+      "import": "./esm/index.js",
       "require": "./cjs/index.js",
       "default": "./esm/index.js"
     },
     "./cjs": {
+      "types": "./cjs/index.d.ts",
       "default": "./cjs/index.js"
     },
     "./esm": {
+      "types": "./esm/index.d.ts",
       "default": "./esm/index.js"
     }
   },
   "module": "./esm/index.js",
   "dependencies": {},
   "devDependencies": {
-    "@babel/cli": "7.19.3",
-    "@babel/core": "7.19.6",
-    "@babel/preset-env": "7.19.4",
+    "@babel/cli": "7.21.5",
+    "@babel/core": "7.21.8",
+    "@babel/preset-env": "7.21.5",
     "@hapi/hapi": "^20.2.2",
-    "@types/express-serve-static-core": "^4.17.31",
+    "@types/express-serve-static-core": "^4.17.35",
     "babel-plugin-add-module-exports": "1.0.4",
-    "eslint": "8.26.0",
+    "eslint": "8.41.0",
     "eslint-config-standard": "17.0.0",
-    "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-n": "15.3.0",
+    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-n": "15.7.0",
     "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.9.2",
-    "i18next": "22.0.2",
-    "mocha": "10.1.0",
-    "supertest": "6.3.1",
-    "tsd": "0.24.1",
+    "fastify": "4.17.0",
+    "i18next": "22.5.0",
+    "mocha": "10.2.0",
+    "supertest": "6.3.3",
+    "tsd": "0.28.1",
     "uglify-js": "3.17.4"
   },
   "description": "i18next-http-middleware is a middleware to be used with Node.js web frameworks like express or Fastify and also for Deno.",
@@ -61,8 +69,8 @@
   "license": "MIT",
   "scripts": {
     "lint": "eslint .",
-    "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:esm": "rm -rf esm && mkdir esm && BABEL_ENV=esm babel lib -d esm && cp index.d.ts esm/index.d.ts",
+    "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",
     "test": "npm run lint && npm run build && mocha test -R spec --exit --experimental-modules && npm run test:types",