Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

find diff by duration hash instead of using repeated addition to cursor #1340

Merged
merged 3 commits into from Dec 6, 2022
Merged

find diff by duration hash instead of using repeated addition to cursor #1340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f06306
find diff by duration hash instead of using cursor
dobon Dec 3, 2022
f4d4c7d
fix code coverage by removing redundant highWater adjustment
dobon Dec 3, 2022
156cb4d
less changes, same effect.
dobon Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/impl/diff.js
View file
Open in desktop
Expand Up @@ -22,23 +22,22 @@ function highOrderDiffs(cursor, later, units) {
];

const results = {};
const earlier = cursor;
let lowestOrder, highWater;

for (const [unit, differ] of differs) {
if (units.indexOf(unit) >= 0) {
lowestOrder = unit;

let delta = differ(cursor, later);
highWater = cursor.plus({ [unit]: delta });
results[unit] = differ(cursor, later);
highWater = earlier.plus(results);

if (highWater > later) {
cursor = cursor.plus({ [unit]: delta - 1 });
delta -= 1;
results[unit]--;
cursor = earlier.plus(results);
} else {
cursor = highWater;
}

results[unit] = delta;
}
}

Expand Down
14 changes: 12 additions & 2 deletions test/datetime/diff.test.js
View file
Open in desktop
Expand Up @@ -295,14 +295,24 @@ test("DateTime#diff results in a duration with the same locale", () => {

// see https://github.com/moment/luxon/issues/487
test("DateTime#diff results works when needing to backtrack months", () => {
const left = DateTime.fromJSDate(new Date(1554036127038));
const right = DateTime.fromJSDate(new Date(1554122527128));
const left = DateTime.fromJSDate(new Date(1554036127038)); // 2019-03-31T12:42:07.038Z
const right = DateTime.fromJSDate(new Date(1554122527128)); // 2019-04-01T12:42:07.128Z

const diff = right.diff(left, ["months", "days", "hours"]);
expect(diff.months).toBe(0);
expect(diff.days).toBe(1);
});

// see https://github.com/moment/luxon/issues/1301
test("DateTime#diff handles Feb-29 edge case logic for higher order units in a manner consistent with DateTime#plus", () => {
const left = DateTime.fromISO("2020-02-29");
const right = DateTime.fromISO("2021-04-01");

const diff = right.diff(left, ["years", "months", "days"]);
expect(diff.days).toBe(3);
expect(left.plus(diff).equals(right)).toBe(true);
});

//------
// diffNow
//-------
Expand Down