express-intlayer 7.0.0 → 7.0.2-canary.0

package/dist/cjs/index.cjs

@@ -10,22 +10,14 @@ cls_hooked = require_rolldown_runtime.__toESM(cls_hooked);
 
 //#region src/index.ts
 const configuration = (0, __intlayer_config.getConfiguration)();
-const { routing, internationalization } = configuration;
-const { headerName } = routing;
-const getCookieNames = (storage) => {
-	if (!storage) return [];
-	if (typeof storage === "string") return storage === "cookie" ? [__intlayer_config.DefaultValues.Routing.COOKIE_NAME] : [__intlayer_config.DefaultValues.Routing.COOKIE_NAME];
-	if (Array.isArray(storage)) {
-		const cookieNames$1 = [];
-		for (const item of storage) if (typeof item === "string") {
-			if (item === "cookie") cookieNames$1.push(__intlayer_config.DefaultValues.Routing.COOKIE_NAME);
-		} else if (typeof item === "object" && item.type === "cookie") cookieNames$1.push(item.name ?? __intlayer_config.DefaultValues.Routing.COOKIE_NAME);
-		return cookieNames$1.length > 0 ? cookieNames$1 : [__intlayer_config.DefaultValues.Routing.COOKIE_NAME];
-	}
-	if (typeof storage === "object" && "type" in storage) return storage.type === "cookie" ? [storage.name ?? __intlayer_config.DefaultValues.Routing.COOKIE_NAME] : [__intlayer_config.DefaultValues.Routing.COOKIE_NAME];
-	return [__intlayer_config.DefaultValues.Routing.COOKIE_NAME];
-};
-const cookieNames = getCookieNames(routing.storage);
+const { internationalization } = configuration;
+/**
+* Retrieves the locale from storage (cookies, localStorage, sessionStorage).
+*/
+const getStorageLocale = (req) => (0, __intlayer_core.getLocaleFromStorage)({
+	getCookie: (name) => req.cookies?.[name],
+	getHeader: (name) => req.headers?.[name]
+});
 const appNamespace = (0, cls_hooked.createNamespace)("app");
 (0, __intlayer_chokidar.prepareIntlayer)(configuration);
 const translateFunction = (_req, res, _next) => (content, locale) => {
@@ -43,21 +35,15 @@ const translateFunction = (_req, res, _next) => (content, locale) => {
 * @returns
 */
 const intlayer = () => async (req, res, next) => {
-	let localeCookie;
-	for (const cookieName of cookieNames) if (req.cookies?.[cookieName]) {
-		localeCookie = req.cookies[cookieName];
-		break;
-	}
-	const localeHeader = req.headers?.[headerName];
+	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.localeDetector)(negotiatorHeaders, internationalization.locales, internationalization.defaultLocale);
-	res.locals.locale_header = localeHeader;
-	res.locals.locale_cookie = localeCookie;
+	res.locals.locale_storage = localeFromStorage;
 	res.locals.locale_detected = localeDetected;
-	res.locals.locale = localeCookie ?? localeHeader ?? localeDetected;
+	res.locals.locale = localeFromStorage ?? localeDetected;
 	res.locals.defaultLocale = internationalization.defaultLocale;
 	const t$1 = translateFunction(req, res, next);
 	const getIntlayer$1 = (key, localeArg = localeDetected, ...props) => (0, __intlayer_core.getIntlayer)(key, localeArg, ...props);

package/dist/cjs/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","names":["DefaultValues","cookieNames: string[]","cookieNames","localeCookie: string | undefined","negotiatorHeaders: Record<string, string>","t","getIntlayer: typeof getIntlayerFunction","getDictionary: typeof getDictionaryFunction","getIntlayer","getDictionary"],"sources":["../../src/index.ts"],"sourcesContent":["import { prepareIntlayer } from '@intlayer/chokidar';\nimport { DefaultValues, getConfiguration } from '@intlayer/config';\nimport {\n  getDictionary as getDictionaryFunction,\n  getIntlayer as getIntlayerFunction,\n  getTranslation,\n  localeDetector,\n} from '@intlayer/core';\nimport type {\n  Locale,\n  RoutingConfig,\n  StrictModeLocaleMap,\n} from '@intlayer/types';\nimport { createNamespace } from 'cls-hooked';\nimport type { NextFunction, Request, RequestHandler, Response } from 'express';\n\nconst configuration = getConfiguration();\nconst { routing, internationalization } = configuration;\nconst { headerName } = routing;\n\nconst getCookieNames = (storage: RoutingConfig['storage']): string[] => {\n  // If storage is disabled, return default cookie name\n  if (!storage) {\n    return [];\n  }\n\n  // If storage is a string\n  if (typeof storage === 'string') {\n    // Only 'cookie' string means use default cookie\n    return storage === 'cookie'\n      ? [DefaultValues.Routing.COOKIE_NAME]\n      : [DefaultValues.Routing.COOKIE_NAME];\n  }\n\n  // If storage is an array\n  if (Array.isArray(storage)) {\n    const cookieNames: string[] = [];\n    for (const item of storage) {\n      if (typeof item === 'string') {\n        if (item === 'cookie') {\n          cookieNames.push(DefaultValues.Routing.COOKIE_NAME);\n        }\n      } else if (typeof item === 'object' && item.type === 'cookie') {\n        cookieNames.push(item.name ?? DefaultValues.Routing.COOKIE_NAME);\n      }\n    }\n    return cookieNames.length > 0\n      ? cookieNames\n      : [DefaultValues.Routing.COOKIE_NAME];\n  }\n\n  // If storage is an object (CookiesAttributes or LocaleStorageAttributes)\n  if (typeof storage === 'object' && 'type' in storage) {\n    return storage.type === 'cookie'\n      ? [storage.name ?? DefaultValues.Routing.COOKIE_NAME]\n      : [DefaultValues.Routing.COOKIE_NAME];\n  }\n\n  return [DefaultValues.Routing.COOKIE_NAME];\n};\n\nconst cookieNames = getCookieNames(routing.storage);\n\nconst appNamespace = createNamespace('app');\n\nprepareIntlayer(configuration);\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 * Detect locale used by the user and load it into res locale storage\n *\n * @returns\n */\nexport const intlayer = (): RequestHandler => async (req, res, next) => {\n  // Detect if locale is set by intlayer frontend lib in the cookies\n  // Check all possible cookie names and use the first one found\n  let localeCookie: string | undefined;\n  for (const cookieName of cookieNames) {\n    if (req.cookies?.[cookieName]) {\n      localeCookie = req.cookies[cookieName];\n      break;\n    }\n  }\n  // Detect if locale is set by intlayer frontend lib in the headers\n  const localeHeader = req.headers?.[headerName];\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_header = localeHeader;\n  res.locals.locale_cookie = localeCookie;\n  res.locals.locale_detected = localeDetected;\n  res.locals.locale = localeCookie ?? localeHeader ?? localeDetected;\n  res.locals.defaultLocale = internationalization.defaultLocale;\n\n  const t = translateFunction(req, res, next);\n\n  const getIntlayer: typeof getIntlayerFunction = (\n    key,\n    localeArg = localeDetected as Parameters<typeof getIntlayerFunction>[1],\n    ...props\n  ) => getIntlayerFunction(key, localeArg, ...props);\n\n  const getDictionary: typeof getDictionaryFunction = (\n    key,\n    localeArg = localeDetected as Parameters<typeof getDictionaryFunction>[1],\n    ...props\n  ) => getDictionaryFunction(key, localeArg, ...props);\n\n  res.locals.t = t;\n  res.locals.getIntlayer = getIntlayer;\n  res.locals.getDictionary = getDictionary;\n\n  appNamespace.run(() => {\n    appNamespace.set('t', t);\n    appNamespace.set('getIntlayer', getIntlayer);\n    appNamespace.set('getDictionary', getDictionary);\n\n    next();\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    if (process.env.NODE_ENV === 'development') {\n      console.error((error as Error).message);\n    }\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    if (process.env.NODE_ENV === 'development') {\n      console.error((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    if (process.env.NODE_ENV === 'development') {\n      console.error((error as Error).message);\n    }\n    return getDictionaryFunction(...args);\n  }\n};\n"],"mappings":"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"}
+{"version":3,"file":"index.cjs","names":["negotiatorHeaders: Record<string, string>","t","getIntlayer: typeof getIntlayerFunction","getDictionary: typeof getDictionaryFunction","getIntlayer","getDictionary"],"sources":["../../src/index.ts"],"sourcesContent":["import { prepareIntlayer } from '@intlayer/chokidar';\nimport { DefaultValues, getConfiguration } from '@intlayer/config';\nimport {\n  getDictionary as getDictionaryFunction,\n  getIntlayer as getIntlayerFunction,\n  getLocaleFromStorage,\n  getTranslation,\n  localeDetector,\n} from '@intlayer/core';\nimport type { Locale, StrictModeLocaleMap } from '@intlayer/types';\nimport { createNamespace } from 'cls-hooked';\nimport type { NextFunction, Request, RequestHandler, Response } from 'express';\n\nconst configuration = getConfiguration();\nconst { internationalization } = configuration;\n\n/**\n * Retrieves the locale from storage (cookies, localStorage, sessionStorage).\n */\nconst getStorageLocale = (req: Request): Locale | undefined =>\n  getLocaleFromStorage({\n    getCookie: (name: string) => req.cookies?.[name],\n    getHeader: (name: string) => req.headers?.[name] as string | undefined,\n  });\n\nconst appNamespace = createNamespace('app');\n\nprepareIntlayer(configuration);\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 * Detect locale used by the user and load it into res locale storage\n *\n * @returns\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  res.locals.locale = localeFromStorage ?? localeDetected;\n  res.locals.defaultLocale = internationalization.defaultLocale;\n\n  const t = translateFunction(req, res, next);\n\n  const getIntlayer: typeof getIntlayerFunction = (\n    key,\n    localeArg = localeDetected as Parameters<typeof getIntlayerFunction>[1],\n    ...props\n  ) => getIntlayerFunction(key, localeArg, ...props);\n\n  const getDictionary: typeof getDictionaryFunction = (\n    key,\n    localeArg = localeDetected as Parameters<typeof getDictionaryFunction>[1],\n    ...props\n  ) => getDictionaryFunction(key, localeArg, ...props);\n\n  res.locals.t = t;\n  res.locals.getIntlayer = getIntlayer;\n  res.locals.getDictionary = getDictionary;\n\n  appNamespace.run(() => {\n    appNamespace.set('t', t);\n    appNamespace.set('getIntlayer', getIntlayer);\n    appNamespace.set('getDictionary', getDictionary);\n\n    next();\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    if (process.env.NODE_ENV === 'development') {\n      console.error((error as Error).message);\n    }\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    if (process.env.NODE_ENV === 'development') {\n      console.error((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    if (process.env.NODE_ENV === 'development') {\n      console.error((error as Error).message);\n    }\n    return getDictionaryFunction(...args);\n  }\n};\n"],"mappings":"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"}

package/dist/esm/index.mjs

@@ -1,26 +1,18 @@
 import { prepareIntlayer } from "@intlayer/chokidar";
-import { DefaultValues, getConfiguration } from "@intlayer/config";
-import { getDictionary as getDictionary$1, getIntlayer as getIntlayer$1, getTranslation, localeDetector } from "@intlayer/core";
+import { getConfiguration } from "@intlayer/config";
+import { getDictionary as getDictionary$1, getIntlayer as getIntlayer$1, getLocaleFromStorage, getTranslation, localeDetector } from "@intlayer/core";
 import { createNamespace } from "cls-hooked";
 
 //#region src/index.ts
 const configuration = getConfiguration();
-const { routing, internationalization } = configuration;
-const { headerName } = routing;
-const getCookieNames = (storage) => {
-	if (!storage) return [];
-	if (typeof storage === "string") return storage === "cookie" ? [DefaultValues.Routing.COOKIE_NAME] : [DefaultValues.Routing.COOKIE_NAME];
-	if (Array.isArray(storage)) {
-		const cookieNames$1 = [];
-		for (const item of storage) if (typeof item === "string") {
-			if (item === "cookie") cookieNames$1.push(DefaultValues.Routing.COOKIE_NAME);
-		} else if (typeof item === "object" && item.type === "cookie") cookieNames$1.push(item.name ?? DefaultValues.Routing.COOKIE_NAME);
-		return cookieNames$1.length > 0 ? cookieNames$1 : [DefaultValues.Routing.COOKIE_NAME];
-	}
-	if (typeof storage === "object" && "type" in storage) return storage.type === "cookie" ? [storage.name ?? DefaultValues.Routing.COOKIE_NAME] : [DefaultValues.Routing.COOKIE_NAME];
-	return [DefaultValues.Routing.COOKIE_NAME];
-};
-const cookieNames = getCookieNames(routing.storage);
+const { internationalization } = configuration;
+/**
+* Retrieves the locale from storage (cookies, localStorage, sessionStorage).
+*/
+const getStorageLocale = (req) => getLocaleFromStorage({
+	getCookie: (name) => req.cookies?.[name],
+	getHeader: (name) => req.headers?.[name]
+});
 const appNamespace = createNamespace("app");
 prepareIntlayer(configuration);
 const translateFunction = (_req, res, _next) => (content, locale) => {
@@ -38,21 +30,15 @@ const translateFunction = (_req, res, _next) => (content, locale) => {
 * @returns
 */
 const intlayer = () => async (req, res, next) => {
-	let localeCookie;
-	for (const cookieName of cookieNames) if (req.cookies?.[cookieName]) {
-		localeCookie = req.cookies[cookieName];
-		break;
-	}
-	const localeHeader = req.headers?.[headerName];
+	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);
-	res.locals.locale_header = localeHeader;
-	res.locals.locale_cookie = localeCookie;
+	res.locals.locale_storage = localeFromStorage;
 	res.locals.locale_detected = localeDetected;
-	res.locals.locale = localeCookie ?? localeHeader ?? localeDetected;
+	res.locals.locale = localeFromStorage ?? localeDetected;
 	res.locals.defaultLocale = internationalization.defaultLocale;
 	const t$1 = translateFunction(req, res, next);
 	const getIntlayer$2 = (key, localeArg = localeDetected, ...props) => getIntlayer$1(key, localeArg, ...props);

package/dist/esm/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":["cookieNames: string[]","cookieNames","localeCookie: string | undefined","negotiatorHeaders: Record<string, string>","t","getIntlayer: typeof getIntlayerFunction","getIntlayerFunction","getDictionary: typeof getDictionaryFunction","getDictionaryFunction","getIntlayer","getDictionary"],"sources":["../../src/index.ts"],"sourcesContent":["import { prepareIntlayer } from '@intlayer/chokidar';\nimport { DefaultValues, getConfiguration } from '@intlayer/config';\nimport {\n  getDictionary as getDictionaryFunction,\n  getIntlayer as getIntlayerFunction,\n  getTranslation,\n  localeDetector,\n} from '@intlayer/core';\nimport type {\n  Locale,\n  RoutingConfig,\n  StrictModeLocaleMap,\n} from '@intlayer/types';\nimport { createNamespace } from 'cls-hooked';\nimport type { NextFunction, Request, RequestHandler, Response } from 'express';\n\nconst configuration = getConfiguration();\nconst { routing, internationalization } = configuration;\nconst { headerName } = routing;\n\nconst getCookieNames = (storage: RoutingConfig['storage']): string[] => {\n  // If storage is disabled, return default cookie name\n  if (!storage) {\n    return [];\n  }\n\n  // If storage is a string\n  if (typeof storage === 'string') {\n    // Only 'cookie' string means use default cookie\n    return storage === 'cookie'\n      ? [DefaultValues.Routing.COOKIE_NAME]\n      : [DefaultValues.Routing.COOKIE_NAME];\n  }\n\n  // If storage is an array\n  if (Array.isArray(storage)) {\n    const cookieNames: string[] = [];\n    for (const item of storage) {\n      if (typeof item === 'string') {\n        if (item === 'cookie') {\n          cookieNames.push(DefaultValues.Routing.COOKIE_NAME);\n        }\n      } else if (typeof item === 'object' && item.type === 'cookie') {\n        cookieNames.push(item.name ?? DefaultValues.Routing.COOKIE_NAME);\n      }\n    }\n    return cookieNames.length > 0\n      ? cookieNames\n      : [DefaultValues.Routing.COOKIE_NAME];\n  }\n\n  // If storage is an object (CookiesAttributes or LocaleStorageAttributes)\n  if (typeof storage === 'object' && 'type' in storage) {\n    return storage.type === 'cookie'\n      ? [storage.name ?? DefaultValues.Routing.COOKIE_NAME]\n      : [DefaultValues.Routing.COOKIE_NAME];\n  }\n\n  return [DefaultValues.Routing.COOKIE_NAME];\n};\n\nconst cookieNames = getCookieNames(routing.storage);\n\nconst appNamespace = createNamespace('app');\n\nprepareIntlayer(configuration);\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 * Detect locale used by the user and load it into res locale storage\n *\n * @returns\n */\nexport const intlayer = (): RequestHandler => async (req, res, next) => {\n  // Detect if locale is set by intlayer frontend lib in the cookies\n  // Check all possible cookie names and use the first one found\n  let localeCookie: string | undefined;\n  for (const cookieName of cookieNames) {\n    if (req.cookies?.[cookieName]) {\n      localeCookie = req.cookies[cookieName];\n      break;\n    }\n  }\n  // Detect if locale is set by intlayer frontend lib in the headers\n  const localeHeader = req.headers?.[headerName];\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_header = localeHeader;\n  res.locals.locale_cookie = localeCookie;\n  res.locals.locale_detected = localeDetected;\n  res.locals.locale = localeCookie ?? localeHeader ?? localeDetected;\n  res.locals.defaultLocale = internationalization.defaultLocale;\n\n  const t = translateFunction(req, res, next);\n\n  const getIntlayer: typeof getIntlayerFunction = (\n    key,\n    localeArg = localeDetected as Parameters<typeof getIntlayerFunction>[1],\n    ...props\n  ) => getIntlayerFunction(key, localeArg, ...props);\n\n  const getDictionary: typeof getDictionaryFunction = (\n    key,\n    localeArg = localeDetected as Parameters<typeof getDictionaryFunction>[1],\n    ...props\n  ) => getDictionaryFunction(key, localeArg, ...props);\n\n  res.locals.t = t;\n  res.locals.getIntlayer = getIntlayer;\n  res.locals.getDictionary = getDictionary;\n\n  appNamespace.run(() => {\n    appNamespace.set('t', t);\n    appNamespace.set('getIntlayer', getIntlayer);\n    appNamespace.set('getDictionary', getDictionary);\n\n    next();\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    if (process.env.NODE_ENV === 'development') {\n      console.error((error as Error).message);\n    }\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    if (process.env.NODE_ENV === 'development') {\n      console.error((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    if (process.env.NODE_ENV === 'development') {\n      console.error((error as Error).message);\n    }\n    return getDictionaryFunction(...args);\n  }\n};\n"],"mappings":"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"}
+{"version":3,"file":"index.mjs","names":["negotiatorHeaders: Record<string, string>","t","getIntlayer: typeof getIntlayerFunction","getIntlayerFunction","getDictionary: typeof getDictionaryFunction","getDictionaryFunction","getIntlayer","getDictionary"],"sources":["../../src/index.ts"],"sourcesContent":["import { prepareIntlayer } from '@intlayer/chokidar';\nimport { DefaultValues, getConfiguration } from '@intlayer/config';\nimport {\n  getDictionary as getDictionaryFunction,\n  getIntlayer as getIntlayerFunction,\n  getLocaleFromStorage,\n  getTranslation,\n  localeDetector,\n} from '@intlayer/core';\nimport type { Locale, StrictModeLocaleMap } from '@intlayer/types';\nimport { createNamespace } from 'cls-hooked';\nimport type { NextFunction, Request, RequestHandler, Response } from 'express';\n\nconst configuration = getConfiguration();\nconst { internationalization } = configuration;\n\n/**\n * Retrieves the locale from storage (cookies, localStorage, sessionStorage).\n */\nconst getStorageLocale = (req: Request): Locale | undefined =>\n  getLocaleFromStorage({\n    getCookie: (name: string) => req.cookies?.[name],\n    getHeader: (name: string) => req.headers?.[name] as string | undefined,\n  });\n\nconst appNamespace = createNamespace('app');\n\nprepareIntlayer(configuration);\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 * Detect locale used by the user and load it into res locale storage\n *\n * @returns\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  res.locals.locale = localeFromStorage ?? localeDetected;\n  res.locals.defaultLocale = internationalization.defaultLocale;\n\n  const t = translateFunction(req, res, next);\n\n  const getIntlayer: typeof getIntlayerFunction = (\n    key,\n    localeArg = localeDetected as Parameters<typeof getIntlayerFunction>[1],\n    ...props\n  ) => getIntlayerFunction(key, localeArg, ...props);\n\n  const getDictionary: typeof getDictionaryFunction = (\n    key,\n    localeArg = localeDetected as Parameters<typeof getDictionaryFunction>[1],\n    ...props\n  ) => getDictionaryFunction(key, localeArg, ...props);\n\n  res.locals.t = t;\n  res.locals.getIntlayer = getIntlayer;\n  res.locals.getDictionary = getDictionary;\n\n  appNamespace.run(() => {\n    appNamespace.set('t', t);\n    appNamespace.set('getIntlayer', getIntlayer);\n    appNamespace.set('getDictionary', getDictionary);\n\n    next();\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    if (process.env.NODE_ENV === 'development') {\n      console.error((error as Error).message);\n    }\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    if (process.env.NODE_ENV === 'development') {\n      console.error((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    if (process.env.NODE_ENV === 'development') {\n      console.error((error as Error).message);\n    }\n    return getDictionaryFunction(...args);\n  }\n};\n"],"mappings":";;;;;;AAaA,MAAM,gBAAgB,kBAAkB;AACxC,MAAM,EAAE,yBAAyB;;;;AAKjC,MAAM,oBAAoB,QACxB,qBAAqB;CACnB,YAAY,SAAiB,IAAI,UAAU;CAC3C,YAAY,SAAiB,IAAI,UAAU;CAC5C,CAAC;AAEJ,MAAM,eAAe,gBAAgB,MAAM;AAE3C,gBAAgB,cAAc;AAE9B,MAAa,qBACV,MAAe,KAAe,WAE7B,SACA,WACM;CACN,MAAM,EAAE,QAAQ,eAAe,kBAAkB,IAAI;CAKrD,MAAM,eAAe,UAAU;AAE/B,KAAI,OAAO,YAAY,YACrB,QAAO;AAGT,KAAI,OAAO,YAAY,SACrB,QAAO;AAGT,KACE,OAAO,UACL,kBACI,YAEN,KACE,OAAO,UACL,mBACI,YAEN,QAAO;KAEP,QAAO,eAAe,SAAS,cAAc;AAIjD,QAAO,eAAe,SAAS,aAAa;;;;;;;AAQhD,MAAa,iBAAiC,OAAO,KAAK,KAAK,SAAS;CAEtE,MAAM,oBAAoB,iBAAiB,IAAI;CAG/C,MAAMA,oBAA4C,EAAE;AAGpD,KAAI,OAAO,OAAO,IAAI,YAAY,UAEhC;OAAK,MAAM,OAAO,IAAI,QACpB,KAAI,OAAO,IAAI,QAAQ,SAAS,SAC9B,mBAAkB,OAAO,IAAI,QAAQ;;CAK3C,MAAM,iBAAiB,eACrB,mBACA,qBAAqB,SACrB,qBAAqB,cACtB;AAED,KAAI,OAAO,iBAAiB;AAC5B,KAAI,OAAO,kBAAkB;AAC7B,KAAI,OAAO,SAAS,qBAAqB;AACzC,KAAI,OAAO,gBAAgB,qBAAqB;CAEhD,MAAMC,MAAI,kBAAkB,KAAK,KAAK,KAAK;CAE3C,MAAMC,iBACJ,KACA,YAAY,gBACZ,GAAG,UACAC,cAAoB,KAAK,WAAW,GAAG,MAAM;CAElD,MAAMC,mBACJ,KACA,YAAY,gBACZ,GAAG,UACAC,gBAAsB,KAAK,WAAW,GAAG,MAAM;AAEpD,KAAI,OAAO,IAAIJ;AACf,KAAI,OAAO,cAAcK;AACzB,KAAI,OAAO,gBAAgBC;AAE3B,cAAa,UAAU;AACrB,eAAa,IAAI,KAAKN,IAAE;AACxB,eAAa,IAAI,eAAeK,cAAY;AAC5C,eAAa,IAAI,iBAAiBC,gBAAc;AAEhD,QAAM;GACN;;AAGJ,MAAa,KACX,SACA,WACY;AACZ,KAAI;AACF,MAAI,OAAO,iBAAiB,YAC1B,OAAM,IAAI,MACR,qGACD;AAGH,MAAI,OAAO,aAAa,IAAI,IAAI,KAAK,WACnC,OAAM,IAAI,MACR,8HACD;AAGH,SAAO,aAAa,IAAI,IAAI,CAAC,SAAS,OAAO;UACtC,OAAO;AAEZ,UAAQ,MAAO,MAAgB,QAAQ;AAGzC,SAAO,eACL,SACA,UAAU,qBAAqB,cAChC;;;AAIL,MAAaL,eAA2C,GAAG,SAAS;AAClE,KAAI;AACF,MAAI,OAAO,iBAAiB,YAC1B,OAAM,IAAI,MACR,qGACD;AAGH,MAAI,OAAO,aAAa,IAAI,cAAc,KAAK,WAC7C,OAAM,IAAI,MACR,8HACD;AAGH,SAAO,aAAa,IAAI,cAAc,CAAC,GAAG,KAAK;UACxC,OAAO;AAEZ,UAAQ,MAAO,MAAgB,QAAQ;AAEzC,SAAOC,cAAoB,GAAG,KAAK;;;AAIvC,MAAaC,iBAA+C,GAAG,SAAS;AACtE,KAAI;AACF,MAAI,OAAO,iBAAiB,YAC1B,OAAM,IAAI,MACR,qGACD;AAGH,MAAI,OAAO,aAAa,IAAI,gBAAgB,KAAK,WAC/C,OAAM,IAAI,MACR,8HACD;AAGH,SAAO,aAAa,IAAI,gBAAgB,CAAC,GAAG,KAAK;UAC1C,OAAO;AAEZ,UAAQ,MAAO,MAAgB,QAAQ;AAEzC,SAAOC,gBAAsB,GAAG,KAAK"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../../src/index.ts"],"sourcesContent":[],"mappings":";;;;;cAmEa,0BACJ,cAAc,kBAAkB,6CAE5B,oBAAoB,sBACpB,WACR;;AALL;;;;AAGiC,cA0CpB,QA1CoB,EAAA,GAAA,GA0CL,cA1CK;AAApB,cA2GA,CA3GA,EAAA,CAAA,UAAA,MAAA,CAAA,CAAA,OAAA,EA4GF,mBA5GE,CA4GkB,OA5GlB,CAAA,EAAA,MAAA,CAAA,EA6GF,MA7GE,EAAA,GA8GV,OA9GU;AACA,cAwIA,WAxIA,EAAA,OAwIoB,aAxIpB;AACR,cA8JQ,aA9JR,EAAA,OA8J8B,eA9J9B"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../../src/index.ts"],"sourcesContent":[],"mappings":";;;;;cA6Ba,0BACJ,cAAc,kBAAkB,6CAE5B,oBAAoB,sBACpB,WACR;;AALL;;;;AAGiC,cA0CpB,QA1CoB,EAAA,GAAA,GA0CL,cA1CK;AAApB,cAiGA,CAjGA,EAAA,CAAA,UAAA,MAAA,CAAA,CAAA,OAAA,EAkGF,mBAlGE,CAkGkB,OAlGlB,CAAA,EAAA,MAAA,CAAA,EAmGF,MAnGE,EAAA,GAoGV,OApGU;AACA,cA8HA,WA9HA,EAAA,OA8HoB,aA9HpB;AACR,cAoJQ,aApJR,EAAA,OAoJ8B,eApJ9B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-intlayer",
-  "version": "7.0.0",
+  "version": "7.0.2-canary.0",
   "private": false,
   "description": "Manage internationalization i18n in a simple way for express application.",
   "keywords": [
@@ -72,20 +72,20 @@
     "typecheck": "tsc --noEmit --project tsconfig.types.json"
   },
   "dependencies": {
-    "@intlayer/chokidar": "7.0.0",
-    "@intlayer/config": "7.0.0",
-    "@intlayer/core": "7.0.0",
-    "@intlayer/types": "7.0.0",
+    "@intlayer/chokidar": "7.0.2-canary.0",
+    "@intlayer/config": "7.0.2-canary.0",
+    "@intlayer/core": "7.0.2-canary.0",
+    "@intlayer/types": "7.0.2-canary.0",
     "cls-hooked": "4.2.2",
-    "intlayer": "7.0.0"
+    "intlayer": "7.0.2-canary.0"
   },
   "devDependencies": {
     "@types/cls-hooked": "4.3.9",
     "@types/express": "5.0.3",
     "@types/node": "24.9.1",
-    "@utils/ts-config": "7.0.0",
-    "@utils/ts-config-types": "7.0.0",
-    "@utils/tsdown-config": "7.0.0",
+    "@utils/ts-config": "7.0.2-canary.0",
+    "@utils/ts-config-types": "7.0.2-canary.0",
+    "@utils/tsdown-config": "7.0.2-canary.0",
     "express": "5.1.0",
     "rimraf": "6.0.1",
     "tsdown": "0.15.9",
@@ -93,10 +93,10 @@
     "vitest": "4.0.3"
   },
   "peerDependencies": {
-    "@intlayer/chokidar": "7.0.0",
-    "@intlayer/config": "7.0.0",
-    "@intlayer/core": "7.0.0",
-    "@intlayer/types": "7.0.0"
+    "@intlayer/chokidar": "7.0.2-canary.0",
+    "@intlayer/config": "7.0.2-canary.0",
+    "@intlayer/core": "7.0.2-canary.0",
+    "@intlayer/types": "7.0.2-canary.0"
   },
   "engines": {
     "node": ">=14.18"