fix: handle the possible errors when object has a property called has…

…OwnProperty
chathurabuddi · Sep 11, 2024 · 2c29ece · 2c29ece
1 parent a6e70bc
commit 2c29ece
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/merge.ts b/src/merge.ts
@@ -2,7 +2,7 @@ export const MergeJson = (target: Record<string, any>, source: Record<string, an
     const result: Partial<Record<string, any>> = { ...target };
 
     for (const key in source) {
-        if (source.hasOwnProperty(key)) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
             const targetValue = result[key];
             const sourceValue = source[key];
 

diff --git a/test/merge.test.ts b/test/merge.test.ts
@@ -64,5 +64,12 @@ describe('MergeJson', () => {
         const result = MergeJson(target, source);
         expect(result).toEqual({ a: { x: 2 } });
     });
+
+    test('should handle objects with a property named hasOwnProperty', () => {
+        const target = { a: 1, hasOwnProperty: 2 };
+        const source = { b: 3, hasOwnProperty: 4 };
+        const result = MergeJson(target, source);
+        expect(result).toEqual({ a: 1, b: 3, hasOwnProperty: 4 });
+    });
 });