intor 2.3.6 → 2.3.7

package/dist/next/src/adapters/next/navigation/link.js

@@ -4,18 +4,7 @@ import { formatUrl } from 'next/dist/shared/lib/router/utils/format-url';
 import NextLink from 'next/link';
 import 'react';
 import { usePathname } from './use-pathname.js';
-import '../../../client/react/contexts/config/context.js';
-import 'intor/react';
-import '../../../client/react/contexts/locale/context.js';
-import '../../../config/constants/cache.constants.js';
-import 'logry';
-import 'keyv';
-import '../../../client/react/contexts/messages/context.js';
-import 'intor-translator';
-import '../../../client/react/contexts/translator-runtime/context.js';
-import '../../../client/react/contexts/translator/context.js';
-import { useNavigationTarget } from '../../../client/react/navigation/use-navigation-target.js';
-import { useNavigationStrategy } from '../../../client/react/navigation/use-navigation-strategy.js';
+import { useNavigationTarget, useNavigationStrategy } from 'intor/react';
 
 /**
  * Locale-aware Link component.

package/dist/next/src/adapters/next/navigation/redirect.js

@@ -1,14 +1,14 @@
 import { redirect as redirect$1 } from 'next/navigation';
 import { getLocale } from '../server/get-locale.js';
-import 'intor-translator';
+import '../../../core/error/intor-error.js';
+import { isExternalDestination } from '../../../core/utils/is-external-destination.js';
+import { localizePathname } from '../../../core/utils/pathname/localize-pathname.js';
+import 'logry';
+import 'keyv';
 import 'node:path';
 import 'p-limit';
-import '../../../config/constants/cache.constants.js';
 import 'node:fs/promises';
-import 'logry';
-import { localizePathname } from '../../../shared/utils/pathname/localize-pathname.js';
-import 'keyv';
-import { isExternalDestination } from '../../../shared/utils/is-external-destination.js';
+import 'intor-translator';
 
 /**
  * Locale-aware redirect helper (server-only).

package/dist/next/src/adapters/next/navigation/use-pathname.js

@@ -1,6 +1,9 @@
 import { usePathname as usePathname$1 } from 'next/navigation';
-import { useConfig, useLocale } from 'intor/react';
-import { localizePathname } from '../../../shared/utils/pathname/localize-pathname.js';
+import { useIntor } from 'intor/react';
+import '../../../core/error/intor-error.js';
+import { localizePathname } from '../../../core/utils/pathname/localize-pathname.js';
+import 'logry';
+import 'keyv';
 
 /**
  * Custom hook to get the current pathname in different forms based on the active locale.
@@ -15,8 +18,7 @@ import { localizePathname } from '../../../shared/utils/pathname/localize-pathna
  * // unprefixedPathname => "/about"
  */
 const usePathname = () => {
-    const { config } = useConfig();
-    const { locale } = useLocale();
+    const { config, locale } = useIntor();
     // Get the raw pathname from the Next.js usePathname hook
     const rawPathname = usePathname$1();
     // Generate the locale-prefixed pathname

package/dist/next/src/adapters/next/navigation/use-router.js

@@ -1,19 +1,6 @@
 import { useRouter as useRouter$1 } from 'next/navigation';
 import { usePathname } from './use-pathname.js';
-import 'react/jsx-runtime';
-import 'react';
-import '../../../client/react/contexts/config/context.js';
-import 'intor/react';
-import '../../../client/react/contexts/locale/context.js';
-import '../../../config/constants/cache.constants.js';
-import 'logry';
-import 'keyv';
-import '../../../client/react/contexts/messages/context.js';
-import 'intor-translator';
-import '../../../client/react/contexts/translator-runtime/context.js';
-import '../../../client/react/contexts/translator/context.js';
-import { useNavigationTarget } from '../../../client/react/navigation/use-navigation-target.js';
-import { useNavigationStrategy } from '../../../client/react/navigation/use-navigation-strategy.js';
+import { useNavigationTarget, useNavigationStrategy } from 'intor/react';
 
 /**
  * Locale-aware router hook.

package/dist/next/src/adapters/next/proxy/intor-proxy.js

@@ -1,8 +1,11 @@
 import { headers } from 'next/headers';
 import { NextResponse } from 'next/server';
 import { setLocaleCookieEdge } from './utils/set-locale-cookie-edge.js';
+import '../../../core/error/intor-error.js';
+import { getLocaleFromAcceptLanguage } from '../../../core/utils/locale/get-locale-from-accept-language.js';
+import 'logry';
+import 'keyv';
 import { resolveRouting } from '../../../routing/resolve-routing.js';
-import { getLocaleFromAcceptLanguage } from '../../../shared/utils/locale/get-locale-from-accept-language.js';
 
 /**
  * Next.js routing adapter for Intor.

package/dist/next/src/adapters/next/server/get-locale.js

@@ -1,6 +1,9 @@
 import { cookies, headers } from 'next/headers';
+import '../../../core/error/intor-error.js';
+import { getLocaleFromAcceptLanguage } from '../../../core/utils/locale/get-locale-from-accept-language.js';
+import 'logry';
+import 'keyv';
 import { resolveLocale } from '../../../routing/locale/resolve-locale.js';
-import { getLocaleFromAcceptLanguage } from '../../../shared/utils/locale/get-locale-from-accept-language.js';
 
 /**
  * Get the locale for the current Next.js request.

package/dist/next/src/adapters/next/server/get-translator.js

@@ -1,9 +1,15 @@
 import { getLocale } from './get-locale.js';
+import '../../../core/error/intor-error.js';
+import 'logry';
+import 'keyv';
+import 'node:path';
+import 'p-limit';
+import 'node:fs/promises';
 import { getTranslator as getTranslator$1 } from '../../../server/translator/get-translator.js';
 
 // Implementation
-async function getTranslator(options) {
-    const { config, preKey, handlers, plugins, extraOptions } = options;
+async function getTranslator(params) {
+    const { config, preKey, handlers, plugins, extraOptions } = params;
     const locale = await getLocale(config);
     const translatorInstance = getTranslator$1({
         config,

package/dist/next/src/core/error/intor-error.js

@@ -0,0 +1,9 @@
+var IntorErrorCode;
+(function (IntorErrorCode) {
+    // intor-config
+    IntorErrorCode["MISSING_SUPPORTED_LOCALES"] = "INTOR_MISSING_SUPPORTED_LOCALES";
+    IntorErrorCode["MISSING_DEFAULT_LOCALE"] = "INTOR_MISSING_DEFAULT_LOCALE";
+    IntorErrorCode["UNSUPPORTED_DEFAULT_LOCALE"] = "INTOR_UNSUPPORTED_DEFAULT_LOCALE";
+})(IntorErrorCode || (IntorErrorCode = {}));
+
+export { IntorErrorCode };

package/dist/next/src/{server → core}/messages/load-remote-messages/fetch-locale-messages/fetch-locale-messages.js

@@ -1,5 +1,6 @@
-import { isValidMessages } from '../../shared/utils/is-valid-messages.js';
-import { getLogger } from '../../../shared/logger/get-logger.js';
+import { getLogger } from '../../../logger/get-logger.js';
+import { isValidMessages } from '../../utils/is-valid-messages.js';
+import { buildSearchParams } from './utils/build-search-params.js';
 
 /**
  * Fetches locale messages from a remote API.
@@ -7,22 +8,21 @@ import { getLogger } from '../../../shared/logger/get-logger.js';
  * - Validates that the returned JSON matches the expected `NamespaceMessages` structure.
  * - Uses `fetch` with `no-store` cache to always get fresh data.
  */
-const fetchLocaleMessages = async ({ remoteUrl, remoteHeaders, searchParams, locale, extraOptions: { loggerOptions } = {}, signal, }) => {
-    const baseLogger = getLogger({ ...loggerOptions });
+const fetchLocaleMessages = async ({ locale, namespaces, rootDir, url: rawUrl, headers: rawHeaders, signal, extraOptions: { loggerOptions }, }) => {
+    const baseLogger = getLogger(loggerOptions);
     const logger = baseLogger.child({ scope: "fetch-locale-messages" });
+    const searchParams = buildSearchParams({ locale, rootDir, namespaces });
+    const url = `${rawUrl}?${searchParams.toString()}`;
     try {
-        const params = new URLSearchParams(searchParams);
-        params.append("locale", locale);
-        const url = `${remoteUrl}?${params.toString()}`;
         // Headers
         const headers = {
             "Content-Type": "application/json",
-            ...remoteHeaders,
+            ...rawHeaders,
         };
         // Fetch
         const response = await fetch(url, {
             method: "GET",
-            headers,
+            headers: headers,
             cache: "no-store",
             signal,
         });
@@ -39,12 +39,12 @@ const fetchLocaleMessages = async ({ remoteUrl, remoteHeaders, searchParams, loc
     }
     catch (error) {
         if (error instanceof Error && error.name === "AbortError") {
-            logger.debug("Fetching locale messages aborted.", { locale, remoteUrl });
+            logger.debug("Fetching locale messages aborted.", { locale, url });
             return;
         }
         logger.warn("Fetching locale messages failed.", {
             locale,
-            remoteUrl,
+            url,
             searchParams: decodeURIComponent(searchParams.toString()),
             error,
         });

package/dist/next/src/{server → core}/messages/load-remote-messages/load-remote-messages.js

@@ -1,9 +1,6 @@
-import { DEFAULT_CACHE_OPTIONS } from '../../../config/constants/cache.constants.js';
+import { getLogger } from '../../logger/get-logger.js';
+import { normalizeCacheKey } from '../../utils/normalizers/normalize-cache-key.js';
 import { fetchLocaleMessages } from './fetch-locale-messages/fetch-locale-messages.js';
-import { buildSearchParams } from './fetch-locale-messages/utils/build-search-params.js';
-import { getLogger } from '../../shared/logger/get-logger.js';
-import { getGlobalMessagesPool } from '../../shared/messages/global-messages-pool.js';
-import { normalizeCacheKey } from '../../../shared/utils/normalizers/normalize-cache-key.js';
 
 /**
  * Load locale messages from a remote API.
@@ -17,8 +14,8 @@ import { normalizeCacheKey } from '../../../shared/utils/normalizers/normalize-c
  *
  * Network fetching and data validation are delegated to lower-level utilities.
  */
-const loadRemoteMessages = async ({ pool = getGlobalMessagesPool(), rootDir, locale, fallbackLocales, namespaces, remoteUrl, remoteHeaders, extraOptions: { cacheOptions = DEFAULT_CACHE_OPTIONS, loggerOptions = { id: "default" }, } = {}, allowCacheWrite = false, signal, }) => {
-    const baseLogger = getLogger({ ...loggerOptions });
+const loadRemoteMessages = async ({ locale, fallbackLocales, namespaces, rootDir, url, headers, signal, pool, cacheOptions, allowCacheWrite = false, loggerOptions, }) => {
+    const baseLogger = getLogger(loggerOptions);
     const logger = baseLogger.child({ scope: "load-remote-messages" });
     // Abort early if the request has already been cancelled
     if (signal?.aborted) {
@@ -26,8 +23,8 @@ const loadRemoteMessages = async ({ pool = getGlobalMessagesPool(), rootDir, loc
         return;
     }
     const start = performance.now();
-    logger.debug("Loading remote messages.", { remoteUrl });
-    // --- Cache key
+    logger.debug("Loading remote messages.", { url });
+    // --- Cache key ---
     const cacheKey = normalizeCacheKey([
         loggerOptions.id,
         "loaderType:remote",
@@ -36,7 +33,7 @@ const loadRemoteMessages = async ({ pool = getGlobalMessagesPool(), rootDir, loc
         (fallbackLocales ?? []).toSorted().join(","),
         (namespaces ?? []).toSorted().join(","),
     ]);
-    // --- Cache read --------------------------------------------------
+    // --- Cache read ---
     if (cacheOptions.enabled && cacheKey) {
         const cached = await pool?.get(cacheKey);
         if (signal?.aborted) {
@@ -56,12 +53,13 @@ const loadRemoteMessages = async ({ pool = getGlobalMessagesPool(), rootDir, loc
         const isLast = i === candidateLocales.length - 1;
         try {
             const fetched = await fetchLocaleMessages({
-                remoteUrl,
-                remoteHeaders,
                 locale: candidateLocale,
-                searchParams: buildSearchParams({ rootDir, namespaces }),
-                extraOptions: { loggerOptions },
+                namespaces,
+                rootDir,
+                url,
+                headers,
                 signal,
+                extraOptions: { loggerOptions },
             });
             // Stop at the first locale that yields non-empty messages
             if (fetched && Object.values(fetched[candidateLocale] || {}).length > 0) {
@@ -89,7 +87,7 @@ const loadRemoteMessages = async ({ pool = getGlobalMessagesPool(), rootDir, loc
             });
         }
     }
-    // --- Cache write --------------------------------------------------
+    // --- Cache write ---
     if (cacheOptions.enabled && allowCacheWrite && cacheKey && messages) {
         if (signal?.aborted) {
             logger.debug("Remote message loading aborted before cache write.");

package/dist/next/src/core/utils/resolve-loader-options.js

@@ -0,0 +1,25 @@
+/**
+ * Resolve the effective message loader for a given runtime.
+ *
+ * Loader resolution follows an inheritance-based priority model:
+ *
+ * - client runtime:
+ *   client.loader → server.loader → root loader
+ *
+ * - server runtime:
+ *   server.loader → root loader
+ *
+ * This allows the client runtime to inherit server behavior
+ * when no explicit client loader is provided.
+ *
+ * Notes:
+ * - Static `messages` are intentionally NOT handled here.
+ * - Returning `undefined` indicates that no loader is enabled
+ *   for the given runtime.
+ */
+const resolveLoaderOptions = (config, runtime) => {
+    // --- runtime: server ---
+    return config.server?.loader ?? config.loader;
+};
+
+export { resolveLoaderOptions };

package/dist/next/src/routing/pathname/resolve-pathname.js

@@ -1,7 +1,10 @@
+import '../../core/error/intor-error.js';
+import { localizePathname } from '../../core/utils/pathname/localize-pathname.js';
+import 'logry';
+import 'keyv';
 import { all } from './strategies/all.js';
 import { exceptDefault } from './strategies/except-default.js';
 import { none } from './strategies/none.js';
-import { localizePathname } from '../../shared/utils/pathname/localize-pathname.js';
 
 const assertNever = (x) => {
     throw new Error(`Unhandled prefix strategy: ${x}`);

package/dist/next/src/routing/resolve-routing.js

@@ -1,6 +1,9 @@
-import { getLocaleFromPathname } from '../shared/utils/locale/get-locale-from-pathname.js';
-import { getLocaleFromHost } from '../shared/utils/locale/get-locale-from-host.js';
-import { getLocaleFromQuery } from '../shared/utils/locale/get-locale-from-query.js';
+import '../core/error/intor-error.js';
+import { getLocaleFromPathname } from '../core/utils/locale/get-locale-from-pathname.js';
+import { getLocaleFromHost } from '../core/utils/locale/get-locale-from-host.js';
+import { getLocaleFromQuery } from '../core/utils/locale/get-locale-from-query.js';
+import 'logry';
+import 'keyv';
 import { resolveLocale } from './locale/resolve-locale.js';
 import { resolvePathname } from './pathname/resolve-pathname.js';
 

package/dist/next/src/server/messages/load-local-messages/load-local-messages.js

@@ -1,10 +1,10 @@
 import path from 'node:path';
 import pLimit from 'p-limit';
-import { DEFAULT_CACHE_OPTIONS } from '../../../config/constants/cache.constants.js';
+import '../../../core/error/intor-error.js';
+import { normalizeCacheKey } from '../../../core/utils/normalizers/normalize-cache-key.js';
+import { getLogger } from '../../../core/logger/get-logger.js';
+import { getGlobalMessagesPool } from '../../../core/messages/global-messages-pool.js';
 import { readLocaleMessages } from './read-locale-messages/read-locale-messages.js';
-import { getLogger } from '../../shared/logger/get-logger.js';
-import { getGlobalMessagesPool } from '../../shared/messages/global-messages-pool.js';
-import { normalizeCacheKey } from '../../../shared/utils/normalizers/normalize-cache-key.js';
 
 /**
  * Load locale messages from the local file system.
@@ -18,15 +18,15 @@ import { normalizeCacheKey } from '../../../shared/utils/normalizers/normalize-c
  *
  * File system traversal, parsing, and message validation are delegated to lower-level utilities.
  */
-const loadLocalMessages = async ({ pool = getGlobalMessagesPool(), rootDir = "messages", locale, fallbackLocales, namespaces, extraOptions: { concurrency = 10, cacheOptions = DEFAULT_CACHE_OPTIONS, loggerOptions = { id: "default" }, exts, messagesReader, } = {}, allowCacheWrite = false, }) => {
-    const baseLogger = getLogger({ ...loggerOptions });
+const loadLocalMessages = async ({ locale, fallbackLocales, namespaces, rootDir = "messages", concurrency = 10, exts, messagesReader, pool = getGlobalMessagesPool(), cacheOptions, allowCacheWrite = false, loggerOptions, }) => {
+    const baseLogger = getLogger(loggerOptions);
     const logger = baseLogger.child({ scope: "load-local-messages" });
     const start = performance.now();
     logger.debug("Loading local messages.", {
         rootDir,
         resolvedRootDir: path.resolve(process.cwd(), rootDir),
     });
-    // --- Cache key
+    // --- Cache key ---
     const cacheKey = normalizeCacheKey([
         loggerOptions.id,
         "loaderType:local",
@@ -35,7 +35,7 @@ const loadLocalMessages = async ({ pool = getGlobalMessagesPool(), rootDir = "me
         (fallbackLocales || []).toSorted().join(","),
         (namespaces || []).toSorted().join(","),
     ]);
-    // --- Cache read --------------------------------------------------
+    // --- Cache read ---
     if (cacheOptions.enabled && cacheKey) {
         const cached = await pool?.get(cacheKey);
         if (cached) {
@@ -51,16 +51,16 @@ const loadLocalMessages = async ({ pool = getGlobalMessagesPool(), rootDir = "me
         const candidateLocale = candidateLocales[i];
         const isLast = i === candidateLocales.length - 1;
         try {
-            const readed = await readLocaleMessages({
-                limit,
-                rootDir,
+            const result = await readLocaleMessages({
                 locale: candidateLocale,
                 namespaces,
-                extraOptions: { loggerOptions, exts, messagesReader },
+                rootDir,
+                limit,
+                extraOptions: { exts, messagesReader, loggerOptions },
             });
             // Stop at the first locale that yields non-empty messages
-            if (Object.values(readed[candidateLocale] || {}).length > 0) {
-                messages = readed;
+            if (Object.values(result[candidateLocale] || {}).length > 0) {
+                messages = result;
                 break;
             }
         }
@@ -76,8 +76,8 @@ const loadLocalMessages = async ({ pool = getGlobalMessagesPool(), rootDir = "me
             }
         }
     }
-    // --- Cache write --------------------------------------------------
-    if (allowCacheWrite && cacheOptions.enabled && cacheKey && messages) {
+    // --- Cache write ---
+    if (cacheOptions.enabled && allowCacheWrite && cacheKey && messages) {
         await pool?.set(cacheKey, messages, cacheOptions.ttl);
     }
     // Final success log with resolved locale and timing

package/dist/next/src/server/messages/load-local-messages/read-locale-messages/collect-file-entries/collect-file-entries.js

@@ -1,6 +1,8 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { getLogger } from '../../../../shared/logger/get-logger.js';
+import '../../../../../core/error/intor-error.js';
+import { getLogger } from '../../../../../core/logger/get-logger.js';
+import 'keyv';
 
 /**
  * Recursively collects all message files under a given root directory.
@@ -19,8 +21,8 @@ import { getLogger } from '../../../../shared/logger/get-logger.js';
  * }, ... ];
  * ```
  */
-async function collectFileEntries({ readdir = fs.readdir, limit, rootDir, namespaces, extraOptions: { exts = [".json"], loggerOptions } = {}, }) {
-    const baseLogger = getLogger({ ...loggerOptions });
+async function collectFileEntries({ readdir = fs.readdir, namespaces, rootDir, limit, extraOptions: { exts = [".json"], loggerOptions }, }) {
+    const baseLogger = getLogger(loggerOptions);
     const logger = baseLogger.child({ scope: "collect-file-entries" });
     const fileEntries = [];
     const walk = async (currentDir) => {

package/dist/next/src/server/messages/load-local-messages/read-locale-messages/parse-file-entries/parse-file-entries.js

@@ -1,7 +1,9 @@
 import path from 'node:path';
-import { isValidMessages } from '../../../shared/utils/is-valid-messages.js';
-import { getLogger } from '../../../../shared/logger/get-logger.js';
-import { deepMerge } from '../../../../../shared/utils/deep-merge.js';
+import '../../../../../core/error/intor-error.js';
+import { deepMerge } from '../../../../../core/utils/deep-merge.js';
+import { getLogger } from '../../../../../core/logger/get-logger.js';
+import { isValidMessages } from '../../../../../core/messages/utils/is-valid-messages.js';
+import 'keyv';
 import { jsonReader } from './utils/json-reader.js';
 import { nestObjectFromPath } from './utils/nest-object-from-path.js';
 
@@ -36,8 +38,8 @@ import { nestObjectFromPath } from './utils/nest-object-from-path.js';
  * }
  * ```
  */
-async function parseFileEntries({ fileEntries, limit, extraOptions: { messagesReader, loggerOptions } = {}, }) {
-    const baseLogger = getLogger({ ...loggerOptions });
+async function parseFileEntries({ fileEntries, limit, extraOptions: { messagesReader, loggerOptions }, }) {
+    const baseLogger = getLogger(loggerOptions);
     const logger = baseLogger.child({ scope: "parse-file-entries" });
     // Read and parse all file entries
     const parsedFileEntries = [];

package/dist/next/src/server/messages/load-local-messages/read-locale-messages/read-locale-messages.js

@@ -9,11 +9,11 @@ import { parseFileEntries } from './parse-file-entries/parse-file-entries.js';
  * 2. Parses each file into a messages object.
  * 3. Wraps the parsed messages under the locale key.
  */
-const readLocaleMessages = async ({ limit, rootDir = "messages", locale, namespaces, extraOptions: { exts, messagesReader, loggerOptions } = {}, }) => {
+const readLocaleMessages = async ({ locale, namespaces, rootDir = "messages", limit, extraOptions: { exts, messagesReader, loggerOptions }, }) => {
     // 1. Collect file entries
     const fileEntries = await collectFileEntries({
-        rootDir: path.resolve(process.cwd(), rootDir, locale),
         namespaces,
+        rootDir: path.resolve(process.cwd(), rootDir, locale),
         limit,
         extraOptions: { exts, loggerOptions },
     });

package/dist/next/src/server/messages/load-messages.js

@@ -1,6 +1,9 @@
+import '../../core/error/intor-error.js';
+import { resolveLoaderOptions } from '../../core/utils/resolve-loader-options.js';
+import { getLogger } from '../../core/logger/get-logger.js';
+import { loadRemoteMessages } from '../../core/messages/load-remote-messages/load-remote-messages.js';
+import 'keyv';
 import { loadLocalMessages } from './load-local-messages/load-local-messages.js';
-import { loadRemoteMessages } from './load-remote-messages/load-remote-messages.js';
-import { getLogger } from '../shared/logger/get-logger.js';
 
 /**
  * Load locale messages based on the resolved Intor configuration.
@@ -14,14 +17,15 @@ import { getLogger } from '../shared/logger/get-logger.js';
  * It does not perform message normalization or transformation itself.
  */
 const loadMessages = async ({ config, locale, extraOptions: { exts, messagesReader } = {}, allowCacheWrite = false, }) => {
-    const baseLogger = getLogger({ id: config.id, ...config.logger });
+    const baseLogger = getLogger(config.logger);
     const logger = baseLogger.child({ scope: "load-messages" });
+    const loader = resolveLoaderOptions(config);
     // Guard: no loader configured
-    if (!config.loader) {
+    if (!loader) {
         logger.warn("No loader options have been configured in the current config.");
         return;
     }
-    const { type, concurrency, rootDir, namespaces } = config.loader;
+    const { type, namespaces, rootDir } = loader;
     const fallbackLocales = config.fallbackLocales[locale] || [];
     logger.info(`Loading messages for locale "${locale}".`);
     logger.trace("Starting to load messages with runtime context.", {
@@ -30,41 +34,43 @@ const loadMessages = async ({ config, locale, extraOptions: { exts, messagesRead
         fallbackLocales,
         namespaces: namespaces && namespaces.length > 0 ? [...namespaces] : "[ALL]",
         cache: config.cache,
-        concurrency: concurrency ?? 10,
     });
     let loadedMessages;
-    // --- loader type: local
+    // ====== loader type: local ======
     if (type === "local") {
         loadedMessages = await loadLocalMessages({
+            // --- Messages Scope ---
             locale,
             fallbackLocales,
             namespaces,
             rootDir,
-            extraOptions: {
-                concurrency,
-                cacheOptions: config.cache,
-                loggerOptions: { id: config.id, ...config.logger },
-                exts,
-                messagesReader,
-            },
+            // --- Execution ---
+            concurrency: loader.concurrency,
+            exts,
+            messagesReader,
+            // --- Caching ---
+            cacheOptions: config.cache,
             allowCacheWrite,
+            // --- Observability ---
+            loggerOptions: config.logger,
         });
     }
-    // --- loader type: remote
+    // ====== loader type: remote ======
     else if (type === "remote") {
-        // Fetch messages from remote
         loadedMessages = await loadRemoteMessages({
+            // --- Messages Scope ---
             locale,
             fallbackLocales,
             namespaces,
             rootDir,
-            remoteUrl: config.loader.remoteUrl,
-            remoteHeaders: config.loader.remoteHeaders,
-            extraOptions: {
-                cacheOptions: config.cache,
-                loggerOptions: { id: config.id, ...config.logger },
-            },
+            // --- Remote Source ---
+            url: loader.url,
+            headers: loader.headers,
+            // --- Caching ---
             allowCacheWrite,
+            cacheOptions: config.cache,
+            // --- Observability ---
+            loggerOptions: config.logger,
         });
     }
     // No messages found

package/dist/next/src/server/translator/get-translator.js

@@ -2,32 +2,27 @@ import { Translator } from 'intor-translator';
 import { loadMessages } from '../messages/load-messages.js';
 
 // Implementation
-async function getTranslator(options) {
-    const { config, locale, preKey } = options;
-    const messages = await loadMessages({
-        config,
-        locale,
-        extraOptions: options.extraOptions,
-    });
-    // Create a Translator instance
+async function getTranslator(params) {
+    const { config, locale, preKey, extraOptions } = params;
+    const messages = await loadMessages({ config, locale, extraOptions });
     const translator = new Translator({
         locale,
         messages,
         fallbackLocales: config.fallbackLocales,
         loadingMessage: config.translator?.loadingMessage,
-        placeholder: config.translator?.placeholder,
-        handlers: options.handlers,
-        plugins: options.plugins,
+        missingMessage: config.translator?.missingMessage,
+        handlers: params.handlers,
+        plugins: params.plugins,
     });
-    const props = { messages, locale };
     const scoped = translator.scoped(preKey);
     return {
-        ...props,
+        messages,
+        locale,
         hasKey: preKey ? scoped.hasKey : translator.hasKey,
         t: preKey ? scoped.t : translator.t,
         // NOTE:
-        // Return type is fully validated by overload signatures.
-        // Assertion here is intentional due to TS inference limitations.
+        // The runtime implementation is intentionally erased.
+        // Type safety is guaranteed by public type contracts.
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
     };
 }

package/dist/react/export/react/index.js

@@ -1,18 +1,8 @@
-export { IntorProvider } from '../../src/client/react/contexts/intor-provider/intor-provider.js';
-import 'react/jsx-runtime';
-import 'react';
-import '../../src/client/react/contexts/config/context.js';
-export { useConfig } from '../../src/client/react/contexts/config/hook.js';
-import '../../src/client/react/contexts/locale/context.js';
-export { useLocale } from '../../src/client/react/contexts/locale/hook.js';
-import '../../src/config/constants/cache.constants.js';
-import 'logry';
-import 'keyv';
-import '../../src/client/react/contexts/messages/context.js';
-import 'intor-translator';
-export { TranslatorRuntimeProvider } from '../../src/client/react/contexts/translator-runtime/provider.js';
-import '../../src/client/react/contexts/translator-runtime/context.js';
-import '../../src/client/react/contexts/translator/context.js';
+export { IntorProvider } from '../../src/client/react/provider/intor-provider.js';
+export { useIntor } from '../../src/client/react/provider/use-intor.js';
 export { useTranslator } from '../../src/client/react/translator/use-translator.js';
 export { T } from '../../src/client/react/translator/t.js';
+export { useNavigationTarget } from '../../src/client/react/navigation/use-navigation-target.js';
+export { useNavigationStrategy } from '../../src/client/react/navigation/use-navigation-strategy.js';
+export { useLoadMessages } from '../../src/client/react/helpers/use-load-messages.js';
 export { getClientLocale } from '../../src/client/helpers/get-client-locale.js';

package/dist/react/src/client/helpers/get-client-locale.js

@@ -1,6 +1,9 @@
+import '../../core/error/intor-error.js';
+import { normalizeLocale } from '../../core/utils/normalizers/normalize-locale.js';
+import 'logry';
+import 'keyv';
 import { detectBrowserLocale } from '../shared/utils/locale/detect-browser-locale.js';
 import { getLocaleCookieBrowser } from '../shared/utils/locale/get-locale-cookie-browser.js';
-import { normalizeLocale } from '../../shared/utils/normalizers/normalize-locale.js';
 
 /**
  * Resolve the locale in a client-only environment.