@koine/i18n 2.0.0-beta.28 → 2.0.0-beta.29

package/i18nGenerateTypes.js

@@ -1,15 +1,72 @@
-import { __awaiter, __generator } from "tslib";
-var pluralSuffixes = ["_zero", "_one", "_two", "_few", "_many", "_other"];
-var filterTranslationKey = function (key) {
-    var parts = key.split("_").filter(Boolean);
-    if (parts.length > 1) {
-        var lastPart = parts[parts.length - 1];
-        return /^[0-9]+$/.test(lastPart) || pluralSuffixes.includes(lastPart);
+import { __awaiter, __generator, __read, __spreadArray } from "tslib";
+import { forin, isNumericLiteral, objectPick, split } from "@koine/utils";
+var pluralSuffixes = ["zero", "one", "two", "few", "many", "other"];
+var requiredPluralSuffix = "other";
+var isPluralSuffix = function (suffix) {
+    return (pluralSuffixes.includes(suffix) ||
+        isNumericLiteral(suffix));
+};
+var isPluralKey = function (key) {
+    var _a = __read(split(key, "_"), 2), suffix = _a[1];
+    return isPluralSuffix(suffix);
+};
+var groupPluralsKeysByRoot = function (pluralKeys) {
+    var map = {};
+    pluralKeys.forEach(function (key) {
+        var _a = __read(split(key, "_"), 1), root = _a[0];
+        map[root] = map[root] || [];
+        map[root].push(key);
+    });
+    return map;
+};
+var transformKeysForPlurals = function (keys) {
+    var pluralKeys = keys.filter(isPluralKey);
+    if (pluralKeys.length) {
+        var transformedKeys_1 = __spreadArray([], __read(keys), false);
+        var groupedPlurals = groupPluralsKeysByRoot(pluralKeys);
+        forin(groupedPlurals, function (pluralRoot, pluralKeys) {
+            if (!keys.includes(pluralRoot)) {
+                transformedKeys_1.push(pluralRoot);
+            }
+            pluralKeys.forEach(function (pluralKey) {
+                if (keys.includes(pluralKey)) {
+                    transformedKeys_1 = transformedKeys_1.filter(function (k) { return k !== pluralKey; });
+                }
+            });
+        });
+        return transformedKeys_1;
+    }
+    return keys;
+};
+var analyseObjectPlurals = function (obj) {
+    var keys = Object.keys(obj);
+    var hasPlurals = keys.includes(requiredPluralSuffix);
+    var hasOnlyPluralKeys = false;
+    var newValue = obj;
+    if (hasPlurals) {
+        var nonPluralKeys = keys.filter(function (k) { return !isPluralSuffix(k); });
+        hasOnlyPluralKeys = nonPluralKeys.length === 0;
+        newValue = objectPick(obj, nonPluralKeys);
     }
-    return false;
+    return {
+        hasPlurals: hasPlurals,
+        hasOnlyPluralKeys: hasOnlyPluralKeys,
+        newValue: newValue,
+    };
 };
-function getType(value, options) {
-    if (options === void 0) { options = {}; }
+var getTypeForObjectEntry = function (key, value) {
+    if (typeof value === "object") {
+        var _a = analyseObjectPlurals(value), hasPlurals = _a.hasPlurals, hasOnlyPluralKeys = _a.hasOnlyPluralKeys, newValue = _a.newValue;
+        if (hasOnlyPluralKeys) {
+            return "'".concat(key, "': string;");
+        }
+        if (hasPlurals) {
+            return "'".concat(key, "': string | ").concat(getType(newValue));
+        }
+    }
+    return "'".concat(key, "': ").concat(getType(value));
+};
+function getType(value) {
     var out = "";
     var primitiveType = "";
     if (typeof value === "boolean") {
@@ -26,16 +83,15 @@ function getType(value, options) {
     }
     else if (Array.isArray(value)) {
         var firstValue = value[0];
-        out += "".concat(getType(firstValue, options), "[];");
+        out += "".concat(getType(firstValue), "[];");
     }
     else if (typeof value === "object") {
         out += "{";
-        for (var _key in value) {
-            var key = _key;
-            if (!filterTranslationKey(key)) {
-                var single = value[key];
-                out += "'".concat(key, "': ").concat(getType(single, options));
-            }
+        var keys = transformKeysForPlurals(Object.keys(value));
+        for (var i = 0; i < keys.length; i++) {
+            var key = keys[i];
+            var single = value[key] || "";
+            out += getTypeForObjectEntry(key, single);
         }
         out += "};";
     }
@@ -45,22 +101,33 @@ function getType(value, options) {
 }
 export function i18nGenerateTypes(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var defaultLocale, files, defaultLocaleFiles, header, footer, out, i, _a, path, data, namespace;
+        var defaultLocale, files, defaultLocaleFiles, header, footer, out, i, _a, path, data, namespace, format;
         return __generator(this, function (_b) {
-            defaultLocale = options.defaultLocale, files = options.files;
-            defaultLocaleFiles = files.filter(function (f) { return f.locale === defaultLocale; });
-            header = "\n/* eslint-disable @typescript-eslint/ban-types */\n/* eslint-disable @typescript-eslint/no-namespace */\n\ndeclare namespace Koine {\n  interface Translations {\n";
-            footer = "\n  }\n}\n";
-            out = header;
-            for (i = 0; i < defaultLocaleFiles.length; i++) {
-                _a = defaultLocaleFiles[i], path = _a.path, data = _a.data;
-                namespace = path.replace(".json", "");
-                out += "\"".concat(namespace, "\": ").concat(getType(data), "\n");
-            }
-            out += footer;
-            if (!process.env["JEST_WORKER_ID"]) {
+            switch (_b.label) {
+                case 0:
+                    defaultLocale = options.defaultLocale, files = options.files;
+                    defaultLocaleFiles = files.filter(function (f) { return f.locale === defaultLocale; });
+                    header = "\n/* eslint-disable @typescript-eslint/ban-types */\n/* eslint-disable @typescript-eslint/no-namespace */\n\ndeclare namespace Koine {\n  interface Translations {\n";
+                    footer = "\n  }\n}\n";
+                    out = header;
+                    for (i = 0; i < defaultLocaleFiles.length; i++) {
+                        _a = defaultLocaleFiles[i], path = _a.path, data = _a.data;
+                        namespace = path.replace(".json", "");
+                        out += "\"".concat(namespace, "\": ").concat(getType(data), "\n");
+                    }
+                    out += footer;
+                    if (!!process.env["JEST_WORKER_ID"]) return [3, 3];
+                    return [4, import("prettier")];
+                case 1:
+                    format = (_b.sent()).format;
+                    return [4, format(out, {
+                            parser: "typescript",
+                        })];
+                case 2:
+                    out = _b.sent();
+                    _b.label = 3;
+                case 3: return [2, out];
             }
-            return [2, out];
         });
     });
 }

package/package.json

@@ -2,7 +2,16 @@
   "name": "@koine/i18n",
   "sideEffects": false,
   "dependencies": {
-    "@koine/node": "2.0.0-beta.28"
+    "@koine/node": "2.0.0-beta.29",
+    "@koine/utils": "2.0.0-beta.29"
+  },
+  "peerDependenciesMeta": {
+    "prettier": {
+      "optional": true
+    },
+    "glob": {
+      "optional": true
+    }
   },
   "module": "./index.js",
   "type": "module",
@@ -35,6 +44,9 @@
       "import": "./types.js"
     }
   },
-  "peerDependencies": {},
-  "version": "2.0.0-beta.28"
+  "peerDependencies": {
+    "prettier": "^3.1.1",
+    "glob": "^10.3.10"
+  },
+  "version": "2.0.0-beta.29"
 }