intor 2.4.17 → 2.5.1

package/dist/vue/src/core/utils/deep-merge.js

@@ -1,47 +1,29 @@
-/**
- * Deeply merges two plain objects.
- *
- * - Nested plain objects → merged recursively
- * - Arrays / primitives → `b` overwrites `a`
- *
- * Debug behavior (optional):
- * - Emits override events via `onOverride`
- * - Zero overhead when no options are provided
- *
- * This function always returns a new plain object.
- */
 const deepMerge = (a = {}, b = {}, options) => {
-    const result = { ...a };
-    const basePath = options?._path ?? [];
-    // Iterate only over b's own enumerable properties
-    for (const key in b) {
-        if (!Object.prototype.hasOwnProperty.call(b, key))
-            continue;
-        const aValue = a[key];
-        const bValue = b[key];
-        const nextPath = [...basePath, key];
-        // Recursively merge when both sides are plain objects
-        if (aValue &&
-            bValue &&
-            typeof aValue === "object" &&
-            typeof bValue === "object" &&
-            !Array.isArray(aValue) &&
-            !Array.isArray(bValue)) {
-            result[key] = deepMerge(aValue, bValue, options ? { ...options, _path: nextPath } : undefined);
-        }
-        else {
-            // Emit override event only when debugging is enabled
-            const isAdd = aValue === undefined;
-            options?.onOverride?.({
-                path: nextPath.join("."),
-                prev: aValue,
-                next: bValue,
-                kind: isAdd ? "add" : "override",
-            });
-            result[key] = bValue;
-        }
+  const result = { ...a };
+  const basePath = options?._path ?? [];
+  for (const key in b) {
+    if (!Object.prototype.hasOwnProperty.call(b, key)) continue;
+    const aValue = a[key];
+    const bValue = b[key];
+    const nextPath = [...basePath, key];
+    if (aValue && bValue && typeof aValue === "object" && typeof bValue === "object" && !Array.isArray(aValue) && !Array.isArray(bValue)) {
+      result[key] = deepMerge(
+        aValue,
+        bValue,
+        options ? { ...options, _path: nextPath } : void 0
+      );
+    } else {
+      const isAdd = aValue === void 0;
+      options?.onOverride?.({
+        path: nextPath.join("."),
+        prev: aValue,
+        next: bValue,
+        kind: isAdd ? "add" : "override"
+      });
+      result[key] = bValue;
     }
-    return result;
+  }
+  return result;
 };
 
 export { deepMerge };

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

@@ -1,34 +1,11 @@
-/**
- * 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 { mode: "remote", ...client };
-        }
-        return config.server?.loader ?? config.loader;
+  {
+    const client = config.client?.loader;
+    if (client) {
+      return { mode: "remote", ...client };
     }
+    return config.server?.loader ?? config.loader;
+  }
 };
 
 export { resolveLoaderOptions };

package/dist/vue/src/policies/should-persist-on-first-visit.js

@@ -1,8 +1,5 @@
-/**
- * Allow locale persistence based on first-visit policy.
- */
 function shouldPersistOnFirstVisit(isFirstVisit, persistOnFirstVisit) {
-    return !isFirstVisit || persistOnFirstVisit;
+  return !isFirstVisit || persistOnFirstVisit;
 }
 
 export { shouldPersistOnFirstVisit };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intor",
-  "version": "2.4.17",
+  "version": "2.5.1",
   "description": "The i18n library for modern JavaScript",
   "author": "Yiming Liao",
   "homepage": "https://intor.dev",
@@ -51,6 +51,10 @@
       "types": "./dist/types/export/react/index.d.ts",
       "import": "./dist/react/export/react/index.js"
     },
+    "./react/internal": {
+      "types": "./dist/types/export/react/internal/index.d.ts",
+      "import": "./dist/react/export/react/internal/index.js"
+    },
     "./vue": {
       "types": "./dist/types/export/vue/index.d.ts",
       "import": "./dist/vue/export/vue/index.js"
@@ -59,6 +63,10 @@
       "types": "./dist/types/export/svelte/index.d.ts",
       "import": "./dist/svelte/export/svelte/index.js"
     },
+    "./svelte/internal": {
+      "types": "./dist/types/export/svelte/internal/index.d.ts",
+      "import": "./dist/svelte/export/svelte/internal/index.js"
+    },
     "./next": {
       "types": "./dist/types/export/next/index.d.ts",
       "import": "./dist/next/export/next/index.js"
@@ -96,36 +104,40 @@
     "node": ">=20"
   },
   "scripts": {
-    "type": "tsc --noEmit",
+    "type": "tsc -p tsconfig.json --noEmit",
     "lint": "eslint",
-    "lint:debug": "eslint --debug",
     "test": "vitest",
     "test:types": "tsx scripts/test-types.ts",
     "test:check": "tsx scripts/check-test-structure.ts",
     "knip": "knip --config .config/knip.config.ts",
+    "clean": "rm -rf dist",
     "build": "tsx scripts/build.ts",
-    "prepublishOnly": "yarn build"
+    "build:types": "tsc -p tsconfig.build.json && tsc-alias tsconfig.build.json --outDir dist/types",
+    "build:release": "yarn clean && yarn build && yarn build:types && yarn api:build",
+    "api:build": "tsx scripts/api-extractor/build.ts",
+    "api:check": "tsx scripts/api-extractor/check.ts",
+    "prepublishOnly": "yarn build:release"
   },
   "dependencies": {
-    "intor-translator": "^1.4.15",
+    "intor-translator": "^1.5.0",
     "logry": "2.1.6",
     "p-limit": "7.2.0"
   },
   "devDependencies": {
+    "@microsoft/api-extractor": "^7.57.6",
     "@rollup/plugin-alias": "6.0.0",
-    "@rollup/plugin-typescript": "12.3.0",
     "@rollup/pluginutils": "5.3.0",
     "@sveltejs/kit": "2.50.1",
     "@testing-library/dom": "10.4.1",
     "@testing-library/jest-dom": "6.9.1",
     "@testing-library/react": "16.3.1",
-    "@testing-library/user-event": "14.6.1",
     "@types/express": "5.0.6",
     "@types/node": "24.10.1",
     "@types/react": "19.0.0",
     "@types/react-dom": "19.0.0",
     "@vitejs/plugin-react": "5.1.2",
     "@vitest/coverage-v8": "4.0.16",
+    "@vue/test-utils": "^2.4.6",
     "eslint": "9.39.2",
     "eslint-config-prettier": "10.1.8",
     "eslint-import-resolver-typescript": "4.4.4",
@@ -149,12 +161,13 @@
     "remark-gfm": "4.0.1",
     "rollup": "4.53.3",
     "rollup-plugin-copy": "3.5.0",
+    "rollup-plugin-esbuild": "^6.2.1",
     "svelte": "5.46.1",
     "tsc-alias": "1.8.16",
     "tsd": "0.33.0",
     "tsx": "^4.21.0",
     "typescript": "5.8.3",
-    "typescript-eslint": "8.32.1",
+    "typescript-eslint": "^8.56.1",
     "vite": "7.3.0",
     "vite-tsconfig-paths": "6.0.3",
     "vitest": "4.0.16",

package/dist/core/src/routing/inbound/resolve-path/resolve-path.js

@@ -1,42 +0,0 @@
-import { localizePathname } from '../../pathname/localize-pathname.js';
-import { all } from './strategies/all.js';
-import { exceptDefault } from './strategies/except-default.js';
-import { none } from './strategies/none.js';
-
-const assertNever = (x) => {
-    throw new Error(`Unhandled prefix strategy: ${x}`);
-};
-/**
- * Resolves the canonical pathname based on locale prefix behavior.
- *
- * The resolved pathname represents the final, normalized form
- * used for routing and navigation.
- */
-const resolvePath = (config, rawPathname, context) => {
-    const { localePrefix } = config.routing;
-    let directive;
-    switch (localePrefix) {
-        case "all": {
-            directive = all(config, context);
-            break;
-        }
-        case "except-default": {
-            directive = exceptDefault(config, context);
-            break;
-        }
-        case "none": {
-            directive = none();
-            break;
-        }
-        default: {
-            return assertNever(localePrefix);
-        }
-    }
-    const { pathname } = localizePathname(rawPathname, config, context.locale);
-    return {
-        pathname,
-        shouldRedirect: directive.type === "redirect",
-    };
-};
-
-export { resolvePath };

package/dist/core/src/routing/inbound/resolve-path/strategies/all.js

@@ -1,28 +0,0 @@
-/**
- * Resolve pathname decision for routing prefix strategy: "all".
- */
-function all(config, context) {
-    const { hasPathLocale, hasPersisted} = context;
-    const { redirect } = config.routing.inbound.firstVisit;
-    const isFirstVisit = !hasPersisted;
-    // ----------------------------------------------------------
-    // URL already canonical
-    // ----------------------------------------------------------
-    if (hasPathLocale) {
-        return { type: "pass" };
-    }
-    // ----------------------------------------------------------
-    // Apply first-visit redirect policy
-    // ----------------------------------------------------------
-    if (isFirstVisit) {
-        if (!redirect)
-            return { type: "pass" };
-        return { type: "redirect" };
-    }
-    // ----------------------------------------------------------
-    // Redirect to the locale-prefixed URL
-    // ----------------------------------------------------------
-    return { type: "redirect" };
-}
-
-export { all };

package/dist/core/src/routing/inbound/resolve-path/strategies/except-default.js

@@ -1,29 +0,0 @@
-/**
- * Resolve pathname decision for routing prefix strategy: "except-default".
- */
-function exceptDefault(config, context) {
-    const { hasPathLocale, hasPersisted} = context;
-    const { redirect } = config.routing.inbound.firstVisit;
-    const isFirstVisit = !hasPersisted;
-    const isDefaultLocale = context.locale === config.defaultLocale;
-    // ----------------------------------------------------------
-    // URL already canonical
-    // ----------------------------------------------------------
-    if (hasPathLocale) {
-        return { type: "pass" };
-    }
-    // ----------------------------------------------------------
-    // Apply first-visit redirect policy
-    // ----------------------------------------------------------
-    if (isFirstVisit) {
-        if (!redirect)
-            return { type: "pass" };
-        return isDefaultLocale ? { type: "pass" } : { type: "redirect" };
-    }
-    // ----------------------------------------------------------
-    // Redirect non-default locale to the locale-prefixed URL
-    // ----------------------------------------------------------
-    return isDefaultLocale ? { type: "pass" } : { type: "redirect" };
-}
-
-export { exceptDefault };

package/dist/core/src/routing/inbound/resolve-path/strategies/none.js

@@ -1,8 +0,0 @@
-/**
- * Resolve pathname decision for routing prefix strategy: "none".
- */
-function none() {
-    return { type: "pass" };
-}
-
-export { none };

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

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

package/dist/express/src/core/logger/get-logger.js

@@ -1,39 +0,0 @@
-import { logry } from 'logry';
-import { getGlobalLoggerPool } from './global-logger-pool.js';
-
-const DEFAULT_FORMAT_CONFIG = {
-    timestamp: { withDate: false },
-};
-const DEFAULT_RENDER_CONFIG = {
-    timestamp: {},
-    id: { visible: true, prefix: "<", suffix: ">" },
-    meta: { lineBreaksAfter: 1 },
-};
-/**
- * Get a shared logger instance by id.
- * - Safe across hot reloads
- * - Prevents unbounded memory usage via soft LRU
- */
-function getLogger({ id = "default", formatConfig, renderConfig, preset, ...options }) {
-    const pool = getGlobalLoggerPool();
-    let logger = pool.get(id);
-    if (!logger) {
-        logger = logry({
-            id,
-            formatConfig: !formatConfig && !preset ? DEFAULT_FORMAT_CONFIG : formatConfig,
-            renderConfig: !renderConfig && !preset ? DEFAULT_RENDER_CONFIG : renderConfig,
-            preset,
-            ...options,
-        });
-        pool.set(id, logger);
-        // Soft LRU: keep pool size under control
-        if (pool.size > 1000) {
-            const keys = [...pool.keys()];
-            for (const key of keys.slice(0, 200))
-                pool.delete(key);
-        }
-    }
-    return logger;
-}
-
-export { getLogger };

package/dist/express/src/core/logger/global-logger-pool.js

@@ -1,8 +0,0 @@
-function getGlobalLoggerPool() {
-    if (!globalThis.__INTOR_LOGGER_POOL__) {
-        globalThis.__INTOR_LOGGER_POOL__ = new Map();
-    }
-    return globalThis.__INTOR_LOGGER_POOL__;
-}
-
-export { getGlobalLoggerPool };

package/dist/express/src/core/messages/load-remote-messages/collect-remote-resources.js

@@ -1,25 +0,0 @@
-/**
- * Collect remote message resources for a given locale.
- *
- * - Always includes the root `index.json`
- * - Optionally includes namespace-specific resources
- * - Produces semantic paths for later message nesting
- *
- * This function performs no I/O and does not validate resource existence.
- */
-function collectRemoteResources({ locale, baseUrl, namespaces, }) {
-    const basePath = `${baseUrl}/${locale}`;
-    // Root translation resource (always loaded)
-    const indexResource = { url: `${basePath}/index.json`, path: [] };
-    // When no namespaces are provided, the locale domain consists of index only
-    if (!namespaces || namespaces.length === 0)
-        return [indexResource];
-    // Namespace-specific resources are nested under their namespace key
-    const nsResources = namespaces.map((ns) => ({
-        url: `${basePath}/${ns}.json`,
-        path: [ns],
-    }));
-    return [indexResource, ...nsResources];
-}
-
-export { collectRemoteResources };

package/dist/express/src/core/messages/load-remote-messages/fetch-remote-resource.js

@@ -1,47 +0,0 @@
-import { getLogger } from '../../logger/get-logger.js';
-import { isValidMessages } from '../utils/is-valid-messages.js';
-
-/**
- * Fetch a single remote messages resource.
- *
- * This function performs a single HTTP request to retrieve
- * a remote translation messages payload.
- *
- * It is responsible for:
- * - Issuing the network request
- * - Validating the returned message structure
- * - Handling abort and network errors
- */
-async function fetchRemoteResource({ fetch, url, headers, signal, loggerOptions, }) {
-    const baseLogger = getLogger(loggerOptions);
-    const logger = baseLogger.child({ scope: "fetch-locale-messages" });
-    try {
-        // Fetch
-        const response = await fetch(url, {
-            method: "GET",
-            headers: { "Content-Type": "application/json", ...headers },
-            cache: "no-store",
-            signal,
-        });
-        if (!response.ok) {
-            throw new Error(`HTTP ${response.status} ${response.statusText}`);
-        }
-        // Parse JSON body
-        const data = await response.json();
-        // Validate messages structure
-        if (!isValidMessages(data)) {
-            throw new Error("Invalid messages structure");
-        }
-        return data;
-    }
-    catch (error) {
-        if (error instanceof Error && error.name === "AbortError") {
-            logger.debug("Remote fetch aborted.", { url });
-            return;
-        }
-        logger.warn("Failed to fetch remote messages.", { url, error });
-        return;
-    }
-}
-
-export { fetchRemoteResource };

package/dist/express/src/core/messages/load-remote-messages/load-remote-messages.js

@@ -1,93 +0,0 @@
-import pLimit from 'p-limit';
-import { getLogger } from '../../logger/get-logger.js';
-import { collectRemoteResources } from './collect-remote-resources.js';
-import { fetchRemoteResource } from './fetch-remote-resource.js';
-import { resolveRemoteResources } from './resolve-remote-resources.js';
-
-/**
- * Load locale messages from a remote source.
- *
- * This function serves as the orchestration layer for remote message loading.
- * It coordinates:
- *
- * - Locale resolution with fallbacks
- * - Concurrency control for network requests
- * - Remote resource fetching and message merging
- *
- * Remote messages are fetched on demand and are not memoized at the process level.
- *
- * Network requests and response validation are delegated to lower-level utilities.
- */
-const loadRemoteMessages = async ({ locale, fallbackLocales, namespaces, concurrency, fetch, url: baseUrl, headers, signal, 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) {
-        logger.debug("Remote message loading aborted before fetch.");
-        return;
-    }
-    const start = performance.now();
-    logger.debug("Loading remote messages.", { baseUrl });
-    // ----------------------------------------------------------------
-    // Resolve locale messages with ordered fallback strategy
-    // ----------------------------------------------------------------
-    const limit = concurrency ? pLimit(concurrency) : undefined;
-    const candidateLocales = [locale, ...(fallbackLocales || [])];
-    let messages;
-    for (let i = 0; i < candidateLocales.length; i++) {
-        const candidateLocale = candidateLocales[i];
-        const isLast = i === candidateLocales.length - 1;
-        try {
-            // -----------------------------------------------------------------
-            // Collect remote message resources for the locale
-            // -----------------------------------------------------------------
-            const resources = collectRemoteResources({
-                locale: candidateLocale,
-                baseUrl,
-                namespaces,
-            });
-            // -----------------------------------------------------------------
-            // Fetch all message chunks in parallel
-            // -----------------------------------------------------------------
-            const fetchUrl = (url) => fetchRemoteResource({ url, headers, signal, loggerOptions, fetch });
-            const results = await Promise.all(resources.map(({ url }) => limit ? limit(() => fetchUrl(url)) : fetchUrl(url)));
-            // Guard: no valid remote resources
-            if (!results.some(Boolean))
-                continue;
-            // -----------------------------------------------------------------
-            // Resolve and merge remote message resources
-            // -----------------------------------------------------------------
-            const resolved = resolveRemoteResources(resources.map((res, i) => ({ path: res.path, data: results[i] })));
-            // -----------------------------------------------------------------
-            // Wrap resolved messages into locale-scoped LocaleMessages
-            // -----------------------------------------------------------------
-            messages = { [candidateLocale]: resolved };
-            break;
-        }
-        catch {
-            if (signal?.aborted) {
-                logger.debug("Remote message loading aborted.");
-                return;
-            }
-            if (isLast) {
-                logger.warn("Failed to load messages for all candidate locales.", {
-                    locale,
-                    fallbackLocales,
-                });
-            }
-            else {
-                logger.warn(`Failed to load locale messages for "${candidateLocale}", trying next fallback.`);
-            }
-        }
-    }
-    // Final success log with resolved locale and timing
-    if (messages) {
-        logger.trace("Finished loading remote messages.", {
-            loadedLocale: Object.keys(messages)[0],
-            duration: `${Math.round(performance.now() - start)} ms`,
-        });
-    }
-    return messages;
-};
-
-export { loadRemoteMessages };

package/dist/express/src/core/messages/load-remote-messages/resolve-remote-resources.js

@@ -1,24 +0,0 @@
-import { deepMerge } from '../../utils/deep-merge.js';
-import { nestObjectFromPath } from '../utils/nest-object-from-path.js';
-
-/**
- * Resolve remote message resources into a single MessageObject.
- *
- * - Applies semantic nesting based on resource path
- * - Merges all resolved message chunks
- *
- * Always returns a MessageObject.
- * An empty object represents an empty translation domain.
- */
-function resolveRemoteResources(resources) {
-    let result = {};
-    for (const { path, data } of resources) {
-        if (!data)
-            continue;
-        const resolved = path.length > 0 ? nestObjectFromPath(path, data) : data;
-        result = deepMerge(result, resolved);
-    }
-    return result;
-}
-
-export { resolveRemoteResources };

package/dist/express/src/core/messages/merge-messages.js

@@ -1,33 +0,0 @@
-import { getLogger } from '../logger/get-logger.js';
-import { deepMerge } from '../utils/deep-merge.js';
-
-/**
- * Merge locale-specific messages with runtime overrides.
- *
- * - Only merges messages under the given locale
- * - Emits debug logs for add / override events
- */
-function mergeMessages(a, b, { config, locale, onEvent }) {
-    const baseLogger = getLogger({ ...config.logger, id: config.id });
-    const logger = baseLogger.child({ scope: "merge-messages" });
-    // Merge messages for the active locale only
-    const merged = deepMerge(a?.[locale] ?? {}, b?.[locale] ?? {}, {
-        onOverride: (event) => {
-            if (onEvent) {
-                onEvent(event);
-                return;
-            }
-            const { kind, path, next, prev } = event;
-            if (kind === "add")
-                return;
-            logger.debug(`Override | ${locale}: "${path}"`, { prev, next });
-        },
-    });
-    // Preserve other locales, update only the target one
-    return {
-        ...a,
-        [locale]: merged,
-    };
-}
-
-export { mergeMessages };

package/dist/express/src/core/messages/utils/is-valid-messages.js

@@ -1,44 +0,0 @@
-/** Check if a value is a plain object (not null, not array) */
-function isPlainObject(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-/**
- * Check if a value is a valid MessageObject.
- *
- * - Supports all MessageValue variants (primitive, array, object).
- * - Uses an iterative approach to avoid stack overflow.
- */
-function isValidMessages(value) {
-    if (!isPlainObject(value))
-        return false;
-    const stack = [value];
-    while (stack.length > 0) {
-        const current = stack.pop();
-        // primitives are always valid
-        if (current === null ||
-            typeof current === "string" ||
-            typeof current === "number" ||
-            typeof current === "boolean") {
-            continue;
-        }
-        // array → validate each item
-        if (Array.isArray(current)) {
-            for (const item of current) {
-                stack.push(item);
-            }
-            continue;
-        }
-        // object → validate each value
-        if (isPlainObject(current)) {
-            for (const v of Object.values(current)) {
-                stack.push(v);
-            }
-            continue;
-        }
-        // everything else is invalid
-        return false;
-    }
-    return true;
-}
-
-export { isPlainObject, isValidMessages };