intor 2.2.5 → 2.2.7

package/dist/next/server/index.cjs

@@ -23,7 +23,7 @@ var Keyv__default = /*#__PURE__*/_interopDefault(Keyv);
 // src/adapters/next/shared/constants/pathname-header-name.ts
 var PATHNAME_HEADER_NAME = "x-intor-pathname";
 
-// src/shared/logger/global-logger-pool.ts
+// src/server/shared/logger/global-logger-pool.ts
 function getGlobalLoggerPool() {
   if (!globalThis.__INTOR_LOGGER_POOL__) {
     globalThis.__INTOR_LOGGER_POOL__ = /* @__PURE__ */ new Map();
@@ -31,7 +31,7 @@ function getGlobalLoggerPool() {
   return globalThis.__INTOR_LOGGER_POOL__;
 }
 
-// src/shared/logger/get-logger.ts
+// src/server/shared/logger/get-logger.ts
 var DEFAULT_FORMATTER_CONFIG = {
   node: { meta: { compact: true }, lineBreaksAfter: 1 }
 };
@@ -241,7 +241,7 @@ var getI18nContext = async (config) => {
   };
 };
 
-// src/modules/config/constants/cache.constants.ts
+// src/config/constants/cache.constants.ts
 var DEFAULT_CACHE_OPTIONS = {
   enabled: process.env.NODE_ENV === "production",
   ttl: 60 * 60 * 1e3
@@ -309,7 +309,7 @@ async function collectFileEntries({
   return results;
 }
 
-// src/modules/messages/shared/utils/is-valid-messages.ts
+// src/server/messages/shared/utils/is-valid-messages.ts
 function isPlainObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -335,7 +335,7 @@ async function jsonReader(filePath, readFile = fs__default.default.readFile) {
   return parsed;
 }
 
-// src/modules/messages/load-local-messages/read-locale-messages/parse-file-entries/utils/nest-object-from-path.ts
+// src/server/messages/load-local-messages/read-locale-messages/parse-file-entries/utils/nest-object-from-path.ts
 function nestObjectFromPath(path5, value) {
   let obj = value;
   for (let i = path5.length - 1; i >= 0; i--) {
@@ -344,7 +344,7 @@ function nestObjectFromPath(path5, value) {
   return obj;
 }
 
-// src/modules/messages/load-local-messages/read-locale-messages/parse-file-entries/parse-file-entries.ts
+// src/server/messages/load-local-messages/read-locale-messages/parse-file-entries/parse-file-entries.ts
 async function parseFileEntries({
   fileEntries,
   limit,
@@ -392,7 +392,7 @@ async function parseFileEntries({
   return result;
 }
 
-// src/modules/messages/load-local-messages/read-locale-messages/read-locale-messages.ts
+// src/server/messages/load-local-messages/read-locale-messages/read-locale-messages.ts
 var readLocaleMessages = async ({
   limit,
   rootDir = "messages",
@@ -421,7 +421,7 @@ function getGlobalMessagesPool() {
   return globalThis.__INTOR_MESSAGES_POOL__;
 }
 
-// src/modules/messages/load-local-messages/load-local-messages.ts
+// src/server/messages/load-local-messages/load-local-messages.ts
 var loadLocalMessages = async ({
   pool = getGlobalMessagesPool(),
   rootDir = "messages",
@@ -494,7 +494,7 @@ var loadLocalMessages = async ({
   return messages;
 };
 
-// src/modules/messages/load-remote-messages/fetch-locale-messages/fetch-locale-messages.ts
+// src/server/messages/load-remote-messages/fetch-locale-messages/fetch-locale-messages.ts
 var fetchLocaleMessages = async ({
   remoteUrl,
   remoteHeaders,
@@ -536,7 +536,7 @@ var fetchLocaleMessages = async ({
   }
 };
 
-// src/modules/messages/load-remote-messages/fetch-locale-messages/utils/build-search-params.ts
+// src/server/messages/load-remote-messages/fetch-locale-messages/utils/build-search-params.ts
 var buildSearchParams = (params) => {
   const searchParams = new URLSearchParams();
   const appendParam = (key, value) => {
@@ -554,7 +554,7 @@ var buildSearchParams = (params) => {
   return searchParams;
 };
 
-// src/modules/messages/load-remote-messages/load-remote-messages.ts
+// src/server/messages/load-remote-messages/load-remote-messages.ts
 var loadRemoteMessages = async ({
   pool = getGlobalMessagesPool(),
   rootDir,
@@ -623,7 +623,7 @@ var loadRemoteMessages = async ({
   return messages;
 };
 
-// src/modules/messages/load-messages.ts
+// src/server/messages/load-messages.ts
 var loadMessages = async ({
   config,
   locale,
@@ -689,17 +689,22 @@ var loadMessages = async ({
   return loadedMessages;
 };
 
-// src/modules/translator/get-translator.ts
-async function getTranslator(opts) {
-  const { config, locale, pathname = "", preKey, handlers } = opts;
-  const messages = await loadMessages({ config, locale, pathname });
+// src/server/translator/get-translator.ts
+async function getTranslator(options) {
+  const { config, locale, pathname = "", preKey } = options;
+  const messages = await loadMessages({
+    config,
+    locale,
+    pathname,
+    extraOptions: options.extraOptions
+  });
   const translator = new intorTranslator.Translator({
     locale,
     messages,
     fallbackLocales: config.fallbackLocales,
     loadingMessage: config.translator?.loadingMessage,
     placeholder: config.translator?.placeholder,
-    handlers
+    handlers: options.handlers
   });
   const props = { messages, locale };
   const scoped = translator.scoped(preKey);
@@ -711,12 +716,15 @@ async function getTranslator(opts) {
 }
 
 // src/adapters/next/server/get-translator.ts
-async function getTranslator2(config, preKey) {
+async function getTranslator2(options) {
+  const { config, preKey, handlers, extraOptions } = options;
   const { locale, pathname } = await getI18nContext(config);
   const translatorInstance = getTranslator({
     config,
     locale,
     pathname,
+    handlers,
+    extraOptions,
     preKey
   });
   return translatorInstance;

package/dist/next/server/index.d.cts

@@ -1,5 +1,7 @@
 import { Level, NormalizerConfig, FormatterConfig, LoggerPreset } from 'logry/edge';
-import { Locale, LocaleMessages, FallbackLocalesMap, ScopedLeafKeys, LocalizedLeafKeys, Replacement, LocalizedNodeKeys } from 'intor-translator';
+import { Locale, LocaleMessages, FallbackLocalesMap, NestedMessage, ScopedLeafKeys, LocalizedLeafKeys, Replacement, TranslateHandlers, LocalizedNodeKeys } from 'intor-translator';
+import Keyv from 'keyv';
+import { Logger } from 'logry';
 
 type CookieRawOptions = {
     /** Completely disable cookie usage (no read, no write, no lookup by name) - default: false */
@@ -162,6 +164,53 @@ interface I18nContext {
  */
 declare const getI18nContext: <CK extends GenConfigKeys = "__default__">(config: IntorResolvedConfig) => Promise<I18nContext>;
 
+/**
+ * Represents a collection of localized messages.
+ *
+ * - Each key is a namespace or message identifier, and the value is a
+ * `NestedMessage` object that can contain nested message structures.
+ *
+ * @example
+ * ```ts
+ * const messages: Messages = {
+ *   ui: {
+ *     greeting: "Hello",
+ *     farewell: "Goodbye"
+ *   },
+ *   errors: {
+ *     network: "Network error occurred"
+ *   }
+ * };
+ * ```
+ */
+type Messages = Record<string, NestedMessage>;
+/**
+ * A function that reads messages from a given file path.
+ *
+ * - This function is expected to return a `Promise` that resolves to a `Messages` object.
+ * - It can be implemented to support different file formats such as JSON, YAML, or others.
+ *
+ * @param filePath - The path to the message file to read.
+ * @returns A Promise that resolves to a `Messages` object.
+ *
+ * @example
+ * ```ts
+ * const reader: MessagesReader = async (filePath) => {
+ *   const content = await fs.promises.readFile(filePath, "utf-8");
+ *   return JSON.parse(content) as Messages;
+ * };
+ * ```
+ */
+type MessagesReader = (filePath: string) => Promise<Messages>;
+
+/**
+ * Global messages pool (cross-module + hot-reload safe)
+ */
+type MessagesPool = Keyv<LocaleMessages>;
+declare global {
+    var __INTOR_MESSAGES_POOL__: MessagesPool | undefined;
+}
+
 /** Base properties shared by all translator instances. */
 interface TranslatorBaseProps<M = unknown> {
     /** `messages`: The message object containing all translations. */
@@ -193,16 +242,38 @@ type TranslatorInstance<M, PK extends string | undefined = undefined> = {
     t: <Result = string>(key?: Key<M, PK>, replacements?: Replacement) => Result;
 } & TranslatorBaseProps<M> & TranslatorClientProps<M>;
 
+/**
+ * Global logger pool (cross-module + hot-reload safe)
+ */
+type LoggerPool = Map<string, Logger>;
+declare global {
+    var __INTOR_LOGGER_POOL__: LoggerPool | undefined;
+}
+
 /**
  * Create a translator instance ready for the current Next.js SSR environment.
  *
- * - Automatically resolves the current locale and pathname using the Next.js adapter.
- * - Loads all corresponding messages for the resolved locale and pathname.
- * - Returns a translator object containing `t`, `hasKey`, `messages`, and other helpers.
- * - Supports optional `preKey` to create a scoped translator for nested translation keys.
- * - Allows passing additional `TranslateConfig` options to the underlying translator.
+ * - **Automatically resolves the current locale and pathname using the Next.js adapter.**
+ * - Loads messages using the provided config, locale, and pathname.
+ * - Initializes a translator with `t`, `hasKey`, and optional scoped methods.
+ * - Supports optional `preKey` to create a scoped translator for nested keys.
  */
-declare function getTranslator<CK extends GenConfigKeys = "__default__">(config: IntorResolvedConfig): Promise<TranslatorInstance<GenMessages<CK>>>;
-declare function getTranslator<CK extends GenConfigKeys = "__default__", PK extends string = LocalizedNodeKeys<GenMessages<CK>>>(config: IntorResolvedConfig, preKey: IfGen<PK, string>): Promise<TranslatorInstance<GenMessages<CK>, PK>>;
+declare function getTranslator<CK extends GenConfigKeys = "__default__">(options: {
+    config: IntorResolvedConfig;
+    handlers?: TranslateHandlers;
+    extraOptions?: {
+        exts?: string[];
+        messagesReader?: MessagesReader;
+    };
+}): Promise<TranslatorInstance<GenMessages<CK>>>;
+declare function getTranslator<CK extends GenConfigKeys = "__default__", PK extends string = LocalizedNodeKeys<GenMessages<CK>>>(options: {
+    config: IntorResolvedConfig;
+    handlers?: TranslateHandlers;
+    extraOptions?: {
+        exts?: string[];
+        messagesReader?: MessagesReader;
+    };
+    preKey: IfGen<PK, string>;
+}): Promise<TranslatorInstance<GenMessages<CK>, PK>>;
 
 export { getI18nContext, getTranslator };

package/dist/next/server/index.d.ts

@@ -1,5 +1,7 @@
 import { Level, NormalizerConfig, FormatterConfig, LoggerPreset } from 'logry/edge';
-import { Locale, LocaleMessages, FallbackLocalesMap, ScopedLeafKeys, LocalizedLeafKeys, Replacement, LocalizedNodeKeys } from 'intor-translator';
+import { Locale, LocaleMessages, FallbackLocalesMap, NestedMessage, ScopedLeafKeys, LocalizedLeafKeys, Replacement, TranslateHandlers, LocalizedNodeKeys } from 'intor-translator';
+import Keyv from 'keyv';
+import { Logger } from 'logry';
 
 type CookieRawOptions = {
     /** Completely disable cookie usage (no read, no write, no lookup by name) - default: false */
@@ -162,6 +164,53 @@ interface I18nContext {
  */
 declare const getI18nContext: <CK extends GenConfigKeys = "__default__">(config: IntorResolvedConfig) => Promise<I18nContext>;
 
+/**
+ * Represents a collection of localized messages.
+ *
+ * - Each key is a namespace or message identifier, and the value is a
+ * `NestedMessage` object that can contain nested message structures.
+ *
+ * @example
+ * ```ts
+ * const messages: Messages = {
+ *   ui: {
+ *     greeting: "Hello",
+ *     farewell: "Goodbye"
+ *   },
+ *   errors: {
+ *     network: "Network error occurred"
+ *   }
+ * };
+ * ```
+ */
+type Messages = Record<string, NestedMessage>;
+/**
+ * A function that reads messages from a given file path.
+ *
+ * - This function is expected to return a `Promise` that resolves to a `Messages` object.
+ * - It can be implemented to support different file formats such as JSON, YAML, or others.
+ *
+ * @param filePath - The path to the message file to read.
+ * @returns A Promise that resolves to a `Messages` object.
+ *
+ * @example
+ * ```ts
+ * const reader: MessagesReader = async (filePath) => {
+ *   const content = await fs.promises.readFile(filePath, "utf-8");
+ *   return JSON.parse(content) as Messages;
+ * };
+ * ```
+ */
+type MessagesReader = (filePath: string) => Promise<Messages>;
+
+/**
+ * Global messages pool (cross-module + hot-reload safe)
+ */
+type MessagesPool = Keyv<LocaleMessages>;
+declare global {
+    var __INTOR_MESSAGES_POOL__: MessagesPool | undefined;
+}
+
 /** Base properties shared by all translator instances. */
 interface TranslatorBaseProps<M = unknown> {
     /** `messages`: The message object containing all translations. */
@@ -193,16 +242,38 @@ type TranslatorInstance<M, PK extends string | undefined = undefined> = {
     t: <Result = string>(key?: Key<M, PK>, replacements?: Replacement) => Result;
 } & TranslatorBaseProps<M> & TranslatorClientProps<M>;
 
+/**
+ * Global logger pool (cross-module + hot-reload safe)
+ */
+type LoggerPool = Map<string, Logger>;
+declare global {
+    var __INTOR_LOGGER_POOL__: LoggerPool | undefined;
+}
+
 /**
  * Create a translator instance ready for the current Next.js SSR environment.
  *
- * - Automatically resolves the current locale and pathname using the Next.js adapter.
- * - Loads all corresponding messages for the resolved locale and pathname.
- * - Returns a translator object containing `t`, `hasKey`, `messages`, and other helpers.
- * - Supports optional `preKey` to create a scoped translator for nested translation keys.
- * - Allows passing additional `TranslateConfig` options to the underlying translator.
+ * - **Automatically resolves the current locale and pathname using the Next.js adapter.**
+ * - Loads messages using the provided config, locale, and pathname.
+ * - Initializes a translator with `t`, `hasKey`, and optional scoped methods.
+ * - Supports optional `preKey` to create a scoped translator for nested keys.
  */
-declare function getTranslator<CK extends GenConfigKeys = "__default__">(config: IntorResolvedConfig): Promise<TranslatorInstance<GenMessages<CK>>>;
-declare function getTranslator<CK extends GenConfigKeys = "__default__", PK extends string = LocalizedNodeKeys<GenMessages<CK>>>(config: IntorResolvedConfig, preKey: IfGen<PK, string>): Promise<TranslatorInstance<GenMessages<CK>, PK>>;
+declare function getTranslator<CK extends GenConfigKeys = "__default__">(options: {
+    config: IntorResolvedConfig;
+    handlers?: TranslateHandlers;
+    extraOptions?: {
+        exts?: string[];
+        messagesReader?: MessagesReader;
+    };
+}): Promise<TranslatorInstance<GenMessages<CK>>>;
+declare function getTranslator<CK extends GenConfigKeys = "__default__", PK extends string = LocalizedNodeKeys<GenMessages<CK>>>(options: {
+    config: IntorResolvedConfig;
+    handlers?: TranslateHandlers;
+    extraOptions?: {
+        exts?: string[];
+        messagesReader?: MessagesReader;
+    };
+    preKey: IfGen<PK, string>;
+}): Promise<TranslatorInstance<GenMessages<CK>, PK>>;
 
 export { getI18nContext, getTranslator };

package/dist/next/server/index.js

@@ -13,7 +13,7 @@ import Keyv from 'keyv';
 // src/adapters/next/shared/constants/pathname-header-name.ts
 var PATHNAME_HEADER_NAME = "x-intor-pathname";
 
-// src/shared/logger/global-logger-pool.ts
+// src/server/shared/logger/global-logger-pool.ts
 function getGlobalLoggerPool() {
   if (!globalThis.__INTOR_LOGGER_POOL__) {
     globalThis.__INTOR_LOGGER_POOL__ = /* @__PURE__ */ new Map();
@@ -21,7 +21,7 @@ function getGlobalLoggerPool() {
   return globalThis.__INTOR_LOGGER_POOL__;
 }
 
-// src/shared/logger/get-logger.ts
+// src/server/shared/logger/get-logger.ts
 var DEFAULT_FORMATTER_CONFIG = {
   node: { meta: { compact: true }, lineBreaksAfter: 1 }
 };
@@ -231,7 +231,7 @@ var getI18nContext = async (config) => {
   };
 };
 
-// src/modules/config/constants/cache.constants.ts
+// src/config/constants/cache.constants.ts
 var DEFAULT_CACHE_OPTIONS = {
   enabled: process.env.NODE_ENV === "production",
   ttl: 60 * 60 * 1e3
@@ -299,7 +299,7 @@ async function collectFileEntries({
   return results;
 }
 
-// src/modules/messages/shared/utils/is-valid-messages.ts
+// src/server/messages/shared/utils/is-valid-messages.ts
 function isPlainObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -325,7 +325,7 @@ async function jsonReader(filePath, readFile = fs.readFile) {
   return parsed;
 }
 
-// src/modules/messages/load-local-messages/read-locale-messages/parse-file-entries/utils/nest-object-from-path.ts
+// src/server/messages/load-local-messages/read-locale-messages/parse-file-entries/utils/nest-object-from-path.ts
 function nestObjectFromPath(path5, value) {
   let obj = value;
   for (let i = path5.length - 1; i >= 0; i--) {
@@ -334,7 +334,7 @@ function nestObjectFromPath(path5, value) {
   return obj;
 }
 
-// src/modules/messages/load-local-messages/read-locale-messages/parse-file-entries/parse-file-entries.ts
+// src/server/messages/load-local-messages/read-locale-messages/parse-file-entries/parse-file-entries.ts
 async function parseFileEntries({
   fileEntries,
   limit,
@@ -382,7 +382,7 @@ async function parseFileEntries({
   return result;
 }
 
-// src/modules/messages/load-local-messages/read-locale-messages/read-locale-messages.ts
+// src/server/messages/load-local-messages/read-locale-messages/read-locale-messages.ts
 var readLocaleMessages = async ({
   limit,
   rootDir = "messages",
@@ -411,7 +411,7 @@ function getGlobalMessagesPool() {
   return globalThis.__INTOR_MESSAGES_POOL__;
 }
 
-// src/modules/messages/load-local-messages/load-local-messages.ts
+// src/server/messages/load-local-messages/load-local-messages.ts
 var loadLocalMessages = async ({
   pool = getGlobalMessagesPool(),
   rootDir = "messages",
@@ -484,7 +484,7 @@ var loadLocalMessages = async ({
   return messages;
 };
 
-// src/modules/messages/load-remote-messages/fetch-locale-messages/fetch-locale-messages.ts
+// src/server/messages/load-remote-messages/fetch-locale-messages/fetch-locale-messages.ts
 var fetchLocaleMessages = async ({
   remoteUrl,
   remoteHeaders,
@@ -526,7 +526,7 @@ var fetchLocaleMessages = async ({
   }
 };
 
-// src/modules/messages/load-remote-messages/fetch-locale-messages/utils/build-search-params.ts
+// src/server/messages/load-remote-messages/fetch-locale-messages/utils/build-search-params.ts
 var buildSearchParams = (params) => {
   const searchParams = new URLSearchParams();
   const appendParam = (key, value) => {
@@ -544,7 +544,7 @@ var buildSearchParams = (params) => {
   return searchParams;
 };
 
-// src/modules/messages/load-remote-messages/load-remote-messages.ts
+// src/server/messages/load-remote-messages/load-remote-messages.ts
 var loadRemoteMessages = async ({
   pool = getGlobalMessagesPool(),
   rootDir,
@@ -613,7 +613,7 @@ var loadRemoteMessages = async ({
   return messages;
 };
 
-// src/modules/messages/load-messages.ts
+// src/server/messages/load-messages.ts
 var loadMessages = async ({
   config,
   locale,
@@ -679,17 +679,22 @@ var loadMessages = async ({
   return loadedMessages;
 };
 
-// src/modules/translator/get-translator.ts
-async function getTranslator(opts) {
-  const { config, locale, pathname = "", preKey, handlers } = opts;
-  const messages = await loadMessages({ config, locale, pathname });
+// src/server/translator/get-translator.ts
+async function getTranslator(options) {
+  const { config, locale, pathname = "", preKey } = options;
+  const messages = await loadMessages({
+    config,
+    locale,
+    pathname,
+    extraOptions: options.extraOptions
+  });
   const translator = new Translator({
     locale,
     messages,
     fallbackLocales: config.fallbackLocales,
     loadingMessage: config.translator?.loadingMessage,
     placeholder: config.translator?.placeholder,
-    handlers
+    handlers: options.handlers
   });
   const props = { messages, locale };
   const scoped = translator.scoped(preKey);
@@ -701,12 +706,15 @@ async function getTranslator(opts) {
 }
 
 // src/adapters/next/server/get-translator.ts
-async function getTranslator2(config, preKey) {
+async function getTranslator2(options) {
+  const { config, preKey, handlers, extraOptions } = options;
   const { locale, pathname } = await getI18nContext(config);
   const translatorInstance = getTranslator({
     config,
     locale,
     pathname,
+    handlers,
+    extraOptions,
     preKey
   });
   return translatorInstance;