Merge pull request #140 from RebeccaStevens/no-enumerable-props

RebeccaStevens · Jun 13, 2022 · 73f0940 · 73f0940
2 parents 172f29a + a8de1ca
commit 73f0940
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/src/deepmerge.ts b/src/deepmerge.ts
@@ -425,7 +425,9 @@ function defaultMergeRecords<
       }
     }
 
-    // assert(propValues.length > 0);
+    if (propValues.length === 0) {
+      continue;
+    }
 
     const updatedMeta = utils.metaDataUpdater(meta, {
       key,

diff --git a/tests/deepmerge.test.ts b/tests/deepmerge.test.ts
@@ -465,6 +465,39 @@ test(`supports symbols`, (t) => {
   t.deepEqual(merged[testSymbol3], expected[testSymbol3]);
 });
 
+test("enumerable keys", (t) => {
+  const x = {};
+  const y = {};
+
+  Object.defineProperties(x, {
+    a: {
+      value: 1,
+      enumerable: false,
+    },
+    b: {
+      value: 2,
+      enumerable: true,
+    },
+  });
+
+  Object.defineProperties(y, {
+    a: {
+      value: 3,
+      enumerable: false,
+    },
+    b: {
+      value: 4,
+      enumerable: false,
+    },
+  });
+
+  const expected = { b: 2 };
+
+  const merged = deepmerge(x, y);
+
+  t.deepEqual(merged, expected);
+});
+
 /* eslint-disable no-proto, @typescript-eslint/naming-convention */
 test(`merging objects with own __proto__`, (t) => {
   const a = { key1: "value1" };