@etsoo/shared 1.0.76 → 1.0.77

package/README.md

@@ -132,6 +132,7 @@ String and other related utilities
 |Name|Description|
 |---:|---|
 |charsToNumber|Base64 chars to number|
+|equals|Two values equal|
 |formatInitial|Format inital character to lower case or upper case|
 |formatString|Format string with parameters|
 |getDataChanges|Get data changed fields with input data updated|

package/__tests__/Utils.ts

@@ -9,7 +9,8 @@ test('Tests for getDataChanges', () => {
         price: '6.0',
         amount: '',
         enabled: true,
-        value: undefined
+        value: undefined,
+        ids: [1, 2]
     };
     const initData = {
         id: 1,
@@ -18,7 +19,8 @@ test('Tests for getDataChanges', () => {
         brand: 'ETSOO',
         price: 6,
         amount: 0,
-        enabled: true
+        enabled: true,
+        ids: [1, 2]
     };
     const fields = Utils.getDataChanges(input, initData);
     expect(fields).toStrictEqual(['gender', 'brand', 'amount']);
@@ -82,8 +84,8 @@ test('Tests for removeNonLetters', () => {
 });
 
 test('Tests for objectEqual', () => {
-    const obj1 = { a: 1, b: 'abc', c: true, d: null };
-    const obj2 = { a: '1', b: 'abc', c: true };
+    const obj1 = { a: 1, b: 'abc', c: true, d: null, f: [1, 2] };
+    const obj2 = { a: '1', b: 'abc', c: true, f: [1, 2] };
     expect(Utils.objectEqual(obj1, obj2)).toBeFalsy();
     expect(Utils.objectEqual(obj1, obj2, [], 0)).toBeTruthy();
     expect(Utils.objectEqual(obj1, obj2, ['a'])).toBeTruthy();

package/lib/cjs/Utils.d.ts

@@ -41,6 +41,13 @@ export declare namespace Utils {
      * @returns Number
      */
     function charsToNumber(base64Chars: string): number;
+    /**
+     * Two values equal
+     * @param v1 Value 1
+     * @param v2 Value 2
+     * @param strict Strict level, 0 with ==, 1 === but null equal undefined, 2 ===
+     */
+    function equals(v1: unknown, v2: unknown, strict?: number): boolean;
     /**
      * Format inital character to lower case or upper case
      * @param input Input string

package/lib/cjs/Utils.js

@@ -43,6 +43,29 @@ var Utils;
         }, 0);
     }
     Utils.charsToNumber = charsToNumber;
+    /**
+     * Two values equal
+     * @param v1 Value 1
+     * @param v2 Value 2
+     * @param strict Strict level, 0 with ==, 1 === but null equal undefined, 2 ===
+     */
+    function equals(v1, v2, strict = 1) {
+        // Null and undefined case
+        if (v1 == null || v2 == null) {
+            if (strict <= 1 && v1 == v2)
+                return true;
+            return v1 === v2;
+        }
+        // For array and object
+        if (typeof v1 === 'object')
+            return JSON.stringify(v1) === JSON.stringify(v2);
+        // 1 and '1' case
+        if (strict === 0)
+            return v1 == v2;
+        // Strict equal
+        return v1 === v2;
+    }
+    Utils.equals = equals;
     /**
      * Format inital character to lower case or upper case
      * @param input Input string
@@ -85,7 +108,7 @@ var Utils;
             }
             if (initValue != null) {
                 const newValue = DataTypes_1.DataTypes.convert(value, initValue);
-                if (newValue === initValue) {
+                if (Utils.equals(newValue, initValue)) {
                     Reflect.deleteProperty(input, key);
                     return;
                 }
@@ -202,14 +225,7 @@ var Utils;
             // Values
             const v1 = Reflect.get(obj1, key);
             const v2 = Reflect.get(obj2, key);
-            // Null and undefined case
-            if (v1 == null && v2 == null && strict <= 1)
-                continue;
-            // 1 and '1' case
-            if (strict === 0 && v1 == v2)
-                continue;
-            // Strict equal
-            if (v1 !== v2)
+            if (!Utils.equals(v1, v2, strict))
                 return false;
         }
         return true;

package/lib/mjs/Utils.d.ts

@@ -41,6 +41,13 @@ export declare namespace Utils {
      * @returns Number
      */
     function charsToNumber(base64Chars: string): number;
+    /**
+     * Two values equal
+     * @param v1 Value 1
+     * @param v2 Value 2
+     * @param strict Strict level, 0 with ==, 1 === but null equal undefined, 2 ===
+     */
+    function equals(v1: unknown, v2: unknown, strict?: number): boolean;
     /**
      * Format inital character to lower case or upper case
      * @param input Input string

package/lib/mjs/Utils.js

@@ -40,6 +40,29 @@ export var Utils;
         }, 0);
     }
     Utils.charsToNumber = charsToNumber;
+    /**
+     * Two values equal
+     * @param v1 Value 1
+     * @param v2 Value 2
+     * @param strict Strict level, 0 with ==, 1 === but null equal undefined, 2 ===
+     */
+    function equals(v1, v2, strict = 1) {
+        // Null and undefined case
+        if (v1 == null || v2 == null) {
+            if (strict <= 1 && v1 == v2)
+                return true;
+            return v1 === v2;
+        }
+        // For array and object
+        if (typeof v1 === 'object')
+            return JSON.stringify(v1) === JSON.stringify(v2);
+        // 1 and '1' case
+        if (strict === 0)
+            return v1 == v2;
+        // Strict equal
+        return v1 === v2;
+    }
+    Utils.equals = equals;
     /**
      * Format inital character to lower case or upper case
      * @param input Input string
@@ -82,7 +105,7 @@ export var Utils;
             }
             if (initValue != null) {
                 const newValue = DataTypes.convert(value, initValue);
-                if (newValue === initValue) {
+                if (Utils.equals(newValue, initValue)) {
                     Reflect.deleteProperty(input, key);
                     return;
                 }
@@ -199,14 +222,7 @@ export var Utils;
             // Values
             const v1 = Reflect.get(obj1, key);
             const v2 = Reflect.get(obj2, key);
-            // Null and undefined case
-            if (v1 == null && v2 == null && strict <= 1)
-                continue;
-            // 1 and '1' case
-            if (strict === 0 && v1 == v2)
-                continue;
-            // Strict equal
-            if (v1 !== v2)
+            if (!Utils.equals(v1, v2, strict))
                 return false;
         }
         return true;

package/package.json

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

package/src/Utils.ts

@@ -93,6 +93,30 @@ export namespace Utils {
         }, 0);
     }
 
+    /**
+     * Two values equal
+     * @param v1 Value 1
+     * @param v2 Value 2
+     * @param strict Strict level, 0 with ==, 1 === but null equal undefined, 2 ===
+     */
+    export function equals(v1: unknown, v2: unknown, strict = 1) {
+        // Null and undefined case
+        if (v1 == null || v2 == null) {
+            if (strict <= 1 && v1 == v2) return true;
+            return v1 === v2;
+        }
+
+        // For array and object
+        if (typeof v1 === 'object')
+            return JSON.stringify(v1) === JSON.stringify(v2);
+
+        // 1 and '1' case
+        if (strict === 0) return v1 == v2;
+
+        // Strict equal
+        return v1 === v2;
+    }
+
     /**
      * Format inital character to lower case or upper case
      * @param input Input string
@@ -142,7 +166,7 @@ export namespace Utils {
 
             if (initValue != null) {
                 const newValue = DataTypes.convert(value, initValue);
-                if (newValue === initValue) {
+                if (Utils.equals(newValue, initValue)) {
                     Reflect.deleteProperty(input, key);
                     return;
                 }
@@ -280,14 +304,7 @@ export namespace Utils {
             const v1 = Reflect.get(obj1, key);
             const v2 = Reflect.get(obj2, key);
 
-            // Null and undefined case
-            if (v1 == null && v2 == null && strict <= 1) continue;
-
-            // 1 and '1' case
-            if (strict === 0 && v1 == v2) continue;
-
-            // Strict equal
-            if (v1 !== v2) return false;
+            if (!Utils.equals(v1, v2, strict)) return false;
         }
 
         return true;