@etsoo/shared 1.1.66 → 1.1.68

package/__tests__/Utils.ts

@@ -9,11 +9,14 @@ test('Tests for addBlankItem', () => {
     expect(options.length).toBe(3);
     expect(options[0].id).toBe('');
     expect(options[0].name).toBe('---');
+    Utils.addBlankItem(options, 'id', 'name');
+    expect(options.length).toBe(3);
 });
 
 test('Tests for correctTypes', () => {
     const input = {
         id: '1',
+        ignore: '2',
         price: '6.0',
         amount: '',
         date: '2022/01/28',

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 object>(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): T[];
     /**
      * Base64 chars to number
      * @param base64Chars Base64 chars
@@ -66,7 +66,7 @@ export declare namespace Utils {
      * @param fields Fields to correct
      */
     function correctTypes<T extends object, F extends {
-        [P in keyof T]: DataTypes.BasicNames;
+        [P in keyof T]?: DataTypes.BasicNames;
     }>(input: T, fields: F): void;
     /**
      * Two values equal

package/lib/cjs/Utils.js

@@ -60,11 +60,16 @@ var Utils;
      * @param blankLabel Blank label, default is ---
      */
     function addBlankItem(options, idField, labelField, blankLabel) {
-        const blankItem = {
-            [idField !== null && idField !== void 0 ? idField : 'id']: '',
-            [typeof labelField === 'string' ? labelField : 'label']: blankLabel !== null && blankLabel !== void 0 ? blankLabel : '---'
-        };
-        options.unshift(blankItem);
+        // Avoid duplicate blank items
+        idField !== null && idField !== void 0 ? idField : (idField = 'id');
+        if (options.length === 0 || Reflect.get(options[0], idField) !== '') {
+            const blankItem = {
+                [idField]: '',
+                [typeof labelField === 'string' ? labelField : 'label']: blankLabel !== null && blankLabel !== void 0 ? blankLabel : '---'
+            };
+            options.unshift(blankItem);
+        }
+        return options;
     }
     Utils.addBlankItem = addBlankItem;
     /**
@@ -88,8 +93,11 @@ var Utils;
      */
     function correctTypes(input, fields) {
         for (const field in fields) {
+            const type = fields[field];
+            if (type == null)
+                continue;
             const value = Reflect.get(input, field);
-            const newValue = DataTypes_1.DataTypes.convertByType(value, fields[field]);
+            const newValue = DataTypes_1.DataTypes.convertByType(value, type);
             if (newValue !== value) {
                 Reflect.set(input, field, newValue);
             }

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 object>(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): T[];
     /**
      * Base64 chars to number
      * @param base64Chars Base64 chars
@@ -66,7 +66,7 @@ export declare namespace Utils {
      * @param fields Fields to correct
      */
     function correctTypes<T extends object, F extends {
-        [P in keyof T]: DataTypes.BasicNames;
+        [P in keyof T]?: DataTypes.BasicNames;
     }>(input: T, fields: F): void;
     /**
      * Two values equal

package/lib/mjs/Utils.js

@@ -57,11 +57,16 @@ export var Utils;
      * @param blankLabel Blank label, default is ---
      */
     function addBlankItem(options, idField, labelField, blankLabel) {
-        const blankItem = {
-            [idField !== null && idField !== void 0 ? idField : 'id']: '',
-            [typeof labelField === 'string' ? labelField : 'label']: blankLabel !== null && blankLabel !== void 0 ? blankLabel : '---'
-        };
-        options.unshift(blankItem);
+        // Avoid duplicate blank items
+        idField !== null && idField !== void 0 ? idField : (idField = 'id');
+        if (options.length === 0 || Reflect.get(options[0], idField) !== '') {
+            const blankItem = {
+                [idField]: '',
+                [typeof labelField === 'string' ? labelField : 'label']: blankLabel !== null && blankLabel !== void 0 ? blankLabel : '---'
+            };
+            options.unshift(blankItem);
+        }
+        return options;
     }
     Utils.addBlankItem = addBlankItem;
     /**
@@ -85,8 +90,11 @@ export var Utils;
      */
     function correctTypes(input, fields) {
         for (const field in fields) {
+            const type = fields[field];
+            if (type == null)
+                continue;
             const value = Reflect.get(input, field);
-            const newValue = DataTypes.convertByType(value, fields[field]);
+            const newValue = DataTypes.convertByType(value, type);
             if (newValue !== value) {
                 Reflect.set(input, field, newValue);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.66",
+    "version": "1.1.68",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -55,13 +55,13 @@
     "homepage": "https://github.com/ETSOO/Shared#readme",
     "devDependencies": {
         "@types/jest": "^29.2.0",
-        "@typescript-eslint/eslint-plugin": "^5.40.1",
-        "@typescript-eslint/parser": "^5.40.1",
-        "eslint": "^8.25.0",
+        "@typescript-eslint/eslint-plugin": "^5.41.0",
+        "@typescript-eslint/parser": "^5.41.0",
+        "eslint": "^8.26.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
-        "jest": "^29.2.1",
-        "jest-environment-jsdom": "^29.2.1",
+        "jest": "^29.2.2",
+        "jest-environment-jsdom": "^29.2.2",
         "ts-jest": "^29.0.3",
         "typescript": "^4.8.4"
     }

package/src/Utils.ts

@@ -125,12 +125,18 @@ export namespace Utils {
         labelField?: unknown,
         blankLabel?: string
     ) {
-        const blankItem: any = {
-            [idField ?? 'id']: '',
-            [typeof labelField === 'string' ? labelField : 'label']:
-                blankLabel ?? '---'
-        };
-        options.unshift(blankItem);
+        // Avoid duplicate blank items
+        idField ??= 'id';
+        if (options.length === 0 || Reflect.get(options[0], idField) !== '') {
+            const blankItem: any = {
+                [idField]: '',
+                [typeof labelField === 'string' ? labelField : 'label']:
+                    blankLabel ?? '---'
+            };
+            options.unshift(blankItem);
+        }
+
+        return options;
     }
 
     /**
@@ -156,11 +162,13 @@ export namespace Utils {
      */
     export function correctTypes<
         T extends object,
-        F extends { [P in keyof T]: DataTypes.BasicNames }
+        F extends { [P in keyof T]?: DataTypes.BasicNames }
     >(input: T, fields: F) {
         for (const field in fields) {
+            const type = fields[field];
+            if (type == null) continue;
             const value = Reflect.get(input, field);
-            const newValue = DataTypes.convertByType(value, fields[field]);
+            const newValue = DataTypes.convertByType(value, type);
             if (newValue !== value) {
                 Reflect.set(input, field, newValue);
             }