@ditojs/utils 1.5.5 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/utils",
-  "version": "1.5.5",
+  "version": "1.9.0",
   "type": "module",
   "description": "Dito.js Utility Functions – Dito.js is a declarative and modern web framework, based on Objection.js, Koa.js and Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/master/packages/utils",
@@ -27,5 +27,5 @@
   "dependencies": {
     "punycode": "^2.1.1"
   },
-  "gitHead": "157b519f3f3552fb25b67adf7e0fd402485ac4c9"
+  "gitHead": "034973580c50fc7d8bb4ad07ec4c91782eb329a5"
 }

package/src/object/merge.js

@@ -3,7 +3,7 @@ import { clone } from './clone.js'
 
 export function merge(target, ...sources) {
   const _merge = (target, source, cloneTarget) => {
-    if (target && source && (
+    if (target && source && target !== source && (
       isArray(target) && isArray(source) ||
       isPlainObject(target) && isPlainObject(source)
     )) {
@@ -11,10 +11,7 @@ export function merge(target, ...sources) {
         ? clone(target)
         : target
       for (const key of Object.keys(source)) {
-        const value = _merge(target[key], source[key], true)
-        if (value !== undefined || !(key in result)) {
-          result[key] = value
-        }
+        result[key] = _merge(target[key], source[key], true)
       }
       return result
     }

package/src/object/merge.test.js

@@ -80,21 +80,20 @@ describe('merge()', () => {
     expect(actual2.a).toStrictEqual([[4, 5, 3]])
   })
 
-  it('should not overwrite existing values with `undefined` in objects', () => {
+  it('should overwrite existing values with `undefined` in objects', () => {
     const actual = merge({ a: 1 }, { a: undefined, b: undefined })
-    expect(actual).toStrictEqual({ a: 1, b: undefined })
+    expect(actual).toStrictEqual({ a: undefined, b: undefined })
   })
 
-  it('should not overwrite existing values with `undefined` in arrays', () => {
+  it('should overwrite existing values with `undefined` in arrays', () => {
     const array1 = [1]
     array1[2] = 3
     const actual1 = merge([4, 5, 6], array1)
-    const expected1 = [1, 5, 3]
-    expect(actual1).toStrictEqual(expected1)
+    expect(actual1).toStrictEqual([1, 5, 3])
 
     const array2 = [1, undefined, 3]
     const actual2 = merge([4, 5, 6], array2)
-    expect(actual2).toStrictEqual(expected1)
+    expect(actual2).toStrictEqual([1, undefined, 3])
   })
 
   it('should merge regexps', () => {