@etsoo/shared 1.1.91 → 1.1.93

package/README.md

@@ -96,6 +96,14 @@ ETSOO Extended abstract history class
 |pushState|Adds an entry to the history stack|
 |replaceState|Modifies the current history entry|
 
+## ArrayUtils
+Array related utilities
+
+|Name|Description|
+|---:|---|
+|differences|Array 1 items do not exist in Array 2 or reverse match|
+|toUnique|Make all items are unique|
+
 ## DataTypes
 Data type definitions and type safe functions. ListItemType and ListItemType1 are sugar types.
 
@@ -244,7 +252,6 @@ String and other related utilities
 |Name|Description|
 |---:|---|
 |addBlankItem|Add blank item to collection|
-|arrayDifferences|Array 1 items do not exist in Array 2 or reverse match|
 |charsToNumber|Base64 chars to number|
 |containChinese|Check the input string contains Chinese character or not|
 |correctTypes|Correct object's property value type|

package/__tests__/ArrayUtils.ts

@@ -0,0 +1,22 @@
+import { ArrayUtils } from '../src/ArrayUtils';
+
+test('Tests for simple type toUnique', () => {
+    const result = [1, 1, 3, 5, 5].toUnique();
+    expect(result).toStrictEqual([1, 3, 5]);
+});
+
+test('Tests for object type toUnique', () => {
+    const result = [
+        { id: 1, label: 'a' },
+        { id: 2, label: 'b' },
+        { id: 2, label: 'b' }
+    ].toUnique();
+    expect(result.length).toBe(2);
+});
+
+test('Tests for differences', () => {
+    const a1 = ['a', 'b', 'c', 'e'];
+    const a2 = ['a', 'c', 'd'];
+    expect(ArrayUtils.differences(a1, a2)).toEqual(['b', 'e']);
+    expect(ArrayUtils.differences(a1, a2, true)).toEqual(['b', 'e', 'd']);
+});

package/__tests__/Utils.ts

@@ -21,13 +21,6 @@ test('Tests for containChinese', () => {
     expect('ぁ-ん'.containJapanese()).toBeTruthy();
 });
 
-test('Tests for arrayDifferences', () => {
-    const a1 = ['a', 'b', 'c', 'e'];
-    const a2 = ['a', 'c', 'd'];
-    expect(Utils.arrayDifferences(a1, a2)).toEqual(['b', 'e']);
-    expect(Utils.arrayDifferences(a1, a2, true)).toEqual(['b', 'e', 'd']);
-});
-
 test('Tests for correctTypes', () => {
     const input = {
         id: '1',
@@ -64,6 +57,7 @@ test('Tests for getDataChanges', () => {
         amount: '',
         enabled: true,
         value: undefined,
+        date: new Date('2023/03/18'),
         ids: [1, 2],
         data: { d1: 1, d2: false, d3: 1.2, d4: 'Hello' }
     };
@@ -74,6 +68,7 @@ test('Tests for getDataChanges', () => {
         brand: 'ETSOO',
         price: 6,
         amount: 0,
+        date: '2023/03/18',
         enabled: true,
         ids: [1, 2],
         data: { d1: 1, d3: 1.2, d4: 'Hello', d2: false }

package/lib/cjs/ArrayUtils.d.ts

@@ -0,0 +1,27 @@
+declare global {
+    interface Array<T> {
+        /**
+         * Items do not exist in target array or reverse match
+         * @param target Target array
+         * @param round A round for both matches
+         */
+        different(target: Array<T>, round?: boolean): Array<T>;
+        /**
+         * Make all items are unique
+         * @param this Input array
+         */
+        toUnique(): Array<T>;
+    }
+}
+/**
+ * Array Utilities
+ */
+export declare namespace ArrayUtils {
+    /**
+     * Array 1 items do not exist in Array 2 or reverse match
+     * @param a1 Array 1
+     * @param a2 Array 2
+     * @param round A round for both matches
+     */
+    function differences<T>(a1: T[], a2: T[], round?: boolean): T[];
+}

package/lib/cjs/ArrayUtils.js

@@ -0,0 +1,40 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ArrayUtils = void 0;
+const lodash_isequal_1 = __importDefault(require("lodash.isequal"));
+Array.prototype.different = function (target, round) {
+    return ArrayUtils.differences(this, target, round);
+};
+Array.prototype.toUnique = function () {
+    if (this.length === 0 || typeof this[0] !== 'object')
+        return Array.from(new Set(this));
+    const newArray = [];
+    this.forEach((item) => {
+        if (newArray.some((newItem) => (0, lodash_isequal_1.default)(item, newItem)))
+            return;
+        newArray.push(item);
+    });
+    return newArray;
+};
+/**
+ * Array Utilities
+ */
+var ArrayUtils;
+(function (ArrayUtils) {
+    /**
+     * Array 1 items do not exist in Array 2 or reverse match
+     * @param a1 Array 1
+     * @param a2 Array 2
+     * @param round A round for both matches
+     */
+    function differences(a1, a2, round) {
+        const diff = a1.filter((x) => !a2.includes(x));
+        if (round)
+            return [...diff, ...a2.filter((x) => !a1.includes(x))];
+        return diff;
+    }
+    ArrayUtils.differences = differences;
+})(ArrayUtils = exports.ArrayUtils || (exports.ArrayUtils = {}));

package/lib/cjs/Utils.d.ts

@@ -72,13 +72,6 @@ export declare namespace Utils {
      * @param blankLabel Blank label, default is ---
      */
     function addBlankItem<T extends object>(options: T[], idField?: string | keyof T, labelField?: unknown, blankLabel?: string): T[];
-    /**
-     * Array 1 items do not exist in Array 2 or reverse match
-     * @param a1 Array 1
-     * @param a2 Array 2
-     * @param round A round for both matches
-     */
-    function arrayDifferences<T>(a1: T[], a2: T[], round?: boolean): T[];
     /**
      * Base64 chars to number
      * @param base64Chars Base64 chars

package/lib/cjs/Utils.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Utils = void 0;
 const DataTypes_1 = require("./DataTypes");
 const lodash_isequal_1 = __importDefault(require("lodash.isequal"));
+const DateUtils_1 = require("./DateUtils");
 String.prototype.containChinese = function () {
     const regExp = /[\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f]/g;
     return regExp.test(this);
@@ -97,19 +98,6 @@ var Utils;
         return options;
     }
     Utils.addBlankItem = addBlankItem;
-    /**
-     * Array 1 items do not exist in Array 2 or reverse match
-     * @param a1 Array 1
-     * @param a2 Array 2
-     * @param round A round for both matches
-     */
-    function arrayDifferences(a1, a2, round) {
-        const diff = a1.filter((x) => !a2.includes(x));
-        if (round)
-            return [...diff, ...a2.filter((x) => !a1.includes(x))];
-        return diff;
-    }
-    Utils.arrayDifferences = arrayDifferences;
     /**
      * Base64 chars to number
      * @param base64Chars Base64 chars
@@ -222,6 +210,7 @@ var Utils;
         // Changed fields
         const changes = [];
         Object.entries(input).forEach(([key, value]) => {
+            var _a;
             // Ignore fields, no process
             if (ignoreFields.includes(key))
                 return;
@@ -233,6 +222,16 @@ var Utils;
                 return;
             }
             if (initValue != null) {
+                // Date when meets string
+                if (value instanceof Date) {
+                    if (value.valueOf() ===
+                        ((_a = DateUtils_1.DateUtils.parse(initValue)) === null || _a === void 0 ? void 0 : _a.valueOf())) {
+                        Reflect.deleteProperty(input, key);
+                        return;
+                    }
+                    changes.push(key);
+                    return;
+                }
                 const newValue = DataTypes_1.DataTypes.convert(value, initValue);
                 if (Utils.equals(newValue, initValue)) {
                     Reflect.deleteProperty(input, key);

package/lib/cjs/index.d.ts

@@ -7,6 +7,7 @@ export * from './types/FormData';
 export * from './storage/IStorage';
 export * from './storage/WindowStorage';
 export * from './ActionResult';
+export * from './ArrayUtils';
 export * from './DataTypes';
 export * from './ColorUtils';
 export * from './DateUtils';

package/lib/cjs/index.js

@@ -23,6 +23,7 @@ __exportStar(require("./types/FormData"), exports);
 __exportStar(require("./storage/IStorage"), exports);
 __exportStar(require("./storage/WindowStorage"), exports);
 __exportStar(require("./ActionResult"), exports);
+__exportStar(require("./ArrayUtils"), exports);
 __exportStar(require("./DataTypes"), exports);
 __exportStar(require("./ColorUtils"), exports);
 __exportStar(require("./DateUtils"), exports);

package/lib/mjs/ArrayUtils.d.ts

@@ -0,0 +1,27 @@
+declare global {
+    interface Array<T> {
+        /**
+         * Items do not exist in target array or reverse match
+         * @param target Target array
+         * @param round A round for both matches
+         */
+        different(target: Array<T>, round?: boolean): Array<T>;
+        /**
+         * Make all items are unique
+         * @param this Input array
+         */
+        toUnique(): Array<T>;
+    }
+}
+/**
+ * Array Utilities
+ */
+export declare namespace ArrayUtils {
+    /**
+     * Array 1 items do not exist in Array 2 or reverse match
+     * @param a1 Array 1
+     * @param a2 Array 2
+     * @param round A round for both matches
+     */
+    function differences<T>(a1: T[], a2: T[], round?: boolean): T[];
+}

package/lib/mjs/ArrayUtils.js

@@ -0,0 +1,34 @@
+import isEqual from 'lodash.isequal';
+Array.prototype.different = function (target, round) {
+    return ArrayUtils.differences(this, target, round);
+};
+Array.prototype.toUnique = function () {
+    if (this.length === 0 || typeof this[0] !== 'object')
+        return Array.from(new Set(this));
+    const newArray = [];
+    this.forEach((item) => {
+        if (newArray.some((newItem) => isEqual(item, newItem)))
+            return;
+        newArray.push(item);
+    });
+    return newArray;
+};
+/**
+ * Array Utilities
+ */
+export var ArrayUtils;
+(function (ArrayUtils) {
+    /**
+     * Array 1 items do not exist in Array 2 or reverse match
+     * @param a1 Array 1
+     * @param a2 Array 2
+     * @param round A round for both matches
+     */
+    function differences(a1, a2, round) {
+        const diff = a1.filter((x) => !a2.includes(x));
+        if (round)
+            return [...diff, ...a2.filter((x) => !a1.includes(x))];
+        return diff;
+    }
+    ArrayUtils.differences = differences;
+})(ArrayUtils || (ArrayUtils = {}));

package/lib/mjs/Utils.d.ts

@@ -72,13 +72,6 @@ export declare namespace Utils {
      * @param blankLabel Blank label, default is ---
      */
     function addBlankItem<T extends object>(options: T[], idField?: string | keyof T, labelField?: unknown, blankLabel?: string): T[];
-    /**
-     * Array 1 items do not exist in Array 2 or reverse match
-     * @param a1 Array 1
-     * @param a2 Array 2
-     * @param round A round for both matches
-     */
-    function arrayDifferences<T>(a1: T[], a2: T[], round?: boolean): T[];
     /**
      * Base64 chars to number
      * @param base64Chars Base64 chars

package/lib/mjs/Utils.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { DataTypes } from './DataTypes';
 import isEqual from 'lodash.isequal';
+import { DateUtils } from './DateUtils';
 String.prototype.containChinese = function () {
     const regExp = /[\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f]/g;
     return regExp.test(this);
@@ -91,19 +92,6 @@ export var Utils;
         return options;
     }
     Utils.addBlankItem = addBlankItem;
-    /**
-     * Array 1 items do not exist in Array 2 or reverse match
-     * @param a1 Array 1
-     * @param a2 Array 2
-     * @param round A round for both matches
-     */
-    function arrayDifferences(a1, a2, round) {
-        const diff = a1.filter((x) => !a2.includes(x));
-        if (round)
-            return [...diff, ...a2.filter((x) => !a1.includes(x))];
-        return diff;
-    }
-    Utils.arrayDifferences = arrayDifferences;
     /**
      * Base64 chars to number
      * @param base64Chars Base64 chars
@@ -216,6 +204,7 @@ export var Utils;
         // Changed fields
         const changes = [];
         Object.entries(input).forEach(([key, value]) => {
+            var _a;
             // Ignore fields, no process
             if (ignoreFields.includes(key))
                 return;
@@ -227,6 +216,16 @@ export var Utils;
                 return;
             }
             if (initValue != null) {
+                // Date when meets string
+                if (value instanceof Date) {
+                    if (value.valueOf() ===
+                        ((_a = DateUtils.parse(initValue)) === null || _a === void 0 ? void 0 : _a.valueOf())) {
+                        Reflect.deleteProperty(input, key);
+                        return;
+                    }
+                    changes.push(key);
+                    return;
+                }
                 const newValue = DataTypes.convert(value, initValue);
                 if (Utils.equals(newValue, initValue)) {
                     Reflect.deleteProperty(input, key);

package/lib/mjs/index.d.ts

@@ -7,6 +7,7 @@ export * from './types/FormData';
 export * from './storage/IStorage';
 export * from './storage/WindowStorage';
 export * from './ActionResult';
+export * from './ArrayUtils';
 export * from './DataTypes';
 export * from './ColorUtils';
 export * from './DateUtils';

package/lib/mjs/index.js

@@ -7,6 +7,7 @@ export * from './types/FormData';
 export * from './storage/IStorage';
 export * from './storage/WindowStorage';
 export * from './ActionResult';
+export * from './ArrayUtils';
 export * from './DataTypes';
 export * from './ColorUtils';
 export * from './DateUtils';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.91",
+    "version": "1.1.93",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -59,7 +59,7 @@
         "jest": "^29.5.0",
         "jest-environment-jsdom": "^29.5.0",
         "ts-jest": "^29.0.5",
-        "typescript": "^4.9.5"
+        "typescript": "^5.0.2"
     },
     "dependencies": {
         "lodash.isequal": "^4.5.0"

package/src/ArrayUtils.ts

@@ -0,0 +1,55 @@
+import isEqual from 'lodash.isequal';
+
+declare global {
+    interface Array<T> {
+        /**
+         * Items do not exist in target array or reverse match
+         * @param target Target array
+         * @param round A round for both matches
+         */
+        different(target: Array<T>, round?: boolean): Array<T>;
+
+        /**
+         * Make all items are unique
+         * @param this Input array
+         */
+        toUnique(): Array<T>;
+    }
+}
+
+Array.prototype.different = function <T>(
+    this: Array<T>,
+    target: Array<T>,
+    round?: boolean
+) {
+    return ArrayUtils.differences(this, target, round);
+};
+
+Array.prototype.toUnique = function <T>(this: Array<T>) {
+    if (this.length === 0 || typeof this[0] !== 'object')
+        return Array.from(new Set(this));
+
+    const newArray: T[] = [];
+    this.forEach((item) => {
+        if (newArray.some((newItem) => isEqual(item, newItem))) return;
+        newArray.push(item);
+    });
+    return newArray;
+};
+
+/**
+ * Array Utilities
+ */
+export namespace ArrayUtils {
+    /**
+     * Array 1 items do not exist in Array 2 or reverse match
+     * @param a1 Array 1
+     * @param a2 Array 2
+     * @param round A round for both matches
+     */
+    export function differences<T>(a1: T[], a2: T[], round?: boolean) {
+        const diff = a1.filter((x) => !a2.includes(x));
+        if (round) return [...diff, ...a2.filter((x) => !a1.includes(x))];
+        return diff;
+    }
+}

package/src/Utils.ts

@@ -1,5 +1,6 @@
 import { DataTypes } from './DataTypes';
 import isEqual from 'lodash.isequal';
+import { DateUtils } from './DateUtils';
 
 declare global {
     interface String {
@@ -178,18 +179,6 @@ export namespace Utils {
         return options;
     }
 
-    /**
-     * Array 1 items do not exist in Array 2 or reverse match
-     * @param a1 Array 1
-     * @param a2 Array 2
-     * @param round A round for both matches
-     */
-    export function arrayDifferences<T>(a1: T[], a2: T[], round?: boolean) {
-        const diff = a1.filter((x) => !a2.includes(x));
-        if (round) return [...diff, ...a2.filter((x) => !a1.includes(x))];
-        return diff;
-    }
-
     /**
      * Base64 chars to number
      * @param base64Chars Base64 chars
@@ -327,6 +316,19 @@ export namespace Utils {
             }
 
             if (initValue != null) {
+                // Date when meets string
+                if (value instanceof Date) {
+                    if (
+                        value.valueOf() ===
+                        DateUtils.parse(initValue)?.valueOf()
+                    ) {
+                        Reflect.deleteProperty(input, key);
+                        return;
+                    }
+                    changes.push(key);
+                    return;
+                }
+
                 const newValue = DataTypes.convert(value, initValue);
                 if (Utils.equals(newValue, initValue)) {
                     Reflect.deleteProperty(input, key);

package/src/index.ts

@@ -9,6 +9,7 @@ export * from './storage/IStorage';
 export * from './storage/WindowStorage';
 
 export * from './ActionResult';
+export * from './ArrayUtils';
 export * from './DataTypes';
 export * from './ColorUtils';
 export * from './DateUtils';