intor 2.4.7 → 2.4.8

package/dist/core/export/server/index.js

@@ -1,10 +1,9 @@
 export { intor } from '../../src/server/intor/intor.js';
-export { loadMessages } from '../../src/server/messages/load-messages.js';
-import 'node:path';
-import 'p-limit';
 import '../../src/core/error/intor-error.js';
 import 'logry';
+import 'p-limit';
 import 'intor-translator';
+import 'node:path';
 export { clearMessagesPool } from '../../src/server/messages/load-local-messages/cache/messages-pool.js';
 import 'node:fs/promises';
 export { getTranslator } from '../../src/server/helpers/get-translator.js';

package/dist/core/src/server/helpers/get-translator.js

@@ -9,14 +9,15 @@ import { initTranslator } from '../translator/init-translator.js';
  * Get a server-side translator for the current execution context.
  */
 async function getTranslator(config, params) {
-    const { locale, readers, allowCacheWrite, fetch, preKey, handlers, plugins } = params;
+    const { locale, loader, readers, allowCacheWrite = false, fetch, handlers, plugins, preKey, } = params;
     // Initialize a locale-bound translator snapshot with messages loaded
     const translator = await initTranslator(config, locale, {
+        loader,
         readers,
         allowCacheWrite,
         fetch: fetch || globalThis.fetch,
-        plugins,
         handlers,
+        plugins,
     });
     const scoped = translator.scoped(preKey);
     return {

package/dist/core/src/server/translator/init-translator.js

@@ -15,11 +15,11 @@ import 'node:fs/promises';
  * - Creates an immutable Translator instance for server usage
  */
 async function initTranslator(config, locale, options) {
-    const { readers, allowCacheWrite = false, fetch, handlers, plugins, } = options;
-    const loader = resolveLoaderOptions(config, "server");
+    const { loader, readers, allowCacheWrite = false, fetch, handlers, plugins, } = options;
+    const loaderOptions = resolveLoaderOptions(config, "server");
     // Load messages
     let messages = {};
-    if (loader) {
+    if (loaderOptions && !loader) {
         const loaded = await loadMessages({
             config,
             locale,
@@ -29,6 +29,9 @@ async function initTranslator(config, locale, options) {
         });
         messages = loaded || {};
     }
+    if (loader) {
+        messages = await loader(config, locale);
+    }
     // Create immutable translator snapshot
     return createTranslator({ config, locale, messages, handlers, plugins });
 }

package/dist/express/src/adapters/express/get-translator.js

@@ -14,14 +14,15 @@ import { getTranslator as getTranslator$1 } from '../../server/helpers/get-trans
  * @platform Express
  */
 async function getTranslator(config, req, params) {
-    const { preKey, handlers, plugins, readers, allowCacheWrite } = params || {};
+    const { loader, readers, allowCacheWrite, handlers, plugins, preKey } = params || {};
     return getTranslator$1(config, {
         locale: req.intor?.locale || config.defaultLocale,
-        preKey,
-        handlers,
-        plugins,
+        loader,
         readers,
         allowCacheWrite,
+        handlers,
+        plugins,
+        preKey,
     });
 }
 

package/dist/express/src/server/helpers/get-translator.js

@@ -9,14 +9,15 @@ import { initTranslator } from '../translator/init-translator.js';
  * Get a server-side translator for the current execution context.
  */
 async function getTranslator(config, params) {
-    const { locale, readers, allowCacheWrite, fetch, preKey, handlers, plugins } = params;
+    const { locale, loader, readers, allowCacheWrite = false, fetch, handlers, plugins, preKey, } = params;
     // Initialize a locale-bound translator snapshot with messages loaded
     const translator = await initTranslator(config, locale, {
+        loader,
         readers,
         allowCacheWrite,
         fetch: fetch || globalThis.fetch,
-        plugins,
         handlers,
+        plugins,
     });
     const scoped = translator.scoped(preKey);
     return {

package/dist/express/src/server/translator/init-translator.js

@@ -15,11 +15,11 @@ import 'node:fs/promises';
  * - Creates an immutable Translator instance for server usage
  */
 async function initTranslator(config, locale, options) {
-    const { readers, allowCacheWrite = false, fetch, handlers, plugins, } = options;
-    const loader = resolveLoaderOptions(config);
+    const { loader, readers, allowCacheWrite = false, fetch, handlers, plugins, } = options;
+    const loaderOptions = resolveLoaderOptions(config);
     // Load messages
     let messages = {};
-    if (loader) {
+    if (loaderOptions && !loader) {
         const loaded = await loadMessages({
             config,
             locale,
@@ -29,6 +29,9 @@ async function initTranslator(config, locale, options) {
         });
         messages = loaded || {};
     }
+    if (loader) {
+        messages = await loader(config, locale);
+    }
     // Create immutable translator snapshot
     return createTranslator({ config, locale, messages, handlers, plugins });
 }

package/dist/fastify/src/adapters/fastify/get-translator.js

@@ -14,14 +14,15 @@ import { getTranslator as getTranslator$1 } from '../../server/helpers/get-trans
  * @platform Fastify
  */
 async function getTranslator(config, request, params) {
-    const { preKey, handlers, plugins, readers, allowCacheWrite } = params || {};
+    const { loader, readers, allowCacheWrite, handlers, plugins, preKey } = params || {};
     return getTranslator$1(config, {
         locale: request.intor?.locale || config.defaultLocale,
-        preKey,
-        handlers,
-        plugins,
+        loader,
         readers,
         allowCacheWrite,
+        handlers,
+        plugins,
+        preKey,
     });
 }
 

package/dist/fastify/src/server/helpers/get-translator.js

@@ -9,14 +9,15 @@ import { initTranslator } from '../translator/init-translator.js';
  * Get a server-side translator for the current execution context.
  */
 async function getTranslator(config, params) {
-    const { locale, readers, allowCacheWrite, fetch, preKey, handlers, plugins } = params;
+    const { locale, loader, readers, allowCacheWrite = false, fetch, handlers, plugins, preKey, } = params;
     // Initialize a locale-bound translator snapshot with messages loaded
     const translator = await initTranslator(config, locale, {
+        loader,
         readers,
         allowCacheWrite,
         fetch: fetch || globalThis.fetch,
-        plugins,
         handlers,
+        plugins,
     });
     const scoped = translator.scoped(preKey);
     return {

package/dist/fastify/src/server/translator/init-translator.js

@@ -15,11 +15,11 @@ import 'node:fs/promises';
  * - Creates an immutable Translator instance for server usage
  */
 async function initTranslator(config, locale, options) {
-    const { readers, allowCacheWrite = false, fetch, handlers, plugins, } = options;
-    const loader = resolveLoaderOptions(config);
+    const { loader, readers, allowCacheWrite = false, fetch, handlers, plugins, } = options;
+    const loaderOptions = resolveLoaderOptions(config);
     // Load messages
     let messages = {};
-    if (loader) {
+    if (loaderOptions && !loader) {
         const loaded = await loadMessages({
             config,
             locale,
@@ -29,6 +29,9 @@ async function initTranslator(config, locale, options) {
         });
         messages = loaded || {};
     }
+    if (loader) {
+        messages = await loader(config, locale);
+    }
     // Create immutable translator snapshot
     return createTranslator({ config, locale, messages, handlers, plugins });
 }

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

@@ -15,14 +15,15 @@ import { getLocale } from './get-locale.js';
  * @platform Next.js
  */
 async function getTranslator(config, params) {
-    const { preKey, handlers, plugins, readers, allowCacheWrite } = params || {};
+    const { loader, readers, allowCacheWrite, handlers, plugins, preKey } = params || {};
     return getTranslator$1(config, {
         locale: await getLocale(config),
-        preKey,
-        handlers,
-        plugins,
+        loader,
         readers,
         allowCacheWrite,
+        handlers,
+        plugins,
+        preKey,
     });
 }
 

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

@@ -9,14 +9,15 @@ import { initTranslator } from '../translator/init-translator.js';
  * Get a server-side translator for the current execution context.
  */
 async function getTranslator(config, params) {
-    const { locale, readers, allowCacheWrite, fetch, preKey, handlers, plugins } = params;
+    const { locale, loader, readers, allowCacheWrite = false, fetch, handlers, plugins, preKey, } = params;
     // Initialize a locale-bound translator snapshot with messages loaded
     const translator = await initTranslator(config, locale, {
+        loader,
         readers,
         allowCacheWrite,
         fetch: fetch || globalThis.fetch,
-        plugins,
         handlers,
+        plugins,
     });
     const scoped = translator.scoped(preKey);
     return {

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

@@ -15,11 +15,11 @@ import 'node:fs/promises';
  * - Creates an immutable Translator instance for server usage
  */
 async function initTranslator(config, locale, options) {
-    const { readers, allowCacheWrite = false, fetch, handlers, plugins, } = options;
-    const loader = resolveLoaderOptions(config, "server");
+    const { loader, readers, allowCacheWrite = false, fetch, handlers, plugins, } = options;
+    const loaderOptions = resolveLoaderOptions(config, "server");
     // Load messages
     let messages = {};
-    if (loader) {
+    if (loaderOptions && !loader) {
         const loaded = await loadMessages({
             config,
             locale,
@@ -29,6 +29,9 @@ async function initTranslator(config, locale, options) {
         });
         messages = loaded || {};
     }
+    if (loader) {
+        messages = await loader(config, locale);
+    }
     // Create immutable translator snapshot
     return createTranslator({ config, locale, messages, handlers, plugins });
 }

package/dist/types/export/server/index.d.ts

@@ -1 +1 @@
-export { intor, type IntorValue, loadMessages, clearMessagesPool, getTranslator, } from "../../src/server";
+export { intor, type IntorValue, clearMessagesPool, getTranslator, type MessagesLoader, } from "../../src/server";

package/dist/types/src/client/react/helpers/use-intor.d.ts

@@ -1,5 +1,4 @@
 import type { IntorValue } from "../provider";
 import type { IntorResolvedConfig } from "../../../config";
-import type { GenConfigKeys } from "../../../core";
 import type { Locale, LocaleMessages } from "intor-translator";
-export declare function useIntor<CK extends GenConfigKeys = "__default__">(config: IntorResolvedConfig, loader: (config: IntorResolvedConfig, locale: Locale) => Promise<LocaleMessages>): Omit<IntorValue<CK>, "handlers" | "plugins">;
+export declare function useIntor(config: IntorResolvedConfig, loader: (config: IntorResolvedConfig, locale: Locale) => Promise<LocaleMessages>): Omit<IntorValue, "handlers" | "plugins">;

package/dist/types/src/client/react/provider/intor-provider.d.ts

@@ -1,5 +1,4 @@
 import type { IntorContextValue, IntorProviderProps } from "./types";
-import type { GenConfigKeys } from "../../../core";
 import * as React from "react";
 export declare const IntorContext: React.Context<IntorContextValue | undefined>;
-export declare function IntorProvider<CK extends GenConfigKeys = "__default__">({ value: { config, locale: initialLocale, messages, handlers, plugins, onLocaleChange, isLoading: externalIsLoading, }, children, }: IntorProviderProps<CK>): import("react/jsx-runtime").JSX.Element;
+export declare function IntorProvider({ value: { config, locale: initialLocale, messages, handlers, plugins, onLocaleChange, isLoading: externalIsLoading, }, children, }: IntorProviderProps): import("react/jsx-runtime").JSX.Element;

package/dist/types/src/client/react/provider/types.d.ts

@@ -1,24 +1,23 @@
 import type { IntorResolvedConfig } from "../../../config";
-import type { GenConfigKeys, GenLocale, GenMessages } from "../../../core";
-import type { TranslateHandlers, TranslateHook, TranslatorPlugin } from "intor-translator";
+import type { Locale, LocaleMessages, TranslateHandlers, TranslateHook, TranslatorPlugin } from "intor-translator";
 import type { Translator } from "intor-translator";
 import type * as React from "react";
-export interface IntorValue<CK extends GenConfigKeys = "__default__"> {
+export interface IntorValue {
     config: IntorResolvedConfig;
-    locale: GenLocale<CK>;
-    messages?: Readonly<GenMessages<CK>>;
+    locale: Locale;
+    messages?: Readonly<LocaleMessages>;
     isLoading?: boolean;
-    onLocaleChange?: (newLocale: GenLocale<CK>) => Promise<void> | void;
+    onLocaleChange?: (newLocale: Locale) => Promise<void> | void;
     handlers?: TranslateHandlers;
     plugins?: (TranslatorPlugin | TranslateHook)[];
 }
-export interface IntorProviderProps<CK extends GenConfigKeys = "__default__"> {
-    value: IntorValue<CK>;
+export interface IntorProviderProps {
+    value: IntorValue;
     children: React.ReactNode;
 }
-export type IntorContextValue<CK extends GenConfigKeys = "__default__"> = {
+export type IntorContextValue = {
     config: IntorResolvedConfig;
-    locale: GenLocale<CK>;
-    setLocale: (locale: GenLocale<CK>) => void;
+    locale: Locale;
+    setLocale: (locale: Locale) => void;
     translator: Translator<unknown>;
 };

package/dist/types/src/client/react/provider/use-intor-context.d.ts

@@ -1,3 +1,2 @@
 import type { IntorContextValue } from "./types";
-import type { GenConfigKeys } from "../../../core";
-export declare function useIntorContext<CK extends GenConfigKeys = "__default__">(): IntorContextValue<CK>;
+export declare function useIntorContext(): IntorContextValue;

package/dist/types/src/server/helpers/get-translator.d.ts

@@ -1,8 +1,10 @@
 import type { IntorResolvedConfig } from "../../config";
 import type { LocalizedPreKey, TranslateHandlers, TranslateHook, TranslatorPlugin } from "intor-translator";
 import { type GenConfigKeys, type GenLocale, type GenMessages, type GenReplacements, type GenRich, type MessagesReaders, type RuntimeFetch, type TranslatorInstance } from "../../core";
+import { type MessagesLoader } from "../translator";
 export interface GetTranslatorParams<CK extends GenConfigKeys = "__default__"> {
     locale: GenLocale<CK> | (string & {});
+    loader?: MessagesLoader;
     readers?: MessagesReaders;
     allowCacheWrite?: boolean;
     fetch?: RuntimeFetch;

package/dist/types/src/server/index.d.ts

@@ -1,3 +1,4 @@
 export { intor, type IntorValue } from "./intor";
-export { loadMessages, clearMessagesPool } from "./messages";
+export { clearMessagesPool } from "./messages";
 export { getTranslator, type GetTranslatorParams } from "./helpers";
+export type { MessagesLoader } from "./translator";

package/dist/types/src/server/translator/index.d.ts

@@ -1 +1,2 @@
 export { initTranslator } from "../translator/init-translator";
+export type { MessagesLoader } from "./types";

package/dist/types/src/server/translator/init-translator.d.ts

@@ -1,8 +1,10 @@
+import type { MessagesLoader } from "./types";
 import type { IntorResolvedConfig } from "../../config";
 import type { Locale, Translator } from "intor-translator";
 import { type CreateTranslatorParams } from "../../core";
 import { type LoadMessagesParams } from "../messages";
 interface InitTranslatorOptions extends Pick<LoadMessagesParams, "readers" | "allowCacheWrite" | "fetch">, Pick<CreateTranslatorParams, "handlers" | "plugins"> {
+    loader?: MessagesLoader;
 }
 /**
  * Initialize a locale-bound Translator snapshot.

package/dist/types/src/server/translator/types.d.ts

@@ -0,0 +1,9 @@
+import type { IntorResolvedConfig } from "../../config";
+import type { LocaleMessages } from "intor-translator";
+/**
+ * Runtime message loader override.
+ *
+ * Loads locale messages imperatively at runtime, bypassing
+ * message loading defined in the Intor config.
+ */
+export type MessagesLoader = (config: IntorResolvedConfig, locale: string) => Promise<LocaleMessages>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intor",
-  "version": "2.4.7",
+  "version": "2.4.8",
   "description": "The i18n library for modern JavaScript",
   "author": "Yiming Liao",
   "homepage": "https://github.com/yiming-liao/intor#readme",