intor 2.3.13 → 2.3.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core/export/index.js +1 -2
- package/dist/core/src/config/define-intor-config.js +0 -3
- package/dist/core/src/config/resolvers/resolve-cookie-options.js +0 -1
- package/dist/core/src/config/resolvers/resolve-fallback-locales.js +1 -2
- package/dist/core/src/config/resolvers/resolve-routing-options.js +0 -2
- package/dist/core/src/config/validators/validate-default-locale.js +0 -1
- package/dist/core/src/config/validators/validate-id.js +0 -1
- package/dist/core/src/config/validators/validate-supported-locales.js +0 -1
- package/dist/core/src/core/messages/global-messages-pool.js +11 -17
- package/dist/core/src/core/messages/load-remote-messages/load-remote-messages.js +1 -40
- package/dist/core/src/core/messages/utils/is-valid-messages.js +23 -15
- package/dist/core/src/routing/pathname/get-unprefixed-pathname.js +0 -1
- package/dist/core/src/routing/pathname/locale-prefix-pathname.js +0 -1
- package/dist/core/src/routing/pathname/standardize-pathname.js +0 -1
- package/dist/core/src/server/helpers/get-translator.js +3 -2
- package/dist/core/src/server/helpers/local-messages-from-url.js +1 -1
- package/dist/core/src/server/intor/intor.js +0 -1
- package/dist/core/src/server/messages/load-local-messages/load-local-messages.js +11 -12
- package/dist/core/src/server/messages/load-local-messages/read-locale-messages/collect-file-entries/collect-file-entries.js +6 -6
- package/dist/core/src/server/messages/load-local-messages/read-locale-messages/parse-file-entries/parse-file-entries.js +14 -6
- package/dist/core/src/server/messages/load-local-messages/read-locale-messages/read-locale-messages.js +3 -3
- package/dist/core/src/server/messages/load-messages.js +8 -12
- package/dist/core/src/server/runtime/create-intor-runtime.js +12 -8
- package/dist/core/src/server/translator/create-translator.js +1 -0
- package/dist/express/src/adapters/express/helpers/get-translator.js +3 -4
- package/dist/express/src/adapters/express/middleware/create-intor.js +5 -5
- package/dist/express/src/core/messages/global-messages-pool.js +9 -3
- package/dist/express/src/core/messages/load-remote-messages/load-remote-messages.js +1 -40
- package/dist/express/src/core/messages/utils/is-valid-messages.js +23 -15
- package/dist/express/src/routing/inbound/resolve-inbound.js +5 -6
- package/dist/express/src/routing/inbound/resolve-locale/resolve-locale.js +13 -6
- package/dist/express/src/routing/locale/get-locale-from-accept-language.js +7 -17
- package/dist/express/src/routing/locale/get-locale-from-host.js +13 -15
- package/dist/express/src/routing/locale/get-locale-from-pathname.js +4 -14
- package/dist/express/src/routing/locale/get-locale-from-query.js +10 -17
- package/dist/express/src/routing/pathname/get-unprefixed-pathname.js +0 -1
- package/dist/express/src/routing/pathname/locale-prefix-pathname.js +0 -1
- package/dist/express/src/routing/pathname/standardize-pathname.js +0 -1
- package/dist/express/src/server/helpers/get-translator.js +3 -2
- package/dist/express/src/server/messages/load-local-messages/load-local-messages.js +11 -12
- package/dist/express/src/server/messages/load-local-messages/read-locale-messages/collect-file-entries/collect-file-entries.js +6 -6
- package/dist/express/src/server/messages/load-local-messages/read-locale-messages/parse-file-entries/parse-file-entries.js +14 -6
- package/dist/express/src/server/messages/load-local-messages/read-locale-messages/read-locale-messages.js +3 -3
- package/dist/express/src/server/messages/load-messages.js +8 -12
- package/dist/express/src/server/runtime/create-intor-runtime.js +12 -8
- package/dist/express/src/server/translator/create-translator.js +1 -0
- package/dist/next/src/adapters/next/navigation/redirect.js +0 -1
- package/dist/next/src/adapters/next/navigation/use-pathname.js +0 -1
- package/dist/next/src/adapters/next/proxy/intor-proxy.js +1 -2
- package/dist/next/src/adapters/next/server/get-locale.js +0 -1
- package/dist/next/src/adapters/next/server/get-pathname.js +0 -1
- package/dist/next/src/adapters/next/server/get-translator.js +3 -4
- package/dist/next/src/adapters/next/server/intor.js +2 -3
- package/dist/next/src/core/messages/global-messages-pool.js +9 -3
- package/dist/next/src/core/messages/load-remote-messages/load-remote-messages.js +1 -40
- package/dist/next/src/core/messages/utils/is-valid-messages.js +23 -15
- package/dist/next/src/policies/shoud-full-reload.js +0 -1
- package/dist/next/src/routing/inbound/resolve-inbound.js +5 -6
- package/dist/next/src/routing/inbound/resolve-locale/resolve-locale.js +13 -6
- package/dist/next/src/routing/locale/get-locale-from-accept-language.js +7 -17
- package/dist/next/src/routing/locale/get-locale-from-host.js +13 -15
- package/dist/next/src/routing/locale/get-locale-from-pathname.js +4 -14
- package/dist/next/src/routing/locale/get-locale-from-query.js +10 -17
- package/dist/next/src/routing/pathname/get-unprefixed-pathname.js +0 -1
- package/dist/next/src/routing/pathname/locale-prefix-pathname.js +0 -1
- package/dist/next/src/routing/pathname/standardize-pathname.js +0 -1
- package/dist/next/src/server/helpers/get-translator.js +3 -2
- package/dist/next/src/server/intor/intor.js +0 -1
- package/dist/next/src/server/messages/load-local-messages/load-local-messages.js +11 -12
- package/dist/next/src/server/messages/load-local-messages/read-locale-messages/collect-file-entries/collect-file-entries.js +6 -6
- package/dist/next/src/server/messages/load-local-messages/read-locale-messages/parse-file-entries/parse-file-entries.js +14 -6
- package/dist/next/src/server/messages/load-local-messages/read-locale-messages/read-locale-messages.js +3 -3
- package/dist/next/src/server/messages/load-messages.js +8 -12
- package/dist/next/src/server/runtime/create-intor-runtime.js +12 -8
- package/dist/next/src/server/translator/create-translator.js +1 -0
- package/dist/react/src/client/react/helpers/use-runtime-state.js +0 -1
- package/dist/react/src/client/react/navigation/use-execute-navigation.js +0 -1
- package/dist/react/src/client/react/navigation/use-resolve-navigation.js +0 -1
- package/dist/react/src/client/react/provider/effects/use-locale-effects.js +0 -1
- package/dist/react/src/client/react/translator/use-translator.js +1 -0
- package/dist/react/src/client/shared/helpers/get-client-locale.js +0 -1
- package/dist/react/src/client/shared/messages/create-refetch-messages.js +0 -3
- package/dist/react/src/core/messages/load-remote-messages/load-remote-messages.js +1 -40
- package/dist/react/src/core/messages/utils/is-valid-messages.js +23 -15
- package/dist/react/src/policies/shoud-full-reload.js +0 -1
- package/dist/react/src/routing/pathname/get-unprefixed-pathname.js +0 -1
- package/dist/react/src/routing/pathname/locale-prefix-pathname.js +0 -1
- package/dist/react/src/routing/pathname/standardize-pathname.js +0 -1
- package/dist/svelte/src/client/shared/helpers/get-client-locale.js +0 -1
- package/dist/svelte/src/client/shared/messages/create-refetch-messages.js +0 -3
- package/dist/svelte/src/client/svelte/helpers/create-runtime-state.js +0 -1
- package/dist/svelte/src/client/svelte/runtime/create-intor-api.js +4 -0
- package/dist/svelte/src/client/svelte/runtime/create-intor.js +2 -1
- package/dist/svelte/src/client/svelte/runtime/effects/locale-effects.js +0 -1
- package/dist/svelte/src/core/messages/load-remote-messages/load-remote-messages.js +1 -40
- package/dist/svelte/src/core/messages/utils/is-valid-messages.js +23 -15
- package/dist/types/export/index.d.ts +2 -2
- package/dist/types/src/adapters/express/global.d.ts +2 -1
- package/dist/types/src/adapters/express/helpers/get-translator.d.ts +1 -1
- package/dist/types/src/adapters/next/server/get-translator.d.ts +1 -1
- package/dist/types/src/adapters/next/server/intor.d.ts +2 -2
- package/dist/types/src/client/svelte/runtime/create-intor-api.d.ts +2 -0
- package/dist/types/src/client/svelte/runtime/types.d.ts +3 -1
- package/dist/types/src/client/vue/provider/resolver/resolve-runtime.d.ts +1 -1
- package/dist/types/src/config/constants/index.d.ts +0 -1
- package/dist/types/src/config/index.d.ts +2 -2
- package/dist/types/src/config/types/index.d.ts +0 -1
- package/dist/types/src/config/types/intor-config.d.ts +0 -4
- package/dist/types/src/core/index.d.ts +1 -1
- package/dist/types/src/core/messages/global-messages-pool.d.ts +15 -12
- package/dist/types/src/core/messages/index.d.ts +2 -2
- package/dist/types/src/core/messages/load-remote-messages/load-remote-messages.d.ts +1 -2
- package/dist/types/src/core/messages/load-remote-messages/types.d.ts +1 -6
- package/dist/types/src/core/messages/types.d.ts +14 -36
- package/dist/types/src/core/messages/utils/is-valid-messages.d.ts +5 -10
- package/dist/types/src/core/types/translator-instance.d.ts +3 -1
- package/dist/types/src/routing/inbound/resolve-locale/resolve-locale.d.ts +4 -3
- package/dist/types/src/routing/locale/get-locale-from-accept-language.d.ts +5 -7
- package/dist/types/src/routing/locale/get-locale-from-host.d.ts +12 -8
- package/dist/types/src/routing/locale/get-locale-from-pathname.d.ts +4 -13
- package/dist/types/src/routing/locale/get-locale-from-query.d.ts +9 -10
- package/dist/types/src/server/helpers/get-translator.d.ts +2 -3
- package/dist/types/src/server/messages/load-local-messages/load-local-messages.d.ts +2 -2
- package/dist/types/src/server/messages/load-local-messages/read-locale-messages/parse-file-entries/parse-file-entries.d.ts +2 -2
- package/dist/types/src/server/messages/load-local-messages/read-locale-messages/parse-file-entries/types.d.ts +4 -3
- package/dist/types/src/server/messages/load-local-messages/read-locale-messages/parse-file-entries/utils/json-reader.d.ts +2 -2
- package/dist/types/src/server/messages/load-local-messages/read-locale-messages/parse-file-entries/utils/nest-object-from-path.d.ts +2 -2
- package/dist/types/src/server/messages/load-local-messages/read-locale-messages/read-locale-messages.d.ts +1 -1
- package/dist/types/src/server/messages/load-local-messages/read-locale-messages/types.d.ts +2 -2
- package/dist/types/src/server/messages/load-local-messages/types.d.ts +2 -2
- package/dist/types/src/server/messages/load-messages.d.ts +1 -1
- package/dist/types/src/server/messages/types.d.ts +2 -2
- package/dist/types/src/server/runtime/types.d.ts +2 -2
- package/dist/types/src/server/translator/create-translator.d.ts +1 -0
- package/dist/vue/src/client/shared/helpers/get-client-locale.js +0 -1
- package/dist/vue/src/client/shared/messages/create-refetch-messages.js +0 -3
- package/dist/vue/src/client/vue/helpers/use-runtime-state.js +0 -1
- package/dist/vue/src/client/vue/provider/effects/use-locale-effects.js +0 -1
- package/dist/vue/src/client/vue/translator/use-translator.js +3 -1
- package/dist/vue/src/core/messages/load-remote-messages/load-remote-messages.js +1 -40
- package/dist/vue/src/core/messages/utils/is-valid-messages.js +23 -15
- package/package.json +3 -4
- package/dist/core/src/config/constants/cache.js +0 -7
- package/dist/core/src/config/resolvers/resolve-cache-options.js +0 -11
- package/dist/react/src/core/utils/normalizers/normalize-cache-key.js +0 -45
- package/dist/svelte/src/core/utils/normalizers/normalize-cache-key.js +0 -45
- package/dist/types/src/config/constants/cache.d.ts +0 -2
- package/dist/types/src/config/resolvers/resolve-cache-options.d.ts +0 -2
- package/dist/types/src/config/types/cache.d.ts +0 -7
- package/dist/vue/src/core/utils/normalizers/normalize-cache-key.js +0 -45
|
@@ -2,7 +2,6 @@ import { INTOR_HEADERS } from '../../../core/constants/headers.js';
|
|
|
2
2
|
import '../../../core/error/intor-error.js';
|
|
3
3
|
import { normalizeQuery } from '../../../core/utils/normalizers/normalize-query.js';
|
|
4
4
|
import 'logry';
|
|
5
|
-
import 'keyv';
|
|
6
5
|
import { resolveInbound } from '../../../routing/inbound/resolve-inbound.js';
|
|
7
6
|
import { getLocaleFromAcceptLanguage } from '../../../routing/locale/get-locale-from-accept-language.js';
|
|
8
7
|
import 'node:path';
|
|
@@ -25,7 +24,7 @@ function createIntor(config, options) {
|
|
|
25
24
|
return async function intorMiddleware(req, _res, next) {
|
|
26
25
|
// locale from accept-language header
|
|
27
26
|
const acceptLanguage = req.headers["accept-language"];
|
|
28
|
-
const localeFromAcceptLanguage = getLocaleFromAcceptLanguage(
|
|
27
|
+
const localeFromAcceptLanguage = getLocaleFromAcceptLanguage(acceptLanguage, config.supportedLocales);
|
|
29
28
|
// ----------------------------------------------------------
|
|
30
29
|
// Resolve inbound routing decision (pure computation)
|
|
31
30
|
// ----------------------------------------------------------
|
|
@@ -44,19 +43,20 @@ function createIntor(config, options) {
|
|
|
44
43
|
// --------------------------------------------------
|
|
45
44
|
// Bind inbound routing context
|
|
46
45
|
// --------------------------------------------------
|
|
47
|
-
const { t,
|
|
46
|
+
const { hasKey, t, tRaw } = (await getTranslator(config, {
|
|
48
47
|
locale,
|
|
49
48
|
handlers: options?.handlers,
|
|
50
49
|
plugins: options?.plugins,
|
|
51
|
-
|
|
50
|
+
readers: options?.readers,
|
|
52
51
|
allowCacheWrite: true,
|
|
53
52
|
}));
|
|
54
53
|
req.intor = { locale, localeSource };
|
|
55
54
|
// DX shortcuts (optional)
|
|
56
55
|
req.locale = locale;
|
|
57
56
|
req.localeSource = localeSource;
|
|
58
|
-
req.t = t;
|
|
59
57
|
req.hasKey = hasKey;
|
|
58
|
+
req.t = t;
|
|
59
|
+
req.tRaw = tRaw;
|
|
60
60
|
return next();
|
|
61
61
|
};
|
|
62
62
|
}
|
|
@@ -1,8 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
/**
|
|
2
|
+
* Get the global messages pool.
|
|
3
|
+
*
|
|
4
|
+
* Lazily initialized to ensure:
|
|
5
|
+
* - Cross-module sharing
|
|
6
|
+
* - Dev / HMR safety
|
|
7
|
+
*/
|
|
3
8
|
function getGlobalMessagesPool() {
|
|
4
9
|
if (!globalThis.__INTOR_MESSAGES_POOL__) {
|
|
5
|
-
|
|
10
|
+
const pool = new Map();
|
|
11
|
+
globalThis.__INTOR_MESSAGES_POOL__ = pool;
|
|
6
12
|
}
|
|
7
13
|
return globalThis.__INTOR_MESSAGES_POOL__;
|
|
8
14
|
}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { getLogger } from '../../logger/get-logger.js';
|
|
2
|
-
import { normalizeCacheKey } from '../../utils/normalizers/normalize-cache-key.js';
|
|
3
2
|
import { fetchLocaleMessages } from './fetch-locale-messages/fetch-locale-messages.js';
|
|
4
3
|
|
|
5
4
|
/**
|
|
@@ -9,12 +8,11 @@ import { fetchLocaleMessages } from './fetch-locale-messages/fetch-locale-messag
|
|
|
9
8
|
* It coordinates:
|
|
10
9
|
*
|
|
11
10
|
* - Locale resolution with fallbacks
|
|
12
|
-
* - Cache read / write behavior
|
|
13
11
|
* - Respecting abort signals across the entire async flow
|
|
14
12
|
*
|
|
15
13
|
* Network fetching and data validation are delegated to lower-level utilities.
|
|
16
14
|
*/
|
|
17
|
-
const loadRemoteMessages = async ({
|
|
15
|
+
const loadRemoteMessages = async ({ locale, fallbackLocales, namespaces, rootDir, url, headers, signal, loggerOptions, }) => {
|
|
18
16
|
const baseLogger = getLogger(loggerOptions);
|
|
19
17
|
const logger = baseLogger.child({ scope: "load-remote-messages" });
|
|
20
18
|
// Abort early if the request has already been cancelled
|
|
@@ -25,31 +23,6 @@ const loadRemoteMessages = async ({ id, locale, fallbackLocales, namespaces, roo
|
|
|
25
23
|
const start = performance.now();
|
|
26
24
|
logger.debug("Loading remote messages.", { url });
|
|
27
25
|
// ---------------------------------------------------------------------------
|
|
28
|
-
// Cache key resolution
|
|
29
|
-
// ---------------------------------------------------------------------------
|
|
30
|
-
const cacheKey = normalizeCacheKey([
|
|
31
|
-
id,
|
|
32
|
-
"loaderType:remote",
|
|
33
|
-
rootDir,
|
|
34
|
-
locale,
|
|
35
|
-
(fallbackLocales || []).toSorted().join(","),
|
|
36
|
-
(namespaces || []).toSorted().join(","),
|
|
37
|
-
]);
|
|
38
|
-
// ---------------------------------------------------------------------------
|
|
39
|
-
// Cache read
|
|
40
|
-
// ---------------------------------------------------------------------------
|
|
41
|
-
if (cacheOptions.enabled && cacheKey) {
|
|
42
|
-
const cached = await pool?.get(cacheKey);
|
|
43
|
-
if (signal?.aborted) {
|
|
44
|
-
logger.debug("Remote message loading aborted after cache read.");
|
|
45
|
-
return;
|
|
46
|
-
}
|
|
47
|
-
if (cached) {
|
|
48
|
-
logger.debug("Messages cache hit.", { key: cacheKey });
|
|
49
|
-
return cached;
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
// ---------------------------------------------------------------------------
|
|
53
26
|
// Resolve locale messages with ordered fallback strategy
|
|
54
27
|
// ---------------------------------------------------------------------------
|
|
55
28
|
const candidateLocales = [locale, ...(fallbackLocales || [])];
|
|
@@ -93,18 +66,6 @@ const loadRemoteMessages = async ({ id, locale, fallbackLocales, namespaces, roo
|
|
|
93
66
|
});
|
|
94
67
|
}
|
|
95
68
|
}
|
|
96
|
-
// ---------------------------------------------------------------------------
|
|
97
|
-
// Cache write (explicitly permitted)
|
|
98
|
-
// ---------------------------------------------------------------------------
|
|
99
|
-
if (cacheOptions.enabled && allowCacheWrite) {
|
|
100
|
-
if (signal?.aborted) {
|
|
101
|
-
logger.debug("Remote message loading aborted before cache write.");
|
|
102
|
-
return;
|
|
103
|
-
}
|
|
104
|
-
if (cacheKey && messages) {
|
|
105
|
-
await pool?.set(cacheKey, messages, cacheOptions.ttl);
|
|
106
|
-
}
|
|
107
|
-
}
|
|
108
69
|
// Final success log with resolved locale and timing
|
|
109
70
|
if (messages) {
|
|
110
71
|
logger.trace("Finished loading remote messages.", {
|
|
@@ -3,15 +3,10 @@ function isPlainObject(value) {
|
|
|
3
3
|
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
4
4
|
}
|
|
5
5
|
/**
|
|
6
|
-
* Check if a value is a valid
|
|
6
|
+
* Check if a value is a valid MessageObject.
|
|
7
7
|
*
|
|
8
|
-
* -
|
|
9
|
-
*
|
|
10
|
-
* @example
|
|
11
|
-
* ```ts
|
|
12
|
-
* isValidMessages({ en: { hello: "Hello" } }) // true
|
|
13
|
-
* isValidMessages({ en: { count: 5 } }) // false
|
|
14
|
-
* ```
|
|
8
|
+
* - Supports all MessageValue variants (primitive, array, object).
|
|
9
|
+
* - Uses an iterative approach to avoid stack overflow.
|
|
15
10
|
*/
|
|
16
11
|
function isValidMessages(value) {
|
|
17
12
|
if (!isPlainObject(value))
|
|
@@ -19,16 +14,29 @@ function isValidMessages(value) {
|
|
|
19
14
|
const stack = [value];
|
|
20
15
|
while (stack.length > 0) {
|
|
21
16
|
const current = stack.pop();
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
17
|
+
// primitives are always valid
|
|
18
|
+
if (current === null ||
|
|
19
|
+
typeof current === "string" ||
|
|
20
|
+
typeof current === "number" ||
|
|
21
|
+
typeof current === "boolean") {
|
|
22
|
+
continue;
|
|
23
|
+
}
|
|
24
|
+
// array → validate each item
|
|
25
|
+
if (Array.isArray(current)) {
|
|
26
|
+
for (const item of current) {
|
|
27
|
+
stack.push(item);
|
|
27
28
|
}
|
|
28
|
-
|
|
29
|
-
|
|
29
|
+
continue;
|
|
30
|
+
}
|
|
31
|
+
// object → validate each value
|
|
32
|
+
if (isPlainObject(current)) {
|
|
33
|
+
for (const v of Object.values(current)) {
|
|
34
|
+
stack.push(v);
|
|
30
35
|
}
|
|
36
|
+
continue;
|
|
31
37
|
}
|
|
38
|
+
// everything else is invalid
|
|
39
|
+
return false;
|
|
32
40
|
}
|
|
33
41
|
return true;
|
|
34
42
|
}
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
import '../../core/error/intor-error.js';
|
|
2
|
-
import 'logry';
|
|
3
|
-
import 'keyv';
|
|
4
1
|
import { getLocaleFromPathname } from '../locale/get-locale-from-pathname.js';
|
|
5
2
|
import { getLocaleFromHost } from '../locale/get-locale-from-host.js';
|
|
6
3
|
import { getLocaleFromQuery } from '../locale/get-locale-from-query.js';
|
|
@@ -21,11 +18,13 @@ async function resolveInbound(config, rawPathname, hasRedirected, localeInputs)
|
|
|
21
18
|
// ------------------------------------------------------
|
|
22
19
|
// Resolve locale from inbound inputs
|
|
23
20
|
// ------------------------------------------------------
|
|
24
|
-
const pathLocale = getLocaleFromPathname(
|
|
21
|
+
const pathLocale = getLocaleFromPathname(rawPathname, config);
|
|
25
22
|
const { locale, localeSource } = resolveLocale(config, {
|
|
26
23
|
path: { locale: pathLocale },
|
|
27
|
-
host: { locale: getLocaleFromHost(
|
|
28
|
-
query: {
|
|
24
|
+
host: { locale: getLocaleFromHost(host) },
|
|
25
|
+
query: {
|
|
26
|
+
locale: getLocaleFromQuery(query, config.routing.inbound.queryKey),
|
|
27
|
+
},
|
|
29
28
|
cookie: { locale: cookie },
|
|
30
29
|
detected: { locale: detected },
|
|
31
30
|
});
|
|
@@ -1,23 +1,30 @@
|
|
|
1
|
+
import '../../../core/error/intor-error.js';
|
|
2
|
+
import { normalizeLocale } from '../../../core/utils/normalizers/normalize-locale.js';
|
|
3
|
+
import 'logry';
|
|
4
|
+
|
|
1
5
|
/**
|
|
2
|
-
*
|
|
6
|
+
* Resolve the active locale from inbound routing configuration.
|
|
3
7
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
8
|
+
* Iterates through configured locale sources and returns the first
|
|
9
|
+
* normalized, supported locale. Falls back to the detected locale
|
|
10
|
+
* or the default locale if none match.
|
|
6
11
|
*/
|
|
7
12
|
function resolveLocale(config, context) {
|
|
8
13
|
const { localeSources } = config.routing.inbound;
|
|
9
14
|
for (const source of localeSources) {
|
|
10
15
|
const locale = context[source]?.locale;
|
|
11
|
-
|
|
16
|
+
const normalized = normalizeLocale(locale, config.supportedLocales);
|
|
17
|
+
if (!normalized)
|
|
12
18
|
continue;
|
|
13
19
|
return {
|
|
14
|
-
locale,
|
|
20
|
+
locale: normalized,
|
|
15
21
|
localeSource: source,
|
|
16
22
|
};
|
|
17
23
|
}
|
|
18
24
|
// Fallback: detected is always available
|
|
19
25
|
return {
|
|
20
|
-
locale: context.detected.locale,
|
|
26
|
+
locale: normalizeLocale(context.detected.locale, config.supportedLocales) ||
|
|
27
|
+
config.defaultLocale,
|
|
21
28
|
localeSource: "detected",
|
|
22
29
|
};
|
|
23
30
|
}
|
|
@@ -1,30 +1,20 @@
|
|
|
1
|
-
import '../../core/error/intor-error.js';
|
|
2
|
-
import { normalizeLocale } from '../../core/utils/normalizers/normalize-locale.js';
|
|
3
|
-
import 'logry';
|
|
4
|
-
import 'keyv';
|
|
5
|
-
|
|
6
1
|
/**
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
* - Parses language priorities (`q` values) from the header.
|
|
10
|
-
* - Selects the highest-priority language supported by the application.
|
|
11
|
-
* - Normalizes the matched locale against `supportedLocales`.
|
|
2
|
+
* Get locale candidate from the `Accept-Language` header.
|
|
12
3
|
*
|
|
13
|
-
*
|
|
4
|
+
* Parses language priorities and returns the highest-priority
|
|
5
|
+
* language present in `supportedLocales`, without normalization.
|
|
14
6
|
*
|
|
15
7
|
* @example
|
|
16
8
|
* ```ts
|
|
17
9
|
* getLocaleFromAcceptLanguage("en-US,en;q=0.8,zh-TW;q=0.9", ["en-US", "zh-TW"])
|
|
18
10
|
* // => "en-US"
|
|
11
|
+
*
|
|
19
12
|
* getLocaleFromAcceptLanguage("fr,ja;q=0.9", ["en", "zh-TW"])
|
|
20
13
|
* // => undefined
|
|
21
14
|
* ```
|
|
22
15
|
*/
|
|
23
|
-
const getLocaleFromAcceptLanguage = (
|
|
24
|
-
|
|
25
|
-
if (!acceptLanguageHeader ||
|
|
26
|
-
!supportedLocales ||
|
|
27
|
-
supportedLocales.length === 0) {
|
|
16
|
+
const getLocaleFromAcceptLanguage = (acceptLanguageHeader, supportedLocales) => {
|
|
17
|
+
if (!acceptLanguageHeader || supportedLocales.length === 0) {
|
|
28
18
|
return;
|
|
29
19
|
}
|
|
30
20
|
const supportedLocalesSet = new Set(supportedLocales);
|
|
@@ -42,7 +32,7 @@ const getLocaleFromAcceptLanguage = (config, acceptLanguageHeader) => {
|
|
|
42
32
|
const sortedByPriority = parsedLanguages.toSorted((a, b) => b.q - a.q);
|
|
43
33
|
// 3. Pick the first language explicitly supported
|
|
44
34
|
const preferred = sortedByPriority.find(({ lang }) => supportedLocalesSet.has(lang))?.lang;
|
|
45
|
-
return
|
|
35
|
+
return preferred;
|
|
46
36
|
};
|
|
47
37
|
|
|
48
38
|
export { getLocaleFromAcceptLanguage };
|
|
@@ -1,34 +1,32 @@
|
|
|
1
|
-
import '../../core/error/intor-error.js';
|
|
2
|
-
import { normalizeLocale } from '../../core/utils/normalizers/normalize-locale.js';
|
|
3
|
-
import 'logry';
|
|
4
|
-
import 'keyv';
|
|
5
|
-
|
|
6
1
|
/**
|
|
7
|
-
*
|
|
2
|
+
* Get locale candidate from hostname.
|
|
8
3
|
*
|
|
9
|
-
*
|
|
4
|
+
* Returns the left-most hostname label, without validation or normalization.
|
|
10
5
|
*
|
|
11
6
|
* @example
|
|
12
7
|
* ```ts
|
|
13
|
-
* getLocaleFromHost(
|
|
8
|
+
* getLocaleFromHost("en.example.com")
|
|
14
9
|
* // => "en"
|
|
15
|
-
*
|
|
16
|
-
*
|
|
17
|
-
*
|
|
10
|
+
*
|
|
11
|
+
* getLocaleFromHost("example.com")
|
|
12
|
+
* // => "example"
|
|
13
|
+
*
|
|
14
|
+
* getLocaleFromHost("api.jp.example.com")
|
|
15
|
+
* // => "api"
|
|
16
|
+
*
|
|
17
|
+
* getLocaleFromHost("localhost")
|
|
18
18
|
* // => undefined
|
|
19
19
|
* ```
|
|
20
20
|
*/
|
|
21
|
-
function getLocaleFromHost(
|
|
21
|
+
function getLocaleFromHost(host) {
|
|
22
22
|
if (!host)
|
|
23
23
|
return;
|
|
24
|
-
const { supportedLocales } = config;
|
|
25
24
|
// Remove port (e.g. localhost:3000)
|
|
26
25
|
const hostname = host.split(":")[0];
|
|
27
26
|
const parts = hostname.split(".");
|
|
28
27
|
if (parts.length < 2)
|
|
29
28
|
return;
|
|
30
|
-
|
|
31
|
-
return normalizeLocale(candidate, supportedLocales);
|
|
29
|
+
return parts[0];
|
|
32
30
|
}
|
|
33
31
|
|
|
34
32
|
export { getLocaleFromHost };
|
|
@@ -1,22 +1,12 @@
|
|
|
1
1
|
import '../../core/error/intor-error.js';
|
|
2
2
|
import { normalizePathname } from '../../core/utils/normalizers/normalize-pathname.js';
|
|
3
3
|
import 'logry';
|
|
4
|
-
import 'keyv';
|
|
5
4
|
|
|
6
5
|
/**
|
|
7
|
-
*
|
|
6
|
+
* Get locale from pathname.
|
|
8
7
|
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
* - Inspects the first path segment to determine whether
|
|
12
|
-
* it matches a supported locale.
|
|
13
|
-
*
|
|
14
|
-
* If no locale segment is found, `undefined` is returned.
|
|
15
|
-
*
|
|
16
|
-
* Note:
|
|
17
|
-
* - The pathname is treated as a canonical source.
|
|
18
|
-
* - Only exact matches against `supportedLocales` are accepted.
|
|
19
|
-
* - ___Locale normalization is intentionally not applied here.___
|
|
8
|
+
* Extracts the first pathname segment (after basePath) as a locale
|
|
9
|
+
* if it exactly matches one of the supported locales.
|
|
20
10
|
*
|
|
21
11
|
* @example
|
|
22
12
|
* ```ts
|
|
@@ -32,7 +22,7 @@ import 'keyv';
|
|
|
32
22
|
* // => "en"
|
|
33
23
|
* ```
|
|
34
24
|
*/
|
|
35
|
-
function getLocaleFromPathname(
|
|
25
|
+
function getLocaleFromPathname(pathname, config) {
|
|
36
26
|
const { routing, supportedLocales } = config;
|
|
37
27
|
const { basePath } = routing;
|
|
38
28
|
// 1. Normalize pathname
|
|
@@ -1,36 +1,29 @@
|
|
|
1
|
-
import '../../core/error/intor-error.js';
|
|
2
|
-
import { normalizeLocale } from '../../core/utils/normalizers/normalize-locale.js';
|
|
3
|
-
import 'logry';
|
|
4
|
-
import 'keyv';
|
|
5
|
-
|
|
6
1
|
/**
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
* - Reads the configured locale query key.
|
|
10
|
-
* - Normalizes the value against supported locales.
|
|
2
|
+
* Get locale candidate from URL query parameters.
|
|
11
3
|
*
|
|
12
|
-
*
|
|
4
|
+
* Extracts the value of the configured query key, without
|
|
5
|
+
* validation or normalization.
|
|
13
6
|
*
|
|
14
7
|
* @example
|
|
15
8
|
* ```ts
|
|
16
|
-
* getLocaleFromQuery(
|
|
9
|
+
* getLocaleFromQuery({ locale: "en" }, "locale")
|
|
17
10
|
* // => "en"
|
|
18
|
-
*
|
|
11
|
+
*
|
|
12
|
+
* getLocaleFromQuery({}, "locale")
|
|
19
13
|
* // => undefined
|
|
20
|
-
*
|
|
14
|
+
*
|
|
15
|
+
* getLocaleFromQuery({ locale: ["zh-TW"] }, "locale")
|
|
21
16
|
* // => "zh-TW"
|
|
22
17
|
* ```
|
|
23
18
|
*/
|
|
24
|
-
function getLocaleFromQuery(
|
|
19
|
+
function getLocaleFromQuery(query, queryKey) {
|
|
25
20
|
if (!query)
|
|
26
21
|
return;
|
|
27
|
-
const { supportedLocales, routing } = config;
|
|
28
|
-
const { queryKey } = routing.inbound;
|
|
29
22
|
const raw = query[queryKey];
|
|
30
23
|
if (!raw)
|
|
31
24
|
return;
|
|
32
25
|
const value = Array.isArray(raw) ? raw[0] : raw;
|
|
33
|
-
return
|
|
26
|
+
return value;
|
|
34
27
|
}
|
|
35
28
|
|
|
36
29
|
export { getLocaleFromQuery };
|
|
@@ -2,7 +2,6 @@ import { PREFIX_PLACEHOLDER } from '../../core/constants/prefix-placeholder.js';
|
|
|
2
2
|
import '../../core/error/intor-error.js';
|
|
3
3
|
import { normalizePathname } from '../../core/utils/normalizers/normalize-pathname.js';
|
|
4
4
|
import 'logry';
|
|
5
|
-
import 'keyv';
|
|
6
5
|
|
|
7
6
|
/**
|
|
8
7
|
* Applies the configured locale prefix behavior to a standardized pathname.
|
|
@@ -2,7 +2,6 @@ import { PREFIX_PLACEHOLDER } from '../../core/constants/prefix-placeholder.js';
|
|
|
2
2
|
import '../../core/error/intor-error.js';
|
|
3
3
|
import { normalizePathname } from '../../core/utils/normalizers/normalize-pathname.js';
|
|
4
4
|
import 'logry';
|
|
5
|
-
import 'keyv';
|
|
6
5
|
|
|
7
6
|
/**
|
|
8
7
|
* Standardizes a canonical pathname by applying the base path
|
|
@@ -2,11 +2,11 @@ import { createIntorRuntime } from '../runtime/create-intor-runtime.js';
|
|
|
2
2
|
|
|
3
3
|
// Implementation
|
|
4
4
|
async function getTranslator(config, params) {
|
|
5
|
-
const {
|
|
5
|
+
const { readers, allowCacheWrite, preKey, handlers, plugins } = params;
|
|
6
6
|
const locale = params.locale;
|
|
7
7
|
// Create runtime (request-scoped, no cache write)
|
|
8
8
|
const runtime = createIntorRuntime(config, {
|
|
9
|
-
|
|
9
|
+
readers,
|
|
10
10
|
allowCacheWrite,
|
|
11
11
|
});
|
|
12
12
|
// Ensure messages & create translator snapshot
|
|
@@ -21,6 +21,7 @@ async function getTranslator(config, params) {
|
|
|
21
21
|
locale,
|
|
22
22
|
hasKey: translator.hasKey,
|
|
23
23
|
t: translator.t,
|
|
24
|
+
tRaw: translator.tRaw,
|
|
24
25
|
};
|
|
25
26
|
}
|
|
26
27
|
|
|
@@ -13,16 +13,15 @@ import { readLocaleMessages } from './read-locale-messages/read-locale-messages.
|
|
|
13
13
|
* It coordinates:
|
|
14
14
|
*
|
|
15
15
|
* - Locale resolution with fallbacks
|
|
16
|
-
* - Process-level memoization (read by default, write by ownership)
|
|
17
16
|
* - Concurrency control for file system access
|
|
17
|
+
* - Process-level memoization (read by default, write by ownership)
|
|
18
18
|
*
|
|
19
19
|
* Local messages are cached for the lifetime of the process.
|
|
20
20
|
* Cache writes are restricted to the primary initialization flow.
|
|
21
21
|
*
|
|
22
22
|
* File traversal, parsing, and validation are delegated to lower-level utilities.
|
|
23
23
|
*/
|
|
24
|
-
const loadLocalMessages = async ({ id, locale, fallbackLocales, namespaces, rootDir = "messages", concurrency = 10,
|
|
25
|
-
const isProd = process.env.NODE_ENV === "production";
|
|
24
|
+
const loadLocalMessages = async ({ id, locale, fallbackLocales, namespaces, rootDir = "messages", concurrency = 10, readers, pool = getGlobalMessagesPool(), allowCacheWrite = false, loggerOptions, }) => {
|
|
26
25
|
const baseLogger = getLogger(loggerOptions);
|
|
27
26
|
const logger = baseLogger.child({ scope: "load-local-messages" });
|
|
28
27
|
const start = performance.now();
|
|
@@ -38,14 +37,14 @@ const loadLocalMessages = async ({ id, locale, fallbackLocales, namespaces, root
|
|
|
38
37
|
"loaderType:local",
|
|
39
38
|
rootDir,
|
|
40
39
|
locale,
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
]);
|
|
40
|
+
fallbackLocales?.toSorted().join(","),
|
|
41
|
+
namespaces?.toSorted().join(","),
|
|
42
|
+
].filter(Boolean));
|
|
44
43
|
// ---------------------------------------------------------------------------
|
|
45
44
|
// Cache read
|
|
46
45
|
// ---------------------------------------------------------------------------
|
|
47
46
|
if (cacheKey) {
|
|
48
|
-
const cached =
|
|
47
|
+
const cached = pool.get(cacheKey);
|
|
49
48
|
if (cached) {
|
|
50
49
|
logger.debug("Messages cache hit.", { key: cacheKey });
|
|
51
50
|
return cached;
|
|
@@ -66,7 +65,7 @@ const loadLocalMessages = async ({ id, locale, fallbackLocales, namespaces, root
|
|
|
66
65
|
namespaces,
|
|
67
66
|
rootDir,
|
|
68
67
|
limit,
|
|
69
|
-
|
|
68
|
+
readers,
|
|
70
69
|
loggerOptions,
|
|
71
70
|
});
|
|
72
71
|
// Stop at the first locale that yields non-empty messages
|
|
@@ -90,10 +89,10 @@ const loadLocalMessages = async ({ id, locale, fallbackLocales, namespaces, root
|
|
|
90
89
|
// ---------------------------------------------------------------------------
|
|
91
90
|
// Cache write (explicitly permitted)
|
|
92
91
|
// ---------------------------------------------------------------------------
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
92
|
+
const isProd = process.env.NODE_ENV === "production";
|
|
93
|
+
const canWriteCache = isProd && allowCacheWrite;
|
|
94
|
+
if (canWriteCache && cacheKey && messages) {
|
|
95
|
+
pool.set(cacheKey, messages);
|
|
97
96
|
}
|
|
98
97
|
// Final success log with resolved locale and timing
|
|
99
98
|
if (messages) {
|
|
@@ -2,7 +2,6 @@ import fs from 'node:fs/promises';
|
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import '../../../../../core/error/intor-error.js';
|
|
4
4
|
import { getLogger } from '../../../../../core/logger/get-logger.js';
|
|
5
|
-
import 'keyv';
|
|
6
5
|
|
|
7
6
|
/**
|
|
8
7
|
* Recursively collects message file metadata under a given locale root.
|
|
@@ -21,9 +20,10 @@ import 'keyv';
|
|
|
21
20
|
* }, ... ];
|
|
22
21
|
* ```
|
|
23
22
|
*/
|
|
24
|
-
async function collectFileEntries({ readdir = fs.readdir, namespaces, rootDir, limit, exts = ["
|
|
23
|
+
async function collectFileEntries({ readdir = fs.readdir, namespaces, rootDir, limit, exts = ["json"], loggerOptions, }) {
|
|
25
24
|
const baseLogger = getLogger(loggerOptions);
|
|
26
25
|
const logger = baseLogger.child({ scope: "collect-file-entries" });
|
|
26
|
+
const supportedExts = new Set(["json", ...exts]);
|
|
27
27
|
const fileEntries = [];
|
|
28
28
|
// Recursive directory walk
|
|
29
29
|
const walk = async (currentDir) => {
|
|
@@ -51,14 +51,14 @@ async function collectFileEntries({ readdir = fs.readdir, namespaces, rootDir, l
|
|
|
51
51
|
return;
|
|
52
52
|
}
|
|
53
53
|
// Skip unsupported file extensions
|
|
54
|
-
|
|
54
|
+
const ext = path.extname(entry.name).slice(1); // "json", "yaml"
|
|
55
|
+
if (!ext || !supportedExts.has(ext))
|
|
55
56
|
return;
|
|
56
57
|
// ---------------------------------------------------------------------
|
|
57
58
|
// Resolve file entry
|
|
58
59
|
// ---------------------------------------------------------------------
|
|
59
60
|
const relativePath = path.relative(rootDir, fullPath);
|
|
60
|
-
const
|
|
61
|
-
const withoutExt = relativePath.slice(0, -ext.length);
|
|
61
|
+
const withoutExt = relativePath.slice(0, relativePath.length - (ext.length + 1));
|
|
62
62
|
const segments = withoutExt.split(path.sep).filter(Boolean);
|
|
63
63
|
const namespace = segments.at(0);
|
|
64
64
|
if (!namespace)
|
|
@@ -73,7 +73,7 @@ async function collectFileEntries({ readdir = fs.readdir, namespaces, rootDir, l
|
|
|
73
73
|
fullPath,
|
|
74
74
|
relativePath,
|
|
75
75
|
segments,
|
|
76
|
-
basename: path.basename(entry.name, ext),
|
|
76
|
+
basename: path.basename(entry.name, `.${ext}`),
|
|
77
77
|
});
|
|
78
78
|
}));
|
|
79
79
|
await Promise.all(tasks);
|
|
@@ -3,7 +3,6 @@ import '../../../../../core/error/intor-error.js';
|
|
|
3
3
|
import { deepMerge } from '../../../../../core/utils/deep-merge.js';
|
|
4
4
|
import { getLogger } from '../../../../../core/logger/get-logger.js';
|
|
5
5
|
import { isValidMessages } from '../../../../../core/messages/utils/is-valid-messages.js';
|
|
6
|
-
import 'keyv';
|
|
7
6
|
import { jsonReader } from './utils/json-reader.js';
|
|
8
7
|
import { nestObjectFromPath } from './utils/nest-object-from-path.js';
|
|
9
8
|
|
|
@@ -36,7 +35,7 @@ import { nestObjectFromPath } from './utils/nest-object-from-path.js';
|
|
|
36
35
|
* }
|
|
37
36
|
* ```
|
|
38
37
|
*/
|
|
39
|
-
async function parseFileEntries({ fileEntries, limit,
|
|
38
|
+
async function parseFileEntries({ fileEntries, limit, readers, loggerOptions, }) {
|
|
40
39
|
const baseLogger = getLogger(loggerOptions);
|
|
41
40
|
const logger = baseLogger.child({ scope: "parse-file-entries" });
|
|
42
41
|
// Read and parse all file entries
|
|
@@ -46,10 +45,19 @@ async function parseFileEntries({ fileEntries, limit, messagesReader, loggerOpti
|
|
|
46
45
|
// -------------------------------------------------------------------
|
|
47
46
|
// Read and validate file content
|
|
48
47
|
// -------------------------------------------------------------------
|
|
49
|
-
const ext = path.extname(fullPath);
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
48
|
+
const ext = path.extname(fullPath).slice(1); // remove dot
|
|
49
|
+
let raw;
|
|
50
|
+
if (ext === "json") {
|
|
51
|
+
raw = await jsonReader(fullPath);
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
const reader = readers?.[ext];
|
|
55
|
+
if (!reader) {
|
|
56
|
+
throw new Error(`No message reader registered for .${ext} files. ` +
|
|
57
|
+
`Please register a reader for the "${ext}" extension.`);
|
|
58
|
+
}
|
|
59
|
+
raw = await reader(fullPath);
|
|
60
|
+
}
|
|
53
61
|
// Validate messages structure
|
|
54
62
|
if (!isValidMessages(raw)) {
|
|
55
63
|
throw new Error("Parsed content does not match expected Messages structure");
|
|
@@ -12,7 +12,7 @@ import { parseFileEntries } from './parse-file-entries/parse-file-entries.js';
|
|
|
12
12
|
*
|
|
13
13
|
* It does not perform validation or transformation itself.
|
|
14
14
|
*/
|
|
15
|
-
const readLocaleMessages = async ({ locale, namespaces, rootDir = "messages", limit,
|
|
15
|
+
const readLocaleMessages = async ({ locale, namespaces, rootDir = "messages", limit, readers, loggerOptions, }) => {
|
|
16
16
|
// ---------------------------------------------------------------------------
|
|
17
17
|
// Collect message file entries for the locale
|
|
18
18
|
// ---------------------------------------------------------------------------
|
|
@@ -20,7 +20,7 @@ const readLocaleMessages = async ({ locale, namespaces, rootDir = "messages", li
|
|
|
20
20
|
namespaces,
|
|
21
21
|
rootDir: path.resolve(rootDir, locale),
|
|
22
22
|
limit,
|
|
23
|
-
exts,
|
|
23
|
+
exts: Object.keys(readers || {}),
|
|
24
24
|
loggerOptions,
|
|
25
25
|
});
|
|
26
26
|
// ---------------------------------------------------------------------------
|
|
@@ -29,7 +29,7 @@ const readLocaleMessages = async ({ locale, namespaces, rootDir = "messages", li
|
|
|
29
29
|
const messages = await parseFileEntries({
|
|
30
30
|
fileEntries,
|
|
31
31
|
limit,
|
|
32
|
-
|
|
32
|
+
readers,
|
|
33
33
|
loggerOptions,
|
|
34
34
|
});
|
|
35
35
|
// ---------------------------------------------------------------------------
|