fix(core-kernel): override array on merge (#4269)

ArkEcosystem · Jan 21, 2021 · e9cee04 · e9cee04
1 parent 2f493d7
commit e9cee04
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 8 deletions.
diff --git a/__tests__/unit/core-kernel/providers/plugin-configuration.test.ts b/__tests__/unit/core-kernel/providers/plugin-configuration.test.ts
@@ -31,13 +31,6 @@ describe("PluginConfiguration", () => {
         expect(pluginConfiguration.all()).toEqual({ defaultKey: "defaultValue" });
     });
 
-    it("should merge the given value", () => {
-        pluginConfiguration.set("key", "value");
-        pluginConfiguration.merge({ some: "value" });
-
-        expect(pluginConfiguration.all()).toEqual({ some: "value", key: "value" });
-    });
-
     it("should set and get the given value", () => {
         pluginConfiguration.set("key", "value");
 
@@ -59,4 +52,48 @@ describe("PluginConfiguration", () => {
     it("should throw when using deprecated get default value argument", () => {
         expect(() => pluginConfiguration.get("key", "default value")).toThrow();
     });
+
+    describe("merge", () => {
+        it("should merge the given value", () => {
+            pluginConfiguration.set("key", "value");
+            pluginConfiguration.merge({ some: "value" });
+
+            expect(pluginConfiguration.all()).toEqual({ some: "value", key: "value" });
+        });
+
+        it("should merge nested object", () => {
+            pluginConfiguration.set("key", {
+                "1": {
+                    "1.1": "test",
+                },
+            });
+            pluginConfiguration.merge({
+                key: {
+                    "1": {
+                        "1.2": "test",
+                    },
+                },
+            });
+
+            expect(pluginConfiguration.all()).toEqual({
+                key: {
+                    "1": {
+                        "1.1": "test",
+                        "1.2": "test",
+                    },
+                },
+            });
+        });
+
+        it("should override array", () => {
+            pluginConfiguration.set("key", [1, 2, 3]);
+            pluginConfiguration.merge({
+                key: [3, 4, 5],
+            });
+
+            expect(pluginConfiguration.all()).toEqual({
+                key: [3, 4, 5],
+            });
+        });
+    });
 });
diff --git a/packages/core-kernel/src/providers/plugin-configuration.ts b/packages/core-kernel/src/providers/plugin-configuration.ts
@@ -71,7 +71,9 @@ export class PluginConfiguration {
      */
     public merge(values: JsonObject | undefined): this {
         if (values) {
-            this.items = deepmerge(this.items, values);
+            this.items = deepmerge(this.items, values, {
+                arrayMerge: (destination, source) => source,
+            });
         }
 
         return this;