@etsoo/shared 1.1.62 → 1.1.64

package/README.md

@@ -79,7 +79,8 @@ Data type definitions and type safe functions. ListItemType and ListItemType1 ar
 |Name|Description|
 |---:|---|
 |DataType|Data type enum|
-|AddOrEditType|Add or edit conditional type for same data model|
+|AddAndEditType|Add and edit data type|
+|AddOrEditType|Add or edit conditional type|
 |Basic|Basic types, includes number, bigint, Date, boolean, string|
 |BasicArray|Basic type name array|
 |BasicConditional|Conditional type based on BasicNames|
@@ -105,6 +106,7 @@ Data type definitions and type safe functions. ListItemType and ListItemType1 ar
 |Keys|Get specific type keys|
 |MConstructor|Mixins constructor|
 |ObjType|Generic object type|
+|Optional|Make properties optional|
 |RequireAtLeastOne|Require at least one property of the keys|
 |Simple|Basic or basic array type|
 |SimpleEnum|Simple type enum|

package/lib/cjs/DataTypes.d.ts

@@ -119,16 +119,27 @@ export declare namespace DataTypes {
      */
     type IdType = number | string;
     /**
-     * Add or edit conditional type for same data model
-     * Dynamic add id and changedFields for editing case
-     */
-    type AddOrEditType<T extends object, E extends boolean, // Editing or not
-    I extends IdType = number, // Id type, default is number
-    D extends string = 'id'> = E extends true ? Partial<T> & {
-        [key in D]: I;
-    } & {
+     * 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;
+    }) | (Partial<T> & Readonly<Pick<T, D>> & {
         changedFields?: string[];
-    } : T;
+    });
+    /**
+     * Add or edit conditional type
+     * ChangedFields for editing case
+     */
+    type AddOrEditType<T extends object, // 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>> & {
+        changedFields?: string[];
+    };
     /**
      * Key collection, like { key1: {}, key2: {} }
      */
@@ -151,6 +162,10 @@ export declare namespace DataTypes {
      * Mixins constructor
      */
     type MConstructor<T = {}> = new (...args: any[]) => T;
+    /**
+     * Make properties optional
+     */
+    type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
     /**
      * String key, unknown value Record
      */

package/lib/mjs/DataTypes.d.ts

@@ -119,16 +119,27 @@ export declare namespace DataTypes {
      */
     type IdType = number | string;
     /**
-     * Add or edit conditional type for same data model
-     * Dynamic add id and changedFields for editing case
-     */
-    type AddOrEditType<T extends object, E extends boolean, // Editing or not
-    I extends IdType = number, // Id type, default is number
-    D extends string = 'id'> = E extends true ? Partial<T> & {
-        [key in D]: I;
-    } & {
+     * 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;
+    }) | (Partial<T> & Readonly<Pick<T, D>> & {
         changedFields?: string[];
-    } : T;
+    });
+    /**
+     * Add or edit conditional type
+     * ChangedFields for editing case
+     */
+    type AddOrEditType<T extends object, // 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>> & {
+        changedFields?: string[];
+    };
     /**
      * Key collection, like { key1: {}, key2: {} }
      */
@@ -151,6 +162,10 @@ export declare namespace DataTypes {
      * Mixins constructor
      */
     type MConstructor<T = {}> = new (...args: any[]) => T;
+    /**
+     * Make properties optional
+     */
+    type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
     /**
      * String key, unknown value Record
      */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.62",
+    "version": "1.1.64",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/DataTypes.ts

@@ -154,19 +154,27 @@ export namespace DataTypes {
     export type IdType = number | string;
 
     /**
-     * Add or edit conditional type for same data model
-     * Dynamic add id and changedFields for editing case
+     * Add and edit data type
+     * ChangedFields for editing case
      */
-    export type AddOrEditType<
+    export type AddAndEditType<
         T extends object,
+        D extends keyof T = T extends { id: IdType } ? 'id' : any
+    > =
+        | (Omit<T, D> & { [key in D]: undefined | never })
+        | (Partial<T> & Readonly<Pick<T, D>> & { changedFields?: string[] });
+
+    /**
+     * Add or edit conditional type
+     * ChangedFields for editing case
+     */
+    export type AddOrEditType<
+        T extends object, // Entity modal
         E extends boolean, // Editing or not
-        I extends IdType = number, // Id type, default is number
-        D extends string = 'id' // Id field name
-    > = E extends true
-        ? Partial<T> & { [key in D]: I } & {
-              changedFields?: string[];
-          }
-        : T;
+        D extends keyof T = T extends { id: IdType } ? 'id' : any // Default is 'id' field
+    > = E extends false
+        ? Optional<T, D>
+        : Partial<T> & Readonly<Pick<T, D>> & { changedFields?: string[] };
 
     /**
      * Key collection, like { key1: {}, key2: {} }
@@ -195,6 +203,12 @@ export namespace DataTypes {
      */
     export type MConstructor<T = {}> = new (...args: any[]) => T;
 
+    /**
+     * Make properties optional
+     */
+    export type Optional<T, K extends keyof T> = Pick<Partial<T>, K> &
+        Omit<T, K>;
+
     /**
      * String key, unknown value Record
      */