Skip to content

Commit f55b858

Browse files
committed
Remove unnecessary reassignment of lhs/rhs
1 parent 04c06f8 commit f55b858

File tree

4 files changed

+24
-35
lines changed

4 files changed

+24
-35
lines changed

src/added.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,18 @@ const addedDiff = (lhs, rhs) => {
44

55
if (lhs === rhs || !isObject(lhs) || !isObject(rhs)) return {};
66

7-
const l = lhs;
8-
const r = rhs;
97

10-
return Object.keys(r).reduce((acc, key) => {
11-
if (hasOwnProperty(l, key)) {
12-
const difference = addedDiff(l[key], r[key]);
8+
return Object.keys(rhs).reduce((acc, key) => {
9+
if (hasOwnProperty(lhs, key)) {
10+
const difference = addedDiff(lhs[key], rhs[key]);
1311

1412
if (isObject(difference) && isEmpty(difference)) return acc;
1513

1614
acc[key] = difference;
1715
return acc;
1816
}
1917

20-
acc[key] = r[key];
18+
acc[key] = rhs[key];
2119
return acc;
2220
}, makeObjectWithoutPrototype());
2321
};

src/deleted.js

+3-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@ import { isEmpty, isObject, hasOwnProperty, makeObjectWithoutPrototype } from '.
33
const deletedDiff = (lhs, rhs) => {
44
if (lhs === rhs || !isObject(lhs) || !isObject(rhs)) return {};
55

6-
const l = lhs;
7-
const r = rhs;
8-
9-
return Object.keys(l).reduce((acc, key) => {
10-
if (hasOwnProperty(r, key)) {
11-
const difference = deletedDiff(l[key], r[key]);
6+
return Object.keys(lhs).reduce((acc, key) => {
7+
if (hasOwnProperty(rhs, key)) {
8+
const difference = deletedDiff(lhs[key], rhs[key]);
129

1310
if (isObject(difference) && isEmpty(difference)) return acc;
1411

src/diff.js

+10-13
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,30 @@ const diff = (lhs, rhs) => {
55

66
if (!isObject(lhs) || !isObject(rhs)) return rhs; // return updated rhs
77

8-
const l = lhs;
9-
const r = rhs;
10-
11-
const deletedValues = Object.keys(l).reduce((acc, key) => {
12-
if (!hasOwnProperty(r, key)) {
8+
const deletedValues = Object.keys(lhs).reduce((acc, key) => {
9+
if (!hasOwnProperty(rhs, key)) {
1310
acc[key] = undefined;
1411

1512
}
1613

1714
return acc;
1815
}, makeObjectWithoutPrototype());
1916

20-
if (isDate(l) || isDate(r)) {
21-
if (l.valueOf() == r.valueOf()) return {};
22-
return r;
17+
if (isDate(lhs) || isDate(rhs)) {
18+
if (lhs.valueOf() == rhs.valueOf()) return {};
19+
return rhs;
2320
}
2421

25-
return Object.keys(r).reduce((acc, key) => {
26-
if (!hasOwnProperty(l, key)){
27-
acc[key] = r[key]; // return added r key
22+
return Object.keys(rhs).reduce((acc, key) => {
23+
if (!hasOwnProperty(lhs, key)){
24+
acc[key] = rhs[key]; // return added r key
2825
return acc;
2926
}
3027

31-
const difference = diff(l[key], r[key]);
28+
const difference = diff(lhs[key], rhs[key]);
3229

3330
// If the difference is empty, and the lhs is an empty object or the rhs is not an empty object
34-
if (isEmptyObject(difference) && !isDate(difference) && (isEmptyObject(l[key]) || !isEmptyObject(r[key])))
31+
if (isEmptyObject(difference) && !isDate(difference) && (isEmptyObject(lhs[key]) || !isEmptyObject(rhs[key])))
3532
return acc; // return no diff
3633

3734
acc[key] = difference // return updated key

src/updated.js

+7-10
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,17 @@ const updatedDiff = (lhs, rhs) => {
55

66
if (!isObject(lhs) || !isObject(rhs)) return rhs;
77

8-
const l = lhs;
9-
const r = rhs;
10-
11-
if (isDate(l) || isDate(r)) {
12-
if (l.valueOf() == r.valueOf()) return {};
13-
return r;
8+
if (isDate(lhs) || isDate(rhs)) {
9+
if (lhs.valueOf() == rhs.valueOf()) return {};
10+
return rhs;
1411
}
1512

16-
return Object.keys(r).reduce((acc, key) => {
17-
if (hasOwnProperty(l, key)) {
18-
const difference = updatedDiff(l[key], r[key]);
13+
return Object.keys(rhs).reduce((acc, key) => {
14+
if (hasOwnProperty(lhs, key)) {
15+
const difference = updatedDiff(lhs[key], rhs[key]);
1916

2017
// If the difference is empty, and the lhs is an empty object or the rhs is not an empty object
21-
if (isEmptyObject(difference) && !isDate(difference) && (isEmptyObject(l[key]) || !isEmptyObject(r[key])))
18+
if (isEmptyObject(difference) && !isDate(difference) && (isEmptyObject(lhs[key]) || !isEmptyObject(rhs[key])))
2219
return acc; // return no diff
2320

2421
acc[key] = difference;

0 commit comments

Comments
 (0)