feat: merge objects

.all-contributorsrc

@@ -1,7 +1,5 @@
 {
-  "files": [
-    "README.md"
-  ],
+  "files": ["README.md"],
   "imageSize": 100,
   "commit": false,
   "commitType": "docs",
@@ -12,46 +10,35 @@
       "name": "Aral Roca Gomez",
       "avatar_url": "https://avatars.githubusercontent.com/u/13313058?v=4",
       "profile": "https://aralroca.com",
-      "contributions": [
-        "code",
-        "maintenance"
-      ]
+      "contributions": ["code", "maintenance"]
     },
     {
       "login": "robinpokorny",
       "name": "Robin Pokorny",
       "avatar_url": "https://avatars.githubusercontent.com/u/68341?v=4",
       "profile": "http://robinpokorny.com",
-      "contributions": [
-        "code"
-      ]
+      "contributions": ["code"]
     },
     {
       "login": "leeferwagen",
       "name": "Muslim Idris",
       "avatar_url": "https://avatars.githubusercontent.com/u/1287545?v=4",
       "profile": "https://github.com/leeferwagen",
-      "contributions": [
-        "code"
-      ]
+      "contributions": ["code"]
     },
     {
       "login": "namhtpyn",
       "name": "namhtpyn",
       "avatar_url": "https://avatars.githubusercontent.com/u/16488178?v=4",
       "profile": "https://github.com/namhtpyn",
-      "contributions": [
-        "infra"
-      ]
+      "contributions": ["infra"]
     },
     {
       "login": "Josuto",
       "name": "Josu Martinez",
       "avatar_url": "https://avatars.githubusercontent.com/u/6097850?v=4",
       "profile": "https://github.com/Josuto",
-      "contributions": [
-        "bug"
-      ]
+      "contributions": ["bug"]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -14,6 +14,7 @@ _A **tiny** (~500B) **JavaScript library** that allows you to set **default valu
 [![Weekly downloads](https://badgen.net/npm/dw/default-composer?color=blue)](https://www.npmjs.com/package/default-composer)
 [![PRs Welcome][badge-prwelcome]][prwelcome]<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
 [![All Contributors](https://img.shields.io/badge/all_contributors-5-orange.svg?style=flat-square)](#contributors-)
+
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 [badge-prwelcome]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square

package.json

@@ -47,4 +47,4 @@
     "@babel/preset-typescript": "7.21.5",
     "microbundle": "0.15.1"
   }
-}
+}

src/index.test.ts

@@ -286,7 +286,7 @@ describe("defaultComposer", () => {
       nested: {
         example: ["a", "d", "e"],
         nums: [1, 4, 5],
-        objects: [{ a: 1 }, { b: 2 }],
+        objects: [{ c: 1 }, { d: 2 }, { e: 3 }],
         notDefaultableKey: ["shouldNotBeMerged"],
       },
     };
@@ -297,7 +297,11 @@ describe("defaultComposer", () => {
       nested: {
         example: ["a", "b", "c", "d", "e"],
         nums: [1, 2, 3, 4, 5],
-        objects: [{ a: 1 }, { b: 2 }, { a: 1 }, { b: 2 }],
+        objects: [
+          { a: 1, c: 1 },
+          { b: 2, d: 2 },
+          { e: 3 }
+        ],
         notDefaultableKey: ["shouldNotBeMerged"],
       },
     };
@@ -310,13 +314,13 @@ describe("defaultComposer", () => {
     expect(defaultComposer<any>(defaults, object)).toEqual(expected);
   });
 
-  it('should respect the Date object', () => {
+  it("should respect the Date object", () => {
     const defaults = {
       date: new Date(),
       range: {
         startDate: new Date(2020, 1, 1),
         endDate: new Date(2020, 1, 2),
-      }
+      },
     };
 
     const object = {
@@ -332,29 +336,29 @@ describe("defaultComposer", () => {
       range: {
         startDate: new Date(2020, 1, 1),
         endDate: new Date(2020, 1, 2),
-      }
+      },
     };
 
     expect(output).toStrictEqual(expected);
   });
 
-  it('should respect instance of any class', () => {
+  it("should respect instance of any class", () => {
     class TestClass {
       constructor(public name: string) { }
     }
 
     const defaults = {
-      test: new TestClass('test'),
+      test: new TestClass("test"),
     };
 
     const object = {
-      test: new TestClass('test2'),
+      test: new TestClass("test2"),
     };
 
     const output = defaultComposer<any>(defaults, object);
 
     const expected = {
-      test: new TestClass('test2'),
+      test: new TestClass("test2"),
     };
 
     expect(output).toStrictEqual(expected);

src/index.ts

@@ -47,7 +47,23 @@ function compose<T>(defaults: Partial<T>, obj: Partial<T>): Partial<T> {
       Array.isArray(defaultsValue) &&
       Array.isArray(originalObjectValue)
     ) {
-      result[key] = [...new Set([...defaultsValue, ...originalObjectValue])];
+      if (!defaultsValue.some(isObject)) {
+        result[key] = [...new Set([...defaultsValue, ...originalObjectValue])];
+        continue;
+      }
+
+      const maxLength = Math.max(
+        defaultsValue.length,
+        originalObjectValue.length,
+      );
+      const setOfObjects = new Set();
+
+      for (let i = 0; i < maxLength; i++) {
+        setOfObjects.add(compose(defaultsValue[i] ?? {}, originalObjectValue[i] ?? {}));
+      }
+
+      result[key] = [...setOfObjects];
+
       continue;
     }
 
@@ -68,11 +84,17 @@ function compose<T>(defaults: Partial<T>, obj: Partial<T>): Partial<T> {
 }
 
 function isObject(value: any): boolean {
-  return typeof value === "object" && value !== null && value.constructor === Object && !Array.isArray(value);
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    value.constructor === Object &&
+    !Array.isArray(value)
+  );
 }
 
 function isEmptyObjectOrArray<T>(object: T): boolean {
-  if (typeof object !== "object" || object === null || object instanceof Date) return false;
+  if (typeof object !== "object" || object === null || object instanceof Date)
+    return false;
   return getAllKeys(object).length === 0;
 }