@koine/i18n 2.0.0-beta.89 → 2.0.0-beta.91

package/adapter-react/code/useLocale.d.ts

@@ -1,3 +1,3 @@
 import type { I18nCompiler } from "../../compiler/types";
-declare const _default: ({ config }: I18nCompiler.AdapterArg<"react">) => string;
+declare const _default: ({}: I18nCompiler.AdapterArg<"react">) => string;
 export default _default;

package/api.cjs.js

@@ -435,6 +435,7 @@ export function getAlternates<TRouteId extends I18n.RouteId>({
 
   const alternates: I18n.Alternates = {
     "x-default": toUrl(
+      // @ts-expect-error FIXME: route conditional type
       params ? to(id, params, defaultLocale) : to(id, defaultLocale),
     ),
   };
@@ -442,6 +443,7 @@ export function getAlternates<TRouteId extends I18n.RouteId>({
     .filter((l) => l !== locale)
     .forEach((locale) => {
       alternates[locale] = toUrl(
+        // @ts-expect-error FIXME: route conditional type
         params ? to(id, params, locale) : to(id, locale),
       );
     });
@@ -544,7 +546,8 @@ import { locales } from "./locales";
 import type { I18n } from "./types";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const isLocale = (payload: any): payload is I18n.Locale => locales.includes(payload);
+export const isLocale = (payload: any): payload is I18n.Locale =>
+  locales.includes(payload);
 
 export default isLocale;
 `);
@@ -1768,6 +1771,7 @@ export const I18nAlternates = <TRouteId extends I18n.RouteId>(
   const [alternates, setAlternates] = useContext(I18nAlternatesContext);
 
   useEffect(() => {
+    // @ts-expect-error FIXME: route conditional type
     setAlternates(getAlternates({ locale, id, params }));
   }, [id, params, locale, setAlternates]);
 
@@ -1843,7 +1847,7 @@ var o$7 = (({})=>`
 "use client";
 
 import Head from "next/head";
-import type { I18n } from "./i18n";
+import type { I18n } from "./types";
 
 export type I18nHeadProps = {
   alternates?: I18n.Alternates;
@@ -1950,6 +1954,7 @@ export const I18nPage = async <TRouteId extends I18n.RouteId>(
     params,
     children,
   } = props;
+  // @ts-expect-error FIXME: route conditional type
   const alternates = await getAlternates({ locale, id, params });
   const dictionaries = await getI18nDictionaries({ locale, namespaces });
 
@@ -1971,11 +1976,8 @@ export default I18nPage;
 `);
 
 var i$4 = (({ options: { routes: { localeParamName: o } } })=>`
-import { I18nProvider } from "./I18nProvider";
 import { I18nAlternatesProvider } from "./I18nAlternatesProvider";
 import { I18nRouteProvider } from "./I18nRouteProvider";
-import { defaultLocale } from "./defaultLocale";
-import { getI18nDictionaries } from "./getI18nDictionaries";
 import type { I18n } from "./types";
 
 export type I18nRootProps = React.PropsWithChildren;
@@ -1984,14 +1986,13 @@ const alternates = {};
 
 /**
  * Use this _only once_ in the root \`layout.tsx\` at root folder of your app
- * directory (one up than the \`[${o}]\` folder).
- * 
+ * directory (one up than the \`[lang]\` folder).
+ *
  * **For App Router only**
  */
 export const I18nRoot = ({ children }: I18nRootProps) => {
-
   return (
-    <I18nRouteProvider id="">
+    <I18nRouteProvider id={"" as I18n.RouteId}>
       <I18nAlternatesProvider alternates={alternates}>
         {children}
       </I18nAlternatesProvider>
@@ -2047,6 +2048,7 @@ export async function i18nProps<TRouteId extends I18n.RouteId, TParams, TData>({
 }: 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 }),
   }
@@ -2698,16 +2700,16 @@ import { useContext, useEffect } from "react";
 import { I18nRouteContext } from "./I18nRouteContext";
 import type { I18n } from "./types";
 
-type I18nAlternatesProps = {
-  id: I18n.Alternates;
+type I18nRouteSetterProps = {
+  id: I18n.RouteId;
 };
 
 /**
  * NB: Do not use it next.js Pages router
- * 
+ *
  * @internal
  */
-export const I18nRouteSetter = (props: I18nAlternatesProps) => {
+export const I18nRouteSetter = (props: I18nRouteSetterProps) => {
   const { id } = props;
   const [, setRouteId] = useContext(I18nRouteContext);
 
@@ -2775,22 +2777,14 @@ var I$1 = (({})=>`
 "use client";
 
 import { useMemo } from "react";
-import { formatElements } from "./formatElements";
 import type { TProps } from "./T";
-import type { I18n } from "./types";
+import { formatElements } from "./formatElements";
 
-export type TransTextProps<
-  TNamespace extends I18n.TranslateNamespace | undefined,
-> = Pick<TProps<TNamespace>, "components"> & {
+export type TransTextProps = Pick<TProps, "components"> & {
   text: string;
 };
 
-export const TransText = <
-  TNamespace extends I18n.TranslateNamespace | undefined,
->({
-  text,
-  components,
-}: TransTextProps<TNamespace>) => {
+export const TransText = ({ text, components }: TransTextProps) => {
   return useMemo(
     () =>
       !components || components.length === 0
@@ -2900,14 +2894,14 @@ export const useAlternates = (
 export default useAlternates;
 `);
 
-var u = (({ config: e })=>`
+var u = (({})=>`
 "use client";
 
 import { useContext } from "react";
+import { defaultLocale } from "./defaultLocale";
 import { I18nContext } from "./I18nContext";
-import type { I18n } from "./types";
 
-export const useLocale = () => useContext(I18nContext).locale || "${e.defaultLocale}";
+export const useLocale = () => useContext(I18nContext).locale || defaultLocale;
 
 export default useLocale;
 `);
@@ -2923,9 +2917,9 @@ export const useT = <T extends I18n.TranslateNamespace>(namespace: T) => {
   const t = useContext(I18nContext).t;
   return useMemo(
     () =>
-      (i18nKey: string, ...args) =>
+      (key: string, ...args) =>
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (t as any)(\`\${namespace}:\${i18nKey}\`, ...args),
+        (t as any)(\`\${namespace}:\${key}\`, ...args),
     [t],
   ) as I18n.TranslateNamespaced<T>;
 };

package/api.esm.js

@@ -413,6 +413,7 @@ export function getAlternates<TRouteId extends I18n.RouteId>({
 
   const alternates: I18n.Alternates = {
     "x-default": toUrl(
+      // @ts-expect-error FIXME: route conditional type
       params ? to(id, params, defaultLocale) : to(id, defaultLocale),
     ),
   };
@@ -420,6 +421,7 @@ export function getAlternates<TRouteId extends I18n.RouteId>({
     .filter((l) => l !== locale)
     .forEach((locale) => {
       alternates[locale] = toUrl(
+        // @ts-expect-error FIXME: route conditional type
         params ? to(id, params, locale) : to(id, locale),
       );
     });
@@ -522,7 +524,8 @@ import { locales } from "./locales";
 import type { I18n } from "./types";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const isLocale = (payload: any): payload is I18n.Locale => locales.includes(payload);
+export const isLocale = (payload: any): payload is I18n.Locale =>
+  locales.includes(payload);
 
 export default isLocale;
 `);
@@ -1746,6 +1749,7 @@ export const I18nAlternates = <TRouteId extends I18n.RouteId>(
   const [alternates, setAlternates] = useContext(I18nAlternatesContext);
 
   useEffect(() => {
+    // @ts-expect-error FIXME: route conditional type
     setAlternates(getAlternates({ locale, id, params }));
   }, [id, params, locale, setAlternates]);
 
@@ -1821,7 +1825,7 @@ var o$7 = (({})=>`
 "use client";
 
 import Head from "next/head";
-import type { I18n } from "./i18n";
+import type { I18n } from "./types";
 
 export type I18nHeadProps = {
   alternates?: I18n.Alternates;
@@ -1928,6 +1932,7 @@ export const I18nPage = async <TRouteId extends I18n.RouteId>(
     params,
     children,
   } = props;
+  // @ts-expect-error FIXME: route conditional type
   const alternates = await getAlternates({ locale, id, params });
   const dictionaries = await getI18nDictionaries({ locale, namespaces });
 
@@ -1949,11 +1954,8 @@ export default I18nPage;
 `);
 
 var i$4 = (({ options: { routes: { localeParamName: o } } })=>`
-import { I18nProvider } from "./I18nProvider";
 import { I18nAlternatesProvider } from "./I18nAlternatesProvider";
 import { I18nRouteProvider } from "./I18nRouteProvider";
-import { defaultLocale } from "./defaultLocale";
-import { getI18nDictionaries } from "./getI18nDictionaries";
 import type { I18n } from "./types";
 
 export type I18nRootProps = React.PropsWithChildren;
@@ -1962,14 +1964,13 @@ const alternates = {};
 
 /**
  * Use this _only once_ in the root \`layout.tsx\` at root folder of your app
- * directory (one up than the \`[${o}]\` folder).
- * 
+ * directory (one up than the \`[lang]\` folder).
+ *
  * **For App Router only**
  */
 export const I18nRoot = ({ children }: I18nRootProps) => {
-
   return (
-    <I18nRouteProvider id="">
+    <I18nRouteProvider id={"" as I18n.RouteId}>
       <I18nAlternatesProvider alternates={alternates}>
         {children}
       </I18nAlternatesProvider>
@@ -2025,6 +2026,7 @@ export async function i18nProps<TRouteId extends I18n.RouteId, TParams, TData>({
 }: 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 }),
   }
@@ -2676,16 +2678,16 @@ import { useContext, useEffect } from "react";
 import { I18nRouteContext } from "./I18nRouteContext";
 import type { I18n } from "./types";
 
-type I18nAlternatesProps = {
-  id: I18n.Alternates;
+type I18nRouteSetterProps = {
+  id: I18n.RouteId;
 };
 
 /**
  * NB: Do not use it next.js Pages router
- * 
+ *
  * @internal
  */
-export const I18nRouteSetter = (props: I18nAlternatesProps) => {
+export const I18nRouteSetter = (props: I18nRouteSetterProps) => {
   const { id } = props;
   const [, setRouteId] = useContext(I18nRouteContext);
 
@@ -2753,22 +2755,14 @@ var I$1 = (({})=>`
 "use client";
 
 import { useMemo } from "react";
-import { formatElements } from "./formatElements";
 import type { TProps } from "./T";
-import type { I18n } from "./types";
+import { formatElements } from "./formatElements";
 
-export type TransTextProps<
-  TNamespace extends I18n.TranslateNamespace | undefined,
-> = Pick<TProps<TNamespace>, "components"> & {
+export type TransTextProps = Pick<TProps, "components"> & {
   text: string;
 };
 
-export const TransText = <
-  TNamespace extends I18n.TranslateNamespace | undefined,
->({
-  text,
-  components,
-}: TransTextProps<TNamespace>) => {
+export const TransText = ({ text, components }: TransTextProps) => {
   return useMemo(
     () =>
       !components || components.length === 0
@@ -2878,14 +2872,14 @@ export const useAlternates = (
 export default useAlternates;
 `);
 
-var u = (({ config: e })=>`
+var u = (({})=>`
 "use client";
 
 import { useContext } from "react";
+import { defaultLocale } from "./defaultLocale";
 import { I18nContext } from "./I18nContext";
-import type { I18n } from "./types";
 
-export const useLocale = () => useContext(I18nContext).locale || "${e.defaultLocale}";
+export const useLocale = () => useContext(I18nContext).locale || defaultLocale;
 
 export default useLocale;
 `);
@@ -2901,9 +2895,9 @@ export const useT = <T extends I18n.TranslateNamespace>(namespace: T) => {
   const t = useContext(I18nContext).t;
   return useMemo(
     () =>
-      (i18nKey: string, ...args) =>
+      (key: string, ...args) =>
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (t as any)(\`\${namespace}:\${i18nKey}\`, ...args),
+        (t as any)(\`\${namespace}:\${key}\`, ...args),
     [t],
   ) as I18n.TranslateNamespaced<T>;
 };

package/package.json

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