@etsoo/shared 1.2.65 → 1.2.66

package/__tests__/Utils.ts

@@ -104,7 +104,7 @@ test("Tests for correctTypes", () => {
 
 test("Tests for getDataChanges", () => {
   const input = {
-    id: 1,
+    id: 2,
     name: "Name",
     gender: "F",
     brand: "",
@@ -146,10 +146,11 @@ test("Tests for getDataChanges", () => {
     enabled: true,
     value: undefined,
     date: new Date("2023/03/18"),
-    ids: [1, 2]
+    ids: [1, 2],
+    changedFields: ["gender", "brand", "date"]
   };
   const fields1 = Utils.getDataChanges(input1, initData, ["brand", "date"]);
-  expect(fields1).toStrictEqual(["gender", "amount"]);
+  expect(fields1).toStrictEqual(["id", "gender", "amount", "changedFields"]);
 });
 
 test("Tests for object array getDataChanges", () => {

package/lib/cjs/Utils.d.ts

@@ -156,10 +156,10 @@ export declare namespace Utils {
      * Get data changed fields (ignored changedFields) with input data updated
      * @param input Input data
      * @param initData Initial data
-     * @param ignoreFields Ignore fields
+     * @param ignoreFields Ignore fields, default is ['changedFields', 'id']
      * @returns
      */
-    export function getDataChanges<T extends object, const I extends (keyof T & string)[]>(input: T, initData: object, ignoreFields?: I): Exclude<keyof T & string, (typeof ignoreFields)[number] | (typeof IgnoredProperties)[number]>[];
+    export function getDataChanges<T extends object, const I extends (keyof T & string)[] | undefined = undefined>(input: T, initData: object, ignoreFields?: I): Exclude<keyof T & string, I extends undefined ? (typeof IgnoredProperties)[number] : Exclude<I, undefined>[number]>[];
     /**
      * Get nested value from object
      * @param data Data

package/lib/cjs/Utils.js

@@ -257,17 +257,17 @@ var Utils;
      * Get data changed fields (ignored changedFields) with input data updated
      * @param input Input data
      * @param initData Initial data
-     * @param ignoreFields Ignore fields
+     * @param ignoreFields Ignore fields, default is ['changedFields', 'id']
      * @returns
      */
-    function getDataChanges(input, initData, ignoreFields = []) {
+    function getDataChanges(input, initData, ignoreFields) {
+        // Default ignore fields
+        const fields = ignoreFields ?? IgnoredProperties;
         // Changed fields
         const changes = [];
-        // Ignored fields
-        const allFields = [...ignoreFields, ...IgnoredProperties];
         Object.entries(input).forEach(([key, value]) => {
             // Ignore fields, no process
-            if (allFields.includes(key))
+            if (fields.includes(key))
                 return;
             // Compare with init value
             const initValue = Reflect.get(initData, key);

package/lib/mjs/Utils.d.ts

@@ -156,10 +156,10 @@ export declare namespace Utils {
      * Get data changed fields (ignored changedFields) with input data updated
      * @param input Input data
      * @param initData Initial data
-     * @param ignoreFields Ignore fields
+     * @param ignoreFields Ignore fields, default is ['changedFields', 'id']
      * @returns
      */
-    export function getDataChanges<T extends object, const I extends (keyof T & string)[]>(input: T, initData: object, ignoreFields?: I): Exclude<keyof T & string, (typeof ignoreFields)[number] | (typeof IgnoredProperties)[number]>[];
+    export function getDataChanges<T extends object, const I extends (keyof T & string)[] | undefined = undefined>(input: T, initData: object, ignoreFields?: I): Exclude<keyof T & string, I extends undefined ? (typeof IgnoredProperties)[number] : Exclude<I, undefined>[number]>[];
     /**
      * Get nested value from object
      * @param data Data

package/lib/mjs/Utils.js

@@ -251,17 +251,17 @@ export var Utils;
      * Get data changed fields (ignored changedFields) with input data updated
      * @param input Input data
      * @param initData Initial data
-     * @param ignoreFields Ignore fields
+     * @param ignoreFields Ignore fields, default is ['changedFields', 'id']
      * @returns
      */
-    function getDataChanges(input, initData, ignoreFields = []) {
+    function getDataChanges(input, initData, ignoreFields) {
+        // Default ignore fields
+        const fields = ignoreFields ?? IgnoredProperties;
         // Changed fields
         const changes = [];
-        // Ignored fields
-        const allFields = [...ignoreFields, ...IgnoredProperties];
         Object.entries(input).forEach(([key, value]) => {
             // Ignore fields, no process
-            if (allFields.includes(key))
+            if (fields.includes(key))
                 return;
             // Compare with init value
             const initValue = Reflect.get(initData, key);

package/package.json

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

package/src/Utils.ts

@@ -402,32 +402,36 @@ export namespace Utils {
    * Get data changed fields (ignored changedFields) with input data updated
    * @param input Input data
    * @param initData Initial data
-   * @param ignoreFields Ignore fields
+   * @param ignoreFields Ignore fields, default is ['changedFields', 'id']
    * @returns
    */
   export function getDataChanges<
     T extends object,
-    const I extends (keyof T & string)[]
+    const I extends (keyof T & string)[] | undefined = undefined
   >(
     input: T,
     initData: object,
-    ignoreFields: I = [] as any
+    ignoreFields?: I
   ): Exclude<
     keyof T & string,
-    (typeof ignoreFields)[number] | (typeof IgnoredProperties)[number]
+    I extends undefined
+      ? (typeof IgnoredProperties)[number]
+      : Exclude<I, undefined>[number]
   >[] {
+    // Default ignore fields
+    const fields = ignoreFields ?? IgnoredProperties;
+
     // Changed fields
     const changes: Exclude<
       keyof T & string,
-      (typeof ignoreFields)[number] | (typeof IgnoredProperties)[number]
+      I extends undefined
+        ? (typeof IgnoredProperties)[number]
+        : Exclude<I, undefined>[number]
     >[] = [];
 
-    // Ignored fields
-    const allFields: string[] = [...ignoreFields, ...IgnoredProperties];
-
     Object.entries(input).forEach(([key, value]) => {
       // Ignore fields, no process
-      if (allFields.includes(key)) return;
+      if (fields.includes(key as any)) return;
 
       // Compare with init value
       const initValue = Reflect.get(initData, key);