@etsoo/shared 1.1.46 → 1.1.47

package/README.md

@@ -121,6 +121,7 @@ Data type definitions and type safe functions
 |getEnumKey|Get enum string literal type value|
 |getEnumKeys|Get Enum keys|
 |getIdValue|Get object id field value|
+|getIdValue1|Get object id field value 1|
 |getResult|Get input function or value result|
 |getStringValue|Get object string field value|
 |getValue|Get object field value|

package/__tests__/DataTypes.ts

@@ -109,8 +109,8 @@ test('Tests for IdLabelItem', () => {
 test('Tests for getValue', () => {
     const data = { id: 1, flag: true };
     expect(DataTypes.getValue(data, 'id')).toBe(1);
-    expect(DataTypes.getValue(data, 'flag')).toBe('true');
-    expect(DataTypes.getValue(data, 'unknown')).toBeNull();
+    expect(DataTypes.getValue(data, 'flag')).toBeTruthy();
+    expect(DataTypes.getValue(data, 'unknown')).toBeUndefined();
 });
 
 test('Tests for getIdValue', () => {

package/lib/cjs/DataTypes.d.ts

@@ -278,7 +278,7 @@ export declare namespace DataTypes {
      * @param key Property name
      * @returns Value
      */
-    function getValue<T extends {}>(data: T | undefined | null, key: keyof T | string): IdType | undefined | null;
+    function getValue<T extends {}, K extends keyof T | string>(data: T | undefined | null, key: K): K extends keyof T ? T[K] : undefined;
     /**
      * Get object id field value
      * @param data Data
@@ -286,13 +286,20 @@ export declare namespace DataTypes {
      * @returns Id value
      */
     function getIdValue<T extends {}, K extends Keys<T, string | number>>(data: T, key: K): T[K];
+    /**
+     * Get object id field value 1
+     * @param data Data
+     * @param key Property name
+     * @returns Id value
+     */
+    function getIdValue1<T extends {}, K extends keyof T | string>(data: T | undefined | null, key: K): K extends keyof T ? (T[K] extends number ? number : string) : undefined;
     /**
      * Get object string field value
      * @param data Data
      * @param key Property name
      * @returns String value
      */
-    function getStringValue<T extends {}>(data: T | undefined | null, key: keyof T | string): string | undefined | null;
+    function getStringValue<T extends {}>(data: T | undefined | null, key: keyof T | string): string | undefined;
     /**
      * Check the type is a basic type or not (type guard)
      * @param name Type name

package/lib/cjs/DataTypes.js

@@ -290,14 +290,10 @@ var DataTypes;
      * @returns Value
      */
     function getValue(data, key) {
-        if (data == null)
-            return null;
-        const value = typeof key === 'string' ? Reflect.get(data, key) : data[key];
-        if (value == null)
-            return null;
-        if (typeof value === 'number')
-            return value;
-        return convert(value, 'string');
+        if (data != null && typeof key === 'string' && key in data) {
+            return Reflect.get(data, key);
+        }
+        return undefined;
     }
     DataTypes.getValue = getValue;
     /**
@@ -310,6 +306,21 @@ var DataTypes;
         return data[key];
     }
     DataTypes.getIdValue = getIdValue;
+    /**
+     * Get object id field value 1
+     * @param data Data
+     * @param key Property name
+     * @returns Id value
+     */
+    function getIdValue1(data, key) {
+        const value = getValue(data, key);
+        if (value == null)
+            return undefined;
+        if (typeof value === 'number')
+            return value;
+        return `${value}`;
+    }
+    DataTypes.getIdValue1 = getIdValue1;
     /**
      * Get object string field value
      * @param data Data
@@ -318,9 +329,11 @@ var DataTypes;
      */
     function getStringValue(data, key) {
         const value = getValue(data, key);
-        if (typeof value === 'number')
-            return value.toString();
-        return value;
+        if (value == null)
+            return undefined;
+        if (typeof value === 'string')
+            return value;
+        return `${value}`;
     }
     DataTypes.getStringValue = getStringValue;
     /**

package/lib/mjs/DataTypes.d.ts

@@ -278,7 +278,7 @@ export declare namespace DataTypes {
      * @param key Property name
      * @returns Value
      */
-    function getValue<T extends {}>(data: T | undefined | null, key: keyof T | string): IdType | undefined | null;
+    function getValue<T extends {}, K extends keyof T | string>(data: T | undefined | null, key: K): K extends keyof T ? T[K] : undefined;
     /**
      * Get object id field value
      * @param data Data
@@ -286,13 +286,20 @@ export declare namespace DataTypes {
      * @returns Id value
      */
     function getIdValue<T extends {}, K extends Keys<T, string | number>>(data: T, key: K): T[K];
+    /**
+     * Get object id field value 1
+     * @param data Data
+     * @param key Property name
+     * @returns Id value
+     */
+    function getIdValue1<T extends {}, K extends keyof T | string>(data: T | undefined | null, key: K): K extends keyof T ? (T[K] extends number ? number : string) : undefined;
     /**
      * Get object string field value
      * @param data Data
      * @param key Property name
      * @returns String value
      */
-    function getStringValue<T extends {}>(data: T | undefined | null, key: keyof T | string): string | undefined | null;
+    function getStringValue<T extends {}>(data: T | undefined | null, key: keyof T | string): string | undefined;
     /**
      * Check the type is a basic type or not (type guard)
      * @param name Type name

package/lib/mjs/DataTypes.js

@@ -287,14 +287,10 @@ export var DataTypes;
      * @returns Value
      */
     function getValue(data, key) {
-        if (data == null)
-            return null;
-        const value = typeof key === 'string' ? Reflect.get(data, key) : data[key];
-        if (value == null)
-            return null;
-        if (typeof value === 'number')
-            return value;
-        return convert(value, 'string');
+        if (data != null && typeof key === 'string' && key in data) {
+            return Reflect.get(data, key);
+        }
+        return undefined;
     }
     DataTypes.getValue = getValue;
     /**
@@ -307,6 +303,21 @@ export var DataTypes;
         return data[key];
     }
     DataTypes.getIdValue = getIdValue;
+    /**
+     * Get object id field value 1
+     * @param data Data
+     * @param key Property name
+     * @returns Id value
+     */
+    function getIdValue1(data, key) {
+        const value = getValue(data, key);
+        if (value == null)
+            return undefined;
+        if (typeof value === 'number')
+            return value;
+        return `${value}`;
+    }
+    DataTypes.getIdValue1 = getIdValue1;
     /**
      * Get object string field value
      * @param data Data
@@ -315,9 +326,11 @@ export var DataTypes;
      */
     function getStringValue(data, key) {
         const value = getValue(data, key);
-        if (typeof value === 'number')
-            return value.toString();
-        return value;
+        if (value == null)
+            return undefined;
+        if (typeof value === 'string')
+            return value;
+        return `${value}`;
     }
     DataTypes.getStringValue = getStringValue;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.46",
+    "version": "1.1.47",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/DataTypes.ts

@@ -523,16 +523,14 @@ export namespace DataTypes {
      * @param key Property name
      * @returns Value
      */
-    export function getValue<T extends {}>(
+    export function getValue<T extends {}, K extends keyof T | string>(
         data: T | undefined | null,
-        key: keyof T | string
-    ): IdType | undefined | null {
-        if (data == null) return null;
-        const value =
-            typeof key === 'string' ? Reflect.get(data, key) : data[key];
-        if (value == null) return null;
-        if (typeof value === 'number') return value;
-        return convert(value, 'string');
+        key: K
+    ): K extends keyof T ? T[K] : undefined {
+        if (data != null && typeof key === 'string' && key in data) {
+            return Reflect.get(data, key);
+        }
+        return undefined as any;
     }
 
     /**
@@ -548,6 +546,22 @@ export namespace DataTypes {
         return data[key];
     }
 
+    /**
+     * Get object id field value 1
+     * @param data Data
+     * @param key Property name
+     * @returns Id value
+     */
+    export function getIdValue1<T extends {}, K extends keyof T | string>(
+        data: T | undefined | null,
+        key: K
+    ): K extends keyof T ? (T[K] extends number ? number : string) : undefined {
+        const value = getValue(data, key);
+        if (value == null) return undefined as any;
+        if (typeof value === 'number') return value as any;
+        return `${value}` as any;
+    }
+
     /**
      * Get object string field value
      * @param data Data
@@ -557,10 +571,11 @@ export namespace DataTypes {
     export function getStringValue<T extends {}>(
         data: T | undefined | null,
         key: keyof T | string
-    ): string | undefined | null {
+    ): string | undefined {
         const value = getValue(data, key);
-        if (typeof value === 'number') return value.toString();
-        return value;
+        if (value == null) return undefined;
+        if (typeof value === 'string') return value;
+        return `${value}`;
     }
 
     /**