@etsoo/shared 1.1.44 → 1.1.47

package/README.md

@@ -88,6 +88,8 @@ Data type definitions and type safe functions
 |BasicTemplateType|Basic template type|
 |CombinedEnum|Combined type enum|
 |CultureDefinition|Culture definition|
+|DI|Dynamic interface with multiple properties|
+|DIS|Dynamic interface with single property|
 |EnumBase|Enum base type|
 |EnumValue|Enum value type|
 |ExtendedEnum|Extended type enum|
@@ -97,6 +99,7 @@ Data type definitions and type safe functions
 |IdType|Number and string combination id type|
 |IdItem|Item with id or id generator|
 |IdLabelItem|Item with id and label|
+|IdLabelType|Item with id and label dynamic type|
 |KeyCollection|Key collection, like { key1: {}, key2: {} }|
 |Keys|Get specific type keys|
 |Simple|Basic or basic array type|
@@ -118,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

@@ -1,5 +1,22 @@
 import { DataTypes } from '../src/DataTypes';
 
+test('Tests for DI', () => {
+    const item: DataTypes.DIS<'id', number> & DataTypes.DIS<'label', string> = {
+        id: 1,
+        label: 'Etsoo'
+    };
+    expect(item.id).toBe(1);
+});
+
+test('Tests for IdLabelType', () => {
+    const item: DataTypes.IdLabelItem = {
+        id: 1,
+        label: 'Etsoo'
+    };
+    const itemCopy: DataTypes.IdLabelType<'id', 'label'> = { ...item };
+    expect(item).toEqual(itemCopy);
+});
+
 test('Tests for convert', () => {
     expect(DataTypes.convert('5', 0)).toStrictEqual(5);
     expect(
@@ -92,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

@@ -133,7 +133,7 @@ export declare namespace DataTypes {
     /**
      * Enum base type
      */
-    type EnumBase<T extends EnumValue = EnumValue> = Record<string, T>;
+    type EnumBase = Record<string, EnumValue>;
     /**
      * Function type
      */
@@ -168,6 +168,10 @@ export declare namespace DataTypes {
          */
         label: string;
     };
+    /**
+     * Item with id and label dynamic type
+     */
+    type IdLabelType<I extends string, L extends string, D extends IdType = number> = DIS<I, D> & DIS<L, string>;
     /**
      * Get specific type keys
      */
@@ -195,6 +199,18 @@ export declare namespace DataTypes {
          */
         compatibleName?: string[];
     }>;
+    /**
+     * Dynamic interface with multiple properties
+     */
+    type DI<K extends readonly string[], T> = {
+        [P in K[number]]: T;
+    };
+    /**
+     * Dynamic interface with single property
+     */
+    type DIS<K extends string, T> = {
+        [P in K]: T;
+    };
     /**
      * Convert value to target type
      * @param input Input value
@@ -262,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
@@ -270,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

@@ -133,7 +133,7 @@ export declare namespace DataTypes {
     /**
      * Enum base type
      */
-    type EnumBase<T extends EnumValue = EnumValue> = Record<string, T>;
+    type EnumBase = Record<string, EnumValue>;
     /**
      * Function type
      */
@@ -168,6 +168,10 @@ export declare namespace DataTypes {
          */
         label: string;
     };
+    /**
+     * Item with id and label dynamic type
+     */
+    type IdLabelType<I extends string, L extends string, D extends IdType = number> = DIS<I, D> & DIS<L, string>;
     /**
      * Get specific type keys
      */
@@ -195,6 +199,18 @@ export declare namespace DataTypes {
          */
         compatibleName?: string[];
     }>;
+    /**
+     * Dynamic interface with multiple properties
+     */
+    type DI<K extends readonly string[], T> = {
+        [P in K[number]]: T;
+    };
+    /**
+     * Dynamic interface with single property
+     */
+    type DIS<K extends string, T> = {
+        [P in K]: T;
+    };
     /**
      * Convert value to target type
      * @param input Input value
@@ -262,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
@@ -270,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.44",
+    "version": "1.1.47",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -55,15 +55,15 @@
     "homepage": "https://github.com/ETSOO/Shared#readme",
     "dependencies": {},
     "devDependencies": {
-        "@types/jest": "^28.1.6",
-        "@typescript-eslint/eslint-plugin": "^5.33.0",
-        "@typescript-eslint/parser": "^5.33.0",
+        "@types/jest": "^28.1.7",
+        "@typescript-eslint/eslint-plugin": "^5.34.0",
+        "@typescript-eslint/parser": "^5.34.0",
         "eslint": "^8.22.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "jest": "^28.1.3",
         "jest-environment-jsdom": "^28.1.3",
-        "ts-jest": "^28.0.7",
+        "ts-jest": "^28.0.8",
         "typescript": "^4.7.4"
     }
 }

package/src/DataTypes.ts

@@ -171,7 +171,7 @@ export namespace DataTypes {
     /**
      * Enum base type
      */
-    export type EnumBase<T extends EnumValue = EnumValue> = Record<string, T>;
+    export type EnumBase = Record<string, EnumValue>;
 
     /**
      * Function type
@@ -213,6 +213,15 @@ export namespace DataTypes {
         label: string;
     };
 
+    /**
+     * Item with id and label dynamic type
+     */
+    export type IdLabelType<
+        I extends string,
+        L extends string,
+        D extends IdType = number
+    > = DIS<I, D> & DIS<L, string>;
+
     /**
      * Get specific type keys
      */
@@ -245,6 +254,16 @@ export namespace DataTypes {
         compatibleName?: string[];
     }>;
 
+    /**
+     * Dynamic interface with multiple properties
+     */
+    export type DI<K extends readonly string[], T> = { [P in K[number]]: T };
+
+    /**
+     * Dynamic interface with single property
+     */
+    export type DIS<K extends string, T> = { [P in K]: T };
+
     /**
      * Convert value to target type
      * @param input Input value
@@ -504,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;
     }
 
     /**
@@ -529,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
@@ -538,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}`;
     }
 
     /**