@koine/i18n 2.0.0-beta.128 → 2.0.0-beta.129

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

@@ -2,7 +2,6 @@
 
 var loadTranslations_inline = require('./loadTranslations_inline.cjs.js');
 
-// import type { I18nCompiler } from "../../compiler/types";
 /**
  * @requires {defaultLocale, I18n}
  */ const getI18nDictionaries_inline = (n, i)=>`

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

@@ -1,6 +1,5 @@
 import { loadTranslations_inline } from './loadTranslations_inline.esm.js';
 
-// import type { I18nCompiler } from "../../compiler/types";
 /**
  * @requires {defaultLocale, I18n}
  */ const getI18nDictionaries_inline = (n, i)=>`

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

@@ -2,7 +2,6 @@
 
 var helpers = require('../../compiler/helpers.cjs.js');
 
-// import type { I18nCompiler } from "../../compiler/types";
 const loadTranslations_inline = (e)=>/* js */ `const loadTranslations = (
   locale: I18n.Locale,
   namespace: I18n.TranslateNamespace,

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

@@ -1,6 +1,5 @@
 import { getTranslationsDir } from '../../compiler/helpers.esm.js';
 
-// import type { I18nCompiler } from "../../compiler/types";
 const loadTranslations_inline = (e)=>/* js */ `const loadTranslations = (
   locale: I18n.Locale,
   namespace: I18n.TranslateNamespace,

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

@@ -13,6 +13,8 @@ var m = createAdapter.createGenerator("next", (t)=>{
             // index: true,
             content: ()=>/* js */ `
 import React from "react";
+import type { Metadata } from "next/types";
+import { rtlLocales } from "@koine/i18n";
 // import { getI18nDictionaries } from "../getI18nDictionaries";
 import { defaultLocale } from "../defaultLocale";
 import { I18nTranslateProvider } from "../I18nTranslateProvider";
@@ -20,7 +22,6 @@ import { locales } from "../locales";
 import type { I18n } from "../types";
 import { getLocale } from "./getLocale";
 import { I18nLayoutRoot } from "./I18nLayoutRoot";
-// import { I18nNotFound } from "./I18nNotFound";
 import { I18nLocaleContext } from "./I18nLocaleContext";
 ${getI18nDictionaries_inline.getI18nDictionaries_inline(1)}
 
@@ -79,50 +80,75 @@ type Configurator = {
  * @example
  * 
  * \`\`\`
- * type Props = {
- *   params: {
- *     slug: string;
- *   };
- * };
+ * const layout = i18nServer.layout({
+ *   namespaces: ["dashboard"],
+ * });
  * 
- * const i18nLayout = i18nServer.layout<Props>(async (_props, _locale) => {
+ * // or as a function (async supported):
+ * type Props = { params: { slug: string; }; };
+ * 
+ * const layout = i18nServer.layout((props: Props, locale) => {
  *   return {
  *     namespaces: ["dashboard"],
  *   };
  * });
  * \`\`\`
  */
-export const createI18nLayout = <TProps extends {}>(
-  configurator?: (props: I18n.Props & TProps, locale: I18n.Locale) => Configurator | Promise<Configurator>
+export const createI18nLayout = <
+  TProps extends {},
+>(
+  configurator?:
+    | ((
+        props: I18n.Props<TProps>,
+        locale: I18n.Locale,
+      ) => Configurator | Promise<Configurator>)
+    | Configurator,
 ) => {
+  const resolveConfigurator = async (props: I18n.Props<TProps>) => {
+    const localeParam = props.params?.${e};
+    const config = configurator
+      ? typeof configurator === "function"
+        ? await configurator(props, localeParam)
+        : configurator
+      : null;
+    const { locale: localeConfig, ...restConfig } = config || {};
+    const locale = localeConfig || getLocale();
+    return { ...restConfig, locale };
+  };
+
   return {
-    notFound: () => {
-      // <I18nNotFound />
-    },
-    generateStaticParams: () => {
-      return locales.map((l) => ({ ${e}: l }));
+    generateStaticParams: () => locales.map((l) => ({ ${e}: l })),
+    generateMetadata: (
+      impl: (
+        props: TProps & { locale: I18n.Locale },
+      ) => Metadata | Promise<Metadata>,
+    ) => {
+      return async (props: I18n.Props<TProps>): Promise<Metadata> => {
+        const { locale } = await resolveConfigurator(props);
+        const metadata = await impl({ locale, ...props });
+        return metadata;
+      };
     },
     default: (
       impl: (
-        props: I18n.Props<
-          TProps & React.PropsWithChildren<{
-            i18nHtmlAttrs: Pick<React.ComponentPropsWithoutRef<"html">, "lang" | "dir">
-          }>
-        >,
-        locale: I18n.Locale
-      ) => React.ReactNode | Promise<React.ReactNode>
+        props: TProps & { locale: I18n.Locale } & React.PropsWithChildren<{
+            i18nHtmlAttrs: Pick<
+              React.ComponentPropsWithoutRef<"html">,
+              "lang" | "dir"
+            >;
+          }>,
+      ) => React.ReactNode | Promise<React.ReactNode>,
     ) => {
       return async (props: I18n.Props<TProps>) => {
-        // const locale = props.params.${e};
-        const locale = getLocale();
-        // TODO: determine "dir" dynamically
-        const i18nHtmlAttrs = { lang: locale, dir: "ltr" };
-        const options = configurator ? await configurator(props, locale) : {};
-        const inner = await impl({ ...props, i18nHtmlAttrs }, locale);
-        return (<I18nLayout {...options}>{inner}</I18nLayout>);
-      }
-    }
-  }
+        const config = await resolveConfigurator(props);
+        const { locale } = config;
+        const dir = rtlLocales.includes(locale) ? "rtl" : "ltr";
+        const i18nHtmlAttrs = { lang: locale, dir };
+        const render = await impl({ locale, i18nHtmlAttrs, ...props });
+        return <I18nLayout {...config}>{render}</I18nLayout>;
+      };
+    },
+  };
 };
 
 createI18nLayout.Root = I18nLayoutRoot;

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

@@ -11,6 +11,8 @@ var m = createGenerator("next", (t)=>{
             // index: true,
             content: ()=>/* js */ `
 import React from "react";
+import type { Metadata } from "next/types";
+import { rtlLocales } from "@koine/i18n";
 // import { getI18nDictionaries } from "../getI18nDictionaries";
 import { defaultLocale } from "../defaultLocale";
 import { I18nTranslateProvider } from "../I18nTranslateProvider";
@@ -18,7 +20,6 @@ import { locales } from "../locales";
 import type { I18n } from "../types";
 import { getLocale } from "./getLocale";
 import { I18nLayoutRoot } from "./I18nLayoutRoot";
-// import { I18nNotFound } from "./I18nNotFound";
 import { I18nLocaleContext } from "./I18nLocaleContext";
 ${getI18nDictionaries_inline(1)}
 
@@ -77,50 +78,75 @@ type Configurator = {
  * @example
  * 
  * \`\`\`
- * type Props = {
- *   params: {
- *     slug: string;
- *   };
- * };
+ * const layout = i18nServer.layout({
+ *   namespaces: ["dashboard"],
+ * });
  * 
- * const i18nLayout = i18nServer.layout<Props>(async (_props, _locale) => {
+ * // or as a function (async supported):
+ * type Props = { params: { slug: string; }; };
+ * 
+ * const layout = i18nServer.layout((props: Props, locale) => {
  *   return {
  *     namespaces: ["dashboard"],
  *   };
  * });
  * \`\`\`
  */
-export const createI18nLayout = <TProps extends {}>(
-  configurator?: (props: I18n.Props & TProps, locale: I18n.Locale) => Configurator | Promise<Configurator>
+export const createI18nLayout = <
+  TProps extends {},
+>(
+  configurator?:
+    | ((
+        props: I18n.Props<TProps>,
+        locale: I18n.Locale,
+      ) => Configurator | Promise<Configurator>)
+    | Configurator,
 ) => {
+  const resolveConfigurator = async (props: I18n.Props<TProps>) => {
+    const localeParam = props.params?.${e};
+    const config = configurator
+      ? typeof configurator === "function"
+        ? await configurator(props, localeParam)
+        : configurator
+      : null;
+    const { locale: localeConfig, ...restConfig } = config || {};
+    const locale = localeConfig || getLocale();
+    return { ...restConfig, locale };
+  };
+
   return {
-    notFound: () => {
-      // <I18nNotFound />
-    },
-    generateStaticParams: () => {
-      return locales.map((l) => ({ ${e}: l }));
+    generateStaticParams: () => locales.map((l) => ({ ${e}: l })),
+    generateMetadata: (
+      impl: (
+        props: TProps & { locale: I18n.Locale },
+      ) => Metadata | Promise<Metadata>,
+    ) => {
+      return async (props: I18n.Props<TProps>): Promise<Metadata> => {
+        const { locale } = await resolveConfigurator(props);
+        const metadata = await impl({ locale, ...props });
+        return metadata;
+      };
     },
     default: (
       impl: (
-        props: I18n.Props<
-          TProps & React.PropsWithChildren<{
-            i18nHtmlAttrs: Pick<React.ComponentPropsWithoutRef<"html">, "lang" | "dir">
-          }>
-        >,
-        locale: I18n.Locale
-      ) => React.ReactNode | Promise<React.ReactNode>
+        props: TProps & { locale: I18n.Locale } & React.PropsWithChildren<{
+            i18nHtmlAttrs: Pick<
+              React.ComponentPropsWithoutRef<"html">,
+              "lang" | "dir"
+            >;
+          }>,
+      ) => React.ReactNode | Promise<React.ReactNode>,
     ) => {
       return async (props: I18n.Props<TProps>) => {
-        // const locale = props.params.${e};
-        const locale = getLocale();
-        // TODO: determine "dir" dynamically
-        const i18nHtmlAttrs = { lang: locale, dir: "ltr" };
-        const options = configurator ? await configurator(props, locale) : {};
-        const inner = await impl({ ...props, i18nHtmlAttrs }, locale);
-        return (<I18nLayout {...options}>{inner}</I18nLayout>);
-      }
-    }
-  }
+        const config = await resolveConfigurator(props);
+        const { locale } = config;
+        const dir = rtlLocales.includes(locale) ? "rtl" : "ltr";
+        const i18nHtmlAttrs = { lang: locale, dir };
+        const render = await impl({ locale, i18nHtmlAttrs, ...props });
+        return <I18nLayout {...config}>{render}</I18nLayout>;
+      };
+    },
+  };
 };
 
 createI18nLayout.Root = I18nLayoutRoot;

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

@@ -3,8 +3,8 @@
 var getI18nDictionaries_inline = require('../../adapter-js/generators/getI18nDictionaries_inline.cjs.js');
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var p = createAdapter.createGenerator("next", (t)=>{
-    let { config: { single: a }, options: { routes: { localeParamName: o } } } = t;
+var p = createAdapter.createGenerator("next", (a)=>{
+    let { config: { single: t }, options: { routes: { localeParamName: o } } } = a;
     return {
         I18nPage: {
             dir: "server",
@@ -31,7 +31,7 @@ ${getI18nDictionaries_inline.getI18nDictionaries_inline(1)}
 export type I18nPageProps<TRouteId extends I18n.RouteId> =
   React.PropsWithChildren<
     {
-      ${a ? "" : `/**
+      ${t ? "" : `/**
        * Optionally set this manually to override the current locale
        */
       locale?: I18n.Locale;
@@ -119,7 +119,7 @@ function pageInit(paramsOrProps: I18n.Props["params"] | I18n.Props) {
     const locale = (params as any).${o};
 
     if (isLocale(locale)) {
-      ${a ? "" : `
+      ${t ? "" : `
       // 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
@@ -127,7 +127,6 @@ function pageInit(paramsOrProps: I18n.Props["params"] | I18n.Props) {
       // passing a 'locale' argument. Passing the 'locale' should not be needed
       // actually, but...
       I18nLocaleContext.set(locale);
-      global.__i18n_locale = locale;
       `}return locale;
     }
   }
@@ -184,42 +183,85 @@ type Configurator<TRouteId extends I18n.RouteId> = {
  * @example
  * 
  * \`\`\`
- * type Props = {
- *   params: {
- *     slug: string;
- *   };
- * };
- * 
- * const i18nPage = i18nServer.page<Props>(async (_props, _locale) => {
+ * type Props = { params: { slug: string; }; };
+ *
+ * const page = i18nServer.page((props: Props) => {
  *   return {
- *     route: { id: "home" },
- *     namespaces: ["~home"],
+ *     route: { id: "collection.[slug]", params: { slug: props.params.slug } },
+ *     namespaces: ["~collection-single"],
  *   };
  * });
+ * 
+ * export const generateMetadata = page.generateMetadata((props) => {
+ *    return {};
+ * });
+ * 
+ * // or async:
+ * export const generateMetadata = page.generateMetadata(async (props) => {
+ *    return {};
+ * });
+ * 
+ * export default page.default((props) => {
+ *    return <>{props.route.id} {props.locale}</>;
+ * });
+ * 
+ * // or async:
+ * export default page.default(async (props) => {
+ *   const data = await fetch(...);
+ *   return <>{props.route.id} {props.locale}</>;
+ * });
  * \`\`\`
- * @returns 
  */
-export const createI18nPage = <TProps extends {}, TRouteId extends I18n.RouteId = I18n.RouteId>(
-  configurator: (props: I18n.Props & TProps, locale: I18n.Locale) => Configurator<TRouteId> | Promise<Configurator<TRouteId>>
+export const createI18nPage = <
+  TProps extends {},
+  TRouteId extends I18n.RouteId,
+  TConfig extends Configurator<TRouteId>,
+>(
+  configurator: (
+    props: I18n.Props<TProps>,
+    locale: I18n.Locale,
+  ) => TConfig | Promise<TConfig>,
 ) => {
   return {
-    generateMetadata: (impl: (props: I18n.Props & TProps, locale: I18n.Locale) => Promise<Metadata>) => {
-      return async (props: I18n.Props & TProps): Promise<Metadata> => {
+    generateMetadata: (
+      impl: (
+        props: TProps &
+          Omit<TConfig, "namespaces"> & {
+            locale: I18n.Locale;
+          },
+      ) => Metadata | Promise<Metadata>,
+    ) => {
+      return async (props: I18n.Props<TProps>): Promise<Metadata> => {
         const locale = pageInit(props);
-        const { route } = await configurator(props, locale);
-        const custom = await impl(props, locale)
-        return getMetadata({ ...route, locale }, custom)
+        const { namespaces, ...config } = await configurator(props, locale);
+        const metadata = await impl({ locale, ...config, ...props });
+        return getMetadata({ ...config.route, locale }, metadata);
       };
     },
-    default: (impl: (props: I18n.Props & TProps, locale: I18n.Locale) => React.ReactNode | Promise<React.ReactNode>) => {
-      return async (props: I18n.Props & TProps) => {
+    default: (
+      impl: (
+        props: TProps &
+          Omit<TConfig, "namespaces"> & {
+            locale: I18n.Locale;
+          },
+      ) => React.ReactNode | Promise<React.ReactNode>,
+    ) => {
+      return async (props: I18n.Props<TProps>) => {
         const locale = pageInit(props);
-        const { route, ...options } = await configurator(props, locale);
-        const render = await impl(props, locale);
-        return (<I18nPage route={route} {...options}>{render}</I18nPage>);
-      }
-    }
-  }
+        const { namespaces, ...config } = await configurator(props, locale);
+        const render = await impl({ locale, ...config, ...props });
+        return (
+          <I18nPage
+            locale={locale}
+            namespaces={namespaces}
+            route={config.route}
+          >
+            {render}
+          </I18nPage>
+        );
+      };
+    },
+  };
 };
 
 export default I18nPage;

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

@@ -1,8 +1,8 @@
 import { getI18nDictionaries_inline } from '../../adapter-js/generators/getI18nDictionaries_inline.esm.js';
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var p = createGenerator("next", (t)=>{
-    let { config: { single: a }, options: { routes: { localeParamName: o } } } = t;
+var p = createGenerator("next", (a)=>{
+    let { config: { single: t }, options: { routes: { localeParamName: o } } } = a;
     return {
         I18nPage: {
             dir: "server",
@@ -29,7 +29,7 @@ ${getI18nDictionaries_inline(1)}
 export type I18nPageProps<TRouteId extends I18n.RouteId> =
   React.PropsWithChildren<
     {
-      ${a ? "" : `/**
+      ${t ? "" : `/**
        * Optionally set this manually to override the current locale
        */
       locale?: I18n.Locale;
@@ -117,7 +117,7 @@ function pageInit(paramsOrProps: I18n.Props["params"] | I18n.Props) {
     const locale = (params as any).${o};
 
     if (isLocale(locale)) {
-      ${a ? "" : `
+      ${t ? "" : `
       // 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
@@ -125,7 +125,6 @@ function pageInit(paramsOrProps: I18n.Props["params"] | I18n.Props) {
       // passing a 'locale' argument. Passing the 'locale' should not be needed
       // actually, but...
       I18nLocaleContext.set(locale);
-      global.__i18n_locale = locale;
       `}return locale;
     }
   }
@@ -182,42 +181,85 @@ type Configurator<TRouteId extends I18n.RouteId> = {
  * @example
  * 
  * \`\`\`
- * type Props = {
- *   params: {
- *     slug: string;
- *   };
- * };
- * 
- * const i18nPage = i18nServer.page<Props>(async (_props, _locale) => {
+ * type Props = { params: { slug: string; }; };
+ *
+ * const page = i18nServer.page((props: Props) => {
  *   return {
- *     route: { id: "home" },
- *     namespaces: ["~home"],
+ *     route: { id: "collection.[slug]", params: { slug: props.params.slug } },
+ *     namespaces: ["~collection-single"],
  *   };
  * });
+ * 
+ * export const generateMetadata = page.generateMetadata((props) => {
+ *    return {};
+ * });
+ * 
+ * // or async:
+ * export const generateMetadata = page.generateMetadata(async (props) => {
+ *    return {};
+ * });
+ * 
+ * export default page.default((props) => {
+ *    return <>{props.route.id} {props.locale}</>;
+ * });
+ * 
+ * // or async:
+ * export default page.default(async (props) => {
+ *   const data = await fetch(...);
+ *   return <>{props.route.id} {props.locale}</>;
+ * });
  * \`\`\`
- * @returns 
  */
-export const createI18nPage = <TProps extends {}, TRouteId extends I18n.RouteId = I18n.RouteId>(
-  configurator: (props: I18n.Props & TProps, locale: I18n.Locale) => Configurator<TRouteId> | Promise<Configurator<TRouteId>>
+export const createI18nPage = <
+  TProps extends {},
+  TRouteId extends I18n.RouteId,
+  TConfig extends Configurator<TRouteId>,
+>(
+  configurator: (
+    props: I18n.Props<TProps>,
+    locale: I18n.Locale,
+  ) => TConfig | Promise<TConfig>,
 ) => {
   return {
-    generateMetadata: (impl: (props: I18n.Props & TProps, locale: I18n.Locale) => Promise<Metadata>) => {
-      return async (props: I18n.Props & TProps): Promise<Metadata> => {
+    generateMetadata: (
+      impl: (
+        props: TProps &
+          Omit<TConfig, "namespaces"> & {
+            locale: I18n.Locale;
+          },
+      ) => Metadata | Promise<Metadata>,
+    ) => {
+      return async (props: I18n.Props<TProps>): Promise<Metadata> => {
         const locale = pageInit(props);
-        const { route } = await configurator(props, locale);
-        const custom = await impl(props, locale)
-        return getMetadata({ ...route, locale }, custom)
+        const { namespaces, ...config } = await configurator(props, locale);
+        const metadata = await impl({ locale, ...config, ...props });
+        return getMetadata({ ...config.route, locale }, metadata);
       };
     },
-    default: (impl: (props: I18n.Props & TProps, locale: I18n.Locale) => React.ReactNode | Promise<React.ReactNode>) => {
-      return async (props: I18n.Props & TProps) => {
+    default: (
+      impl: (
+        props: TProps &
+          Omit<TConfig, "namespaces"> & {
+            locale: I18n.Locale;
+          },
+      ) => React.ReactNode | Promise<React.ReactNode>,
+    ) => {
+      return async (props: I18n.Props<TProps>) => {
         const locale = pageInit(props);
-        const { route, ...options } = await configurator(props, locale);
-        const render = await impl(props, locale);
-        return (<I18nPage route={route} {...options}>{render}</I18nPage>);
-      }
-    }
-  }
+        const { namespaces, ...config } = await configurator(props, locale);
+        const render = await impl({ locale, ...config, ...props });
+        return (
+          <I18nPage
+            locale={locale}
+            namespaces={namespaces}
+            route={config.route}
+          >
+            {render}
+          </I18nPage>
+        );
+      };
+    },
+  };
 };
 
 export default I18nPage;

package/adapter-next/redirects.cjs.js

@@ -1,11 +1,11 @@
 'use strict';
 
 var utils = require('@koine/utils');
-var formatRoutePathname = require('../client/formatRoutePathname.cjs.js');
+var formatRoutePathname = require('../formatRoutePathname.cjs.js');
 var transformPathname = require('./transformPathname.cjs.js');
 
 function a(e) {
-    let { localeSource: t, localeDestination: o, template: a, pathname: l, permanent: n } = e, i = formatRoutePathname.formatRoutePathname((t ? `${t}/` : "") + a), c = formatRoutePathname.formatRoutePathname((o ? `${o}/` : "") + l);
+    let { localeSource: t, localeDestination: r, template: a, pathname: l, permanent: n } = e, i = formatRoutePathname.formatRoutePathname((t ? `${t}/` : "") + a), c = formatRoutePathname.formatRoutePathname((r ? `${r}/` : "") + l);
     // console.log(`redirect template "${source}" to pathname "${destination}"`);
     if (i !== c) return {
         source: i,
@@ -13,10 +13,10 @@ function a(e) {
         permanent: !!n
     };
 }
-function generateRedirectForPathname(e, t, r, o, l) {
+function generateRedirectForPathname(e, t, o, r, l) {
     let { defaultLocale: n, hideDefaultLocaleInUrl: i, localeParamName: c, permanentRedirects: s } = e, p = t === n, u = p && !i, m = {
-        template: r,
-        pathname: o,
+        template: o,
+        pathname: r,
         permanent: s
     };
     c ? // app router:
@@ -31,7 +31,7 @@ function generateRedirectForPathname(e, t, r, o, l) {
         localeSource: t,
         localeDestination: t
     })) : // pages router:
-    o !== r && (u ? l.push(a({
+    r !== o && (u ? l.push(a({
         ...m,
         localeDestination: t
     })) : p ? l.push(a(m)) : l.push(a({
@@ -46,16 +46,16 @@ function generateRedirectForPathname(e, t, r, o, l) {
  * @see
  * - https://nextjs.org/docs/pages/api-reference/next-config-js/redirects
  * - https://vercel.com/docs/projects/project-configuration#redirects
- */ let generateRedirects = (r, { localeParamName: a, permanentRedirects: l, tokens: n }, i)=>{
+ */ let generateRedirects = (o, { localeParamName: a, permanentRedirects: l, tokens: n }, i)=>{
     let c = {
-        ...r,
+        ...o,
         localeParamName: a,
         permanentRedirects: l
     }, s = RegExp(utils.escapeRegExp(n.idDelimiter), "g"), p = [];
     for(let e in i){
-        let t = i[e], r = i[e].pathnames;
-        for(let a in r){
-            let l = r[a], // prettier-ignore
+        let t = i[e], o = i[e].pathnames;
+        for(let a in o){
+            let l = o[a], // prettier-ignore
             n = transformPathname.transformPathname(e.replace(s, "/"), t.wildcard), i = transformPathname.transformPathname(l, t.wildcard);
             // we do not redirect urls children of wildcard urls
             if (t.inWildcard) break;

package/adapter-next/redirects.esm.js

@@ -1,9 +1,9 @@
 import { escapeRegExp, arrayUniqueByProperties } from '@koine/utils';
-import { formatRoutePathname } from '../client/formatRoutePathname.esm.js';
+import { formatRoutePathname } from '../formatRoutePathname.esm.js';
 import { transformPathname } from './transformPathname.esm.js';
 
 function a(e) {
-    let { localeSource: t, localeDestination: o, template: a, pathname: l, permanent: n } = e, i = formatRoutePathname((t ? `${t}/` : "") + a), c = formatRoutePathname((o ? `${o}/` : "") + l);
+    let { localeSource: t, localeDestination: r, template: a, pathname: l, permanent: n } = e, i = formatRoutePathname((t ? `${t}/` : "") + a), c = formatRoutePathname((r ? `${r}/` : "") + l);
     // console.log(`redirect template "${source}" to pathname "${destination}"`);
     if (i !== c) return {
         source: i,
@@ -11,10 +11,10 @@ function a(e) {
         permanent: !!n
     };
 }
-function generateRedirectForPathname(e, t, r, o, l) {
+function generateRedirectForPathname(e, t, o, r, l) {
     let { defaultLocale: n, hideDefaultLocaleInUrl: i, localeParamName: c, permanentRedirects: s } = e, p = t === n, u = p && !i, m = {
-        template: r,
-        pathname: o,
+        template: o,
+        pathname: r,
         permanent: s
     };
     c ? // app router:
@@ -29,7 +29,7 @@ function generateRedirectForPathname(e, t, r, o, l) {
         localeSource: t,
         localeDestination: t
     })) : // pages router:
-    o !== r && (u ? l.push(a({
+    r !== o && (u ? l.push(a({
         ...m,
         localeDestination: t
     })) : p ? l.push(a(m)) : l.push(a({
@@ -44,16 +44,16 @@ function generateRedirectForPathname(e, t, r, o, l) {
  * @see
  * - https://nextjs.org/docs/pages/api-reference/next-config-js/redirects
  * - https://vercel.com/docs/projects/project-configuration#redirects
- */ let generateRedirects = (r, { localeParamName: a, permanentRedirects: l, tokens: n }, i)=>{
+ */ let generateRedirects = (o, { localeParamName: a, permanentRedirects: l, tokens: n }, i)=>{
     let c = {
-        ...r,
+        ...o,
         localeParamName: a,
         permanentRedirects: l
     }, s = RegExp(escapeRegExp(n.idDelimiter), "g"), p = [];
     for(let e in i){
-        let t = i[e], r = i[e].pathnames;
-        for(let a in r){
-            let l = r[a], // prettier-ignore
+        let t = i[e], o = i[e].pathnames;
+        for(let a in o){
+            let l = o[a], // prettier-ignore
             n = transformPathname(e.replace(s, "/"), t.wildcard), i = transformPathname(l, t.wildcard);
             // we do not redirect urls children of wildcard urls
             if (t.inWildcard) break;

package/adapter-next/rewrites.cjs.js

@@ -1,37 +1,37 @@
 'use strict';
 
 var utils = require('@koine/utils');
-var formatRoutePathname = require('../client/formatRoutePathname.cjs.js');
+var formatRoutePathname = require('../formatRoutePathname.cjs.js');
 var transformPathname = require('./transformPathname.cjs.js');
 
 function o(e) {
     let { localeSource: t, localeDestination: a, template: o, pathname: l, passLocale: i } = e, n = "";
     t && (n = `/${t}`);
-    let c = formatRoutePathname.formatRoutePathname(n + l), s = "";
-    a && (s = `/${a}`);
-    let p = formatRoutePathname.formatRoutePathname(s + o);
+    let s = formatRoutePathname.formatRoutePathname(n + l), c = "";
+    a && (c = `/${a}`);
+    let m = formatRoutePathname.formatRoutePathname(c + o);
     // console.log(`rewrite pathname "${source}" to template "${destination}"`);
-    if (c === p) return;
-    let m = {
-        source: c,
-        destination: p
+    if (s === m) return;
+    let p = {
+        source: s,
+        destination: m
     };
-    return !1 === i && (m.locale = !1), m;
+    return !1 === i && (p.locale = !1), p;
 }
 const generateRewriteForPathname = (e, t, r, a, l)=>{
-    let { defaultLocale: i, hideDefaultLocaleInUrl: n, localeParamName: c } = e, s = t === i && n, // TODO: maybe support other locales to be hidden in the URL other than the default?
-    p = {
+    let { defaultLocale: i, hideDefaultLocaleInUrl: n, localeParamName: s } = e, c = t === i && n, // TODO: maybe support other locales to be hidden in the URL other than the default?
+    m = {
         template: r,
         pathname: a
     };
-    c ? // app router:
-    s ? l.push(o({
-        ...p,
+    s ? // app router:
+    c ? l.push(o({
+        ...m,
         localeDestination: t,
         passLocale: !1
     })) : l.push(// prettier-ignore
     o({
-        ...p,
+        ...m,
         localeSource: t,
         localeDestination: t,
         passLocale: !1
@@ -39,13 +39,13 @@ const generateRewriteForPathname = (e, t, r, a, l)=>{
     // this condition only applies to the pages router as with the app one
     // even if the template matches the pathname we always need to rewrite
     // as the localeParam is always needed in the rewrite destination
-    a !== r && (s ? l.push(o(p)) : l.push(// `passLocale` must be `false` or the locale prefixed rewrite won't
+    a !== r && (c ? l.push(o(m)) : l.push(// `passLocale` must be `false` or the locale prefixed rewrite won't
     // be applied and does not forward the locale to the route context
     // when the locale is included in the URL. In fact we explicitly
     // add the locale to the rewrite rule in order to get the least
     // amount of existing URLs which is a good SEO practice
     o({
-        ...p,
+        ...m,
         localeSource: t,
         passLocale: !1
     })));
@@ -57,27 +57,27 @@ const generateRewriteForPathname = (e, t, r, a, l)=>{
  * - https://nextjs.org/docs/pages/api-reference/next-config-js/rewrites
  * - https://vercel.com/docs/projects/project-configuration#rewrites
  */ let generateRewrites = (r, { tokens: o, localeParamName: l, permanentRedirects: i }, n)=>{
-    let c = {
+    let s = {
         ...r,
         localeParamName: l,
         permanentRedirects: i
-    }, s = RegExp(utils.escapeRegExp(o.idDelimiter), "g"), p = [];
+    }, c = RegExp(utils.escapeRegExp(o.idDelimiter), "g"), m = [];
     for(let e in n){
         let t = n[e], r = n[e].pathnames;
         for(let o in r){
-            let l = r[o], i = e.replace(s, "/");
+            let l = r[o], i = e.replace(c, "/");
             // we do not rewrite urls children of wildcard urls
             if (t.inWildcard) break;
             // we need to rewrite both the root path...
-            generateRewriteForPathname(c, o, transformPathname.transformPathname(i), transformPathname.transformPathname(l), p), t.wildcard && // and for wildcard routes the ones with the `/:segment*` portion
-            generateRewriteForPathname(c, o, transformPathname.transformPathname(i, t.wildcard), transformPathname.transformPathname(l, t.wildcard), p);
+            generateRewriteForPathname(s, o, transformPathname.transformPathname(i), transformPathname.transformPathname(l), m), t.wildcard && // and for wildcard routes the ones with the `/:segment*` portion
+            generateRewriteForPathname(s, o, transformPathname.transformPathname(i, t.wildcard), transformPathname.transformPathname(l, t.wildcard), m);
         }
     }
     // simple sort by destination:
     // return a.destination.localeCompare(b.destination);
     // sort by locale
     // return a.
-    return utils.arrayUniqueByProperties(p.filter(Boolean), [
+    return utils.arrayUniqueByProperties(m.filter(Boolean), [
         "source",
         "destination"
     ]).sort((e, t)=>// simple sort by source:

package/adapter-next/rewrites.esm.js

@@ -1,35 +1,35 @@
 import { escapeRegExp, arrayUniqueByProperties } from '@koine/utils';
-import { formatRoutePathname } from '../client/formatRoutePathname.esm.js';
+import { formatRoutePathname } from '../formatRoutePathname.esm.js';
 import { transformPathname } from './transformPathname.esm.js';
 
 function o(e) {
     let { localeSource: t, localeDestination: a, template: o, pathname: l, passLocale: i } = e, n = "";
     t && (n = `/${t}`);
-    let c = formatRoutePathname(n + l), s = "";
-    a && (s = `/${a}`);
-    let p = formatRoutePathname(s + o);
+    let s = formatRoutePathname(n + l), c = "";
+    a && (c = `/${a}`);
+    let m = formatRoutePathname(c + o);
     // console.log(`rewrite pathname "${source}" to template "${destination}"`);
-    if (c === p) return;
-    let m = {
-        source: c,
-        destination: p
+    if (s === m) return;
+    let p = {
+        source: s,
+        destination: m
     };
-    return !1 === i && (m.locale = !1), m;
+    return !1 === i && (p.locale = !1), p;
 }
 const generateRewriteForPathname = (e, t, r, a, l)=>{
-    let { defaultLocale: i, hideDefaultLocaleInUrl: n, localeParamName: c } = e, s = t === i && n, // TODO: maybe support other locales to be hidden in the URL other than the default?
-    p = {
+    let { defaultLocale: i, hideDefaultLocaleInUrl: n, localeParamName: s } = e, c = t === i && n, // TODO: maybe support other locales to be hidden in the URL other than the default?
+    m = {
         template: r,
         pathname: a
     };
-    c ? // app router:
-    s ? l.push(o({
-        ...p,
+    s ? // app router:
+    c ? l.push(o({
+        ...m,
         localeDestination: t,
         passLocale: !1
     })) : l.push(// prettier-ignore
     o({
-        ...p,
+        ...m,
         localeSource: t,
         localeDestination: t,
         passLocale: !1
@@ -37,13 +37,13 @@ const generateRewriteForPathname = (e, t, r, a, l)=>{
     // this condition only applies to the pages router as with the app one
     // even if the template matches the pathname we always need to rewrite
     // as the localeParam is always needed in the rewrite destination
-    a !== r && (s ? l.push(o(p)) : l.push(// `passLocale` must be `false` or the locale prefixed rewrite won't
+    a !== r && (c ? l.push(o(m)) : l.push(// `passLocale` must be `false` or the locale prefixed rewrite won't
     // be applied and does not forward the locale to the route context
     // when the locale is included in the URL. In fact we explicitly
     // add the locale to the rewrite rule in order to get the least
     // amount of existing URLs which is a good SEO practice
     o({
-        ...p,
+        ...m,
         localeSource: t,
         passLocale: !1
     })));
@@ -55,27 +55,27 @@ const generateRewriteForPathname = (e, t, r, a, l)=>{
  * - https://nextjs.org/docs/pages/api-reference/next-config-js/rewrites
  * - https://vercel.com/docs/projects/project-configuration#rewrites
  */ let generateRewrites = (r, { tokens: o, localeParamName: l, permanentRedirects: i }, n)=>{
-    let c = {
+    let s = {
         ...r,
         localeParamName: l,
         permanentRedirects: i
-    }, s = RegExp(escapeRegExp(o.idDelimiter), "g"), p = [];
+    }, c = RegExp(escapeRegExp(o.idDelimiter), "g"), m = [];
     for(let e in n){
         let t = n[e], r = n[e].pathnames;
         for(let o in r){
-            let l = r[o], i = e.replace(s, "/");
+            let l = r[o], i = e.replace(c, "/");
             // we do not rewrite urls children of wildcard urls
             if (t.inWildcard) break;
             // we need to rewrite both the root path...
-            generateRewriteForPathname(c, o, transformPathname(i), transformPathname(l), p), t.wildcard && // and for wildcard routes the ones with the `/:segment*` portion
-            generateRewriteForPathname(c, o, transformPathname(i, t.wildcard), transformPathname(l, t.wildcard), p);
+            generateRewriteForPathname(s, o, transformPathname(i), transformPathname(l), m), t.wildcard && // and for wildcard routes the ones with the `/:segment*` portion
+            generateRewriteForPathname(s, o, transformPathname(i, t.wildcard), transformPathname(l, t.wildcard), m);
         }
     }
     // simple sort by destination:
     // return a.destination.localeCompare(b.destination);
     // sort by locale
     // return a.
-    return arrayUniqueByProperties(p.filter(Boolean), [
+    return arrayUniqueByProperties(m.filter(Boolean), [
         "source",
         "destination"
     ]).sort((e, t)=>// simple sort by source:

package/compiler/code/data-routes.cjs.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var utils = require('@koine/utils');
-var formatRoutePathname = require('../../client/formatRoutePathname.cjs.js');
+var formatRoutePathname = require('../../formatRoutePathname.cjs.js');
 
 const codeDataRoutesOptions = {
     /**

package/compiler/code/data-routes.esm.js

@@ -1,5 +1,5 @@
 import { escapeRegExp, objectSortByKeysMatching, objectFlat, objectSort } from '@koine/utils';
-import { formatRoutePathname } from '../../client/formatRoutePathname.esm.js';
+import { formatRoutePathname } from '../../formatRoutePathname.esm.js';
 
 const codeDataRoutesOptions = {
     /**

package/formatRoutePathname.cjs.d.ts

@@ -0,0 +1,2 @@
+export * from "./formatRoutePathname";
+export { default } from "./formatRoutePathname";

package/formatRoutePathname.cjs.default.js

@@ -0,0 +1 @@
+exports._default = require('./formatRoutePathname.cjs.js').default;

package/formatRoutePathname.cjs.mjs

@@ -0,0 +1,2 @@
+export * from './formatRoutePathname.cjs.js';
+export { _default as default } from './formatRoutePathname.cjs.default.js';

package/formatRoutePathname.esm.d.ts

@@ -0,0 +1,2 @@
+export * from "./formatRoutePathname";
+export { default } from "./formatRoutePathname";

package/index.cjs.js

@@ -1,11 +1,13 @@
 'use strict';
 
-var formatRoutePathname = require('./client/formatRoutePathname.cjs.js');
-var interpolateTo = require('./client/interpolateTo.cjs.js');
-var routeHasDynamicPortion = require('./client/routeHasDynamicPortion.cjs.js');
+var formatRoutePathname = require('./formatRoutePathname.cjs.js');
+var interpolateTo = require('./interpolateTo.cjs.js');
+var rtlLocales = require('./rtlLocales.cjs.js');
+var routeHasDynamicPortion = require('./routeHasDynamicPortion.cjs.js');
 
 
 
 exports.formatRoutePathname = formatRoutePathname.formatRoutePathname;
 exports.interpolateTo = interpolateTo.interpolateTo;
+exports.rtlLocales = rtlLocales.rtlLocales;
 exports.routeHasDynamicPortion = routeHasDynamicPortion.routeHasDynamicPortion;

package/index.d.ts

@@ -1,2 +1,5 @@
-export * from "./client";
+export { formatRoutePathname } from "./formatRoutePathname";
+export { interpolateTo } from "./interpolateTo";
+export { rtlLocales } from "./rtlLocales";
+export { routeHasDynamicPortion } from "./routeHasDynamicPortion";
 export * from "./types";

package/index.esm.js

@@ -1,3 +1,4 @@
-export { formatRoutePathname } from './client/formatRoutePathname.esm.js';
-export { interpolateTo } from './client/interpolateTo.esm.js';
-export { routeHasDynamicPortion } from './client/routeHasDynamicPortion.esm.js';
+export { formatRoutePathname } from './formatRoutePathname.esm.js';
+export { interpolateTo } from './interpolateTo.esm.js';
+export { rtlLocales } from './rtlLocales.esm.js';
+export { routeHasDynamicPortion } from './routeHasDynamicPortion.esm.js';

package/interpolateTo.cjs.d.ts

@@ -0,0 +1,2 @@
+export * from "./interpolateTo";
+export { default } from "./interpolateTo";

package/interpolateTo.cjs.default.js

@@ -0,0 +1 @@
+exports._default = require('./interpolateTo.cjs.js').default;

package/interpolateTo.cjs.mjs

@@ -0,0 +1,2 @@
+export * from './interpolateTo.cjs.js';
+export { _default as default } from './interpolateTo.cjs.default.js';

package/{client/interpolateTo.d.ts → interpolateTo.d.ts}

@@ -1,4 +1,4 @@
-import type { I18nUtils } from "../types";
+import type { I18nUtils } from "./types";
 export declare function interpolateTo<TRouteId extends string>(value: TRouteId): string;
 export declare function interpolateTo<TRouteId extends string>(value: TRouteId, params: I18nUtils.DynamicParams<TRouteId>): string;
 export default interpolateTo;

package/interpolateTo.esm.d.ts

@@ -0,0 +1,2 @@
+export * from "./interpolateTo";
+export { default } from "./interpolateTo";

package/package.json

@@ -2,8 +2,8 @@
   "name": "@koine/i18n",
   "sideEffects": false,
   "dependencies": {
-    "@koine/node": "2.0.0-beta.128",
-    "@koine/utils": "2.0.0-beta.128",
+    "@koine/node": "2.0.0-beta.129",
+    "@koine/utils": "2.0.0-beta.129",
     "glob": "^10.3.10",
     "minimatch": "^9.0.3",
     "negotiator": "^0.6.3",
@@ -37,6 +37,30 @@
       "import": "./index.cjs.mjs",
       "default": "./index.cjs.js"
     },
+    "./formatRoutePathname": {
+      "module": "./formatRoutePathname.esm.js",
+      "types": "./formatRoutePathname.esm.d.ts",
+      "import": "./formatRoutePathname.cjs.mjs",
+      "default": "./formatRoutePathname.cjs.js"
+    },
+    "./interpolateTo": {
+      "module": "./interpolateTo.esm.js",
+      "types": "./interpolateTo.esm.d.ts",
+      "import": "./interpolateTo.cjs.mjs",
+      "default": "./interpolateTo.cjs.js"
+    },
+    "./routeHasDynamicPortion": {
+      "module": "./routeHasDynamicPortion.esm.js",
+      "types": "./routeHasDynamicPortion.esm.d.ts",
+      "import": "./routeHasDynamicPortion.cjs.mjs",
+      "default": "./routeHasDynamicPortion.cjs.js"
+    },
+    "./rtlLocales": {
+      "module": "./rtlLocales.esm.js",
+      "types": "./rtlLocales.esm.d.ts",
+      "import": "./rtlLocales.cjs.mjs",
+      "default": "./rtlLocales.cjs.js"
+    },
     "./compiler": {
       "module": "./compiler.esm.js",
       "types": "./compiler.esm.d.ts",
@@ -65,5 +89,5 @@
   "module": "./index.esm.js",
   "main": "./index.cjs.js",
   "types": "./index.esm.d.ts",
-  "version": "2.0.0-beta.128"
+  "version": "2.0.0-beta.129"
 }

package/routeHasDynamicPortion.cjs.d.ts

@@ -0,0 +1,2 @@
+export * from "./routeHasDynamicPortion";
+export { default } from "./routeHasDynamicPortion";

package/routeHasDynamicPortion.cjs.default.js

@@ -0,0 +1 @@
+exports._default = require('./routeHasDynamicPortion.cjs.js').default;

package/routeHasDynamicPortion.cjs.mjs

@@ -0,0 +1,2 @@
+export * from './routeHasDynamicPortion.cjs.js';
+export { _default as default } from './routeHasDynamicPortion.cjs.default.js';

package/routeHasDynamicPortion.esm.d.ts

@@ -0,0 +1,2 @@
+export * from "./routeHasDynamicPortion";
+export { default } from "./routeHasDynamicPortion";

package/rtlLocales.cjs.d.ts

@@ -0,0 +1,2 @@
+export * from "./rtlLocales";
+export { default } from "./rtlLocales";

package/rtlLocales.cjs.default.js

@@ -0,0 +1 @@
+exports._default = require('./rtlLocales.cjs.js').default;

package/rtlLocales.cjs.js

@@ -0,0 +1,55 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/**
+ * List of Right-to-left language codes
+ *
+ * @borrows [shadiabuhilal/rtl-detect](https://github.com/shadiabuhilal/rtl-detect)
+ * @see https://en.wikipedia.org/wiki/Right-to-left_script
+ * @see https://en.wikipedia.org/wiki/Script_(Unicode)
+ * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Locale/getTextInfo
+ */ let rtlLocales = [
+    "ae",
+    // Avestan
+    "ar",
+    // 'العربية', Arabic
+    "arc",
+    // Aramaic
+    "bcc",
+    // 'بلوچی مکرانی', Southern Balochi
+    "bqi",
+    // 'بختياري', Bakthiari
+    "ckb",
+    // 'Soranî / کوردی', Sorani
+    "dv",
+    // Dhivehi
+    "fa",
+    // 'فارسی', Persian
+    "glk",
+    // 'گیلکی', Gilaki
+    "he",
+    // 'עברית', Hebrew
+    "ku",
+    // 'Kurdî / كوردی', Kurdish
+    "mzn",
+    // 'مازِرونی', Mazanderani
+    "nqo",
+    // N'Ko
+    "pnb",
+    // 'پنجابی', Western Punjabi
+    "prs",
+    // 'دری', Darī
+    "ps",
+    // 'پښتو', Pashto,
+    "sd",
+    // 'سنڌي', Sindhi
+    "ug",
+    // 'Uyghurche / ئۇيغۇرچە', Uyghur
+    "ur",
+    // 'اردو', Urdu
+    "yi"
+];
+
+exports.default = rtlLocales;
+exports.rtlLocales = rtlLocales;

package/rtlLocales.cjs.mjs

@@ -0,0 +1,2 @@
+export * from './rtlLocales.cjs.js';
+export { _default as default } from './rtlLocales.cjs.default.js';

package/rtlLocales.d.ts

@@ -0,0 +1,2 @@
+export declare let rtlLocales: string[];
+export default rtlLocales;

package/rtlLocales.esm.d.ts

@@ -0,0 +1,2 @@
+export * from "./rtlLocales";
+export { default } from "./rtlLocales";

package/rtlLocales.esm.js

@@ -0,0 +1,50 @@
+/**
+ * List of Right-to-left language codes
+ *
+ * @borrows [shadiabuhilal/rtl-detect](https://github.com/shadiabuhilal/rtl-detect)
+ * @see https://en.wikipedia.org/wiki/Right-to-left_script
+ * @see https://en.wikipedia.org/wiki/Script_(Unicode)
+ * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Locale/getTextInfo
+ */ let rtlLocales = [
+    "ae",
+    // Avestan
+    "ar",
+    // 'العربية', Arabic
+    "arc",
+    // Aramaic
+    "bcc",
+    // 'بلوچی مکرانی', Southern Balochi
+    "bqi",
+    // 'بختياري', Bakthiari
+    "ckb",
+    // 'Soranî / کوردی', Sorani
+    "dv",
+    // Dhivehi
+    "fa",
+    // 'فارسی', Persian
+    "glk",
+    // 'گیلکی', Gilaki
+    "he",
+    // 'עברית', Hebrew
+    "ku",
+    // 'Kurdî / كوردی', Kurdish
+    "mzn",
+    // 'مازِرونی', Mazanderani
+    "nqo",
+    // N'Ko
+    "pnb",
+    // 'پنجابی', Western Punjabi
+    "prs",
+    // 'دری', Darī
+    "ps",
+    // 'پښتو', Pashto,
+    "sd",
+    // 'سنڌي', Sindhi
+    "ug",
+    // 'Uyghurche / ئۇيغۇرچە', Uyghur
+    "ur",
+    // 'اردو', Urdu
+    "yi"
+];
+
+export { rtlLocales as default, rtlLocales };

package/adapter-next/generators/__________I18nLayoutLang.d.ts

@@ -1,10 +0,0 @@
-declare const _default: (data: import("../../compiler-sync").I18nCompiler.DataCode<"next">) => {
-    I18nLayoutLang: {
-        dir: string;
-        name: string;
-        ext: "tsx";
-        index: true;
-        content: () => string;
-    };
-};
-export default _default;

package/client/index.d.ts

@@ -1,3 +0,0 @@
-export { formatRoutePathname } from "./formatRoutePathname";
-export { interpolateTo } from "./interpolateTo";
-export { routeHasDynamicPortion } from "./routeHasDynamicPortion";