express-intlayer 9.5.12 → 9.7.0

package/dist/cjs/index.cjs

@@ -1,44 +1,55 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+let node_async_hooks = require("node:async_hooks");
+let _intlayer_config_built = require("@intlayer/config/built");
 let _intlayer_config_node = require("@intlayer/config/node");
 let _intlayer_core_interpreter = require("@intlayer/core/interpreter");
 let _intlayer_core_localization = require("@intlayer/core/localization");
 let _intlayer_core_utils = require("@intlayer/core/utils");
 let _intlayer_engine_build = require("@intlayer/engine/build");
-let cls_hooked = require("cls-hooked");
 
 //#region src/index.ts
 let debug = () => {};
-const configuration = (0, _intlayer_config_node.getConfiguration)();
-const { internationalization } = configuration;
 if (process.env.NODE_ENV === "development") debug = (msg) => console.debug(msg);
 /**
-* Retrieves the locale from storage (cookies, localStorage, sessionStorage).
+* Reads a single-valued request header.
 */
-const getStorageLocale = (req) => (0, _intlayer_core_utils.getLocaleFromStorageServer)({
-	getCookie: (name) => req.cookies?.[name],
-	getHeader: (name) => req.headers?.[name]
-});
-const appNamespace = (0, cls_hooked.createNamespace)("app");
-(0, _intlayer_core_interpreter.registerAmbientLocaleResolver)(() => appNamespace.get("locale"));
-(0, _intlayer_engine_build.prepareIntlayerServer)(configuration, { label: "express-intlayer" });
-const translateFunction = (_req, res, _next) => (content, locale) => {
-	const { locale: currentLocale, defaultLocale } = res.locals;
-	const targetLocale = locale ?? currentLocale;
-	if (typeof content === "undefined") return "";
-	if (typeof content === "string") return content;
-	if (typeof content?.[targetLocale] === "undefined") {
-		if (typeof content?.[defaultLocale] === "undefined") return content;
-		else return (0, _intlayer_core_interpreter.getTranslation)(content, defaultLocale);
-	}
-	return (0, _intlayer_core_interpreter.getTranslation)(content, targetLocale);
+const getHeader = (req, name) => {
+	const value = req.headers[name];
+	return Array.isArray(value) ? value.join(",") : value;
 };
 /**
+* Retrieves the locale from storage (cookies, headers).
+*
+* Parsed cookies need `cookie-parser`: the raw header is read otherwise.
+*/
+const getStorageLocale = (req) => {
+	const parsedCookies = req.cookies;
+	return (0, _intlayer_core_utils.getLocaleFromStorageServer)({
+		getCookie: (name) => parsedCookies ? parsedCookies[name] : (0, _intlayer_core_utils.getCookie)(name, req.headers.cookie ?? ""),
+		getHeader: (name) => getHeader(req, name)
+	});
+};
+/**
+* Request-scoped Intlayer context.
+*
+* `AsyncLocalStorage` rather than `cls-hooked`: the latter relies on
+* `async_hooks.createHook`, which Bun does not implement, and is several times
+* slower on Node.
+*/
+const intlayerStorage = new node_async_hooks.AsyncLocalStorage();
+(0, _intlayer_core_interpreter.registerAmbientLocaleResolver)(() => intlayerStorage.getStore()?.locale);
+(0, _intlayer_engine_build.prepareIntlayerServer)((0, _intlayer_config_node.getConfiguration)(), { label: "express-intlayer" });
+/**
+* Builds the translation function bound to the locale stored in `res.locals`.
+*/
+const translateFunction = (_req, res, _next) => (content, locale) => typeof content === "string" ? content : (0, _intlayer_core_interpreter.getTranslation)(content, locale ?? res.locals.locale, _intlayer_config_built.internationalization.defaultLocale);
+/**
 * Express middleware that detects the user's locale and populates `res.locals` with Intlayer data.
 *
 * It performs:
 * 1. Locale detection from cookies, headers, or default settings.
 * 2. Injects `t`, `getIntlayer`, and `getDictionary` functions into `res.locals`.
-* 3. Sets up a `cls-hooked` namespace for accessing these functions anywhere in the request lifecycle.
+* 3. Sets up an `AsyncLocalStorage` context for accessing these functions anywhere in the request lifecycle.
 *
 * @returns An Express middleware function.
 *
@@ -51,31 +62,26 @@ const translateFunction = (_req, res, _next) => (content, locale) => {
 * app.use(intlayer());
 * ```
 */
-const intlayer = () => async (req, res, next) => {
+const intlayer = () => (req, res, next) => {
 	const localeFromStorage = getStorageLocale(req);
-	const negotiatorHeaders = {};
-	if (req && typeof req.headers === "object") {
-		for (const key in req.headers) if (typeof req.headers[key] === "string") negotiatorHeaders[key] = req.headers[key];
-	}
-	const localeDetected = (0, _intlayer_core_localization.localeDetector)(negotiatorHeaders, internationalization.locales, internationalization.defaultLocale);
+	const localeDetected = (0, _intlayer_core_localization.localeDetector)({ "accept-language": getHeader(req, "accept-language") }, _intlayer_config_built.internationalization.locales, _intlayer_config_built.internationalization.defaultLocale);
 	res.locals.locale_storage = localeFromStorage;
 	res.locals.locale_detected = localeDetected;
 	const locale = localeFromStorage ?? localeDetected;
 	res.locals.locale = locale;
-	res.locals.defaultLocale = internationalization.defaultLocale;
+	res.locals.defaultLocale = _intlayer_config_built.internationalization.defaultLocale;
 	const t = translateFunction(req, res, next);
 	const getIntlayer = (key, localeArg, ...props) => (0, _intlayer_core_interpreter.getIntlayer)(key, localeArg ?? locale, ...props);
 	const getDictionary = (key, localeArg, ...props) => (0, _intlayer_core_interpreter.getDictionary)(key, localeArg ?? locale, ...props);
 	res.locals.t = t;
 	res.locals.getIntlayer = getIntlayer;
 	res.locals.getDictionary = getDictionary;
-	appNamespace.run(() => {
-		appNamespace.set("locale", locale);
-		appNamespace.set("t", t);
-		appNamespace.set("getIntlayer", getIntlayer);
-		appNamespace.set("getDictionary", getDictionary);
-		next();
-	});
+	intlayerStorage.run({
+		locale,
+		t,
+		getIntlayer,
+		getDictionary
+	}, next);
 };
 /**
 * Translation function to retrieve content for the current locale.
@@ -100,34 +106,28 @@ const intlayer = () => async (req, res, next) => {
 * ```
 */
 const t = (content, locale) => {
-	try {
-		if (typeof appNamespace === "undefined") throw new Error("Intlayer is not initialized. Add the `app.use(intlayer());` middleware before using this function.");
-		if (typeof appNamespace.get("t") !== "function") throw new Error("Using the import { t } from \"express-intlayer\" is not supported in your environment. Use the res.locals.t syntax instead.");
-		return appNamespace.get("t")(content, locale);
-	} catch (error) {
-		debug(error.message);
-		return (0, _intlayer_core_interpreter.getTranslation)(content, locale ?? internationalization.defaultLocale);
+	const context = intlayerStorage.getStore();
+	if (!context) {
+		debug("Using the import { t } from \"express-intlayer\" outside of a request handled by the `intlayer()` middleware. Use the res.locals.t syntax instead.");
+		return (0, _intlayer_core_interpreter.getTranslation)(content, locale ?? _intlayer_config_built.internationalization.defaultLocale);
 	}
+	return context.t(content, locale);
 };
 const getIntlayer = (...args) => {
-	try {
-		if (typeof appNamespace === "undefined") throw new Error("Intlayer is not initialized. Add the `app.use(intlayer());` middleware before using this function.");
-		if (typeof appNamespace.get("getIntlayer") !== "function") throw new Error("Using the import { t } from \"express-intlayer\" is not supported in your environment. Use the res.locals.t syntax instead.");
-		return appNamespace.get("getIntlayer")(...args);
-	} catch (error) {
-		debug(error.message);
+	const context = intlayerStorage.getStore();
+	if (!context) {
+		debug("Using the import { getIntlayer } from \"express-intlayer\" outside of a request handled by the `intlayer()` middleware. Use the res.locals.getIntlayer syntax instead.");
 		return (0, _intlayer_core_interpreter.getIntlayer)(...args);
 	}
+	return context.getIntlayer(...args);
 };
 const getDictionary = (...args) => {
-	try {
-		if (typeof appNamespace === "undefined") throw new Error("Intlayer is not initialized. Add the `app.use(intlayer());` middleware before using this function.");
-		if (typeof appNamespace.get("getDictionary") !== "function") throw new Error("Using the import { t } from \"express-intlayer\" is not supported in your environment. Use the res.locals.t syntax instead.");
-		return appNamespace.get("getDictionary")(...args);
-	} catch (error) {
-		debug(error.message);
+	const context = intlayerStorage.getStore();
+	if (!context) {
+		debug("Using the import { getDictionary } from \"express-intlayer\" outside of a request handled by the `intlayer()` middleware. Use the res.locals.getDictionary syntax instead.");
 		return (0, _intlayer_core_interpreter.getDictionary)(...args);
 	}
+	return context.getDictionary(...args);
 };
 
 //#endregion

package/dist/cjs/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","names":["getConfiguration","getLocaleFromStorageServer","createNamespace","registerAmbientLocaleResolver","prepareIntlayerServer","getTranslation","localeDetector","getIntlayerFunction","getDictionaryFunction"],"sources":["../../src/index.ts"],"sourcesContent":["import { getConfiguration } from '@intlayer/config/node';\nimport {\n  getDictionary as getDictionaryFunction,\n  getIntlayer as getIntlayerFunction,\n  getTranslation,\n  registerAmbientLocaleResolver,\n} from '@intlayer/core/interpreter';\nimport { localeDetector } from '@intlayer/core/localization';\nimport { getLocaleFromStorageServer } from '@intlayer/core/utils';\nimport { prepareIntlayerServer } from '@intlayer/engine/build';\nimport type { Locale } from '@intlayer/types/allLocales';\nimport type { StrictModeLocaleMap } from '@intlayer/types/module_augmentation';\nimport { createNamespace } from 'cls-hooked';\nimport type { NextFunction, Request, RequestHandler, Response } from 'express';\n\n// Zero-cost fallback, will be updated with console logger in dev mode\nlet debug: (message: string) => void = () => {};\n\nconst configuration = getConfiguration();\nconst { internationalization } = configuration;\n\nif (process.env['NODE_ENV'] === 'development') {\n  debug = (msg: string) => console.debug(msg);\n}\n\n/**\n * Retrieves the locale from storage (cookies, localStorage, sessionStorage).\n */\nconst getStorageLocale = (req: Request): Locale | undefined =>\n  getLocaleFromStorageServer({\n    getCookie: (name: string) => req.cookies?.[name],\n    getHeader: (name: string) => req.headers?.[name] as string | undefined,\n  });\n\nconst appNamespace = createNamespace('app');\n\n// Lets a bare `getIntlayer` / `getDictionary` from any Intlayer package resolve\n// to the locale of the request being handled.\nregisterAmbientLocaleResolver(() => appNamespace.get('locale'));\n\nprepareIntlayerServer(configuration, { label: 'express-intlayer' });\n\nexport const translateFunction =\n  (_req: Request, res: Response, _next?: NextFunction) =>\n  <T extends string>(\n    content: StrictModeLocaleMap<T> | string,\n    locale?: Locale\n  ): T => {\n    const { locale: currentLocale, defaultLocale } = res.locals as {\n      locale: Locale;\n      defaultLocale: Locale;\n    };\n\n    const targetLocale = locale ?? currentLocale;\n\n    if (typeof content === 'undefined') {\n      return '' as unknown as T;\n    }\n\n    if (typeof content === 'string') {\n      return content as unknown as T;\n    }\n\n    if (\n      typeof content?.[\n        targetLocale as unknown as keyof StrictModeLocaleMap<T>\n      ] === 'undefined'\n    ) {\n      if (\n        typeof content?.[\n          defaultLocale as unknown as keyof StrictModeLocaleMap<T>\n        ] === 'undefined'\n      ) {\n        return content as unknown as T;\n      } else {\n        return getTranslation(content, defaultLocale);\n      }\n    }\n\n    return getTranslation(content, targetLocale);\n  };\n\n/**\n * Express middleware that detects the user's locale and populates `res.locals` with Intlayer data.\n *\n * It performs:\n * 1. Locale detection from cookies, headers, or default settings.\n * 2. Injects `t`, `getIntlayer`, and `getDictionary` functions into `res.locals`.\n * 3. Sets up a `cls-hooked` namespace for accessing these functions anywhere in the request lifecycle.\n *\n * @returns An Express middleware function.\n *\n * @example\n * ```ts\n * import express from 'express';\n * import { intlayer } from 'express-intlayer';\n *\n * const app = express();\n * app.use(intlayer());\n * ```\n */\nexport const intlayer = (): RequestHandler => async (req, res, next) => {\n  // Detect if locale is set by intlayer frontend lib in the headers\n  const localeFromStorage = getStorageLocale(req);\n  // Interpret browser locale\n\n  const negotiatorHeaders: Record<string, string> = {};\n\n  // // Check if req.headers exists and is an object\n  if (req && typeof req.headers === 'object') {\n    // Copy all headers from the request to negotiatorHeaders\n    for (const key in req.headers) {\n      if (typeof req.headers[key] === 'string') {\n        negotiatorHeaders[key] = req.headers[key];\n      }\n    }\n  }\n\n  const localeDetected = localeDetector(\n    negotiatorHeaders,\n    internationalization.locales,\n    internationalization.defaultLocale\n  );\n\n  res.locals.locale_storage = localeFromStorage;\n  res.locals.locale_detected = localeDetected;\n  const locale = localeFromStorage ?? localeDetected;\n\n  res.locals.locale = locale;\n  res.locals.defaultLocale = internationalization.defaultLocale;\n\n  const t = translateFunction(req, res, next);\n\n  const getIntlayer: typeof getIntlayerFunction = (key, localeArg, ...props) =>\n    getIntlayerFunction(\n      key,\n      (localeArg ?? locale) as typeof localeArg,\n      ...props\n    );\n\n  const getDictionary: typeof getDictionaryFunction = (\n    key,\n    localeArg,\n    ...props\n  ) =>\n    getDictionaryFunction(\n      key,\n      (localeArg ?? locale) as typeof localeArg,\n      ...props\n    );\n\n  res.locals.t = t;\n  res.locals.getIntlayer = getIntlayer;\n  res.locals.getDictionary = getDictionary;\n\n  appNamespace.run(() => {\n    appNamespace.set('locale', locale);\n    appNamespace.set('t', t);\n    appNamespace.set('getIntlayer', getIntlayer);\n    appNamespace.set('getDictionary', getDictionary);\n\n    next();\n  });\n};\n\n/**\n * Translation function to retrieve content for the current locale.\n *\n * This function works within the request lifecycle managed by the `intlayer` middleware.\n *\n * @param content - A map of locales to content.\n * @param locale - Optional locale override.\n * @returns The translated content.\n *\n * @example\n * ```ts\n * import { t } from 'express-intlayer';\n *\n * app.get('/', (req, res) => {\n *   const greeting = t({\n *     en: 'Hello',\n *     fr: 'Bonjour',\n *   });\n *   res.send(greeting);\n * });\n * ```\n */\nexport const t = <Content = string>(\n  content: StrictModeLocaleMap<Content>,\n  locale?: Locale\n): Content => {\n  try {\n    if (typeof appNamespace === 'undefined') {\n      throw new Error(\n        'Intlayer is not initialized. Add the `app.use(intlayer());` middleware before using this function.'\n      );\n    }\n\n    if (typeof appNamespace.get('t') !== 'function') {\n      throw new Error(\n        'Using the import { t } from \"express-intlayer\" is not supported in your environment. Use the res.locals.t syntax instead.'\n      );\n    }\n\n    return appNamespace.get('t')(content, locale);\n  } catch (error) {\n    debug((error as Error).message);\n\n    return getTranslation(\n      content,\n      locale ?? internationalization.defaultLocale\n    );\n  }\n};\n\nexport const getIntlayer: typeof getIntlayerFunction = (...args) => {\n  try {\n    if (typeof appNamespace === 'undefined') {\n      throw new Error(\n        'Intlayer is not initialized. Add the `app.use(intlayer());` middleware before using this function.'\n      );\n    }\n\n    if (typeof appNamespace.get('getIntlayer') !== 'function') {\n      throw new Error(\n        'Using the import { t } from \"express-intlayer\" is not supported in your environment. Use the res.locals.t syntax instead.'\n      );\n    }\n\n    return appNamespace.get('getIntlayer')(...args);\n  } catch (error) {\n    debug((error as Error).message);\n\n    return getIntlayerFunction(...args);\n  }\n};\n\nexport const getDictionary: typeof getDictionaryFunction = (...args) => {\n  try {\n    if (typeof appNamespace === 'undefined') {\n      throw new Error(\n        'Intlayer is not initialized. Add the `app.use(intlayer());` middleware before using this function.'\n      );\n    }\n\n    if (typeof appNamespace.get('getDictionary') !== 'function') {\n      throw new Error(\n        'Using the import { t } from \"express-intlayer\" is not supported in your environment. Use the res.locals.t syntax instead.'\n      );\n    }\n\n    return appNamespace.get('getDictionary')(...args);\n  } catch (error) {\n    debug((error as Error).message);\n\n    return getDictionaryFunction(...args);\n  }\n};\n"],"mappings":"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"}
+{"version":3,"file":"index.cjs","names":["getLocaleFromStorageServer","getCookie","AsyncLocalStorage","registerAmbientLocaleResolver","prepareIntlayerServer","getConfiguration","getTranslation","internationalization","localeDetector","getIntlayerFunction","getDictionaryFunction"],"sources":["../../src/index.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\nimport { internationalization } from '@intlayer/config/built';\nimport { getConfiguration } from '@intlayer/config/node';\nimport {\n  getDictionary as getDictionaryFunction,\n  getIntlayer as getIntlayerFunction,\n  getTranslation,\n  registerAmbientLocaleResolver,\n} from '@intlayer/core/interpreter';\nimport { localeDetector } from '@intlayer/core/localization';\nimport { getCookie, getLocaleFromStorageServer } from '@intlayer/core/utils';\nimport { prepareIntlayerServer } from '@intlayer/engine/build';\nimport type { Locale } from '@intlayer/types/allLocales';\nimport type { StrictModeLocaleMap } from '@intlayer/types/module_augmentation';\nimport type { NextFunction, Request, RequestHandler, Response } from 'express';\n\n// Zero-cost fallback, will be updated with console logger in dev mode\nlet debug: (message: string) => void = () => {};\n\nif (process.env['NODE_ENV'] === 'development') {\n  debug = (msg: string) => console.debug(msg);\n}\n\n/**\n * Reads a single-valued request header.\n */\nconst getHeader = (req: Request, name: string): string | undefined => {\n  const value = req.headers[name];\n\n  return Array.isArray(value) ? value.join(',') : value;\n};\n\n/**\n * Retrieves the locale from storage (cookies, headers).\n *\n * Parsed cookies need `cookie-parser`: the raw header is read otherwise.\n */\nconst getStorageLocale = (req: Request): Locale | undefined => {\n  const parsedCookies = req.cookies as Record<string, string> | undefined;\n\n  return getLocaleFromStorageServer({\n    getCookie: (name: string) =>\n      parsedCookies\n        ? parsedCookies[name]\n        : getCookie(name, req.headers.cookie ?? ''),\n    getHeader: (name: string) => getHeader(req, name),\n  });\n};\n\n/**\n * Intlayer helpers bound to the request being handled.\n */\ntype IntlayerRequestContext = {\n  locale: Locale;\n  t: ReturnType<typeof translateFunction>;\n  getIntlayer: typeof getIntlayerFunction;\n  getDictionary: typeof getDictionaryFunction;\n};\n\n/**\n * Request-scoped Intlayer context.\n *\n * `AsyncLocalStorage` rather than `cls-hooked`: the latter relies on\n * `async_hooks.createHook`, which Bun does not implement, and is several times\n * slower on Node.\n */\nconst intlayerStorage = new AsyncLocalStorage<IntlayerRequestContext>();\n\n// Lets a bare `getIntlayer` / `getDictionary` from any Intlayer package resolve\n// to the locale of the request being handled.\nregisterAmbientLocaleResolver(() => intlayerStorage.getStore()?.locale);\n\nprepareIntlayerServer(getConfiguration(), { label: 'express-intlayer' });\n\n/**\n * Builds the translation function bound to the locale stored in `res.locals`.\n */\nexport const translateFunction =\n  (_req: Request, res: Response, _next?: NextFunction) =>\n  <T extends string>(\n    content: StrictModeLocaleMap<T> | string,\n    locale?: Locale\n  ): T =>\n    typeof content === 'string'\n      ? (content as T)\n      : getTranslation(\n          content,\n          locale ?? (res.locals.locale as Locale),\n          internationalization.defaultLocale\n        );\n\n/**\n * Express middleware that detects the user's locale and populates `res.locals` with Intlayer data.\n *\n * It performs:\n * 1. Locale detection from cookies, headers, or default settings.\n * 2. Injects `t`, `getIntlayer`, and `getDictionary` functions into `res.locals`.\n * 3. Sets up an `AsyncLocalStorage` context for accessing these functions anywhere in the request lifecycle.\n *\n * @returns An Express middleware function.\n *\n * @example\n * ```ts\n * import express from 'express';\n * import { intlayer } from 'express-intlayer';\n *\n * const app = express();\n * app.use(intlayer());\n * ```\n */\nexport const intlayer = (): RequestHandler => (req, res, next) => {\n  // Detect if locale is set by intlayer frontend lib in the headers\n  const localeFromStorage = getStorageLocale(req);\n\n  // Interpret browser locale\n  const localeDetected = localeDetector(\n    { 'accept-language': getHeader(req, 'accept-language') },\n    internationalization.locales,\n    internationalization.defaultLocale\n  );\n\n  res.locals.locale_storage = localeFromStorage;\n  res.locals.locale_detected = localeDetected;\n  const locale = localeFromStorage ?? localeDetected;\n\n  res.locals.locale = locale;\n  res.locals.defaultLocale = internationalization.defaultLocale;\n\n  const t = translateFunction(req, res, next);\n\n  const getIntlayer: typeof getIntlayerFunction = (key, localeArg, ...props) =>\n    getIntlayerFunction(\n      key,\n      (localeArg ?? locale) as typeof localeArg,\n      ...props\n    );\n\n  const getDictionary: typeof getDictionaryFunction = (\n    key,\n    localeArg,\n    ...props\n  ) =>\n    getDictionaryFunction(\n      key,\n      (localeArg ?? locale) as typeof localeArg,\n      ...props\n    );\n\n  res.locals.t = t;\n  res.locals.getIntlayer = getIntlayer;\n  res.locals.getDictionary = getDictionary;\n\n  intlayerStorage.run({ locale, t, getIntlayer, getDictionary }, next);\n};\n\n/**\n * Translation function to retrieve content for the current locale.\n *\n * This function works within the request lifecycle managed by the `intlayer` middleware.\n *\n * @param content - A map of locales to content.\n * @param locale - Optional locale override.\n * @returns The translated content.\n *\n * @example\n * ```ts\n * import { t } from 'express-intlayer';\n *\n * app.get('/', (req, res) => {\n *   const greeting = t({\n *     en: 'Hello',\n *     fr: 'Bonjour',\n *   });\n *   res.send(greeting);\n * });\n * ```\n */\nexport const t = <Content = string>(\n  content: StrictModeLocaleMap<Content>,\n  locale?: Locale\n): Content => {\n  const context = intlayerStorage.getStore();\n\n  if (!context) {\n    debug(\n      'Using the import { t } from \"express-intlayer\" outside of a request handled by the `intlayer()` middleware. Use the res.locals.t syntax instead.'\n    );\n\n    return getTranslation(\n      content,\n      locale ?? internationalization.defaultLocale\n    );\n  }\n\n  return context.t(content as StrictModeLocaleMap<string>, locale) as Content;\n};\n\nexport const getIntlayer: typeof getIntlayerFunction = (...args) => {\n  const context = intlayerStorage.getStore();\n\n  if (!context) {\n    debug(\n      'Using the import { getIntlayer } from \"express-intlayer\" outside of a request handled by the `intlayer()` middleware. Use the res.locals.getIntlayer syntax instead.'\n    );\n\n    return getIntlayerFunction(...args);\n  }\n\n  return context.getIntlayer(...args);\n};\n\nexport const getDictionary: typeof getDictionaryFunction = (...args) => {\n  const context = intlayerStorage.getStore();\n\n  if (!context) {\n    debug(\n      'Using the import { getDictionary } from \"express-intlayer\" outside of a request handled by the `intlayer()` middleware. Use the res.locals.getDictionary syntax instead.'\n    );\n\n    return getDictionaryFunction(...args);\n  }\n\n  return context.getDictionary(...args);\n};\n"],"mappings":";;;;;;;;;;AAiBA,IAAI,cAAyC,CAAC;AAE9C,6BAAgC,eAC9B,SAAS,QAAgB,QAAQ,MAAM,GAAG;;;;AAM5C,MAAM,aAAa,KAAc,SAAqC;CACpE,MAAM,QAAQ,IAAI,QAAQ;CAE1B,OAAO,MAAM,QAAQ,KAAK,IAAI,MAAM,KAAK,GAAG,IAAI;AAClD;;;;;;AAOA,MAAM,oBAAoB,QAAqC;CAC7D,MAAM,gBAAgB,IAAI;CAE1B,WAAOA,iDAA2B;EAChC,YAAY,SACV,gBACI,cAAc,YACdC,gCAAU,MAAM,IAAI,QAAQ,UAAU,EAAE;EAC9C,YAAY,SAAiB,UAAU,KAAK,IAAI;CAClD,CAAC;AACH;;;;;;;;AAmBA,MAAM,kBAAkB,IAAIC,mCAA0C;IAItEC,gEAAoC,gBAAgB,SAAS,CAAC,EAAE,MAAM;IAEtEC,kDAAsBC,wCAAiB,GAAG,EAAE,OAAO,mBAAmB,CAAC;;;;AAKvE,MAAa,qBACV,MAAe,KAAe,WAE7B,SACA,WAEA,OAAO,YAAY,WACd,cACDC,2CACE,SACA,UAAW,IAAI,OAAO,QACtBC,4CAAqB,aACvB;;;;;;;;;;;;;;;;;;;;AAqBR,MAAa,kBAAkC,KAAK,KAAK,SAAS;CAEhE,MAAM,oBAAoB,iBAAiB,GAAG;CAG9C,MAAM,qBAAiBC,4CACrB,EAAE,mBAAmB,UAAU,KAAK,iBAAiB,EAAE,GACvDD,4CAAqB,SACrBA,4CAAqB,aACvB;CAEA,IAAI,OAAO,iBAAiB;CAC5B,IAAI,OAAO,kBAAkB;CAC7B,MAAM,SAAS,qBAAqB;CAEpC,IAAI,OAAO,SAAS;CACpB,IAAI,OAAO,gBAAgBA,4CAAqB;CAEhD,MAAM,IAAI,kBAAkB,KAAK,KAAK,IAAI;CAE1C,MAAM,eAA2C,KAAK,WAAW,GAAG,cAClEE,wCACE,KACC,aAAa,QACd,GAAG,KACL;CAEF,MAAM,iBACJ,KACA,WACA,GAAG,cAEHC,0CACE,KACC,aAAa,QACd,GAAG,KACL;CAEF,IAAI,OAAO,IAAI;CACf,IAAI,OAAO,cAAc;CACzB,IAAI,OAAO,gBAAgB;CAE3B,gBAAgB,IAAI;EAAE;EAAQ;EAAG;EAAa;CAAc,GAAG,IAAI;AACrE;;;;;;;;;;;;;;;;;;;;;;;AAwBA,MAAa,KACX,SACA,WACY;CACZ,MAAM,UAAU,gBAAgB,SAAS;CAEzC,IAAI,CAAC,SAAS;EACZ,MACE,oJACF;EAEA,WAAOJ,2CACL,SACA,UAAUC,4CAAqB,aACjC;CACF;CAEA,OAAO,QAAQ,EAAE,SAAwC,MAAM;AACjE;AAEA,MAAa,eAA2C,GAAG,SAAS;CAClE,MAAM,UAAU,gBAAgB,SAAS;CAEzC,IAAI,CAAC,SAAS;EACZ,MACE,wKACF;EAEA,WAAOE,wCAAoB,GAAG,IAAI;CACpC;CAEA,OAAO,QAAQ,YAAY,GAAG,IAAI;AACpC;AAEA,MAAa,iBAA+C,GAAG,SAAS;CACtE,MAAM,UAAU,gBAAgB,SAAS;CAEzC,IAAI,CAAC,SAAS;EACZ,MACE,4KACF;EAEA,WAAOC,0CAAsB,GAAG,IAAI;CACtC;CAEA,OAAO,QAAQ,cAAc,GAAG,IAAI;AACtC"}

package/dist/esm/index.mjs

@@ -1,43 +1,54 @@
+import { AsyncLocalStorage } from "node:async_hooks";
+import { internationalization } from "@intlayer/config/built";
 import { getConfiguration } from "@intlayer/config/node";
 import { getDictionary as getDictionary$1, getIntlayer as getIntlayer$1, getTranslation, registerAmbientLocaleResolver } from "@intlayer/core/interpreter";
 import { localeDetector } from "@intlayer/core/localization";
-import { getLocaleFromStorageServer } from "@intlayer/core/utils";
+import { getCookie, getLocaleFromStorageServer } from "@intlayer/core/utils";
 import { prepareIntlayerServer } from "@intlayer/engine/build";
-import { createNamespace } from "cls-hooked";
 
 //#region src/index.ts
 let debug = () => {};
-const configuration = getConfiguration();
-const { internationalization } = configuration;
 if (process.env.NODE_ENV === "development") debug = (msg) => console.debug(msg);
 /**
-* Retrieves the locale from storage (cookies, localStorage, sessionStorage).
+* Reads a single-valued request header.
 */
-const getStorageLocale = (req) => getLocaleFromStorageServer({
-	getCookie: (name) => req.cookies?.[name],
-	getHeader: (name) => req.headers?.[name]
-});
-const appNamespace = createNamespace("app");
-registerAmbientLocaleResolver(() => appNamespace.get("locale"));
-prepareIntlayerServer(configuration, { label: "express-intlayer" });
-const translateFunction = (_req, res, _next) => (content, locale) => {
-	const { locale: currentLocale, defaultLocale } = res.locals;
-	const targetLocale = locale ?? currentLocale;
-	if (typeof content === "undefined") return "";
-	if (typeof content === "string") return content;
-	if (typeof content?.[targetLocale] === "undefined") {
-		if (typeof content?.[defaultLocale] === "undefined") return content;
-		else return getTranslation(content, defaultLocale);
-	}
-	return getTranslation(content, targetLocale);
+const getHeader = (req, name) => {
+	const value = req.headers[name];
+	return Array.isArray(value) ? value.join(",") : value;
 };
 /**
+* Retrieves the locale from storage (cookies, headers).
+*
+* Parsed cookies need `cookie-parser`: the raw header is read otherwise.
+*/
+const getStorageLocale = (req) => {
+	const parsedCookies = req.cookies;
+	return getLocaleFromStorageServer({
+		getCookie: (name) => parsedCookies ? parsedCookies[name] : getCookie(name, req.headers.cookie ?? ""),
+		getHeader: (name) => getHeader(req, name)
+	});
+};
+/**
+* Request-scoped Intlayer context.
+*
+* `AsyncLocalStorage` rather than `cls-hooked`: the latter relies on
+* `async_hooks.createHook`, which Bun does not implement, and is several times
+* slower on Node.
+*/
+const intlayerStorage = new AsyncLocalStorage();
+registerAmbientLocaleResolver(() => intlayerStorage.getStore()?.locale);
+prepareIntlayerServer(getConfiguration(), { label: "express-intlayer" });
+/**
+* Builds the translation function bound to the locale stored in `res.locals`.
+*/
+const translateFunction = (_req, res, _next) => (content, locale) => typeof content === "string" ? content : getTranslation(content, locale ?? res.locals.locale, internationalization.defaultLocale);
+/**
 * Express middleware that detects the user's locale and populates `res.locals` with Intlayer data.
 *
 * It performs:
 * 1. Locale detection from cookies, headers, or default settings.
 * 2. Injects `t`, `getIntlayer`, and `getDictionary` functions into `res.locals`.
-* 3. Sets up a `cls-hooked` namespace for accessing these functions anywhere in the request lifecycle.
+* 3. Sets up an `AsyncLocalStorage` context for accessing these functions anywhere in the request lifecycle.
 *
 * @returns An Express middleware function.
 *
@@ -50,13 +61,9 @@ const translateFunction = (_req, res, _next) => (content, locale) => {
 * app.use(intlayer());
 * ```
 */
-const intlayer = () => async (req, res, next) => {
+const intlayer = () => (req, res, next) => {
 	const localeFromStorage = getStorageLocale(req);
-	const negotiatorHeaders = {};
-	if (req && typeof req.headers === "object") {
-		for (const key in req.headers) if (typeof req.headers[key] === "string") negotiatorHeaders[key] = req.headers[key];
-	}
-	const localeDetected = localeDetector(negotiatorHeaders, internationalization.locales, internationalization.defaultLocale);
+	const localeDetected = localeDetector({ "accept-language": getHeader(req, "accept-language") }, internationalization.locales, internationalization.defaultLocale);
 	res.locals.locale_storage = localeFromStorage;
 	res.locals.locale_detected = localeDetected;
 	const locale = localeFromStorage ?? localeDetected;
@@ -68,13 +75,12 @@ const intlayer = () => async (req, res, next) => {
 	res.locals.t = t;
 	res.locals.getIntlayer = getIntlayer;
 	res.locals.getDictionary = getDictionary;
-	appNamespace.run(() => {
-		appNamespace.set("locale", locale);
-		appNamespace.set("t", t);
-		appNamespace.set("getIntlayer", getIntlayer);
-		appNamespace.set("getDictionary", getDictionary);
-		next();
-	});
+	intlayerStorage.run({
+		locale,
+		t,
+		getIntlayer,
+		getDictionary
+	}, next);
 };
 /**
 * Translation function to retrieve content for the current locale.
@@ -99,34 +105,28 @@ const intlayer = () => async (req, res, next) => {
 * ```
 */
 const t = (content, locale) => {
-	try {
-		if (typeof appNamespace === "undefined") throw new Error("Intlayer is not initialized. Add the `app.use(intlayer());` middleware before using this function.");
-		if (typeof appNamespace.get("t") !== "function") throw new Error("Using the import { t } from \"express-intlayer\" is not supported in your environment. Use the res.locals.t syntax instead.");
-		return appNamespace.get("t")(content, locale);
-	} catch (error) {
-		debug(error.message);
+	const context = intlayerStorage.getStore();
+	if (!context) {
+		debug("Using the import { t } from \"express-intlayer\" outside of a request handled by the `intlayer()` middleware. Use the res.locals.t syntax instead.");
 		return getTranslation(content, locale ?? internationalization.defaultLocale);
 	}
+	return context.t(content, locale);
 };
 const getIntlayer = (...args) => {
-	try {
-		if (typeof appNamespace === "undefined") throw new Error("Intlayer is not initialized. Add the `app.use(intlayer());` middleware before using this function.");
-		if (typeof appNamespace.get("getIntlayer") !== "function") throw new Error("Using the import { t } from \"express-intlayer\" is not supported in your environment. Use the res.locals.t syntax instead.");
-		return appNamespace.get("getIntlayer")(...args);
-	} catch (error) {
-		debug(error.message);
+	const context = intlayerStorage.getStore();
+	if (!context) {
+		debug("Using the import { getIntlayer } from \"express-intlayer\" outside of a request handled by the `intlayer()` middleware. Use the res.locals.getIntlayer syntax instead.");
 		return getIntlayer$1(...args);
 	}
+	return context.getIntlayer(...args);
 };
 const getDictionary = (...args) => {
-	try {
-		if (typeof appNamespace === "undefined") throw new Error("Intlayer is not initialized. Add the `app.use(intlayer());` middleware before using this function.");
-		if (typeof appNamespace.get("getDictionary") !== "function") throw new Error("Using the import { t } from \"express-intlayer\" is not supported in your environment. Use the res.locals.t syntax instead.");
-		return appNamespace.get("getDictionary")(...args);
-	} catch (error) {
-		debug(error.message);
+	const context = intlayerStorage.getStore();
+	if (!context) {
+		debug("Using the import { getDictionary } from \"express-intlayer\" outside of a request handled by the `intlayer()` middleware. Use the res.locals.getDictionary syntax instead.");
 		return getDictionary$1(...args);
 	}
+	return context.getDictionary(...args);
 };
 
 //#endregion

package/dist/esm/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":["getIntlayerFunction","getDictionaryFunction"],"sources":["../../src/index.ts"],"sourcesContent":["import { getConfiguration } from '@intlayer/config/node';\nimport {\n  getDictionary as getDictionaryFunction,\n  getIntlayer as getIntlayerFunction,\n  getTranslation,\n  registerAmbientLocaleResolver,\n} from '@intlayer/core/interpreter';\nimport { localeDetector } from '@intlayer/core/localization';\nimport { getLocaleFromStorageServer } from '@intlayer/core/utils';\nimport { prepareIntlayerServer } from '@intlayer/engine/build';\nimport type { Locale } from '@intlayer/types/allLocales';\nimport type { StrictModeLocaleMap } from '@intlayer/types/module_augmentation';\nimport { createNamespace } from 'cls-hooked';\nimport type { NextFunction, Request, RequestHandler, Response } from 'express';\n\n// Zero-cost fallback, will be updated with console logger in dev mode\nlet debug: (message: string) => void = () => {};\n\nconst configuration = getConfiguration();\nconst { internationalization } = configuration;\n\nif (process.env['NODE_ENV'] === 'development') {\n  debug = (msg: string) => console.debug(msg);\n}\n\n/**\n * Retrieves the locale from storage (cookies, localStorage, sessionStorage).\n */\nconst getStorageLocale = (req: Request): Locale | undefined =>\n  getLocaleFromStorageServer({\n    getCookie: (name: string) => req.cookies?.[name],\n    getHeader: (name: string) => req.headers?.[name] as string | undefined,\n  });\n\nconst appNamespace = createNamespace('app');\n\n// Lets a bare `getIntlayer` / `getDictionary` from any Intlayer package resolve\n// to the locale of the request being handled.\nregisterAmbientLocaleResolver(() => appNamespace.get('locale'));\n\nprepareIntlayerServer(configuration, { label: 'express-intlayer' });\n\nexport const translateFunction =\n  (_req: Request, res: Response, _next?: NextFunction) =>\n  <T extends string>(\n    content: StrictModeLocaleMap<T> | string,\n    locale?: Locale\n  ): T => {\n    const { locale: currentLocale, defaultLocale } = res.locals as {\n      locale: Locale;\n      defaultLocale: Locale;\n    };\n\n    const targetLocale = locale ?? currentLocale;\n\n    if (typeof content === 'undefined') {\n      return '' as unknown as T;\n    }\n\n    if (typeof content === 'string') {\n      return content as unknown as T;\n    }\n\n    if (\n      typeof content?.[\n        targetLocale as unknown as keyof StrictModeLocaleMap<T>\n      ] === 'undefined'\n    ) {\n      if (\n        typeof content?.[\n          defaultLocale as unknown as keyof StrictModeLocaleMap<T>\n        ] === 'undefined'\n      ) {\n        return content as unknown as T;\n      } else {\n        return getTranslation(content, defaultLocale);\n      }\n    }\n\n    return getTranslation(content, targetLocale);\n  };\n\n/**\n * Express middleware that detects the user's locale and populates `res.locals` with Intlayer data.\n *\n * It performs:\n * 1. Locale detection from cookies, headers, or default settings.\n * 2. Injects `t`, `getIntlayer`, and `getDictionary` functions into `res.locals`.\n * 3. Sets up a `cls-hooked` namespace for accessing these functions anywhere in the request lifecycle.\n *\n * @returns An Express middleware function.\n *\n * @example\n * ```ts\n * import express from 'express';\n * import { intlayer } from 'express-intlayer';\n *\n * const app = express();\n * app.use(intlayer());\n * ```\n */\nexport const intlayer = (): RequestHandler => async (req, res, next) => {\n  // Detect if locale is set by intlayer frontend lib in the headers\n  const localeFromStorage = getStorageLocale(req);\n  // Interpret browser locale\n\n  const negotiatorHeaders: Record<string, string> = {};\n\n  // // Check if req.headers exists and is an object\n  if (req && typeof req.headers === 'object') {\n    // Copy all headers from the request to negotiatorHeaders\n    for (const key in req.headers) {\n      if (typeof req.headers[key] === 'string') {\n        negotiatorHeaders[key] = req.headers[key];\n      }\n    }\n  }\n\n  const localeDetected = localeDetector(\n    negotiatorHeaders,\n    internationalization.locales,\n    internationalization.defaultLocale\n  );\n\n  res.locals.locale_storage = localeFromStorage;\n  res.locals.locale_detected = localeDetected;\n  const locale = localeFromStorage ?? localeDetected;\n\n  res.locals.locale = locale;\n  res.locals.defaultLocale = internationalization.defaultLocale;\n\n  const t = translateFunction(req, res, next);\n\n  const getIntlayer: typeof getIntlayerFunction = (key, localeArg, ...props) =>\n    getIntlayerFunction(\n      key,\n      (localeArg ?? locale) as typeof localeArg,\n      ...props\n    );\n\n  const getDictionary: typeof getDictionaryFunction = (\n    key,\n    localeArg,\n    ...props\n  ) =>\n    getDictionaryFunction(\n      key,\n      (localeArg ?? locale) as typeof localeArg,\n      ...props\n    );\n\n  res.locals.t = t;\n  res.locals.getIntlayer = getIntlayer;\n  res.locals.getDictionary = getDictionary;\n\n  appNamespace.run(() => {\n    appNamespace.set('locale', locale);\n    appNamespace.set('t', t);\n    appNamespace.set('getIntlayer', getIntlayer);\n    appNamespace.set('getDictionary', getDictionary);\n\n    next();\n  });\n};\n\n/**\n * Translation function to retrieve content for the current locale.\n *\n * This function works within the request lifecycle managed by the `intlayer` middleware.\n *\n * @param content - A map of locales to content.\n * @param locale - Optional locale override.\n * @returns The translated content.\n *\n * @example\n * ```ts\n * import { t } from 'express-intlayer';\n *\n * app.get('/', (req, res) => {\n *   const greeting = t({\n *     en: 'Hello',\n *     fr: 'Bonjour',\n *   });\n *   res.send(greeting);\n * });\n * ```\n */\nexport const t = <Content = string>(\n  content: StrictModeLocaleMap<Content>,\n  locale?: Locale\n): Content => {\n  try {\n    if (typeof appNamespace === 'undefined') {\n      throw new Error(\n        'Intlayer is not initialized. Add the `app.use(intlayer());` middleware before using this function.'\n      );\n    }\n\n    if (typeof appNamespace.get('t') !== 'function') {\n      throw new Error(\n        'Using the import { t } from \"express-intlayer\" is not supported in your environment. Use the res.locals.t syntax instead.'\n      );\n    }\n\n    return appNamespace.get('t')(content, locale);\n  } catch (error) {\n    debug((error as Error).message);\n\n    return getTranslation(\n      content,\n      locale ?? internationalization.defaultLocale\n    );\n  }\n};\n\nexport const getIntlayer: typeof getIntlayerFunction = (...args) => {\n  try {\n    if (typeof appNamespace === 'undefined') {\n      throw new Error(\n        'Intlayer is not initialized. Add the `app.use(intlayer());` middleware before using this function.'\n      );\n    }\n\n    if (typeof appNamespace.get('getIntlayer') !== 'function') {\n      throw new Error(\n        'Using the import { t } from \"express-intlayer\" is not supported in your environment. Use the res.locals.t syntax instead.'\n      );\n    }\n\n    return appNamespace.get('getIntlayer')(...args);\n  } catch (error) {\n    debug((error as Error).message);\n\n    return getIntlayerFunction(...args);\n  }\n};\n\nexport const getDictionary: typeof getDictionaryFunction = (...args) => {\n  try {\n    if (typeof appNamespace === 'undefined') {\n      throw new Error(\n        'Intlayer is not initialized. Add the `app.use(intlayer());` middleware before using this function.'\n      );\n    }\n\n    if (typeof appNamespace.get('getDictionary') !== 'function') {\n      throw new Error(\n        'Using the import { t } from \"express-intlayer\" is not supported in your environment. Use the res.locals.t syntax instead.'\n      );\n    }\n\n    return appNamespace.get('getDictionary')(...args);\n  } catch (error) {\n    debug((error as Error).message);\n\n    return getDictionaryFunction(...args);\n  }\n};\n"],"mappings":"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"}
+{"version":3,"file":"index.mjs","names":["getIntlayerFunction","getDictionaryFunction"],"sources":["../../src/index.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\nimport { internationalization } from '@intlayer/config/built';\nimport { getConfiguration } from '@intlayer/config/node';\nimport {\n  getDictionary as getDictionaryFunction,\n  getIntlayer as getIntlayerFunction,\n  getTranslation,\n  registerAmbientLocaleResolver,\n} from '@intlayer/core/interpreter';\nimport { localeDetector } from '@intlayer/core/localization';\nimport { getCookie, getLocaleFromStorageServer } from '@intlayer/core/utils';\nimport { prepareIntlayerServer } from '@intlayer/engine/build';\nimport type { Locale } from '@intlayer/types/allLocales';\nimport type { StrictModeLocaleMap } from '@intlayer/types/module_augmentation';\nimport type { NextFunction, Request, RequestHandler, Response } from 'express';\n\n// Zero-cost fallback, will be updated with console logger in dev mode\nlet debug: (message: string) => void = () => {};\n\nif (process.env['NODE_ENV'] === 'development') {\n  debug = (msg: string) => console.debug(msg);\n}\n\n/**\n * Reads a single-valued request header.\n */\nconst getHeader = (req: Request, name: string): string | undefined => {\n  const value = req.headers[name];\n\n  return Array.isArray(value) ? value.join(',') : value;\n};\n\n/**\n * Retrieves the locale from storage (cookies, headers).\n *\n * Parsed cookies need `cookie-parser`: the raw header is read otherwise.\n */\nconst getStorageLocale = (req: Request): Locale | undefined => {\n  const parsedCookies = req.cookies as Record<string, string> | undefined;\n\n  return getLocaleFromStorageServer({\n    getCookie: (name: string) =>\n      parsedCookies\n        ? parsedCookies[name]\n        : getCookie(name, req.headers.cookie ?? ''),\n    getHeader: (name: string) => getHeader(req, name),\n  });\n};\n\n/**\n * Intlayer helpers bound to the request being handled.\n */\ntype IntlayerRequestContext = {\n  locale: Locale;\n  t: ReturnType<typeof translateFunction>;\n  getIntlayer: typeof getIntlayerFunction;\n  getDictionary: typeof getDictionaryFunction;\n};\n\n/**\n * Request-scoped Intlayer context.\n *\n * `AsyncLocalStorage` rather than `cls-hooked`: the latter relies on\n * `async_hooks.createHook`, which Bun does not implement, and is several times\n * slower on Node.\n */\nconst intlayerStorage = new AsyncLocalStorage<IntlayerRequestContext>();\n\n// Lets a bare `getIntlayer` / `getDictionary` from any Intlayer package resolve\n// to the locale of the request being handled.\nregisterAmbientLocaleResolver(() => intlayerStorage.getStore()?.locale);\n\nprepareIntlayerServer(getConfiguration(), { label: 'express-intlayer' });\n\n/**\n * Builds the translation function bound to the locale stored in `res.locals`.\n */\nexport const translateFunction =\n  (_req: Request, res: Response, _next?: NextFunction) =>\n  <T extends string>(\n    content: StrictModeLocaleMap<T> | string,\n    locale?: Locale\n  ): T =>\n    typeof content === 'string'\n      ? (content as T)\n      : getTranslation(\n          content,\n          locale ?? (res.locals.locale as Locale),\n          internationalization.defaultLocale\n        );\n\n/**\n * Express middleware that detects the user's locale and populates `res.locals` with Intlayer data.\n *\n * It performs:\n * 1. Locale detection from cookies, headers, or default settings.\n * 2. Injects `t`, `getIntlayer`, and `getDictionary` functions into `res.locals`.\n * 3. Sets up an `AsyncLocalStorage` context for accessing these functions anywhere in the request lifecycle.\n *\n * @returns An Express middleware function.\n *\n * @example\n * ```ts\n * import express from 'express';\n * import { intlayer } from 'express-intlayer';\n *\n * const app = express();\n * app.use(intlayer());\n * ```\n */\nexport const intlayer = (): RequestHandler => (req, res, next) => {\n  // Detect if locale is set by intlayer frontend lib in the headers\n  const localeFromStorage = getStorageLocale(req);\n\n  // Interpret browser locale\n  const localeDetected = localeDetector(\n    { 'accept-language': getHeader(req, 'accept-language') },\n    internationalization.locales,\n    internationalization.defaultLocale\n  );\n\n  res.locals.locale_storage = localeFromStorage;\n  res.locals.locale_detected = localeDetected;\n  const locale = localeFromStorage ?? localeDetected;\n\n  res.locals.locale = locale;\n  res.locals.defaultLocale = internationalization.defaultLocale;\n\n  const t = translateFunction(req, res, next);\n\n  const getIntlayer: typeof getIntlayerFunction = (key, localeArg, ...props) =>\n    getIntlayerFunction(\n      key,\n      (localeArg ?? locale) as typeof localeArg,\n      ...props\n    );\n\n  const getDictionary: typeof getDictionaryFunction = (\n    key,\n    localeArg,\n    ...props\n  ) =>\n    getDictionaryFunction(\n      key,\n      (localeArg ?? locale) as typeof localeArg,\n      ...props\n    );\n\n  res.locals.t = t;\n  res.locals.getIntlayer = getIntlayer;\n  res.locals.getDictionary = getDictionary;\n\n  intlayerStorage.run({ locale, t, getIntlayer, getDictionary }, next);\n};\n\n/**\n * Translation function to retrieve content for the current locale.\n *\n * This function works within the request lifecycle managed by the `intlayer` middleware.\n *\n * @param content - A map of locales to content.\n * @param locale - Optional locale override.\n * @returns The translated content.\n *\n * @example\n * ```ts\n * import { t } from 'express-intlayer';\n *\n * app.get('/', (req, res) => {\n *   const greeting = t({\n *     en: 'Hello',\n *     fr: 'Bonjour',\n *   });\n *   res.send(greeting);\n * });\n * ```\n */\nexport const t = <Content = string>(\n  content: StrictModeLocaleMap<Content>,\n  locale?: Locale\n): Content => {\n  const context = intlayerStorage.getStore();\n\n  if (!context) {\n    debug(\n      'Using the import { t } from \"express-intlayer\" outside of a request handled by the `intlayer()` middleware. Use the res.locals.t syntax instead.'\n    );\n\n    return getTranslation(\n      content,\n      locale ?? internationalization.defaultLocale\n    );\n  }\n\n  return context.t(content as StrictModeLocaleMap<string>, locale) as Content;\n};\n\nexport const getIntlayer: typeof getIntlayerFunction = (...args) => {\n  const context = intlayerStorage.getStore();\n\n  if (!context) {\n    debug(\n      'Using the import { getIntlayer } from \"express-intlayer\" outside of a request handled by the `intlayer()` middleware. Use the res.locals.getIntlayer syntax instead.'\n    );\n\n    return getIntlayerFunction(...args);\n  }\n\n  return context.getIntlayer(...args);\n};\n\nexport const getDictionary: typeof getDictionaryFunction = (...args) => {\n  const context = intlayerStorage.getStore();\n\n  if (!context) {\n    debug(\n      'Using the import { getDictionary } from \"express-intlayer\" outside of a request handled by the `intlayer()` middleware. Use the res.locals.getDictionary syntax instead.'\n    );\n\n    return getDictionaryFunction(...args);\n  }\n\n  return context.getDictionary(...args);\n};\n"],"mappings":";;;;;;;;;AAiBA,IAAI,cAAyC,CAAC;AAE9C,6BAAgC,eAC9B,SAAS,QAAgB,QAAQ,MAAM,GAAG;;;;AAM5C,MAAM,aAAa,KAAc,SAAqC;CACpE,MAAM,QAAQ,IAAI,QAAQ;CAE1B,OAAO,MAAM,QAAQ,KAAK,IAAI,MAAM,KAAK,GAAG,IAAI;AAClD;;;;;;AAOA,MAAM,oBAAoB,QAAqC;CAC7D,MAAM,gBAAgB,IAAI;CAE1B,OAAO,2BAA2B;EAChC,YAAY,SACV,gBACI,cAAc,QACd,UAAU,MAAM,IAAI,QAAQ,UAAU,EAAE;EAC9C,YAAY,SAAiB,UAAU,KAAK,IAAI;CAClD,CAAC;AACH;;;;;;;;AAmBA,MAAM,kBAAkB,IAAI,kBAA0C;AAItE,oCAAoC,gBAAgB,SAAS,CAAC,EAAE,MAAM;AAEtE,sBAAsB,iBAAiB,GAAG,EAAE,OAAO,mBAAmB,CAAC;;;;AAKvE,MAAa,qBACV,MAAe,KAAe,WAE7B,SACA,WAEA,OAAO,YAAY,WACd,UACD,eACE,SACA,UAAW,IAAI,OAAO,QACtB,qBAAqB,aACvB;;;;;;;;;;;;;;;;;;;;AAqBR,MAAa,kBAAkC,KAAK,KAAK,SAAS;CAEhE,MAAM,oBAAoB,iBAAiB,GAAG;CAG9C,MAAM,iBAAiB,eACrB,EAAE,mBAAmB,UAAU,KAAK,iBAAiB,EAAE,GACvD,qBAAqB,SACrB,qBAAqB,aACvB;CAEA,IAAI,OAAO,iBAAiB;CAC5B,IAAI,OAAO,kBAAkB;CAC7B,MAAM,SAAS,qBAAqB;CAEpC,IAAI,OAAO,SAAS;CACpB,IAAI,OAAO,gBAAgB,qBAAqB;CAEhD,MAAM,IAAI,kBAAkB,KAAK,KAAK,IAAI;CAE1C,MAAM,eAA2C,KAAK,WAAW,GAAG,UAClEA,cACE,KACC,aAAa,QACd,GAAG,KACL;CAEF,MAAM,iBACJ,KACA,WACA,GAAG,UAEHC,gBACE,KACC,aAAa,QACd,GAAG,KACL;CAEF,IAAI,OAAO,IAAI;CACf,IAAI,OAAO,cAAc;CACzB,IAAI,OAAO,gBAAgB;CAE3B,gBAAgB,IAAI;EAAE;EAAQ;EAAG;EAAa;CAAc,GAAG,IAAI;AACrE;;;;;;;;;;;;;;;;;;;;;;;AAwBA,MAAa,KACX,SACA,WACY;CACZ,MAAM,UAAU,gBAAgB,SAAS;CAEzC,IAAI,CAAC,SAAS;EACZ,MACE,oJACF;EAEA,OAAO,eACL,SACA,UAAU,qBAAqB,aACjC;CACF;CAEA,OAAO,QAAQ,EAAE,SAAwC,MAAM;AACjE;AAEA,MAAa,eAA2C,GAAG,SAAS;CAClE,MAAM,UAAU,gBAAgB,SAAS;CAEzC,IAAI,CAAC,SAAS;EACZ,MACE,wKACF;EAEA,OAAOD,cAAoB,GAAG,IAAI;CACpC;CAEA,OAAO,QAAQ,YAAY,GAAG,IAAI;AACpC;AAEA,MAAa,iBAA+C,GAAG,SAAS;CACtE,MAAM,UAAU,gBAAgB,SAAS;CAEzC,IAAI,CAAC,SAAS;EACZ,MACE,4KACF;EAEA,OAAOC,gBAAsB,GAAG,IAAI;CACtC;CAEA,OAAO,QAAQ,cAAc,GAAG,IAAI;AACtC"}

package/dist/types/index.d.ts

@@ -3,6 +3,9 @@ import { Locale } from "@intlayer/types/allLocales";
 import { StrictModeLocaleMap } from "@intlayer/types/module_augmentation";
 import { NextFunction, Request, RequestHandler, Response } from "express";
 //#region src/index.d.ts
+/**
+ * Builds the translation function bound to the locale stored in `res.locals`.
+ */
 export declare const translateFunction: (_req: Request, res: Response, _next?: NextFunction) => <T extends string>(content: StrictModeLocaleMap<T> | string, locale?: Locale) => T;
 /**
  * Express middleware that detects the user's locale and populates `res.locals` with Intlayer data.
@@ -10,7 +13,7 @@ export declare const translateFunction: (_req: Request, res: Response, _next?: N
  * It performs:
  * 1. Locale detection from cookies, headers, or default settings.
  * 2. Injects `t`, `getIntlayer`, and `getDictionary` functions into `res.locals`.
- * 3. Sets up a `cls-hooked` namespace for accessing these functions anywhere in the request lifecycle.
+ * 3. Sets up an `AsyncLocalStorage` context for accessing these functions anywhere in the request lifecycle.
  *
  * @returns An Express middleware function.
  *

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../../src/index.ts"],"mappings":";;;;;qBA0Ca,oBAAiB,MACrB,SAAO,KAAO,UAAQ,QAAU,kBACtC,kBAAgB,SACN,oBAAoB,aAAW,SAC/B,WACR;;;;;;;;;;;;;;;;;;;;qBAsDQ,gBAAe;;;;;;;;;;;;;;;;;;;;;;;qBAsFf,IAAK,kBAAgB,SACvB,oBAAoB,UAAQ,SAC5B,WACR;qBAyBU,oBAAoB;qBAsBpB,sBAAsB"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../../src/index.ts"],"mappings":";;;;;;;;qBA6Ea,oBAAiB,MACrB,SAAO,KAAO,UAAQ,QAAU,kBACtC,kBAAgB,SACN,oBAAoB,aAAW,SAC/B,WACR;;;;;;;;;;;;;;;;;;;;qBA4BQ,gBAAe;;;;;;;;;;;;;;;;;;;;;;;qBAmEf,IAAK,kBAAgB,SACvB,oBAAoB,UAAQ,SAC5B,WACR;qBAiBU,oBAAoB;qBAcpB,sBAAsB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-intlayer",
-  "version": "9.5.12",
+  "version": "9.7.0",
   "private": false,
   "description": "Manage internationalization i18n in a simple way for express application.",
   "keywords": [
@@ -76,16 +76,14 @@
     "typecheck": "tsc --noEmit --project tsconfig.types.json"
   },
   "dependencies": {
-    "@intlayer/config": "9.5.12",
-    "@intlayer/core": "9.5.12",
-    "@intlayer/engine": "9.5.12",
-    "@intlayer/types": "9.5.12",
-    "cls-hooked": "4.2.2"
+    "@intlayer/config": "9.7.0",
+    "@intlayer/core": "9.7.0",
+    "@intlayer/engine": "9.7.0",
+    "@intlayer/types": "9.7.0"
   },
   "devDependencies": {
-    "@types/cls-hooked": "4.3.9",
     "@types/express": "5.0.6",
-    "@types/node": "^22",
+    "@types/node": "^26",
     "@utils/ts-config": "1.0.4",
     "@utils/ts-config-types": "1.0.4",
     "@utils/tsdown-config": "1.0.4",
@@ -93,7 +91,7 @@
     "rimraf": "6.1.3",
     "tsdown": "0.23.0",
     "typescript": "7.0.2",
-    "vitest": "5.0.2"
+    "vitest": "5.0.3"
   },
   "engines": {
     "node": ">=14.18"