Skip to content

Commit

Permalink
Improve date parsing in the js sandbox
Browse files Browse the repository at this point in the history
If for example dd:mm is failing we just try with d:m which is equivalent
to the regex /d{1,2}:m{1,2}/. This way it allows the user to forget the
0 for the first days/months.
  • Loading branch information
calixteman committed Jun 14, 2024
1 parent e3caa3c commit c14c3cf
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 2 deletions.
19 changes: 17 additions & 2 deletions src/scripting_api/aform.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,26 @@ class AForm {
return date;
}

_parseDate(cFormat, cDate) {
_parseDate(cFormat, cDate, strict = false) {
let date = null;
try {
date = this._util.scand(cFormat, cDate);
} catch {}
if (!date) {
if (strict) {
return null;
}
let format = cFormat;
if (/mm(?!m)/.test(format)) {
format = format.replace("mm", "m");
}
if (/dd(?!d)/.test(format)) {
format = format.replace("dd", "d");
}
try {
date = this._util.scand(format, cDate);
} catch {}
}
if (!date) {
date = Date.parse(cDate);
date = isNaN(date)
Expand Down Expand Up @@ -379,7 +394,7 @@ class AForm {
return;
}

if (this._parseDate(cFormat, value) === null) {
if (this._parseDate(cFormat, value, /* strict = */ true) === null) {
const invalid = GlobalConstants.IDS_INVALID_DATE;
const invalid2 = GlobalConstants.IDS_INVALID_DATE2;
const err = `${invalid} ${this._mkTargetName(
Expand Down
4 changes: 4 additions & 0 deletions test/unit/scripting_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,10 @@ describe("Scripting", function () {
await check("12", "mm", "2000/12/01");
await check("2022", "yyyy", "2022/01/01");
await check("a1$9bbbb21", "dd/mm/yyyy", "2021/09/01");
await check("1/2/2024", "dd/mm/yyyy", "2024/02/01");
await check("01/2/2024", "dd/mm/yyyy", "2024/02/01");
await check("1/02/2024", "dd/mm/yyyy", "2024/02/01");
await check("01/02/2024", "dd/mm/yyyy", "2024/02/01");

// The following test isn't working as expected because
// the quickjs date parser has been replaced by the browser one
Expand Down

0 comments on commit c14c3cf

Please sign in to comment.