@ditojs/utils 1.3.0 → 1.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/utils",
-  "version": "1.3.0",
+  "version": "1.4.3",
   "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",
@@ -14,11 +14,11 @@
     "src/"
   ],
   "engines": {
-    "node": ">= 14.0.0",
+    "node": ">= 16.0.0",
     "yarn": ">= 1.0.0"
   },
   "browserslist": [
-    "node >= 14",
+    "node >= 16",
     "> 1%",
     "last 2 versions",
     "ie >= 11",
@@ -27,5 +27,5 @@
   "dependencies": {
     "punycode": "^2.1.1"
   },
-  "gitHead": "23aac9eddfc17e3e9367db2b7ac73595bc2bad37"
+  "gitHead": "f2a544aef8ab0a12c7019650cd86558f8365b007"
 }

package/src/object/clone.js

@@ -1,10 +1,10 @@
 import {
-  isArray, isObject, isDate, isRegExp, isFunction
+  isArray, isObject, isDate, isRegExp, isFunction, isPromise
 } from '../base/index.js'
 import { pick } from '../object/index.js'
 
 export function clone(arg, callback = null) {
-  let copy
+  let copy = arg
   if (isDate(arg)) {
     copy = new arg.constructor(+arg)
   } else if (isRegExp(arg)) {
@@ -18,6 +18,9 @@ export function clone(arg, callback = null) {
     // Rely on arg.clone() if it exists and assume it creates an actual clone.
     if (isFunction(arg.clone)) {
       copy = arg.clone()
+    } else if (isPromise(arg)) {
+      // https://stackoverflow.com/questions/37063293/can-i-clone-a-promise
+      copy = arg.then()
     } else {
       // Prevent calling the actual constructor since it is not guaranteed to
       // work as intended here, and only clone the non-inherited own properties.
@@ -26,8 +29,6 @@ export function clone(arg, callback = null) {
         copy[key] = clone(arg[key], callback)
       }
     }
-  } else {
-    copy = arg
   }
   return pick(callback?.(copy), copy)
 }

package/src/object/clone.test.js

@@ -88,4 +88,10 @@ describe('clone()', () => {
     ]
     expect(copy).toStrictEqual(expected)
   })
+
+  it('should handle promises', async () => {
+    const promise = (async () => 1)()
+    const result = clone(promise)
+    expect(await result).toStrictEqual(1)
+  })
 })

package/src/object/merge.test.js

@@ -110,4 +110,16 @@ describe('merge()', () => {
     const expected = { a: new Date(2021, 5, 9) }
     expect(merge({}, source1, source2)).toStrictEqual(expected)
   })
+
+  it('should be fine with nested promises', async () => {
+    const promise1 = (async () => 1)()
+    const promise2 = (async () => 2)()
+    const source1 = { nested: { promise1 } }
+    const source2 = { nested: { promise2 } }
+    const expected = { nested: { promise1, promise2 } }
+    const result = merge({}, source1, source2)
+    expect(result).toStrictEqual(expected)
+    expect(await result.nested.promise1).toStrictEqual(1)
+    expect(await result.nested.promise2).toStrictEqual(2)
+  })
 })