@etsoo/shared 1.1.64 → 1.1.66

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/lib/cjs/DataTypes.d.ts

@@ -122,10 +122,10 @@ export declare namespace DataTypes {
      * Add and edit data type
      * ChangedFields for editing case
      */
-    type AddAndEditType<T extends object, D extends keyof T = T extends {
-        id: IdType;
-    } ? 'id' : any> = (Omit<T, D> & {
-        [key in D]: undefined | never;
+    type AddAndEditType<T extends {
+        [key in D]: IdType;
+    }, D extends string = 'id'> = (Omit<T, D> & {
+        [key in D]?: undefined | never;
     }) | (Partial<T> & Readonly<Pick<T, D>> & {
         changedFields?: string[];
     });
@@ -133,11 +133,11 @@ export declare namespace DataTypes {
      * Add or edit conditional type
      * ChangedFields for editing case
      */
-    type AddOrEditType<T extends object, // Entity modal
+    type AddOrEditType<T extends {
+        [key in D]: IdType;
+    }, // Entity modal
     E extends boolean, // Editing or not
-    D extends keyof T = T extends {
-        id: IdType;
-    } ? 'id' : any> = E extends false ? Optional<T, D> : Partial<T> & Readonly<Pick<T, D>> & {
+    D extends string = 'id'> = E extends false ? Optional<T, D> : Partial<T> & Readonly<Pick<T, D>> & {
         changedFields?: string[];
     };
     /**

package/lib/cjs/DomUtils.d.ts

@@ -70,12 +70,16 @@ export declare namespace DomUtils {
     const getCulture: <T extends DataTypes.StringRecord>(items: Readonly<{
         name: string;
         label: string;
-        resources: T;
+        resources: T; /**
+         * Current detected culture
+         */
         compatibleName?: string[] | undefined;
     }>[], culture: string) => Readonly<{
         name: string;
         label: string;
-        resources: T;
+        resources: T; /**
+         * Current detected culture
+         */
         compatibleName?: string[] | undefined;
     }> | undefined;
     /**

package/lib/mjs/DataTypes.d.ts

@@ -122,10 +122,10 @@ export declare namespace DataTypes {
      * Add and edit data type
      * ChangedFields for editing case
      */
-    type AddAndEditType<T extends object, D extends keyof T = T extends {
-        id: IdType;
-    } ? 'id' : any> = (Omit<T, D> & {
-        [key in D]: undefined | never;
+    type AddAndEditType<T extends {
+        [key in D]: IdType;
+    }, D extends string = 'id'> = (Omit<T, D> & {
+        [key in D]?: undefined | never;
     }) | (Partial<T> & Readonly<Pick<T, D>> & {
         changedFields?: string[];
     });
@@ -133,11 +133,11 @@ export declare namespace DataTypes {
      * Add or edit conditional type
      * ChangedFields for editing case
      */
-    type AddOrEditType<T extends object, // Entity modal
+    type AddOrEditType<T extends {
+        [key in D]: IdType;
+    }, // Entity modal
     E extends boolean, // Editing or not
-    D extends keyof T = T extends {
-        id: IdType;
-    } ? 'id' : any> = E extends false ? Optional<T, D> : Partial<T> & Readonly<Pick<T, D>> & {
+    D extends string = 'id'> = E extends false ? Optional<T, D> : Partial<T> & Readonly<Pick<T, D>> & {
         changedFields?: string[];
     };
     /**

package/lib/mjs/DomUtils.d.ts

@@ -70,12 +70,16 @@ export declare namespace DomUtils {
     const getCulture: <T extends DataTypes.StringRecord>(items: Readonly<{
         name: string;
         label: string;
-        resources: T;
+        resources: T; /**
+         * Current detected culture
+         */
         compatibleName?: string[] | undefined;
     }>[], culture: string) => Readonly<{
         name: string;
         label: string;
-        resources: T;
+        resources: T; /**
+         * Current detected culture
+         */
         compatibleName?: string[] | undefined;
     }> | undefined;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.64",
+    "version": "1.1.66",
     "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",
+        "@types/jest": "^29.2.0",
+        "@typescript-eslint/eslint-plugin": "^5.40.1",
+        "@typescript-eslint/parser": "^5.40.1",
         "eslint": "^8.25.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.1",
+        "jest-environment-jsdom": "^29.2.1",
         "ts-jest": "^29.0.3",
         "typescript": "^4.8.4"
     }

package/src/DataTypes.ts

@@ -158,10 +158,10 @@ export namespace DataTypes {
      * ChangedFields for editing case
      */
     export type AddAndEditType<
-        T extends object,
-        D extends keyof T = T extends { id: IdType } ? 'id' : any
+        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[] });
 
     /**
@@ -169,9 +169,9 @@ export namespace DataTypes {
      * ChangedFields for editing case
      */
     export type AddOrEditType<
-        T extends object, // Entity modal
+        T extends { [key in D]: IdType }, // Entity modal
         E extends boolean, // Editing or not
-        D extends keyof T = T extends { id: IdType } ? 'id' : any // Default is 'id' field
+        D extends string = 'id' // Default is 'id' field
     > = E extends false
         ? Optional<T, D>
         : Partial<T> & Readonly<Pick<T, D>> & { changedFields?: string[] };