@etsoo/shared 1.1.62 → 1.1.63

package/README.md

@@ -105,6 +105,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

@@ -120,15 +120,15 @@ 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
+     * 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;
-    } & {
+    type AddOrEditType<T extends object, // Entity modal
+    E extends boolean, // Editing or not
+    D extends keyof T = T extends {
+        id: number | string;
+    } ? 'id' : any> = E extends false ? Optional<T, D> : Partial<T> & Readonly<Pick<T, D>> & {
         changedFields?: string[];
-    } : T;
+    };
     /**
      * Key collection, like { key1: {}, key2: {} }
      */
@@ -151,6 +151,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/cjs/DomUtils.d.ts

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

package/lib/mjs/DataTypes.d.ts

@@ -120,15 +120,15 @@ 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
+     * 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;
-    } & {
+    type AddOrEditType<T extends object, // Entity modal
+    E extends boolean, // Editing or not
+    D extends keyof T = T extends {
+        id: number | string;
+    } ? 'id' : any> = E extends false ? Optional<T, D> : Partial<T> & Readonly<Pick<T, D>> & {
         changedFields?: string[];
-    } : T;
+    };
     /**
      * Key collection, like { key1: {}, key2: {} }
      */
@@ -151,6 +151,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/DomUtils.d.ts

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

package/package.json

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

package/src/DataTypes.ts

@@ -155,18 +155,15 @@ export namespace DataTypes {
 
     /**
      * Add or edit conditional type for same data model
-     * Dynamic add id and changedFields for editing case
+     * ChangedFields for editing case
      */
     export type AddOrEditType<
-        T extends object,
+        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: number | string } ? '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 +192,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
      */