@etsoo/appscript 1.4.43 → 1.4.45

package/lib/cjs/app/CoreApp.d.ts

@@ -413,19 +413,19 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     /**
      * Get enum item number id list
      * @param em Enum
-     * @param prefix Label prefix
+     * @param prefix Label prefix or callback
      * @param filter Filter
      * @returns List
      */
-    getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: ((id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined) | E[keyof E][]): ListType[];
+    getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string | ((key: string) => string), filter?: ((id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined) | E[keyof E][]): ListType[];
     /**
      * Get enum item string id list
      * @param em Enum
-     * @param prefix Label prefix
+     * @param prefix Label prefix or callback
      * @param filter Filter
      * @returns List
      */
-    getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType1[];
+    getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string | ((key: string) => string), filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType1[];
     /**
      * Get region label
      * @param id Region id

package/lib/cjs/app/CoreApp.js

@@ -1023,20 +1023,23 @@ class CoreApp {
     /**
      * Get enum item number id list
      * @param em Enum
-     * @param prefix Label prefix
+     * @param prefix Label prefix or callback
      * @param filter Filter
      * @returns List
      */
     getEnumList(em, prefix, filter) {
         var _a;
         const list = [];
+        const getKey = typeof prefix === 'function'
+            ? prefix
+            : (key) => prefix + key;
         if (Array.isArray(filter)) {
             filter.forEach((id) => {
                 var _a;
                 if (typeof id !== 'number')
                     return;
                 const key = shared_1.DataTypes.getEnumKey(em, id);
-                var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
+                const label = (_a = this.get(getKey(key))) !== null && _a !== void 0 ? _a : key;
                 list.push({ id, label });
             });
         }
@@ -1052,7 +1055,7 @@ class CoreApp {
                 }
                 if (typeof id !== 'number')
                     continue;
-                var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
+                const label = (_a = this.get(getKey(key))) !== null && _a !== void 0 ? _a : key;
                 list.push({ id, label });
             }
         }
@@ -1061,13 +1064,16 @@ class CoreApp {
     /**
      * Get enum item string id list
      * @param em Enum
-     * @param prefix Label prefix
+     * @param prefix Label prefix or callback
      * @param filter Filter
      * @returns List
      */
     getEnumStrList(em, prefix, filter) {
         var _a;
         const list = [];
+        const getKey = typeof prefix === 'function'
+            ? prefix
+            : (key) => prefix + key;
         const keys = shared_1.DataTypes.getEnumKeys(em);
         for (const key of keys) {
             let id = em[key];
@@ -1077,7 +1083,7 @@ class CoreApp {
                     continue;
                 id = fid;
             }
-            var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
+            var label = (_a = this.get(getKey(key))) !== null && _a !== void 0 ? _a : key;
             list.push({ id: id.toString(), label });
         }
         return list;

package/lib/cjs/app/IApp.d.ts

@@ -336,19 +336,19 @@ export interface IApp {
     /**
      * Get enum item number id list
      * @param em Enum
-     * @param prefix Label prefix
+     * @param prefix Label prefix or callback
      * @param filter Filter
      * @returns List
      */
-    getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType[];
+    getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string | ((key: string) => string), filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType[];
     /**
      * Get enum item string id list
      * @param em Enum
-     * @param prefix Label prefix
+     * @param prefix Label prefix or callback
      * @param filter Filter
      * @returns List
      */
-    getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: ((id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined) | E[keyof E][]): ListType1[];
+    getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string | ((key: string) => string), filter?: ((id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined) | E[keyof E][]): ListType1[];
     /**
      * Get region label
      * @param id Region id

package/lib/mjs/app/CoreApp.d.ts

@@ -413,19 +413,19 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     /**
      * Get enum item number id list
      * @param em Enum
-     * @param prefix Label prefix
+     * @param prefix Label prefix or callback
      * @param filter Filter
      * @returns List
      */
-    getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: ((id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined) | E[keyof E][]): ListType[];
+    getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string | ((key: string) => string), filter?: ((id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined) | E[keyof E][]): ListType[];
     /**
      * Get enum item string id list
      * @param em Enum
-     * @param prefix Label prefix
+     * @param prefix Label prefix or callback
      * @param filter Filter
      * @returns List
      */
-    getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType1[];
+    getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string | ((key: string) => string), filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType1[];
     /**
      * Get region label
      * @param id Region id

package/lib/mjs/app/CoreApp.js

@@ -997,20 +997,23 @@ export class CoreApp {
     /**
      * Get enum item number id list
      * @param em Enum
-     * @param prefix Label prefix
+     * @param prefix Label prefix or callback
      * @param filter Filter
      * @returns List
      */
     getEnumList(em, prefix, filter) {
         var _a;
         const list = [];
+        const getKey = typeof prefix === 'function'
+            ? prefix
+            : (key) => prefix + key;
         if (Array.isArray(filter)) {
             filter.forEach((id) => {
                 var _a;
                 if (typeof id !== 'number')
                     return;
                 const key = DataTypes.getEnumKey(em, id);
-                var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
+                const label = (_a = this.get(getKey(key))) !== null && _a !== void 0 ? _a : key;
                 list.push({ id, label });
             });
         }
@@ -1026,7 +1029,7 @@ export class CoreApp {
                 }
                 if (typeof id !== 'number')
                     continue;
-                var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
+                const label = (_a = this.get(getKey(key))) !== null && _a !== void 0 ? _a : key;
                 list.push({ id, label });
             }
         }
@@ -1035,13 +1038,16 @@ export class CoreApp {
     /**
      * Get enum item string id list
      * @param em Enum
-     * @param prefix Label prefix
+     * @param prefix Label prefix or callback
      * @param filter Filter
      * @returns List
      */
     getEnumStrList(em, prefix, filter) {
         var _a;
         const list = [];
+        const getKey = typeof prefix === 'function'
+            ? prefix
+            : (key) => prefix + key;
         const keys = DataTypes.getEnumKeys(em);
         for (const key of keys) {
             let id = em[key];
@@ -1051,7 +1057,7 @@ export class CoreApp {
                     continue;
                 id = fid;
             }
-            var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
+            var label = (_a = this.get(getKey(key))) !== null && _a !== void 0 ? _a : key;
             list.push({ id: id.toString(), label });
         }
         return list;

package/lib/mjs/app/IApp.d.ts

@@ -336,19 +336,19 @@ export interface IApp {
     /**
      * Get enum item number id list
      * @param em Enum
-     * @param prefix Label prefix
+     * @param prefix Label prefix or callback
      * @param filter Filter
      * @returns List
      */
-    getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType[];
+    getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string | ((key: string) => string), filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType[];
     /**
      * Get enum item string id list
      * @param em Enum
-     * @param prefix Label prefix
+     * @param prefix Label prefix or callback
      * @param filter Filter
      * @returns List
      */
-    getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: ((id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined) | E[keyof E][]): ListType1[];
+    getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string | ((key: string) => string), filter?: ((id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined) | E[keyof E][]): ListType1[];
     /**
      * Get region label
      * @param id Region id

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.4.43",
+    "version": "1.4.45",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -53,13 +53,13 @@
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.28",
-        "@etsoo/restclient": "^1.0.89",
+        "@etsoo/restclient": "^1.0.90",
         "@etsoo/shared": "^1.2.12",
         "crypto-js": "^4.1.1"
     },
     "devDependencies": {
         "@babel/cli": "^7.22.15",
-        "@babel/core": "^7.22.15",
+        "@babel/core": "^7.22.17",
         "@babel/plugin-transform-runtime": "^7.22.15",
         "@babel/preset-env": "^7.22.15",
         "@babel/runtime-corejs3": "^7.22.15",

package/src/app/CoreApp.ts

@@ -1359,13 +1359,13 @@ export abstract class CoreApp<
     /**
      * Get enum item number id list
      * @param em Enum
-     * @param prefix Label prefix
+     * @param prefix Label prefix or callback
      * @param filter Filter
      * @returns List
      */
     getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(
         em: E,
-        prefix: string,
+        prefix: string | ((key: string) => string),
         filter?:
             | ((
                   id: E[keyof E],
@@ -1375,11 +1375,16 @@ export abstract class CoreApp<
     ): ListType[] {
         const list: ListType[] = [];
 
+        const getKey =
+            typeof prefix === 'function'
+                ? prefix
+                : (key: string) => prefix + key;
+
         if (Array.isArray(filter)) {
             filter.forEach((id) => {
                 if (typeof id !== 'number') return;
                 const key = DataTypes.getEnumKey(em, id);
-                var label = this.get<string>(prefix + key) ?? key;
+                const label = this.get<string>(getKey(key)) ?? key;
                 list.push({ id, label });
             });
         } else {
@@ -1392,7 +1397,7 @@ export abstract class CoreApp<
                     id = fid;
                 }
                 if (typeof id !== 'number') continue;
-                var label = this.get<string>(prefix + key) ?? key;
+                const label = this.get<string>(getKey(key)) ?? key;
                 list.push({ id, label });
             }
         }
@@ -1402,19 +1407,25 @@ export abstract class CoreApp<
     /**
      * Get enum item string id list
      * @param em Enum
-     * @param prefix Label prefix
+     * @param prefix Label prefix or callback
      * @param filter Filter
      * @returns List
      */
     getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(
         em: E,
-        prefix: string,
+        prefix: string | ((key: string) => string),
         filter?: (
             id: E[keyof E],
             key: keyof E & string
         ) => E[keyof E] | undefined
     ): ListType1[] {
         const list: ListType1[] = [];
+
+        const getKey =
+            typeof prefix === 'function'
+                ? prefix
+                : (key: string) => prefix + key;
+
         const keys = DataTypes.getEnumKeys(em);
         for (const key of keys) {
             let id = em[key as keyof E];
@@ -1423,7 +1434,7 @@ export abstract class CoreApp<
                 if (fid == null) continue;
                 id = fid;
             }
-            var label = this.get<string>(prefix + key) ?? key;
+            var label = this.get<string>(getKey(key)) ?? key;
             list.push({ id: id.toString(), label });
         }
         return list;

package/src/app/IApp.ts

@@ -450,13 +450,13 @@ export interface IApp {
     /**
      * Get enum item number id list
      * @param em Enum
-     * @param prefix Label prefix
+     * @param prefix Label prefix or callback
      * @param filter Filter
      * @returns List
      */
     getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(
         em: E,
-        prefix: string,
+        prefix: string | ((key: string) => string),
         filter?: (
             id: E[keyof E],
             key: keyof E & string
@@ -466,13 +466,13 @@ export interface IApp {
     /**
      * Get enum item string id list
      * @param em Enum
-     * @param prefix Label prefix
+     * @param prefix Label prefix or callback
      * @param filter Filter
      * @returns List
      */
     getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(
         em: E,
-        prefix: string,
+        prefix: string | ((key: string) => string),
         filter?:
             | ((
                   id: E[keyof E],