Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions src/locales/zh/hans/parsers/ZHHansAgoFormatParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ const NUMBER_GROUP = 1;
const UNIT_GROUP = 2;

export default class ZHHansAgoFormatParser extends AbstractParserWithWordBoundaryChecking {
patternLeftBoundary(): string {
// Return a capturing group to ensure that the match index is correct in the base class
// while avoiding matching CJK characters as word boundaries.
return "()";
}

innerPattern(): RegExp {
return PATTERN;
}
Expand Down
6 changes: 6 additions & 0 deletions src/locales/zh/hans/parsers/ZHHansDateParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ const MONTH_GROUP = 2;
const DAY_GROUP = 3;

export default class ZHHansDateParser extends AbstractParserWithWordBoundaryChecking {
patternLeftBoundary(): string {
// Return a capturing group to ensure that the match index is correct in the base class
// while avoiding matching CJK characters as word boundaries.
return "()";
}

innerPattern() {
// prettier-ignore
return new RegExp(
Expand Down
6 changes: 6 additions & 0 deletions src/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ const NUMBER_GROUP = 1;
const UNIT_GROUP = 2;

export default class ZHHansDeadlineFormatParser extends AbstractParserWithWordBoundaryChecking {
patternLeftBoundary(): string {
// Return a capturing group to ensure that the match index is correct in the base class
// while avoiding matching CJK characters as word boundaries.
return "()";
}

innerPattern(): RegExp {
return PATTERN;
}
Expand Down
6 changes: 6 additions & 0 deletions src/locales/zh/hant/parsers/ZHHantAgoFormatParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ const NUMBER_GROUP = 1;
const UNIT_GROUP = 2;

export default class ZHHantAgoFormatParser extends AbstractParserWithWordBoundaryChecking {
patternLeftBoundary(): string {
// Return a capturing group to ensure that the match index is correct in the base class
// while avoiding matching CJK characters as word boundaries.
return "()";
}

innerPattern(): RegExp {
return PATTERN;
}
Expand Down
6 changes: 6 additions & 0 deletions src/locales/zh/hant/parsers/ZHHantDateParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ const MONTH_GROUP = 2;
const DAY_GROUP = 3;

export default class ZHHantDateParser extends AbstractParserWithWordBoundaryChecking {
patternLeftBoundary(): string {
// Return a capturing group to ensure that the match index is correct in the base class
// while avoiding matching CJK characters as word boundaries.
return "()";
}

innerPattern() {
// prettier-ignore
return new RegExp(
Expand Down
6 changes: 6 additions & 0 deletions src/locales/zh/hant/parsers/ZHHantDeadlineFormatParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ const NUMBER_GROUP = 1;
const UNIT_GROUP = 2;

export default class ZHHantDeadlineFormatParser extends AbstractParserWithWordBoundaryChecking {
patternLeftBoundary(): string {
// Return a capturing group to ensure that the match index is correct in the base class
// while avoiding matching CJK characters as word boundaries.
return "()";
}

innerPattern(): RegExp {
return PATTERN;
}
Expand Down
39 changes: 39 additions & 0 deletions test/zh/hans/zh_hans_ago.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,42 @@ test("Test - Simplified Chinese Ago Expression", function () {
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});
});

test("Test - Ago expression at the beginning of the text", function () {
// The leading Chinese numeral must not be consumed as a word boundary.
testSingleCase(chrono.zh.hans, "十五天前", new Date(2012, 7, 10, 12, 14), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("十五天前");

const resultDate = result.start.date();
const expectDate = new Date(2012, 6, 26, 12);
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});

testSingleCase(chrono.zh.hans, "二十天前", new Date(2012, 7, 10, 12, 14), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("二十天前");

const resultDate = result.start.date();
const expectDate = new Date(2012, 6, 21, 12);
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});

testSingleCase(chrono.zh.hans, "三十分钟前", new Date(2012, 7, 10, 12, 14), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("三十分钟前");

const resultDate = result.start.date();
const expectDate = new Date(2012, 7, 10, 11, 44);
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});

testSingleCase(chrono.zh.hans, "十天前", new Date(2012, 7, 10, 12, 14), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("十天前");

const resultDate = result.start.date();
const expectDate = new Date(2012, 6, 31, 12);
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});
});
40 changes: 40 additions & 0 deletions test/zh/hans/zh_hans_date.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,43 @@ test("Test - Range Expression", function () {
}
});
});

test("Test - Date expression at the beginning of the text", function () {
// The leading Chinese numeral must not be consumed as a word boundary.
testSingleCase(chrono.zh.hans, "十一月十日", new Date(2012, 8 - 1, 10), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("十一月十日");

expect(result.start).not.toBeNull();
expect(result.start.get("year")).toBe(2012);
expect(result.start.get("month")).toBe(11);
expect(result.start.get("day")).toBe(10);

const resultDate = result.start.date();
const expectDate = new Date(2012, 11 - 1, 10, 12);
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});

testSingleCase(chrono.zh.hans, "十二月十日", new Date(2012, 8 - 1, 10), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("十二月十日");

expect(result.start).not.toBeNull();
expect(result.start.get("year")).toBe(2012);
expect(result.start.get("month")).toBe(12);
expect(result.start.get("day")).toBe(10);

const resultDate = result.start.date();
const expectDate = new Date(2012, 12 - 1, 10, 12);
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});

testSingleCase(chrono.zh.hans, "十月十日", new Date(2012, 8 - 1, 10), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("十月十日");

expect(result.start).not.toBeNull();
expect(result.start.get("month")).toBe(10);
expect(result.start.get("day")).toBe(10);
});
});
30 changes: 30 additions & 0 deletions test/zh/hans/zh_hans_deadline.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,33 @@ test("Test - Untested suffix", function () {
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});
});

test("Test - Deadline expression at the beginning of the text", function () {
// The leading Chinese numeral must not be consumed as a word boundary.
testSingleCase(chrono.zh.hans, "十五天后", new Date(2012, 7, 10, 12, 14), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("十五天后");

const resultDate = result.start.date();
const expectDate = new Date(2012, 7, 25, 12);
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});

testSingleCase(chrono.zh.hans, "二十天后", new Date(2012, 7, 10, 12, 14), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("二十天后");

const resultDate = result.start.date();
const expectDate = new Date(2012, 7, 30, 12);
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});

testSingleCase(chrono.zh.hans, "十天后", new Date(2012, 7, 10, 12, 14), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("十天后");

const resultDate = result.start.date();
const expectDate = new Date(2012, 7, 20, 12);
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});
});
39 changes: 39 additions & 0 deletions test/zh/hant/zh_hant_ago.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,42 @@ test("Test - Traditional Chinese Ago Expression", function () {
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});
});

test("Test - Ago expression at the beginning of the text", function () {
// The leading Chinese numeral must not be consumed as a word boundary.
testSingleCase(chrono.zh.hant, "十五天前", new Date(2012, 7, 10, 12, 14), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("十五天前");

const resultDate = result.start.date();
const expectDate = new Date(2012, 6, 26, 12);
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});

testSingleCase(chrono.zh.hant, "二十天前", new Date(2012, 7, 10, 12, 14), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("二十天前");

const resultDate = result.start.date();
const expectDate = new Date(2012, 6, 21, 12);
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});

testSingleCase(chrono.zh.hant, "三十分鐘前", new Date(2012, 7, 10, 12, 14), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("三十分鐘前");

const resultDate = result.start.date();
const expectDate = new Date(2012, 7, 10, 11, 44);
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});

testSingleCase(chrono.zh.hant, "十天前", new Date(2012, 7, 10, 12, 14), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("十天前");

const resultDate = result.start.date();
const expectDate = new Date(2012, 6, 31, 12);
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});
});
40 changes: 40 additions & 0 deletions test/zh/hant/zh_hant_date.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,43 @@ test("Test - Range Expression", function () {
}
});
});

test("Test - Date expression at the beginning of the text", function () {
// The leading Chinese numeral must not be consumed as a word boundary.
testSingleCase(chrono.zh.hant, "十一月十日", new Date(2012, 8 - 1, 10), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("十一月十日");

expect(result.start).not.toBeNull();
expect(result.start.get("year")).toBe(2012);
expect(result.start.get("month")).toBe(11);
expect(result.start.get("day")).toBe(10);

const resultDate = result.start.date();
const expectDate = new Date(2012, 11 - 1, 10, 12);
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});

testSingleCase(chrono.zh.hant, "十二月十日", new Date(2012, 8 - 1, 10), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("十二月十日");

expect(result.start).not.toBeNull();
expect(result.start.get("year")).toBe(2012);
expect(result.start.get("month")).toBe(12);
expect(result.start.get("day")).toBe(10);

const resultDate = result.start.date();
const expectDate = new Date(2012, 12 - 1, 10, 12);
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});

testSingleCase(chrono.zh.hant, "十月十日", new Date(2012, 8 - 1, 10), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("十月十日");

expect(result.start).not.toBeNull();
expect(result.start.get("month")).toBe(10);
expect(result.start.get("day")).toBe(10);
});
});
30 changes: 30 additions & 0 deletions test/zh/hant/zh_hant_deadline.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,33 @@ test("Test - Single Expression", function () {
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});
});

test("Test - Deadline expression at the beginning of the text", function () {
// The leading Chinese numeral must not be consumed as a word boundary.
testSingleCase(chrono.zh.hant, "十五天後", new Date(2012, 7, 10, 12, 14), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("十五天後");

const resultDate = result.start.date();
const expectDate = new Date(2012, 7, 25, 12);
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});

testSingleCase(chrono.zh.hant, "二十天後", new Date(2012, 7, 10, 12, 14), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("二十天後");

const resultDate = result.start.date();
const expectDate = new Date(2012, 7, 30, 12);
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});

testSingleCase(chrono.zh.hant, "十天後", new Date(2012, 7, 10, 12, 14), (result) => {
expect(result.index).toBe(0);
expect(result.text).toBe("十天後");

const resultDate = result.start.date();
const expectDate = new Date(2012, 7, 20, 12);
expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
});
});