cafe-utility 7.2.0 → 8.0.0

package/index.d.ts

@@ -62,7 +62,9 @@ declare function asArray(value: any): unknown[];
 declare function asObject(value: any): Record<string, unknown>;
 declare function represent(value: any): string;
 declare function expandError(error: any, stackTrace?: boolean): string;
-declare function mergeDeep(target: CafeObject, source: CafeObject): CafeObject;
+declare function deepMergeInPlace<X extends object, Y extends object>(target: X, source: Y): X & Y;
+declare function deepMerge2<X extends object, Y extends object>(target: X, source: Y): X & Y;
+declare function deepMerge3<X extends object, Y extends object, Z extends object>(target: X, sourceA: Y, sourceB: Z): X & Y & Z;
 declare function zip<T>(objects: CafeObject<T>[], reducer: (a: T, b: T) => T): CafeObject<T>;
 declare function zipSum(objects: CafeObject<number>[]): CafeObject<number>;
 declare function asPageNumber(value: any): number;
@@ -394,7 +396,9 @@ export declare const Objects: {
     ensureDeep: typeof ensureDeep;
     replaceDeep: typeof replaceDeep;
     getFirstDeep: typeof getFirstDeep;
-    mergeDeep: typeof mergeDeep;
+    deepMergeInPlace: typeof deepMergeInPlace;
+    deepMerge2: typeof deepMerge2;
+    deepMerge3: typeof deepMerge3;
     mapAllAsync: typeof mapAllAsync;
     cloneWithJson: typeof cloneWithJson;
     sortObject: typeof sortObject;

package/index.js

@@ -292,7 +292,12 @@ function convertBytes(bytes) {
 }
 
 function isObject(value) {
-    return value !== null && typeof value === 'object'
+    return (
+        value !== null &&
+        typeof value === 'object' &&
+        !value.constructor.isBuffer &&
+        value.constructor.name !== 'Uint8Array'
+    )
 }
 
 function isStrictlyObject(value) {
@@ -470,14 +475,14 @@ function expandError(error, stackTrace) {
     return stackTrace && error.stack ? joined + '\n' + error.stack : joined
 }
 
-function mergeDeep(target, source) {
+function deepMergeInPlace(target, source) {
     if (isStrictlyObject(target) && isStrictlyObject(source)) {
         for (const key in source) {
             if (isStrictlyObject(source[key])) {
                 if (!target[key]) {
                     target[key] = {}
                 }
-                mergeDeep(target[key], source[key])
+                deepMergeInPlace(target[key], source[key])
             } else if (Array.isArray(source[key])) {
                 target[key] = [...source[key]]
             } else {
@@ -488,6 +493,21 @@ function mergeDeep(target, source) {
     return target
 }
 
+function deepMerge2(target, source) {
+    const result = {}
+    deepMergeInPlace(result, target)
+    deepMergeInPlace(result, source)
+    return result
+}
+
+function deepMerge3(target, sourceA, sourceB) {
+    const result = {}
+    deepMergeInPlace(result, target)
+    deepMergeInPlace(result, sourceA)
+    deepMergeInPlace(result, sourceB)
+    return result
+}
+
 function zip(objects, reducer) {
     const result = {}
     for (const object of objects) {
@@ -2229,7 +2249,9 @@ exports.Objects = {
     ensureDeep,
     replaceDeep,
     getFirstDeep,
-    mergeDeep,
+    deepMergeInPlace,
+    deepMerge2,
+    deepMerge3,
     mapAllAsync,
     cloneWithJson,
     sortObject,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cafe-utility",
-    "version": "7.2.0",
+    "version": "8.0.0",
     "description": "",
     "main": "index.js",
     "exports": {
@@ -14,5 +14,5 @@
     "scripts": {},
     "keywords": [],
     "author": "",
-    "license": "ISC"
+    "license": "MIT"
 }