@koine/i18n 2.0.0-beta.196 → 2.0.0-beta.198

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

@@ -2,8 +2,8 @@
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var i = createAdapter.createGenerator("js", (e)=>{
-    let { routes: { dynamicRoutes: a, staticRoutes: o } } = e;
+var i = createAdapter.createGenerator("js", (t)=>{
+    let { routes: { dynamicRoutes: a, staticRoutes: o } } = t;
     return {
         getI18nMetadata: {
             dir: createAdapter.createGenerator.dirs.internal,
@@ -47,7 +47,7 @@ export function getI18nMetadata<TRouteId extends I18n.RouteId | RouteIdError>({
   locales.forEach((locale) => {
     alternates[locale] = formatUrl(${a.length && o.length ? `
       // @ ts-ignore dynamic to fn typing
-      params ? to(id, params, locale) : to(id, locale),
+      params ? to(id, paramsByLocale?.[locale] ?? params, locale) : to(id, locale),
     );` : a.length ? "to(id, paramsByLocale?.[locale] ?? params, locale));" : "to(id, locale));"}
   });
 

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

@@ -1,7 +1,7 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var i = createGenerator("js", (e)=>{
-    let { routes: { dynamicRoutes: a, staticRoutes: o } } = e;
+var i = createGenerator("js", (t)=>{
+    let { routes: { dynamicRoutes: a, staticRoutes: o } } = t;
     return {
         getI18nMetadata: {
             dir: createGenerator.dirs.internal,
@@ -45,7 +45,7 @@ export function getI18nMetadata<TRouteId extends I18n.RouteId | RouteIdError>({
   locales.forEach((locale) => {
     alternates[locale] = formatUrl(${a.length && o.length ? `
       // @ ts-ignore dynamic to fn typing
-      params ? to(id, params, locale) : to(id, locale),
+      params ? to(id, paramsByLocale?.[locale] ?? params, locale) : to(id, locale),
     );` : a.length ? "to(id, paramsByLocale?.[locale] ?? params, locale));" : "to(id, locale));"}
   });
 

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

@@ -9,15 +9,16 @@ var imports = require('../../compiler/imports.cjs.js');
 var pluralisation = require('../../compiler/pluralisation.cjs.js');
 
 function getTypeLocale(e) {
-    return T(e.locales);
+    return m(e.locales);
 }
-function T(e, t = true) {
+let T = /;\[\];/g, y = /;+/g;
+function m(e, t = true) {
     return (t ? e.sort() : e).filter(utils.isString).map((e)=>`"${e}"`).join(" | ");
 }
-function y(e, t) {
-    return T(Object.keys(e.byId).filter((a)=>t(a, e.byId[a]))) || "never";
+function u(e, t) {
+    return m(Object.keys(e.byId).filter((a)=>t(a, e.byId[a]))) || "never";
 }
-function m(e) {
+function h(e) {
     return `{
     ${e.join("\n    ")}
   }`;
@@ -32,13 +33,13 @@ const getImportTypes = ()=>new imports.ImportsCompiler({
         ]
     });
 var x = createAdapter.createGenerator("js", (i)=>{
-    let { options: { routes: { tokens: { idDelimiter: T } }, translations: { tokens: { keyDelimiter: u, namespaceDelimiter: h } } } } = i, f = function(s) {
-        let { config: i, routes: T, options: u } = s;
+    let { options: { routes: { tokens: { idDelimiter: m } }, translations: { tokens: { keyDelimiter: f, namespaceDelimiter: I } } } } = i, R = function(s) {
+        let { config: i, routes: m, options: f } = s;
         return {
             Locale: getTypeLocale(i),
-            RouteIdStatic: y(T, (e, { params: t })=>!t),
-            RouteIdDynamic: y(T, (e, { params: t })=>!!t),
-            RouteSpa: m(function(e, t, a) {
+            RouteIdStatic: u(m, (e, { params: t })=>!t),
+            RouteIdDynamic: u(m, (e, { params: t })=>!!t),
+            RouteSpa: h(function(e, t, a) {
                 let n = Object.keys(t.byId).reduce((e, a)=>{
                     if (t.byId[a].inWildcard) for(let n = 0; n < t.wildcardIds.length; n++){
                         let s = t.wildcardIds[n];
@@ -55,28 +56,28 @@ var x = createAdapter.createGenerator("js", (i)=>{
                     s.push(`"${o}": { ${l.join(" ")} }`);
                 }
                 return s;
-            }(i, T, u)),
-            RoutePathnames: m(function(e, t) {
+            }(i, m, f)),
+            RoutePathnames: h(function(e, t) {
                 let a = [];
                 for(let n in t.byId){
                     let s = t.byId[n];
                     a.push(`"${s.id}": "${s.pathnames[e.defaultLocale]}";`);
                 }
                 return a;
-            }(i, T)),
-            RouteParams: m(function(e) {
+            }(i, m)),
+            RouteParams: h(function(e) {
                 let t = [];
                 for(let a in e.byId){
                     let { params: n } = e.byId[a];
                     n && t.push(`"${a}": ${helpers.compileDataParamsToType(n)};`);
                 }
                 return t;
-            }(T)),
-            TranslationsDictionary: m(function(s) {
-                let { config: { defaultLocale: o }, input: { translationFiles: i }, options: { translations: { ignorePaths: T } } } = s, y = helpers.filterInputTranslationFiles(i, T, (e)=>e.locale === o), m = [];
-                for(let s = 0; s < y.length; s++){
-                    let { path: o, data: r } = y[s], i = o.replace(".json", "");
-                    m.push(`"${i}": ${function s(o) {
+            }(m)),
+            TranslationsDictionary: h(function(s) {
+                let { config: { defaultLocale: o }, input: { translationFiles: i }, options: { translations: { ignorePaths: m } } } = s, u = helpers.filterInputTranslationFiles(i, m, (e)=>e.locale === o), h = [];
+                for(let s = 0; s < u.length; s++){
+                    let { path: o, data: r } = u[s], i = o.replace(".json", "");
+                    h.push(`"${i}": ${function s(o) {
                         let r = "", i = "";
                         if (utils.isBoolean(o) ? i = "boolean" : utils.isString(o) && (i = "string"), i) r += i + ";";
                         else if (o) {
@@ -93,10 +94,10 @@ var x = createAdapter.createGenerator("js", (i)=>{
                                 r += "};";
                             }
                         } else r += "";
-                        return (r = r.replace(/;\[\];/g, "[];")).replace(/;+/g, ";");
+                        return (r = r.replace(T, "[];")).replace(y, ";");
                     }(r)}`);
                 }
-                return m.sort();
+                return h.sort();
             }(s))
         };
     }(i);
@@ -148,7 +149,7 @@ export namespace I18n {
   /**
    * Any of the available locale code
    */
-  export type Locale = ${f.Locale};
+  export type Locale = ${R.Locale};
  
   /**
    * Utility to map values by all available locales
@@ -179,32 +180,32 @@ export namespace I18n {
   /**
    * The static routes available ids
    */
-  export type RouteIdStatic = ${f.RouteIdStatic};
+  export type RouteIdStatic = ${R.RouteIdStatic};
 
   /**
    * The dynamic routes available ids
    */
-  export type RouteIdDynamic = ${f.RouteIdDynamic};
+  export type RouteIdDynamic = ${R.RouteIdDynamic};
 
   /**
    * Route dynamic params dictionary for each dynamic route id
    */
-  export type RouteParams = ${f.RouteParams};
+  export type RouteParams = ${R.RouteParams};
 
  /**
   * Map every route id to its actual pathname value for the default locale
   */
-  export type RoutePathnames = ${f.RoutePathnames};
+  export type RoutePathnames = ${R.RoutePathnames};
 
   /**
    * Map every SPA path divided by their roots to their actual pathname value for the default locale
    */
-  export type RouteSpa = ${f.RouteSpa};
+  export type RouteSpa = ${R.RouteSpa};
 
   /**
    * Utility to join two route ids
    */
-  export type RouteJoinedId<Root extends string, Tail extends string> = \`\${Root}${T}\${Tail}\` extends RouteId ? \`\${Root}${T}\${Tail}\` : never;
+  export type RouteJoinedId<Root extends string, Tail extends string> = \`\${Root}${m}\${Tail}\` extends RouteId ? \`\${Root}${m}\${Tail}\` : never;
 
   /**
    * Extract all children routes that starts with the given string
@@ -221,7 +222,7 @@ export namespace I18n {
    * The types extracted from the translations JSON files, this is a little
    * more sophisticated than the type result of \`typeof "./en/messages.json"\`
    */
-  export type TranslationsDictionary = ${f.TranslationsDictionary};
+  export type TranslationsDictionary = ${R.TranslationsDictionary};
 
   /**
    * Any of the available translations dictionary namespaces
@@ -243,13 +244,13 @@ export namespace I18n {
    *
    * \`T\` can be any of all possible paths begininng with a namespace:
    * - \`namespace\` only a namespace
-   * - \`namespace${h}myKey\` sub dictionaries within a namespace
-   * - \`namespace${h}myKey.nested\` whatever nested level of nesting
+   * - \`namespace${I}myKey\` sub dictionaries within a namespace
+   * - \`namespace${I}myKey.nested\` whatever nested level of nesting
    */
   export type TranslationsChildrenOf<T extends TranslationAtGeneric> =
     T extends TranslationsNamespace
       ? TranslationsPaths<TranslationsDictionary[T]>
-      : T extends \`\${infer Namespace}${h}\${infer Path}\`
+      : T extends \`\${infer Namespace}${I}\${infer Path}\`
         ? Namespace extends TranslationsNamespace
           ? I18nUtils.Get<TranslationsDictionary[Namespace], Path> extends object
             ? TranslationsPaths<I18nUtils.Get<TranslationsDictionary[Namespace], Path>>
@@ -259,12 +260,12 @@ export namespace I18n {
 
   /**
    * All translations ancestor partial _paths_ of the given one, e.g. if \`T\` would be
-   * \`"area${u}main${u}[id]${u}edit"\` the generated type would be the union
-   * \`"area${u}main${u}[id]" | "area${u}main" | "area"\`.
+   * \`"area${f}main${f}[id]${f}edit"\` the generated type would be the union
+   * \`"area${f}main${f}[id]" | "area${f}main" | "area"\`.
    */
   export type TranslationsAncestorsOf<
     T extends string,
-    TSeparator extends string = "${u}",
+    TSeparator extends string = "${f}",
   > = I18nUtils.BuildRecursiveJoin<Split<T, TSeparator>, TSeparator>;
 
   /**
@@ -272,13 +273,13 @@ export namespace I18n {
    *
    * \`T\` can be any of all possible paths begininng with a namespace:
    * - \`namespace\` only a namespace
-   * - \`namespace${h}myKey\` sub dictionaries within a namespace
-   * - \`namespace${h}myKey${u}nested\` whatever nested level of nesting
+   * - \`namespace${I}myKey\` sub dictionaries within a namespace
+   * - \`namespace${I}myKey${f}nested\` whatever nested level of nesting
    */
   export type TranslationAt<T extends TranslationAtGeneric> =
     T extends TranslationsNamespace
       ? TranslationsDictionary[T]
-      : T extends \`\${infer Namespace}${h}\${infer Path}\`
+      : T extends \`\${infer Namespace}${I}\${infer Path}\`
         ? Namespace extends TranslationsNamespace
           ? I18nUtils.Get<TranslationsDictionary[Namespace], Path>
           : never
@@ -297,7 +298,7 @@ export namespace I18n {
    *
    * \`T\` can be any of all possible paths:
    * - \`myKey\` sub dictionaries within a namespace
-   * - \`myKey${u}nested\` whatever nested level of nesting within a namespace
+   * - \`myKey${f}nested\` whatever nested level of nesting within a namespace
    */
   export type TranslationAtNamespace<
     TNamespace extends TranslationsNamespace,

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

@@ -5,15 +5,16 @@ import { ImportsCompiler } from '../../compiler/imports.esm.js';
 import { transformKeysForPlurals, hasPlurals, hasOnlyPluralKeys, pickNonPluralValue } from '../../compiler/pluralisation.esm.js';
 
 function getTypeLocale(e) {
-    return T(e.locales);
+    return m(e.locales);
 }
-function T(e, t = true) {
+let T = /;\[\];/g, y = /;+/g;
+function m(e, t = true) {
     return (t ? e.sort() : e).filter(isString).map((e)=>`"${e}"`).join(" | ");
 }
-function y(e, t) {
-    return T(Object.keys(e.byId).filter((a)=>t(a, e.byId[a]))) || "never";
+function u(e, t) {
+    return m(Object.keys(e.byId).filter((a)=>t(a, e.byId[a]))) || "never";
 }
-function m(e) {
+function h(e) {
     return `{
     ${e.join("\n    ")}
   }`;
@@ -28,13 +29,13 @@ const getImportTypes = ()=>new ImportsCompiler({
         ]
     });
 var x = createGenerator("js", (i)=>{
-    let { options: { routes: { tokens: { idDelimiter: T } }, translations: { tokens: { keyDelimiter: u, namespaceDelimiter: h } } } } = i, f = function(s) {
-        let { config: i, routes: T, options: u } = s;
+    let { options: { routes: { tokens: { idDelimiter: m } }, translations: { tokens: { keyDelimiter: f, namespaceDelimiter: I } } } } = i, R = function(s) {
+        let { config: i, routes: m, options: f } = s;
         return {
             Locale: getTypeLocale(i),
-            RouteIdStatic: y(T, (e, { params: t })=>!t),
-            RouteIdDynamic: y(T, (e, { params: t })=>!!t),
-            RouteSpa: m(function(e, t, a) {
+            RouteIdStatic: u(m, (e, { params: t })=>!t),
+            RouteIdDynamic: u(m, (e, { params: t })=>!!t),
+            RouteSpa: h(function(e, t, a) {
                 let n = Object.keys(t.byId).reduce((e, a)=>{
                     if (t.byId[a].inWildcard) for(let n = 0; n < t.wildcardIds.length; n++){
                         let s = t.wildcardIds[n];
@@ -51,28 +52,28 @@ var x = createGenerator("js", (i)=>{
                     s.push(`"${o}": { ${l.join(" ")} }`);
                 }
                 return s;
-            }(i, T, u)),
-            RoutePathnames: m(function(e, t) {
+            }(i, m, f)),
+            RoutePathnames: h(function(e, t) {
                 let a = [];
                 for(let n in t.byId){
                     let s = t.byId[n];
                     a.push(`"${s.id}": "${s.pathnames[e.defaultLocale]}";`);
                 }
                 return a;
-            }(i, T)),
-            RouteParams: m(function(e) {
+            }(i, m)),
+            RouteParams: h(function(e) {
                 let t = [];
                 for(let a in e.byId){
                     let { params: n } = e.byId[a];
                     n && t.push(`"${a}": ${compileDataParamsToType(n)};`);
                 }
                 return t;
-            }(T)),
-            TranslationsDictionary: m(function(s) {
-                let { config: { defaultLocale: o }, input: { translationFiles: i }, options: { translations: { ignorePaths: T } } } = s, y = filterInputTranslationFiles(i, T, (e)=>e.locale === o), m = [];
-                for(let s = 0; s < y.length; s++){
-                    let { path: o, data: r } = y[s], i = o.replace(".json", "");
-                    m.push(`"${i}": ${function s(o) {
+            }(m)),
+            TranslationsDictionary: h(function(s) {
+                let { config: { defaultLocale: o }, input: { translationFiles: i }, options: { translations: { ignorePaths: m } } } = s, u = filterInputTranslationFiles(i, m, (e)=>e.locale === o), h = [];
+                for(let s = 0; s < u.length; s++){
+                    let { path: o, data: r } = u[s], i = o.replace(".json", "");
+                    h.push(`"${i}": ${function s(o) {
                         let r = "", i = "";
                         if (isBoolean(o) ? i = "boolean" : isString(o) && (i = "string"), i) r += i + ";";
                         else if (o) {
@@ -89,10 +90,10 @@ var x = createGenerator("js", (i)=>{
                                 r += "};";
                             }
                         } else r += "";
-                        return (r = r.replace(/;\[\];/g, "[];")).replace(/;+/g, ";");
+                        return (r = r.replace(T, "[];")).replace(y, ";");
                     }(r)}`);
                 }
-                return m.sort();
+                return h.sort();
             }(s))
         };
     }(i);
@@ -144,7 +145,7 @@ export namespace I18n {
   /**
    * Any of the available locale code
    */
-  export type Locale = ${f.Locale};
+  export type Locale = ${R.Locale};
  
   /**
    * Utility to map values by all available locales
@@ -175,32 +176,32 @@ export namespace I18n {
   /**
    * The static routes available ids
    */
-  export type RouteIdStatic = ${f.RouteIdStatic};
+  export type RouteIdStatic = ${R.RouteIdStatic};
 
   /**
    * The dynamic routes available ids
    */
-  export type RouteIdDynamic = ${f.RouteIdDynamic};
+  export type RouteIdDynamic = ${R.RouteIdDynamic};
 
   /**
    * Route dynamic params dictionary for each dynamic route id
    */
-  export type RouteParams = ${f.RouteParams};
+  export type RouteParams = ${R.RouteParams};
 
  /**
   * Map every route id to its actual pathname value for the default locale
   */
-  export type RoutePathnames = ${f.RoutePathnames};
+  export type RoutePathnames = ${R.RoutePathnames};
 
   /**
    * Map every SPA path divided by their roots to their actual pathname value for the default locale
    */
-  export type RouteSpa = ${f.RouteSpa};
+  export type RouteSpa = ${R.RouteSpa};
 
   /**
    * Utility to join two route ids
    */
-  export type RouteJoinedId<Root extends string, Tail extends string> = \`\${Root}${T}\${Tail}\` extends RouteId ? \`\${Root}${T}\${Tail}\` : never;
+  export type RouteJoinedId<Root extends string, Tail extends string> = \`\${Root}${m}\${Tail}\` extends RouteId ? \`\${Root}${m}\${Tail}\` : never;
 
   /**
    * Extract all children routes that starts with the given string
@@ -217,7 +218,7 @@ export namespace I18n {
    * The types extracted from the translations JSON files, this is a little
    * more sophisticated than the type result of \`typeof "./en/messages.json"\`
    */
-  export type TranslationsDictionary = ${f.TranslationsDictionary};
+  export type TranslationsDictionary = ${R.TranslationsDictionary};
 
   /**
    * Any of the available translations dictionary namespaces
@@ -239,13 +240,13 @@ export namespace I18n {
    *
    * \`T\` can be any of all possible paths begininng with a namespace:
    * - \`namespace\` only a namespace
-   * - \`namespace${h}myKey\` sub dictionaries within a namespace
-   * - \`namespace${h}myKey.nested\` whatever nested level of nesting
+   * - \`namespace${I}myKey\` sub dictionaries within a namespace
+   * - \`namespace${I}myKey.nested\` whatever nested level of nesting
    */
   export type TranslationsChildrenOf<T extends TranslationAtGeneric> =
     T extends TranslationsNamespace
       ? TranslationsPaths<TranslationsDictionary[T]>
-      : T extends \`\${infer Namespace}${h}\${infer Path}\`
+      : T extends \`\${infer Namespace}${I}\${infer Path}\`
         ? Namespace extends TranslationsNamespace
           ? I18nUtils.Get<TranslationsDictionary[Namespace], Path> extends object
             ? TranslationsPaths<I18nUtils.Get<TranslationsDictionary[Namespace], Path>>
@@ -255,12 +256,12 @@ export namespace I18n {
 
   /**
    * All translations ancestor partial _paths_ of the given one, e.g. if \`T\` would be
-   * \`"area${u}main${u}[id]${u}edit"\` the generated type would be the union
-   * \`"area${u}main${u}[id]" | "area${u}main" | "area"\`.
+   * \`"area${f}main${f}[id]${f}edit"\` the generated type would be the union
+   * \`"area${f}main${f}[id]" | "area${f}main" | "area"\`.
    */
   export type TranslationsAncestorsOf<
     T extends string,
-    TSeparator extends string = "${u}",
+    TSeparator extends string = "${f}",
   > = I18nUtils.BuildRecursiveJoin<Split<T, TSeparator>, TSeparator>;
 
   /**
@@ -268,13 +269,13 @@ export namespace I18n {
    *
    * \`T\` can be any of all possible paths begininng with a namespace:
    * - \`namespace\` only a namespace
-   * - \`namespace${h}myKey\` sub dictionaries within a namespace
-   * - \`namespace${h}myKey${u}nested\` whatever nested level of nesting
+   * - \`namespace${I}myKey\` sub dictionaries within a namespace
+   * - \`namespace${I}myKey${f}nested\` whatever nested level of nesting
    */
   export type TranslationAt<T extends TranslationAtGeneric> =
     T extends TranslationsNamespace
       ? TranslationsDictionary[T]
-      : T extends \`\${infer Namespace}${h}\${infer Path}\`
+      : T extends \`\${infer Namespace}${I}\${infer Path}\`
         ? Namespace extends TranslationsNamespace
           ? I18nUtils.Get<TranslationsDictionary[Namespace], Path>
           : never
@@ -293,7 +294,7 @@ export namespace I18n {
    *
    * \`T\` can be any of all possible paths:
    * - \`myKey\` sub dictionaries within a namespace
-   * - \`myKey${u}nested\` whatever nested level of nesting within a namespace
+   * - \`myKey${f}nested\` whatever nested level of nesting within a namespace
    */
   export type TranslationAtNamespace<
     TNamespace extends TranslationsNamespace,

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

@@ -4,56 +4,55 @@ var utils = require('@koine/utils');
 var i18nFormatRoutePathname = require('../../i18nFormatRoutePathname.cjs.js');
 var utils$1 = require('./utils.cjs.js');
 
-function a(e) {
-    let { localeSource: t, localeDestination: o, template: a, pathname: l, passLocale: i } = e, n = "";
-    t && (n = `/${t}`);
-    let s = i18nFormatRoutePathname.i18nFormatRoutePathname(n + l), c = "";
-    o && (c = `/${o}`);
-    let p = i18nFormatRoutePathname.i18nFormatRoutePathname(c + a);
-    if (s === p) return;
-    let u = {
+function generatePathRewrite(e) {
+    let { localeSource: t, localeDestination: a, template: o, pathname: i, passLocale: n } = e, l = "";
+    t && (l = `/${t}`);
+    let s = i18nFormatRoutePathname.i18nFormatRoutePathname(l + i), c = "";
+    a && (c = `/${a}`);
+    let p = {
         source: s,
-        destination: p
+        destination: i18nFormatRoutePathname.i18nFormatRoutePathname(c + o)
     };
-    return false === i && (u.locale = false), u;
+    return false === n && (p.locale = false), p;
 }
-const generateRewriteForPathname = (e, t, r, o, l)=>{
-    let { defaultLocale: i, hideDefaultLocaleInUrl: n, localeParamName: s } = e, c = t === i && n, p = {
+const generateRewriteForPathname = (e, t, r, a, o)=>{
+    let { defaultLocale: i, hideDefaultLocaleInUrl: n, localeParamName: l } = e, s = t === i && n, c = {
         template: r,
-        pathname: o
+        pathname: a
     };
-    s ? c ? l.push(a({
-        ...p,
+    l ? s ? o.push(generatePathRewrite({
+        ...c,
         localeDestination: t,
         passLocale: false
-    })) : l.push(a({
-        ...p,
+    })) : o.push(generatePathRewrite({
+        ...c,
         localeSource: t,
         localeDestination: t,
         passLocale: false
-    })) : o !== r && (c ? l.push(a(p)) : l.push(a({
-        ...p,
+    })) : a !== r && (s ? o.push(generatePathRewrite(c)) : o.push(generatePathRewrite({
+        ...c,
         localeSource: t,
         passLocale: false
     })));
 };
-let generateRewrites = (r, { tokens: a, localeParamName: l, permanentRedirects: i }, n)=>{
-    let s = {
-        ...r,
-        localeParamName: l}, c = RegExp(utils.escapeRegExp(a.idDelimiter), "g"), p = [];
-    for(let e in n){
-        let t = n[e], r = n[e].pathnames;
-        for(let a in r){
-            let l = r[a], i = e.replace(c, "/");
+let generateRewrites = (o, { tokens: i, localeParamName: n, permanentRedirects: l }, s)=>{
+    let c = {
+        ...o,
+        localeParamName: n}, p = RegExp(utils.escapeRegExp(i.idDelimiter), "g"), u = [];
+    for(let e in s){
+        let t = s[e], r = s[e].pathnames;
+        for(let o in r){
+            let i = r[o], n = e.replace(p, "/");
             if (t.inWildcard) break;
-            generateRewriteForPathname(s, a, utils$1.transformPathname(i), utils$1.transformPathname(l), p), t.wildcard && generateRewriteForPathname(s, a, utils$1.transformPathname(i, t.wildcard), utils$1.transformPathname(l, t.wildcard), p);
+            generateRewriteForPathname(c, o, utils$1.transformPathname(n), utils$1.transformPathname(i), u), t.wildcard && generateRewriteForPathname(c, o, utils$1.transformPathname(n, t.wildcard), utils$1.transformPathname(i, t.wildcard), u);
         }
     }
-    return utils.arrayUniqueByProperties(p.filter(Boolean), [
+    return utils.arrayUniqueByProperties(u.filter(Boolean), [
         "source",
         "destination"
-    ]).sort((e, t)=>e.source.localeCompare(t.source));
+    ]).sort((e, t)=>e.destination.indexOf(":") > -1 ? 1 : t.destination.indexOf(":") > -1 ? -1 : 2 === i18nFormatRoutePathname.i18nFormatRoutePathname(e.source).split("/").length ? 2 === i18nFormatRoutePathname.i18nFormatRoutePathname(e.source).split("/").length && e.source.length > t.source.length ? 1 : -1 : e.source.localeCompare(t.source));
 };
 
+exports.generatePathRewrite = generatePathRewrite;
 exports.generateRewriteForPathname = generateRewriteForPathname;
 exports.generateRewrites = generateRewrites;

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

@@ -1,6 +1,13 @@
 import type { Rewrite } from "next/dist/lib/load-custom-routes";
 import type { CodeDataRoutesOptions } from "../../compiler/code/data-routes";
 import type { I18nCompiler } from "../../compiler/types";
+export declare function generatePathRewrite(arg: {
+    localeSource?: I18nCompiler.Locale;
+    localeDestination?: I18nCompiler.Locale;
+    template: string;
+    pathname: string;
+    passLocale?: boolean;
+}): Rewrite;
 export declare const generateRewriteForPathname: (config: Pick<I18nCompiler.Config, "defaultLocale" | "hideDefaultLocaleInUrl" | "trailingSlash"> & Pick<CodeDataRoutesOptions, "localeParamName">, locale: string, template: string, pathname: string, rewrites: (Rewrite | undefined)[]) => void;
 /**
  * TODO: maybe write directly the vercel configuration?

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

@@ -2,55 +2,53 @@ import { escapeRegExp, arrayUniqueByProperties } from '@koine/utils';
 import { i18nFormatRoutePathname } from '../../i18nFormatRoutePathname.esm.js';
 import { transformPathname } from './utils.esm.js';
 
-function a(e) {
-    let { localeSource: t, localeDestination: o, template: a, pathname: l, passLocale: i } = e, n = "";
-    t && (n = `/${t}`);
-    let s = i18nFormatRoutePathname(n + l), c = "";
-    o && (c = `/${o}`);
-    let p = i18nFormatRoutePathname(c + a);
-    if (s === p) return;
-    let u = {
+function generatePathRewrite(e) {
+    let { localeSource: t, localeDestination: a, template: o, pathname: i, passLocale: n } = e, l = "";
+    t && (l = `/${t}`);
+    let s = i18nFormatRoutePathname(l + i), c = "";
+    a && (c = `/${a}`);
+    let p = {
         source: s,
-        destination: p
+        destination: i18nFormatRoutePathname(c + o)
     };
-    return false === i && (u.locale = false), u;
+    return false === n && (p.locale = false), p;
 }
-const generateRewriteForPathname = (e, t, r, o, l)=>{
-    let { defaultLocale: i, hideDefaultLocaleInUrl: n, localeParamName: s } = e, c = t === i && n, p = {
+const generateRewriteForPathname = (e, t, r, a, o)=>{
+    let { defaultLocale: i, hideDefaultLocaleInUrl: n, localeParamName: l } = e, s = t === i && n, c = {
         template: r,
-        pathname: o
+        pathname: a
     };
-    s ? c ? l.push(a({
-        ...p,
+    l ? s ? o.push(generatePathRewrite({
+        ...c,
         localeDestination: t,
         passLocale: false
-    })) : l.push(a({
-        ...p,
+    })) : o.push(generatePathRewrite({
+        ...c,
         localeSource: t,
         localeDestination: t,
         passLocale: false
-    })) : o !== r && (c ? l.push(a(p)) : l.push(a({
-        ...p,
+    })) : a !== r && (s ? o.push(generatePathRewrite(c)) : o.push(generatePathRewrite({
+        ...c,
         localeSource: t,
         passLocale: false
     })));
 };
-let generateRewrites = (r, { tokens: a, localeParamName: l, permanentRedirects: i }, n)=>{
-    let s = {
-        ...r,
-        localeParamName: l}, c = RegExp(escapeRegExp(a.idDelimiter), "g"), p = [];
-    for(let e in n){
-        let t = n[e], r = n[e].pathnames;
-        for(let a in r){
-            let l = r[a], i = e.replace(c, "/");
+let generateRewrites = (o, { tokens: i, localeParamName: n, permanentRedirects: l }, s)=>{
+    let c = {
+        ...o,
+        localeParamName: n}, p = RegExp(escapeRegExp(i.idDelimiter), "g"), u = [];
+    for(let e in s){
+        let t = s[e], r = s[e].pathnames;
+        for(let o in r){
+            let i = r[o], n = e.replace(p, "/");
             if (t.inWildcard) break;
-            generateRewriteForPathname(s, a, transformPathname(i), transformPathname(l), p), t.wildcard && generateRewriteForPathname(s, a, transformPathname(i, t.wildcard), transformPathname(l, t.wildcard), p);
+            generateRewriteForPathname(c, o, transformPathname(n), transformPathname(i), u), t.wildcard && generateRewriteForPathname(c, o, transformPathname(n, t.wildcard), transformPathname(i, t.wildcard), u);
         }
     }
-    return arrayUniqueByProperties(p.filter(Boolean), [
+    return arrayUniqueByProperties(u.filter(Boolean), [
         "source",
         "destination"
-    ]).sort((e, t)=>e.source.localeCompare(t.source));
+    ]).sort((e, t)=>e.destination.indexOf(":") > -1 ? 1 : t.destination.indexOf(":") > -1 ? -1 : 2 === i18nFormatRoutePathname(e.source).split("/").length ? 2 === i18nFormatRoutePathname(e.source).split("/").length && e.source.length > t.source.length ? 1 : -1 : e.source.localeCompare(t.source));
 };
 
-export { generateRewriteForPathname, generateRewrites };
+export { generatePathRewrite, generateRewriteForPathname, generateRewrites };