@tstdl/base 0.83.12 → 0.83.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.83.12",
+  "version": "0.83.14",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -31,8 +31,8 @@
     "@types/mjml": "4.7",
     "@types/node": "18",
     "@types/nodemailer": "6.4",
-    "@typescript-eslint/eslint-plugin": "5.56",
-    "@typescript-eslint/parser": "5.56",
+    "@typescript-eslint/eslint-plugin": "5.57",
+    "@typescript-eslint/parser": "5.57",
     "concurrently": "7.6",
     "esbuild": "0.17",
     "eslint": "8.36",

package/text/localization.service.d.ts

@@ -14,12 +14,12 @@ type LocalizationTemplate = {
 export type EnumerationLocalization<T extends Enumeration = Enumeration> = {
     [P in EnumerationValue<T>]: LocalizeItem<any>;
 };
-export type EnumerationLocalizationEntry<T extends Enumeration = Enumeration> = [T, EnumerationLocalization<T>];
-export type Localization<T extends LocalizationTemplate = LocalizationTemplate, Enums extends Enumeration[] = []> = {
+export type EnumerationLocalizationEntry<T extends Enumeration = Enumeration> = [enumType: T, enumName: LocalizeItem<any> | undefined, enumValues: EnumerationLocalization<T>];
+export type Localization<T extends LocalizationTemplate = LocalizationTemplate, Enums extends Enumeration[] = Enumeration[]> = {
     language: Language;
     keys: T;
     enums: {
-        [P in keyof Enums]: EnumerationLocalizationEntry<Enums[P]>;
+        [I in keyof Enums]: EnumerationLocalizationEntry<Enums[I]>;
     };
 };
 declare const parametersSymbol: unique symbol;
@@ -60,19 +60,21 @@ export declare class LocalizationService {
     readonly activeLanguage$: Observable<Language | undefined>;
     readonly availableLanguages$: Observable<readonly Language[]>;
     constructor(logger: Logger);
-    registerLocalization(...localizations: Localization<any, any>[]): void;
+    registerLocalization(...localizations: Localization[]): void;
     hasLanguage(languageCode: string): boolean;
     getLanguage(languageCode: string): Language;
     setLanguage(languageOrCode: Language | string): void;
-    setLocalization(localization: Localization<any, any>): void;
+    setLocalization(localization: Localization): void;
     tryGetItem<Parameters>(key: LocalizationKey<Parameters> | LocalizationData<Parameters>): LocalizeItem | undefined;
     hasKey<Parameters>(key: LocalizationKey<Parameters> | LocalizationData<Parameters>): boolean;
     localize<Parameters>(keyOrData: LocalizationKey<Parameters> | LocalizationData<Parameters>): string;
-    localizeEnum<T extends Enumeration>(enumeration: T, value: EnumerationValue<T>, parameters?: unknown): string;
+    localizeEnum<T extends Enumeration>(enumeration: T, value?: EnumerationValue<T>, parameters?: unknown): string;
     localize$<Parameters>(data: LocalizationData<Parameters>): Observable<string>;
-    localizeEnum$<T extends Enumeration>(enumeration: T, value: EnumerationValue<T>, parameters?: unknown): Observable<string>;
+    localizeEnum$<T extends Enumeration>(enumeration: T, value?: EnumerationValue<T>, parameters?: unknown): Observable<string>;
     private localizeItem;
 }
+export declare function enumerationLocalization<T extends Enumeration>(enumeration: T, name: LocalizeItem | undefined, localization: EnumerationLocalization<T>): EnumerationLocalizationEntry<T>;
 export declare function enumerationLocalization<T extends Enumeration>(enumeration: T, localization: EnumerationLocalization<T>): EnumerationLocalizationEntry<T>;
-declare function _autoEnumerationLocalization<T extends Enumeration>(enumeration: T): EnumerationLocalizationEntry<T>;
+declare function _autoEnumerationLocalization<T extends Enumeration>(enumeration: T, name?: LocalizeItem): EnumerationLocalizationEntry<T>;
+export declare function isLocalizeItem(value: any): value is LocalizeItem<any>;
 export {};

package/text/localization.service.js

@@ -23,6 +23,7 @@ __export(localization_service_exports, {
   enumerationLocalization: () => enumerationLocalization,
   getLocalizationKeys: () => getLocalizationKeys,
   getProxyLocalizationKey: () => getProxyLocalizationKey,
+  isLocalizeItem: () => isLocalizeItem,
   isProxyLocalizationKey: () => isProxyLocalizationKey,
   localizationData: () => localizationData
 });
@@ -155,10 +156,14 @@ let LocalizationService = class LocalizationService2 {
     return this.localizeItem(key, templateOrFunction, parameters);
   }
   localizeEnum(enumeration, value, parameters) {
+    if ((0, import_type_guards.isUndefined)(value)) {
+      const name = this.activeLocalization?.enums.get(enumeration)?.name;
+      return this.localizeItem("ENUM", name, parameters);
+    }
     const key = (0, import_type_guards.isArray)(enumeration) ? value : (0, import_enum.enumValueName)(enumeration, value);
-    const item = this.activeLocalization?.enums.get(enumeration)?.[value];
+    const item = this.activeLocalization?.enums.get(enumeration)?.values[value];
     if ((0, import_type_guards.isUndefined)(item)) {
-      return autoEnumerationLocalization(enumeration)[1][value];
+      return autoEnumerationLocalization(enumeration)[2][value];
     }
     return this.localizeItem(key, item, parameters);
   }
@@ -195,21 +200,22 @@ LocalizationService = __decorate([
   __param(0, (0, import_container.resolveArg)("LocalizationService")),
   __metadata("design:paramtypes", [import_logger.Logger])
 ], LocalizationService);
-function enumerationLocalization(enumeration, localization) {
-  return [enumeration, localization];
+function enumerationLocalization(enumeration, nameOrLocalization, localizationOrNothing) {
+  return [enumeration, isLocalizeItem(nameOrLocalization) ? nameOrLocalization : void 0, localizationOrNothing ?? nameOrLocalization];
 }
-function _autoEnumerationLocalization(enumeration) {
+function _autoEnumerationLocalization(enumeration, name) {
   if ((0, import_type_guards.isObject)(enumeration)) {
-    return [enumeration, Object.fromEntries((0, import_enum.enumEntries)(enumeration).map(([key, value]) => [value, key]))];
+    return [enumeration, name, Object.fromEntries((0, import_enum.enumEntries)(enumeration).map(([key, value]) => [value, key]))];
   }
   const arrayEntries = enumeration.map((value) => [value, value]);
-  return [enumeration, Object.fromEntries(arrayEntries)];
+  return [enumeration, name, Object.fromEntries(arrayEntries)];
 }
 function buildMappedLocalization({ language, keys, enums }) {
+  const enumsEntries = enums.map((entry) => [entry[0], { name: entry[1], values: entry[2] }]);
   const mappedLocalization = {
     language,
     keys: new Map((0, import_object.deepObjectEntries)(keys)),
-    enums: new Map(enums)
+    enums: new Map(enumsEntries)
   };
   return mappedLocalization;
 }
@@ -235,3 +241,6 @@ function mergeMappedLocalization(a, b, force = false) {
     enums: new Map([...a.enums, ...b.enums])
   };
 }
+function isLocalizeItem(value) {
+  return (0, import_type_guards.isString)(value) || (0, import_type_guards.isFunction)(value);
+}