@koine/i18n 2.0.0-beta.134 → 2.0.0-beta.135

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

@@ -1,30 +1,49 @@
 'use strict';
 
-var createAdapter = require('../../compiler/createAdapter.cjs.js');
+Object.defineProperty(exports, '__esModule', { value: true });
 
-var a = createAdapter.createGenerator("js", (e)=>{
-    let { config: a } = e;
-    return {
-        formatTo: {
-            name: "formatTo",
-            ext: "ts",
-            index: !1,
-            content: ()=>`
-import { defaultLocale } from "./defaultLocale";
+var createAdapter = require('../../compiler/createAdapter.cjs.js');
+var functions = require('../../compiler/functions.cjs.js');
+var imports = require('../../compiler/imports.cjs.js');
 
-/**
- * @internal
- */
-export function formatTo(
-  locale: string | undefined,
-  pathname: string,
-  params?: object,
-) {
+const formatTo = ({ hideDefaultLocaleInUrl: e })=>new functions.FunctionsCompiler({
+        imports: [
+            new imports.ImportsCompiler({
+                path: "defaultLocale",
+                named: [
+                    {
+                        name: "defaultLocale"
+                    }
+                ]
+            })
+        ],
+        comment: {
+            internal: !0
+        },
+        name: "tInterpolateParams",
+        args: [
+            {
+                name: "locale",
+                type: "string | undefined",
+                optional: !1
+            },
+            {
+                name: "pathname",
+                type: "string",
+                optional: !1
+            },
+            {
+                name: "params",
+                type: "object",
+                optional: !0
+            }
+        ],
+        body: ({ format: a })=>`{
   locale = locale || defaultLocale;
   if (process.env["NODE_ENV"] === "development") {
     if (params) {
       pathname.replace(/\\[(.*?)\\]/g, (_, dynamicKey) => {
-        const key = dynamicKey as Extract<keyof typeof params, string>;
+        const key = dynamicKey${"ts" === a ? " as Extract<keyof typeof params, string>" : ""};
 
         if (!(key in params)) {
           console.warn(
@@ -57,19 +76,35 @@ export function formatTo(
     pathname = pathname.replace(
         /\\[(.*?)\\]/g,
         (_, key) =>
-          params[key as keyof typeof params] + "",
+          params[key${"ts" === a ? " as keyof typeof params" : ""}] + "",
       )
   }
-  ${a.hideDefaultLocaleInUrl ? `
+  ${e ? `
   if (locale !== defaultLocale) {
     return "/" + locale + (pathname === "/" ? "" : pathname);
   }
   ` : ""}
   return pathname;
-}
+}`
+    });
+var a = createAdapter.createGenerator("js", (e)=>{
+    let { config: a } = e;
+    return {
+        formatTo: {
+            name: "formatTo",
+            ext: "ts",
+            index: !1,
+            content: ()=>`
+${formatTo(a).$out("ts", {
+                    imports: {
+                        folderUp: 0
+                    },
+                    exports: "named"
+                })}
 `
         }
     };
 });
 
-module.exports = a;
+exports.default = a;
+exports.formatTo = formatTo;

package/adapter-js/generators/formatTo.d.ts

@@ -1,4 +1,7 @@
-declare const _default: (data: import("../../compiler-sync").I18nCompiler.DataCode<"js">) => {
+import { FunctionsCompiler } from "../../compiler/functions";
+import type { I18nCompiler } from "../../compiler/types";
+export declare const formatTo: ({ hideDefaultLocaleInUrl, }: Pick<I18nCompiler.Config, "hideDefaultLocaleInUrl">) => FunctionsCompiler;
+declare const _default: (data: I18nCompiler.DataCode<"js">) => {
     formatTo: {
         name: string;
         ext: "ts";

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

@@ -1,28 +1,45 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
+import { FunctionsCompiler } from '../../compiler/functions.esm.js';
+import { ImportsCompiler } from '../../compiler/imports.esm.js';
 
-var a = createGenerator("js", (e)=>{
-    let { config: a } = e;
-    return {
-        formatTo: {
-            name: "formatTo",
-            ext: "ts",
-            index: !1,
-            content: ()=>`
-import { defaultLocale } from "./defaultLocale";
-
-/**
- * @internal
- */
-export function formatTo(
-  locale: string | undefined,
-  pathname: string,
-  params?: object,
-) {
+const formatTo = ({ hideDefaultLocaleInUrl: e })=>new FunctionsCompiler({
+        imports: [
+            new ImportsCompiler({
+                path: "defaultLocale",
+                named: [
+                    {
+                        name: "defaultLocale"
+                    }
+                ]
+            })
+        ],
+        comment: {
+            internal: !0
+        },
+        name: "tInterpolateParams",
+        args: [
+            {
+                name: "locale",
+                type: "string | undefined",
+                optional: !1
+            },
+            {
+                name: "pathname",
+                type: "string",
+                optional: !1
+            },
+            {
+                name: "params",
+                type: "object",
+                optional: !0
+            }
+        ],
+        body: ({ format: a })=>`{
   locale = locale || defaultLocale;
   if (process.env["NODE_ENV"] === "development") {
     if (params) {
       pathname.replace(/\\[(.*?)\\]/g, (_, dynamicKey) => {
-        const key = dynamicKey as Extract<keyof typeof params, string>;
+        const key = dynamicKey${"ts" === a ? " as Extract<keyof typeof params, string>" : ""};
 
         if (!(key in params)) {
           console.warn(
@@ -55,19 +72,34 @@ export function formatTo(
     pathname = pathname.replace(
         /\\[(.*?)\\]/g,
         (_, key) =>
-          params[key as keyof typeof params] + "",
+          params[key${"ts" === a ? " as keyof typeof params" : ""}] + "",
       )
   }
-  ${a.hideDefaultLocaleInUrl ? `
+  ${e ? `
   if (locale !== defaultLocale) {
     return "/" + locale + (pathname === "/" ? "" : pathname);
   }
   ` : ""}
   return pathname;
-}
+}`
+    });
+var a = createGenerator("js", (e)=>{
+    let { config: a } = e;
+    return {
+        formatTo: {
+            name: "formatTo",
+            ext: "ts",
+            index: !1,
+            content: ()=>`
+${formatTo(a).$out("ts", {
+                    imports: {
+                        folderUp: 0
+                    },
+                    exports: "named"
+                })}
 `
         }
     };
 });
 
-export { a as default };
+export { a as default, formatTo };

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

@@ -31,10 +31,10 @@ let n = (t, o)=>{
         ]
     })
 }, s = (e, r)=>{
-    let { defaultLocale: s, locales: i, modularized: d, fnsPrefix: m } = r, u = [], p = 1 === i.length, c = new Set(), f = m || d ? "$to_" : "";
-    for(let r in c.add(l.formatTo), c.add(l.types), e.byId){
-        let i = "", { pathnames: d, params: m } = e.byId[r], c = `${f}${utils.changeCaseSnake(r)}`, I = `I18n.RouteParams["${r}"]`, g = [];
-        m && g.push({
+    let { defaultLocale: s, locales: i, fnPrefix: d } = r, m = [], u = 1 === i.length, p = new Set();
+    for(let r in p.add(l.formatTo), p.add(l.types), e.byId){
+        let i = "", { pathnames: p, params: c } = e.byId[r], f = `${d}${utils.changeCaseSnake(r)}`, I = `I18n.RouteParams["${r}"]`, g = [];
+        c && g.push({
             name: "params",
             type: I,
             optional: !1
@@ -43,31 +43,29 @@ let n = (t, o)=>{
             type: "I18n.Locale",
             optional: !0
         });
-        let R = p ? '""' : "locale", h = m ? ", params" : "";
-        utils.isString(d) ? i += `formatTo(${R}, "${d}"${h});` : i += `formatTo(${R}, ${n(s, d)}${h});`, u.push(new functions.FunctionsCompiler({
+        let R = u ? '""' : "locale", h = c ? ", params" : "";
+        utils.isString(p) ? i += `formatTo(${R}, "${p}"${h});` : i += `formatTo(${R}, ${n(s, p)}${h});`, m.push(new functions.FunctionsCompiler({
             imports: [
                 l.formatTo,
                 l.types
             ],
-            name: c,
+            name: f,
             args: g,
             body: i
         }));
     }
     return {
-        functions: u,
-        fnPrefix: f,
-        allImports: c
+        functions: m,
+        allImports: p
     };
 }, i = ({ config: t, routes: o, options: { routes: { fnsPrefix: e }, adapter: { modularized: n } } })=>{
-    let { functions: l, fnPrefix: i, allImports: d } = s(o, {
+    let l = e || n ? "$to_" : "", { functions: i, allImports: d } = s(o, {
         defaultLocale: t.defaultLocale,
         locales: t.locales,
-        fnsPrefix: e,
-        modularized: n
+        fnPrefix: l
     });
-    return n ? l.reduce((t, o)=>(t[o.name] = {
-            dir: i.replace(/_*$/, ""),
+    return n ? i.reduce((t, o)=>(t[o.name] = {
+            dir: l.replace(/_*$/, ""),
             name: o.name,
             ext: "ts",
             index: !0,
@@ -84,7 +82,7 @@ let n = (t, o)=>{
             index: !0,
             content: ()=>"" + (imports.ImportsCompiler.outMany("ts", d, {
                     folderUp: 0
-                }) + functions.FunctionsCompiler.outMany("ts", l, {
+                }) + functions.FunctionsCompiler.outMany("ts", i, {
                     imports: !1,
                     exports: "named"
                 }))

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

@@ -29,10 +29,10 @@ let n = (t, o)=>{
         ]
     })
 }, s = (e, r)=>{
-    let { defaultLocale: s, locales: i, modularized: d, fnsPrefix: m } = r, u = [], p = 1 === i.length, c = new Set(), f = m || d ? "$to_" : "";
-    for(let r in c.add(l.formatTo), c.add(l.types), e.byId){
-        let i = "", { pathnames: d, params: m } = e.byId[r], c = `${f}${changeCaseSnake(r)}`, I = `I18n.RouteParams["${r}"]`, g = [];
-        m && g.push({
+    let { defaultLocale: s, locales: i, fnPrefix: d } = r, m = [], u = 1 === i.length, p = new Set();
+    for(let r in p.add(l.formatTo), p.add(l.types), e.byId){
+        let i = "", { pathnames: p, params: c } = e.byId[r], f = `${d}${changeCaseSnake(r)}`, I = `I18n.RouteParams["${r}"]`, g = [];
+        c && g.push({
             name: "params",
             type: I,
             optional: !1
@@ -41,31 +41,29 @@ let n = (t, o)=>{
             type: "I18n.Locale",
             optional: !0
         });
-        let R = p ? '""' : "locale", h = m ? ", params" : "";
-        isString(d) ? i += `formatTo(${R}, "${d}"${h});` : i += `formatTo(${R}, ${n(s, d)}${h});`, u.push(new FunctionsCompiler({
+        let R = u ? '""' : "locale", h = c ? ", params" : "";
+        isString(p) ? i += `formatTo(${R}, "${p}"${h});` : i += `formatTo(${R}, ${n(s, p)}${h});`, m.push(new FunctionsCompiler({
             imports: [
                 l.formatTo,
                 l.types
             ],
-            name: c,
+            name: f,
             args: g,
             body: i
         }));
     }
     return {
-        functions: u,
-        fnPrefix: f,
-        allImports: c
+        functions: m,
+        allImports: p
     };
 }, i = ({ config: t, routes: o, options: { routes: { fnsPrefix: e }, adapter: { modularized: n } } })=>{
-    let { functions: l, fnPrefix: i, allImports: d } = s(o, {
+    let l = e || n ? "$to_" : "", { functions: i, allImports: d } = s(o, {
         defaultLocale: t.defaultLocale,
         locales: t.locales,
-        fnsPrefix: e,
-        modularized: n
+        fnPrefix: l
     });
-    return n ? l.reduce((t, o)=>(t[o.name] = {
-            dir: i.replace(/_*$/, ""),
+    return n ? i.reduce((t, o)=>(t[o.name] = {
+            dir: l.replace(/_*$/, ""),
             name: o.name,
             ext: "ts",
             index: !0,
@@ -82,7 +80,7 @@ let n = (t, o)=>{
             index: !0,
             content: ()=>"" + (ImportsCompiler.outMany("ts", d, {
                     folderUp: 0
-                }) + FunctionsCompiler.outMany("ts", l, {
+                }) + FunctionsCompiler.outMany("ts", i, {
                     imports: !1,
                     exports: "named"
                 }))

package/adapter-js/index.cjs.js

@@ -30,7 +30,7 @@ const adapterJs = createAdapter.createAdapter({
             config,
             createT,
             defaultI18nMetadata,
-            formatTo,
+            formatTo.default,
             formatUrl,
             getI18nDictionaries,
             getI18nMetadata,

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

@@ -3,10 +3,11 @@
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 var redirects = require('../redirects.cjs.js');
 
-var t = createAdapter.createGenerator("next", (e)=>{
-    let { config: r, options: o, routes: i } = e, d = JSON.stringify(redirects.generateRedirects(r, o.routes, i.byId), null, 2);
+var t = createAdapter.createGenerator("next", (r)=>{
+    let { config: i, options: o, routes: d } = r, n = JSON.stringify(redirects.generateRedirects(i, o.routes, d.byId), null, 2);
     return {
         nextRedirects: {
+            dir: createAdapter.createGenerator.dirs.internal,
             name: "next-redirects",
             ext: "js",
             index: !1,
@@ -14,7 +15,7 @@ var t = createAdapter.createGenerator("next", (e)=>{
 /**
  * @type {import("next/dist/lib/load-custom-routes").Redirect[]}
  */
-module.exports = ${d}
+module.exports = ${n}
 `
         }
     };

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

@@ -1,5 +1,6 @@
 declare const _default: (data: import("../../compiler-sync").I18nCompiler.DataCode<"next">) => {
     nextRedirects: {
+        dir: string;
         name: string;
         ext: "js";
         index: false;

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

@@ -1,10 +1,11 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 import { generateRedirects } from '../redirects.esm.js';
 
-var t = createGenerator("next", (e)=>{
-    let { config: r, options: o, routes: i } = e, d = JSON.stringify(generateRedirects(r, o.routes, i.byId), null, 2);
+var t = createGenerator("next", (r)=>{
+    let { config: i, options: o, routes: d } = r, n = JSON.stringify(generateRedirects(i, o.routes, d.byId), null, 2);
     return {
         nextRedirects: {
+            dir: createGenerator.dirs.internal,
             name: "next-redirects",
             ext: "js",
             index: !1,
@@ -12,7 +13,7 @@ var t = createGenerator("next", (e)=>{
 /**
  * @type {import("next/dist/lib/load-custom-routes").Redirect[]}
  */
-module.exports = ${d}
+module.exports = ${n}
 `
         }
     };

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

@@ -3,10 +3,11 @@
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 var rewrites = require('../rewrites.cjs.js');
 
-var o = createAdapter.createGenerator("next", (e)=>{
-    let { config: r, routes: o, options: i } = e, n = JSON.stringify(rewrites.generateRewrites(r, i.routes, o.byId), null, 2);
+var o = createAdapter.createGenerator("next", (r)=>{
+    let { config: i, routes: o, options: n } = r, s = JSON.stringify(rewrites.generateRewrites(i, n.routes, o.byId), null, 2);
     return {
         nextRewrites: {
+            dir: createAdapter.createGenerator.dirs.internal,
             name: "next-rewrites",
             ext: "js",
             index: !1,
@@ -14,7 +15,7 @@ var o = createAdapter.createGenerator("next", (e)=>{
 /**
  * @type {import("next/dist/lib/load-custom-routes").Rewrite[]}
  */
-module.exports = ${n}
+module.exports = ${s}
 `
         }
     };

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

@@ -1,5 +1,6 @@
 declare const _default: (data: import("../../compiler-sync").I18nCompiler.DataCode<"next">) => {
     nextRewrites: {
+        dir: string;
         name: string;
         ext: "js";
         index: false;

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

@@ -1,10 +1,11 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 import { generateRewrites } from '../rewrites.esm.js';
 
-var o = createGenerator("next", (e)=>{
-    let { config: r, routes: o, options: i } = e, n = JSON.stringify(generateRewrites(r, i.routes, o.byId), null, 2);
+var o = createGenerator("next", (r)=>{
+    let { config: i, routes: o, options: n } = r, s = JSON.stringify(generateRewrites(i, n.routes, o.byId), null, 2);
     return {
         nextRewrites: {
+            dir: createGenerator.dirs.internal,
             name: "next-rewrites",
             ext: "js",
             index: !1,
@@ -12,7 +13,7 @@ var o = createGenerator("next", (e)=>{
 /**
  * @type {import("next/dist/lib/load-custom-routes").Rewrite[]}
  */
-module.exports = ${n}
+module.exports = ${s}
 `
         }
     };

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

@@ -3,11 +3,11 @@
 var getI18nDictionaries_inline = require('../../../adapter-js/generators/getI18nDictionaries_inline.cjs.js');
 var createAdapter = require('../../../compiler/createAdapter.cjs.js');
 
-var a = createAdapter.createGenerator("next", (o)=>{
-    let { options: { routes: { localeParamName: e } } } = o;
+var a = createAdapter.createGenerator("next", (e)=>{
+    let { options: { routes: { localeParamName: a } } } = e;
     return {
         I18nLayout: {
-            dir: "server",
+            dir: createAdapter.createGenerator.dirs.server,
             name: "I18nLayout",
             ext: "tsx",
             index: !1,
@@ -62,7 +62,7 @@ export const I18nLayout = async ({
  *
  * **For App Router only**
  */
-I18nLayout.locale = (props: any) => props.params.${e};
+I18nLayout.locale = (props: any) => props.params.${a};
 
 type Configurator = {
   /**
@@ -97,7 +97,7 @@ type Configurator = {
  *   };
  * });
  * 
- * // 2) export the metadata (maybe only in /app/[${e}]/layout.tsx)
+ * // 2) export the metadata (maybe only in /app/[${a}]/layout.tsx)
  * 
  * // with a sync function
  * export const generateMetadata = layout.generateMetadata((props) => {
@@ -111,7 +111,7 @@ type Configurator = {
  * 
  * // 3) export the default component
  * 
- * // 3a) in /app/[${e}]/layout.tsx)
+ * // 3a) in /app/[${a}]/layout.tsx)
  * 
  * // only thing to do is to spread the i18nHtmlAttrs prop on the <html> element
  * export default layout.default((props) => {
@@ -125,7 +125,7 @@ type Configurator = {
  *   );
  * });
  * 
- * // 3b) in /app/[${e}]/ ...folders... /layout.tsx)
+ * // 3b) in /app/[${a}]/ ...folders... /layout.tsx)
  * 
  * // with a sync function (if you do not need to await)
  * export default layout.default((props) => {
@@ -150,7 +150,7 @@ export const createI18nLayout = <
     | Configurator,
 ) => {
   const resolveConfigurator = async (props: I18n.Props<TProps>) => {
-    const localeParam = props.params?.${e};
+    const localeParam = props.params?.${a};
     const config = configurator
       ? typeof configurator === "function"
         ? await configurator(props, localeParam)
@@ -162,7 +162,7 @@ export const createI18nLayout = <
   };
 
   return {
-    generateStaticParams: () => locales.map((l) => ({ ${e}: l })),
+    generateStaticParams: () => locales.map((l) => ({ ${a}: l })),
     generateMetadata: (
       impl: (
         props: TProps & { locale: I18n.Locale },

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

@@ -1,11 +1,11 @@
 import { getI18nDictionaries_inline } from '../../../adapter-js/generators/getI18nDictionaries_inline.esm.js';
 import { createGenerator } from '../../../compiler/createAdapter.esm.js';
 
-var a = createGenerator("next", (o)=>{
-    let { options: { routes: { localeParamName: e } } } = o;
+var a = createGenerator("next", (e)=>{
+    let { options: { routes: { localeParamName: a } } } = e;
     return {
         I18nLayout: {
-            dir: "server",
+            dir: createGenerator.dirs.server,
             name: "I18nLayout",
             ext: "tsx",
             index: !1,
@@ -60,7 +60,7 @@ export const I18nLayout = async ({
  *
  * **For App Router only**
  */
-I18nLayout.locale = (props: any) => props.params.${e};
+I18nLayout.locale = (props: any) => props.params.${a};
 
 type Configurator = {
   /**
@@ -95,7 +95,7 @@ type Configurator = {
  *   };
  * });
  * 
- * // 2) export the metadata (maybe only in /app/[${e}]/layout.tsx)
+ * // 2) export the metadata (maybe only in /app/[${a}]/layout.tsx)
  * 
  * // with a sync function
  * export const generateMetadata = layout.generateMetadata((props) => {
@@ -109,7 +109,7 @@ type Configurator = {
  * 
  * // 3) export the default component
  * 
- * // 3a) in /app/[${e}]/layout.tsx)
+ * // 3a) in /app/[${a}]/layout.tsx)
  * 
  * // only thing to do is to spread the i18nHtmlAttrs prop on the <html> element
  * export default layout.default((props) => {
@@ -123,7 +123,7 @@ type Configurator = {
  *   );
  * });
  * 
- * // 3b) in /app/[${e}]/ ...folders... /layout.tsx)
+ * // 3b) in /app/[${a}]/ ...folders... /layout.tsx)
  * 
  * // with a sync function (if you do not need to await)
  * export default layout.default((props) => {
@@ -148,7 +148,7 @@ export const createI18nLayout = <
     | Configurator,
 ) => {
   const resolveConfigurator = async (props: I18n.Props<TProps>) => {
-    const localeParam = props.params?.${e};
+    const localeParam = props.params?.${a};
     const config = configurator
       ? typeof configurator === "function"
         ? await configurator(props, localeParam)
@@ -160,7 +160,7 @@ export const createI18nLayout = <
   };
 
   return {
-    generateStaticParams: () => locales.map((l) => ({ ${e}: l })),
+    generateStaticParams: () => locales.map((l) => ({ ${a}: l })),
     generateMetadata: (
       impl: (
         props: TProps & { locale: I18n.Locale },

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

@@ -2,11 +2,11 @@
 
 var createAdapter = require('../../../compiler/createAdapter.cjs.js');
 
-var p = createAdapter.createGenerator("next", (t)=>{
-    let { options: { routes: { localeParamName: o } } } = t;
+var p = createAdapter.createGenerator("next", (o)=>{
+    let { options: { routes: { localeParamName: e } } } = o;
     return {
         I18nLayoutRoot: {
-            dir: "server",
+            dir: createAdapter.createGenerator.dirs.server,
             name: "I18nLayoutRoot",
             ext: "tsx",
             index: !1,
@@ -21,7 +21,7 @@ type I18nLayoutRootProps = React.PropsWithChildren;
 
 /**
  * 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 \`[${e}]\` folder).
  *
  * **For App Router only**
  */

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

@@ -1,10 +1,10 @@
 import { createGenerator } from '../../../compiler/createAdapter.esm.js';
 
-var p = createGenerator("next", (t)=>{
-    let { options: { routes: { localeParamName: o } } } = t;
+var p = createGenerator("next", (o)=>{
+    let { options: { routes: { localeParamName: e } } } = o;
     return {
         I18nLayoutRoot: {
-            dir: "server",
+            dir: createGenerator.dirs.server,
             name: "I18nLayoutRoot",
             ext: "tsx",
             index: !1,
@@ -19,7 +19,7 @@ type I18nLayoutRootProps = React.PropsWithChildren;
 
 /**
  * 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 \`[${e}]\` folder).
  *
  * **For App Router only**
  */