i18next-http-middleware 3.8.2 → 3.9.1

package/README.md

@@ -238,6 +238,35 @@ app.get('/', async (req) => {
 await app.listen({ port })
 ```
 
+#### Fresh 2.x
+
+```js
+import i18next from 'https://deno.land/x/i18next/index.js'
+import i18nextMiddleware from 'https://deno.land/x/i18next_http_middleware/index.js'
+import { App, createDefine } from "jsr:@fresh/core";
+
+i18next
+  .use(i18nextMiddleware.LanguageDetector)
+  .init({
+    preload: ["en", "fr"],
+    fallbackLng: "en",
+    resources: {
+      en: {
+        translation: { hi: "hello" }
+      },
+      fr: {
+        translation: { hi: "bonjour" }
+      }
+    }
+  });
+
+const app = new App()
+  .use(i18nextMiddleware.freshPlugin(i18next))
+  .get("/", (ctx) => {
+    return new Response(ctx.state.t('hi'))
+  });
+```
+
 ## add routes
 
 ```js

package/cjs/httpFunctions.js

@@ -39,6 +39,11 @@ var getQuery = exports.getQuery = function getQuery(req) {
   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 {};
+  if (typeof URL !== 'undefined') {
+    try {
+      return Object.fromEntries(new URL(url).searchParams.entries());
+    } catch (_unused) {}
+  }
   console.log('no possibility found to get query');
   return {};
 };
@@ -50,8 +55,14 @@ var getParams = exports.getParams = function getParams(req) {
   return {};
 };
 var getHeaders = exports.getHeaders = function getHeaders(req) {
-  if (req.headers) return req.headers;
-  console.log('no possibility found to get headers');
+  if (!req.headers) {
+    console.log('no possibility found to get headers');
+    return;
+  }
+  if (typeof Headers !== 'undefined' && req.headers.constructor === Headers) {
+    return Object.fromEntries(req.headers.entries());
+  }
+  return req.headers;
 };
 var getCookies = exports.getCookies = function getCookies(req) {
   if (req.cookies) return req.cookies;
@@ -113,6 +124,12 @@ var setStatus = exports.setStatus = function setStatus(res, code) {
 var send = exports.send = function send(res, body) {
   if (typeof res.send === 'function') return res.send(body);
   if (res.request && res.response && res.app) res.body = body;
+  if (typeof Response !== 'undefined' && res.constructor === Response) {
+    return new Response(body, {
+      status: res.status,
+      headers: res.headers
+    });
+  }
   return body;
 };
 var getSession = exports.getSession = function getSession(req) {

package/cjs/index.d.ts

@@ -76,6 +76,8 @@ export function handle(i18next: I18next, options?: HandleOptions): Handler;
 
 export function koaPlugin(i18next: I18next, options?: HandleOptions): (context: unknown, next: Function) => any;
 
+export function freshPlugin(i18next:I18next, options?: HandleOptions): Promise<any>;
+
 export function plugin(
   instance: any,
   options: HandleOptions & { i18next?: I18next },

package/cjs/index.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.LanguageDetector = void 0;
 exports.addRoute = addRoute;
 exports.default = void 0;
+exports.freshPlugin = freshPlugin;
 exports.getResourcesHandler = getResourcesHandler;
 exports.handle = handle;
 exports.hapiPlugin = void 0;
@@ -38,6 +39,15 @@ var checkForCombinedReqRes = function checkForCombinedReqRes(req, res, next) {
     } else if (req.respond) {
       res = req;
       if (!next) next = function next() {};
+    } else if (typeof Request !== 'undefined' && typeof Response !== 'undefined' && req.req && req.req.constructor === Request) {
+      if (req.state) {
+        req.state.res = req.state.res || new Response();
+        res = req.state.res;
+      } else {
+        res = new Response();
+      }
+      req = req.req;
+      if (!next) next = function next() {};
     }
   } else if (!next && typeof res === 'function' && req.req && req.res) {
     return {
@@ -161,6 +171,41 @@ function koaPlugin(i18next, options) {
     return koaMiddleware;
   }();
 }
+function freshPlugin(i18next, options) {
+  return function () {
+    var _ref = _asyncToGenerator(_regeneratorRuntime().mark(function _callee2(ctx) {
+      var placeholder, resp;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            handle(i18next, _objectSpread(_objectSpread({}, options), {}, {
+              attachLocals: true
+            }))(ctx);
+            ctx.state.t = ctx.req.t;
+            ctx.state.i18n = ctx.req.i18n;
+            ctx.state.lng = ctx.req.lng;
+            ctx.state.locale = ctx.req.locale;
+            ctx.state.language = ctx.req.language;
+            ctx.state.languages = ctx.req.languages;
+            placeholder = ctx.state.res;
+            delete ctx.state.res;
+            _context2.next = 11;
+            return ctx.next();
+          case 11:
+            resp = _context2.sent;
+            resp.headers.set('Content-Language', placeholder.headers.get('Content-Language'));
+            return _context2.abrupt("return", resp);
+          case 14:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function (_x3) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+}
 var hapiPlugin = exports.hapiPlugin = {
   name: 'i18next-http-middleware',
   version: '1',
@@ -215,6 +260,9 @@ function getResourcesHandler(i18next) {
         });
       });
     });
+    if (typeof Response !== 'undefined' && res.constructor === Response && typeof JSON !== 'undefined') {
+      return options.send(res, JSON.stringify(resources));
+    }
     return options.send(res, resources);
   };
 }
@@ -280,6 +328,7 @@ var _default = exports.default = {
   plugin: plugin,
   hapiPlugin: hapiPlugin,
   koaPlugin: koaPlugin,
+  freshPlugin: freshPlugin,
   handle: handle,
   getResourcesHandler: getResourcesHandler,
   missingKeyHandler: missingKeyHandler,

package/esm/httpFunctions.js

@@ -33,6 +33,11 @@ export var getQuery = function getQuery(req) {
   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 {};
+  if (typeof URL !== 'undefined') {
+    try {
+      return Object.fromEntries(new URL(url).searchParams.entries());
+    } catch (_unused) {}
+  }
   console.log('no possibility found to get query');
   return {};
 };
@@ -44,8 +49,14 @@ export var getParams = function getParams(req) {
   return {};
 };
 export var getHeaders = function getHeaders(req) {
-  if (req.headers) return req.headers;
-  console.log('no possibility found to get headers');
+  if (!req.headers) {
+    console.log('no possibility found to get headers');
+    return;
+  }
+  if (typeof Headers !== 'undefined' && req.headers.constructor === Headers) {
+    return Object.fromEntries(req.headers.entries());
+  }
+  return req.headers;
 };
 export var getCookies = function getCookies(req) {
   if (req.cookies) return req.cookies;
@@ -107,6 +118,12 @@ export var setStatus = function setStatus(res, code) {
 export var send = function send(res, body) {
   if (typeof res.send === 'function') return res.send(body);
   if (res.request && res.response && res.app) res.body = body;
+  if (typeof Response !== 'undefined' && res.constructor === Response) {
+    return new Response(body, {
+      status: res.status,
+      headers: res.headers
+    });
+  }
   return body;
 };
 export var getSession = function getSession(req) {

package/esm/index.d.ts

@@ -76,6 +76,8 @@ export function handle(i18next: I18next, options?: HandleOptions): Handler;
 
 export function koaPlugin(i18next: I18next, options?: HandleOptions): (context: unknown, next: Function) => any;
 
+export function freshPlugin(i18next:I18next, options?: HandleOptions): Promise<any>;
+
 export function plugin(
   instance: any,
   options: HandleOptions & { i18next?: I18next },

package/esm/index.js

@@ -21,6 +21,15 @@ var checkForCombinedReqRes = function checkForCombinedReqRes(req, res, next) {
     } else if (req.respond) {
       res = req;
       if (!next) next = function next() {};
+    } else if (typeof Request !== 'undefined' && typeof Response !== 'undefined' && req.req && req.req.constructor === Request) {
+      if (req.state) {
+        req.state.res = req.state.res || new Response();
+        res = req.state.res;
+      } else {
+        res = new Response();
+      }
+      req = req.req;
+      if (!next) next = function next() {};
     }
   } else if (!next && typeof res === 'function' && req.req && req.res) {
     return {
@@ -144,6 +153,41 @@ export function koaPlugin(i18next, options) {
     return koaMiddleware;
   }();
 }
+export function freshPlugin(i18next, options) {
+  return function () {
+    var _ref = _asyncToGenerator(_regeneratorRuntime().mark(function _callee2(ctx) {
+      var placeholder, resp;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            handle(i18next, _objectSpread(_objectSpread({}, options), {}, {
+              attachLocals: true
+            }))(ctx);
+            ctx.state.t = ctx.req.t;
+            ctx.state.i18n = ctx.req.i18n;
+            ctx.state.lng = ctx.req.lng;
+            ctx.state.locale = ctx.req.locale;
+            ctx.state.language = ctx.req.language;
+            ctx.state.languages = ctx.req.languages;
+            placeholder = ctx.state.res;
+            delete ctx.state.res;
+            _context2.next = 11;
+            return ctx.next();
+          case 11:
+            resp = _context2.sent;
+            resp.headers.set('Content-Language', placeholder.headers.get('Content-Language'));
+            return _context2.abrupt("return", resp);
+          case 14:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function (_x3) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+}
 export var hapiPlugin = {
   name: 'i18next-http-middleware',
   version: '1',
@@ -198,6 +242,9 @@ export function getResourcesHandler(i18next) {
         });
       });
     });
+    if (typeof Response !== 'undefined' && res.constructor === Response && typeof JSON !== 'undefined') {
+      return options.send(res, JSON.stringify(resources));
+    }
     return options.send(res, resources);
   };
 }
@@ -263,6 +310,7 @@ export default {
   plugin: plugin,
   hapiPlugin: hapiPlugin,
   koaPlugin: koaPlugin,
+  freshPlugin: freshPlugin,
   handle: handle,
   getResourcesHandler: getResourcesHandler,
   missingKeyHandler: missingKeyHandler,

package/index.d.ts

@@ -76,6 +76,8 @@ export function handle(i18next: I18next, options?: HandleOptions): Handler;
 
 export function koaPlugin(i18next: I18next, options?: HandleOptions): (context: unknown, next: Function) => any;
 
+export function freshPlugin(i18next:I18next, options?: HandleOptions): Promise<any>;
+
 export function plugin(
   instance: any,
   options: HandleOptions & { i18next?: I18next },

package/lib/httpFunctions.js

@@ -38,6 +38,11 @@ export const getQuery = (req) => {
   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 {}
+  if (typeof URL !== 'undefined') {
+    try {
+      return Object.fromEntries(new URL(url).searchParams.entries())
+    } catch { }
+  }
   console.log('no possibility found to get query')
   return {}
 }
@@ -49,8 +54,14 @@ export const getParams = (req) => {
   return {}
 }
 export const getHeaders = (req) => {
-  if (req.headers) return req.headers
-  console.log('no possibility found to get headers')
+  if (!req.headers) {
+    console.log('no possibility found to get headers')
+    return
+  }
+  if (typeof Headers !== 'undefined' && req.headers.constructor === Headers) {
+    return Object.fromEntries(req.headers.entries())
+  }
+  return req.headers
 }
 export const getCookies = (req) => {
   if (req.cookies) return req.cookies
@@ -114,6 +125,12 @@ export const setStatus = (res, code) => {
 export const send = (res, body) => {
   if (typeof res.send === 'function') return res.send(body)
   if (res.request && res.response && res.app) res.body = body
+  if (typeof Response !== 'undefined' && res.constructor === Response) {
+    return new Response(body, {
+      status: res.status,
+      headers: res.headers
+    })
+  }
   return body
 }
 export const getSession = (req) => {

package/lib/index.js

@@ -14,6 +14,19 @@ const checkForCombinedReqRes = (req, res, next) => {
     } else if (req.respond) {
       res = req
       if (!next) next = () => {}
+    } else if (typeof Request !== 'undefined' &&
+        typeof Response !== 'undefined' &&
+        req.req &&
+        req.req.constructor === Request
+    ) {
+      if (req.state) {
+        req.state.res = req.state.res || new Response()
+        res = req.state.res
+      } else {
+        res = new Response()
+      }
+      req = req.req
+      if (!next) next = () => {}
     }
   } else if (!next && typeof res === 'function' && req.req && req.res) {
     return {
@@ -137,6 +150,23 @@ export function koaPlugin (i18next, options) {
   }
 }
 
+export function freshPlugin (i18next, options) {
+  return async (ctx) => {
+    handle(i18next, { ...options, attachLocals: true })(ctx)
+    ctx.state.t = ctx.req.t
+    ctx.state.i18n = ctx.req.i18n
+    ctx.state.lng = ctx.req.lng
+    ctx.state.locale = ctx.req.locale
+    ctx.state.language = ctx.req.language
+    ctx.state.languages = ctx.req.languages
+    const placeholder = ctx.state.res
+    delete ctx.state.res
+    const resp = await ctx.next()
+    resp.headers.set('Content-Language', placeholder.headers.get('Content-Language'))
+    return resp
+  }
+}
+
 export const hapiPlugin = {
   name: 'i18next-http-middleware',
   version: '1',
@@ -232,6 +262,11 @@ export function getResourcesHandler (i18next, options = {}) {
       })
     })
 
+    if (typeof Response !== 'undefined' &&
+        res.constructor === Response &&
+        typeof JSON !== 'undefined') {
+      return options.send(res, JSON.stringify(resources))
+    }
     return options.send(res, resources)
   }
 }
@@ -311,6 +346,7 @@ export default {
   plugin,
   hapiPlugin,
   koaPlugin,
+  freshPlugin,
   handle,
   getResourcesHandler,
   missingKeyHandler,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-http-middleware",
-  "version": "3.8.2",
+  "version": "3.9.1",
   "private": false,
   "type": "module",
   "main": "./cjs/index.js",
@@ -32,6 +32,8 @@
     "@babel/core": "7.26.0",
     "@babel/preset-env": "7.26.0",
     "@hapi/hapi": "^21.3.12",
+    "@opentelemetry/api": "^1.9.0",
+    "@preact/signals": "^2.2.1",
     "@types/express-serve-static-core": "^5.0.1",
     "@koa/router": "12.0.1",
     "koa": "2.16.1",
@@ -48,6 +50,8 @@
     "fastify": "5.3.2",
     "i18next": "25.5.2",
     "mocha": "10.8.2",
+    "preact": "10.27.2",
+    "preact-render-to-string": "6.6.3",
     "supertest": "7.0.0",
     "tsd": "0.31.2",
     "uglify-js": "3.19.3"