From dee43694b1cd4ced7eae04996c7c07d1c1051730 Mon Sep 17 00:00:00 2001 From: bnymncoskuner Date: Thu, 20 Aug 2020 08:37:09 +0300 Subject: [PATCH] refactor: improve readability of bool exp --- .../packages/core/src/lib/utils/object-utils.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/utils/object-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/object-utils.ts index 1dd21b208f..d4b475b7da 100644 --- a/npm/ng-packs/packages/core/src/lib/utils/object-utils.ts +++ b/npm/ng-packs/packages/core/src/lib/utils/object-utils.ts @@ -4,7 +4,7 @@ export function deepMerge(target, source) { } else if (isNullOrUndefined(target) && isNullOrUndefined(source)) { return {}; } else { - return isNullOrUndefined(source) ? target : source; + return exists(source) ? source : target; } } @@ -15,14 +15,14 @@ function deepMergeRecursively(target, source) { isArray(target) || isArray(source) || // at least one array !isObject(target) || - !isObject(source); // at least one not an object; + !isObject(source); // at least one not an object /** * if we will not recurse any further, * we will prioritize source if it is a defined value. */ if (shouldNotRecurse) { - return !isNullOrUndefined(source) ? source : target; + return exists(source) ? source : target; } const keysOfTarget = Object.keys(target); @@ -38,6 +38,10 @@ function isNullOrUndefined(obj) { return obj === null || obj === undefined; } +function exists(obj) { + return !isNullOrUndefined(obj); +} + function isObject(obj) { return obj instanceof Object; }