@etsoo/shared 1.2.50 → 1.2.52

package/README.md

@@ -15,7 +15,7 @@ Using yarn:
 $ yarn add @etsoo/shared
 ```
 
-## ActionResult / IActionResult, IdActionResult, DynamicActionResult
+## ActionResult / IActionResult, IdActionResult, MsgActionResult, IdMsgActionResult, DynamicActionResult
 |Name|Description|
 |---:|---|
 |static create|Create a result from error|

package/__tests__/ArrayUtils.ts

@@ -65,8 +65,9 @@ test('Tests for maxItem / minItem', () => {
 
 test('Tests for remove simple', () => {
     const items = [1, 2, 3, 4, 5];
-    items.remove(1, 5, (item) => item % 2 === 0);
+    const result = items.remove(1, 5, (item) => item % 2 === 0);
     expect(items).toStrictEqual([3]);
+    expect(result.length).toBe(4);
 });
 
 test('Tests for remove object', () => {
@@ -78,7 +79,7 @@ test('Tests for remove object', () => {
         item
     ];
 
-    items.remove(
+    const result = items.remove(
         item,
         (item) => item.id === 2,
         (item) => item.amount <= 2
@@ -86,6 +87,7 @@ test('Tests for remove object', () => {
 
     expect(items.length).toBe(1);
     expect(items[0].id).toBe(1);
+    expect(result.length).toBe(3);
 });
 
 test('Tests for sortIds 1', () => {

package/lib/cjs/ArrayUtils.d.ts

@@ -31,7 +31,7 @@ declare global {
          * Remove items by value or condition
          * @param items Items to remove
          */
-        remove(...items: ((T & (DataTypes.Basic | object)) | ((item: T) => boolean))[]): void;
+        remove(...items: ((T & (DataTypes.Basic | object)) | ((item: T) => boolean))[]): T[];
         /**
          * Sort by property
          * @param property Property

package/lib/cjs/ArrayUtils.js

@@ -43,6 +43,7 @@ Array.prototype.minItem = function (field) {
 };
 Array.prototype.remove = function (...items) {
     const funs = [];
+    const results = [];
     items.forEach((item) => {
         if (typeof item === 'function') {
             funs.push(item);
@@ -51,16 +52,17 @@ Array.prototype.remove = function (...items) {
             // For object items, should be removed by reference, not by value
             const index = this.indexOf(item);
             if (index >= 0)
-                this.splice(index, 1);
+                results.push(...this.splice(index, 1));
         }
     });
     if (funs.length > 0) {
         // Reduce check loops for performance
         for (let i = this.length - 1; i >= 0; i--) {
             if (funs.some((fun) => fun(this[i])))
-                this.splice(i, 1);
+                results.push(...this.splice(i, 1));
         }
     }
+    return results;
 };
 Array.prototype.sortByProperty = function (property, values) {
     return this.sort((a, b) => {

package/lib/cjs/IActionResult.d.ts

@@ -48,11 +48,24 @@ export interface IActionResult<D extends object = {}> {
     readonly ok: boolean;
 }
 /**
- * Action result with id data
+ * Action result with id
  */
 export type IdActionResult<T extends IdType = number> = IActionResult<{
     id: T;
 }>;
+/**
+ * Action result with message data
+ */
+export type MsgActionResult = IActionResult<{
+    msg: string;
+}>;
+/**
+ * Action result with id, message data
+ */
+export type IdMsgActionResult = IActionResult<{
+    id: number;
+    msg: string;
+}>;
 /**
  * Action result with dynamic data
  */

package/lib/mjs/ArrayUtils.d.ts

@@ -31,7 +31,7 @@ declare global {
          * Remove items by value or condition
          * @param items Items to remove
          */
-        remove(...items: ((T & (DataTypes.Basic | object)) | ((item: T) => boolean))[]): void;
+        remove(...items: ((T & (DataTypes.Basic | object)) | ((item: T) => boolean))[]): T[];
         /**
          * Sort by property
          * @param property Property

package/lib/mjs/ArrayUtils.js

@@ -37,6 +37,7 @@ Array.prototype.minItem = function (field) {
 };
 Array.prototype.remove = function (...items) {
     const funs = [];
+    const results = [];
     items.forEach((item) => {
         if (typeof item === 'function') {
             funs.push(item);
@@ -45,16 +46,17 @@ Array.prototype.remove = function (...items) {
             // For object items, should be removed by reference, not by value
             const index = this.indexOf(item);
             if (index >= 0)
-                this.splice(index, 1);
+                results.push(...this.splice(index, 1));
         }
     });
     if (funs.length > 0) {
         // Reduce check loops for performance
         for (let i = this.length - 1; i >= 0; i--) {
             if (funs.some((fun) => fun(this[i])))
-                this.splice(i, 1);
+                results.push(...this.splice(i, 1));
         }
     }
+    return results;
 };
 Array.prototype.sortByProperty = function (property, values) {
     return this.sort((a, b) => {

package/lib/mjs/IActionResult.d.ts

@@ -48,11 +48,24 @@ export interface IActionResult<D extends object = {}> {
     readonly ok: boolean;
 }
 /**
- * Action result with id data
+ * Action result with id
  */
 export type IdActionResult<T extends IdType = number> = IActionResult<{
     id: T;
 }>;
+/**
+ * Action result with message data
+ */
+export type MsgActionResult = IActionResult<{
+    msg: string;
+}>;
+/**
+ * Action result with id, message data
+ */
+export type IdMsgActionResult = IActionResult<{
+    id: number;
+    msg: string;
+}>;
 /**
  * Action result with dynamic data
  */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.2.50",
+    "version": "1.2.52",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     },
     "homepage": "https://github.com/ETSOO/Shared#readme",
     "devDependencies": {
-        "@types/jest": "^29.5.13",
+        "@types/jest": "^29.5.14",
         "@types/lodash.isequal": "^4.5.8",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",

package/src/ArrayUtils.ts

@@ -59,7 +59,7 @@ declare global {
                 | (T & (DataTypes.Basic | object))
                 | ((item: T) => boolean)
             )[]
-        ): void;
+        ): T[];
 
         /**
          * Sort by property
@@ -157,22 +157,26 @@ Array.prototype.remove = function <T>(
     ...items: ((T & (DataTypes.Basic | object)) | ((item: T) => boolean))[]
 ) {
     const funs: ((item: T) => boolean)[] = [];
+    const results: T[] = [];
     items.forEach((item) => {
         if (typeof item === 'function') {
             funs.push(item);
         } else {
             // For object items, should be removed by reference, not by value
             const index = this.indexOf(item);
-            if (index >= 0) this.splice(index, 1);
+            if (index >= 0) results.push(...this.splice(index, 1));
         }
     });
 
     if (funs.length > 0) {
         // Reduce check loops for performance
         for (let i = this.length - 1; i >= 0; i--) {
-            if (funs.some((fun) => fun(this[i]))) this.splice(i, 1);
+            if (funs.some((fun) => fun(this[i])))
+                results.push(...this.splice(i, 1));
         }
     }
+
+    return results;
 };
 
 Array.prototype.sortByProperty = function <T, P extends keyof T>(

package/src/IActionResult.ts

@@ -59,12 +59,27 @@ export interface IActionResult<D extends object = {}> {
 }
 
 /**
- * Action result with id data
+ * Action result with id
  */
 export type IdActionResult<T extends IdType = number> = IActionResult<{
     id: T;
 }>;
 
+/**
+ * Action result with message data
+ */
+export type MsgActionResult = IActionResult<{
+    msg: string;
+}>;
+
+/**
+ * Action result with id, message data
+ */
+export type IdMsgActionResult = IActionResult<{
+    id: number;
+    msg: string;
+}>;
+
 /**
  * Action result with dynamic data
  */