@etsoo/shared 1.2.65 → 1.2.67

package/README.md

@@ -306,6 +306,8 @@ String and other related utilities
 |     getDataChanges | Get data changed fields with input data updated                     |
 |     getNestedValue | Get nested value from object                                        |
 |        getTimeZone | Get time zone                                                       |
+|      hasHtmlEntity | Check the input string contains HTML entity or not                  |
+|         hasHtmlTag | Check the input string contains HTML tag or not                     |
 |           hideData | Hide data                                                           |
 |          hideEmail | Hide email data                                                     |
 |           isDigits | Is digits string                                                    |

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", () => {
@@ -197,6 +198,21 @@ test("Tests for formatString", () => {
   expect(template.format("aa", "bb")).toBe(result);
 });
 
+test("Tests for hasHtmlEntity", () => {
+  expect(Utils.hasHtmlEntity("&nbsp")).toBeFalsy();
+  expect(Utils.hasHtmlEntity(" ")).toBeTruthy();
+  expect(Utils.hasHtmlEntity("< >")).toBeTruthy();
+  expect(Utils.hasHtmlEntity("&180;")).toBeFalsy();
+  expect(Utils.hasHtmlEntity("&160;")).toBeTruthy();
+});
+
+test("Tests for hasHtmlTag", () => {
+  expect(Utils.hasHtmlTag("<>")).toBeFalsy();
+  expect(Utils.hasHtmlTag("<div>")).toBeTruthy();
+  expect(Utils.hasHtmlTag("</h1>")).toBeTruthy();
+  expect(Utils.hasHtmlTag("<br>")).toBeTruthy();
+});
+
 test("Tests for hideData", () => {
   expect("xz@etsoo.com".hideEmail()).toBe("x***@etsoo.com");
   expect("info@etsoo.com".hideEmail()).toBe("in***@etsoo.com");

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
@@ -180,6 +180,18 @@ export declare namespace Utils {
      * @returns Timezone
      */
     export const getTimeZone: (tz?: string) => string;
+    /**
+     * Check the input string contains HTML entity or not
+     * @param input Input string
+     * @returns Result
+     */
+    export function hasHtmlEntity(input: string): boolean;
+    /**
+     * Check the input string contains HTML tag or not
+     * @param input Input string
+     * @returns Result
+     */
+    export function hasHtmlTag(input: string): boolean;
     /**
      * Is digits string
      * @param input Input string

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);
@@ -357,6 +357,24 @@ var Utils;
         // Default timezone
         return tz ?? "UTC";
     };
+    /**
+     * Check the input string contains HTML entity or not
+     * @param input Input string
+     * @returns Result
+     */
+    function hasHtmlEntity(input) {
+        return /&(lt|gt|nbsp|60|62|160);/.test(input);
+    }
+    Utils.hasHtmlEntity = hasHtmlEntity;
+    /**
+     * Check the input string contains HTML tag or not
+     * @param input Input string
+     * @returns Result
+     */
+    function hasHtmlTag(input) {
+        return /<\/?[a-z]+[^<>]*>/i.test(input);
+    }
+    Utils.hasHtmlTag = hasHtmlTag;
     /**
      * Is digits string
      * @param input Input string

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
@@ -180,6 +180,18 @@ export declare namespace Utils {
      * @returns Timezone
      */
     export const getTimeZone: (tz?: string) => string;
+    /**
+     * Check the input string contains HTML entity or not
+     * @param input Input string
+     * @returns Result
+     */
+    export function hasHtmlEntity(input: string): boolean;
+    /**
+     * Check the input string contains HTML tag or not
+     * @param input Input string
+     * @returns Result
+     */
+    export function hasHtmlTag(input: string): boolean;
     /**
      * Is digits string
      * @param input Input string

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);
@@ -351,6 +351,24 @@ export var Utils;
         // Default timezone
         return tz ?? "UTC";
     };
+    /**
+     * Check the input string contains HTML entity or not
+     * @param input Input string
+     * @returns Result
+     */
+    function hasHtmlEntity(input) {
+        return /&(lt|gt|nbsp|60|62|160);/.test(input);
+    }
+    Utils.hasHtmlEntity = hasHtmlEntity;
+    /**
+     * Check the input string contains HTML tag or not
+     * @param input Input string
+     * @returns Result
+     */
+    function hasHtmlTag(input) {
+        return /<\/?[a-z]+[^<>]*>/i.test(input);
+    }
+    Utils.hasHtmlTag = hasHtmlTag;
     /**
      * Is digits string
      * @param input Input string

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/shared",
-  "version": "1.2.65",
+  "version": "1.2.67",
   "description": "TypeScript shared utilities and functions",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -39,7 +39,7 @@
     "@types/lodash.isequal": "^4.5.8",
     "@vitejs/plugin-react": "^4.3.4",
     "jsdom": "^26.0.0",
-    "typescript": "^5.8.2",
+    "typescript": "^5.8.3",
     "vitest": "^3.1.1"
   },
   "dependencies": {

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);
@@ -530,6 +534,24 @@ export namespace Utils {
     return tz ?? "UTC";
   };
 
+  /**
+   * Check the input string contains HTML entity or not
+   * @param input Input string
+   * @returns Result
+   */
+  export function hasHtmlEntity(input: string) {
+    return /&(lt|gt|nbsp|60|62|160);/.test(input);
+  }
+
+  /**
+   * Check the input string contains HTML tag or not
+   * @param input Input string
+   * @returns Result
+   */
+  export function hasHtmlTag(input: string) {
+    return /<\/?[a-z]+[^<>]*>/i.test(input);
+  }
+
   /**
    * Is digits string
    * @param input Input string