chrono-node 2.8.0 → 2.8.1

package/test/de/de_dash.test.ts

@@ -1,16 +1,32 @@
 import * as chrono from "../../src/";
 import { testSingleCase } from "../test_util";
 
-test("Test - Should handle de dayname dd-mm-yy", () => {
-    testSingleCase(chrono.de, "30.12.16", (result) => {
+test("Test - Single date expression with dash notation", () => {
+    testSingleCase(chrono.de, "30-12-16", (result) => {
+        expect(result.start.get("year")).toBe(2016);
+        expect(result.start.get("month")).toBe(12);
+        expect(result.start.get("day")).toBe(30);
+    });
+
+    testSingleCase(chrono.de, "Freitag 30-12-16", (result) => {
+        expect(result.text).toBe("Freitag 30-12-16");
         expect(result.start.get("year")).toBe(2016);
         expect(result.start.get("month")).toBe(12);
         expect(result.start.get("day")).toBe(30);
     });
 });
 
-test("Test - Should handle de weekday dd-mm-yy", () => {
+test("Test - Single date expression with dot notation", () => {
+    testSingleCase(chrono.de, "30.12.16", (result) => {
+        expect(result.start.get("year")).toBe(2016);
+        expect(result.start.get("month")).toBe(12);
+        expect(result.start.get("day")).toBe(30);
+    });
+
     testSingleCase(chrono.de, "Freitag 30.12.16", (result) => {
         expect(result.text).toBe("Freitag 30.12.16");
+        expect(result.start.get("year")).toBe(2016);
+        expect(result.start.get("month")).toBe(12);
+        expect(result.start.get("day")).toBe(30);
     });
 });

package/test/en/en_slash.test.ts

@@ -274,3 +274,11 @@ test("Test - forward dates only option", function () {
         expect(result.start).toBeDate(new Date(2022, 1 - 1, 8, 12));
     });
 });
+
+test("Test - Slash date with an extra chunk", () => {
+    testSingleCase(chrono, "14/4 90", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(4);
+        expect(result.start.get("day")).toBe(14);
+    });
+});

package/test/ja/ja_slash_date_format.test.ts

@@ -0,0 +1,60 @@
+import * as chrono from "../../src";
+import { testSingleCase } from "../test_util";
+
+test("Test - Single Expression", function () {
+    testSingleCase(chrono.ja, "2012/3/31", new Date(2012, 8 - 1, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("2012/3/31");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(3);
+        expect(result.start.get("day")).toBe(31);
+
+        expect(result.start).toBeDate(new Date(2012, 3 - 1, 31, 12));
+    });
+    testSingleCase(chrono.ja, "12/31", new Date(2012, 8 - 1, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("12/31");
+
+        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(31);
+
+        expect(result.start).toBeDate(new Date(2012, 12 - 1, 31, 12));
+    });
+
+    testSingleCase(chrono.ja, "8/5", new Date(2012, 8 - 1, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("8/5");
+
+        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(5);
+
+        expect(result.start).toBeDate(new Date(2012, 8 - 1, 5, 12));
+    });
+});
+
+test("Test - Range Expression", function () {
+    testSingleCase(chrono.ja, "2013/12/26~2014/1/7", new Date(2012, 8 - 1, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("2013/12/26~2014/1/7");
+
+        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));
+    });
+});

package/test/ja/ja_time_exp.test.ts

@@ -0,0 +1,244 @@
+import * as chrono from "../../src";
+import { testSingleCase } from "../test_util";
+
+test("Test - Single Expression", function () {
+    testSingleCase(chrono.ja, "私は午前6時13分に起きた", new Date(2012, 7, 10), (result) => {
+        expect(result.index).toBe(2);
+        expect(result.text).toBe("午前6時13分");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("hour")).toBe(6);
+        expect(result.start.get("minute")).toBe(13);
+
+        const resultDate = result.start.date();
+        const expectDate = new Date(2012, 7, 10, 6, 13);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
+    });
+
+    testSingleCase(chrono.ja, "私は午前8時に起きる", new Date(2012, 7, 10, 12), (result) => {
+        expect(result.index).toBe(2);
+        expect(result.text).toBe("午前8時");
+
+        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.get("hour")).toBe(8);
+
+        const resultDate = result.start.date();
+        const expectDate = new Date(2012, 7, 10, 8);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
+    });
+
+    testSingleCase(chrono.ja, "午後8時", new Date(2012, 8 - 1, 10, 12), (result) => {
+        expect(result.text).toBe("午後8時");
+
+        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.get("hour")).toBe(20);
+
+        const resultDate = result.start.date();
+        const expectDate = new Date(2012, 8 - 1, 10, 20);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
+    });
+    testSingleCase(chrono.ja, "12/9の16:00", new Date(2025, 12 - 1, 10, 12), (result) => {
+        expect(result.text).toBe("12/9の16:00");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2025);
+        expect(result.start.get("month")).toBe(12);
+        expect(result.start.get("day")).toBe(9);
+        expect(result.start.get("hour")).toBe(16);
+
+        const resultDate = result.start.date();
+        const expectDate = new Date(2025, 12 - 1, 9, 16);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
+    });
+    testSingleCase(chrono.ja, "１２月９日の１６：３０", new Date(2025, 12 - 1, 10, 12), (result) => {
+        expect(result.text).toBe("１２月９日の１６：３０");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2025);
+        expect(result.start.get("month")).toBe(12);
+        expect(result.start.get("day")).toBe(9);
+        expect(result.start.get("hour")).toBe(16);
+        expect(result.start.get("minute")).toBe(30);
+
+        const resultDate = result.start.date();
+        const expectDate = new Date(2025, 12 - 1, 9, 16, 30);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
+    });
+});
+
+test("Test - Range Expression", function () {
+    testSingleCase(
+        chrono.ja,
+        "私は本日午前八時十分から午後11時32分までゲームをした",
+        new Date(2012, 7, 10),
+        (result) => {
+            expect(result.index).toBe(2);
+            expect(result.text).toBe("本日午前八時十分から午後11時32分");
+
+            expect(result.start).not.toBeNull();
+            expect(result.start.get("hour")).toBe(8);
+            expect(result.start.get("minute")).toBe(10);
+
+            expect(result.start.isCertain("day")).toBe(true);
+            expect(result.start.isCertain("month")).toBe(true);
+            expect(result.start.isCertain("year")).toBe(true);
+            expect(result.start.isCertain("hour")).toBe(true);
+            expect(result.start.isCertain("minute")).toBe(true);
+            expect(result.start.isCertain("second")).toBe(false);
+            expect(result.start.isCertain("millisecond")).toBe(false);
+
+            let resultDate = result.start.date();
+            let expectDate = new Date(2012, 7, 10, 8, 10);
+            expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
+
+            expect(result.end).not.toBeNull();
+            expect(result.end.get("hour")).toBe(23);
+            expect(result.end.get("minute")).toBe(32);
+
+            expect(result.end.isCertain("day")).toBe(true);
+            expect(result.end.isCertain("month")).toBe(true);
+            expect(result.end.isCertain("year")).toBe(true);
+            expect(result.end.isCertain("hour")).toBe(true);
+            expect(result.end.isCertain("minute")).toBe(true);
+            expect(result.end.isCertain("second")).toBe(false);
+            expect(result.end.isCertain("millisecond")).toBe(false);
+
+            resultDate = result.end.date();
+            expectDate = new Date(2012, 7, 10, 23, 32);
+            expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
+        }
+    );
+
+    testSingleCase(chrono.ja, "6時30分PM-11時PM", new Date(2012, 7, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("6時30分PM-11時PM");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("hour")).toBe(18);
+        expect(result.start.get("minute")).toBe(30);
+        expect(result.start.get("meridiem")).toBe(1);
+
+        let resultDate = result.start.date();
+        let expectDate = new Date(2012, 7, 10, 18, 30);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
+
+        expect(result.end).not.toBeNull();
+        expect(result.end.get("hour")).toBe(23);
+        expect(result.end.get("minute")).toBe(0);
+        expect(result.end.get("meridiem")).toBe(1);
+
+        resultDate = result.end.date();
+        expectDate = new Date(2012, 7, 10, 23, 0);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
+    });
+});
+
+test("Test - Date + Time Expression", function () {
+    testSingleCase(
+        chrono.ja,
+        "僕は2018年11月26日午後三時半五十九秒にゲームを始めた",
+        new Date(2012, 7, 10),
+        (result) => {
+            expect(result.index).toBe(2);
+            expect(result.text).toBe("2018年11月26日午後三時半五十九秒");
+
+            expect(result.start.get("year")).toBe(2018);
+            expect(result.start.get("month")).toBe(11);
+            expect(result.start.get("day")).toBe(26);
+            expect(result.start.get("hour")).toBe(15);
+            expect(result.start.get("minute")).toBe(30);
+            expect(result.start.get("second")).toBe(59);
+            expect(result.start.get("millisecond")).toBe(0);
+            expect(result.start.isCertain("millisecond")).toBe(false);
+
+            const resultDate = result.start.date();
+            const expectDate = new Date(2018, 11 - 1, 26, 15, 30, 59);
+            expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
+        }
+    );
+});
+
+test("Test - Time Expression's Meridiem imply", function () {
+    testSingleCase(chrono.ja, "午後1時から3時", new Date(2012, 7, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("午後1時から3時");
+
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(10);
+        expect(result.start.get("hour")).toBe(13);
+        expect(result.start.get("minute")).toBe(0);
+        expect(result.start.get("second")).toBe(0);
+        expect(result.start.get("millisecond")).toBe(0);
+        expect(result.start.get("meridiem")).toBe(1);
+        expect(result.start.isCertain("meridiem")).toBe(true);
+
+        expect(result.end.get("year")).toBe(2012);
+        expect(result.end.get("month")).toBe(8);
+        expect(result.end.get("day")).toBe(10);
+        expect(result.end.get("hour")).toBe(15);
+        expect(result.end.get("minute")).toBe(0);
+        expect(result.end.get("second")).toBe(0);
+        expect(result.end.get("millisecond")).toBe(0);
+        expect(result.start.get("meridiem")).toBe(1);
+    });
+
+    testSingleCase(chrono.ja, "午後６時半－１１時", new Date(2012, 7, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("午後６時半－１１時");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("hour")).toBe(18);
+        expect(result.start.get("minute")).toBe(30);
+        expect(result.start.get("meridiem")).toBe(1);
+
+        const resultDate = result.start.date();
+        const expectDate = new Date(2012, 7, 10, 18, 30);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
+
+        expect(result.end).not.toBeNull();
+        expect(result.end.get("hour")).toBe(23);
+        expect(result.end.get("minute")).toBe(0);
+        expect(result.end.get("meridiem")).toBe(1);
+    });
+});
+
+test("Test - Random date + time expression", function () {
+    testSingleCase(chrono.ja, "2014年3月5日午前 6 時から 7 時", new Date(2012, 7, 10), (result) => {
+        expect(result.text).toBe("2014年3月5日午前 6 時から 7 時");
+    });
+
+    testSingleCase(chrono.ja, "次の土曜日1時30分二十九秒", new Date(2012, 7, 10), (result) => {
+        expect(result.text).toBe("次の土曜日1時30分二十九秒");
+    });
+
+    testSingleCase(chrono.ja, "昨日午前六時", new Date(2012, 7, 10), (result) => {
+        expect(result.text).toBe("昨日午前六時");
+    });
+
+    testSingleCase(chrono.ja, "６月４日3:00am", new Date(2012, 7, 10), (result) => {
+        expect(result.text).toBe("６月４日3:00am");
+    });
+
+    testSingleCase(chrono.ja, "前の金曜日16時", new Date(2012, 7, 10), (result) => {
+        expect(result.text).toBe("前の金曜日16時");
+    });
+
+    testSingleCase(chrono.ja, "3月17日 20時15", new Date(2012, 7, 10), (result) => {
+        expect(result.text).toBe("3月17日 20時15");
+    });
+
+    testSingleCase(chrono.ja, "10時", new Date(2012, 7, 10), (result) => {
+        expect(result.text).toBe("10時");
+    });
+
+    testSingleCase(chrono.ja, "12時", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("hour")).toBe(12);
+    });
+});

package/test/ja/ja_weekday.test.ts

@@ -0,0 +1,183 @@
+import * as chrono from "../../src";
+import { testSingleCase } from "../test_util";
+
+test("Test - Single Expression", function () {
+    testSingleCase(chrono.ja, "木曜日", new Date(2016, 9 - 1, 2), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("木曜日");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2016);
+        expect(result.start.get("month")).toBe(9);
+        expect(result.start.get("day")).toBe(1);
+        expect(result.start.get("weekday")).toBe(4);
+
+        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);
+
+        const resultDate = result.start.date();
+        const expectDate = new Date(2016, 9 - 1, 1, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
+    });
+
+    testSingleCase(chrono.ja, "前の水曜日", new Date(2016, 9 - 1, 2), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("前の水曜日");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2016);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(31);
+        expect(result.start.get("weekday")).toBe(3);
+
+        const resultDate = result.start.date();
+        const expectDate = new Date(2016, 8 - 1, 31, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
+    });
+});
+
+test("Test - Single Expression - weekday with parentheses", function () {
+    testSingleCase(chrono.ja, "(木)", new Date(2016, 9 - 1, 2), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("(木)");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2016);
+        expect(result.start.get("month")).toBe(9);
+        expect(result.start.get("day")).toBe(1);
+        expect(result.start.get("weekday")).toBe(4);
+
+        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);
+
+        const resultDate = result.start.date();
+        const expectDate = new Date(2016, 9 - 1, 1, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
+    });
+    testSingleCase(chrono.ja, "（木）", new Date(2016, 9 - 1, 2), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("（木）");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2016);
+        expect(result.start.get("month")).toBe(9);
+        expect(result.start.get("day")).toBe(1);
+        expect(result.start.get("weekday")).toBe(4);
+
+        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);
+
+        const resultDate = result.start.date();
+        const expectDate = new Date(2016, 9 - 1, 1, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
+    });
+});
+
+test("Test - forward dates only option", function () {
+    testSingleCase(chrono.ja, "土曜日～月曜日", new Date(2016, 9 - 1, 2), { forwardDate: true }, (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("土曜日～月曜日");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2016);
+        expect(result.start.get("month")).toBe(9);
+        expect(result.start.get("day")).toBe(3);
+        expect(result.start.get("weekday")).toBe(6);
+
+        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);
+
+        let resultDate = result.start.date();
+        let expectDate = new Date(2016, 9 - 1, 3, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
+
+        expect(result.end).not.toBeNull();
+        expect(result.end.get("year")).toBe(2016);
+        expect(result.end.get("month")).toBe(9);
+        expect(result.end.get("day")).toBe(5);
+        expect(result.end.get("weekday")).toBe(1);
+
+        expect(result.end.isCertain("day")).toBe(false);
+        expect(result.end.isCertain("month")).toBe(false);
+        expect(result.end.isCertain("year")).toBe(false);
+        expect(result.end.isCertain("weekday")).toBe(true);
+
+        resultDate = result.end.date();
+        expectDate = new Date(2016, 9 - 1, 5, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
+    });
+});
+
+test("Test - merge date and weekday", function () {
+    testSingleCase(chrono.ja, "8月27日水曜日", new Date(2012, 8 - 1, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("8月27日水曜日");
+
+        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(27);
+        expect(result.start.get("weekday")).toBe(3);
+
+        expect(result.start).toBeDate(new Date(2012, 8 - 1, 27, 12));
+    });
+    testSingleCase(chrono.ja, "8月27日（水）", new Date(2012, 8 - 1, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("8月27日（水）");
+
+        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(27);
+        expect(result.start.get("weekday")).toBe(3);
+
+        expect(result.start).toBeDate(new Date(2012, 8 - 1, 27, 12));
+    });
+    testSingleCase(chrono.ja, "2012/8/27（水）", new Date(2012, 8 - 1, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("2012/8/27（水）");
+
+        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(27);
+        expect(result.start.get("weekday")).toBe(3);
+
+        expect(result.start).toBeDate(new Date(2012, 8 - 1, 27, 12));
+    });
+    testSingleCase(chrono.ja, "１／３０（木）", new Date(2025, 1, 10), (result) => {
+        expect(result.text).toBe("１／３０（木）");
+    });
+    testSingleCase(chrono.ja, "1/30の木曜日", new Date(2025, 1, 10), (result) => {
+        expect(result.text).toBe("1/30の木曜日");
+    });
+    testSingleCase(chrono.ja, "1/30(木)", new Date(2025, 1, 10), (result) => {
+        expect(result.text).toBe("1/30(木)");
+    });
+    testSingleCase(chrono.ja, "１月３０日（木）１４：００", new Date(2025, 1, 10), (result) => {
+        expect(result.text).toBe("１月３０日（木）１４：００");
+    });
+    testSingleCase(chrono.ja, "１月３１日（金）１２：００－１６：００", new Date(2025, 1, 10), (result) => {
+        expect(result.text).toBe("１月３１日（金）１２：００－１６：００");
+    });
+    testSingleCase(
+        chrono.ja,
+        "１月３０日（木）１２：００－１月３１日（金）１６：００",
+        new Date(2025, 1, 10),
+        (result) => {
+            expect(result.text).toBe("１月３０日（木）１２：００－１月３１日（金）１６：００");
+            expect(result.start).toBeDate(new Date(2025, 1 - 1, 30, 12));
+            expect(result.start.get("weekday")).toBe(4);
+            expect(result.end).toBeDate(new Date(2025, 1 - 1, 31, 16));
+            expect(result.end.get("weekday")).toBe(5);
+        }
+    );
+});

package/test/system.test.ts

@@ -9,7 +9,7 @@ import { ParsingComponents } from "../src/";
 
 //-------------------------------------
 
-test("Test - Load modules", function () {
+test("Test - Load modules", () => {
     expect(chrono).toBeDefined();
 
     expect(chrono.Chrono).toBeDefined();