@koine/i18n 2.0.0-beta.92 → 2.0.0-beta.93

package/api.cjs.js

@@ -180,7 +180,7 @@ export function createT<TNamespace extends I18n.TranslateNamespace>(
     const k = Array.isArray(key) ? key[0] : key;
     const [namespace, i18nKey] = k.split("${n.translations.tokens.namespaceDelimiter}");
     const dic = (namespace && dictionaries[namespace]) || {};
-    const pluralisedKey = plural(pluralRules, dic, i18nKey, query, options);
+    const pluralisedKey = getPluralisedKey(pluralRules, dic, i18nKey, query, options);
     const dicValue = getDicValue(dic, pluralisedKey, query, options);
     const value =
       typeof dicValue === "object"
@@ -251,7 +251,7 @@ function getDicValue(
 /**
  * Control plural keys depending the {{count}} variable
  */
-function plural(
+function getPluralisedKey(
   pluralRules: Intl.PluralRules,
   dic: I18n.TranslationsDictionaryLoose,
   key: string,
@@ -431,6 +431,7 @@ export function getAlternates<TRouteId extends I18n.RouteId>({
   id,
   params,
 }: GetAlternatesOptions<TRouteId>) {
+  // TODO: i18n maybe handle error routes
   // if (id === "404" || id === "500") return {};
 
   const alternates: I18n.Alternates = {
@@ -515,7 +516,7 @@ export async function getI18nDictionaries({
 export default getI18nDictionaries;
 `);
 
-var x$5 = (({})=>`
+var x$4 = (({})=>`
 import { createT } from "./createT";
 import { loadTranslations } from "./loadTranslations";
 import type { I18n } from "./types";
@@ -1045,7 +1046,7 @@ let c$2 = (e, a)=>!utils.isArray(a) && utils.isObject(a) && hasPlurals(a) ? hasO
         s.push(`"${o}": { ${l.join(" ")} }`);
     }
     return s;
-}, x$4 = (e, t)=>{
+}, b = (e, t)=>{
     let a = [];
     for(let n in t.byId){
         let s = t.byId[n];
@@ -1107,7 +1108,7 @@ export namespace I18n {
    * Map every route id to its actual pathanem value for the default locale
    */
   export type RoutePathnames = {
-    ${x$4(e, a).join("\n    ")}
+    ${b(e, a).join("\n    ")}
   }
 
   /**
@@ -1346,6 +1347,7 @@ export namespace I18n {
           : never;
       }
     | {
+        // TODO: i18n maybe handle error routes
         id: TRouteId extends RouteIdStatic/*  | "404" | "500" */
           ? TRouteId/*  | "404" | "500" */
           : never;
@@ -1429,7 +1431,7 @@ var t$1 = createAdapter(adapterJsOptions, ({})=>({
             },
             {
                 name: "getT",
-                fn: x$5,
+                fn: x$4,
                 ext: "ts",
                 index: !0
             },
@@ -1795,9 +1797,11 @@ import type { I18n } from "./types";
  * @internal
  */
 export type I18nAppPropsData = {
-  locale: I18n.Locale;
-  dictionaries: I18n.Dictionaries;
-  alternates: I18n.Alternates;
+  i18n: {
+    locale: I18n.Locale;
+    dictionaries: I18n.Dictionaries;
+    alternates: I18n.Alternates;
+  }
 };
 
 type I18nAppProps =  React.PropsWithChildren<
@@ -1823,8 +1827,8 @@ type I18nAppProps =  React.PropsWithChildren<
  * \`\`\`
  */
 export const I18nApp = (props: I18nAppProps) => {
-  
-  const { locale, dictionaries, alternates, children } = props;
+  const { i18n, children } = props;
+  const { locale, dictionaries, alternates } = i18n;
   
   return (
     <I18nProvider
@@ -2046,15 +2050,17 @@ export async function i18nProps<TRouteId extends I18n.RouteId, TParams, TData>({
   params,
   data,
 }: I18nPropsOptions<TRouteId, TParams, TData>) {
-  const i18n: I18nAppPropsData = {
-    locale: locale,
-    // @ts-expect-error FIXME: route conditional type
-    alternates: getAlternates({ locale, id: routeId, params: routeParams }),
-    dictionaries: await getI18nDictionaries({ locale, namespaces }),
+  const props: I18nAppPropsData = {
+    i18n: {
+      locale: locale,
+      // @ts-expect-error FIXME: route conditional type
+      alternates: getAlternates({ locale, id: routeId, params: routeParams }),
+      dictionaries: await getI18nDictionaries({ locale, namespaces }),
+    }
   }
 
   return {
-    i18n,
+    ...props,
     params: ${a ? `{ ${a}: locale, ...(params || ({} as TParams)) }` : "params || ({} as TParams)"},
     data: data || ({} as TData),
   };

package/api.esm.js

@@ -158,7 +158,7 @@ export function createT<TNamespace extends I18n.TranslateNamespace>(
     const k = Array.isArray(key) ? key[0] : key;
     const [namespace, i18nKey] = k.split("${n.translations.tokens.namespaceDelimiter}");
     const dic = (namespace && dictionaries[namespace]) || {};
-    const pluralisedKey = plural(pluralRules, dic, i18nKey, query, options);
+    const pluralisedKey = getPluralisedKey(pluralRules, dic, i18nKey, query, options);
     const dicValue = getDicValue(dic, pluralisedKey, query, options);
     const value =
       typeof dicValue === "object"
@@ -229,7 +229,7 @@ function getDicValue(
 /**
  * Control plural keys depending the {{count}} variable
  */
-function plural(
+function getPluralisedKey(
   pluralRules: Intl.PluralRules,
   dic: I18n.TranslationsDictionaryLoose,
   key: string,
@@ -409,6 +409,7 @@ export function getAlternates<TRouteId extends I18n.RouteId>({
   id,
   params,
 }: GetAlternatesOptions<TRouteId>) {
+  // TODO: i18n maybe handle error routes
   // if (id === "404" || id === "500") return {};
 
   const alternates: I18n.Alternates = {
@@ -493,7 +494,7 @@ export async function getI18nDictionaries({
 export default getI18nDictionaries;
 `);
 
-var x$5 = (({})=>`
+var x$4 = (({})=>`
 import { createT } from "./createT";
 import { loadTranslations } from "./loadTranslations";
 import type { I18n } from "./types";
@@ -1023,7 +1024,7 @@ let c$2 = (e, a)=>!isArray(a) && isObject(a) && hasPlurals(a) ? hasOnlyPluralKey
         s.push(`"${o}": { ${l.join(" ")} }`);
     }
     return s;
-}, x$4 = (e, t)=>{
+}, b = (e, t)=>{
     let a = [];
     for(let n in t.byId){
         let s = t.byId[n];
@@ -1085,7 +1086,7 @@ export namespace I18n {
    * Map every route id to its actual pathanem value for the default locale
    */
   export type RoutePathnames = {
-    ${x$4(e, a).join("\n    ")}
+    ${b(e, a).join("\n    ")}
   }
 
   /**
@@ -1324,6 +1325,7 @@ export namespace I18n {
           : never;
       }
     | {
+        // TODO: i18n maybe handle error routes
         id: TRouteId extends RouteIdStatic/*  | "404" | "500" */
           ? TRouteId/*  | "404" | "500" */
           : never;
@@ -1407,7 +1409,7 @@ var t$1 = createAdapter(adapterJsOptions, ({})=>({
             },
             {
                 name: "getT",
-                fn: x$5,
+                fn: x$4,
                 ext: "ts",
                 index: !0
             },
@@ -1773,9 +1775,11 @@ import type { I18n } from "./types";
  * @internal
  */
 export type I18nAppPropsData = {
-  locale: I18n.Locale;
-  dictionaries: I18n.Dictionaries;
-  alternates: I18n.Alternates;
+  i18n: {
+    locale: I18n.Locale;
+    dictionaries: I18n.Dictionaries;
+    alternates: I18n.Alternates;
+  }
 };
 
 type I18nAppProps =  React.PropsWithChildren<
@@ -1801,8 +1805,8 @@ type I18nAppProps =  React.PropsWithChildren<
  * \`\`\`
  */
 export const I18nApp = (props: I18nAppProps) => {
-  
-  const { locale, dictionaries, alternates, children } = props;
+  const { i18n, children } = props;
+  const { locale, dictionaries, alternates } = i18n;
   
   return (
     <I18nProvider
@@ -2024,15 +2028,17 @@ export async function i18nProps<TRouteId extends I18n.RouteId, TParams, TData>({
   params,
   data,
 }: I18nPropsOptions<TRouteId, TParams, TData>) {
-  const i18n: I18nAppPropsData = {
-    locale: locale,
-    // @ts-expect-error FIXME: route conditional type
-    alternates: getAlternates({ locale, id: routeId, params: routeParams }),
-    dictionaries: await getI18nDictionaries({ locale, namespaces }),
+  const props: I18nAppPropsData = {
+    i18n: {
+      locale: locale,
+      // @ts-expect-error FIXME: route conditional type
+      alternates: getAlternates({ locale, id: routeId, params: routeParams }),
+      dictionaries: await getI18nDictionaries({ locale, namespaces }),
+    }
   }
 
   return {
-    i18n,
+    ...props,
     params: ${a ? `{ ${a}: locale, ...(params || ({} as TParams)) }` : "params || ({} as TParams)"},
     data: data || ({} as TData),
   };

package/package.json

@@ -2,8 +2,8 @@
   "name": "@koine/i18n",
   "sideEffects": false,
   "dependencies": {
-    "@koine/node": "2.0.0-beta.92",
-    "@koine/utils": "2.0.0-beta.92",
+    "@koine/node": "2.0.0-beta.93",
+    "@koine/utils": "2.0.0-beta.93",
     "glob": "^10.3.10",
     "webpack": "^5.90.1",
     "minimatch": "^9.0.3",
@@ -58,5 +58,5 @@
   },
   "module": "./index.esm.js",
   "main": "./index.cjs.js",
-  "version": "2.0.0-beta.92"
+  "version": "2.0.0-beta.93"
 }