Skip to content

Preserve the calendar date when scand matches weekday names #22364

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

Open
NUAAwqy wants to merge 3 commits into
base: master
Choose a base branch
from
+15 −6
Open

Preserve the calendar date when scand matches weekday names #22364

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
df85b6b
Preserve the day of the month when scand matches weekday names
NUAAwqy Oct 28, 2026
3024ccf
Use one explicit weekday parsing regression test
NUAAwqy Oct 28, 2026
cc85226
Write the weekday scand cases out explicitly
NUAAwqy Oct 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/scripting_api/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,17 +474,14 @@ class Util {
data.month = parseInt(value) - 1;
},
},
// Weekday names are matched but must not set the day of the month.
dddd: {
pattern: `(${days.join("|")})`,
action: (value, data) => {
data.day = days.indexOf(value);
},
action: () => {},
},
ddd: {
pattern: `(${days.map(day => day.substring(0, 3)).join("|")})`,
action: (value, data) => {
data.day = days.findIndex(day => day.substring(0, 3) === value);
},
action: () => {},
},
dd: {
pattern: "(\\d{2})",
Expand Down
12 changes: 12 additions & 0 deletions test/unit/scripting_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1398,6 +1398,18 @@ describe("Scripting", function () {
expect(value).toEqual([15, 16, 21]);
});

it("should preserve the day of the month when matching weekday names", async () => {
const value = await myeval(`[
util.scand("yyyy-mm-dd ddd", "2026-10-25 Sun").getDate(),
util.scand("yyyy-mm-dd dddd", "2026-10-25 Sunday").getDate(),
util.scand("ddd yyyy-mm-dd", "Sun 2026-10-25").getDate(),
util.scand("dddd yyyy-mm-dd", "Sunday 2026-10-25").getDate(),
util.scand("yyyy-mm-dd ddd", "2026-10-31 Sat").getDate(),
util.scand("ddd yyyy-mm-dd", "Sat 2026-10-31").getDate(),
]`);
expect(value).toEqual([25, 25, 25, 25, 31, 31]);
});

it("should handle a format with repeated specifiers", async () => {
const cFormat = "Hm".repeat(40);
const cDate = `${"1".repeat(84)}x`;
Expand Down