@etsoo/shared 1.1.45 → 1.1.48

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,8 +99,10 @@ 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|
+|ObjType|Generic object type|
 |Simple|Basic or basic array type|
 |SimpleEnum|Simple type enum|
 |SimpleNames|Simple type names|
@@ -118,6 +122,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/__tests__/Utils.ts

@@ -143,9 +143,9 @@ test('Tests for objectEqual', () => {
 
 test('Tests for objectUpdated', () => {
     const objPrev = { a: 1, b: 'abc', c: true, d: null, f: [1, 2] };
-    const objNew = { a: 2, b: 'abc', d: new Date(), f: [1, 2, 3] };
+    const objNew = { a: 2, b: 'abc', d: new Date(), f: [1, 2, 3], g: true };
     const fields = Utils.objectUpdated(objNew, objPrev, ['d']);
-    expect(fields.sort()).toStrictEqual(['a', 'c', 'f']);
+    expect(fields.sort()).toStrictEqual(['a', 'c', 'f', 'g']);
 });
 
 test('Tests for parseString', () => {

package/lib/cjs/DataTypes.d.ts

@@ -1,3 +1,8 @@
+/**
+ * Generic object type
+ * Narrow case, uses StringRecord
+ * Before was wrong with {}, from 4.8 unknown = {} | null | undefined
+ */
 /**
  * Interface data types
  */
@@ -123,8 +128,8 @@ export declare namespace DataTypes {
     /**
      * Key collection, like { key1: {}, key2: {} }
      */
-    type KeyCollection<K extends readonly string[], I extends {}> = {
-        [index in K[number]]: I;
+    type KeyCollection<K extends readonly string[], I extends object> = {
+        [P in K[number]]: I;
     };
     /**
      * Enum value type
@@ -168,6 +173,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
      */
@@ -177,7 +186,7 @@ export declare namespace DataTypes {
     /**
      * Culture definiton
      */
-    type CultureDefinition<T extends {} = StringRecord> = Readonly<{
+    type CultureDefinition<T extends StringRecord = StringRecord> = Readonly<{
         /**
          * Name, like zh-CN
          */
@@ -195,6 +204,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,21 +283,28 @@ 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 object, 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
      * @param key Property name
      * @returns Id value
      */
-    function getIdValue<T extends {}, K extends Keys<T, string | number>>(data: T, key: K): T[K];
+    function getIdValue<T extends object, 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 object, 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 object>(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

@@ -1,4 +1,9 @@
 "use strict";
+/**
+ * Generic object type
+ * Narrow case, uses StringRecord
+ * Before was wrong with {}, from 4.8 unknown = {} | null | undefined
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataTypes = void 0;
 /**
@@ -290,14 +295,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 +311,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 +334,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/cjs/DomUtils.d.ts

@@ -19,7 +19,7 @@ export declare namespace DomUtils {
      * @param source Source data to match
      * @param keepFields Fields need to be kept
      */
-    function clearFormData(data: IFormData, source?: {}, keepFields?: string[]): IFormData;
+    function clearFormData(data: IFormData, source?: object, keepFields?: string[]): IFormData;
     /**
      * Cast data as template format
      * @param source Source data
@@ -35,7 +35,7 @@ export declare namespace DomUtils {
      * @param keepSource Means even the template does not include the definition, still keep the item
      * @returns Result
      */
-    function dataValueAs<T extends {}>(source: IFormData | {}, templateValue: T, keepSource?: boolean): Partial<T>;
+    function dataValueAs<T extends object>(source: IFormData | object, templateValue: T, keepSource?: boolean): Partial<T>;
     /**
      * Current detected country
      */
@@ -67,7 +67,7 @@ export declare namespace DomUtils {
      * @param items Available cultures
      * @param culture Detected culture
      */
-    const getCulture: <T extends {}>(items: Readonly<{
+    const getCulture: <T extends DataTypes.StringRecord>(items: Readonly<{
         name: string;
         label: string;
         resources: T;
@@ -117,5 +117,5 @@ export declare namespace DomUtils {
      * @param name Element name or first collection item
      * @param container Container, limits the element range
      */
-    function setFocus(name: string | {}, container?: HTMLElement): void;
+    function setFocus(name: string | object, container?: HTMLElement): void;
 }

package/lib/cjs/StorageUtils.d.ts

@@ -30,7 +30,7 @@ export declare namespace StorageUtils {
      * Get local storage object data
      * @param key Key name
      */
-    function getLocalObject<T extends {}>(key: string): T | undefined;
+    function getLocalObject<T extends object>(key: string): T | undefined;
     /**
      * Get session storage data
      * @param key Key name
@@ -46,5 +46,5 @@ export declare namespace StorageUtils {
      * Get session storage object data
      * @param key Key name
      */
-    function getSessionObject<T extends {}>(key: string): T | undefined;
+    function getSessionObject<T extends object>(key: string): T | undefined;
 }

package/lib/cjs/Utils.d.ts

@@ -53,7 +53,7 @@ export declare namespace Utils {
      * @param labelField Label field, default is label
      * @param blankLabel Blank label, default is ---
      */
-    function addBlankItem<T extends {}>(options: T[], idField?: string | keyof T, labelField?: unknown, blankLabel?: string): void;
+    function addBlankItem<T extends object>(options: T[], idField?: string | keyof T, labelField?: unknown, blankLabel?: string): void;
     /**
      * Base64 chars to number
      * @param base64Chars Base64 chars
@@ -65,7 +65,7 @@ export declare namespace Utils {
      * @param input Input object
      * @param fields Fields to correct
      */
-    function correctTypes<T extends {}, F extends {
+    function correctTypes<T extends object, F extends {
         [P in keyof T]: DataTypes.BasicNames;
     }>(input: T, fields: F): void;
     /**
@@ -95,7 +95,7 @@ export declare namespace Utils {
      * @param ignoreFields Ignore fields
      * @returns
      */
-    function getDataChanges(input: {}, initData: {}, ignoreFields?: string[]): string[];
+    function getDataChanges(input: object, initData: object, ignoreFields?: string[]): string[];
     /**
      * Get input function or value result
      * @param input Input function or value
@@ -150,7 +150,7 @@ export declare namespace Utils {
      * @param strict Strict level, 0 with ==, 1 === but null equal undefined, 2 ===
      * @returns Result
      */
-    function objectEqual(obj1: {}, obj2: {}, ignoreFields?: string[], strict?: number): boolean;
+    function objectEqual(obj1: object, obj2: object, ignoreFields?: string[], strict?: number): boolean;
     /**
      * Get two object's unqiue properties
      * @param obj1 Object 1
@@ -158,7 +158,7 @@ export declare namespace Utils {
      * @param ignoreFields Ignored fields
      * @returns Unique properties
      */
-    function objectKeys(obj1: {}, obj2: {}, ignoreFields?: string[]): Set<string>;
+    function objectKeys(obj1: object, obj2: object, ignoreFields?: string[]): Set<string>;
     /**
      * Get the new object's updated fields contrast to the previous object
      * @param objNew New object
@@ -167,7 +167,7 @@ export declare namespace Utils {
      * @param strict Strict level, 0 with ==, 1 === but null equal undefined, 2 ===
      * @returns Updated fields
      */
-    function objectUpdated(objNew: {}, objPrev: {}, ignoreFields?: string[], strict?: number): string[];
+    function objectUpdated(objNew: object, objPrev: object, ignoreFields?: string[], strict?: number): string[];
     /**
      * Parse string (JSON) to specific type, no type conversion
      * For type conversion, please use DataTypes.convert
@@ -202,7 +202,7 @@ export declare namespace Utils {
      * @param labels Labels
      * @param reference Key reference dictionary
      */
-    const setLabels: (source: {}, labels: DataTypes.StringRecord, reference?: Readonly<DataTypes.StringDictionary>) => void;
+    const setLabels: (source: DataTypes.StringRecord, labels: DataTypes.StringRecord, reference?: Readonly<DataTypes.StringDictionary>) => void;
     /**
      * Snake name to works, 'snake_name' to 'Snake Name'
      * @param name Name text

package/lib/cjs/node/Storage.d.ts

@@ -9,7 +9,6 @@ export declare class NodeStorage {
     source: [string, string][];
     /**
      * Constructor
-     * @param session Is session storage
      */
     constructor();
     /**

package/lib/cjs/node/Storage.js

@@ -8,7 +8,6 @@ exports.NodeStorage = void 0;
 class NodeStorage {
     /**
      * Constructor
-     * @param session Is session storage
      */
     constructor() {
         /**

package/lib/cjs/storage/IStorage.d.ts

@@ -46,12 +46,12 @@ export interface IStorage {
      * Get object data
      * @param key Key name
      */
-    getObject<T extends {}>(key: string): T | undefined;
+    getObject<T extends object>(key: string): T | undefined;
     /**
      * Get persisted object data
      * @param key Key name
      */
-    getPersistedObject<T extends {}>(key: string): T | undefined;
+    getPersistedObject<T extends object>(key: string): T | undefined;
     /**
      * Set data
      * @param key Key name

package/lib/cjs/storage/WindowStorage.d.ts

@@ -48,12 +48,12 @@ export declare class WindowStorage implements IStorage {
      * Get object data
      * @param key Key name
      */
-    getObject<T extends {}>(key: string): T | undefined;
+    getObject<T extends object>(key: string): T | undefined;
     /**
      * Get persisted object data
      * @param key Key name
      */
-    getPersistedObject<T extends {}>(key: string): T | undefined;
+    getPersistedObject<T extends object>(key: string): T | undefined;
     /**
      * Set data
      * @param key Key name

package/lib/cjs/types/EventClass.d.ts

@@ -41,7 +41,7 @@ interface EventOptions {
     once?: boolean;
 }
 declare type EventClassDef = {
-    [key: string]: {};
+    [key: string]: object;
 };
 /**
  * Event class

package/lib/mjs/DataTypes.d.ts

@@ -1,3 +1,8 @@
+/**
+ * Generic object type
+ * Narrow case, uses StringRecord
+ * Before was wrong with {}, from 4.8 unknown = {} | null | undefined
+ */
 /**
  * Interface data types
  */
@@ -123,8 +128,8 @@ export declare namespace DataTypes {
     /**
      * Key collection, like { key1: {}, key2: {} }
      */
-    type KeyCollection<K extends readonly string[], I extends {}> = {
-        [index in K[number]]: I;
+    type KeyCollection<K extends readonly string[], I extends object> = {
+        [P in K[number]]: I;
     };
     /**
      * Enum value type
@@ -168,6 +173,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
      */
@@ -177,7 +186,7 @@ export declare namespace DataTypes {
     /**
      * Culture definiton
      */
-    type CultureDefinition<T extends {} = StringRecord> = Readonly<{
+    type CultureDefinition<T extends StringRecord = StringRecord> = Readonly<{
         /**
          * Name, like zh-CN
          */
@@ -195,6 +204,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,21 +283,28 @@ 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 object, 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
      * @param key Property name
      * @returns Id value
      */
-    function getIdValue<T extends {}, K extends Keys<T, string | number>>(data: T, key: K): T[K];
+    function getIdValue<T extends object, 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 object, 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 object>(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

@@ -1,3 +1,8 @@
+/**
+ * Generic object type
+ * Narrow case, uses StringRecord
+ * Before was wrong with {}, from 4.8 unknown = {} | null | undefined
+ */
 /**
  * Interface data types
  */
@@ -287,14 +292,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 +308,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 +331,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/lib/mjs/DomUtils.d.ts

@@ -19,7 +19,7 @@ export declare namespace DomUtils {
      * @param source Source data to match
      * @param keepFields Fields need to be kept
      */
-    function clearFormData(data: IFormData, source?: {}, keepFields?: string[]): IFormData;
+    function clearFormData(data: IFormData, source?: object, keepFields?: string[]): IFormData;
     /**
      * Cast data as template format
      * @param source Source data
@@ -35,7 +35,7 @@ export declare namespace DomUtils {
      * @param keepSource Means even the template does not include the definition, still keep the item
      * @returns Result
      */
-    function dataValueAs<T extends {}>(source: IFormData | {}, templateValue: T, keepSource?: boolean): Partial<T>;
+    function dataValueAs<T extends object>(source: IFormData | object, templateValue: T, keepSource?: boolean): Partial<T>;
     /**
      * Current detected country
      */
@@ -67,7 +67,7 @@ export declare namespace DomUtils {
      * @param items Available cultures
      * @param culture Detected culture
      */
-    const getCulture: <T extends {}>(items: Readonly<{
+    const getCulture: <T extends DataTypes.StringRecord>(items: Readonly<{
         name: string;
         label: string;
         resources: T;
@@ -117,5 +117,5 @@ export declare namespace DomUtils {
      * @param name Element name or first collection item
      * @param container Container, limits the element range
      */
-    function setFocus(name: string | {}, container?: HTMLElement): void;
+    function setFocus(name: string | object, container?: HTMLElement): void;
 }

package/lib/mjs/StorageUtils.d.ts

@@ -30,7 +30,7 @@ export declare namespace StorageUtils {
      * Get local storage object data
      * @param key Key name
      */
-    function getLocalObject<T extends {}>(key: string): T | undefined;
+    function getLocalObject<T extends object>(key: string): T | undefined;
     /**
      * Get session storage data
      * @param key Key name
@@ -46,5 +46,5 @@ export declare namespace StorageUtils {
      * Get session storage object data
      * @param key Key name
      */
-    function getSessionObject<T extends {}>(key: string): T | undefined;
+    function getSessionObject<T extends object>(key: string): T | undefined;
 }

package/lib/mjs/Utils.d.ts

@@ -53,7 +53,7 @@ export declare namespace Utils {
      * @param labelField Label field, default is label
      * @param blankLabel Blank label, default is ---
      */
-    function addBlankItem<T extends {}>(options: T[], idField?: string | keyof T, labelField?: unknown, blankLabel?: string): void;
+    function addBlankItem<T extends object>(options: T[], idField?: string | keyof T, labelField?: unknown, blankLabel?: string): void;
     /**
      * Base64 chars to number
      * @param base64Chars Base64 chars
@@ -65,7 +65,7 @@ export declare namespace Utils {
      * @param input Input object
      * @param fields Fields to correct
      */
-    function correctTypes<T extends {}, F extends {
+    function correctTypes<T extends object, F extends {
         [P in keyof T]: DataTypes.BasicNames;
     }>(input: T, fields: F): void;
     /**
@@ -95,7 +95,7 @@ export declare namespace Utils {
      * @param ignoreFields Ignore fields
      * @returns
      */
-    function getDataChanges(input: {}, initData: {}, ignoreFields?: string[]): string[];
+    function getDataChanges(input: object, initData: object, ignoreFields?: string[]): string[];
     /**
      * Get input function or value result
      * @param input Input function or value
@@ -150,7 +150,7 @@ export declare namespace Utils {
      * @param strict Strict level, 0 with ==, 1 === but null equal undefined, 2 ===
      * @returns Result
      */
-    function objectEqual(obj1: {}, obj2: {}, ignoreFields?: string[], strict?: number): boolean;
+    function objectEqual(obj1: object, obj2: object, ignoreFields?: string[], strict?: number): boolean;
     /**
      * Get two object's unqiue properties
      * @param obj1 Object 1
@@ -158,7 +158,7 @@ export declare namespace Utils {
      * @param ignoreFields Ignored fields
      * @returns Unique properties
      */
-    function objectKeys(obj1: {}, obj2: {}, ignoreFields?: string[]): Set<string>;
+    function objectKeys(obj1: object, obj2: object, ignoreFields?: string[]): Set<string>;
     /**
      * Get the new object's updated fields contrast to the previous object
      * @param objNew New object
@@ -167,7 +167,7 @@ export declare namespace Utils {
      * @param strict Strict level, 0 with ==, 1 === but null equal undefined, 2 ===
      * @returns Updated fields
      */
-    function objectUpdated(objNew: {}, objPrev: {}, ignoreFields?: string[], strict?: number): string[];
+    function objectUpdated(objNew: object, objPrev: object, ignoreFields?: string[], strict?: number): string[];
     /**
      * Parse string (JSON) to specific type, no type conversion
      * For type conversion, please use DataTypes.convert
@@ -202,7 +202,7 @@ export declare namespace Utils {
      * @param labels Labels
      * @param reference Key reference dictionary
      */
-    const setLabels: (source: {}, labels: DataTypes.StringRecord, reference?: Readonly<DataTypes.StringDictionary>) => void;
+    const setLabels: (source: DataTypes.StringRecord, labels: DataTypes.StringRecord, reference?: Readonly<DataTypes.StringDictionary>) => void;
     /**
      * Snake name to works, 'snake_name' to 'Snake Name'
      * @param name Name text

package/lib/mjs/node/Storage.d.ts

@@ -9,7 +9,6 @@ export declare class NodeStorage {
     source: [string, string][];
     /**
      * Constructor
-     * @param session Is session storage
      */
     constructor();
     /**

package/lib/mjs/node/Storage.js

@@ -5,7 +5,6 @@
 export class NodeStorage {
     /**
      * Constructor
-     * @param session Is session storage
      */
     constructor() {
         /**

package/lib/mjs/storage/IStorage.d.ts

@@ -46,12 +46,12 @@ export interface IStorage {
      * Get object data
      * @param key Key name
      */
-    getObject<T extends {}>(key: string): T | undefined;
+    getObject<T extends object>(key: string): T | undefined;
     /**
      * Get persisted object data
      * @param key Key name
      */
-    getPersistedObject<T extends {}>(key: string): T | undefined;
+    getPersistedObject<T extends object>(key: string): T | undefined;
     /**
      * Set data
      * @param key Key name

package/lib/mjs/storage/WindowStorage.d.ts

@@ -48,12 +48,12 @@ export declare class WindowStorage implements IStorage {
      * Get object data
      * @param key Key name
      */
-    getObject<T extends {}>(key: string): T | undefined;
+    getObject<T extends object>(key: string): T | undefined;
     /**
      * Get persisted object data
      * @param key Key name
      */
-    getPersistedObject<T extends {}>(key: string): T | undefined;
+    getPersistedObject<T extends object>(key: string): T | undefined;
     /**
      * Set data
      * @param key Key name

package/lib/mjs/types/EventClass.d.ts

@@ -41,7 +41,7 @@ interface EventOptions {
     once?: boolean;
 }
 declare type EventClassDef = {
-    [key: string]: {};
+    [key: string]: object;
 };
 /**
  * Event class

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.45",
+    "version": "1.1.48",
     "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.8",
+        "@typescript-eslint/eslint-plugin": "^5.35.1",
+        "@typescript-eslint/parser": "^5.35.1",
         "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

@@ -1,3 +1,9 @@
+/**
+ * Generic object type
+ * Narrow case, uses StringRecord
+ * Before was wrong with {}, from 4.8 unknown = {} | null | undefined
+ */
+
 /**
  * Interface data types
  */
@@ -159,8 +165,8 @@ export namespace DataTypes {
     /**
      * Key collection, like { key1: {}, key2: {} }
      */
-    export type KeyCollection<K extends readonly string[], I extends {}> = {
-        [index in K[number]]: I;
+    export type KeyCollection<K extends readonly string[], I extends object> = {
+        [P in K[number]]: I;
     };
 
     /**
@@ -213,6 +219,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
      */
@@ -223,27 +238,38 @@ export namespace DataTypes {
     /**
      * Culture definiton
      */
-    export type CultureDefinition<T extends {} = StringRecord> = Readonly<{
-        /**
-         * Name, like zh-CN
-         */
-        name: string;
+    export type CultureDefinition<T extends StringRecord = StringRecord> =
+        Readonly<{
+            /**
+             * Name, like zh-CN
+             */
+            name: string;
 
-        /**
-         * Label for description, like Simplifined Chinese
-         */
-        label: string;
+            /**
+             * Label for description, like Simplifined Chinese
+             */
+            label: string;
 
-        /**
-         * Resources
-         */
-        resources: T;
+            /**
+             * Resources
+             */
+            resources: T;
 
-        /**
-         * Compatible names
-         */
-        compatibleName?: string[];
-    }>;
+            /**
+             * Compatible names
+             */
+            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
@@ -504,16 +530,14 @@ export namespace DataTypes {
      * @param key Property name
      * @returns Value
      */
-    export function getValue<T extends {}>(
+    export function getValue<T extends object, 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;
     }
 
     /**
@@ -523,25 +547,42 @@ export namespace DataTypes {
      * @returns Id value
      */
     export function getIdValue<
-        T extends {},
+        T extends object,
         K extends Keys<T, string | number>
     >(data: T, key: K): T[K] {
         return data[key];
     }
 
+    /**
+     * Get object id field value 1
+     * @param data Data
+     * @param key Property name
+     * @returns Id value
+     */
+    export function getIdValue1<T extends object, 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
      * @param key Property name
      * @returns String value
      */
-    export function getStringValue<T extends {}>(
+    export function getStringValue<T extends object>(
         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}`;
     }
 
     /**

package/src/DomUtils.ts

@@ -30,7 +30,7 @@ export namespace DomUtils {
      */
     export function clearFormData(
         data: IFormData,
-        source?: {},
+        source?: object,
         keepFields?: string[]
     ) {
         // Unique keys, FormData may have same name keys
@@ -98,9 +98,9 @@ export namespace DomUtils {
     }
 
     function dataAsTraveller(
-        source: IFormData | {},
-        data: {},
-        template: {},
+        source: IFormData | object,
+        data: object,
+        template: object,
         keepSource: boolean,
         isValue: boolean
     ) {
@@ -183,8 +183,8 @@ export namespace DomUtils {
      * @param keepSource Means even the template does not include the definition, still keep the item
      * @returns Result
      */
-    export function dataValueAs<T extends {}>(
-        source: IFormData | {},
+    export function dataValueAs<T extends object>(
+        source: IFormData | object,
         templateValue: T,
         keepSource: boolean = false
     ): Partial<T> {
@@ -312,7 +312,7 @@ export namespace DomUtils {
      * @param items Available cultures
      * @param culture Detected culture
      */
-    export const getCulture = <T extends {}>(
+    export const getCulture = <T extends DataTypes.StringRecord>(
         items: DataTypes.CultureDefinition<T>[],
         culture: string
     ) => {
@@ -453,7 +453,7 @@ export namespace DomUtils {
      * @param name Element name or first collection item
      * @param container Container, limits the element range
      */
-    export function setFocus(name: string | {}, container?: HTMLElement) {
+    export function setFocus(name: string | object, container?: HTMLElement) {
         const elementName =
             typeof name === 'string' ? name : Object.keys(name)[0];
 

package/src/StorageUtils.ts

@@ -80,7 +80,7 @@ export namespace StorageUtils {
      * Get local storage object data
      * @param key Key name
      */
-    export function getLocalObject<T extends {}>(key: string) {
+    export function getLocalObject<T extends object>(key: string) {
         // Get storage
         const data = localStorage.getItem(key);
         if (data == null) return undefined;
@@ -123,7 +123,7 @@ export namespace StorageUtils {
      * Get session storage object data
      * @param key Key name
      */
-    export function getSessionObject<T extends {}>(key: string) {
+    export function getSessionObject<T extends object>(key: string) {
         // Get storage
         const data = sessionStorage.getItem(key);
         if (data == null) return undefined;

package/src/Utils.ts

@@ -119,7 +119,7 @@ export namespace Utils {
      * @param labelField Label field, default is label
      * @param blankLabel Blank label, default is ---
      */
-    export function addBlankItem<T extends {}>(
+    export function addBlankItem<T extends object>(
         options: T[],
         idField?: string | keyof T,
         labelField?: unknown,
@@ -155,7 +155,7 @@ export namespace Utils {
      * @param fields Fields to correct
      */
     export function correctTypes<
-        T extends {},
+        T extends object,
         F extends { [P in keyof T]: DataTypes.BasicNames }
     >(input: T, fields: F) {
         for (const field in fields) {
@@ -218,8 +218,8 @@ export namespace Utils {
      * @returns
      */
     export function getDataChanges(
-        input: {},
-        initData: {},
+        input: object,
+        initData: object,
         ignoreFields: string[] = ['id']
     ): string[] {
         // Changed fields
@@ -375,8 +375,8 @@ export namespace Utils {
      * @returns Result
      */
     export function objectEqual(
-        obj1: {},
-        obj2: {},
+        obj1: object,
+        obj2: object,
         ignoreFields: string[] = [],
         strict = 1
     ) {
@@ -402,8 +402,8 @@ export namespace Utils {
      * @returns Unique properties
      */
     export function objectKeys(
-        obj1: {},
-        obj2: {},
+        obj1: object,
+        obj2: object,
         ignoreFields: string[] = []
     ) {
         // All keys
@@ -424,8 +424,8 @@ export namespace Utils {
      * @returns Updated fields
      */
     export function objectUpdated(
-        objNew: {},
-        objPrev: {},
+        objNew: object,
+        objPrev: object,
         ignoreFields: string[] = [],
         strict = 1
     ) {
@@ -537,7 +537,7 @@ export namespace Utils {
      * @param reference Key reference dictionary
      */
     export const setLabels = (
-        source: {},
+        source: DataTypes.StringRecord,
         labels: DataTypes.StringRecord,
         reference?: Readonly<DataTypes.StringDictionary>
     ) => {

package/src/node/Storage.ts

@@ -10,7 +10,6 @@ export class NodeStorage {
 
     /**
      * Constructor
-     * @param session Is session storage
      */
     constructor() {}
 

package/src/storage/IStorage.ts

@@ -53,13 +53,13 @@ export interface IStorage {
      * Get object data
      * @param key Key name
      */
-    getObject<T extends {}>(key: string): T | undefined;
+    getObject<T extends object>(key: string): T | undefined;
 
     /**
      * Get persisted object data
      * @param key Key name
      */
-    getPersistedObject<T extends {}>(key: string): T | undefined;
+    getPersistedObject<T extends object>(key: string): T | undefined;
 
     /**
      * Set data

package/src/storage/WindowStorage.ts

@@ -105,7 +105,7 @@ export class WindowStorage implements IStorage {
      * Get object data
      * @param key Key name
      */
-    getObject<T extends {}>(key: string) {
+    getObject<T extends object>(key: string) {
         // Get storage
         const data = sessionStorage.getItem(key);
 
@@ -118,7 +118,7 @@ export class WindowStorage implements IStorage {
      * Get persisted object data
      * @param key Key name
      */
-    getPersistedObject<T extends {}>(key: string) {
+    getPersistedObject<T extends object>(key: string) {
         // Get storage
         const data = localStorage.getItem(key);
 

package/src/types/EventClass.ts

@@ -55,7 +55,7 @@ interface EventOptions {
     once?: boolean;
 }
 
-type EventClassDef = { [key: string]: {} };
+type EventClassDef = { [key: string]: object };
 
 /**
  * Event class