@etsoo/shared 1.2.74 → 1.2.75

package/__tests__/DataTypes.ts

@@ -1,5 +1,10 @@
 import { DataTypes, IdDefaultType, LabelDefaultType } from "../src/DataTypes";
 
+enum GenderEnum {
+  Male = "M",
+  Female = "F"
+}
+
 test("Tests for DI", () => {
   const item: DataTypes.DIS<"id", number> & DataTypes.DIS<"label", string> = {
     id: 1,
@@ -98,12 +103,26 @@ test("Tests for getEnumByValue", () => {
   expect(DataTypes.getEnumByValue(DataTypes.HAlignEnum, 4)).toBeUndefined();
 });
 
+test("Tests for getEnumByValue of string value enum", () => {
+  expect(DataTypes.getEnumByValue(GenderEnum, "M")).toStrictEqual(
+    GenderEnum.Male
+  );
+  expect(DataTypes.getEnumByValue(GenderEnum, "F")).toStrictEqual(
+    GenderEnum.Female
+  );
+});
+
 test("Tests for getEnumKey", () => {
   expect(
     DataTypes.getEnumKey(DataTypes.HAlignEnum, DataTypes.HAlignEnum.Center)
   ).toBe("Center");
 });
 
+test("Tests for getEnumKey of string value enum", () => {
+  expect(DataTypes.getEnumKey(GenderEnum, GenderEnum.Female)).toBe("Female");
+  expect(DataTypes.getEnumKey(GenderEnum, "None")).toBeUndefined();
+});
+
 test("Tests for getEnumKeys", () => {
   enum ProductUnit {
     KILOGRAM = 32,

package/lib/cjs/DataTypes.d.ts

@@ -325,6 +325,7 @@ export declare namespace DataTypes {
     function getBasicNameByValue(value: unknown, isArray?: boolean): BasicNames | undefined;
     /**
      * Get enum item from key
+     * getEnumByKey(Gender, "Male") === Gender.Male
      * @param enumItem Enum
      * @param key Key
      * @returns Enum item
@@ -332,6 +333,7 @@ export declare namespace DataTypes {
     function getEnumByKey<T extends EnumBase, K extends keyof T>(enumItem: T, key: string): T[K] | undefined;
     /**
      * Get enum item from value
+     * getEnumByKey(Gender, "M") === Gender.Male
      * @param enumItem Enum
      * @param value Key
      * @returns Enum item or undefined
@@ -339,11 +341,12 @@ export declare namespace DataTypes {
     function getEnumByValue<T extends EnumBase, K extends keyof T>(enumItem: T, value: EnumValue): T[K] | undefined;
     /**
      * Get enum string literal type value
+     * getEnumKey(Gender, "F") === "Female"
      * @param enumItem Enum item
      * @param value Value
      * @returns Result
      */
-    function getEnumKey(enumItem: EnumBase, value: EnumValue): string;
+    function getEnumKey<T extends EnumBase>(enumItem: T, value: EnumValue): string | undefined;
     /**
      * Get Enum keys
      * @param input Input Enum

package/lib/cjs/DataTypes.js

@@ -290,8 +290,15 @@ var DataTypes;
         return typeName;
     }
     DataTypes.getBasicNameByValue = getBasicNameByValue;
+    /*
+      enum Gender {
+        Male = "M",
+        Female = "F"
+      }
+    */
     /**
      * Get enum item from key
+     * getEnumByKey(Gender, "Male") === Gender.Male
      * @param enumItem Enum
      * @param key Key
      * @returns Enum item
@@ -304,24 +311,47 @@ var DataTypes;
     DataTypes.getEnumByKey = getEnumByKey;
     /**
      * Get enum item from value
+     * getEnumByKey(Gender, "M") === Gender.Male
      * @param enumItem Enum
      * @param value Key
      * @returns Enum item or undefined
      */
     function getEnumByValue(enumItem, value) {
-        if (value in enumItem)
-            return value;
+        if (typeof value === "number") {
+            if (value in enumItem)
+                return value;
+        }
+        else {
+            const keys = Object.keys(enumItem);
+            for (const key of keys) {
+                const kv = enumItem[key];
+                if (kv === value)
+                    return kv;
+            }
+        }
         return undefined;
     }
     DataTypes.getEnumByValue = getEnumByValue;
     /**
      * Get enum string literal type value
+     * getEnumKey(Gender, "F") === "Female"
      * @param enumItem Enum item
      * @param value Value
      * @returns Result
      */
     function getEnumKey(enumItem, value) {
-        return enumItem[value].toString();
+        if (typeof value === "number") {
+            if (value in enumItem)
+                return enumItem[value].toString();
+        }
+        else {
+            const keys = Object.keys(enumItem);
+            for (const key of keys) {
+                if (enumItem[key] === value)
+                    return key;
+            }
+        }
+        return undefined;
     }
     DataTypes.getEnumKey = getEnumKey;
     /**

package/lib/mjs/DataTypes.d.ts

@@ -325,6 +325,7 @@ export declare namespace DataTypes {
     function getBasicNameByValue(value: unknown, isArray?: boolean): BasicNames | undefined;
     /**
      * Get enum item from key
+     * getEnumByKey(Gender, "Male") === Gender.Male
      * @param enumItem Enum
      * @param key Key
      * @returns Enum item
@@ -332,6 +333,7 @@ export declare namespace DataTypes {
     function getEnumByKey<T extends EnumBase, K extends keyof T>(enumItem: T, key: string): T[K] | undefined;
     /**
      * Get enum item from value
+     * getEnumByKey(Gender, "M") === Gender.Male
      * @param enumItem Enum
      * @param value Key
      * @returns Enum item or undefined
@@ -339,11 +341,12 @@ export declare namespace DataTypes {
     function getEnumByValue<T extends EnumBase, K extends keyof T>(enumItem: T, value: EnumValue): T[K] | undefined;
     /**
      * Get enum string literal type value
+     * getEnumKey(Gender, "F") === "Female"
      * @param enumItem Enum item
      * @param value Value
      * @returns Result
      */
-    function getEnumKey(enumItem: EnumBase, value: EnumValue): string;
+    function getEnumKey<T extends EnumBase>(enumItem: T, value: EnumValue): string | undefined;
     /**
      * Get Enum keys
      * @param input Input Enum

package/lib/mjs/DataTypes.js

@@ -287,8 +287,15 @@ export var DataTypes;
         return typeName;
     }
     DataTypes.getBasicNameByValue = getBasicNameByValue;
+    /*
+      enum Gender {
+        Male = "M",
+        Female = "F"
+      }
+    */
     /**
      * Get enum item from key
+     * getEnumByKey(Gender, "Male") === Gender.Male
      * @param enumItem Enum
      * @param key Key
      * @returns Enum item
@@ -301,24 +308,47 @@ export var DataTypes;
     DataTypes.getEnumByKey = getEnumByKey;
     /**
      * Get enum item from value
+     * getEnumByKey(Gender, "M") === Gender.Male
      * @param enumItem Enum
      * @param value Key
      * @returns Enum item or undefined
      */
     function getEnumByValue(enumItem, value) {
-        if (value in enumItem)
-            return value;
+        if (typeof value === "number") {
+            if (value in enumItem)
+                return value;
+        }
+        else {
+            const keys = Object.keys(enumItem);
+            for (const key of keys) {
+                const kv = enumItem[key];
+                if (kv === value)
+                    return kv;
+            }
+        }
         return undefined;
     }
     DataTypes.getEnumByValue = getEnumByValue;
     /**
      * Get enum string literal type value
+     * getEnumKey(Gender, "F") === "Female"
      * @param enumItem Enum item
      * @param value Value
      * @returns Result
      */
     function getEnumKey(enumItem, value) {
-        return enumItem[value].toString();
+        if (typeof value === "number") {
+            if (value in enumItem)
+                return enumItem[value].toString();
+        }
+        else {
+            const keys = Object.keys(enumItem);
+            for (const key of keys) {
+                if (enumItem[key] === value)
+                    return key;
+            }
+        }
+        return undefined;
     }
     DataTypes.getEnumKey = getEnumKey;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/shared",
-  "version": "1.2.74",
+  "version": "1.2.75",
   "description": "TypeScript shared utilities and functions",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -37,10 +37,10 @@
   "homepage": "https://github.com/ETSOO/Shared#readme",
   "devDependencies": {
     "@types/lodash.isequal": "^4.5.8",
-    "@vitejs/plugin-react": "^4.5.0",
+    "@vitejs/plugin-react": "^4.5.1",
     "jsdom": "^26.1.0",
     "typescript": "^5.8.3",
-    "vitest": "^3.1.4"
+    "vitest": "^3.2.3"
   },
   "dependencies": {
     "lodash.isequal": "^4.5.0"

package/src/DataTypes.ts

@@ -561,8 +561,16 @@ export namespace DataTypes {
     return typeName;
   }
 
+  /* 
+    enum Gender {
+      Male = "M",
+      Female = "F"
+    }
+  */
+
   /**
    * Get enum item from key
+   * getEnumByKey(Gender, "Male") === Gender.Male
    * @param enumItem Enum
    * @param key Key
    * @returns Enum item
@@ -577,6 +585,7 @@ export namespace DataTypes {
 
   /**
    * Get enum item from value
+   * getEnumByKey(Gender, "M") === Gender.Male
    * @param enumItem Enum
    * @param value Key
    * @returns Enum item or undefined
@@ -585,18 +594,40 @@ export namespace DataTypes {
     enumItem: T,
     value: EnumValue
   ): T[K] | undefined {
-    if (value in enumItem) return <T[K]>value;
+    if (typeof value === "number") {
+      if (value in enumItem) return <T[K]>value;
+    } else {
+      const keys = Object.keys(enumItem) as (keyof T)[];
+      for (const key of keys) {
+        const kv = enumItem[key];
+        if (kv === value) return <T[K]>kv;
+      }
+    }
+
     return undefined;
   }
 
   /**
    * Get enum string literal type value
+   * getEnumKey(Gender, "F") === "Female"
    * @param enumItem Enum item
    * @param value Value
    * @returns Result
    */
-  export function getEnumKey(enumItem: EnumBase, value: EnumValue) {
-    return enumItem[value].toString();
+  export function getEnumKey<T extends EnumBase>(
+    enumItem: T,
+    value: EnumValue
+  ) {
+    if (typeof value === "number") {
+      if (value in enumItem) return enumItem[value].toString();
+    } else {
+      const keys = Object.keys(enumItem);
+      for (const key of keys) {
+        if (enumItem[key] === value) return key;
+      }
+    }
+
+    return undefined;
   }
 
   /**