@etsoo/shared 1.1.42 → 1.1.43

package/README.md

@@ -118,8 +118,6 @@ Data type definitions and type safe functions
 |getEnumKey|Get enum string literal type value|
 |getEnumKeys|Get Enum keys|
 |getIdValue|Get object id field value|
-|getItemId|Get item id|
-|getItemLabel|Get item label|
 |getResult|Get input function or value result|
 |getStringValue|Get object string field value|
 |getValue|Get object field value|

package/__tests__/DataTypes.ts

@@ -77,17 +77,16 @@ test('Tests for getEnumKeys', () => {
     expect(keys).toContainEqual('Unkwown');
 });
 
-test('Tests for getItemId', () => {
+test('Tests for IdLabelItem', () => {
     // Arrange
-    const items: DataTypes.IdItem[] = [
-        { id: 1 },
-        { id: '123' },
-        { id: () => 'f123' }
+    const items: DataTypes.IdLabelItem[] = [
+        { id: 1, label: 'Item 1' },
+        { id: 2, label: 'Item 2' }
     ];
 
     // Assert
-    expect(DataTypes.getItemId(items[0])).toBe('1');
-    expect(DataTypes.getItemId(items[2])).toBe('f123');
+    expect(items[0].id).toBe(1);
+    expect(items[1].label).toBe('Item 2');
 });
 
 test('Tests for getValue', () => {
@@ -109,19 +108,6 @@ test('Tests for getStringValue', () => {
     expect(DataTypes.getStringValue(data, 'flag')).toBe('true');
 });
 
-test('Tests for getItemLabel', () => {
-    // Arrange
-    const items: DataTypes.IdLabelItem[] = [
-        { id: 1, label: '123' },
-        { id: '123', label: () => 'f123' },
-        { id: () => 'f123', label: 'l123' }
-    ];
-
-    // Assert
-    expect(DataTypes.getItemLabel(items[0])).toBe('123');
-    expect(DataTypes.getItemLabel(items[1])).toBe('f123');
-});
-
 test('Tests for isSimpleType', () => {
     expect(DataTypes.isSimpleType(1)).toBeTruthy();
     expect(DataTypes.isSimpleType(new Date())).toBeTruthy();

package/lib/cjs/DataTypes.d.ts

@@ -153,20 +153,20 @@ export declare namespace DataTypes {
     /**
      * Item with id property
      */
-    type IdItem = {
+    type IdItem<T extends IdType = number> = {
         /**
-         * Id field or generator
+         * Id field
          */
-        id: IdType | (() => string);
+        id: T;
     };
     /**
      * Item with id and label property
      */
-    type IdLabelItem = IdItem & {
+    type IdLabelItem<T extends IdType = number> = IdItem<T> & {
         /**
-         * label field or generator
+         * label field
          */
-        label: string | (() => string);
+        label: string;
     };
     /**
      * Get specific type keys
@@ -174,18 +174,6 @@ export declare namespace DataTypes {
     type Keys<T, R = string | number> = {
         [k in keyof T]: T[k] extends R ? k : never;
     }[keyof T];
-    /**
-     * Get item id
-     * @param item Item with id
-     * @returns string id
-     */
-    const getItemId: (item: IdItem) => string;
-    /**
-     * Get item label
-     * @param item Item with id
-     * @returns string id
-     */
-    const getItemLabel: (item: IdLabelItem) => string;
     /**
      * Culture definiton
      */

package/lib/cjs/DataTypes.js

@@ -71,28 +71,6 @@ var DataTypes;
         VAlignEnum[VAlignEnum["Center"] = 2] = "Center";
         VAlignEnum[VAlignEnum["Bottom"] = 3] = "Bottom";
     })(VAlignEnum = DataTypes.VAlignEnum || (DataTypes.VAlignEnum = {}));
-    /**
-     * Get item id
-     * @param item Item with id
-     * @returns string id
-     */
-    DataTypes.getItemId = (item) => {
-        if (typeof item.id === 'function')
-            return item.id();
-        if (typeof item.id === 'number')
-            return item.id.toString();
-        return item.id;
-    };
-    /**
-     * Get item label
-     * @param item Item with id
-     * @returns string id
-     */
-    DataTypes.getItemLabel = (item) => {
-        if (typeof item.label === 'function')
-            return item.label();
-        return item.label;
-    };
     /**
      * Convert value to target type
      * @param input Input value

package/lib/mjs/DataTypes.d.ts

@@ -153,20 +153,20 @@ export declare namespace DataTypes {
     /**
      * Item with id property
      */
-    type IdItem = {
+    type IdItem<T extends IdType = number> = {
         /**
-         * Id field or generator
+         * Id field
          */
-        id: IdType | (() => string);
+        id: T;
     };
     /**
      * Item with id and label property
      */
-    type IdLabelItem = IdItem & {
+    type IdLabelItem<T extends IdType = number> = IdItem<T> & {
         /**
-         * label field or generator
+         * label field
          */
-        label: string | (() => string);
+        label: string;
     };
     /**
      * Get specific type keys
@@ -174,18 +174,6 @@ export declare namespace DataTypes {
     type Keys<T, R = string | number> = {
         [k in keyof T]: T[k] extends R ? k : never;
     }[keyof T];
-    /**
-     * Get item id
-     * @param item Item with id
-     * @returns string id
-     */
-    const getItemId: (item: IdItem) => string;
-    /**
-     * Get item label
-     * @param item Item with id
-     * @returns string id
-     */
-    const getItemLabel: (item: IdLabelItem) => string;
     /**
      * Culture definiton
      */

package/lib/mjs/DataTypes.js

@@ -68,28 +68,6 @@ export var DataTypes;
         VAlignEnum[VAlignEnum["Center"] = 2] = "Center";
         VAlignEnum[VAlignEnum["Bottom"] = 3] = "Bottom";
     })(VAlignEnum = DataTypes.VAlignEnum || (DataTypes.VAlignEnum = {}));
-    /**
-     * Get item id
-     * @param item Item with id
-     * @returns string id
-     */
-    DataTypes.getItemId = (item) => {
-        if (typeof item.id === 'function')
-            return item.id();
-        if (typeof item.id === 'number')
-            return item.id.toString();
-        return item.id;
-    };
-    /**
-     * Get item label
-     * @param item Item with id
-     * @returns string id
-     */
-    DataTypes.getItemLabel = (item) => {
-        if (typeof item.label === 'function')
-            return item.label();
-        return item.label;
-    };
     /**
      * Convert value to target type
      * @param input Input value

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.42",
+    "version": "1.1.43",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -56,8 +56,8 @@
     "dependencies": {},
     "devDependencies": {
         "@types/jest": "^28.1.6",
-        "@typescript-eslint/eslint-plugin": "^5.32.0",
-        "@typescript-eslint/parser": "^5.32.0",
+        "@typescript-eslint/eslint-plugin": "^5.33.0",
+        "@typescript-eslint/parser": "^5.33.0",
         "eslint": "^8.21.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",

package/src/DataTypes.ts

@@ -196,21 +196,21 @@ export namespace DataTypes {
     /**
      * Item with id property
      */
-    export type IdItem = {
+    export type IdItem<T extends IdType = number> = {
         /**
-         * Id field or generator
+         * Id field
          */
-        id: IdType | (() => string);
+        id: T;
     };
 
     /**
      * Item with id and label property
      */
-    export type IdLabelItem = IdItem & {
+    export type IdLabelItem<T extends IdType = number> = IdItem<T> & {
         /**
-         * label field or generator
+         * label field
          */
-        label: string | (() => string);
+        label: string;
     };
 
     /**
@@ -220,27 +220,6 @@ export namespace DataTypes {
         [k in keyof T]: T[k] extends R ? k : never;
     }[keyof T];
 
-    /**
-     * Get item id
-     * @param item Item with id
-     * @returns string id
-     */
-    export const getItemId = (item: IdItem) => {
-        if (typeof item.id === 'function') return item.id();
-        if (typeof item.id === 'number') return item.id.toString();
-        return item.id;
-    };
-
-    /**
-     * Get item label
-     * @param item Item with id
-     * @returns string id
-     */
-    export const getItemLabel = (item: IdLabelItem) => {
-        if (typeof item.label === 'function') return item.label();
-        return item.label;
-    };
-
     /**
      * Culture definiton
      */