chrono-node
Advanced tools
Comparing version 2.3.1 to 2.3.2
@@ -29,3 +29,3 @@ "use strict"; | ||
if (result.start.isOnlyWeekdayComponent() && refMoment.isAfter(result.start.dayjs())) { | ||
if (refMoment.day() > result.start.get("weekday")) { | ||
if (refMoment.day() >= result.start.get("weekday")) { | ||
refMoment = refMoment.day(result.start.get("weekday") + 7); | ||
@@ -32,0 +32,0 @@ } |
@@ -18,3 +18,3 @@ { | ||
"license": "MIT", | ||
"version": "2.3.1", | ||
"version": "2.3.2", | ||
"directories": { | ||
@@ -21,0 +21,0 @@ "source": "./src", |
@@ -37,3 +37,3 @@ /* | ||
if (result.start.isOnlyWeekdayComponent() && refMoment.isAfter(result.start.dayjs())) { | ||
if (refMoment.day() > result.start.get("weekday")) { | ||
if (refMoment.day() >= result.start.get("weekday")) { | ||
refMoment = refMoment.day(result.start.get("weekday") + 7); | ||
@@ -40,0 +40,0 @@ } else { |
@@ -367,2 +367,12 @@ import * as chrono from "../../src"; | ||
}); | ||
testSingleCase(chrono, "17 August 2013 - 19 August 2013", (result) => { | ||
expect(result.start.get("year")).toBe(2013); | ||
expect(result.start.get("month")).toBe(8); | ||
expect(result.start.get("day")).toBe(17); | ||
expect(result.end.get("year")).toBe(2013); | ||
expect(result.end.get("month")).toBe(8); | ||
expect(result.end.get("day")).toBe(19); | ||
}); | ||
}); | ||
@@ -369,0 +379,0 @@ |
@@ -206,2 +206,13 @@ import * as chrono from "../../src"; | ||
}); | ||
testSingleCase(chrono, "1/8 at 12pm", new Date("Sep 25 2021 12:00:00"), { forwardDate: true }, (result) => { | ||
expect(result.text).toBe("1/8 at 12pm"); | ||
expect(result.start).not.toBeNull(); | ||
expect(result.start.get("year")).toBe(2022); | ||
expect(result.start.get("month")).toBe(1); | ||
expect(result.start.get("day")).toBe(8); | ||
expect(result.start).toBeDate(new Date(2022, 1 - 1, 8, 12)); | ||
}); | ||
}); |
@@ -23,26 +23,2 @@ import * as chrono from "../../src"; | ||
testSingleCase( | ||
chrono.casual, | ||
"Monday (forward dates only)", | ||
new Date(2012, 7, 9), | ||
{ forwardDate: true }, | ||
(result) => { | ||
expect(result.index).toBe(0); | ||
expect(result.text).toBe("Monday"); | ||
expect(result.start).not.toBeNull(); | ||
expect(result.start.get("year")).toBe(2012); | ||
expect(result.start.get("month")).toBe(8); | ||
expect(result.start.get("day")).toBe(13); | ||
expect(result.start.get("weekday")).toBe(1); | ||
expect(result.start.isCertain("day")).toBe(false); | ||
expect(result.start.isCertain("month")).toBe(false); | ||
expect(result.start.isCertain("year")).toBe(false); | ||
expect(result.start.isCertain("weekday")).toBe(true); | ||
expect(result.start).toBeDate(new Date(2012, 7, 13, 12)); | ||
} | ||
); | ||
testSingleCase(chrono.casual, "Thursday", new Date(2012, 7, 9), (result) => { | ||
@@ -186,5 +162,29 @@ expect(result.index).toBe(0); | ||
test("Test - forward dates only option", function () { | ||
test("Test - forward dates only option", () => { | ||
testSingleCase( | ||
chrono.casual, | ||
"Monday (forward dates only)", | ||
new Date(2012, 7, 9), | ||
{ forwardDate: true }, | ||
(result) => { | ||
expect(result.index).toBe(0); | ||
expect(result.text).toBe("Monday"); | ||
expect(result.start).not.toBeNull(); | ||
expect(result.start.get("year")).toBe(2012); | ||
expect(result.start.get("month")).toBe(8); | ||
expect(result.start.get("day")).toBe(13); | ||
expect(result.start.get("weekday")).toBe(1); | ||
expect(result.start.isCertain("day")).toBe(false); | ||
expect(result.start.isCertain("month")).toBe(false); | ||
expect(result.start.isCertain("year")).toBe(false); | ||
expect(result.start.isCertain("weekday")).toBe(true); | ||
expect(result.start).toBeDate(new Date(2012, 7, 13, 12)); | ||
} | ||
); | ||
testSingleCase( | ||
chrono.casual, | ||
"this Friday to this Monday", | ||
@@ -224,2 +224,46 @@ new Date(2016, 8 - 1, 4), | ||
); | ||
testSingleCase( | ||
chrono.casual, | ||
"sunday morning", | ||
new Date("August 15, 2021, 20:00"), | ||
{ forwardDate: true }, | ||
(result) => { | ||
expect(result.index).toBe(0); | ||
expect(result.text).toBe("sunday morning"); | ||
expect(result.start).not.toBeNull(); | ||
expect(result.start.get("year")).toBe(2021); | ||
expect(result.start.get("month")).toBe(8); | ||
expect(result.start.get("day")).toBe(22); | ||
expect(result.start.get("weekday")).toBe(0); | ||
expect(result.start.isCertain("day")).toBe(false); | ||
expect(result.start.isCertain("month")).toBe(false); | ||
expect(result.start.isCertain("year")).toBe(false); | ||
expect(result.start.isCertain("weekday")).toBe(true); | ||
expect(result.start).toBeDate(new Date(2021, 8 - 1, 22, 6)); | ||
} | ||
); | ||
testSingleCase( | ||
chrono.casual, | ||
"vacation monday - friday", | ||
new Date("thursday 13 June 2019"), | ||
{ forwardDate: true }, | ||
(result) => { | ||
expect(result.text).toBe("monday - friday"); | ||
expect(result.start).not.toBeNull(); | ||
expect(result.start.get("year")).toBe(2019); | ||
expect(result.start.get("month")).toBe(6); | ||
expect(result.start.get("day")).toBe(17); | ||
expect(result.end).not.toBeNull(); | ||
expect(result.end.get("year")).toBe(2019); | ||
expect(result.end.get("month")).toBe(6); | ||
expect(result.end.get("day")).toBe(21); | ||
} | ||
); | ||
}); |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
1347384
26494