@koine/i18n 2.0.0-beta.115 → 2.0.0-beta.116

package/api.cjs.js

@@ -943,10 +943,10 @@ let c$3 = (e, a)=>!utils.isArray(a) && utils.isObject(a) && hasPlurals(a) ? hasO
             o += "{";
             let t = transformKeysForPlurals(Object.keys(e));
             for(let a = 0; a < t.length; a++){
-                let s = t[a], // fallback to a string otherwise plurals without root definition would
+                let n = t[a], // fallback to a string otherwise plurals without root definition would
                 // not get a type otherwise, e.g. ` pluralNoDefault_...` in __mocks__
-                n = e[s] || "";
-                o += c$3(s, n);
+                s = e[n] || "";
+                o += c$3(n, s);
             }
             o += "};";
         }
@@ -954,10 +954,10 @@ let c$3 = (e, a)=>!utils.isArray(a) && utils.isObject(a) && hasPlurals(a) ? hasO
     return(// adjust syntax
     (o = o.replace(/;\[\];/g, "[];")).replace(/;+/g, ";"));
 }, u$2 = (e, t)=>{
-    let { translationFiles: a } = t, { defaultLocale: s } = e, n = a.filter((e)=>e.locale === s), o = [];
-    for(let e = 0; e < n.length; e++){
-        let { path: t, data: a } = n[e], s = t.replace(".json", "");
-        o.push(`"${s}": ${d$4(a)}`);
+    let { translationFiles: a } = t, { defaultLocale: n } = e, s = a.filter((e)=>e.locale === n), o = [];
+    for(let e = 0; e < s.length; e++){
+        let { path: t, data: a } = s[e], n = t.replace(".json", "");
+        o.push(`"${n}": ${d$4(a)}`);
     }
     return o.sort();
 }, h$2 = (t)=>{
@@ -966,37 +966,37 @@ let c$3 = (e, a)=>!utils.isArray(a) && utils.isObject(a) && hasPlurals(a) ? hasO
         t && a.push(`"${e}": { ${dataParamsToTsInterfaceBody(t)} };`);
     }), a;
 }, y$1 = (e)=>e.sort().map((e)=>`"${e}"`).join(" | "), T$1 = (e, t)=>y$1(Object.keys(e.byId).filter((a)=>t(a, e.byId[a]))), m$5 = (e)=>Object.keys(e.byId).reduce((t, a)=>{
-        if (e.byId[a].inWildcard) for(let s = 0; s < e.wildcardIds.length; s++){
-            let n = e.wildcardIds[s];
-            a.startsWith(n) && (t[n] = t[n] || [], t[n].push(a));
+        if (e.byId[a].inWildcard) for(let n = 0; n < e.wildcardIds.length; n++){
+            let s = e.wildcardIds[n];
+            a.startsWith(s) && (t[s] = t[s] || [], t[s].push(a));
         }
         return t;
     }, {}), f$3 = (e, t, a)=>{
-    let s = m$5(t), n = [];
-    for(let o in s){
-        let r = s[o].map(// remove the root id portion and the first character which is always
+    let n = m$5(t), s = [];
+    for(let o in n){
+        let r = n[o].map(// remove the root id portion and the first character which is always
         // the route `idDelimiter`
         (e)=>e.split(o)[1].slice(1)), i = t.byId[o].pathnames[e.defaultLocale], l = [];
-        for(let s = 0; s < r.length; s++){
-            let n = r[s], p = `${o}${a.routes.tokens.idDelimiter}${n}`, c = t.byId[p].pathnames[e.defaultLocale].split(i)[1];
-            l.push(`"${n}": "${c}";`);
+        for(let n = 0; n < r.length; n++){
+            let s = r[n], p = `${o}${a.routes.tokens.idDelimiter}${s}`, c = t.byId[p].pathnames[e.defaultLocale].split(i)[1];
+            l.push(`"${s}": "${c}";`);
         }
-        n.push(`"${o}": { ${l.join(" ")} }`);
+        s.push(`"${o}": { ${l.join(" ")} }`);
     }
-    return n;
+    return s;
 }, g$2 = (e, t)=>{
     let a = [];
-    for(let s in t.byId){
-        let n = t.byId[s];
-        a.push(`"${n.id}": "${n.pathnames[e.defaultLocale]}";`);
+    for(let n in t.byId){
+        let s = t.byId[n];
+        a.push(`"${s.id}": "${s.pathnames[e.defaultLocale]}";`);
     }
     return a;
 };
 // TODO: maybe move the Translate types into the various adapters unless we
 // will use the same api for all of them
-var h$3 = (({ config: e, input: t, routes: a, options: s })=>{
-    let n = T$1(a, (e, { params: t })=>!t), o = T$1(a, (e, { params: t })=>!!t), // const routeIdSpa = buildRoutesUnion(routes, (_, { inWildcard }) => inWildcard);
-    { idDelimiter: r } = s.routes.tokens;
+var h$3 = (({ config: e, input: t, routes: a, options: n })=>{
+    let s = T$1(a, (e, { params: t })=>!t), o = T$1(a, (e, { params: t })=>!!t), // const routeIdSpa = buildRoutesUnion(routes, (_, { inWildcard }) => inWildcard);
+    { idDelimiter: r } = n.routes.tokens;
     return `
 /* eslint-disable @typescript-eslint/no-namespace */
 /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -1026,7 +1026,7 @@ export namespace I18n {
   /**
    * The static routes available ids
    */
-  export type RouteIdStatic = ${n};
+  export type RouteIdStatic = ${s};
 
   /**
    * The dynamic routes available ids
@@ -1037,7 +1037,7 @@ export namespace I18n {
    * Map every SPA path divided by their roots to their actual pathname value for the default locale
    */
   export type RouteSpa = {
-    ${f$3(e, a, s).join("\n    ")}
+    ${f$3(e, a, n).join("\n    ")}
   }
 
   /**
@@ -1295,14 +1295,14 @@ export namespace I18n {
    * such as \`/[lang]/my-route/page.tsx\`.
    */
   export type Params = {
-    ${s.routes.localeParamName}: Locale;
+    ${n.routes.localeParamName}: Locale;
   };
 
   /**
    * Props available to each page/layout when a root \`localeParam\` is in place (e.g. 
    * in the typical _next.js_ folder structure \`/[lang]/my-route/page.tsx\`).
    */
-  export type Props<TProps = {}> = TProps & {
+  export type Props<P = {}> = P & {
     params: Params;
   };
 
@@ -1514,33 +1514,33 @@ export default I18nProvider;
 var m$4 = (({})=>`
 "use client";
 
-import type { TransProps } from "next-translate";
-import Trans from "next-translate/Trans";
+import type { TransProps as NextTranslateTransProps } from "next-translate";
+import NextTranslateTrans from "next-translate/Trans";
 import type { I18n } from "./types";
 
-export type TProps<
+export type TransProps<
   TNamespace extends I18n.TranslateNamespace | undefined = undefined,
 > =
-  | (Omit<TransProps, "i18nKey" | "ns"> & {
+  | (Omit<NextTranslateTransProps, "i18nKey" | "ns"> & {
       i18nKey: I18n.TranslationsAllPaths;
     })
-  | (Omit<TransProps, "i18nKey" | "ns"> & {
+  | (Omit<NextTranslateTransProps, "i18nKey" | "ns"> & {
       ns: TNamespace;
       i18nKey: I18n.TranslationsPaths<TNamespace>;
     });
 
-const TypedT = <
+const TypedTrans = <
   TNamespace extends I18n.TranslateNamespace | undefined = undefined,
 >(
-  props: TProps<TNamespace>,
+  props: TransProps<TNamespace>,
 ) =>
-  (<Trans {...(props as TransProps)} />) as React.ReactElement<
-    TProps<TNamespace>
+  (<NextTranslateTrans {...(props as NextTranslateTransProps)} />) as React.ReactElement<
+    TransProps<TNamespace>
   >;
 
-export const T = Trans as typeof TypedT;
+export const Trans = NextTranslateTrans as typeof TypedTrans;
 
-export default T;
+export default Trans;
 `);
 
 var o$7 = (({})=>`
@@ -2967,7 +2967,7 @@ export const I18nRouteContext = createContext<I18nRouteContextValue>([
 // export default I18nRouteContext;
 `);
 
-var i$3 = (({})=>`
+var s$3 = (({})=>`
 "use client";
 
 import { useMemo, useState } from "react";
@@ -3001,7 +3001,7 @@ export function I18nRouteProvider(props: I18nRouteProviderProps) {
 // export default I18nRouteProvider;
 `);
 
-var s$3 = (({})=>`
+var i$3 = (({})=>`
 "use client";
 
 import { useContext, useEffect } from "react";
@@ -3109,7 +3109,7 @@ import { formatElements } from "./formatElements";
 import type { I18n } from "./types";
 import { useT } from "./useT";
 
-export type TProps = {
+export type TransProps = {
   i18nKey: I18n.TranslationsAllPaths;
   components?: React.ReactElement[] | Record<string, React.ReactElement>;
   values?: I18n.TranslationQuery;
@@ -3121,12 +3121,12 @@ export type TProps = {
  * <0>This is an <1>example</1><0>
  * to -> <h1>This is an <b>example</b><h1>
  */
-export const T = ({
+export const Trans = ({
   i18nKey,
   values,
   components,
   returnObjects,
-}: TProps) => {
+}: TransProps) => {
   const [namespace, path] = (i18nKey as string).split(":");
   const t = useT(namespace as I18n.TranslateNamespace) as I18n.TranslateLoose;
   const result = useMemo(() => {
@@ -3148,17 +3148,17 @@ export const T = ({
   return result;
 };
 
-export default T;
+export default Trans;
 `);
 
 var T = (({})=>`
 "use client";
 
 import { useMemo } from "react";
-import type { TProps } from "./T";
+import type { TransProps } from "./Trans";
 import { formatElements } from "./formatElements";
 
-export type TransTextProps = Pick<TProps, "components"> & {
+export type TransTextProps = Pick<TransProps, "components"> & {
   text: string;
 };
 
@@ -3464,12 +3464,12 @@ var r$1 = createAdapter(adapterReactOptions, ({})=>({
             },
             {
                 name: "I18nRouteProvider",
-                fn: i$3,
+                fn: s$3,
                 ext: "tsx"
             },
             {
                 name: "I18nRouteSetter",
-                fn: s$3,
+                fn: i$3,
                 ext: "tsx"
             },
             {
@@ -3484,7 +3484,7 @@ var r$1 = createAdapter(adapterReactOptions, ({})=>({
                 index: !0
             },
             {
-                name: "T",
+                name: "Trans",
                 fn: I$1,
                 ext: "tsx",
                 index: !0

package/api.esm.js

@@ -922,10 +922,10 @@ let c$3 = (e, a)=>!isArray(a) && isObject(a) && hasPlurals(a) ? hasOnlyPluralKey
             o += "{";
             let t = transformKeysForPlurals(Object.keys(e));
             for(let a = 0; a < t.length; a++){
-                let s = t[a], // fallback to a string otherwise plurals without root definition would
+                let n = t[a], // fallback to a string otherwise plurals without root definition would
                 // not get a type otherwise, e.g. ` pluralNoDefault_...` in __mocks__
-                n = e[s] || "";
-                o += c$3(s, n);
+                s = e[n] || "";
+                o += c$3(n, s);
             }
             o += "};";
         }
@@ -933,10 +933,10 @@ let c$3 = (e, a)=>!isArray(a) && isObject(a) && hasPlurals(a) ? hasOnlyPluralKey
     return(// adjust syntax
     (o = o.replace(/;\[\];/g, "[];")).replace(/;+/g, ";"));
 }, u$2 = (e, t)=>{
-    let { translationFiles: a } = t, { defaultLocale: s } = e, n = a.filter((e)=>e.locale === s), o = [];
-    for(let e = 0; e < n.length; e++){
-        let { path: t, data: a } = n[e], s = t.replace(".json", "");
-        o.push(`"${s}": ${d$4(a)}`);
+    let { translationFiles: a } = t, { defaultLocale: n } = e, s = a.filter((e)=>e.locale === n), o = [];
+    for(let e = 0; e < s.length; e++){
+        let { path: t, data: a } = s[e], n = t.replace(".json", "");
+        o.push(`"${n}": ${d$4(a)}`);
     }
     return o.sort();
 }, h$2 = (t)=>{
@@ -945,37 +945,37 @@ let c$3 = (e, a)=>!isArray(a) && isObject(a) && hasPlurals(a) ? hasOnlyPluralKey
         t && a.push(`"${e}": { ${dataParamsToTsInterfaceBody(t)} };`);
     }), a;
 }, y$1 = (e)=>e.sort().map((e)=>`"${e}"`).join(" | "), T$1 = (e, t)=>y$1(Object.keys(e.byId).filter((a)=>t(a, e.byId[a]))), m$5 = (e)=>Object.keys(e.byId).reduce((t, a)=>{
-        if (e.byId[a].inWildcard) for(let s = 0; s < e.wildcardIds.length; s++){
-            let n = e.wildcardIds[s];
-            a.startsWith(n) && (t[n] = t[n] || [], t[n].push(a));
+        if (e.byId[a].inWildcard) for(let n = 0; n < e.wildcardIds.length; n++){
+            let s = e.wildcardIds[n];
+            a.startsWith(s) && (t[s] = t[s] || [], t[s].push(a));
         }
         return t;
     }, {}), f$3 = (e, t, a)=>{
-    let s = m$5(t), n = [];
-    for(let o in s){
-        let r = s[o].map(// remove the root id portion and the first character which is always
+    let n = m$5(t), s = [];
+    for(let o in n){
+        let r = n[o].map(// remove the root id portion and the first character which is always
         // the route `idDelimiter`
         (e)=>e.split(o)[1].slice(1)), i = t.byId[o].pathnames[e.defaultLocale], l = [];
-        for(let s = 0; s < r.length; s++){
-            let n = r[s], p = `${o}${a.routes.tokens.idDelimiter}${n}`, c = t.byId[p].pathnames[e.defaultLocale].split(i)[1];
-            l.push(`"${n}": "${c}";`);
+        for(let n = 0; n < r.length; n++){
+            let s = r[n], p = `${o}${a.routes.tokens.idDelimiter}${s}`, c = t.byId[p].pathnames[e.defaultLocale].split(i)[1];
+            l.push(`"${s}": "${c}";`);
         }
-        n.push(`"${o}": { ${l.join(" ")} }`);
+        s.push(`"${o}": { ${l.join(" ")} }`);
     }
-    return n;
+    return s;
 }, g$2 = (e, t)=>{
     let a = [];
-    for(let s in t.byId){
-        let n = t.byId[s];
-        a.push(`"${n.id}": "${n.pathnames[e.defaultLocale]}";`);
+    for(let n in t.byId){
+        let s = t.byId[n];
+        a.push(`"${s.id}": "${s.pathnames[e.defaultLocale]}";`);
     }
     return a;
 };
 // TODO: maybe move the Translate types into the various adapters unless we
 // will use the same api for all of them
-var h$3 = (({ config: e, input: t, routes: a, options: s })=>{
-    let n = T$1(a, (e, { params: t })=>!t), o = T$1(a, (e, { params: t })=>!!t), // const routeIdSpa = buildRoutesUnion(routes, (_, { inWildcard }) => inWildcard);
-    { idDelimiter: r } = s.routes.tokens;
+var h$3 = (({ config: e, input: t, routes: a, options: n })=>{
+    let s = T$1(a, (e, { params: t })=>!t), o = T$1(a, (e, { params: t })=>!!t), // const routeIdSpa = buildRoutesUnion(routes, (_, { inWildcard }) => inWildcard);
+    { idDelimiter: r } = n.routes.tokens;
     return `
 /* eslint-disable @typescript-eslint/no-namespace */
 /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -1005,7 +1005,7 @@ export namespace I18n {
   /**
    * The static routes available ids
    */
-  export type RouteIdStatic = ${n};
+  export type RouteIdStatic = ${s};
 
   /**
    * The dynamic routes available ids
@@ -1016,7 +1016,7 @@ export namespace I18n {
    * Map every SPA path divided by their roots to their actual pathname value for the default locale
    */
   export type RouteSpa = {
-    ${f$3(e, a, s).join("\n    ")}
+    ${f$3(e, a, n).join("\n    ")}
   }
 
   /**
@@ -1274,14 +1274,14 @@ export namespace I18n {
    * such as \`/[lang]/my-route/page.tsx\`.
    */
   export type Params = {
-    ${s.routes.localeParamName}: Locale;
+    ${n.routes.localeParamName}: Locale;
   };
 
   /**
    * Props available to each page/layout when a root \`localeParam\` is in place (e.g. 
    * in the typical _next.js_ folder structure \`/[lang]/my-route/page.tsx\`).
    */
-  export type Props<TProps = {}> = TProps & {
+  export type Props<P = {}> = P & {
     params: Params;
   };
 
@@ -1493,33 +1493,33 @@ export default I18nProvider;
 var m$4 = (({})=>`
 "use client";
 
-import type { TransProps } from "next-translate";
-import Trans from "next-translate/Trans";
+import type { TransProps as NextTranslateTransProps } from "next-translate";
+import NextTranslateTrans from "next-translate/Trans";
 import type { I18n } from "./types";
 
-export type TProps<
+export type TransProps<
   TNamespace extends I18n.TranslateNamespace | undefined = undefined,
 > =
-  | (Omit<TransProps, "i18nKey" | "ns"> & {
+  | (Omit<NextTranslateTransProps, "i18nKey" | "ns"> & {
       i18nKey: I18n.TranslationsAllPaths;
     })
-  | (Omit<TransProps, "i18nKey" | "ns"> & {
+  | (Omit<NextTranslateTransProps, "i18nKey" | "ns"> & {
       ns: TNamespace;
       i18nKey: I18n.TranslationsPaths<TNamespace>;
     });
 
-const TypedT = <
+const TypedTrans = <
   TNamespace extends I18n.TranslateNamespace | undefined = undefined,
 >(
-  props: TProps<TNamespace>,
+  props: TransProps<TNamespace>,
 ) =>
-  (<Trans {...(props as TransProps)} />) as React.ReactElement<
-    TProps<TNamespace>
+  (<NextTranslateTrans {...(props as NextTranslateTransProps)} />) as React.ReactElement<
+    TransProps<TNamespace>
   >;
 
-export const T = Trans as typeof TypedT;
+export const Trans = NextTranslateTrans as typeof TypedTrans;
 
-export default T;
+export default Trans;
 `);
 
 var o$7 = (({})=>`
@@ -2946,7 +2946,7 @@ export const I18nRouteContext = createContext<I18nRouteContextValue>([
 // export default I18nRouteContext;
 `);
 
-var i$3 = (({})=>`
+var s$3 = (({})=>`
 "use client";
 
 import { useMemo, useState } from "react";
@@ -2980,7 +2980,7 @@ export function I18nRouteProvider(props: I18nRouteProviderProps) {
 // export default I18nRouteProvider;
 `);
 
-var s$3 = (({})=>`
+var i$3 = (({})=>`
 "use client";
 
 import { useContext, useEffect } from "react";
@@ -3088,7 +3088,7 @@ import { formatElements } from "./formatElements";
 import type { I18n } from "./types";
 import { useT } from "./useT";
 
-export type TProps = {
+export type TransProps = {
   i18nKey: I18n.TranslationsAllPaths;
   components?: React.ReactElement[] | Record<string, React.ReactElement>;
   values?: I18n.TranslationQuery;
@@ -3100,12 +3100,12 @@ export type TProps = {
  * <0>This is an <1>example</1><0>
  * to -> <h1>This is an <b>example</b><h1>
  */
-export const T = ({
+export const Trans = ({
   i18nKey,
   values,
   components,
   returnObjects,
-}: TProps) => {
+}: TransProps) => {
   const [namespace, path] = (i18nKey as string).split(":");
   const t = useT(namespace as I18n.TranslateNamespace) as I18n.TranslateLoose;
   const result = useMemo(() => {
@@ -3127,17 +3127,17 @@ export const T = ({
   return result;
 };
 
-export default T;
+export default Trans;
 `);
 
 var T = (({})=>`
 "use client";
 
 import { useMemo } from "react";
-import type { TProps } from "./T";
+import type { TransProps } from "./Trans";
 import { formatElements } from "./formatElements";
 
-export type TransTextProps = Pick<TProps, "components"> & {
+export type TransTextProps = Pick<TransProps, "components"> & {
   text: string;
 };
 
@@ -3443,12 +3443,12 @@ var r$1 = createAdapter(adapterReactOptions, ({})=>({
             },
             {
                 name: "I18nRouteProvider",
-                fn: i$3,
+                fn: s$3,
                 ext: "tsx"
             },
             {
                 name: "I18nRouteSetter",
-                fn: s$3,
+                fn: i$3,
                 ext: "tsx"
             },
             {
@@ -3463,7 +3463,7 @@ var r$1 = createAdapter(adapterReactOptions, ({})=>({
                 index: !0
             },
             {
-                name: "T",
+                name: "Trans",
                 fn: I$1,
                 ext: "tsx",
                 index: !0

package/package.json

@@ -2,8 +2,8 @@
   "name": "@koine/i18n",
   "sideEffects": false,
   "dependencies": {
-    "@koine/node": "2.0.0-beta.115",
-    "@koine/utils": "2.0.0-beta.115",
+    "@koine/node": "2.0.0-beta.116",
+    "@koine/utils": "2.0.0-beta.116",
     "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.115"
+  "version": "2.0.0-beta.116"
 }