@etsoo/shared 1.1.59 → 1.1.61

package/README.md

@@ -103,6 +103,7 @@ Data type definitions and type safe functions. ListItemType and ListItemType1 ar
 |IdNameItem|Item with id and name|
 |KeyCollection|Key collection, like { key1: {}, key2: {} }|
 |Keys|Get specific type keys|
+|MConstructor|Mixins constructor|
 |ObjType|Generic object type|
 |RequireAtLeastOne|Require at least one property of the keys|
 |Simple|Basic or basic array type|

package/lib/cjs/DataTypes.d.ts

@@ -120,11 +120,13 @@ export declare namespace DataTypes {
     type IdType = number | string;
     /**
      * Add or edit conditional type for same data model
-     * Dynamic add changedFields for editing case
+     * Dynamic add id and changedFields for editing case
      */
-    type AddOrEditType<T, Editing extends boolean> = (Editing extends true ? T : Partial<T>) & {
+    type AddOrEditType<T extends object, Editing extends boolean, D extends string = 'id'> = Editing extends true ? Partial<T> & {
+        [key in D]: number | string;
+    } & {
         changedFields?: string[];
-    };
+    } : T;
     /**
      * Key collection, like { key1: {}, key2: {} }
      */
@@ -143,6 +145,10 @@ export declare namespace DataTypes {
      * Function type
      */
     type Func<R> = (...args: any[]) => R;
+    /**
+     * Mixins constructor
+     */
+    type MConstructor<T = {}> = new (...args: any[]) => T;
     /**
      * String key, unknown value Record
      */

package/lib/mjs/DataTypes.d.ts

@@ -120,11 +120,13 @@ export declare namespace DataTypes {
     type IdType = number | string;
     /**
      * Add or edit conditional type for same data model
-     * Dynamic add changedFields for editing case
+     * Dynamic add id and changedFields for editing case
      */
-    type AddOrEditType<T, Editing extends boolean> = (Editing extends true ? T : Partial<T>) & {
+    type AddOrEditType<T extends object, Editing extends boolean, D extends string = 'id'> = Editing extends true ? Partial<T> & {
+        [key in D]: number | string;
+    } & {
         changedFields?: string[];
-    };
+    } : T;
     /**
      * Key collection, like { key1: {}, key2: {} }
      */
@@ -143,6 +145,10 @@ export declare namespace DataTypes {
      * Function type
      */
     type Func<R> = (...args: any[]) => R;
+    /**
+     * Mixins constructor
+     */
+    type MConstructor<T = {}> = new (...args: any[]) => T;
     /**
      * String key, unknown value Record
      */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.59",
+    "version": "1.1.61",
     "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.1",
-        "@typescript-eslint/eslint-plugin": "^5.38.1",
-        "@typescript-eslint/parser": "^5.38.1",
-        "eslint": "^8.24.0",
+        "@types/jest": "^29.1.2",
+        "@typescript-eslint/eslint-plugin": "^5.40.0",
+        "@typescript-eslint/parser": "^5.40.0",
+        "eslint": "^8.25.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
-        "jest": "^29.1.2",
-        "jest-environment-jsdom": "^29.1.2",
+        "jest": "^29.2.0",
+        "jest-environment-jsdom": "^29.2.0",
         "ts-jest": "^29.0.3",
         "typescript": "^4.8.4"
     }

package/src/DataTypes.ts

@@ -155,12 +155,17 @@ export namespace DataTypes {
 
     /**
      * Add or edit conditional type for same data model
-     * Dynamic add changedFields for editing case
+     * Dynamic add id and changedFields for editing case
      */
     export type AddOrEditType<
-        T,
-        Editing extends boolean
-    > = (Editing extends true ? T : Partial<T>) & { changedFields?: string[] };
+        T extends object,
+        Editing extends boolean,
+        D extends string = 'id'
+    > = Editing extends true
+        ? Partial<T> & { [key in D]: number | string } & {
+              changedFields?: string[];
+          }
+        : T;
 
     /**
      * Key collection, like { key1: {}, key2: {} }
@@ -184,6 +189,11 @@ export namespace DataTypes {
      */
     export type Func<R> = (...args: any[]) => R;
 
+    /**
+     * Mixins constructor
+     */
+    export type MConstructor<T = {}> = new (...args: any[]) => T;
+
     /**
      * String key, unknown value Record
      */