@ditojs/utils 2.1.1 → 2.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/utils",
-  "version": "2.1.1",
+  "version": "2.3.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": "b4ff87b7ffa812092a27b6c28a8ab3c5d7d7094d",
+  "gitHead": "81398b333e755f30b2c3c1998c8879a3e87f7873",
   "scripts": {
     "types": "tsc --noEmit types/index.d.ts"
   },

package/src/object/merge.js

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

package/src/object/merge.test.js

@@ -77,7 +77,7 @@ describe('merge()', () => {
 
     expect(source3.a).toStrictEqual([[1, 2, 3]])
     expect(source4.a).toStrictEqual([[4, 5]])
-    expect(actual2.a).toStrictEqual([[4, 5, 3]])
+    expect(actual2.a).toStrictEqual([[1, 2, 3, 4, 5]])
   })
 
   it('should overwrite existing values with `undefined` in objects', () => {
@@ -85,15 +85,15 @@ describe('merge()', () => {
     expect(actual).toStrictEqual({ a: undefined, b: undefined })
   })
 
-  it('should overwrite existing values with `undefined` in arrays', () => {
-    const array1 = [1]
-    array1[2] = 3
+  it('should not overwrite existing values with `undefined` in arrays', () => {
+    const array1 = [1, undefined, 3]
     const actual1 = merge([4, 5, 6], array1)
-    expect(actual1).toStrictEqual([1, 5, 3])
+    expect(actual1).toStrictEqual([4, 5, 6, 1, undefined, 3])
 
-    const array2 = [1, undefined, 3]
+    // eslint-disable-next-line no-sparse-arrays
+    const array2 = [1, , 3]
     const actual2 = merge([4, 5, 6], array2)
-    expect(actual2).toStrictEqual([1, undefined, 3])
+    expect(actual2).toStrictEqual([4, 5, 6, 1, 3])
   })
 
   it('should merge regexps', () => {

package/src/string/format.test.js

@@ -19,7 +19,7 @@ describe('format()', () => {
   it('should use the en-US locale by default', () => {
     expect(format(integer)).toBe('123,456,789')
     expect(format(float)).toBe('123,456.789')
-    expect(format(date)).toBe('June 9, 2012 at 10:45:30 PM')
+    expect(format(date)).toMatch(/^June 9, 2012 at 10:45:30\sPM$/)
   })
 
   it('should format numbers with different locale and default options', () => {
@@ -88,7 +88,7 @@ describe('format()', () => {
           currency: 'EUR'
         }
       })
-    ).toBe('123.456.789,00 €')
+    ).toMatch(/^123\.456\.789,00\s€$/)
     expect(
       format(integer, {
         locale: 'de-CH',
@@ -97,7 +97,7 @@ describe('format()', () => {
           currency: 'CHF'
         }
       })
-    ).toBe('CHF 123’456’789.00')
+    ).toMatch(/^CHF\s123’456’789\.00$/)
     expect(
       format(float, {
         locale: 'de-DE',
@@ -106,7 +106,7 @@ describe('format()', () => {
           currency: 'EUR'
         }
       })
-    ).toBe('123.456,79 €')
+    ).toMatch(/^123\.456,79\s€$/)
     expect(
       format(float, {
         locale: 'de-CH',
@@ -115,7 +115,7 @@ describe('format()', () => {
           currency: 'CHF'
         }
       })
-    ).toBe('CHF 123’456.79')
+    ).toMatch(/^CHF\s123’456\.79$/)
   })
 
   it('should support fine-grained control of `options.date`', () => {
@@ -188,7 +188,7 @@ describe('format()', () => {
     ).toBe('May 24, 2016')
     expect(
       format('2016-05-24T15:54:14.876Z', { date: true, time: true })
-    ).toBe('May 24, 2016 at 05:54:14 PM')
+    ).toMatch(/^May 24, 2016 at 05:54:14\sPM$/)
     expect(format('123456789', { number: true })).toBe('123,456,789')
     expect(format('123456.789', { number: true })).toBe('123,456.789')
     expect(format('Hello World')).toBe('Hello World')

package/src/string/formatDate.test.js

@@ -8,8 +8,8 @@ describe('formatDate()', () => {
   })
 
   it('should use the en-US locale by default', () => {
-    expect(formatDate(date)).toBe('June 9, 2012 at 10:45:30 PM')
-    expect(formatDate(date, {})).toBe('June 9, 2012 at 10:45:30 PM')
+    expect(formatDate(date)).toMatch(/^June 9, 2012 at 10:45:30\sPM$/)
+    expect(formatDate(date, {})).toMatch(/^June 9, 2012 at 10:45:30\sPM$/)
   })
 
   it('should format dates with different locale and default options', () => {