Add support for Array during object merging (#60)

* Add support for Array during object merging

* Bump version

* Remove test.only

* Clone object before merging it

Author: abdala

assert/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgauge/assert",
-  "version": "0.17.2",
+  "version": "0.17.3",
   "description": "Extra assert library",
   "type": "module",
   "repository": {

dtc-aws-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgauge/dtc-aws-plugin",
-  "version": "0.17.2",
+  "version": "0.17.3",
   "description": "AWS plugin for Declarative TestCases",
   "repository": {
     "type": "git",

dtc-graphql-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgauge/dtc-graphql-plugin",
-  "version": "0.17.2",
+  "version": "0.17.3",
   "description": "GraphQl plugin for Declarative TestCases",
   "repository": {
     "type": "git",

dtc-mysql-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgauge/dtc-mysql-plugin",
-  "version": "0.17.2",
+  "version": "0.17.3",
   "description": "MySQL plugin for Declarative TestCases",
   "repository": {
     "type": "git",

dtc-playwright-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgauge/dtc-playwright-plugin",
-  "version": "0.17.2",
+  "version": "0.17.3",
   "description": "Playwright plugin for Declarative TestCases",
   "repository": {
     "type": "git",

dtc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgauge/dtc",
-  "version": "0.17.2",
+  "version": "0.17.3",
   "description": "Declarative TestCases",
   "repository": {
     "type": "git",

dtc/src/utils.ts

@@ -35,14 +35,18 @@ export const retry = async <T>(fn: () => Promise<T>, times = 0, seconds = 1): Pr
   throw errors[0]
 }
 
-export const merge = (to: any, from: any) => {
-  to = {...to}
-  for (const n in from) {
-    if (typeof to[n] != 'object') {
-      to[n] = from[n]
-    } else if (typeof from[n] == 'object') {
-      to[n] = merge(to[n], from[n])
+export const merge = (to: any, from: any): any => {
+  if (Array.isArray(to) && Array.isArray(from)) {
+    return to.length > from.length
+      ? to.map((v, i) => merge(v, from[i] ?? v))
+      : from.map((v: any, i: number) => merge(to[i], v))
+  } else if (typeof to === 'object' && !Array.isArray(to) && typeof from === 'object' && !Array.isArray(from)) {
+    to = structuredClone(to)
+    for (const key in from) {
+      to[key] = merge(to[key], from[key])
     }
+    return to
   }
-  return to
+
+  return from
 }

dtc/test/utils.test.ts

@@ -1,6 +1,6 @@
 import {test} from 'node:test'
 import assert from 'node:assert'
-import {retry} from '../src/utils'
+import {retry, merge} from '../src/utils'
 
 test('It execute at least one time', async () => {
   const response = await retry(() => Promise.resolve(true))
@@ -25,4 +25,34 @@ test('It retries when it fails', async () => {
   }, 1)
 
   assert.ok(response)
+});
+
+([
+  //objects
+  [{a: 'a'}, {a: 'b'}, {a: 'b'}],
+  [{a: 'a', b: 'c'}, {a: 'b'}, {a: 'b', b: 'c'}],
+  [{a: 'a'}, {a: 'b', b: 'c'}, {a: 'b', b: 'c'}],
+  [{a: {a: 'a'}}, {a: {a: 'b'}}, {a: {a: 'b'}}],
+  [{a: {a: 'a'}, b: 'c'}, {a: {a: 'b'}}, {a: {a: 'b'}, b: 'c'}],
+  //arrays
+  [[1], [2], [2]],
+  [[1], [2,3], [2,3]],
+  [[1,2], [3], [3,2]],
+  [[[1]], [[2]], [[2]]],
+  [[[1], 2], [[2]], [[2], 2]],
+  [[[1]], [[2], 3], [[2], 3]],
+  //mixed types
+  [{a: [1]}, {a: 1}, {a: 1}],
+  [{a: 1}, {a: [1]}, {a: [1]}],
+  [{a: {b: 'a'}}, {a: [1]}, {a: [1]}],
+  [[{a: 'a', b: 'c'}], [{a: 'b'}], [{a: 'b', b: 'c'}]],
+  //primitives
+  [1, 2, 2],
+  ['a', 'b', 'b'],
+]).forEach(([source, target, expected], index) => {
+  test(`It merge objects (${index})`, async () => {
+    const result = merge(source, target)
+
+    assert.deepStrictEqual(result, expected)
+  })
 })

nock-aws/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgauge/nock-aws",
-  "version": "0.17.2",
+  "version": "0.17.3",
   "description": "AWS Request mocker based on Nock",
   "repository": {
     "type": "git",

type-guard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgauge/type-guard",
-  "version": "0.17.2",
+  "version": "0.17.3",
   "description": "Typescript type guards",
   "repository": {
     "type": "git",