intor 2.3.6 → 2.3.8

package/dist/vue/src/core/utils/normalizers/normalize-cache-key.js

@@ -0,0 +1,45 @@
+const CACHE_KEY_DELIMITER = "|";
+const sanitize = (k) => k
+    .replaceAll(/[\u200B-\u200D\uFEFF]/g, "")
+    .replaceAll(/[\r\n]/g, "")
+    .trim();
+/**
+ * Normalizes a value into a stable cache key string.
+ *
+ * - Supports primitive values and structured array keys.
+ * - Produces deterministic output suitable for cache identifiers.
+ *
+ * Notes:
+ * - `null`, `undefined`, or empty arrays return `null`.
+ * - Special tokens are used for boolean, null, and undefined values
+ *   to preserve semantic differences.
+ */
+const normalizeCacheKey = (key, delimiter = CACHE_KEY_DELIMITER) => {
+    // Treat nullish values as "no cache key"
+    if (key === null || key === undefined)
+        return null;
+    if (Array.isArray(key)) {
+        // Empty array produces no meaningful cache key
+        if (key.length === 0)
+            return null;
+        const normalized = key.map((k) => {
+            // Preserve semantic differences for special values
+            if (k === null)
+                return "__null";
+            if (k === undefined)
+                return "__undefined";
+            if (typeof k === "boolean")
+                return k ? "__true" : "__false";
+            return sanitize(String(k));
+        });
+        // Join segments into a single deterministic cache key
+        return normalized.join(delimiter);
+    }
+    // Normalize boolean primitives explicitly
+    if (typeof key === "boolean")
+        return key ? "__true" : "__false";
+    // Fallback: stringify primitive values
+    return String(key);
+};
+
+export { normalizeCacheKey };

package/dist/vue/src/core/utils/normalizers/normalize-locale.js

@@ -0,0 +1,59 @@
+const toCanonical = (input) => {
+    try {
+        return Intl.getCanonicalLocales(input)[0];
+    }
+    catch {
+        return;
+    }
+};
+/**
+ * Normalizes a locale string and resolves the best match
+ * from a list of supported locales.
+ *
+ * Resolution strategy:
+ *
+ * 1. Exact canonical match (BCP 47)
+ * 2. Base language fallback
+ *    - Falls back by base language when no exact match is found
+ *      (e.g. `"en"` → `"en-US"`).
+ *    - Script and region subtags are ignored during this step
+ *      (e.g. `"zh-Hans"` → `"zh-Hant-TW"`)
+ *    - Preference is determined by the order of `supportedLocales`.
+ *
+ * Returns `undefined` if no suitable match is found.
+ *
+ * Notes:
+ * - Invalid locale inputs are ignored gracefully.
+ * - Always returns an original entry from `supportedLocales`.
+ * - Requires `Intl` locale support in the runtime.
+ */
+const normalizeLocale = (locale, supportedLocales = []) => {
+    if (!locale || supportedLocales.length === 0)
+        return;
+    const canonicalLocale = toCanonical(locale);
+    if (!canonicalLocale)
+        return;
+    const supportedCanonicalMap = new Map();
+    for (const l of supportedLocales) {
+        const normalized = toCanonical(l);
+        if (normalized) {
+            supportedCanonicalMap.set(normalized, l);
+        }
+    }
+    // 1. Exact match
+    if (supportedCanonicalMap.has(canonicalLocale)) {
+        return supportedCanonicalMap.get(canonicalLocale);
+    }
+    const baseLang = canonicalLocale.split("-")[0];
+    // 2. Match by same base language (e.g., "en" matches "en-US" or "en-GB")
+    for (const [key, original] of supportedCanonicalMap) {
+        const supportedBase = key.split("-")[0];
+        if (supportedBase === baseLang) {
+            return original;
+        }
+    }
+    // 3. No match
+    return;
+};
+
+export { normalizeLocale };

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

@@ -0,0 +1,32 @@
+/**
+ * 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: client ---
+    {
+        const client = config.client?.loader;
+        if (client) {
+            // Client loader is always remote by design
+            return { type: "remote", ...client };
+        }
+        return config.server?.loader ?? config.loader;
+    }
+};
+
+export { resolveLoaderOptions };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intor",
-  "version": "2.3.6",
+  "version": "2.3.8",
   "description": "A modular and extensible i18n core designed for TypeScript and JavaScript projects. Intor enables custom translation logic with support for both frontend and backend environments, featuring runtime configuration, caching, adapters, and message loaders.",
   "author": "Yiming Liao",
   "homepage": "https://github.com/yiming-liao/intor#readme",
@@ -64,6 +64,14 @@
     "./next/server": {
       "import": "./dist/next/export/next/server/index.js",
       "types": "./dist/types/export/next/server/index.d.ts"
+    },
+    "./vue": {
+      "import": "./dist/vue/export/vue/index.js",
+      "types": "./dist/types/export/vue/index.d.ts"
+    },
+    "./svelte": {
+      "import": "./dist/svelte/export/svelte/index.js",
+      "types": "./dist/types/export/svelte/index.d.ts"
     }
   },
   "main": "./dist/export/index.js",
@@ -89,15 +97,15 @@
     "examples:html": "vite --config examples/html/vite.config.ts"
   },
   "dependencies": {
-    "intor-translator": "1.3.1",
+    "intor-translator": "1.3.2",
     "keyv": "5.5.5",
     "logry": "2.1.5",
     "p-limit": "7.2.0"
   },
   "devDependencies": {
-    "@rollup/plugin-alias": "^6.0.0",
+    "@rollup/plugin-alias": "6.0.0",
     "@rollup/plugin-typescript": "12.3.0",
-    "@rollup/pluginutils": "^5.3.0",
+    "@rollup/pluginutils": "5.3.0",
     "@testing-library/dom": "10.4.1",
     "@testing-library/jest-dom": "6.9.1",
     "@testing-library/react": "16.3.1",
@@ -118,7 +126,7 @@
     "eslint-plugin-unused-imports": "4.1.4",
     "jsdom": "27.3.0",
     "knip": "5.69.1",
-    "magic-string": "^0.30.21",
+    "magic-string": "0.30.21",
     "next": "16.0.3",
     "prettier": "3.6.2",
     "react": "19.0.0",
@@ -126,12 +134,14 @@
     "remark": "15.0.1",
     "remark-gfm": "4.0.1",
     "rollup": "4.53.3",
+    "svelte": "5.46.1",
     "tsc-alias": "1.8.16",
     "tsd": "0.33.0",
     "typescript": "5.8.3",
     "typescript-eslint": "8.32.1",
     "vite": "7.3.0",
     "vite-tsconfig-paths": "6.0.3",
-    "vitest": "4.0.16"
+    "vitest": "4.0.16",
+    "vue": "3.5.26"
   }
 }

package/dist/next/src/client/react/contexts/config/context.js

@@ -1,3 +0,0 @@
-import * as React from 'react';
-
-React.createContext(undefined);

package/dist/next/src/client/react/contexts/locale/context.js

@@ -1,3 +0,0 @@
-import * as React from 'react';
-
-React.createContext(undefined);

package/dist/next/src/client/react/contexts/messages/context.js

@@ -1,3 +0,0 @@
-import * as React from 'react';
-
-React.createContext(undefined);

package/dist/next/src/client/react/contexts/translator/context.js

@@ -1,3 +0,0 @@
-import * as React from 'react';
-
-React.createContext(undefined);

package/dist/next/src/client/react/contexts/translator-runtime/context.js

@@ -1,3 +0,0 @@
-import * as React from 'react';
-
-React.createContext(undefined);

package/dist/next/src/config/constants/cache.constants.js

@@ -1,7 +0,0 @@
-// Default cache options
-const DEFAULT_CACHE_OPTIONS = {
-    enabled: process.env.NODE_ENV === "production",
-    ttl: 60 * 60 * 1000, // 1 hour
-};
-
-export { DEFAULT_CACHE_OPTIONS };

package/dist/react/src/client/react/contexts/config/context.js

@@ -1,5 +0,0 @@
-import * as React from 'react';
-
-const ConfigContext = React.createContext(undefined);
-
-export { ConfigContext };

package/dist/react/src/client/react/contexts/config/hook.js

@@ -1,11 +0,0 @@
-import * as React from 'react';
-import { ConfigContext } from './context.js';
-
-function useConfig() {
-    const context = React.useContext(ConfigContext);
-    if (!context)
-        throw new Error("useConfig must be used within ConfigProvider");
-    return context;
-}
-
-export { useConfig };

package/dist/react/src/client/react/contexts/config/provider.js

@@ -1,14 +0,0 @@
-"use client";
-import { jsx } from 'react/jsx-runtime';
-import * as React from 'react';
-import { ConfigContext } from './context.js';
-
-function ConfigProvider({ value: { config }, children, }) {
-    // context value
-    const value = React.useMemo(() => ({
-        config,
-    }), [config]);
-    return (jsx(ConfigContext.Provider, { value: value, children: children }));
-}
-
-export { ConfigProvider };

package/dist/react/src/client/react/contexts/intor-provider/intor-provider.js

@@ -1,17 +0,0 @@
-"use client";
-import { jsx } from 'react/jsx-runtime';
-import { ConfigProvider } from '../config/provider.js';
-import 'react';
-import '../config/context.js';
-import { LocaleProvider } from '../locale/provider.js';
-import '../locale/context.js';
-import { MessagesProvider } from '../messages/provider.js';
-import '../messages/context.js';
-import { TranslatorProvider } from '../translator/provider.js';
-import '../translator/context.js';
-
-const IntorProvider = ({ value: { config, initialLocale, messages = config.messages, onLocaleChange, isLoading, }, children, }) => {
-    return (jsx(ConfigProvider, { value: { config }, children: jsx(LocaleProvider, { value: { initialLocale, onLocaleChange }, children: jsx(MessagesProvider, { value: { messages }, children: jsx(TranslatorProvider, { value: { isLoading }, children: children }) }) }) }));
-};
-
-export { IntorProvider };

package/dist/react/src/client/react/contexts/locale/context.js

@@ -1,5 +0,0 @@
-import * as React from 'react';
-
-const LocaleContext = React.createContext(undefined);
-
-export { LocaleContext };

package/dist/react/src/client/react/contexts/locale/hook.js

@@ -1,11 +0,0 @@
-import * as React from 'react';
-import { LocaleContext } from './context.js';
-
-function useLocale() {
-    const context = React.useContext(LocaleContext);
-    if (!context)
-        throw new Error("useLocale must be used within a LocaleProvider");
-    return context;
-}
-
-export { useLocale };

package/dist/react/src/client/react/contexts/locale/provider.js

@@ -1,38 +0,0 @@
-"use client";
-import { jsx } from 'react/jsx-runtime';
-import * as React from 'react';
-import '../config/context.js';
-import { useConfig } from '../config/hook.js';
-import { setLocaleCookieBrowser } from '../../../shared/utils/locale/set-locale-cookie-browser.js';
-import { setDocumentLocale } from '../../../shared/utils/locale/set-document-locale.js';
-import { LocaleContext } from './context.js';
-import { changeLocale } from './utils/change-locale.js';
-
-function LocaleProvider({ value: { initialLocale, onLocaleChange }, children, }) {
-    const { config } = useConfig();
-    const [locale, setLocaleState] = React.useState(initialLocale);
-    // Request a locale change.
-    const setLocale = React.useCallback(async (newLocale) => {
-        changeLocale({
-            locale,
-            newLocale,
-            fullReloadRequired: config.loader?.type === "local",
-            setLocaleState,
-        });
-        // Notify external listener (fire-and-forget)
-        onLocaleChange?.(newLocale);
-    }, [locale, config.loader, onLocaleChange]);
-    // Sync locale-related browser side effects.
-    React.useEffect(() => {
-        setLocaleCookieBrowser(config.cookie, locale);
-        setDocumentLocale(locale);
-    }, [config.cookie, locale]);
-    // context value
-    const value = React.useMemo(() => ({
-        locale,
-        setLocale,
-    }), [locale, setLocale]);
-    return (jsx(LocaleContext.Provider, { value: value, children: children }));
-}
-
-export { LocaleProvider };

package/dist/react/src/client/react/contexts/locale/utils/change-locale.js

@@ -1,26 +0,0 @@
-/**
- * Requests a locale change on the client.
- *
- * - This function updates the locale state only.
- * - Side effects such as cookie persistence, `<html lang>` updates,
- * or message refetching are handled by higher-level providers.
- *
- * Notes:
- * - When using a `local` loader, client-side locale switching
- *   requires a full page reload to load new message bundles.
- */
-const changeLocale = ({ locale, newLocale, fullReloadRequired, setLocaleState, }) => {
-    // No-op when locale does not change
-    if (newLocale === locale)
-        return;
-    // Informational warning when a full reload is required
-    if (fullReloadRequired) {
-        console.warn(`[Intor] Locale change requested while using a "local" loader. ` +
-            `Client-side navigation alone will not load new messages. ` +
-            `Use the provided <Link> wrapper or trigger a full page reload.`);
-    }
-    // Update locale state
-    setLocaleState(newLocale);
-};
-
-export { changeLocale };

package/dist/react/src/client/react/contexts/messages/context.js

@@ -1,5 +0,0 @@
-import * as React from 'react';
-
-const MessagesContext = React.createContext(undefined);
-
-export { MessagesContext };

package/dist/react/src/client/react/contexts/messages/hook.js

@@ -1,11 +0,0 @@
-import * as React from 'react';
-import { MessagesContext } from './context.js';
-
-function useMessages() {
-    const context = React.useContext(MessagesContext);
-    if (!context)
-        throw new Error("useMessages must be used within a MessagesProvider");
-    return context;
-}
-
-export { useMessages };

package/dist/react/src/client/react/contexts/messages/provider.js

@@ -1,39 +0,0 @@
-"use client";
-import { jsx } from 'react/jsx-runtime';
-import * as React from 'react';
-import '../config/context.js';
-import { useConfig } from '../config/hook.js';
-import '../locale/context.js';
-import { useLocale } from '../locale/hook.js';
-import { useRefetchMessages } from './utils/use-refetch-messages.js';
-import { MessagesContext } from './context.js';
-
-function MessagesProvider({ value: { messages = {} }, children, }) {
-    const { config } = useConfig();
-    const { locale } = useLocale();
-    const [runtimeMessages, setRuntimeMessages] = React.useState(null);
-    const [isLoadingMessages, setIsLoadingMessages] = React.useState(false);
-    const isInitialRenderRef = React.useRef(true);
-    // Prepares message refetch function.
-    const { refetchMessages } = useRefetchMessages({
-        config,
-        setRuntimeMessages,
-        setIsLoadingMessages,
-    });
-    // Refetch messages when locale changes (except initial render).
-    React.useEffect(() => {
-        if (isInitialRenderRef.current) {
-            isInitialRenderRef.current = false;
-            return;
-        }
-        refetchMessages(locale);
-    }, [refetchMessages, locale]);
-    // context value
-    const value = React.useMemo(() => ({
-        messages: runtimeMessages || messages,
-        isLoading: isLoadingMessages,
-    }), [runtimeMessages, messages, isLoadingMessages]);
-    return (jsx(MessagesContext.Provider, { value: value, children: children }));
-}
-
-export { MessagesProvider };

package/dist/react/src/client/react/contexts/messages/utils/use-refetch-messages.js

@@ -1,70 +0,0 @@
-import * as React from 'react';
-import { loadRemoteMessages } from '../../../../../server/messages/load-remote-messages/load-remote-messages.js';
-import { deepMerge } from '../../../../../shared/utils/deep-merge.js';
-
-/**
- * Refetch remote locale messages.
- *
- * This hook ensures that:
- * - Only one remote request is active at a time
- * - In-flight requests are aborted when a new locale is requested
- * - State updates are applied only for the latest request
- */
-const useRefetchMessages = ({ config, setRuntimeMessages, setIsLoadingMessages, }) => {
-    const { loader } = config;
-    // Holds the AbortController for the currently active remote request
-    const abortControllerRef = React.useRef(null);
-    // Refetch messages
-    const refetchMessages = React.useCallback(async (newLocale) => {
-        if (!loader || loader.type !== "remote")
-            return;
-        // Abort any in-flight request
-        abortControllerRef.current?.abort();
-        const controller = new AbortController();
-        abortControllerRef.current = controller;
-        setIsLoadingMessages(true);
-        try {
-            const loadedMessages = await loadRemoteMessages({
-                locale: newLocale,
-                fallbackLocales: config.fallbackLocales[newLocale] || [],
-                namespaces: loader.namespaces,
-                rootDir: loader.rootDir,
-                remoteUrl: loader.remoteUrl,
-                remoteHeaders: loader.remoteHeaders,
-                extraOptions: {
-                    cacheOptions: config.cache,
-                    loggerOptions: { id: config.id, ...config.logger },
-                },
-                signal: controller.signal,
-            });
-            // Update state only if this request was not aborted
-            if (!controller.signal.aborted) {
-                setRuntimeMessages(deepMerge(config.messages, loadedMessages));
-            }
-        }
-        finally {
-            // Clear loading state only if this is still the active request
-            if (abortControllerRef.current === controller) {
-                setIsLoadingMessages(false);
-            }
-        }
-    }, [
-        loader,
-        config.id,
-        config.messages,
-        config.fallbackLocales,
-        config.logger,
-        config.cache,
-        setRuntimeMessages,
-        setIsLoadingMessages,
-    ]);
-    // Abort in-flight request on unmount
-    React.useEffect(() => {
-        return () => {
-            abortControllerRef.current?.abort();
-        };
-    }, []);
-    return { refetchMessages };
-};
-
-export { useRefetchMessages };

package/dist/react/src/client/react/contexts/translator/context.js

@@ -1,5 +0,0 @@
-import * as React from 'react';
-
-const TranslatorContext = React.createContext(undefined);
-
-export { TranslatorContext };

package/dist/react/src/client/react/contexts/translator/hook.js

@@ -1,11 +0,0 @@
-import * as React from 'react';
-import { TranslatorContext } from './context.js';
-
-function useTranslator() {
-    const context = React.useContext(TranslatorContext);
-    if (!context)
-        throw new Error("useTranslator must be used within IntorTranslatorProvider");
-    return context;
-}
-
-export { useTranslator };

package/dist/react/src/client/react/contexts/translator/provider.js

@@ -1,58 +0,0 @@
-"use client";
-import { jsx } from 'react/jsx-runtime';
-import { Translator } from 'intor-translator';
-import * as React from 'react';
-import '../config/context.js';
-import { useConfig } from '../config/hook.js';
-import '../locale/context.js';
-import { useLocale } from '../locale/hook.js';
-import '../../../../config/constants/cache.constants.js';
-import 'logry';
-import 'keyv';
-import '../messages/context.js';
-import { useMessages } from '../messages/hook.js';
-import '../translator-runtime/context.js';
-import { useTranslatorRuntime } from '../translator-runtime/hook.js';
-import { TranslatorContext } from './context.js';
-
-function TranslatorProvider({ value: { isLoading: externalIsLoading } = {}, children, }) {
-    const { config } = useConfig();
-    const { messages, isLoading: internalIsLoading } = useMessages();
-    const { locale } = useLocale();
-    const runtime = useTranslatorRuntime();
-    // Treat locale changes as a loading boundary to avoid transient missing states.
-    // isLoading defaults to false, but is eagerly set to true on locale switches.
-    const prevLocaleRef = React.useRef(locale);
-    // eslint-disable-next-line react-hooks/refs -- intentional render-time read to detect locale switches
-    const localeChanged = prevLocaleRef.current !== locale;
-    React.useEffect(() => {
-        prevLocaleRef.current = locale;
-    }, [locale]);
-    const isLoading = !!externalIsLoading || internalIsLoading || localeChanged;
-    // context value
-    const value = React.useMemo(() => {
-        const translator = new Translator({
-            messages,
-            locale,
-            isLoading,
-            fallbackLocales: config.fallbackLocales,
-            loadingMessage: config.translator?.loadingMessage,
-            placeholder: config.translator?.placeholder,
-            handlers: runtime?.handlers,
-            plugins: runtime?.plugins,
-        });
-        return { translator };
-    }, [
-        messages,
-        locale,
-        isLoading,
-        config.fallbackLocales,
-        config.translator?.loadingMessage,
-        config.translator?.placeholder,
-        runtime?.handlers,
-        runtime?.plugins,
-    ]);
-    return (jsx(TranslatorContext.Provider, { value: value, children: children }));
-}
-
-export { TranslatorProvider };

package/dist/react/src/client/react/contexts/translator-runtime/context.js

@@ -1,5 +0,0 @@
-import * as React from 'react';
-
-const TranslatorRuntimeContext = React.createContext(undefined);
-
-export { TranslatorRuntimeContext };

package/dist/react/src/client/react/contexts/translator-runtime/hook.js

@@ -1,9 +0,0 @@
-import * as React from 'react';
-import { TranslatorRuntimeContext } from './context.js';
-
-function useTranslatorRuntime() {
-    const context = React.useContext(TranslatorRuntimeContext);
-    return context;
-}
-
-export { useTranslatorRuntime };

package/dist/react/src/client/react/contexts/translator-runtime/provider.js

@@ -1,15 +0,0 @@
-"use client";
-import { jsx } from 'react/jsx-runtime';
-import * as React from 'react';
-import { TranslatorRuntimeContext } from './context.js';
-
-const TranslatorRuntimeProvider = ({ value: { handlers, plugins }, children, }) => {
-    // context value
-    const value = React.useMemo(() => ({
-        handlers,
-        plugins,
-    }), [handlers, plugins]);
-    return (jsx(TranslatorRuntimeContext.Provider, { value: value, children: children }));
-};
-
-export { TranslatorRuntimeProvider };

package/dist/react/src/config/constants/cache.constants.js

@@ -1,7 +0,0 @@
-// Default cache options
-const DEFAULT_CACHE_OPTIONS = {
-    enabled: process.env.NODE_ENV === "production",
-    ttl: 60 * 60 * 1000, // 1 hour
-};
-
-export { DEFAULT_CACHE_OPTIONS };

package/dist/react/src/server/shared/messages/global-messages-pool.js

@@ -1,10 +0,0 @@
-import Keyv from 'keyv';
-
-function getGlobalMessagesPool() {
-    if (!globalThis.__INTOR_MESSAGES_POOL__) {
-        globalThis.__INTOR_MESSAGES_POOL__ = new Keyv();
-    }
-    return globalThis.__INTOR_MESSAGES_POOL__;
-}
-
-export { getGlobalMessagesPool };

package/dist/types/src/client/react/contexts/config/context.d.ts

@@ -1,3 +0,0 @@
-import type { ConfigContextValue } from "./types";
-import * as React from "react";
-export declare const ConfigContext: React.Context<ConfigContextValue | undefined>;

package/dist/types/src/client/react/contexts/config/hook.d.ts

@@ -1,2 +0,0 @@
-import type { ConfigContextValue } from "./types";
-export declare function useConfig(): ConfigContextValue;

package/dist/types/src/client/react/contexts/config/index.d.ts

@@ -1,2 +0,0 @@
-export { ConfigProvider } from "./provider";
-export { useConfig } from "./hook";

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

@@ -1,2 +0,0 @@
-import type { ConfigProviderProps } from "./types";
-export declare function ConfigProvider({ value: { config }, children, }: ConfigProviderProps): import("react/jsx-runtime").JSX.Element;