@koine/i18n 2.0.0-beta.185 → 2.0.0-beta.187

package/adapter-js/generators/dictionary.cjs.js

@@ -11,7 +11,7 @@ var e = createAdapter.createGenerator("js", (o)=>{
         return e[n] = e[n] || {}, e[n][o] = i, e;
     }, {}), l = (t)=>utils.changeCaseSnake(t);
     return Object.keys(c).reduce((e, r)=>{
-        let o = c[r], n = `dictionary_${r}`, a = dataTranslations.normaliseTranslationTraceIdentifier(r, p);
+        let o = c[r], n = `$dictionary_${r}`, a = dataTranslations.normaliseTranslationTraceIdentifier(r, p);
         return e[n] = {
             dir: m,
             name: a,

package/adapter-js/generators/dictionary.esm.js

@@ -9,7 +9,7 @@ var e = createGenerator("js", (o)=>{
         return e[n] = e[n] || {}, e[n][o] = i, e;
     }, {}), l = (t)=>changeCaseSnake(t);
     return Object.keys(c).reduce((e, r)=>{
-        let o = c[r], n = `dictionary_${r}`, a = normaliseTranslationTraceIdentifier(r, p);
+        let o = c[r], n = `$dictionary_${r}`, a = normaliseTranslationTraceIdentifier(r, p);
         return e[n] = {
             dir: m,
             name: a,

package/adapter-js/generators/t.cjs.js

@@ -129,13 +129,16 @@ var u = createAdapter.createGenerator("js", (e)=>{
             name: o,
             ext: "ts",
             index: !1,
-            content: ()=>"" + (imports.ImportsCompiler.outMany("ts", s) + functions.FunctionsCompiler.outMany("ts", i, {
+            content: ()=>{
+                let e = "";
+                return e += imports.ImportsCompiler.outMany("ts", s), e += functions.FunctionsCompiler.outMany("ts", i, {
                     imports: !1,
                     exports: "named",
                     style: "function",
                     comments: !0,
                     pure: !0
-                }))
+                });
+            }
         }
     };
 });

package/adapter-js/generators/t.esm.js

@@ -125,13 +125,16 @@ var u = createGenerator("js", (e)=>{
             name: o,
             ext: "ts",
             index: !1,
-            content: ()=>"" + (ImportsCompiler.outMany("ts", s) + FunctionsCompiler.outMany("ts", i, {
+            content: ()=>{
+                let e = "";
+                return e += ImportsCompiler.outMany("ts", s), e += FunctionsCompiler.outMany("ts", i, {
                     imports: !1,
                     exports: "named",
                     style: "function",
                     comments: !0,
                     pure: !0
-                }))
+                });
+            }
         }
     };
 });

package/adapter-js/generators/to.cjs.js

@@ -103,13 +103,16 @@ var I = createAdapter.createGenerator("js", (t)=>{
                     name: i,
                     ext: "ts",
                     index: !1,
-                    content: ()=>"" + (imports.ImportsCompiler.outMany("ts", d) + functions.FunctionsCompiler.outMany("ts", u, {
+                    content: ()=>{
+                        let t = "";
+                        return t += imports.ImportsCompiler.outMany("ts", d), t += functions.FunctionsCompiler.outMany("ts", u, {
                             imports: !1,
                             exports: "named",
                             style: "function",
                             comments: !0,
                             pure: !0
-                        }))
+                        });
+                    }
                 }
             };
         }(t),

package/adapter-js/generators/to.esm.js

@@ -99,13 +99,16 @@ var I = createGenerator("js", (t)=>{
                     name: i,
                     ext: "ts",
                     index: !1,
-                    content: ()=>"" + (ImportsCompiler.outMany("ts", d) + FunctionsCompiler.outMany("ts", u, {
+                    content: ()=>{
+                        let t = "";
+                        return t += ImportsCompiler.outMany("ts", d), t += FunctionsCompiler.outMany("ts", u, {
                             imports: !1,
                             exports: "named",
                             style: "function",
                             comments: !0,
                             pure: !0
-                        }))
+                        });
+                    }
                 }
             };
         }(t),

package/adapter-next/generators/router-app/I18nLayout.cjs.js

@@ -14,15 +14,14 @@ var a = createAdapter.createGenerator("next", (e)=>{
             content: ()=>`
 import React from "react";
 import type { Metadata } from "next/types";
-import { i18nRtlLocales } from "@koine/i18n";
+import { i18nConsole, i18nRtlLocales } from "@koine/i18n";
 import { getI18nDictionaries } from "../internal/getI18nDictionaries";
 import { I18nTranslateProvider } from "../I18nTranslateProvider";
-import { defaultLocale } from "../defaultLocale";
 import { locales } from "../locales";
 import type { I18n } from "../types";
 import { getLocale } from "./getLocale";
 import { I18nLayoutRoot } from "./I18nLayoutRoot";
-import { I18nLocaleContext } from "./I18nLocaleContext";
+import { setLocale } from "./setLocale";
 
 export type I18nLayoutProps = React.PropsWithChildren<Configurator>;
 
@@ -41,17 +40,13 @@ export const I18nLayout = async ({
   locale = locale || getLocale();
   const dictionaries = await getI18nDictionaries({ locale, namespaces });
 
-  I18nLocaleContext.set(locale);
-
   return (
-    <I18nLocaleContext.Provider value={locale}>
-      <I18nTranslateProvider
-        locale={locale}
-        dictionaries={dictionaries}
-      >
-        {children}
-      </I18nTranslateProvider>
-    </I18nLocaleContext.Provider>
+    <I18nTranslateProvider
+      locale={locale}
+      dictionaries={dictionaries}
+    >
+      {children}
+    </I18nTranslateProvider>
   );
 };
 
@@ -153,7 +148,7 @@ export const createI18nLayout = <
     | Configurator,
 ) => {
   const resolveConfigurator = async (props: I18n.Props<TProps>) => {
-    const localeParam = props.params?.${a};
+    const localeParam = props.params?.${a};${createAdapter.createGenerator.log(e, "createI18nLayout", "resolveConfigurator", "localeParam")}
     const config = configurator
       ? typeof configurator === "function"
         ? await configurator(props, localeParam)
@@ -161,6 +156,9 @@ export const createI18nLayout = <
       : null;
     const { locale: localeConfig, ...restConfig } = config || {};
     const locale = localeConfig || getLocale();
+
+    setLocale(locale);
+
     return { ...restConfig, locale };
   };
 
@@ -200,7 +198,7 @@ export const createI18nLayout = <
     ) => {
       return async (props: I18n.Props<TProps>) => {
         const config = await resolveConfigurator(props);
-        const { locale } = config;
+        const { locale } = config;${createAdapter.createGenerator.log(e, "layout.default", "resolveConfigurator", "locale")}
         const dir = i18nRtlLocales.includes(locale) ? "rtl" : "ltr";
         const i18nHtmlAttrs = { lang: locale, dir };
         const I18nScript = (

package/adapter-next/generators/router-app/I18nLayout.esm.js

@@ -12,15 +12,14 @@ var a = createGenerator("next", (e)=>{
             content: ()=>`
 import React from "react";
 import type { Metadata } from "next/types";
-import { i18nRtlLocales } from "@koine/i18n";
+import { i18nConsole, i18nRtlLocales } from "@koine/i18n";
 import { getI18nDictionaries } from "../internal/getI18nDictionaries";
 import { I18nTranslateProvider } from "../I18nTranslateProvider";
-import { defaultLocale } from "../defaultLocale";
 import { locales } from "../locales";
 import type { I18n } from "../types";
 import { getLocale } from "./getLocale";
 import { I18nLayoutRoot } from "./I18nLayoutRoot";
-import { I18nLocaleContext } from "./I18nLocaleContext";
+import { setLocale } from "./setLocale";
 
 export type I18nLayoutProps = React.PropsWithChildren<Configurator>;
 
@@ -39,17 +38,13 @@ export const I18nLayout = async ({
   locale = locale || getLocale();
   const dictionaries = await getI18nDictionaries({ locale, namespaces });
 
-  I18nLocaleContext.set(locale);
-
   return (
-    <I18nLocaleContext.Provider value={locale}>
-      <I18nTranslateProvider
-        locale={locale}
-        dictionaries={dictionaries}
-      >
-        {children}
-      </I18nTranslateProvider>
-    </I18nLocaleContext.Provider>
+    <I18nTranslateProvider
+      locale={locale}
+      dictionaries={dictionaries}
+    >
+      {children}
+    </I18nTranslateProvider>
   );
 };
 
@@ -151,7 +146,7 @@ export const createI18nLayout = <
     | Configurator,
 ) => {
   const resolveConfigurator = async (props: I18n.Props<TProps>) => {
-    const localeParam = props.params?.${a};
+    const localeParam = props.params?.${a};${createGenerator.log(e, "createI18nLayout", "resolveConfigurator", "localeParam")}
     const config = configurator
       ? typeof configurator === "function"
         ? await configurator(props, localeParam)
@@ -159,6 +154,9 @@ export const createI18nLayout = <
       : null;
     const { locale: localeConfig, ...restConfig } = config || {};
     const locale = localeConfig || getLocale();
+
+    setLocale(locale);
+
     return { ...restConfig, locale };
   };
 
@@ -198,7 +196,7 @@ export const createI18nLayout = <
     ) => {
       return async (props: I18n.Props<TProps>) => {
         const config = await resolveConfigurator(props);
-        const { locale } = config;
+        const { locale } = config;${createGenerator.log(e, "layout.default", "resolveConfigurator", "locale")}
         const dir = i18nRtlLocales.includes(locale) ? "rtl" : "ltr";
         const i18nHtmlAttrs = { lang: locale, dir };
         const I18nScript = (

package/adapter-next/generators/router-app/I18nPage.cjs.js

@@ -2,8 +2,8 @@
 
 var createAdapter = require('../../../compiler/createAdapter.cjs.js');
 
-var n = createAdapter.createGenerator("next", (t)=>{
-    let { config: { single: a }, options: { routes: { localeParamName: o } } } = t;
+var n = createAdapter.createGenerator("next", (a)=>{
+    let { config: { single: t }, options: { routes: { localeParamName: o } } } = a;
     return {
         I18nPage: {
             dir: createAdapter.createGenerator.dirs.server,
@@ -14,7 +14,7 @@ var n = createAdapter.createGenerator("next", (t)=>{
 import React from "react";
 import { notFound } from "next/navigation";
 import type { Metadata } from "next/types";
-import { defaultLocale } from "../defaultLocale";
+import { i18nConsole } from "@koine/i18n";
 import { I18nTranslateProvider } from "../I18nTranslateProvider";
 import { isLocale } from "../isLocale";
 import { locales } from "../locales";
@@ -24,12 +24,12 @@ import { getI18nMetadata } from "../internal/getI18nMetadata";
 import { I18nMetadataSetter } from "../internal/I18nMetadataSetter";
 import { I18nRouteSetter } from "../internal/I18nRouteSetter";
 import { getLocale } from "./getLocale";
-import { I18nLocaleContext } from "./I18nLocaleContext";
+import { setLocale } from "./setLocale";
 
 export type I18nPageProps<TRouteId extends I18n.RouteId> =
   React.PropsWithChildren<
     {
-      ${a ? "" : `/**
+      ${t ? "" : `/**
        * Optionally set this manually to override the current locale
        */
       locale?: I18n.Locale;
@@ -112,14 +112,9 @@ function pageInit(paramsOrProps: I18n.Props["params"] | I18n.Props) {
     const locale = (params as any).${o};
 
     if (isLocale(locale)) {
-      ${a ? "" : `
-      // set the server context based locale as early as possible, usually this
-      // function is called as first thing in the page components. Setting the
-      // locale here might help reducing the cases where a 't' function needed
-      // in those "root" page components is obtained by calling 'getT' without
-      // passing a 'locale' argument. Passing the 'locale' should not be needed
-      // actually, but...
-      I18nLocaleContext.set(locale);
+      ${t ? "" : `
+      // set the server context based locale as early as possible
+      setLocale(locale);
       `}return locale;
     }
   }
@@ -238,7 +233,7 @@ export const createI18nPage = <
     | TConfig,
 ) => {
   const resolveConfigurator = async (props: I18n.Props<TProps>) => {
-    const localeParam = pageInit(props);
+    const localeParam = pageInit(props);${createAdapter.createGenerator.log(a, "createI18nPage", "resolveConfigurator", "localeParam")}
     const config =
       typeof configurator === "function"
         ? await configurator(props, localeParam)
@@ -272,7 +267,7 @@ export const createI18nPage = <
       ) => React.ReactNode | Promise<React.ReactNode>,
     ) => {
       return async (props: I18n.Props<TProps>) => {
-        const { locale, route, namespaces } = await resolveConfigurator(props);
+        const { locale, route, namespaces } = await resolveConfigurator(props);${createAdapter.createGenerator.log(a, "page.default", "resolveConfigurator", "locale")}
         const render = await impl({ locale, route, ...props });
         return (
           <I18nPage

package/adapter-next/generators/router-app/I18nPage.esm.js

@@ -1,7 +1,7 @@
 import { createGenerator } from '../../../compiler/createAdapter.esm.js';
 
-var n = createGenerator("next", (t)=>{
-    let { config: { single: a }, options: { routes: { localeParamName: o } } } = t;
+var n = createGenerator("next", (a)=>{
+    let { config: { single: t }, options: { routes: { localeParamName: o } } } = a;
     return {
         I18nPage: {
             dir: createGenerator.dirs.server,
@@ -12,7 +12,7 @@ var n = createGenerator("next", (t)=>{
 import React from "react";
 import { notFound } from "next/navigation";
 import type { Metadata } from "next/types";
-import { defaultLocale } from "../defaultLocale";
+import { i18nConsole } from "@koine/i18n";
 import { I18nTranslateProvider } from "../I18nTranslateProvider";
 import { isLocale } from "../isLocale";
 import { locales } from "../locales";
@@ -22,12 +22,12 @@ import { getI18nMetadata } from "../internal/getI18nMetadata";
 import { I18nMetadataSetter } from "../internal/I18nMetadataSetter";
 import { I18nRouteSetter } from "../internal/I18nRouteSetter";
 import { getLocale } from "./getLocale";
-import { I18nLocaleContext } from "./I18nLocaleContext";
+import { setLocale } from "./setLocale";
 
 export type I18nPageProps<TRouteId extends I18n.RouteId> =
   React.PropsWithChildren<
     {
-      ${a ? "" : `/**
+      ${t ? "" : `/**
        * Optionally set this manually to override the current locale
        */
       locale?: I18n.Locale;
@@ -110,14 +110,9 @@ function pageInit(paramsOrProps: I18n.Props["params"] | I18n.Props) {
     const locale = (params as any).${o};
 
     if (isLocale(locale)) {
-      ${a ? "" : `
-      // set the server context based locale as early as possible, usually this
-      // function is called as first thing in the page components. Setting the
-      // locale here might help reducing the cases where a 't' function needed
-      // in those "root" page components is obtained by calling 'getT' without
-      // passing a 'locale' argument. Passing the 'locale' should not be needed
-      // actually, but...
-      I18nLocaleContext.set(locale);
+      ${t ? "" : `
+      // set the server context based locale as early as possible
+      setLocale(locale);
       `}return locale;
     }
   }
@@ -236,7 +231,7 @@ export const createI18nPage = <
     | TConfig,
 ) => {
   const resolveConfigurator = async (props: I18n.Props<TProps>) => {
-    const localeParam = pageInit(props);
+    const localeParam = pageInit(props);${createGenerator.log(a, "createI18nPage", "resolveConfigurator", "localeParam")}
     const config =
       typeof configurator === "function"
         ? await configurator(props, localeParam)
@@ -270,7 +265,7 @@ export const createI18nPage = <
       ) => React.ReactNode | Promise<React.ReactNode>,
     ) => {
       return async (props: I18n.Props<TProps>) => {
-        const { locale, route, namespaces } = await resolveConfigurator(props);
+        const { locale, route, namespaces } = await resolveConfigurator(props);${createGenerator.log(a, "page.default", "resolveConfigurator", "locale")}
         const render = await impl({ locale, route, ...props });
         return (
           <I18nPage

package/adapter-react/generators/I18nMetadata.cjs.js

@@ -2,7 +2,7 @@
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var m = createAdapter.createGenerator("react", (e)=>({
+var a = createAdapter.createGenerator("react", (e)=>({
         I18nMetadataContext: {
             dir: createAdapter.createGenerator.dirs.internal,
             name: "I18nMetadataContext",
@@ -139,4 +139,4 @@ export default useI18nSwitch;
         }
     }));
 
-module.exports = m;
+module.exports = a;

package/adapter-react/generators/I18nMetadata.esm.js

@@ -1,6 +1,6 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var m = createGenerator("react", (e)=>({
+var a = createGenerator("react", (e)=>({
         I18nMetadataContext: {
             dir: createGenerator.dirs.internal,
             name: "I18nMetadataContext",
@@ -137,4 +137,4 @@ export default useI18nSwitch;
         }
     }));
 
-export { m as default };
+export { a as default };

package/adapter-react/generators/I18nRoute.cjs.js

@@ -2,7 +2,7 @@
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var n = createAdapter.createGenerator("react", (e)=>({
+var m = createAdapter.createGenerator("react", (e)=>({
         I18nRouteContext: {
             dir: createAdapter.createGenerator.dirs.internal,
             name: "I18nRouteContext",
@@ -100,4 +100,4 @@ export const I18nRouteSetter = (props: I18nRouteSetterProps) => {
         }
     }));
 
-module.exports = n;
+module.exports = m;

package/adapter-react/generators/I18nRoute.esm.js

@@ -1,6 +1,6 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var n = createGenerator("react", (e)=>({
+var m = createGenerator("react", (e)=>({
         I18nRouteContext: {
             dir: createGenerator.dirs.internal,
             name: "I18nRouteContext",
@@ -98,4 +98,4 @@ export const I18nRouteSetter = (props: I18nRouteSetterProps) => {
         }
     }));
 
-export { n as default };
+export { m as default };

package/adapter-react/generators/I18nTranslate.cjs.js

@@ -43,6 +43,7 @@ export const I18nTranslateContext = createContext<I18nTranslateContextValue>({
 "use client";
 
 import React, { useContext } from "react";
+import { i18nConsole, type I18nUtils } from "@koine/i18n";
 import { I18nTranslateContext } from "./internal/I18nTranslateContext";
 import { setGlobalLocale } from "./internal/setGlobalLocale";
 import { createT } from "./createT";
@@ -68,7 +69,7 @@ export const I18nTranslateProvider = ({
   // (the "rsc" webpack layer), while here we set it in a client component (the
   // "ssr" webpack layer) making the locale available in all client components
   // and in the webpack-define implementation
-  setGlobalLocale(locale);
+  setGlobalLocale(locale);${createAdapter.createGenerator.log(t, "I18nTranslateProvider", "setGlobalLocale", "locale")}
 
   const parentCtx = useContext(I18nTranslateContext);
   const _d = { ...parentCtx._d, ...dictionaries };

package/adapter-react/generators/I18nTranslate.esm.js

@@ -41,6 +41,7 @@ export const I18nTranslateContext = createContext<I18nTranslateContextValue>({
 "use client";
 
 import React, { useContext } from "react";
+import { i18nConsole, type I18nUtils } from "@koine/i18n";
 import { I18nTranslateContext } from "./internal/I18nTranslateContext";
 import { setGlobalLocale } from "./internal/setGlobalLocale";
 import { createT } from "./createT";
@@ -66,7 +67,7 @@ export const I18nTranslateProvider = ({
   // (the "rsc" webpack layer), while here we set it in a client component (the
   // "ssr" webpack layer) making the locale available in all client components
   // and in the webpack-define implementation
-  setGlobalLocale(locale);
+  setGlobalLocale(locale);${createGenerator.log(t, "I18nTranslateProvider", "setGlobalLocale", "locale")}
 
   const parentCtx = useContext(I18nTranslateContext);
   const _d = { ...parentCtx._d, ...dictionaries };

package/adapter-react/generators/getT.cjs.js

@@ -2,13 +2,14 @@
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var g = createAdapter.createGenerator("react", (e)=>({
+var f = createAdapter.createGenerator("react", (e)=>({
         getT: {
             dir: createAdapter.createGenerator.dirs.server,
             name: "getT",
             ext: "ts",
             index: !0,
             content: ()=>`
+import { i18nConsole } from "@koine/i18n";
 import { loadTranslations } from "../internal/loadTranslations";
 import { createT } from "../createT";
 import type { I18n } from "../types";
@@ -34,7 +35,7 @@ export async function getT<TNamespace extends I18n.TranslationsNamespace>(
   // _namespace?: TNamespace,
 ) {
   const locale = args.length === 1 ? getLocale() : (args[0] as I18n.Locale);
-  const namespace = args[1] || (args[0] as TNamespace);
+  const namespace = args[1] || (args[0] as TNamespace);${createAdapter.createGenerator.log(e, "getT", "", "{ locale, namespace }")}
   const translations = await loadTranslations(locale, namespace);
   const t = createT({ [namespace]: translations }, locale);
 
@@ -50,4 +51,4 @@ export default getT;
         }
     }));
 
-module.exports = g;
+module.exports = f;

package/adapter-react/generators/getT.esm.js

@@ -1,12 +1,13 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var g = createGenerator("react", (e)=>({
+var f = createGenerator("react", (e)=>({
         getT: {
             dir: createGenerator.dirs.server,
             name: "getT",
             ext: "ts",
             index: !0,
             content: ()=>`
+import { i18nConsole } from "@koine/i18n";
 import { loadTranslations } from "../internal/loadTranslations";
 import { createT } from "../createT";
 import type { I18n } from "../types";
@@ -32,7 +33,7 @@ export async function getT<TNamespace extends I18n.TranslationsNamespace>(
   // _namespace?: TNamespace,
 ) {
   const locale = args.length === 1 ? getLocale() : (args[0] as I18n.Locale);
-  const namespace = args[1] || (args[0] as TNamespace);
+  const namespace = args[1] || (args[0] as TNamespace);${createGenerator.log(e, "getT", "", "{ locale, namespace }")}
   const translations = await loadTranslations(locale, namespace);
   const t = createT({ [namespace]: translations }, locale);
 
@@ -48,4 +49,4 @@ export default getT;
         }
     }));
 
-export { g as default };
+export { f as default };

package/adapter-react/generators/getTo.cjs.js

@@ -2,7 +2,7 @@
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var i = createAdapter.createGenerator("react", (t)=>{
+var g = createAdapter.createGenerator("react", (t)=>{
     let { routes: { dynamicRoutes: o } } = t;
     return {
         getTo: {
@@ -20,8 +20,7 @@ import { getLocale } from "./getLocale";
 /**
  * **For React RSC only**
  * 
- * By default it grabs the current locale from NodeJS' \`AsyncLocalStorage\`
- * implementation used in \`I18nLocaleContext\`.
+ * @param {locale} By default it uses the current locale
  */
 export function getTo(locale = getLocale()) {
   return <Id extends I18n.RouteId>(
@@ -43,4 +42,4 @@ export default getTo;
     };
 });
 
-module.exports = i;
+module.exports = g;

package/adapter-react/generators/getTo.esm.js

@@ -1,6 +1,6 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var i = createGenerator("react", (t)=>{
+var g = createGenerator("react", (t)=>{
     let { routes: { dynamicRoutes: o } } = t;
     return {
         getTo: {
@@ -18,8 +18,7 @@ import { getLocale } from "./getLocale";
 /**
  * **For React RSC only**
  * 
- * By default it grabs the current locale from NodeJS' \`AsyncLocalStorage\`
- * implementation used in \`I18nLocaleContext\`.
+ * @param {locale} By default it uses the current locale
  */
 export function getTo(locale = getLocale()) {
   return <Id extends I18n.RouteId>(
@@ -41,4 +40,4 @@ export default getTo;
     };
 });
 
-export { i as default };
+export { g as default };