@koine/i18n 2.0.0-beta.174 → 2.0.0-beta.175

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

@@ -2,7 +2,7 @@
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var e = createAdapter.createGenerator("js", (e)=>{
+var t = createAdapter.createGenerator("js", (e)=>{
     let { config: { single: t }, options: { translations: { fallbackDefaultStrategy: a, tokens: { keyDelimiter: n, namespaceDelimiter: l } } } } = e;
     return {
         createT: {
@@ -38,17 +38,9 @@ export function createT<TDictionary extends I18nUtils.TranslationsDictionaryLoos
     const namespace = namespaceOrPath && maybePath ? namespaceOrPath : "";
     const path = namespaceOrPath && maybePath ? maybePath : namespaceOrPath;
     const dic = (namespace && dictionaries[namespace]) || dictionaries || {};
-    const pluralisedKey = getPluralisedKey(pluralRules, dic, path, query);
-    const value = getValue(dic, pluralisedKey);
+    const [value, isEmpty] = getValue(pluralRules, dic, path, query);
       
-    // check if value is empty
-    if (
-      typeof value === "undefined" ||
-      value === null ||
-      value === "" ||
-      (typeof value === "object" && !Object.keys(value).length) ||
-      (Array.isArray(value) && !value.length)
-    ) {
+    if (isEmpty) {
       // special case when query is an empty string use it as fallback
       fallback = query === "" ? query : fallback;
       return (typeof fallback !== "undefined" ? fallback : ${"key" === a ? "trace" : 'value || ""'}) as TReturn;
@@ -58,55 +50,62 @@ export function createT<TDictionary extends I18nUtils.TranslationsDictionaryLoos
   };
 }
 
-/**
- * Get value from key (allow nested keys as parent.children)
- */
 function getValue(
-  dic: I18nUtils.TranslationsDictionaryLoose,
-  key: string = "",
-): unknown | undefined {
-  const keyParts = key.split("${n}");
-
-  return keyParts.reduce(
-    (val: I18nUtils.TranslationsDictionaryLoose | string, key: string) => {
-      return val?.[key as keyof typeof val] ?? {};
-    },
-    dic,
-  );
-}
-
-/**
- * Control plural keys depending the {{count}} variable
- */
-function getPluralisedKey(
   pluralRules: Intl.PluralRules,
-  dic: I18nUtils.TranslationsDictionaryLoose,
-  key: string,
+  dictionary: I18nUtils.TranslationsDictionaryLoose,
+  path: string,
   query?: I18nUtils.TranslateQuery
-): string {
+): [unknown | undefined, boolean] {
   const count = query instanceof Object ? query["count"] : null;
 
-  if (!query || typeof count !== "number") return key;
-
-  if (getValue(dic, key + "_" + count) !== undefined) {
-    return key + "_" + count;
+  if (typeof count === "number") {
+    const countRule = pluralRules.select(count);
+    const pluralisedPaths = [
+      path + "_" + count,
+      path + "_" + countRule,
+      path + "${n}" + count,
+      path + "${n}" + countRule,
+    ];
+  
+    for (let i = 0; i < pluralisedPaths.length; i++) {
+      const pluralisedPath = pluralisedPaths[i];
+    
+      const output = getValueAtPath(dictionary, pluralisedPath);
+      if (output[0] !== undefined) {
+        return output;
+      }
+    }
   }
 
-  const pluralKey = key + "_" + pluralRules.select(count);
-  if (getValue(dic, pluralKey) !== undefined) {
-    return pluralKey;
-  }
+  return getValueAtPath(dictionary, path);
+}
 
-  if (getValue(dic, key + "${n}" + count) !== undefined) {
-    return key + "${n}" + count;
-  }
+/**
+ * Get value at path (allow nested keys as parent.children)
+ */
+function getValueAtPath(
+  dictionary: I18nUtils.TranslationsDictionaryLoose,
+  path: string = "",
+): unknown | undefined {
+  const keys = path.split("${n}");
 
-  const nestedKey = key + "${n}" + pluralRules.select(count);
-  if (getValue(dic, nestedKey) !== undefined) {
-    return nestedKey;
-  }
+  const value = keys.reduce(
+    (val: I18nUtils.TranslationsDictionaryLoose | string, key: string) => {
+      return val?.[key as keyof typeof val];
+    },
+    dictionary,
+  );
+
+  // check if value is empty
+  const isEmpty = (
+    typeof value === "undefined" ||
+    value === null ||
+    value === "" ||
+    (typeof value === "object" && !Object.keys(value).length) ||
+    (Array.isArray(value) && !value.length)
+  );
 
-  return key;
+  return [value, isEmpty];
 }
 
 export default createT;
@@ -115,4 +114,4 @@ export default createT;
     };
 });
 
-module.exports = e;
+module.exports = t;

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

@@ -1,6 +1,6 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var e = createGenerator("js", (e)=>{
+var t = createGenerator("js", (e)=>{
     let { config: { single: t }, options: { translations: { fallbackDefaultStrategy: a, tokens: { keyDelimiter: n, namespaceDelimiter: l } } } } = e;
     return {
         createT: {
@@ -36,17 +36,9 @@ export function createT<TDictionary extends I18nUtils.TranslationsDictionaryLoos
     const namespace = namespaceOrPath && maybePath ? namespaceOrPath : "";
     const path = namespaceOrPath && maybePath ? maybePath : namespaceOrPath;
     const dic = (namespace && dictionaries[namespace]) || dictionaries || {};
-    const pluralisedKey = getPluralisedKey(pluralRules, dic, path, query);
-    const value = getValue(dic, pluralisedKey);
+    const [value, isEmpty] = getValue(pluralRules, dic, path, query);
       
-    // check if value is empty
-    if (
-      typeof value === "undefined" ||
-      value === null ||
-      value === "" ||
-      (typeof value === "object" && !Object.keys(value).length) ||
-      (Array.isArray(value) && !value.length)
-    ) {
+    if (isEmpty) {
       // special case when query is an empty string use it as fallback
       fallback = query === "" ? query : fallback;
       return (typeof fallback !== "undefined" ? fallback : ${"key" === a ? "trace" : 'value || ""'}) as TReturn;
@@ -56,55 +48,62 @@ export function createT<TDictionary extends I18nUtils.TranslationsDictionaryLoos
   };
 }
 
-/**
- * Get value from key (allow nested keys as parent.children)
- */
 function getValue(
-  dic: I18nUtils.TranslationsDictionaryLoose,
-  key: string = "",
-): unknown | undefined {
-  const keyParts = key.split("${n}");
-
-  return keyParts.reduce(
-    (val: I18nUtils.TranslationsDictionaryLoose | string, key: string) => {
-      return val?.[key as keyof typeof val] ?? {};
-    },
-    dic,
-  );
-}
-
-/**
- * Control plural keys depending the {{count}} variable
- */
-function getPluralisedKey(
   pluralRules: Intl.PluralRules,
-  dic: I18nUtils.TranslationsDictionaryLoose,
-  key: string,
+  dictionary: I18nUtils.TranslationsDictionaryLoose,
+  path: string,
   query?: I18nUtils.TranslateQuery
-): string {
+): [unknown | undefined, boolean] {
   const count = query instanceof Object ? query["count"] : null;
 
-  if (!query || typeof count !== "number") return key;
-
-  if (getValue(dic, key + "_" + count) !== undefined) {
-    return key + "_" + count;
+  if (typeof count === "number") {
+    const countRule = pluralRules.select(count);
+    const pluralisedPaths = [
+      path + "_" + count,
+      path + "_" + countRule,
+      path + "${n}" + count,
+      path + "${n}" + countRule,
+    ];
+  
+    for (let i = 0; i < pluralisedPaths.length; i++) {
+      const pluralisedPath = pluralisedPaths[i];
+    
+      const output = getValueAtPath(dictionary, pluralisedPath);
+      if (output[0] !== undefined) {
+        return output;
+      }
+    }
   }
 
-  const pluralKey = key + "_" + pluralRules.select(count);
-  if (getValue(dic, pluralKey) !== undefined) {
-    return pluralKey;
-  }
+  return getValueAtPath(dictionary, path);
+}
 
-  if (getValue(dic, key + "${n}" + count) !== undefined) {
-    return key + "${n}" + count;
-  }
+/**
+ * Get value at path (allow nested keys as parent.children)
+ */
+function getValueAtPath(
+  dictionary: I18nUtils.TranslationsDictionaryLoose,
+  path: string = "",
+): unknown | undefined {
+  const keys = path.split("${n}");
 
-  const nestedKey = key + "${n}" + pluralRules.select(count);
-  if (getValue(dic, nestedKey) !== undefined) {
-    return nestedKey;
-  }
+  const value = keys.reduce(
+    (val: I18nUtils.TranslationsDictionaryLoose | string, key: string) => {
+      return val?.[key as keyof typeof val];
+    },
+    dictionary,
+  );
+
+  // check if value is empty
+  const isEmpty = (
+    typeof value === "undefined" ||
+    value === null ||
+    value === "" ||
+    (typeof value === "object" && !Object.keys(value).length) ||
+    (Array.isArray(value) && !value.length)
+  );
 
-  return key;
+  return [value, isEmpty];
 }
 
 export default createT;
@@ -113,4 +112,4 @@ export default createT;
     };
 });
 
-export { e as default };
+export { t as default };

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

@@ -0,0 +1,34 @@
+'use strict';
+
+var utils = require('@koine/utils');
+var dataTranslations = require('../../compiler/code/data-translations.cjs.js');
+var createAdapter = require('../../compiler/createAdapter.cjs.js');
+var helpers = require('../../compiler/helpers.cjs.js');
+
+var e = createAdapter.createGenerator("js", (o)=>{
+    let { input: n, options: { translations: a } } = o, { dir: m, prefix: p } = a.dictionaries, { translationFiles: s } = n, c = s.reduce((e, t)=>{
+        let { locale: o, path: i } = t, n = dataTranslations.translationPathToNamespace(i);
+        return e[n] = e[n] || {}, e[n][o] = i, e;
+    }, {}), l = (t)=>utils.changeCaseSnake(t);
+    return Object.keys(c).reduce((e, r)=>{
+        let o = c[r], n = `dictionary_${r}`, a = dataTranslations.normaliseTranslationTraceIdentifier(r, p);
+        return e[n] = {
+            dir: m,
+            name: a,
+            ext: "ts",
+            index: !0,
+            content: ()=>`
+${Object.keys(o).map((e)=>`import ${l(e)} from "${helpers.getTranslationsDir(1)}/${e}/${o[e]}";`).join("\n")}
+
+/* @__NO_SIDE_EFFECTS__ */
+export const ${a} = {
+  ${Object.keys(o).map((e)=>`"${e}": ${l(e)}`).join(",\n  ")}
+} as const;
+
+export default ${a};
+`
+        }, e;
+    }, {});
+});
+
+module.exports = e;

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

@@ -0,0 +1,3 @@
+import type { I18nCompiler } from "../../compiler/types";
+declare const _default: (data: I18nCompiler.DataCode<"js">) => never;
+export default _default;

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

@@ -0,0 +1,32 @@
+import { changeCaseSnake } from '@koine/utils';
+import { translationPathToNamespace, normaliseTranslationTraceIdentifier } from '../../compiler/code/data-translations.esm.js';
+import { createGenerator } from '../../compiler/createAdapter.esm.js';
+import { getTranslationsDir } from '../../compiler/helpers.esm.js';
+
+var e = createGenerator("js", (o)=>{
+    let { input: n, options: { translations: a } } = o, { dir: m, prefix: p } = a.dictionaries, { translationFiles: s } = n, c = s.reduce((e, t)=>{
+        let { locale: o, path: i } = t, n = translationPathToNamespace(i);
+        return e[n] = e[n] || {}, e[n][o] = i, e;
+    }, {}), l = (t)=>changeCaseSnake(t);
+    return Object.keys(c).reduce((e, r)=>{
+        let o = c[r], n = `dictionary_${r}`, a = normaliseTranslationTraceIdentifier(r, p);
+        return e[n] = {
+            dir: m,
+            name: a,
+            ext: "ts",
+            index: !0,
+            content: ()=>`
+${Object.keys(o).map((e)=>`import ${l(e)} from "${getTranslationsDir(1)}/${e}/${o[e]}";`).join("\n")}
+
+/* @__NO_SIDE_EFFECTS__ */
+export const ${a} = {
+  ${Object.keys(o).map((e)=>`"${e}": ${l(e)}`).join(",\n  ")}
+} as const;
+
+export default ${a};
+`
+        }, e;
+    }, {});
+});
+
+export { e as default };

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

@@ -84,7 +84,7 @@ const formatTo = ({ defaultLocale: e, hideDefaultLocaleInUrl: t }, n)=>new funct
   return pathname;
 `
     });
-var t = createAdapter.createGenerator("js", (a)=>{
+var a = createAdapter.createGenerator("js", (a)=>{
     let { config: t } = a;
     return {
         formatTo: {
@@ -100,5 +100,5 @@ var t = createAdapter.createGenerator("js", (a)=>{
     };
 });
 
-exports.default = t;
+exports.default = a;
 exports.formatTo = formatTo;

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

@@ -80,7 +80,7 @@ const formatTo = ({ defaultLocale: e, hideDefaultLocaleInUrl: t }, n)=>new Funct
   return pathname;
 `
     });
-var t = createGenerator("js", (a)=>{
+var a = createGenerator("js", (a)=>{
     let { config: t } = a;
     return {
         formatTo: {
@@ -96,4 +96,4 @@ var t = createGenerator("js", (a)=>{
     };
 });
 
-export { t as default, formatTo };
+export { a as default, formatTo };

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

@@ -2,7 +2,7 @@
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var a = createAdapter.createGenerator("js", (e)=>{
+var m = createAdapter.createGenerator("js", (e)=>{
     let { config: { baseUrl: t, trailingSlash: a } } = e;
     return {
         formatUrl: {
@@ -24,4 +24,4 @@ export default formatUrl;
     };
 });
 
-module.exports = a;
+module.exports = m;

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

@@ -1,6 +1,6 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var a = createGenerator("js", (e)=>{
+var m = createGenerator("js", (e)=>{
     let { config: { baseUrl: t, trailingSlash: a } } = e;
     return {
         formatUrl: {
@@ -22,4 +22,4 @@ export default formatUrl;
     };
 });
 
-export { a as default };
+export { m as default };

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

@@ -2,7 +2,7 @@
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var m = createAdapter.createGenerator("js", (n)=>({
+var s = createAdapter.createGenerator("js", (n)=>({
         getI18nDictionaries: {
             dir: createAdapter.createGenerator.dirs.internal,
             name: "getI18nDictionaries",
@@ -41,4 +41,4 @@ export async function getI18nDictionaries({
         }
     }));
 
-module.exports = m;
+module.exports = s;

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

@@ -1,6 +1,6 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var m = createGenerator("js", (n)=>({
+var s = createGenerator("js", (n)=>({
         getI18nDictionaries: {
             dir: createGenerator.dirs.internal,
             name: "getI18nDictionaries",
@@ -39,4 +39,4 @@ export async function getI18nDictionaries({
         }
     }));
 
-export { m as default };
+export { s as default };

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

@@ -2,7 +2,7 @@
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var s = createAdapter.createGenerator("js", (e)=>{
+var n = createAdapter.createGenerator("js", (e)=>{
     let { routes: { dynamicRoutes: a, staticRoutes: o } } = e;
     return {
         getI18nMetadata: {
@@ -63,4 +63,4 @@ export function getI18nMetadata<TRouteId extends I18n.RouteId | RouteIdError>({
     };
 });
 
-module.exports = s;
+module.exports = n;

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

@@ -1,6 +1,6 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var s = createGenerator("js", (e)=>{
+var n = createGenerator("js", (e)=>{
     let { routes: { dynamicRoutes: a, staticRoutes: o } } = e;
     return {
         getI18nMetadata: {
@@ -61,4 +61,4 @@ export function getI18nMetadata<TRouteId extends I18n.RouteId | RouteIdError>({
     };
 });
 
-export { s as default };
+export { n as default };

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

@@ -2,14 +2,14 @@
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var n = createAdapter.createGenerator("js", (a)=>({
+var i = createAdapter.createGenerator("js", (a)=>({
         getT: {
             name: "getT",
             ext: "ts",
             index: !0,
             content: ()=>`
 import { loadTranslations } from "./internal/loadTranslations";
-import { createT } from "../createT";
+import { createT } from "./createT";
 import type { I18n } from "./types";
 
 export async function getT<TNamespace extends I18n.TranslationsNamespace>(
@@ -31,4 +31,4 @@ export default getT;
         }
     }));
 
-module.exports = n;
+module.exports = i;

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

@@ -1,13 +1,13 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var n = createGenerator("js", (a)=>({
+var i = createGenerator("js", (a)=>({
         getT: {
             name: "getT",
             ext: "ts",
             index: !0,
             content: ()=>`
 import { loadTranslations } from "./internal/loadTranslations";
-import { createT } from "../createT";
+import { createT } from "./createT";
 import type { I18n } from "./types";
 
 export async function getT<TNamespace extends I18n.TranslationsNamespace>(
@@ -29,4 +29,4 @@ export default getT;
         }
     }));
 
-export { n as default };
+export { i as default };

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

@@ -3,7 +3,7 @@
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 var helpers = require('../../compiler/helpers.cjs.js');
 
-var i = createAdapter.createGenerator("js", (n)=>({
+var f = createAdapter.createGenerator("js", (n)=>({
         loadTranslations: {
             dir: createAdapter.createGenerator.dirs.internal,
             name: "loadTranslations",
@@ -26,4 +26,4 @@ export const loadTranslations = (
         }
     }));
 
-module.exports = i;
+module.exports = f;

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

@@ -1,7 +1,7 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 import { getTranslationsDir } from '../../compiler/helpers.esm.js';
 
-var i = createGenerator("js", (n)=>({
+var f = createGenerator("js", (n)=>({
         loadTranslations: {
             dir: createGenerator.dirs.internal,
             name: "loadTranslations",
@@ -24,4 +24,4 @@ export const loadTranslations = (
         }
     }));
 
-export { i as default };
+export { f as default };

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

@@ -3,7 +3,7 @@
 var utils = require('@koine/utils');
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var f = createAdapter.createGenerator("js", (t)=>{
+var g = createAdapter.createGenerator("js", (t)=>{
     let { options: a } = t, { idDelimiter: r, optionalCatchAll: o, catchAll: n } = a.routes.tokens;
     return {
         pathnameToRouteId: {
@@ -30,4 +30,4 @@ export default pathnameToRouteId;
     };
 });
 
-module.exports = f;
+module.exports = g;

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

@@ -1,7 +1,7 @@
 import { escapeRegExp } from '@koine/utils';
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var f = createGenerator("js", (t)=>{
+var g = createGenerator("js", (t)=>{
     let { options: a } = t, { idDelimiter: r, optionalCatchAll: o, catchAll: n } = a.routes.tokens;
     return {
         pathnameToRouteId: {
@@ -28,4 +28,4 @@ export default pathnameToRouteId;
     };
 });
 
-export { f as default };
+export { g as default };

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

@@ -2,7 +2,7 @@
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var g = createAdapter.createGenerator("js", (t)=>{
+var l = createAdapter.createGenerator("js", (t)=>{
     let { routes: e } = t, n = (r)=>JSON.stringify(Object.fromEntries(Object.entries(e.byId).map(([t, e])=>[
                 t,
                 r(e)
@@ -84,4 +84,4 @@ export const routesSpa = ${r} as Record<string, string | Record<I18n.Locale, str
     };
 });
 
-module.exports = g;
+module.exports = l;

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

@@ -1,6 +1,6 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var g = createGenerator("js", (t)=>{
+var l = createGenerator("js", (t)=>{
     let { routes: e } = t, n = (r)=>JSON.stringify(Object.fromEntries(Object.entries(e.byId).map(([t, e])=>[
                 t,
                 r(e)
@@ -82,4 +82,4 @@ export const routesSpa = ${r} as Record<string, string | Record<I18n.Locale, str
     };
 });
 
-export { g as default };
+export { l as default };

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

@@ -29,7 +29,7 @@ const setGlobalLocale = (e)=>new functions.FunctionsCompiler({
         body: `global.${helpers.GLOBAL_I18N_IDENTIFIER} = value`,
         implicitReturn: !0
     });
-var l = createAdapter.createGenerator("js", (o)=>({
+var d = createAdapter.createGenerator("js", (o)=>({
         globals: {
             dir: createAdapter.createGenerator.dirs.internal,
             name: "globals",
@@ -55,5 +55,5 @@ declare global {
         }
     }));
 
-exports.default = l;
+exports.default = d;
 exports.setGlobalLocale = setGlobalLocale;

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

@@ -25,7 +25,7 @@ const setGlobalLocale = (e)=>new FunctionsCompiler({
         body: `global.${GLOBAL_I18N_IDENTIFIER} = value`,
         implicitReturn: !0
     });
-var l = createGenerator("js", (o)=>({
+var d = createGenerator("js", (o)=>({
         globals: {
             dir: createGenerator.dirs.internal,
             name: "globals",
@@ -51,4 +51,4 @@ declare global {
         }
     }));
 
-export { l as default, setGlobalLocale };
+export { d as default, setGlobalLocale };