@ditojs/utils 2.4.1 → 2.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/utils",
-  "version": "2.4.1",
+  "version": "2.6.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",
@@ -32,7 +32,7 @@
     "typescript": "^5.0.4"
   },
   "types": "types",
-  "gitHead": "aa24e36fb6be2ad0113d13a1bda6d8d8b04bd77e",
+  "gitHead": "ce98ce03662c08e040ad7f9cb93cc0f48e11edb9",
   "scripts": {
     "types": "tsc --noEmit types/index.d.ts"
   },

package/src/object/merge.js

@@ -2,10 +2,10 @@ import { isArray, isPlainObject } from '../base/index.js'
 import { clone } from './clone.js'
 
 export function merge(target, ...sources) {
-  const mergeIteratively = (target, source, cloneTarget, concat) => {
-    const result = cloneTarget
-      ? clone(target, { shallow: true })
-      : target
+  const mergeIteratively = (target, source, root, concat) => {
+    const result = root
+      ? target
+      : clone(target, { shallow: true })
     for (const key of Object.keys(source)) {
       const to = target[key]
       const from = source[key]
@@ -14,7 +14,7 @@ export function merge(target, ...sources) {
         isArray(to) && isArray(from) ||
         isPlainObject(to) && isPlainObject(from)
       ) {
-        result[key] = mergeValues(to, from, true)
+        result[key] = mergeValues(to, from, false)
       } else {
         // Append non-mergeable values to the end of results.
         result.push(from)
@@ -23,19 +23,19 @@ export function merge(target, ...sources) {
     return result
   }
 
-  const mergeValues = (target, source, cloneTarget) => {
+  const mergeValues = (target, source, root) => {
     if (target && source && target !== source) {
       if (isArray(target) && isArray(source)) {
-        return mergeIteratively(target, source, cloneTarget, true)
+        return mergeIteratively(target, source, root, true)
       } else if (isPlainObject(target) && isPlainObject(source)) {
-        return mergeIteratively(target, source, cloneTarget, false)
+        return mergeIteratively(target, source, root, false)
       }
     }
-    return source
+    return root ? source ?? target : source
   }
 
   for (const source of sources) {
-    mergeValues(target, source, false)
+    target = mergeValues(target, source, true)
   }
   return target
 }

package/src/object/merge.test.js

@@ -55,6 +55,20 @@ describe('merge()', () => {
     expect(merge(names, ages, heights)).toEqual(expected)
   })
 
+  it('should handle plain values', () => {
+    expect(merge(true, false)).toEqual(false)
+    expect(merge(10, 0)).toEqual(0)
+    expect(merge(0, 10)).toEqual(10)
+    expect(merge('foo', 'bar')).toEqual('bar')
+  })
+
+  it('should not override values with nullish values at root level', () => {
+    expect(merge({}, null)).toEqual({})
+    expect(merge([], null)).toEqual([])
+    expect(merge(10, null)).toEqual(10)
+    expect(merge(false, null)).toEqual(false)
+  })
+
   it('should work with multiple arguments', () => {
     const expected = { a: 4 }
     const actual = merge({ a: 1 }, { a: 2 }, { a: 3 }, expected)