intor 2.4.14 → 2.4.16

package/dist/vue/src/core/locale/canonicalize-locale.js

@@ -0,0 +1,23 @@
+/**
+ * Canonicalizes a BCP 47 locale string.
+ *
+ * - Uses `Intl.getCanonicalLocales` when available.
+ * - Returns the original input if `Intl` is unavailable.
+ * - Returns `undefined` for invalid locale input.
+ *
+ * This function performs normalization only.
+ * It does not perform matching or fallback.
+ */
+function canonicalizeLocale(input) {
+    try {
+        if (typeof Intl === "undefined" || !Intl.getCanonicalLocales) {
+            return input;
+        }
+        return Intl.getCanonicalLocales(input)[0];
+    }
+    catch {
+        return;
+    }
+}
+
+export { canonicalizeLocale };

package/dist/vue/src/core/locale/match-locale.js

@@ -0,0 +1,57 @@
+import { canonicalizeLocale } from './canonicalize-locale.js';
+import { parseLocale } from './parse-locale.js';
+
+/**
+ * Matches a locale candidate against a list of supported locales.
+ *
+ * Resolution order:
+ * 1. Exact canonical match
+ * 2. Same language + same script
+ * 3. Same language only (only if candidate has no script)
+ *
+ * Returns `undefined` if no match is found.
+ *
+ * Notes:
+ * - Matching is deterministic and order-sensitive.
+ * - Does not perform automatic fallback to default locale.
+ * - Does not cross script boundaries.
+ */
+function matchLocale(locale, supportedLocales = []) {
+    if (!locale || supportedLocales.length === 0)
+        return;
+    const canonicalCandidate = canonicalizeLocale(locale);
+    if (!canonicalCandidate)
+        return;
+    const candidateParts = parseLocale(canonicalCandidate);
+    const supportedCanonical = supportedLocales.flatMap((original) => {
+        const canonical = canonicalizeLocale(original);
+        if (!canonical)
+            return [];
+        return [{ original, canonical, parts: parseLocale(canonical) }];
+    });
+    // 1. Exact match
+    for (const s of supportedCanonical) {
+        if (s.canonical === canonicalCandidate) {
+            return s.original;
+        }
+    }
+    // 2. Same language + same script
+    if (candidateParts.script) {
+        for (const s of supportedCanonical) {
+            if (s.parts.language === candidateParts.language &&
+                s.parts.script === candidateParts.script) {
+                return s.original;
+            }
+        }
+        return;
+    }
+    // 3. Same language only
+    for (const s of supportedCanonical) {
+        if (s.parts.language === candidateParts.language) {
+            return s.original;
+        }
+    }
+    return;
+}
+
+export { matchLocale };

package/dist/vue/src/core/locale/parse-locale.js

@@ -0,0 +1,27 @@
+/**
+ * Parses a canonical locale tag into structural components.
+ *
+ * - Uses `Intl.Locale` when available.
+ * - Falls back to minimal parsing (language only) if unavailable.
+ *
+ * This function does not validate or match locales.
+ */
+function parseLocale(tag) {
+    try {
+        if (typeof Intl !== "undefined" && typeof Intl.Locale === "function") {
+            const locale = new Intl.Locale(tag);
+            return {
+                language: locale.language,
+                script: locale.script,
+                region: locale.region,
+            };
+        }
+    }
+    catch {
+        // fallback below
+    }
+    const parts = tag.split("-");
+    return { language: parts[0].toLowerCase() };
+}
+
+export { parseLocale };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intor",
-  "version": "2.4.14",
+  "version": "2.4.16",
   "description": "The i18n library for modern JavaScript",
   "author": "Yiming Liao",
   "homepage": "https://intor.dev",
@@ -31,57 +31,57 @@
   "type": "module",
   "exports": {
     ".": {
+      "types": "./dist/types/export/index.d.ts",
       "import": "./dist/core/export/index.js",
-      "require": "./dist/core/export/index.js",
-      "types": "./dist/types/export/index.d.ts"
+      "require": "./dist/core/export/index.js"
     },
     "./internal": {
-      "import": "./dist/core/export/internal/index.js",
-      "types": "./dist/types/export/internal/index.d.ts"
+      "types": "./dist/types/export/internal/index.d.ts",
+      "import": "./dist/core/export/internal/index.js"
     },
     "./server": {
-      "import": "./dist/core/export/server/index.js",
-      "types": "./dist/types/export/server/index.d.ts"
+      "types": "./dist/types/export/server/index.d.ts",
+      "import": "./dist/core/export/server/index.js"
     },
     "./edge": {
-      "import": "./dist/core/export/edge/index.js",
-      "types": "./dist/types/export/edge/index.d.ts"
+      "types": "./dist/types/export/edge/index.d.ts",
+      "import": "./dist/core/export/edge/index.js"
     },
     "./react": {
-      "import": "./dist/react/export/react/index.js",
-      "types": "./dist/types/export/react/index.d.ts"
+      "types": "./dist/types/export/react/index.d.ts",
+      "import": "./dist/react/export/react/index.js"
     },
     "./vue": {
-      "import": "./dist/vue/export/vue/index.js",
-      "types": "./dist/types/export/vue/index.d.ts"
+      "types": "./dist/types/export/vue/index.d.ts",
+      "import": "./dist/vue/export/vue/index.js"
     },
     "./svelte": {
-      "import": "./dist/svelte/export/svelte/index.js",
-      "types": "./dist/types/export/svelte/index.d.ts"
+      "types": "./dist/types/export/svelte/index.d.ts",
+      "import": "./dist/svelte/export/svelte/index.js"
     },
     "./next": {
-      "import": "./dist/next/export/next/index.js",
-      "types": "./dist/types/export/next/index.d.ts"
+      "types": "./dist/types/export/next/index.d.ts",
+      "import": "./dist/next/export/next/index.js"
     },
     "./next/server": {
-      "import": "./dist/next/export/next/server/index.js",
-      "types": "./dist/types/export/next/server/index.d.ts"
+      "types": "./dist/types/export/next/server/index.d.ts",
+      "import": "./dist/next/export/next/server/index.js"
     },
     "./svelte-kit": {
-      "import": "./dist/svelte-kit/export/svelte-kit/index.js",
-      "types": "./dist/types/export/svelte-kit/index.d.ts"
+      "types": "./dist/types/export/svelte-kit/index.d.ts",
+      "import": "./dist/svelte-kit/export/svelte-kit/index.js"
     },
     "./express": {
-      "import": "./dist/express/export/express/index.js",
-      "types": "./dist/types/export/express/index.d.ts"
+      "types": "./dist/types/export/express/index.d.ts",
+      "import": "./dist/express/export/express/index.js"
     },
     "./fastify": {
-      "import": "./dist/fastify/export/fastify/index.js",
-      "types": "./dist/types/export/fastify/index.d.ts"
+      "types": "./dist/types/export/fastify/index.d.ts",
+      "import": "./dist/fastify/export/fastify/index.js"
     },
     "./hono": {
-      "import": "./dist/hono/export/hono/index.js",
-      "types": "./dist/types/export/hono/index.d.ts"
+      "types": "./dist/types/export/hono/index.d.ts",
+      "import": "./dist/hono/export/hono/index.js"
     }
   },
   "main": "./dist/core/export/index.js",

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

@@ -1,59 +0,0 @@
-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/express/src/core/utils/normalizers/normalize-locale.js

@@ -1,59 +0,0 @@
-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/fastify/src/core/utils/normalizers/normalize-locale.js

@@ -1,59 +0,0 @@
-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/hono/src/core/utils/normalizers/normalize-locale.js

@@ -1,59 +0,0 @@
-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/next/src/core/utils/normalizers/normalize-locale.js

@@ -1,59 +0,0 @@
-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/react/src/core/utils/normalizers/normalize-locale.js

@@ -1,59 +0,0 @@
-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/svelte/src/core/utils/normalizers/normalize-locale.js

@@ -1,59 +0,0 @@
-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/svelte-kit/src/core/utils/normalizers/normalize-locale.js

@@ -1,59 +0,0 @@
-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 };