@koine/i18n 2.0.0-beta.138 → 2.0.0-beta.139

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

@@ -31,6 +31,7 @@ export default defaultLocale;
             name: "config",
             ext: "ts",
             index: !0,
+            disabled: !0,
             content: ()=>`
 import { locales } from "./locales";
 import { defaultLocale } from "./defaultLocale";
@@ -50,6 +51,7 @@ export default config;
             name: "config.cjs",
             ext: "js",
             index: !1,
+            disabled: !0,
             content: ()=>`
 const { locales } = require("./locales");
 const { defaultLocale } = require("./defaultLocale");

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

@@ -15,12 +15,14 @@ declare const _default: (data: import("../../compiler-sync").I18nCompiler.DataCo
         name: string;
         ext: "ts";
         index: true;
+        disabled: true;
         content: () => string;
     };
     configCjs: {
         name: string;
         ext: "js";
         index: false;
+        disabled: true;
         content: () => string;
     };
 };

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

@@ -29,6 +29,7 @@ export default defaultLocale;
             name: "config",
             ext: "ts",
             index: !0,
+            disabled: !0,
             content: ()=>`
 import { locales } from "./locales";
 import { defaultLocale } from "./defaultLocale";
@@ -48,6 +49,7 @@ export default config;
             name: "config.cjs",
             ext: "js",
             index: !1,
+            disabled: !0,
             content: ()=>`
 const { locales } = require("./locales");
 const { defaultLocale } = require("./defaultLocale");

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

@@ -4,19 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 var functions = require('../../compiler/functions.cjs.js');
-var imports = require('../../compiler/imports.cjs.js');
 
-const formatTo = ({ hideDefaultLocaleInUrl: e })=>new functions.FunctionsCompiler({
-        imports: [
-            new imports.ImportsCompiler({
-                path: "defaultLocale",
-                named: [
-                    {
-                        name: "defaultLocale"
-                    }
-                ]
-            })
-        ],
+const formatTo = ({ defaultLocale: e, hideDefaultLocaleInUrl: t }, o)=>new functions.FunctionsCompiler({
+        imports: [],
         comment: {
             internal: !0
         },
@@ -38,8 +28,9 @@ const formatTo = ({ hideDefaultLocaleInUrl: e })=>new functions.FunctionsCompile
                 optional: !0
             }
         ],
-        body: ({ format: a })=>`{
-  locale = locale || defaultLocale;
+        body: ({ format: a })=>`
+  locale = locale || "${e}";
+      ${o ? `
   if (process.env["NODE_ENV"] === "development") {
     if (params) {
       pathname.replace(/\\[(.*?)\\]/g, (_, dynamicKey) => {
@@ -71,21 +62,17 @@ const formatTo = ({ hideDefaultLocaleInUrl: e })=>new functions.FunctionsCompile
       });
     }
   }
-
+` : ""}
   if (params) {
-    pathname = pathname.replace(
-        /\\[(.*?)\\]/g,
-        (_, key) =>
-          params[key${"ts" === a ? " as keyof typeof params" : ""}] + "",
-      )
+    pathname = pathname.replace(/\\[(.*?)\\]/g, (_, key) => params[key${"ts" === a ? " as keyof typeof params" : ""}] + "")
   }
-  ${e ? `
-  if (locale !== defaultLocale) {
+  ${t ? `
+  if (locale !== "${e}") {
     return "/" + locale + (pathname === "/" ? "" : pathname);
   }
   ` : ""}
   return pathname;
-}`
+`
     });
 var a = createAdapter.createGenerator("js", (e)=>{
     let { config: a } = e;
@@ -94,14 +81,12 @@ var a = createAdapter.createGenerator("js", (e)=>{
             name: "formatTo",
             ext: "ts",
             index: !1,
-            content: ()=>`
-${formatTo(a).$out("ts", {
+            content: ()=>formatTo(a, !0).$out("ts", {
                     imports: {
                         folderUp: 0
                     },
                     exports: "named"
-                })}
-`
+                })
         }
     };
 });

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

@@ -1,6 +1,6 @@
 import { FunctionsCompiler } from "../../compiler/functions";
 import type { I18nCompiler } from "../../compiler/types";
-export declare const formatTo: ({ hideDefaultLocaleInUrl, }: Pick<I18nCompiler.Config, "hideDefaultLocaleInUrl">) => FunctionsCompiler;
+export declare const formatTo: ({ defaultLocale, hideDefaultLocaleInUrl, }: Pick<I18nCompiler.Config, "defaultLocale" | "hideDefaultLocaleInUrl" | "trailingSlash">, devDebug?: boolean) => FunctionsCompiler;
 declare const _default: (data: I18nCompiler.DataCode<"js">) => {
     formatTo: {
         name: string;

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

@@ -1,18 +1,8 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 import { FunctionsCompiler } from '../../compiler/functions.esm.js';
-import { ImportsCompiler } from '../../compiler/imports.esm.js';
 
-const formatTo = ({ hideDefaultLocaleInUrl: e })=>new FunctionsCompiler({
-        imports: [
-            new ImportsCompiler({
-                path: "defaultLocale",
-                named: [
-                    {
-                        name: "defaultLocale"
-                    }
-                ]
-            })
-        ],
+const formatTo = ({ defaultLocale: e, hideDefaultLocaleInUrl: t }, o)=>new FunctionsCompiler({
+        imports: [],
         comment: {
             internal: !0
         },
@@ -34,8 +24,9 @@ const formatTo = ({ hideDefaultLocaleInUrl: e })=>new FunctionsCompiler({
                 optional: !0
             }
         ],
-        body: ({ format: a })=>`{
-  locale = locale || defaultLocale;
+        body: ({ format: a })=>`
+  locale = locale || "${e}";
+      ${o ? `
   if (process.env["NODE_ENV"] === "development") {
     if (params) {
       pathname.replace(/\\[(.*?)\\]/g, (_, dynamicKey) => {
@@ -67,21 +58,17 @@ const formatTo = ({ hideDefaultLocaleInUrl: e })=>new FunctionsCompiler({
       });
     }
   }
-
+` : ""}
   if (params) {
-    pathname = pathname.replace(
-        /\\[(.*?)\\]/g,
-        (_, key) =>
-          params[key${"ts" === a ? " as keyof typeof params" : ""}] + "",
-      )
+    pathname = pathname.replace(/\\[(.*?)\\]/g, (_, key) => params[key${"ts" === a ? " as keyof typeof params" : ""}] + "")
   }
-  ${e ? `
-  if (locale !== defaultLocale) {
+  ${t ? `
+  if (locale !== "${e}") {
     return "/" + locale + (pathname === "/" ? "" : pathname);
   }
   ` : ""}
   return pathname;
-}`
+`
     });
 var a = createGenerator("js", (e)=>{
     let { config: a } = e;
@@ -90,14 +77,12 @@ var a = createGenerator("js", (e)=>{
             name: "formatTo",
             ext: "ts",
             index: !1,
-            content: ()=>`
-${formatTo(a).$out("ts", {
+            content: ()=>formatTo(a, !0).$out("ts", {
                     imports: {
                         folderUp: 0
                     },
                     exports: "named"
-                })}
-`
+                })
         }
     };
 });

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

@@ -3,7 +3,7 @@
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 var loadTranslations_inline = require('./loadTranslations_inline.cjs.js');
 
-var i = createAdapter.createGenerator("js", (a)=>({
+var p = createAdapter.createGenerator("js", (a)=>({
         getT: {
             name: "getT",
             ext: "ts",
@@ -35,4 +35,4 @@ export default getT;
         }
     }));
 
-module.exports = i;
+module.exports = p;

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

@@ -1,7 +1,7 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 import { loadTranslations_inline } from './loadTranslations_inline.esm.js';
 
-var i = createGenerator("js", (a)=>({
+var p = createGenerator("js", (a)=>({
         getT: {
             name: "getT",
             ext: "ts",
@@ -33,4 +33,4 @@ export default getT;
         }
     }));
 
-export { i as default };
+export { p as default };

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

@@ -2,7 +2,7 @@
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var p = createAdapter.createGenerator("js", (e)=>({
+var i = createAdapter.createGenerator("js", (e)=>({
         isLocale: {
             name: "isLocale",
             ext: "ts",
@@ -19,4 +19,4 @@ export default isLocale;
         }
     }));
 
-module.exports = p;
+module.exports = i;

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

@@ -1,6 +1,6 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var p = createGenerator("js", (e)=>({
+var i = createGenerator("js", (e)=>({
         isLocale: {
             name: "isLocale",
             ext: "ts",
@@ -17,4 +17,4 @@ export default isLocale;
         }
     }));
 
-export { p as default };
+export { i as default };

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

@@ -27,11 +27,15 @@ const setGlobalLocale = (e)=>new functions.FunctionsCompiler({
                 optional: !1
             }
         ],
-        before: ({ format: e })=>"ts" === e ? `
-declare global {
+        before: ({ format: e })=>"ts" === e ? `declare global {
   var ${helpers.GLOBAL_I18N_IDENTIFIER}: I18n.Locale;
-}` : "",
-        body: `global.${helpers.GLOBAL_I18N_IDENTIFIER} = value;`
+}
+` : "",
+        comment: {
+            internal: !0
+        },
+        body: `global.${helpers.GLOBAL_I18N_IDENTIFIER} = value`,
+        implicitReturn: !0
     });
 var l = createAdapter.createGenerator("js", (e)=>({
         setGlobalLocale: {
@@ -40,9 +44,6 @@ var l = createAdapter.createGenerator("js", (e)=>({
             ext: "ts",
             index: !1,
             content: ()=>`
-/**
- * @internal
- */
 ${setGlobalLocale().$out("ts", {
                     imports: {
                         folderUp: 1

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

@@ -23,11 +23,15 @@ const setGlobalLocale = (e)=>new FunctionsCompiler({
                 optional: !1
             }
         ],
-        before: ({ format: e })=>"ts" === e ? `
-declare global {
+        before: ({ format: e })=>"ts" === e ? `declare global {
   var ${GLOBAL_I18N_IDENTIFIER}: I18n.Locale;
-}` : "",
-        body: `global.${GLOBAL_I18N_IDENTIFIER} = value;`
+}
+` : "",
+        comment: {
+            internal: !0
+        },
+        body: `global.${GLOBAL_I18N_IDENTIFIER} = value`,
+        implicitReturn: !0
     });
 var l = createGenerator("js", (e)=>({
         setGlobalLocale: {
@@ -36,9 +40,6 @@ var l = createGenerator("js", (e)=>({
             ext: "ts",
             index: !1,
             content: ()=>`
-/**
- * @internal
- */
 ${setGlobalLocale().$out("ts", {
                     imports: {
                         folderUp: 1

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

@@ -8,17 +8,47 @@ var functions = require('../../compiler/functions.cjs.js');
 var helpers = require('../../compiler/helpers.cjs.js');
 var imports = require('../../compiler/imports.cjs.js');
 
-const getTranslationValueOutput = (t)=>utils.isString(t) || utils.isNumber(t) ? `"${t}"` : utils.isBoolean(t) ? `${t}` : utils.isArray(t) ? JSON.stringify(t) : `(${JSON.stringify(t)})`;
-const areEqualTranslationsValues = (e, a)=>utils.areEqual(e, a);
-const getTFunctionBodyWithLocales = (t, e)=>{
-    let a = "";
-    for(let n in e){
-        let r = e[n];
-        n === t || areEqualTranslationsValues(r, e[t]) || (a += `locale === "${n}" ? ${getTranslationValueOutput(r)} : `);
-    }
-    return a + getTranslationValueOutput(e[t]);
-};
-let i = {
+function getTFunctionsPrefix(t) {
+    let { translations: { fnsPrefix: e }, modularized: r } = t;
+    return e || r ? "$t_" : "";
+}
+function getTFunction(e, r) {
+    let { defaultLocale: a, fnPrefix: o } = r, { id: p, values: s, params: i, plural: c, typeValue: f } = e, P = [], d = `${o}${p}`, $ = "count";
+    c && (i = i ? {
+        ...i,
+        [$]: "number"
+    } : {
+        [$]: "number"
+    }), i && P.push({
+        name: "params",
+        type: helpers.compileDataParamsToType(i),
+        optional: !1
+    }), P.push({
+        name: "locale",
+        type: "I18n.Locale",
+        optional: !0
+    });
+    let y = [
+        u.types
+    ], h = "";
+    return utils.isPrimitive(s) ? h += m(s) : h += function(e, r) {
+        let a = "";
+        for(let n in r){
+            let o = r[n];
+            n === e || utils.areEqual(o, r[e]) || (a += `locale === "${n}" ? ${m(o)} : `);
+        }
+        return a + m(r[e]);
+    }(a, s), c && (y.push(u.tPluralise), h = `tPluralise(${h}, params.${$})`), i && (!c || c && !Object.keys(i).every((t)=>t === $)) && ("Primitive" === f ? (y.push(u.tInterpolateParams), h = `tInterpolateParams(${h}, params)`) : ("Array" === f || "Object" === f) && (y.push(u.tInterpolateParamsDeep), h = `tInterpolateParamsDeep(${h}, params)`)), {
+        name: d,
+        body: h,
+        args: P,
+        imports: y
+    };
+}
+function m(t) {
+    return utils.isString(t) || utils.isNumber(t) ? `"${t}"` : utils.isBoolean(t) ? `${t}` : utils.isArray(t) ? JSON.stringify(t) : `(${JSON.stringify(t)})`;
+}
+let u = {
     types: new imports.ImportsCompiler({
         path: "types",
         named: [
@@ -36,6 +66,14 @@ let i = {
             }
         ]
     }),
+    tInterpolateParamsDeep: new imports.ImportsCompiler({
+        path: "tInterpolateParamsDeep",
+        named: [
+            {
+                name: "tInterpolateParamsDeep"
+            }
+        ]
+    }),
     tPluralise: new imports.ImportsCompiler({
         path: "tPluralise",
         named: [
@@ -44,48 +82,35 @@ let i = {
             }
         ]
     })
-};
-const getTFunctions = (t, e)=>{
-    let { defaultLocale: a, fnPrefix: n } = e, o = [], l = new Set();
-    for(let e in l.add(i.types), t){
-        let u = !1, m = !1, { values: c, params: d, plural: $ } = t[e], f = `${n}${e}`;
-        $ && (d ? d.count = "number" : d = {
-            count: "number"
-        });
-        let y = [];
-        d && y.push({
-            name: "params",
-            type: `{ ${helpers.dataParamsToTsInterfaceBody(d)} }`,
-            optional: !1
-        }), y.push({
-            name: "locale",
-            type: "I18n.Locale",
-            optional: !0
-        });
-        let h = "", P = [
-            i.types
-        ];
-        utils.isPrimitive(c) ? h += getTranslationValueOutput(c) : h += getTFunctionBodyWithLocales(a, c), $ && (m = !0, h = `tPluralise(${h}, params.count)`), d && (u = !0, h = `tInterpolateParams(${h}, params)`), u && (P.push(i.tInterpolateParams), l.add(i.tInterpolateParams)), m && (P.push(i.tPluralise), l.add(i.tPluralise)), o.push(new functions.FunctionsCompiler({
-            imports: P,
-            name: f,
-            args: y,
-            body: h
+}, c = (t, e)=>{
+    let r = [], a = new Set();
+    for(let n in a.add(u.types), t){
+        let { imports: o, name: p, args: l, body: i } = getTFunction(t[n], e);
+        o.forEach((t)=>a.add(t)), r.push(new functions.FunctionsCompiler({
+            imports: o,
+            name: p,
+            args: l,
+            body: i,
+            implicitReturn: !0
         }));
     }
     return {
-        functions: o,
-        allImports: l
+        functions: r,
+        allImports: a
     };
 };
 var d = createAdapter.createGenerator("js", (t)=>{
-    let { config: { defaultLocale: e }, options: { adapter: { modularized: a }, translations: { fnsPrefix: n } }, translations: r } = t, o = n || (a ? "$t_" : ""), { functions: l, allImports: p } = getTFunctions(r, {
+    let { config: { defaultLocale: e }, options: { translations: r, adapter: { modularized: a } }, translations: n } = t, o = getTFunctionsPrefix({
+        modularized: a,
+        translations: r
+    }), { functions: p, allImports: l } = c(n, {
         defaultLocale: e,
         fnPrefix: o
     });
-    return a ? l.reduce((t, e)=>{
-        let a = o.replace(/_*$/, "");
+    return a ? p.reduce((t, e)=>{
+        let r = o.replace(/_*$/, "");
         return t[e.name] = {
-            dir: a,
+            dir: r,
             name: e.name,
             ext: "ts",
             index: !0,
@@ -101,9 +126,9 @@ var d = createAdapter.createGenerator("js", (t)=>{
             name: "$t",
             ext: "ts",
             index: !0,
-            content: ()=>"" + (imports.ImportsCompiler.outMany("ts", p, {
+            content: ()=>"" + (imports.ImportsCompiler.outMany("ts", l, {
                     folderUp: 0
-                }) + functions.FunctionsCompiler.outMany("ts", l, {
+                }) + functions.FunctionsCompiler.outMany("ts", p, {
                     imports: !1,
                     exports: "named"
                 }))
@@ -111,8 +136,6 @@ var d = createAdapter.createGenerator("js", (t)=>{
     };
 });
 
-exports.areEqualTranslationsValues = areEqualTranslationsValues;
 exports.default = d;
-exports.getTFunctionBodyWithLocales = getTFunctionBodyWithLocales;
-exports.getTFunctions = getTFunctions;
-exports.getTranslationValueOutput = getTranslationValueOutput;
+exports.getTFunction = getTFunction;
+exports.getTFunctionsPrefix = getTFunctionsPrefix;

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

@@ -1,15 +1,21 @@
-import { FunctionsCompiler } from "../../compiler/functions";
+import { type FunctionsCompilerDataArg } from "../../compiler/functions";
 import { ImportsCompiler } from "../../compiler/imports";
 import type { I18nCompiler } from "../../compiler/types";
-export declare const getTranslationValueOutput: (value: I18nCompiler.DataTranslationValue) => string;
-export declare const areEqualTranslationsValues: (a: I18nCompiler.DataTranslationValue, b: I18nCompiler.DataTranslationValue) => boolean;
-export declare const getTFunctionBodyWithLocales: (defaultLocale: I18nCompiler.Config["defaultLocale"], perLocaleValues: I18nCompiler.DataTranslation["values"]) => string;
-export declare const getTFunctions: (translations: I18nCompiler.DataTranslations, options: {
-    defaultLocale: string;
+/**
+ * If the user does not specifiy a custom prefix by default we prepend `$t_`
+ * when `modularized` option is true
+ */
+export declare function getTFunctionsPrefix(options: {
+    translations: I18nCompiler.DataCode<"js">["options"]["translations"];
+    modularized: I18nCompiler.DataCode<"js">["options"]["adapter"]["modularized"];
+}): "" | "$t_";
+export declare function getTFunction(translation: I18nCompiler.DataTranslation, options: Pick<I18nCompiler.Config, "defaultLocale"> & {
     fnPrefix: string;
-}) => {
-    functions: FunctionsCompiler[];
-    allImports: Set<ImportsCompiler>;
+}): {
+    name: string;
+    body: string;
+    args: FunctionsCompilerDataArg[];
+    imports: ImportsCompiler[];
 };
 declare const _default: (data: I18nCompiler.DataCode<"js">) => {
     $t: {