From 5e8fc973c4c7aa3f1ef09c82d3ba8042d039271d Mon Sep 17 00:00:00 2001 From: Elena-brv Date: Thu, 27 Aug 2020 22:03:42 +0300 Subject: [PATCH 1/2] solution --- package.json | 2 +- src/deepEqual.js | 30 +++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 29cd1e0..d09183b 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "license": "GPL-3.0", "devDependencies": { "@mate-academy/eslint-config": "*", - "@mate-academy/scripts": "^0.3.5", + "@mate-academy/scripts": "^0.6.4", "eslint": "^5.16.0", "eslint-plugin-jest": "^22.4.1", "eslint-plugin-node": "^8.0.1", diff --git a/src/deepEqual.js b/src/deepEqual.js index 860208b..6ba59bd 100644 --- a/src/deepEqual.js +++ b/src/deepEqual.js @@ -20,7 +20,35 @@ * @return {boolean} */ function deepEqual(a, b) { - // write code here + if (a === null && b === null) { + return true; + } else if ((a === null && b !== null) || (a !== null && b === null)) { + return false; + } + + if (typeof a !== 'object' || typeof b !== 'object') { + return a === b; + } + + if (Object.keys(a).length !== Object.keys(b).length) { + return false; + } + + for (const key in a) { + if (!b.hasOwnProperty(key)) { + return false; + } else if (typeof (a[key]) !== 'object' && a[key] !== b[key]) { + return false; + } else if (typeof (a[key]) === 'object') { + const result = deepEqual(a[key], b[key]); + + if (!result) { + return false; + } + } + } + + return true; } module.exports = deepEqual; From f0ff1c070e49e36c82556b31d70b228f1274b714 Mon Sep 17 00:00:00 2001 From: Elena-brv Date: Fri, 28 Aug 2020 09:49:06 +0300 Subject: [PATCH 2/2] fixed --- src/deepEqual.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/deepEqual.js b/src/deepEqual.js index 6ba59bd..9db8527 100644 --- a/src/deepEqual.js +++ b/src/deepEqual.js @@ -20,9 +20,11 @@ * @return {boolean} */ function deepEqual(a, b) { - if (a === null && b === null) { + if (a === b) { return true; - } else if ((a === null && b !== null) || (a !== null && b === null)) { + } + + if (a === null || b === null) { return false; } @@ -37,9 +39,7 @@ function deepEqual(a, b) { for (const key in a) { if (!b.hasOwnProperty(key)) { return false; - } else if (typeof (a[key]) !== 'object' && a[key] !== b[key]) { - return false; - } else if (typeof (a[key]) === 'object') { + } else { const result = deepEqual(a[key], b[key]); if (!result) {