@koine/i18n 2.0.0-beta.68 → 2.0.0-beta.70

package/api.cjs.js

@@ -62,7 +62,7 @@ exports.config = config;
 module.exports = config;
 `);
 
-var o$6 = (({ config: e })=>`
+var o$7 = (({ config: e })=>`
 import type { I18n } from "./types";
 
 export const defaultLocale: I18n.Locale = "${e.defaultLocale}";
@@ -159,7 +159,7 @@ export const isLocale = (payload: any): payload is I18n.Locale => locales.includ
 export default isLocale;
 `);
 
-var r$5 = (({ config: e })=>{
+var r$4 = (({ config: e })=>{
     let l = `[${e.locales.map((e)=>`"${e}"`).join(", ")}]`;
     return `
 export const locales = ${l} as const;
@@ -212,7 +212,7 @@ export default routesSlim;
 `;
 });
 
-var i$4 = (({ routes: t })=>{
+var i$5 = (({ routes: t })=>{
     let e = JSON.stringify(Object.fromEntries(Object.entries(t.byId).filter(([, { pathnamesSpa: t }])=>!!t).map(([t, { pathnamesSpa: e }])=>[
             t,
             e
@@ -239,13 +239,13 @@ let dataParamsToTsInterfaceBody = (e)=>Object.keys(e).reduce((r, t)=>{
         return r.push(`${t}: ${s};`), r;
     }, []).join(" ");
 
-let i$3 = (t)=>utils.isString(t) || utils.isNumber(t) ? `"${t}"` : utils.isBoolean(t) ? `${t}` : utils.isArray(t) ? JSON.stringify(t) : `(${JSON.stringify(t)})`, s$6 = (e, r)=>utils.areEqual(e, r), p$2 = (t, e)=>{
+let i$4 = (t)=>utils.isString(t) || utils.isNumber(t) ? `"${t}"` : utils.isBoolean(t) ? `${t}` : utils.isArray(t) ? JSON.stringify(t) : `(${JSON.stringify(t)})`, s$6 = (e, r)=>utils.areEqual(e, r), p$2 = (t, e)=>{
     let { defaultLocale: r } = t, l = "";
     for(let t in e){
         let o = e[t];
-        t === r || s$6(o, e[r]) || (l += `locale === "${t}" ? ${i$3(o)} : `);
+        t === r || s$6(o, e[r]) || (l += `locale === "${t}" ? ${i$4(o)} : `);
     }
-    return l + i$3(e[r]);
+    return l + i$4(e[r]);
 };
 var x$1 = (({ config: t, options: e, translations: r })=>{
     let l = `
@@ -267,7 +267,7 @@ import { tPluralise } from "./tPluralise";
         ].filter(Boolean).join(", ");
         l += `export let ${u} = (${$}) => `;
         let c = "";
-        utils.isPrimitive(s) ? c += i$3(s) : c += p$2(t, s), f && (c = `tPluralise(${c}, params.count)`), l += (c = m ? `tInterpolateParams(${c}, params);` : `${c};`) + `\n`;
+        utils.isPrimitive(s) ? c += i$4(s) : c += p$2(t, s), f && (c = `tPluralise(${c}, params.count)`), l += (c = m ? `tInterpolateParams(${c}, params);` : `${c};`) + `\n`;
     }
     return l;
 });
@@ -297,7 +297,7 @@ let pluralRules = new Intl.PluralRules();
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export let tPluralise = (values: any, count: number) =>
-  values[count] || values[pluralRules.select(count)] || values["other"];
+  values[count] || values[pluralRules.select(count)] || (count === 0 ? values.zero : values["other"]);
 
 export default tPluralise;
 `);
@@ -335,7 +335,7 @@ export function to<Id extends I18n.RouteId>(
 export default to;
 `);
 
-let o$5 = (t, e)=>{
+let o$6 = (t, e)=>{
     let { defaultLocale: o } = t, r = "";
     for(let t in e){
         let l = e[t];
@@ -355,7 +355,7 @@ import type { I18n } from "./types";
             s ? `params: ${p}` : "",
             n ? "" : "locale?: I18n.Locale"
         ].filter(Boolean).join(", "), u = n ? '""' : "locale", I = s ? ", params" : "";
-        $ += `export let ${f} = (${c}) => `, utils.isString(i) ? $ += `toFormat(${u}, "${i}"${I});` : $ += `toFormat(${u}, ${o$5(r, i)}${I});`, $ += `\n`;
+        $ += `export let ${f} = (${c}) => `, utils.isString(i) ? $ += `toFormat(${u}, "${i}"${I});` : $ += `toFormat(${u}, ${o$6(r, i)}${I});`, $ += `\n`;
     }
     return $;
 });
@@ -448,6 +448,11 @@ export function toSpa<
     // FIXME: actually the locale will be prepended if hideDefaultLocaleInUrl will be false
     "", // do not pass the locale so that won't be prepended
     (routesSpa[fullId] as Record<string, string>)[locale],
+    args.length === 2
+      ? args[0]
+      : args[0] && !isLocale(args[0])
+        ? args[0]
+        : void 0,
   ) as I18n.RouteSpa[Root][Path];
 }
 
@@ -462,7 +467,7 @@ let s$5 = [
     "few",
     "many",
     "other"
-], i$2 = "other";
+], i$3 = "other";
 let isPluralSuffix = (e)=>s$5.includes(e) || utils.isNumericLiteral(e);
 let removePluralSuffix = (e)=>{
     let [l] = utils.splitReverse(e, "_");
@@ -481,7 +486,7 @@ let a$3 = (e)=>{
     }), l;
 };
 let transformKeysForPlurals = (l)=>{
-    if (l.includes(i$2)) {
+    if (l.includes(i$3)) {
         let r = l.filter(isPluralKey);
         if (r.length) {
             let t = [
@@ -496,7 +501,7 @@ let transformKeysForPlurals = (l)=>{
     }
     return l;
 };
-let hasPlurals = (e)=>Object.keys(e).includes(i$2);
+let hasPlurals = (e)=>Object.keys(e).includes(i$3);
 let hasOnlyPluralKeys = (e)=>!!hasPlurals(e) && 0 === pickNonPluralKeys(e).length;
 let pickNonPluralKeys = (e)=>Object.keys(e).filter((e)=>!isPluralSuffix(e));
 let pickNonPluralValue = (e)=>hasPlurals(e) ? utils.objectPick(e, pickNonPluralKeys(e)) : e;
@@ -841,7 +846,7 @@ var t$2 = (()=>({
             },
             {
                 name: "defaultLocale",
-                fn: o$6,
+                fn: o$7,
                 ext: "ts",
                 index: !0
             },
@@ -859,7 +864,7 @@ var t$2 = (()=>({
             },
             {
                 name: "locales",
-                fn: r$5,
+                fn: r$4,
                 ext: "ts",
                 index: !0
             },
@@ -881,7 +886,7 @@ var t$2 = (()=>({
             },
             {
                 name: "routesSpa",
-                fn: i$4,
+                fn: i$5,
                 ext: "ts"
             },
             {
@@ -1112,7 +1117,7 @@ function transformPathname(e, t) {
     return "/" + e.split("/").filter(Boolean).map((e)=>e.startsWith("[[...") ? `:${encodeURIComponent(e.slice(5, -2))}` : e.startsWith("[[") ? `:${encodeURIComponent(e.slice(2, -2))}` : e.startsWith("[") ? `:${encodeURIComponent(e.slice(1, -1))}` : `${encodeURIComponent(e)}`).join("/") + (t ? "/:wildcard*" : "");
 }
 
-function r$4(e) {
+function r$3(e) {
     let { localeSource: o, localeDestination: l, template: r, pathname: i, permanent: a } = e, n = formatRoutePathname.formatRoutePathname((o ? `${o}/` : "") + r), c = formatRoutePathname.formatRoutePathname((l ? `${l}/` : "") + i);
     if (n !== c) return {
         source: n,
@@ -1132,20 +1137,20 @@ let generateRedirects = (t, i, a, n = "", c = !1)=>{
                 pathname: d,
                 permanent: c
             };
-            n ? D ? m.push(r$4({
+            n ? D ? m.push(r$3({
                 ...k,
                 localeDestination: i
-            })) : g ? m.push(r$4({
+            })) : g ? m.push(r$3({
                 ...k,
                 localeSource: i
-            })) : h ? m.push(r$4(k)) : m.push(r$4({
+            })) : h ? m.push(r$3(k)) : m.push(r$3({
                 ...k,
                 localeSource: i,
                 localeDestination: i
-            })) : d !== f && (D ? m.push(r$4({
+            })) : d !== f && (D ? m.push(r$3({
                 ...k,
                 localeDestination: i
-            })) : h ? m.push(r$4(k)) : m.push(r$4({
+            })) : h ? m.push(r$3(k)) : m.push(r$3({
                 ...k,
                 localeSource: i,
                 localeDestination: i
@@ -1166,46 +1171,49 @@ var e$1 = (({ config: e, routes: t, options: o })=>{
     return `module.exports = ${l}`;
 });
 
-function r$3(e) {
-    let { localeSource: t, localeDestination: o, template: r, pathname: i } = e, a = "";
+function o$5(e) {
+    let { localeSource: t, localeDestination: r, template: o, pathname: i } = e, a = "";
     t && (a = `/${t}`);
     let n = formatRoutePathname.formatRoutePathname(a + i), c = "";
-    o && (c = `/${o}`);
-    let s = formatRoutePathname.formatRoutePathname(c + r);
+    r && (c = `/${r}`);
+    let s = formatRoutePathname.formatRoutePathname(c + o);
     if (n !== s) return {
         source: n,
         destination: s
     };
 }
-let generateRewrites = (l, i, a, n = "")=>{
-    let { defaultLocale: c, hideDefaultLocaleInUrl: s } = l, u = RegExp(utils.escapeRegExp(a.tokens.idDelimiter), "g"), p = [];
-    for(let e in i){
-        let t = i[e], a = i[e].pathnames;
-        for(let i in a){
-            let m = a[i], f = i === c && s, d = transformPathname(e.replace(u, "/"), t.wildcard), h = transformPathname(m, t.wildcard);
+let i$2 = (e, t = "", l, r, i, a)=>{
+    let { defaultLocale: n, hideDefaultLocaleInUrl: c } = e, s = l === n && c, u = {
+        config: e,
+        template: r,
+        pathname: i
+    };
+    t ? s ? a.push(o$5({
+        ...u,
+        localeDestination: l
+    })) : a.push(o$5({
+        ...u,
+        localeSource: l,
+        localeDestination: l
+    })) : i !== r && (s ? a.push(o$5(u)) : a.push({
+        ...o$5({
+            ...u,
+            localeSource: l
+        }),
+        locale: !1
+    }));
+};
+let generateRewrites = (l, o, a, n = "")=>{
+    let c = RegExp(utils.escapeRegExp(a.tokens.idDelimiter), "g"), s = [];
+    for(let e in o){
+        let t = o[e], a = o[e].pathnames;
+        for(let o in a){
+            let u = a[o], p = e.replace(c, "/");
             if (t.inWildcard) break;
-            let g = {
-                config: l,
-                template: d,
-                pathname: h
-            };
-            n ? f ? p.push(r$3({
-                ...g,
-                localeDestination: i
-            })) : p.push(r$3({
-                ...g,
-                localeSource: i,
-                localeDestination: i
-            })) : h !== d && (f ? p.push(r$3(g)) : p.push({
-                ...r$3({
-                    ...g,
-                    localeSource: i
-                }),
-                locale: !1
-            }));
+            i$2(l, n, o, transformPathname(p), transformPathname(u), s), t.wildcard && i$2(l, n, o, transformPathname(p, t.wildcard), transformPathname(u, t.wildcard), s);
         }
     }
-    return utils.arrayUniqueByProperties(p.filter(Boolean), [
+    return utils.arrayUniqueByProperties(s.filter(Boolean), [
         "source",
         "destination"
     ]).sort((e, t)=>e.source.localeCompare(t.source));
@@ -1297,19 +1305,22 @@ export const useToSpa = () => {
   const locale = useLocale();
   return <
     Root extends keyof I18n.RouteSpa,
-    Path extends Extract<keyof I18n.RouteSpa[Root], string>
+    Path extends Extract<keyof I18n.RouteSpa[Root], string>,
   >(
+    root: Root,
+    path: Path,
     ...args: I18n.RouteJoinedId<Root, Path> extends I18n.RouteIdDynamic
-    ? [root: Root, path: Path, params: I18n.RouteParams[I18n.RouteJoinedId<Root, Path>]]
-    : I18n.RouteJoinedId<Root, Path> extends I18n.RouteIdStatic
-      ? [root: Root, path: Path]
-      : never
+      ? [params: I18n.RouteParams[I18n.RouteJoinedId<Root, Path>]]
+      : I18n.RouteJoinedId<Root, Path> extends I18n.RouteIdStatic
+        ? []
+        : never
   ) => {
-    const [root, path, params] = args;
+    const [params] = args;
     return (
+      // prettier-ignore
       // @ts-expect-error FIXME: types
-      params ? toSpa(root, path, params, locale) : toSpa(root, path, locale)
-    ) as I18n.RouteSpa[Root][Path];
+      (params ? toSpa(root, path, params, locale) : toSpa(root, path, locale)) as I18n.RouteSpa[Root][Path]
+    );
   };
 };
 

package/api.esm.js

@@ -40,7 +40,7 @@ exports.config = config;
 module.exports = config;
 `);
 
-var o$6 = (({ config: e })=>`
+var o$7 = (({ config: e })=>`
 import type { I18n } from "./types";
 
 export const defaultLocale: I18n.Locale = "${e.defaultLocale}";
@@ -137,7 +137,7 @@ export const isLocale = (payload: any): payload is I18n.Locale => locales.includ
 export default isLocale;
 `);
 
-var r$5 = (({ config: e })=>{
+var r$4 = (({ config: e })=>{
     let l = `[${e.locales.map((e)=>`"${e}"`).join(", ")}]`;
     return `
 export const locales = ${l} as const;
@@ -190,7 +190,7 @@ export default routesSlim;
 `;
 });
 
-var i$4 = (({ routes: t })=>{
+var i$5 = (({ routes: t })=>{
     let e = JSON.stringify(Object.fromEntries(Object.entries(t.byId).filter(([, { pathnamesSpa: t }])=>!!t).map(([t, { pathnamesSpa: e }])=>[
             t,
             e
@@ -217,13 +217,13 @@ let dataParamsToTsInterfaceBody = (e)=>Object.keys(e).reduce((r, t)=>{
         return r.push(`${t}: ${s};`), r;
     }, []).join(" ");
 
-let i$3 = (t)=>isString(t) || isNumber(t) ? `"${t}"` : isBoolean(t) ? `${t}` : isArray(t) ? JSON.stringify(t) : `(${JSON.stringify(t)})`, s$6 = (e, r)=>areEqual(e, r), p$2 = (t, e)=>{
+let i$4 = (t)=>isString(t) || isNumber(t) ? `"${t}"` : isBoolean(t) ? `${t}` : isArray(t) ? JSON.stringify(t) : `(${JSON.stringify(t)})`, s$6 = (e, r)=>areEqual(e, r), p$2 = (t, e)=>{
     let { defaultLocale: r } = t, l = "";
     for(let t in e){
         let o = e[t];
-        t === r || s$6(o, e[r]) || (l += `locale === "${t}" ? ${i$3(o)} : `);
+        t === r || s$6(o, e[r]) || (l += `locale === "${t}" ? ${i$4(o)} : `);
     }
-    return l + i$3(e[r]);
+    return l + i$4(e[r]);
 };
 var x$1 = (({ config: t, options: e, translations: r })=>{
     let l = `
@@ -245,7 +245,7 @@ import { tPluralise } from "./tPluralise";
         ].filter(Boolean).join(", ");
         l += `export let ${u} = (${$}) => `;
         let c = "";
-        isPrimitive(s) ? c += i$3(s) : c += p$2(t, s), f && (c = `tPluralise(${c}, params.count)`), l += (c = m ? `tInterpolateParams(${c}, params);` : `${c};`) + `\n`;
+        isPrimitive(s) ? c += i$4(s) : c += p$2(t, s), f && (c = `tPluralise(${c}, params.count)`), l += (c = m ? `tInterpolateParams(${c}, params);` : `${c};`) + `\n`;
     }
     return l;
 });
@@ -275,7 +275,7 @@ let pluralRules = new Intl.PluralRules();
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export let tPluralise = (values: any, count: number) =>
-  values[count] || values[pluralRules.select(count)] || values["other"];
+  values[count] || values[pluralRules.select(count)] || (count === 0 ? values.zero : values["other"]);
 
 export default tPluralise;
 `);
@@ -313,7 +313,7 @@ export function to<Id extends I18n.RouteId>(
 export default to;
 `);
 
-let o$5 = (t, e)=>{
+let o$6 = (t, e)=>{
     let { defaultLocale: o } = t, r = "";
     for(let t in e){
         let l = e[t];
@@ -333,7 +333,7 @@ import type { I18n } from "./types";
             s ? `params: ${p}` : "",
             n ? "" : "locale?: I18n.Locale"
         ].filter(Boolean).join(", "), u = n ? '""' : "locale", I = s ? ", params" : "";
-        $ += `export let ${f} = (${c}) => `, isString(i) ? $ += `toFormat(${u}, "${i}"${I});` : $ += `toFormat(${u}, ${o$5(r, i)}${I});`, $ += `\n`;
+        $ += `export let ${f} = (${c}) => `, isString(i) ? $ += `toFormat(${u}, "${i}"${I});` : $ += `toFormat(${u}, ${o$6(r, i)}${I});`, $ += `\n`;
     }
     return $;
 });
@@ -426,6 +426,11 @@ export function toSpa<
     // FIXME: actually the locale will be prepended if hideDefaultLocaleInUrl will be false
     "", // do not pass the locale so that won't be prepended
     (routesSpa[fullId] as Record<string, string>)[locale],
+    args.length === 2
+      ? args[0]
+      : args[0] && !isLocale(args[0])
+        ? args[0]
+        : void 0,
   ) as I18n.RouteSpa[Root][Path];
 }
 
@@ -440,7 +445,7 @@ let s$5 = [
     "few",
     "many",
     "other"
-], i$2 = "other";
+], i$3 = "other";
 let isPluralSuffix = (e)=>s$5.includes(e) || isNumericLiteral(e);
 let removePluralSuffix = (e)=>{
     let [l] = splitReverse(e, "_");
@@ -459,7 +464,7 @@ let a$3 = (e)=>{
     }), l;
 };
 let transformKeysForPlurals = (l)=>{
-    if (l.includes(i$2)) {
+    if (l.includes(i$3)) {
         let r = l.filter(isPluralKey);
         if (r.length) {
             let t = [
@@ -474,7 +479,7 @@ let transformKeysForPlurals = (l)=>{
     }
     return l;
 };
-let hasPlurals = (e)=>Object.keys(e).includes(i$2);
+let hasPlurals = (e)=>Object.keys(e).includes(i$3);
 let hasOnlyPluralKeys = (e)=>!!hasPlurals(e) && 0 === pickNonPluralKeys(e).length;
 let pickNonPluralKeys = (e)=>Object.keys(e).filter((e)=>!isPluralSuffix(e));
 let pickNonPluralValue = (e)=>hasPlurals(e) ? objectPick(e, pickNonPluralKeys(e)) : e;
@@ -819,7 +824,7 @@ var t$2 = (()=>({
             },
             {
                 name: "defaultLocale",
-                fn: o$6,
+                fn: o$7,
                 ext: "ts",
                 index: !0
             },
@@ -837,7 +842,7 @@ var t$2 = (()=>({
             },
             {
                 name: "locales",
-                fn: r$5,
+                fn: r$4,
                 ext: "ts",
                 index: !0
             },
@@ -859,7 +864,7 @@ var t$2 = (()=>({
             },
             {
                 name: "routesSpa",
-                fn: i$4,
+                fn: i$5,
                 ext: "ts"
             },
             {
@@ -1090,7 +1095,7 @@ function transformPathname(e, t) {
     return "/" + e.split("/").filter(Boolean).map((e)=>e.startsWith("[[...") ? `:${encodeURIComponent(e.slice(5, -2))}` : e.startsWith("[[") ? `:${encodeURIComponent(e.slice(2, -2))}` : e.startsWith("[") ? `:${encodeURIComponent(e.slice(1, -1))}` : `${encodeURIComponent(e)}`).join("/") + (t ? "/:wildcard*" : "");
 }
 
-function r$4(e) {
+function r$3(e) {
     let { localeSource: o, localeDestination: l, template: r, pathname: i, permanent: a } = e, n = formatRoutePathname((o ? `${o}/` : "") + r), c = formatRoutePathname((l ? `${l}/` : "") + i);
     if (n !== c) return {
         source: n,
@@ -1110,20 +1115,20 @@ let generateRedirects = (t, i, a, n = "", c = !1)=>{
                 pathname: d,
                 permanent: c
             };
-            n ? D ? m.push(r$4({
+            n ? D ? m.push(r$3({
                 ...k,
                 localeDestination: i
-            })) : g ? m.push(r$4({
+            })) : g ? m.push(r$3({
                 ...k,
                 localeSource: i
-            })) : h ? m.push(r$4(k)) : m.push(r$4({
+            })) : h ? m.push(r$3(k)) : m.push(r$3({
                 ...k,
                 localeSource: i,
                 localeDestination: i
-            })) : d !== f && (D ? m.push(r$4({
+            })) : d !== f && (D ? m.push(r$3({
                 ...k,
                 localeDestination: i
-            })) : h ? m.push(r$4(k)) : m.push(r$4({
+            })) : h ? m.push(r$3(k)) : m.push(r$3({
                 ...k,
                 localeSource: i,
                 localeDestination: i
@@ -1144,46 +1149,49 @@ var e$1 = (({ config: e, routes: t, options: o })=>{
     return `module.exports = ${l}`;
 });
 
-function r$3(e) {
-    let { localeSource: t, localeDestination: o, template: r, pathname: i } = e, a = "";
+function o$5(e) {
+    let { localeSource: t, localeDestination: r, template: o, pathname: i } = e, a = "";
     t && (a = `/${t}`);
     let n = formatRoutePathname(a + i), c = "";
-    o && (c = `/${o}`);
-    let s = formatRoutePathname(c + r);
+    r && (c = `/${r}`);
+    let s = formatRoutePathname(c + o);
     if (n !== s) return {
         source: n,
         destination: s
     };
 }
-let generateRewrites = (l, i, a, n = "")=>{
-    let { defaultLocale: c, hideDefaultLocaleInUrl: s } = l, u = RegExp(escapeRegExp(a.tokens.idDelimiter), "g"), p = [];
-    for(let e in i){
-        let t = i[e], a = i[e].pathnames;
-        for(let i in a){
-            let m = a[i], f = i === c && s, d = transformPathname(e.replace(u, "/"), t.wildcard), h = transformPathname(m, t.wildcard);
+let i$2 = (e, t = "", l, r, i, a)=>{
+    let { defaultLocale: n, hideDefaultLocaleInUrl: c } = e, s = l === n && c, u = {
+        config: e,
+        template: r,
+        pathname: i
+    };
+    t ? s ? a.push(o$5({
+        ...u,
+        localeDestination: l
+    })) : a.push(o$5({
+        ...u,
+        localeSource: l,
+        localeDestination: l
+    })) : i !== r && (s ? a.push(o$5(u)) : a.push({
+        ...o$5({
+            ...u,
+            localeSource: l
+        }),
+        locale: !1
+    }));
+};
+let generateRewrites = (l, o, a, n = "")=>{
+    let c = RegExp(escapeRegExp(a.tokens.idDelimiter), "g"), s = [];
+    for(let e in o){
+        let t = o[e], a = o[e].pathnames;
+        for(let o in a){
+            let u = a[o], p = e.replace(c, "/");
             if (t.inWildcard) break;
-            let g = {
-                config: l,
-                template: d,
-                pathname: h
-            };
-            n ? f ? p.push(r$3({
-                ...g,
-                localeDestination: i
-            })) : p.push(r$3({
-                ...g,
-                localeSource: i,
-                localeDestination: i
-            })) : h !== d && (f ? p.push(r$3(g)) : p.push({
-                ...r$3({
-                    ...g,
-                    localeSource: i
-                }),
-                locale: !1
-            }));
+            i$2(l, n, o, transformPathname(p), transformPathname(u), s), t.wildcard && i$2(l, n, o, transformPathname(p, t.wildcard), transformPathname(u, t.wildcard), s);
         }
     }
-    return arrayUniqueByProperties(p.filter(Boolean), [
+    return arrayUniqueByProperties(s.filter(Boolean), [
         "source",
         "destination"
     ]).sort((e, t)=>e.source.localeCompare(t.source));
@@ -1275,19 +1283,22 @@ export const useToSpa = () => {
   const locale = useLocale();
   return <
     Root extends keyof I18n.RouteSpa,
-    Path extends Extract<keyof I18n.RouteSpa[Root], string>
+    Path extends Extract<keyof I18n.RouteSpa[Root], string>,
   >(
+    root: Root,
+    path: Path,
     ...args: I18n.RouteJoinedId<Root, Path> extends I18n.RouteIdDynamic
-    ? [root: Root, path: Path, params: I18n.RouteParams[I18n.RouteJoinedId<Root, Path>]]
-    : I18n.RouteJoinedId<Root, Path> extends I18n.RouteIdStatic
-      ? [root: Root, path: Path]
-      : never
+      ? [params: I18n.RouteParams[I18n.RouteJoinedId<Root, Path>]]
+      : I18n.RouteJoinedId<Root, Path> extends I18n.RouteIdStatic
+        ? []
+        : never
   ) => {
-    const [root, path, params] = args;
+    const [params] = args;
     return (
+      // prettier-ignore
       // @ts-expect-error FIXME: types
-      params ? toSpa(root, path, params, locale) : toSpa(root, path, locale)
-    ) as I18n.RouteSpa[Root][Path];
+      (params ? toSpa(root, path, params, locale) : toSpa(root, path, locale)) as I18n.RouteSpa[Root][Path]
+    );
   };
 };
 

package/package.json

@@ -2,8 +2,8 @@
   "name": "@koine/i18n",
   "sideEffects": false,
   "dependencies": {
-    "@koine/node": "2.0.0-beta.68",
-    "@koine/utils": "2.0.0-beta.68",
+    "@koine/node": "2.0.0-beta.70",
+    "@koine/utils": "2.0.0-beta.70",
     "glob": "^10.3.10",
     "webpack": "^5.90.1",
     "minimatch": "^9.0.3",
@@ -58,5 +58,5 @@
   },
   "module": "./index.esm.js",
   "main": "./index.cjs.js",
-  "version": "2.0.0-beta.68"
+  "version": "2.0.0-beta.70"
 }