chrono-node 2.7.7 → 2.7.9

package/src/locales/ja/parsers/JPCasualDateParser.ts

@@ -3,14 +3,14 @@ import dayjs from "dayjs";
 import { Meridiem } from "../../../types";
 import * as references from "../../../common/casualReferences";
 
-const PATTERN = /今日|きょう|当日|とうじつ|昨日|きのう|明日|あした|今夜|こんや|今夕|こんゆう|今晩|こんばん|今朝|けさ/i;
+const PATTERN = /今日|きょう|本日|ほんじつ|昨日|きのう|明日|あした|今夜|こんや|今夕|こんゆう|今晩|こんばん|今朝|けさ/i;
 
 function normalizeTextToKanji(text: string) {
     switch (text) {
         case "きょう":
             return "今日";
-        case "とうじつ":
-            return "当日";
+        case "ほんじつ":
+            return "本日";
         case "きのう":
             return "昨日";
         case "あした":
@@ -46,8 +46,8 @@ export default class JPCasualDateParser implements Parser {
             case "明日":
                 return references.tomorrow(context.reference);
 
+            case "本日":
             case "今日":
-            case "当日":
                 return references.today(context.reference);
         }
 

package/src/locales/ja/refiners/JPMergeDateRangeRefiner.ts

@@ -8,6 +8,6 @@ import AbstractMergeDateRangeRefiner from "../../../common/refiners/AbstractMerg
  */
 export default class JPMergeDateRangeRefiner extends AbstractMergeDateRangeRefiner {
     patternBetween(): RegExp {
-        return /^\s*(から|ー|-)\s*$/i;
+        return /^\s*(から|ー|-|～|~)\s*$/i;
     }
 }

package/src/results.ts

@@ -216,7 +216,9 @@ export class ParsingComponents implements ParsedComponents {
         }
 
         const components = new ParsingComponents(reference);
+        components.addTag("result/relativeDate");
         if (fragments["hour"] || fragments["minute"] || fragments["second"]) {
+            components.addTag("result/relativeDateAndTime");
             assignSimilarTime(components, date);
             assignSimilarDate(components, date);
             if (reference.timezoneOffset !== null) {
@@ -293,6 +295,22 @@ export class ParsingResult implements ParsedResult {
         return this.start.date();
     }
 
+    addTag(tag: string): ParsingResult {
+        this.start.addTag(tag);
+        if (this.end) {
+            this.end.addTag(tag);
+        }
+        return this;
+    }
+
+    addTags(tags: string[] | Set<string>): ParsingResult {
+        this.start.addTags(tags);
+        if (this.end) {
+            this.end.addTags(tags);
+        }
+        return this;
+    }
+
     tags(): Set<string> {
         const combinedTags: Set<string> = new Set(this.start.tags());
         if (this.end) {

package/test/en/en_casual.test.ts

@@ -412,6 +412,10 @@ test("Test - Random negative text", () => {
 
     testUnexpectedResult(chrono, "do I have the money");
 
+    testUnexpectedResult(chrono, "I may by here. May the force be with you. Theresa may become PM soon.");
+
+    testUnexpectedResult(chrono, "XXX is set to be released in the second half of 2025");
+
     testUnexpectedResult(chrono.casual, "do I have the money");
 
     testUnexpectedResult(chrono.en.GB, "do I have the money");

package/test/en/en_month.test.ts

@@ -1,5 +1,5 @@
 import * as chrono from "../../src";
-import { testSingleCase } from "../test_util";
+import { testSingleCase, testUnexpectedResult } from "../test_util";
 
 test("Test - Month-Year expression", function () {
     testSingleCase(chrono, "September 2012", (result) => {
@@ -69,6 +69,14 @@ test("Test - Month-Year expression", function () {
         expect(result.start).toBeDate(new Date(2012, 9 - 1, 1, 12));
     });
 
+    testSingleCase(chrono, "in June of 2022", (result) => {
+        expect(result.text).toContain("June of 2022");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2022);
+        expect(result.start.get("month")).toBe(6);
+    });
+
     testSingleCase(chrono, "Statement of comprehensive income for the year ended Dec. 2021", (result) => {
         expect(result.text).toBe("Dec. 2021");
 
@@ -272,3 +280,16 @@ test("Test - Month should not have timezone", () => {
         }
     );
 });
+
+test("Test - Month only in different context", () => {
+    testSingleCase(chrono.casual, "May", (result) => {
+        expect(result.text).toContain("May");
+    });
+
+    testSingleCase(chrono.casual, "in May", (result) => {
+        expect(result.text).toContain("May");
+    });
+
+    testUnexpectedResult(chrono.casual, "The mountain may not move");
+    testUnexpectedResult(chrono.casual, "May not be correct");
+});

package/test/en/en_slash.test.ts

@@ -17,6 +17,7 @@ test("Test - Single Expression (MM/dd/yyyy)", function () {
 
         expect(result.index).toBe(0);
         expect(result.text).toBe("8/10/2012");
+        expect(result.tags()).toContain("parser/SlashDateFormatParser");
 
         expect(result.start.isCertain("day")).toBe(true);
         expect(result.start.isCertain("month")).toBe(true);
@@ -161,11 +162,13 @@ test("Test - Range Expression", function () {
     testSingleCase(chrono.en, "8/10/2012 - 8/15/2012", new Date(2012, 7, 10), (result) => {
         expect(result.index).toBe(0);
         expect(result.text).toBe("8/10/2012 - 8/15/2012");
+        expect(result.tags()).toContain("parser/SlashDateFormatParser");
 
         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(10);
+        expect(result.start.tags()).toContain("parser/SlashDateFormatParser");
 
         expect(result.start).toBeDate(new Date(2012, 8 - 1, 10, 12));
 
@@ -173,6 +176,7 @@ test("Test - Range Expression", function () {
         expect(result.end.get("year")).toBe(2012);
         expect(result.end.get("month")).toBe(8);
         expect(result.end.get("day")).toBe(15);
+        expect(result.end.tags()).toContain("parser/SlashDateFormatParser");
 
         expect(result.end).toBeDate(new Date(2012, 8 - 1, 15, 12));
     });

package/test/en/en_time_exp.test.ts

@@ -21,6 +21,9 @@ test("Test - Time expression", function () {
         expect(result.start.get("minute")).toBe(32);
         expect(result.start.get("second")).toBe(13);
         expect(result.start.get("meridiem")).toBe(Meridiem.PM);
+
+        expect(result.tags()).toContain("parser/ENTimeExpressionParser");
+        expect(result.start.tags()).toContain("parser/ENTimeExpressionParser");
     });
 });
 
@@ -35,6 +38,9 @@ test("Test - Time expression after date", function () {
         expect(result.start.get("hour")).toBe(14);
         expect(result.start.get("minute")).toBe(15);
         expect(result.start.get("meridiem")).toBe(Meridiem.PM);
+
+        expect(result.tags()).toContain("parser/ENTimeExpressionParser");
+        expect(result.start.tags()).toContain("parser/ENTimeExpressionParser");
     });
 
     testSingleCase(chrono, "05/31/2024.14:15", new Date(2016, 10 - 1, 1, 8), (result, text) => {
@@ -115,16 +121,19 @@ test("Test - Time expression before date", () => {
 test("Test - Time range expression", function () {
     testSingleCase(chrono, "10:00:00 - 21:45:00", new Date(2016, 10 - 1, 1, 8), (result, text) => {
         expect(result.text).toBe(text);
+        expect(result.tags()).toContain("parser/ENTimeExpressionParser");
 
         expect(result.start.get("hour")).toBe(10);
         expect(result.start.get("minute")).toBe(0);
         expect(result.start.get("second")).toBe(0);
         expect(result.start.get("meridiem")).toBe(Meridiem.AM);
+        expect(result.start.tags()).toContain("parser/ENTimeExpressionParser");
 
         expect(result.end.get("hour")).toBe(21);
         expect(result.end.get("minute")).toBe(45);
         expect(result.end.get("second")).toBe(0);
         expect(result.end.get("meridiem")).toBe(Meridiem.PM);
+        expect(result.end.tags()).toContain("parser/ENTimeExpressionParser");
     });
 
     testSingleCase(chrono, "10:00:00 until 21:45:00", new Date(2016, 10 - 1, 1, 11), (result, text) => {

package/test/en/en_time_units_ago.test.ts

@@ -11,6 +11,7 @@ test("Test - Single Expression", function () {
 
         expect(result.index).toBe(0);
         expect(result.text).toBe("5 days ago");
+        expect(result.tags()).toContain("result/relativeDate");
 
         expect(result.start).toBeDate(new Date(2012, 8 - 1, 5));
     });
@@ -30,6 +31,9 @@ test("Test - Single Expression", function () {
     testSingleCase(chrono, "15 minute ago", new Date(2012, 7, 10, 12, 14), (result) => {
         expect(result.index).toBe(0);
         expect(result.text).toBe("15 minute ago");
+        expect(result.tags()).toContain("result/relativeDate");
+        expect(result.tags()).toContain("result/relativeDateAndTime");
+
         expect(result.start.get("hour")).toBe(11);
         expect(result.start.get("minute")).toBe(59);
         expect(result.start.get("meridiem")).toBe(Meridiem.AM);

package/test/en/en_time_units_casual_relative.test.ts

@@ -5,6 +5,8 @@ import ENTimeUnitCasualRelativeFormatParser from "../../src/locales/en/parsers/E
 test("Test - Positive time units", () => {
     testSingleCase(chrono, "next 2 weeks", new Date(2016, 10 - 1, 1, 12), (result, text) => {
         expect(result.text).toBe(text);
+        expect(result.tags()).toContain("result/relativeDate");
+
         expect(result.start.get("year")).toBe(2016);
         expect(result.start.get("month")).toBe(10);
         expect(result.start.get("day")).toBe(15);
@@ -44,6 +46,9 @@ test("Test - Positive time units", () => {
 
     testSingleCase(chrono, "after an hour", new Date(2016, 10 - 1, 1, 15), (result, text) => {
         expect(result.text).toBe(text);
+        expect(result.tags()).toContain("result/relativeDate");
+        expect(result.tags()).toContain("result/relativeDateAndTime");
+
         expect(result.start.get("year")).toBe(2016);
         expect(result.start.get("month")).toBe(10);
         expect(result.start.get("day")).toBe(1);

package/test/en/en_time_units_later.test.ts

@@ -11,6 +11,7 @@ test("Test - Later Expression", function () {
 
         expect(result.index).toBe(0);
         expect(result.text).toBe("2 days later");
+        expect(result.tags()).toContain("result/relativeDate");
 
         expect(result.start.isCertain("day")).toBe(true);
         expect(result.start.isCertain("month")).toBe(true);

package/test/en/en_time_units_within.test.ts

@@ -6,6 +6,7 @@ test("Test - The normal within expression", () => {
     testSingleCase(chrono, "we have to make something in 5 days.", new Date(2012, 7, 10), (result) => {
         expect(result.index).toBe(26);
         expect(result.text).toBe("in 5 days");
+        expect(result.tags()).toContain("result/relativeDate");
 
         expect(result.start).not.toBeNull();
         expect(result.start.get("year")).toBe(2012);
@@ -412,4 +413,5 @@ test("Test - Forward date option", () => {
 test("Test - Negative cases", () => {
     testUnexpectedResult(chrono, "in am");
     testUnexpectedResult(chrono, "in them");
+    testUnexpectedResult(chrono, "the second half");
 });

package/test/en/en_weekday.test.ts

@@ -219,6 +219,49 @@ test("Test - Weekday casual `Next` guessing", function () {
     }
 });
 
+test("Test - Casual 'weekend' and 'weekday'", () => {
+    {
+        const refDateOnFriday = new Date(2024, 10 - 1, 18, 12, 0);
+        testSingleCase(chrono.casual, "last weekend", refDateOnFriday, (result, text) => {
+            expect(result.text).toBe(text);
+            expect(result.start).toBeDate(new Date(2024, 10 - 1, 13, 12)); // Sunday
+        });
+        testSingleCase(chrono.casual, "this weekend", refDateOnFriday, (result, text) => {
+            expect(result.text).toBe(text);
+            expect(result.start).toBeDate(new Date(2024, 10 - 1, 19, 12)); // Saturday
+        });
+        testSingleCase(chrono.casual, "next weekend", refDateOnFriday, (result, text) => {
+            expect(result.text).toBe(text);
+            expect(result.start).toBeDate(new Date(2024, 10 - 1, 26, 12)); // Saturday
+        });
+    }
+});
+
+test("Test - Casual 'weekday' mentioning", () => {
+    {
+        const refDateOnFriday = new Date(2024, 10 - 1, 18, 12, 0);
+        testSingleCase(chrono.casual, "last weekday", refDateOnFriday, (result, text) => {
+            expect(result.text).toBe(text);
+            expect(result.start).toBeDate(new Date(2024, 10 - 1, 17, 12)); // Thursday
+        });
+        testSingleCase(chrono.casual, "next weekday", refDateOnFriday, (result, text) => {
+            expect(result.text).toBe(text);
+            expect(result.start).toBeDate(new Date(2024, 10 - 1, 21, 12)); // Monday
+        });
+    }
+    {
+        const refDateOnSaturday = new Date(2024, 10 - 1, 19, 12, 0);
+        testSingleCase(chrono.casual, "last weekday", refDateOnSaturday, (result, text) => {
+            expect(result.text).toBe(text);
+            expect(result.start).toBeDate(new Date(2024, 10 - 1, 18, 12)); // Friday
+        });
+        testSingleCase(chrono.casual, "next weekday", refDateOnSaturday, (result, text) => {
+            expect(result.text).toBe(text);
+            expect(result.start).toBeDate(new Date(2024, 10 - 1, 21, 12)); // Monday
+        });
+    }
+});
+
 test("Test - Weekday With Casual Time", function () {
     testSingleCase(chrono.casual, "Lets meet on Tuesday morning", new Date(2015, 3, 18), (result) => {
         expect(result.index).toBe(10);

package/test/ja/ja_casual.test.ts

@@ -10,6 +10,14 @@ test("Test - Single Expression", function () {
         expect(result.text).toBe("きょう");
         expect(result.start).toBeDate(new Date(2012, 8 - 1, 10, 12));
     });
+    testSingleCase(chrono.ja, "本日はお日柄もよく", new Date(2012, 8 - 1, 10, 12), (result) => {
+        expect(result.text).toBe("本日");
+        expect(result.start).toBeDate(new Date(2012, 8 - 1, 10, 12));
+    });
+    testSingleCase(chrono.ja, "ほんじつはお日柄もよく", new Date(2012, 8 - 1, 10, 12), (result) => {
+        expect(result.text).toBe("ほんじつ");
+        expect(result.start).toBeDate(new Date(2012, 8 - 1, 10, 12));
+    });
 
     testSingleCase(chrono.ja, "昨日の全国観測値ランキング", new Date(2012, 8 - 1, 10, 12), (result) => {
         expect(result.text).toBe("昨日");

package/test/ja/ja_standard.test.ts

@@ -213,4 +213,23 @@ test("Test - Range Expression", function () {
 
         expect(result.end).toBeDate(new Date(2014, 1 - 1, 7, 12));
     });
+
+    testSingleCase(chrono.ja, "2013年12月26日 ～ ２０１４年１月７日", new Date(2012, 8 - 1, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("2013年12月26日 ～ ２０１４年１月７日");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2013);
+        expect(result.start.get("month")).toBe(12);
+        expect(result.start.get("day")).toBe(26);
+
+        expect(result.start).toBeDate(new Date(2013, 12 - 1, 26, 12));
+
+        expect(result.end).not.toBeNull();
+        expect(result.end.get("year")).toBe(2014);
+        expect(result.end.get("month")).toBe(1);
+        expect(result.end.get("day")).toBe(7);
+
+        expect(result.end).toBeDate(new Date(2014, 1 - 1, 7, 12));
+    });
 });