@etsoo/shared 1.2.48 → 1.2.50

package/README.md

@@ -109,6 +109,7 @@ Array related utilities
 |maxItem|Get max field value item|
 |min|Get min number item or number item property|
 |minItem|Get min field value item|
+|remove|Remove items by value or condition|
 |sum|Sum number items or number item properties|
 |toUnique|Make all items are unique|
 

package/__tests__/ArrayUtils.ts

@@ -63,6 +63,31 @@ test('Tests for maxItem / minItem', () => {
     expect(emptyItems.maxItem('amount')).toBeUndefined();
 });
 
+test('Tests for remove simple', () => {
+    const items = [1, 2, 3, 4, 5];
+    items.remove(1, 5, (item) => item % 2 === 0);
+    expect(items).toStrictEqual([3]);
+});
+
+test('Tests for remove object', () => {
+    const item = { id: 4, label: 'd', amount: 9.66 };
+    const items = [
+        { id: 1, label: 'a', amount: 3.14 },
+        { id: 2, label: 'b', amount: 4.54 },
+        { id: 3, label: 'b', amount: 1.52 },
+        item
+    ];
+
+    items.remove(
+        item,
+        (item) => item.id === 2,
+        (item) => item.amount <= 2
+    );
+
+    expect(items.length).toBe(1);
+    expect(items[0].id).toBe(1);
+});
+
 test('Tests for sortIds 1', () => {
     const source = [
         {

package/__tests__/Utils.ts

@@ -46,6 +46,13 @@ describe('Tests for addUrlParams', () => {
         );
     });
 
+    const result22 = '/'.addUrlParams(data);
+    test('addUrlParams with relative path', () => {
+        expect(result22).toBe(
+            '/?a=a&b=false&c=123&d=2022-01-28T10%3A00%3A00.000Z&e=1&e=2&f=a&f=b&g='
+        );
+    });
+
     global.URL = undefined as any;
 
     const result3 = url.addUrlParams(data);

package/lib/cjs/ArrayUtils.d.ts

@@ -27,6 +27,11 @@ declare global {
          * @param field Object field to calculate
          */
         minItem(field: T extends object ? DataTypes.Keys<T, number> : never): T | undefined;
+        /**
+         * Remove items by value or condition
+         * @param items Items to remove
+         */
+        remove(...items: ((T & (DataTypes.Basic | object)) | ((item: T) => boolean))[]): void;
         /**
          * Sort by property
          * @param property Property

package/lib/cjs/ArrayUtils.js

@@ -41,6 +41,27 @@ Array.prototype.minItem = function (field) {
         return undefined;
     return this.reduce((prev, curr) => prev[field] < curr[field] ? prev : curr);
 };
+Array.prototype.remove = function (...items) {
+    const funs = [];
+    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 (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);
+        }
+    }
+};
 Array.prototype.sortByProperty = function (property, values) {
     return this.sort((a, b) => {
         const ai = values.indexOf(a[property]);

package/lib/cjs/Utils.js

@@ -23,7 +23,8 @@ String.prototype.addUrlParams = function (data, arrayFormat) {
         }
         return url + data;
     }
-    if (typeof URL === 'undefined') {
+    // Simple check
+    if (typeof URL === 'undefined' || !this.includes('://')) {
         const params = Object.entries(data)
             .map(([key, value]) => {
             let v;

package/lib/cjs/node/Storage.js

@@ -47,9 +47,7 @@ class NodeStorage {
      * Removes the key/value pair with the given key from the list associated with the object, if a key/value pair with the given key exists.
      */
     removeItem(key) {
-        const index = this.source.findIndex((p) => p[0] === key);
-        if (index != -1)
-            this.source.splice(index, 1);
+        this.source.remove((p) => p[0] === key);
     }
     /**
      * Sets the value of the pair identified by key to value, creating a new key/value pair if none existed for key previously.

package/lib/mjs/ArrayUtils.d.ts

@@ -27,6 +27,11 @@ declare global {
          * @param field Object field to calculate
          */
         minItem(field: T extends object ? DataTypes.Keys<T, number> : never): T | undefined;
+        /**
+         * Remove items by value or condition
+         * @param items Items to remove
+         */
+        remove(...items: ((T & (DataTypes.Basic | object)) | ((item: T) => boolean))[]): void;
         /**
          * Sort by property
          * @param property Property

package/lib/mjs/ArrayUtils.js

@@ -35,6 +35,27 @@ Array.prototype.minItem = function (field) {
         return undefined;
     return this.reduce((prev, curr) => prev[field] < curr[field] ? prev : curr);
 };
+Array.prototype.remove = function (...items) {
+    const funs = [];
+    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 (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);
+        }
+    }
+};
 Array.prototype.sortByProperty = function (property, values) {
     return this.sort((a, b) => {
         const ai = values.indexOf(a[property]);

package/lib/mjs/Utils.js

@@ -17,7 +17,8 @@ String.prototype.addUrlParams = function (data, arrayFormat) {
         }
         return url + data;
     }
-    if (typeof URL === 'undefined') {
+    // Simple check
+    if (typeof URL === 'undefined' || !this.includes('://')) {
         const params = Object.entries(data)
             .map(([key, value]) => {
             let v;

package/lib/mjs/node/Storage.js

@@ -44,9 +44,7 @@ export class NodeStorage {
      * Removes the key/value pair with the given key from the list associated with the object, if a key/value pair with the given key exists.
      */
     removeItem(key) {
-        const index = this.source.findIndex((p) => p[0] === key);
-        if (index != -1)
-            this.source.splice(index, 1);
+        this.source.remove((p) => p[0] === key);
     }
     /**
      * Sets the value of the pair identified by key to value, creating a new key/value pair if none existed for key previously.

package/package.json

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

package/src/ArrayUtils.ts

@@ -50,6 +50,17 @@ declare global {
             field: T extends object ? DataTypes.Keys<T, number> : never
         ): T | undefined;
 
+        /**
+         * Remove items by value or condition
+         * @param items Items to remove
+         */
+        remove(
+            ...items: (
+                | (T & (DataTypes.Basic | object))
+                | ((item: T) => boolean)
+            )[]
+        ): void;
+
         /**
          * Sort by property
          * @param property Property
@@ -141,6 +152,29 @@ Array.prototype.minItem = function <T>(
     );
 };
 
+Array.prototype.remove = function <T>(
+    this: Array<T>,
+    ...items: ((T & (DataTypes.Basic | object)) | ((item: T) => boolean))[]
+) {
+    const funs: ((item: T) => boolean)[] = [];
+    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 (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);
+        }
+    }
+};
+
 Array.prototype.sortByProperty = function <T, P extends keyof T>(
     this: Array<T>,
     property: P,

package/src/Utils.ts

@@ -135,7 +135,8 @@ String.prototype.addUrlParams = function (
         return url + data;
     }
 
-    if (typeof URL === 'undefined') {
+    // Simple check
+    if (typeof URL === 'undefined' || !this.includes('://')) {
         const params = Object.entries(data)
             .map(([key, value]) => {
                 let v: string;

package/src/node/Storage.ts

@@ -48,8 +48,7 @@ export class NodeStorage {
      * Removes the key/value pair with the given key from the list associated with the object, if a key/value pair with the given key exists.
      */
     removeItem(key: string): void {
-        const index = this.source.findIndex((p) => p[0] === key);
-        if (index != -1) this.source.splice(index, 1);
+        this.source.remove((p) => p[0] === key);
     }
 
     /**