@koine/i18n 2.0.0-beta.144 → 2.0.0-beta.146

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

@@ -10,35 +10,37 @@ var imports = require('../../compiler/imports.cjs.js');
 var types = require('./types.cjs.js');
 
 function getTFunction(t, a) {
-    let { defaultLocale: r } = a, { values: o, params: l, plural: p, typeValue: i } = t, u = [], d = "count";
-    p && (l = l ? {
-        ...l,
-        [d]: "number"
+    let { defaultLocale: r, single: o } = a, { values: l, params: p, plural: i, typeValue: u, equalValues: d } = t, y = !o && !d, P = [], $ = "count";
+    i && (p = p ? {
+        ...p,
+        [$]: "number"
     } : {
-        [d]: "number"
-    }), l && u.push({
+        [$]: "number"
+    }), p && P.push({
         name: "params",
-        type: helpers.compileDataParamsToType(l),
+        type: helpers.compileDataParamsToType(p),
         optional: !1
-    }), u.push({
+    }), P.push({
         name: "locale",
         type: "I18n.Locale",
         optional: !0
     });
-    let y = [
+    let h = [
         f.types
-    ], P = "";
-    return utils.isPrimitive(o) ? P += c(o) : P += function(t, a) {
-        let r = "";
-        for(let n in a){
-            let o = a[n];
-            n === t || utils.areEqual(o, a[t]) || (r += `locale === "${n}" ? ${c(o)} : `);
+    ], I = y ? "locale = locale || global." + helpers.GLOBAL_I18N_IDENTIFIER + "; " : "";
+    I += "return ";
+    let x = "";
+    return utils.isPrimitive(l) ? x += c(l) : x += function(t, a, r) {
+        let n = "";
+        if (r) for(let r in a){
+            let o = a[r];
+            r === t || utils.areEqual(o, a[t]) || (n += `locale === "${r}" ? ${c(o)} : `);
         }
-        return r + c(a[t]);
-    }(r, o), p && (y.push(f.tPluralise), P = `tPluralise(${P}, params.${d})`), l && (!p || p && !Object.keys(l).every((e)=>e === d)) && ("Primitive" === i ? (y.push(f.tInterpolateParams), P = `tInterpolateParams(${P}, params)`) : ("Array" === i || "Object" === i) && (y.push(f.tInterpolateParamsDeep), P = `tInterpolateParamsDeep(${P}, params)`)), {
-        body: "locale = locale || global." + helpers.GLOBAL_I18N_IDENTIFIER + "; return " + P,
-        args: u,
-        imports: y
+        return n + c(a[t]);
+    }(r, l, y), i && (h.push(f.tPluralise), x = `tPluralise(${x}, params.${$})`), p && (!i || i && !Object.keys(p).every((e)=>e === $)) && ("Primitive" === u ? (h.push(f.tInterpolateParams), x = `tInterpolateParams(${x}, params)`) : ("Array" === u || "Object" === u) && (h.push(f.tInterpolateParamsDeep), x = `tInterpolateParamsDeep(${x}, params)`)), {
+        body: I + x,
+        args: P,
+        imports: h
     };
 }
 function c(e) {

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

@@ -1,7 +1,7 @@
 import { type FunctionsCompilerDataArg } from "../../compiler/functions";
 import { ImportsCompiler } from "../../compiler/imports";
 import type { I18nCompiler } from "../../compiler/types";
-export declare function getTFunction(translation: I18nCompiler.DataTranslation, options: Pick<I18nCompiler.Config, "defaultLocale">): {
+export declare function getTFunction(translation: I18nCompiler.DataTranslation, options: Pick<I18nCompiler.Config, "defaultLocale" | "single">): {
     body: string;
     args: FunctionsCompilerDataArg[];
     imports: ImportsCompiler[];

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

@@ -6,35 +6,37 @@ import { ImportsCompiler } from '../../compiler/imports.esm.js';
 import { getImportTypes } from './types.esm.js';
 
 function getTFunction(t, a) {
-    let { defaultLocale: r } = a, { values: o, params: l, plural: p, typeValue: i } = t, u = [], d = "count";
-    p && (l = l ? {
-        ...l,
-        [d]: "number"
+    let { defaultLocale: r, single: o } = a, { values: l, params: p, plural: i, typeValue: u, equalValues: d } = t, y = !o && !d, P = [], $ = "count";
+    i && (p = p ? {
+        ...p,
+        [$]: "number"
     } : {
-        [d]: "number"
-    }), l && u.push({
+        [$]: "number"
+    }), p && P.push({
         name: "params",
-        type: compileDataParamsToType(l),
+        type: compileDataParamsToType(p),
         optional: !1
-    }), u.push({
+    }), P.push({
         name: "locale",
         type: "I18n.Locale",
         optional: !0
     });
-    let y = [
+    let h = [
         f.types
-    ], P = "";
-    return isPrimitive(o) ? P += c(o) : P += function(t, a) {
-        let r = "";
-        for(let n in a){
-            let o = a[n];
-            n === t || areEqual(o, a[t]) || (r += `locale === "${n}" ? ${c(o)} : `);
+    ], I = y ? "locale = locale || global." + GLOBAL_I18N_IDENTIFIER + "; " : "";
+    I += "return ";
+    let x = "";
+    return isPrimitive(l) ? x += c(l) : x += function(t, a, r) {
+        let n = "";
+        if (r) for(let r in a){
+            let o = a[r];
+            r === t || areEqual(o, a[t]) || (n += `locale === "${r}" ? ${c(o)} : `);
         }
-        return r + c(a[t]);
-    }(r, o), p && (y.push(f.tPluralise), P = `tPluralise(${P}, params.${d})`), l && (!p || p && !Object.keys(l).every((e)=>e === d)) && ("Primitive" === i ? (y.push(f.tInterpolateParams), P = `tInterpolateParams(${P}, params)`) : ("Array" === i || "Object" === i) && (y.push(f.tInterpolateParamsDeep), P = `tInterpolateParamsDeep(${P}, params)`)), {
-        body: "locale = locale || global." + GLOBAL_I18N_IDENTIFIER + "; return " + P,
-        args: u,
-        imports: y
+        return n + c(a[t]);
+    }(r, l, y), i && (h.push(f.tPluralise), x = `tPluralise(${x}, params.${$})`), p && (!i || i && !Object.keys(p).every((e)=>e === $)) && ("Primitive" === u ? (h.push(f.tInterpolateParams), x = `tInterpolateParams(${x}, params)`) : ("Array" === u || "Object" === u) && (h.push(f.tInterpolateParamsDeep), x = `tInterpolateParamsDeep(${x}, params)`)), {
+        body: I + x,
+        args: P,
+        imports: h
     };
 }
 function c(e) {

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

@@ -2,7 +2,7 @@
 
 var createAdapter = require('../../../compiler/createAdapter.cjs.js');
 
-var s = createAdapter.createGenerator("next", (e)=>{
+var i = createAdapter.createGenerator("next", (e)=>{
     let { options: { adapter: { modularize: t } } } = e;
     return {
         i18nServer: {
@@ -72,4 +72,4 @@ export default i18nServer;
     };
 });
 
-module.exports = s;
+module.exports = i;

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

@@ -1,6 +1,6 @@
 import { createGenerator } from '../../../compiler/createAdapter.esm.js';
 
-var s = createGenerator("next", (e)=>{
+var i = createGenerator("next", (e)=>{
     let { options: { adapter: { modularize: t } } } = e;
     return {
         i18nServer: {
@@ -70,4 +70,4 @@ export default i18nServer;
     };
 });
 
-export { s as default };
+export { i as default };

package/adapter-next/generators/router-pages/I18nApp.cjs.js

@@ -2,7 +2,7 @@
 
 var createAdapter = require('../../../compiler/createAdapter.cjs.js');
 
-var i = createAdapter.createGenerator("next", (e)=>({
+var s = createAdapter.createGenerator("next", (e)=>({
         I18nApp: {
             name: "I18nApp",
             ext: "tsx",
@@ -86,4 +86,4 @@ export default I18nApp;
         }
     }));
 
-module.exports = i;
+module.exports = s;

package/adapter-next/generators/router-pages/I18nApp.esm.js

@@ -1,6 +1,6 @@
 import { createGenerator } from '../../../compiler/createAdapter.esm.js';
 
-var i = createGenerator("next", (e)=>({
+var s = createGenerator("next", (e)=>({
         I18nApp: {
             name: "I18nApp",
             ext: "tsx",
@@ -84,4 +84,4 @@ export default I18nApp;
         }
     }));
 
-export { i as default };
+export { s as default };

package/adapter-next/generators/router-pages/I18nHead.cjs.js

@@ -2,7 +2,7 @@
 
 var createAdapter = require('../../../compiler/createAdapter.cjs.js');
 
-var g = createAdapter.createGenerator("next", (a)=>({
+var f = createAdapter.createGenerator("next", (a)=>({
         I18nHead: {
             dir: createAdapter.createGenerator.dirs.internal,
             name: "I18nHead",
@@ -51,4 +51,4 @@ export const I18nHead = (props: I18nHeadProps) => {
         }
     }));
 
-module.exports = g;
+module.exports = f;

package/adapter-next/generators/router-pages/I18nHead.esm.js

@@ -1,6 +1,6 @@
 import { createGenerator } from '../../../compiler/createAdapter.esm.js';
 
-var g = createGenerator("next", (a)=>({
+var f = createGenerator("next", (a)=>({
         I18nHead: {
             dir: createGenerator.dirs.internal,
             name: "I18nHead",
@@ -49,4 +49,4 @@ export const I18nHead = (props: I18nHeadProps) => {
         }
     }));
 
-export { g as default };
+export { f as default };

package/adapter-next/generators/router-pages/I18nSetter.cjs.js

@@ -2,7 +2,7 @@
 
 var createAdapter = require('../../../compiler/createAdapter.cjs.js');
 
-var f = createAdapter.createGenerator("next", (e)=>({
+var g = createAdapter.createGenerator("next", (e)=>({
         I18nSetter: {
             name: "I18nSetter",
             ext: "tsx",
@@ -54,4 +54,4 @@ export default I18nSetter;
         }
     }));
 
-module.exports = f;
+module.exports = g;

package/adapter-next/generators/router-pages/I18nSetter.esm.js

@@ -1,6 +1,6 @@
 import { createGenerator } from '../../../compiler/createAdapter.esm.js';
 
-var f = createGenerator("next", (e)=>({
+var g = createGenerator("next", (e)=>({
         I18nSetter: {
             name: "I18nSetter",
             ext: "tsx",
@@ -52,4 +52,4 @@ export default I18nSetter;
         }
     }));
 
-export { f as default };
+export { g as default };

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

@@ -2,7 +2,7 @@
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var d = createAdapter.createGenerator("next", (t)=>{
+var l = createAdapter.createGenerator("next", (t)=>{
     let { options: { routes: { localeParamName: e }, adapter: { router: o } } } = t;
     return {
         useRouteId: {
@@ -71,4 +71,4 @@ export default useRouteId;
     };
 });
 
-module.exports = d;
+module.exports = l;

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

@@ -1,6 +1,6 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var d = createGenerator("next", (t)=>{
+var l = createGenerator("next", (t)=>{
     let { options: { routes: { localeParamName: e }, adapter: { router: o } } } = t;
     return {
         useRouteId: {
@@ -69,4 +69,4 @@ export default useRouteId;
     };
 });
 
-export { d as default };
+export { l as default };

package/adapter-next/generators/webpack-define.cjs.js

@@ -14,11 +14,11 @@ var index = require('../index.cjs.js');
 function m(e) {
     return e.replace(/\s+/g, " ");
 }
-var l = createAdapter.createGenerator("next", (u)=>{
+var d = createAdapter.createGenerator("next", (u)=>{
     let { config: d, options: $ } = u, { debug: f } = d, { cwd: b, output: j } = $.write || {
         cwd: "",
         output: ""
-    }, g = index.resolveGlobalizeOption($.adapter.globalize), y = g.functions.routes ? u.routes.byId : {}, I = g.functions.translations ? u.translations : {};
+    }, { modularize: g } = $.adapter, y = index.resolveGlobalizeOption($.adapter.globalize), I = y.functions.routes ? u.routes.byId : {}, k = y.functions.translations ? u.translations : {};
     return {
         webpackDefineGranularTypes: {
             dir: createAdapter.createGenerator.dirs.internal,
@@ -31,12 +31,12 @@ var l = createAdapter.createGenerator("next", (u)=>{
 export {};
 
 declare global {
-  ${Object.keys(y).map((t)=>{
-                    let { id: n, fnName: a, params: o } = y[t], r = `var ${g.prefix}_${a}: (`;
+  ${Object.keys(I).map((t)=>{
+                    let { id: n, fnName: a, params: o } = I[t], r = `var ${y.prefixSafe}${a}: (`;
                     return o ? r += `params: ${helpers.compileDataParamsToType(o)}, ` : r += "", r += `locale?: ${e}) => import("../types").I18n.RoutePathnames["${n}"]`;
                 }).join(";\n  ")};
-  ${Object.keys(I).map((t)=>{
-                    let { fnName: n, params: a, values: o } = I[t], r = `var ${g.prefix}_${n}: (`;
+  ${Object.keys(k).map((t)=>{
+                    let { fnName: n, params: a, values: o } = k[t], r = `var ${y.prefixSafe}${n}: (`;
                     return a ? r += `params: ${helpers.compileDataParamsToType(a)}, ` : r += "", r += `locale?: ${e}) => ${JSON.stringify(o[d.defaultLocale])}`;
                 }).join(";\n  ")};
 }
@@ -52,28 +52,30 @@ declare global {
 const { join } = require("path");
 const { DefinePlugin } = require("webpack");
 
+const base = join("${b}", "${j}");
+
 module.exports = {
-  ${Object.keys(y).map((t)=>{
-                    let n = y[t], { fnName: a } = n, { args: o, body: l } = to.getToFunction(n, d);
-                    return `${g.prefix}_${a}: DefinePlugin.runtimeValue(() => ` + m([
+  ${Object.keys(I).map((t)=>{
+                    let n = I[t], { fnName: a } = n, { args: o, body: i } = to.getToFunction(n, d), { dir: l } = $.routes.functions;
+                    return `${y.prefixSafe}${a}: DefinePlugin.runtimeValue(() => ` + m([
                         "`(function(" + o.map((e)=>e.name).join(", ") + ") {",
-                        "locale = locale || global." + helpers.GLOBAL_I18N_IDENTIFIER + ";",
                         formatTo.formatTo(d).$outInline(),
-                        "return " + l,
-                        "})`"
-                    ].join(" ") + ", { fileDependencies: [" + $.adapter.modularize ? `join("${b}", "${j}", "${$.routes.functions.dir}", "${a}.ts")` : `join("${b}", "${j}", "$to.ts")] }`);
+                        i,
+                        "})`,",
+                        `{ fileDependencies: [join(base, ${g ? `"${l}", "${a}.ts"` : `"${l}.ts"`})] }`
+                    ].join(" "));
                 }).join("),\n  ")}),
-  ${Object.keys(I).map((e)=>{
-                    let r = I[e], { fnName: l, params: i, typeValue: p, plural: c } = r, { args: u, body: f } = t.getTFunction(r, d);
-                    return `${g.prefix}_${l}: DefinePlugin.runtimeValue(() => ` + m([
-                        "`(function(" + u.map((e)=>e.name).join(", ") + ") {",
-                        "locale = locale || global." + helpers.GLOBAL_I18N_IDENTIFIER + ";",
-                        i ? tInterpolateParams.tInterpolateParams($.translations.tokens.dynamicDelimiters).$outInline() : "",
-                        "Primitive" === p ? "" : tInterpolateParamsDeep.tInterpolateParamsDeep().$outInline(),
-                        c ? tPluralise.tPluralise().$outInline() : "",
-                        "return " + f,
-                        "})`"
-                    ].join(" ") + ", { fileDependencies: [" + $.adapter.modularize ? `join("${b}", "${j}", "${$.translations.functions.dir}", "${l}.ts")` : `join("${b}", "${j}", "$t.ts")] }`);
+  ${Object.keys(k).map((e)=>{
+                    let r = k[e], { fnName: i, params: l, typeValue: s, plural: p } = r, { args: c, body: u } = t.getTFunction(r, d), { dir: f } = $.translations.functions;
+                    return `${y.prefixSafe}${i}: DefinePlugin.runtimeValue(() => ` + m([
+                        "`(function(" + c.map((e)=>e.name).join(", ") + ") {",
+                        l ? tInterpolateParams.tInterpolateParams($.translations.tokens.dynamicDelimiters).$outInline() : "",
+                        l ? "Primitive" === s ? "" : tInterpolateParamsDeep.tInterpolateParamsDeep().$outInline() : "",
+                        p ? tPluralise.tPluralise().$outInline() : "",
+                        u,
+                        "})`,",
+                        `{ fileDependencies: [join(base, ${g ? `"${f}", "${i}.ts"` : `"${f}.ts"`})] }`
+                    ].join(" "));
                 }).join(`),\n  `)}),
 };
 `
@@ -125,7 +127,7 @@ declare global {
    */
   ${a}
 
-  var ${g.prefix}: {
+  var ${y.prefix}: {
     t: GlobalT;
     to: GlobalTo;
   }
@@ -144,7 +146,7 @@ const { join } = require("path");
 const { DefinePlugin } = require("webpack");
 
 module.exports = {
-  ${g.prefix}: DefinePlugin.runtimeValue(
+  ${y.prefix}: DefinePlugin.runtimeValue(
     (_ctx) => {
       ${"internal" === f ? 'console.log("[@koine/i18n]:webpack-define:ctx.module", _ctx.module);' : ""};
       return {
@@ -161,9 +163,9 @@ module.exports = {
                 })}
 
           const lookup = {
-            ${Object.keys(y).map((e)=>{
-                    let { args: t, body: n } = to.getToFunction(y[e], d);
-                    return `"${e}": (${t.map((e)=>"locale" === e.name ? "locale = locale" : e.name).join(", ")}) => ${n}`;
+            ${Object.keys(I).map((e)=>{
+                    let { args: t, body: n } = to.getToFunction(I[e], d);
+                    return `"${e}": (${t.map((e)=>e.name).join(", ")}) => { ${n} }`;
                 }).join(",\n  ")}
           };
 
@@ -181,9 +183,9 @@ module.exports = {
           ${tInterpolateParamsDeep.tInterpolateParamsDeep().$outInline()}
 
           const lookup = {
-            ${Object.keys(I).map((e)=>{
-                    let n = I[e], { fullKey: a } = n, { args: o, body: r } = t.getTFunction(n, d);
-                    return `"${a}": (${o.map((e)=>"locale" === e.name ? "locale = locale" : e.name).join(", ")}) => ${r}`;
+            ${Object.keys(k).map((e)=>{
+                    let n = k[e], { fullKey: a } = n, { args: o, body: r } = t.getTFunction(n, d);
+                    return `"${a}": (${o.map((e)=>e.name).join(", ")}) => { ${r} }`;
                 }).join(",\n  ")}
           };
 
@@ -206,4 +208,4 @@ module.exports = {
     };
 });
 
-module.exports = l;
+module.exports = d;

package/adapter-next/generators/webpack-define.esm.js

@@ -12,11 +12,11 @@ import { resolveGlobalizeOption } from '../index.esm.js';
 function m(e) {
     return e.replace(/\s+/g, " ");
 }
-var l = createGenerator("next", (u)=>{
+var d = createGenerator("next", (u)=>{
     let { config: d, options: $ } = u, { debug: f } = d, { cwd: b, output: j } = $.write || {
         cwd: "",
         output: ""
-    }, g = resolveGlobalizeOption($.adapter.globalize), y = g.functions.routes ? u.routes.byId : {}, I = g.functions.translations ? u.translations : {};
+    }, { modularize: g } = $.adapter, y = resolveGlobalizeOption($.adapter.globalize), I = y.functions.routes ? u.routes.byId : {}, k = y.functions.translations ? u.translations : {};
     return {
         webpackDefineGranularTypes: {
             dir: createGenerator.dirs.internal,
@@ -29,12 +29,12 @@ var l = createGenerator("next", (u)=>{
 export {};
 
 declare global {
-  ${Object.keys(y).map((t)=>{
-                    let { id: n, fnName: a, params: o } = y[t], r = `var ${g.prefix}_${a}: (`;
+  ${Object.keys(I).map((t)=>{
+                    let { id: n, fnName: a, params: o } = I[t], r = `var ${y.prefixSafe}${a}: (`;
                     return o ? r += `params: ${compileDataParamsToType(o)}, ` : r += "", r += `locale?: ${e}) => import("../types").I18n.RoutePathnames["${n}"]`;
                 }).join(";\n  ")};
-  ${Object.keys(I).map((t)=>{
-                    let { fnName: n, params: a, values: o } = I[t], r = `var ${g.prefix}_${n}: (`;
+  ${Object.keys(k).map((t)=>{
+                    let { fnName: n, params: a, values: o } = k[t], r = `var ${y.prefixSafe}${n}: (`;
                     return a ? r += `params: ${compileDataParamsToType(a)}, ` : r += "", r += `locale?: ${e}) => ${JSON.stringify(o[d.defaultLocale])}`;
                 }).join(";\n  ")};
 }
@@ -50,28 +50,30 @@ declare global {
 const { join } = require("path");
 const { DefinePlugin } = require("webpack");
 
+const base = join("${b}", "${j}");
+
 module.exports = {
-  ${Object.keys(y).map((t)=>{
-                    let n = y[t], { fnName: a } = n, { args: o, body: l } = getToFunction(n, d);
-                    return `${g.prefix}_${a}: DefinePlugin.runtimeValue(() => ` + m([
+  ${Object.keys(I).map((t)=>{
+                    let n = I[t], { fnName: a } = n, { args: o, body: i } = getToFunction(n, d), { dir: l } = $.routes.functions;
+                    return `${y.prefixSafe}${a}: DefinePlugin.runtimeValue(() => ` + m([
                         "`(function(" + o.map((e)=>e.name).join(", ") + ") {",
-                        "locale = locale || global." + GLOBAL_I18N_IDENTIFIER + ";",
                         formatTo(d).$outInline(),
-                        "return " + l,
-                        "})`"
-                    ].join(" ") + ", { fileDependencies: [" + $.adapter.modularize ? `join("${b}", "${j}", "${$.routes.functions.dir}", "${a}.ts")` : `join("${b}", "${j}", "$to.ts")] }`);
+                        i,
+                        "})`,",
+                        `{ fileDependencies: [join(base, ${g ? `"${l}", "${a}.ts"` : `"${l}.ts"`})] }`
+                    ].join(" "));
                 }).join("),\n  ")}),
-  ${Object.keys(I).map((e)=>{
-                    let r = I[e], { fnName: l, params: i, typeValue: p, plural: c } = r, { args: u, body: f } = getTFunction(r, d);
-                    return `${g.prefix}_${l}: DefinePlugin.runtimeValue(() => ` + m([
-                        "`(function(" + u.map((e)=>e.name).join(", ") + ") {",
-                        "locale = locale || global." + GLOBAL_I18N_IDENTIFIER + ";",
-                        i ? tInterpolateParams($.translations.tokens.dynamicDelimiters).$outInline() : "",
-                        "Primitive" === p ? "" : tInterpolateParamsDeep().$outInline(),
-                        c ? tPluralise().$outInline() : "",
-                        "return " + f,
-                        "})`"
-                    ].join(" ") + ", { fileDependencies: [" + $.adapter.modularize ? `join("${b}", "${j}", "${$.translations.functions.dir}", "${l}.ts")` : `join("${b}", "${j}", "$t.ts")] }`);
+  ${Object.keys(k).map((e)=>{
+                    let r = k[e], { fnName: i, params: l, typeValue: s, plural: p } = r, { args: c, body: u } = getTFunction(r, d), { dir: f } = $.translations.functions;
+                    return `${y.prefixSafe}${i}: DefinePlugin.runtimeValue(() => ` + m([
+                        "`(function(" + c.map((e)=>e.name).join(", ") + ") {",
+                        l ? tInterpolateParams($.translations.tokens.dynamicDelimiters).$outInline() : "",
+                        l ? "Primitive" === s ? "" : tInterpolateParamsDeep().$outInline() : "",
+                        p ? tPluralise().$outInline() : "",
+                        u,
+                        "})`,",
+                        `{ fileDependencies: [join(base, ${g ? `"${f}", "${i}.ts"` : `"${f}.ts"`})] }`
+                    ].join(" "));
                 }).join(`),\n  `)}),
 };
 `
@@ -123,7 +125,7 @@ declare global {
    */
   ${a}
 
-  var ${g.prefix}: {
+  var ${y.prefix}: {
     t: GlobalT;
     to: GlobalTo;
   }
@@ -142,7 +144,7 @@ const { join } = require("path");
 const { DefinePlugin } = require("webpack");
 
 module.exports = {
-  ${g.prefix}: DefinePlugin.runtimeValue(
+  ${y.prefix}: DefinePlugin.runtimeValue(
     (_ctx) => {
       ${"internal" === f ? 'console.log("[@koine/i18n]:webpack-define:ctx.module", _ctx.module);' : ""};
       return {
@@ -159,9 +161,9 @@ module.exports = {
                 })}
 
           const lookup = {
-            ${Object.keys(y).map((e)=>{
-                    let { args: t, body: n } = getToFunction(y[e], d);
-                    return `"${e}": (${t.map((e)=>"locale" === e.name ? "locale = locale" : e.name).join(", ")}) => ${n}`;
+            ${Object.keys(I).map((e)=>{
+                    let { args: t, body: n } = getToFunction(I[e], d);
+                    return `"${e}": (${t.map((e)=>e.name).join(", ")}) => { ${n} }`;
                 }).join(",\n  ")}
           };
 
@@ -179,9 +181,9 @@ module.exports = {
           ${tInterpolateParamsDeep().$outInline()}
 
           const lookup = {
-            ${Object.keys(I).map((e)=>{
-                    let n = I[e], { fullKey: a } = n, { args: o, body: r } = getTFunction(n, d);
-                    return `"${a}": (${o.map((e)=>"locale" === e.name ? "locale = locale" : e.name).join(", ")}) => ${r}`;
+            ${Object.keys(k).map((e)=>{
+                    let n = k[e], { fullKey: a } = n, { args: o, body: r } = getTFunction(n, d);
+                    return `"${a}": (${o.map((e)=>e.name).join(", ")}) => { ${r} }`;
                 }).join(",\n  ")}
           };
 
@@ -204,4 +206,4 @@ module.exports = {
     };
 });
 
-export { l as default };
+export { d as default };

package/adapter-next/index.cjs.js

@@ -21,7 +21,8 @@ var webpackDefine = require('./generators/webpack-define.cjs.js');
 function resolveGlobalizeOption(r) {
     let { functions: e, prefix: t } = r;
     return {
-        prefix: t,
+        prefix: t || "",
+        prefixSafe: t ? (t + "_").replace(/_+$/, "_") : "",
         functions: "boolean" == typeof e ? {
             routes: !0,
             translations: !0

package/adapter-next/index.d.ts

@@ -49,8 +49,14 @@ export type Options = AdapterReactOptions & {
         };
     };
 };
+/**
+ * We add `safePrefix`: when `prefix` is present we add an underscore after it
+ * and remove consecutive underscores in case the user defined prefix already
+ * had an ending underscore.
+ */
 export declare function resolveGlobalizeOption(globalize: Options["globalize"]): {
     prefix: string;
+    prefixSafe: string;
     functions: {
         /**
          * Configure generation of _routes_' `to` functions

package/adapter-next/index.esm.js

@@ -5,19 +5,20 @@ import o from './generators/next-rewrites.esm.js';
 import a from './generators/router-app/I18nLayout.esm.js';
 import p from './generators/router-app/I18nLayoutRoot.esm.js';
 import n from './generators/router-app/I18nPage.esm.js';
-import s from './generators/router-app/i18nServer.esm.js';
-import i from './generators/router-pages/I18nApp.esm.js';
+import i from './generators/router-app/i18nServer.esm.js';
+import s from './generators/router-pages/I18nApp.esm.js';
 import m from './generators/router-pages/I18nDocument.esm.js';
-import g from './generators/router-pages/I18nHead.esm.js';
-import f from './generators/router-pages/I18nSetter.esm.js';
+import f from './generators/router-pages/I18nHead.esm.js';
+import g from './generators/router-pages/I18nSetter.esm.js';
 import u from './generators/router-pages/i18nGet.esm.js';
-import d from './generators/useRouteId.esm.js';
-import l from './generators/webpack-define.esm.js';
+import l from './generators/useRouteId.esm.js';
+import d from './generators/webpack-define.esm.js';
 
 function resolveGlobalizeOption(r) {
     let { functions: e, prefix: t } = r;
     return {
-        prefix: t,
+        prefix: t || "",
+        prefixSafe: t ? (t + "_").replace(/_+$/, "_") : "",
         functions: "boolean" == typeof e ? {
             routes: !0,
             translations: !0
@@ -44,17 +45,17 @@ const adapterNext = createAdapter({
                 a,
                 p,
                 n,
-                s
+                i
             ] : [],
             ..."pages" === c || "migrating" === c ? [
-                i,
+                s,
                 m,
-                g,
                 f,
+                g,
                 u
             ] : [],
-            d,
-            l
+            l,
+            d
         ];
     },
     getTransformers: (r)=>{

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

@@ -49,87 +49,100 @@ function h(e, t, l) {
     }
     return l;
 }
-let v = RegExp(node_path.sep, "g");
-function y(e, { id: t, namespace: l, path: a, locale: r, value: n, typeValue: i }, s) {
+let y = RegExp(node_path.sep, "g");
+function _(e, { id: t, namespace: l, path: a, locale: r, value: n, typeValue: i }, s) {
     let u;
-    let o = null === n ? null : h(e, n), p = l + e.tokens.namespaceDelimiter + a, c = {
+    let o = null === n ? null : h(e, n), c = l + e.tokens.namespaceDelimiter + a, f = {
         ...s,
         id: t,
-        fnName: (u = p.replace(/~/g, "_").replace(/-|\.|:/g, "_").replace(v, "_").replace(/[^a-zA-Z0-9_$]/gi, ""), u = /^[0-9]/.test(u) ? "_" + u : u, (e.functions.prefix + u).replace(/_+/g, "_")),
+        fnName: (u = c.replace(/~/g, "_").replace(/-|\.|:/g, "_").replace(y, "_").replace(/[^a-zA-Z0-9_$]/gi, ""), u = /^[0-9]/.test(u) ? "_" + u : u, (e.functions.prefix + u).replace(/_+/g, "_")),
         namespace: l,
         path: a,
-        fullKey: p,
+        fullKey: c,
         typeValue: i,
         values: s?.values || {}
     };
-    return null !== r && null !== n && (c.values[r] = n), o && Object.keys(o).length && (c.params = o), c;
+    return null !== r && null !== n && (f.values[r] = n), o && Object.keys(o).length && (f.params = o), f;
 }
-let getCodeDataTranslations = (r, u, { translationFiles: v })=>{
-    let { ignorePaths: _ } = u, k = {};
-    return helpers.filterInputTranslationFiles(v, _).forEach((r)=>(function(r, i, u) {
-            let { locale: o, path: p } = u, c = node_path.join(node_path.dirname(p), node_path.basename(p, node_path.extname(p))), f = c;
-            for(let e in u.data){
-                let t = u.data[e];
-                e && (f = c + ":" + e), function e(t, l, { id: a, namespace: r, path: i, locale: u, value: o }) {
-                    let p = l[a];
-                    if (utils.isPrimitive(o)) l[a] = y(t, {
+let getCodeDataTranslations = (r, o, { translationFiles: y })=>{
+    let { ignorePaths: k } = o, x = {};
+    return helpers.filterInputTranslationFiles(y, k).forEach((r)=>(function(r, n, s) {
+            let { locale: o, path: c } = s, f = node_path.join(node_path.dirname(c), node_path.basename(c, node_path.extname(c))), p = f;
+            for(let e in s.data){
+                let t = s.data[e];
+                e && (p = f + ":" + e), function e(t, l, { id: a, namespace: r, path: n, locale: s, value: o }) {
+                    let c = l[a];
+                    if (utils.isPrimitive(o)) l[a] = _(t, {
                         id: a,
                         namespace: r,
-                        path: i,
+                        path: n,
                         typeValue: "Primitive",
-                        locale: u,
+                        locale: s,
                         value: o
-                    }, p);
-                    else if (t.functions.asData && (l[a] = y(t, {
+                    }, c);
+                    else if (t.functions.asData && (l[a] = _(t, {
                         id: a,
                         namespace: r,
-                        path: i,
+                        path: n,
                         typeValue: utils.isArray(o) ? "Array" : "Object",
-                        locale: u,
+                        locale: s,
                         value: o
-                    }, p)), utils.isArray(o)) {
-                        if (t.createArrayIndexBasedFns) for(let n = 0; n < o.length; n++)e(t, l, {
-                            id: a + "_" + n,
+                    }, c)), utils.isArray(o)) {
+                        if (t.createArrayIndexBasedFns) for(let i = 0; i < o.length; i++)e(t, l, {
+                            id: a + "_" + i,
                             namespace: r,
-                            path: i + "[" + n + "]",
-                            locale: u,
-                            value: o[n]
+                            path: n + "[" + i + "]",
+                            locale: s,
+                            value: o[i]
                         });
-                    } else for(let n in o)e(t, l, {
-                        id: a + "_" + n,
+                    } else for(let i in o)e(t, l, {
+                        id: a + "_" + i,
                         namespace: r,
-                        path: i + "." + n,
-                        locale: u,
-                        value: o[n]
+                        path: n + "." + i,
+                        locale: s,
+                        value: o[i]
                     });
                     return l;
-                }(r, i, {
-                    id: f,
-                    namespace: c,
+                }(r, n, {
+                    id: p,
+                    namespace: f,
                     path: e,
                     locale: o,
                     value: t
                 });
             }
-            return i;
-        })(u, k, r)), k = utils.objectSort(k = function(e, t) {
+            return n;
+        })(o, x, r)), x = utils.objectSort(x = function(e, t) {
+        for(let e in t){
+            let l = t[e], a = null, r = !0;
+            for(let e in l.values){
+                if (a && !utils.areEqual(a, l.values[e])) {
+                    r = !1;
+                    continue;
+                }
+                a = l.values[e];
+            }
+            r && (t[e].equalValues = !0);
+        }
+        return t;
+    }(0, x = function(e, t) {
         let l = Object.keys(t).filter(pluralisation.isPluralKey);
         return l.forEach((a)=>{
-            let r = pluralisation.removePluralSuffix(a), n = pluralisation.getPluralSuffix(a), s = t[a], u = pluralisation.getRequiredPluralSuffix(r);
+            let r = pluralisation.removePluralSuffix(a), n = pluralisation.getPluralSuffix(a), i = t[a], u = pluralisation.getRequiredPluralSuffix(r);
             if (!l.includes(u)) return;
             let o = !!t[r];
-            if (s) {
-                o || (t[r] = y(e, {
+            if (i) {
+                o || (t[r] = _(e, {
                     id: r,
-                    namespace: s.namespace,
-                    path: pluralisation.removePluralSuffix(s.path),
+                    namespace: i.namespace,
+                    path: pluralisation.removePluralSuffix(i.path),
                     typeValue: "Primitive",
                     locale: null,
                     value: null
                 }));
                 let l = t[r].values || {};
-                for(let a in s.values){
-                    let u = s.values[a];
+                for(let a in i.values){
+                    let u = i.values[a];
                     l[a] = utils.isObject(l[a]) ? l[a] : {}, l[a][n] = u;
                     let o = h(e, u);
                     o && (t[r].params = {
@@ -145,7 +158,7 @@ let getCodeDataTranslations = (r, u, { translationFiles: v })=>{
                 delete t[a];
             }
         }), t;
-    }(u, k));
+    }(o, x)));
 };
 
 exports.codeDataTranslationsOptions = codeDataTranslationsOptions;

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

@@ -1,5 +1,5 @@
 import { join, dirname, basename, extname, sep } from 'node:path';
-import { isPrimitive, isArray, objectSort, isObject, isString } from '@koine/utils';
+import { isPrimitive, isArray, objectSort, isObject, isString, areEqual } from '@koine/utils';
 import { filterInputTranslationFiles } from '../helpers.esm.js';
 import { isPluralKey, removePluralSuffix, getPluralSuffix, hasOnlyPluralKeys, getRequiredPluralSuffix } from '../pluralisation.esm.js';
 
@@ -47,87 +47,100 @@ function h(e, t, l) {
     }
     return l;
 }
-let v = RegExp(sep, "g");
-function y(e, { id: t, namespace: l, path: a, locale: r, value: n, typeValue: i }, s) {
+let y = RegExp(sep, "g");
+function _(e, { id: t, namespace: l, path: a, locale: r, value: n, typeValue: i }, s) {
     let u;
-    let o = null === n ? null : h(e, n), p = l + e.tokens.namespaceDelimiter + a, c = {
+    let o = null === n ? null : h(e, n), c = l + e.tokens.namespaceDelimiter + a, f = {
         ...s,
         id: t,
-        fnName: (u = p.replace(/~/g, "_").replace(/-|\.|:/g, "_").replace(v, "_").replace(/[^a-zA-Z0-9_$]/gi, ""), u = /^[0-9]/.test(u) ? "_" + u : u, (e.functions.prefix + u).replace(/_+/g, "_")),
+        fnName: (u = c.replace(/~/g, "_").replace(/-|\.|:/g, "_").replace(y, "_").replace(/[^a-zA-Z0-9_$]/gi, ""), u = /^[0-9]/.test(u) ? "_" + u : u, (e.functions.prefix + u).replace(/_+/g, "_")),
         namespace: l,
         path: a,
-        fullKey: p,
+        fullKey: c,
         typeValue: i,
         values: s?.values || {}
     };
-    return null !== r && null !== n && (c.values[r] = n), o && Object.keys(o).length && (c.params = o), c;
+    return null !== r && null !== n && (f.values[r] = n), o && Object.keys(o).length && (f.params = o), f;
 }
-let getCodeDataTranslations = (r, u, { translationFiles: v })=>{
-    let { ignorePaths: _ } = u, k = {};
-    return filterInputTranslationFiles(v, _).forEach((r)=>(function(r, i, u) {
-            let { locale: o, path: p } = u, c = join(dirname(p), basename(p, extname(p))), f = c;
-            for(let e in u.data){
-                let t = u.data[e];
-                e && (f = c + ":" + e), function e(t, l, { id: a, namespace: r, path: i, locale: u, value: o }) {
-                    let p = l[a];
-                    if (isPrimitive(o)) l[a] = y(t, {
+let getCodeDataTranslations = (r, o, { translationFiles: y })=>{
+    let { ignorePaths: k } = o, x = {};
+    return filterInputTranslationFiles(y, k).forEach((r)=>(function(r, n, s) {
+            let { locale: o, path: c } = s, f = join(dirname(c), basename(c, extname(c))), p = f;
+            for(let e in s.data){
+                let t = s.data[e];
+                e && (p = f + ":" + e), function e(t, l, { id: a, namespace: r, path: n, locale: s, value: o }) {
+                    let c = l[a];
+                    if (isPrimitive(o)) l[a] = _(t, {
                         id: a,
                         namespace: r,
-                        path: i,
+                        path: n,
                         typeValue: "Primitive",
-                        locale: u,
+                        locale: s,
                         value: o
-                    }, p);
-                    else if (t.functions.asData && (l[a] = y(t, {
+                    }, c);
+                    else if (t.functions.asData && (l[a] = _(t, {
                         id: a,
                         namespace: r,
-                        path: i,
+                        path: n,
                         typeValue: isArray(o) ? "Array" : "Object",
-                        locale: u,
+                        locale: s,
                         value: o
-                    }, p)), isArray(o)) {
-                        if (t.createArrayIndexBasedFns) for(let n = 0; n < o.length; n++)e(t, l, {
-                            id: a + "_" + n,
+                    }, c)), isArray(o)) {
+                        if (t.createArrayIndexBasedFns) for(let i = 0; i < o.length; i++)e(t, l, {
+                            id: a + "_" + i,
                             namespace: r,
-                            path: i + "[" + n + "]",
-                            locale: u,
-                            value: o[n]
+                            path: n + "[" + i + "]",
+                            locale: s,
+                            value: o[i]
                         });
-                    } else for(let n in o)e(t, l, {
-                        id: a + "_" + n,
+                    } else for(let i in o)e(t, l, {
+                        id: a + "_" + i,
                         namespace: r,
-                        path: i + "." + n,
-                        locale: u,
-                        value: o[n]
+                        path: n + "." + i,
+                        locale: s,
+                        value: o[i]
                     });
                     return l;
-                }(r, i, {
-                    id: f,
-                    namespace: c,
+                }(r, n, {
+                    id: p,
+                    namespace: f,
                     path: e,
                     locale: o,
                     value: t
                 });
             }
-            return i;
-        })(u, k, r)), k = objectSort(k = function(e, t) {
+            return n;
+        })(o, x, r)), x = objectSort(x = function(e, t) {
+        for(let e in t){
+            let l = t[e], a = null, r = !0;
+            for(let e in l.values){
+                if (a && !areEqual(a, l.values[e])) {
+                    r = !1;
+                    continue;
+                }
+                a = l.values[e];
+            }
+            r && (t[e].equalValues = !0);
+        }
+        return t;
+    }(0, x = function(e, t) {
         let l = Object.keys(t).filter(isPluralKey);
         return l.forEach((a)=>{
-            let r = removePluralSuffix(a), n = getPluralSuffix(a), s = t[a], u = getRequiredPluralSuffix(r);
+            let r = removePluralSuffix(a), n = getPluralSuffix(a), i = t[a], u = getRequiredPluralSuffix(r);
             if (!l.includes(u)) return;
             let o = !!t[r];
-            if (s) {
-                o || (t[r] = y(e, {
+            if (i) {
+                o || (t[r] = _(e, {
                     id: r,
-                    namespace: s.namespace,
-                    path: removePluralSuffix(s.path),
+                    namespace: i.namespace,
+                    path: removePluralSuffix(i.path),
                     typeValue: "Primitive",
                     locale: null,
                     value: null
                 }));
                 let l = t[r].values || {};
-                for(let a in s.values){
-                    let u = s.values[a];
+                for(let a in i.values){
+                    let u = i.values[a];
                     l[a] = isObject(l[a]) ? l[a] : {}, l[a][n] = u;
                     let o = h(e, u);
                     o && (t[r].params = {
@@ -143,7 +156,7 @@ let getCodeDataTranslations = (r, u, { translationFiles: v })=>{
                 delete t[a];
             }
         }), t;
-    }(u, k));
+    }(o, x)));
 };
 
 export { codeDataTranslationsOptions, getCodeDataTranslations };

package/compiler/types.d.ts

@@ -196,6 +196,11 @@ export declare namespace I18nCompiler {
          * Dictionary of the translation' values {@link DataTranslationValue} mapped by locale
          */
         values: Record<Locale, DataTranslationValue>;
+        /**
+         * Flag as `true` when all values for all locales have the same value (a.k.a.
+         * there are no real translations...)
+         */
+        equalValues?: boolean;
         /**
          * Dictionary of the plural versions of the translations' values
          * {@link DataTranslationValue} for each plural suffix mapped by locale

package/package.json

@@ -2,8 +2,8 @@
   "name": "@koine/i18n",
   "sideEffects": false,
   "dependencies": {
-    "@koine/node": "2.0.0-beta.144",
-    "@koine/utils": "2.0.0-beta.144",
+    "@koine/node": "2.0.0-beta.146",
+    "@koine/utils": "2.0.0-beta.146",
     "comment-json": "^4.2.4",
     "consola": "^3.2.3",
     "glob": "^11.0.0",
@@ -97,5 +97,5 @@
   "module": "./index.esm.js",
   "main": "./index.cjs.js",
   "types": "./index.esm.d.ts",
-  "version": "2.0.0-beta.144"
+  "version": "2.0.0-beta.146"
 }