@etsoo/shared 1.2.56 → 1.2.57

package/__tests__/DataTypes.ts

@@ -217,6 +217,26 @@ test("Tests for AddAndEditType", () => {
   expect(data2.name).toBe(data3.name);
 });
 
+test("Tests for AddOrEditType", () => {
+  type Entity = {
+    id: number;
+    name: string;
+    age?: number;
+  };
+  type AddEntity = DataTypes.AddOrEditType<Entity, false>;
+  type EditEntity = DataTypes.AddOrEditType<Entity, true>;
+
+  const data1: AddEntity = { id: 1, name: "hello" };
+  const data2: AddEntity = { id: undefined, name: "hello" };
+  const data3: AddEntity = { name: "hello" };
+
+  const data4: EditEntity = { id: 1, name: "hello", changedFields: ["name"] };
+
+  expect(data1.name).toBe(data2.name);
+  expect(data2.name).toBe(data3.name);
+  expect(data3.name).toBe(data4.name);
+});
+
 test("Tests for BasicTemplate", () => {
   const template: DataTypes.BasicTemplate = {
     id: "number",

package/lib/cjs/DataTypes.d.ts

@@ -147,7 +147,7 @@ export declare namespace DataTypes {
     }, D extends string = "id"> = (Omit<T, D> & {
         [key in D]?: undefined | never;
     }) | (Partial<T> & Readonly<Pick<T, D>> & {
-        changedFields?: string[];
+        changedFields?: (keyof T & string)[];
     });
     /**
      * Add or edit conditional type
@@ -158,7 +158,7 @@ export declare namespace DataTypes {
     }, // Entity modal
     E extends boolean, // Editing or not
     D extends string = "id"> = E extends false ? Optional<T, D> : Partial<T> & Readonly<Pick<T, D>> & {
-        changedFields?: string[];
+        changedFields?: (keyof T & string)[];
     };
     /**
      * Key collection, like { key1: {}, key2: {} }

package/lib/mjs/DataTypes.d.ts

@@ -147,7 +147,7 @@ export declare namespace DataTypes {
     }, D extends string = "id"> = (Omit<T, D> & {
         [key in D]?: undefined | never;
     }) | (Partial<T> & Readonly<Pick<T, D>> & {
-        changedFields?: string[];
+        changedFields?: (keyof T & string)[];
     });
     /**
      * Add or edit conditional type
@@ -158,7 +158,7 @@ export declare namespace DataTypes {
     }, // Entity modal
     E extends boolean, // Editing or not
     D extends string = "id"> = E extends false ? Optional<T, D> : Partial<T> & Readonly<Pick<T, D>> & {
-        changedFields?: string[];
+        changedFields?: (keyof T & string)[];
     };
     /**
      * Key collection, like { key1: {}, key2: {} }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/shared",
-  "version": "1.2.56",
+  "version": "1.2.57",
   "description": "TypeScript shared utilities and functions",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -36,7 +36,6 @@
   },
   "homepage": "https://github.com/ETSOO/Shared#readme",
   "devDependencies": {
-    "@types/jest": "^29.5.14",
     "@types/lodash.isequal": "^4.5.8",
     "@vitejs/plugin-react": "^4.3.4",
     "jsdom": "^26.0.0",

package/src/DataTypes.ts

@@ -191,7 +191,8 @@ export namespace DataTypes {
     D extends string = "id"
   > =
     | (Omit<T, D> & { [key in D]?: undefined | never })
-    | (Partial<T> & Readonly<Pick<T, D>> & { changedFields?: string[] });
+    | (Partial<T> &
+        Readonly<Pick<T, D>> & { changedFields?: (keyof T & string)[] });
 
   /**
    * Add or edit conditional type
@@ -203,7 +204,8 @@ export namespace DataTypes {
     D extends string = "id" // Default is 'id' field
   > = E extends false
     ? Optional<T, D>
-    : Partial<T> & Readonly<Pick<T, D>> & { changedFields?: string[] };
+    : Partial<T> &
+        Readonly<Pick<T, D>> & { changedFields?: (keyof T & string)[] };
 
   /**
    * Key collection, like { key1: {}, key2: {} }