@etsoo/shared 1.1.65 → 1.1.67

package/__tests__/DataTypes.ts

@@ -180,3 +180,18 @@ test('Tests for jsonReplacer', () => {
     );
     expect(json2).toBe('{"c":{"c2":false}}');
 });
+
+test('Tests for AddAndEditType', () => {
+    type Entity = DataTypes.AddAndEditType<{
+        id: number;
+        name: string;
+        age?: number;
+    }>;
+
+    const data1: Entity = { id: 1, name: 'hello', changedFields: ['name'] };
+    const data2: Entity = { id: undefined, name: 'hello' };
+    const data3: Entity = { name: 'hello' };
+
+    expect(data1.name).toBe(data2.name);
+    expect(data2.name).toBe(data3.name);
+});

package/__tests__/Utils.ts

@@ -14,6 +14,7 @@ test('Tests for addBlankItem', () => {
 test('Tests for correctTypes', () => {
     const input = {
         id: '1',
+        ignore: '2',
         price: '6.0',
         amount: '',
         date: '2022/01/28',

package/lib/cjs/DataTypes.d.ts

@@ -125,7 +125,7 @@ export declare namespace DataTypes {
     type AddAndEditType<T extends {
         [key in D]: IdType;
     }, D extends string = 'id'> = (Omit<T, D> & {
-        [key in D]: undefined | never;
+        [key in D]?: undefined | never;
     }) | (Partial<T> & Readonly<Pick<T, D>> & {
         changedFields?: string[];
     });

package/lib/cjs/Utils.d.ts

@@ -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

@@ -88,8 +88,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/DataTypes.d.ts

@@ -125,7 +125,7 @@ export declare namespace DataTypes {
     type AddAndEditType<T extends {
         [key in D]: IdType;
     }, D extends string = 'id'> = (Omit<T, D> & {
-        [key in D]: undefined | never;
+        [key in D]?: undefined | never;
     }) | (Partial<T> & Readonly<Pick<T, D>> & {
         changedFields?: string[];
     });

package/lib/mjs/Utils.d.ts

@@ -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

@@ -85,8 +85,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.65",
+    "version": "1.1.67",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,14 +54,14 @@
     },
     "homepage": "https://github.com/ETSOO/Shared#readme",
     "devDependencies": {
-        "@types/jest": "^29.1.2",
-        "@typescript-eslint/eslint-plugin": "^5.40.0",
-        "@typescript-eslint/parser": "^5.40.0",
-        "eslint": "^8.25.0",
+        "@types/jest": "^29.2.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.0",
-        "jest-environment-jsdom": "^29.2.0",
+        "jest": "^29.2.2",
+        "jest-environment-jsdom": "^29.2.2",
         "ts-jest": "^29.0.3",
         "typescript": "^4.8.4"
     }

package/src/DataTypes.ts

@@ -161,7 +161,7 @@ export namespace DataTypes {
         T extends { [key in D]: IdType },
         D extends string = 'id'
     > =
-        | (Omit<T, D> & { [key in D]: undefined | never })
+        | (Omit<T, D> & { [key in D]?: undefined | never })
         | (Partial<T> & Readonly<Pick<T, D>> & { changedFields?: string[] });
 
     /**

package/src/Utils.ts

@@ -156,11 +156,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);
             }