@koine/i18n 2.0.0-beta.170 → 2.0.0-beta.172

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

@@ -49,9 +49,12 @@ export function createT<TDictionary extends I18nUtils.TranslationsDictionaryLoos
       (typeof value === "object" && !Object.keys(value).length) ||
       (Array.isArray(value) && !value.length)
     ) {
-      return typeof fallback !== "undefined"
-        ? fallback
-        : ${"key" === a ? "trace" : '""'} as TReturn;
+      return (
+        query === ""
+          ? value || ""
+          : typeof fallback !== "undefined"
+            ? fallback
+            : ${"key" === a ? "trace" : 'value || ""'}) as TReturn;
     }
 
     return (query ? i18nInterpolateParamsDeep(value, query) : value) as TReturn;
@@ -98,7 +101,7 @@ function getPluralisedKey(
   }
 
   if (getValue(dic, key + "${n}" + count) !== undefined) {
-    return key + "." + count;
+    return key + "${n}" + count;
   }
 
   const nestedKey = key + "${n}" + pluralRules.select(count);

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

@@ -47,9 +47,12 @@ export function createT<TDictionary extends I18nUtils.TranslationsDictionaryLoos
       (typeof value === "object" && !Object.keys(value).length) ||
       (Array.isArray(value) && !value.length)
     ) {
-      return typeof fallback !== "undefined"
-        ? fallback
-        : ${"key" === a ? "trace" : '""'} as TReturn;
+      return (
+        query === ""
+          ? value || ""
+          : typeof fallback !== "undefined"
+            ? fallback
+            : ${"key" === a ? "trace" : 'value || ""'}) as TReturn;
     }
 
     return (query ? i18nInterpolateParamsDeep(value, query) : value) as TReturn;
@@ -96,7 +99,7 @@ function getPluralisedKey(
   }
 
   if (getValue(dic, key + "${n}" + count) !== undefined) {
-    return key + "." + count;
+    return key + "${n}" + count;
   }
 
   const nestedKey = key + "${n}" + pluralRules.select(count);

package/package.json

@@ -5,8 +5,8 @@
     "node": "^14.18.0 || >=16.0.0"
   },
   "dependencies": {
-    "@koine/node": "2.0.0-beta.170",
-    "@koine/utils": "2.0.0-beta.170",
+    "@koine/node": "2.0.0-beta.172",
+    "@koine/utils": "2.0.0-beta.172",
     "comment-json": "^4.2.4",
     "consola": "^3.2.3",
     "glob": "^11.0.0",
@@ -110,5 +110,5 @@
   "module": "./index.esm.js",
   "main": "./index.cjs.js",
   "types": "./index.esm.d.ts",
-  "version": "2.0.0-beta.170"
+  "version": "2.0.0-beta.172"
 }

package/types.d.ts

@@ -1,10 +1,15 @@
 import type { JsonObject, Split } from "@koine/utils";
 export declare namespace I18nUtils {
     /**
-     * Generic shape of a translation dictionary, simple a whatever valid JSON
+     * Generic shape of a translation dictionary, simply a whatever valid JSON
      * ready object
      */
     export type TranslationsDictionaryLoose = JsonObject;
+    /**
+     * Generic shape of a series of namespaced translation dictionaries
+     * {@link TranslationsDictionaryLoose}
+     */
+    export type TranslationsDictionaries = Record<string, TranslationsDictionaryLoose>;
     /**
      * Translate function _loose_ type, to use only in implementations that uses
      * the `t` function indirectly without needng knowledge of the string it needs
@@ -16,6 +21,20 @@ export declare namespace I18nUtils {
      * array or whatever basically.
      */
     export type TranslateLoosest<TReturn = any> = (path?: any, query?: TranslateQuery, fallback?: any) => TReturn;
+    /**
+     * Query object to populate the translation returned value interpolating
+     * dynamic data.
+     *
+     * Passing a `string` acts as _fallback_ value. If you need a fallback of
+     * a different type or need both the _query_ and the _fallback_ use the third
+     * argument to provide the fallback instead.
+     *
+     * All falsy allowed values are for ease of use of the third argument and
+     * they will just opt out of any interpolation step.
+     */
+    export type TranslateQuery = "" | undefined | null | 0 | false | {
+        [key: string]: string | number | boolean;
+    };
     /**
      * Dictionary to generate SEO friendly alternate URLs `<links>` where:
      *