@etsoo/shared 1.1.63 → 1.1.65

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|

package/lib/cjs/DataTypes.d.ts

@@ -119,14 +119,25 @@ export declare namespace DataTypes {
      */
     type IdType = number | string;
     /**
-     * Add or edit conditional type for same data model
+     * Add and edit data type
      * ChangedFields for editing case
      */
-    type AddOrEditType<T extends object, // Entity modal
+    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[];
+    });
+    /**
+     * Add or edit conditional type
+     * ChangedFields for editing case
+     */
+    type AddOrEditType<T extends {
+        [key in D]: IdType;
+    }, // 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>> & {
+    D extends string = 'id'> = E extends false ? Optional<T, D> : Partial<T> & Readonly<Pick<T, D>> & {
         changedFields?: string[];
     };
     /**

package/lib/cjs/DomUtils.d.ts

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

package/lib/mjs/DataTypes.d.ts

@@ -119,14 +119,25 @@ export declare namespace DataTypes {
      */
     type IdType = number | string;
     /**
-     * Add or edit conditional type for same data model
+     * Add and edit data type
      * ChangedFields for editing case
      */
-    type AddOrEditType<T extends object, // Entity modal
+    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[];
+    });
+    /**
+     * Add or edit conditional type
+     * ChangedFields for editing case
+     */
+    type AddOrEditType<T extends {
+        [key in D]: IdType;
+    }, // 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>> & {
+    D extends string = 'id'> = E extends false ? Optional<T, D> : Partial<T> & Readonly<Pick<T, D>> & {
         changedFields?: string[];
     };
     /**

package/lib/mjs/DomUtils.d.ts

@@ -68,18 +68,18 @@ export declare namespace DomUtils {
      * @param culture Detected culture
      */
     const getCulture: <T extends DataTypes.StringRecord>(items: Readonly<{
-        name: string; /**
-         * Current detected country
-         */
+        name: string;
         label: string;
-        resources: T;
+        resources: T; /**
+         * Current detected culture
+         */
         compatibleName?: string[] | undefined;
     }>[], culture: string) => Readonly<{
-        name: string; /**
-         * Current detected country
-         */
+        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.63",
+    "version": "1.1.65",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/DataTypes.ts

@@ -154,13 +154,24 @@ export namespace DataTypes {
     export type IdType = number | string;
 
     /**
-     * Add or edit conditional type for same data model
+     * Add and edit data type
+     * ChangedFields for editing case
+     */
+    export 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[] });
+
+    /**
+     * Add or edit conditional type
      * 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: number | string } ? '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[] };