chrono-node 2.7.6 → 2.7.7

package/test/en/en_slash.test.ts

@@ -8,31 +8,7 @@ test("Test - Parsing Offset Expression", function () {
     });
 });
 
-test("Test - Single Expression", function () {
-    testSingleCase(chrono, "The event is going ahead (04/2016)", new Date(2012, 7, 10), (result) => {
-        expect(result.start).not.toBeNull();
-        expect(result.start.get("year")).toBe(2016);
-        expect(result.start.get("month")).toBe(4);
-        expect(result.start.get("day")).toBe(1);
-
-        expect(result.index).toBe(26);
-        expect(result.text).toBe("04/2016");
-
-        expect(result.start).toBeDate(new Date(2016, 4 - 1, 1, 12));
-    });
-
-    testSingleCase(chrono, "Published: 06/2004", new Date(2012, 7, 10), (result) => {
-        expect(result.start).not.toBeNull();
-        expect(result.start.get("year")).toBe(2004);
-        expect(result.start.get("month")).toBe(6);
-        expect(result.start.get("day")).toBe(1);
-
-        expect(result.index).toBe(11);
-        expect(result.text).toBe("06/2004");
-
-        expect(result.start).toBeDate(new Date(2004, 6 - 1, 1, 12));
-    });
-
+test("Test - Single Expression (MM/dd/yyyy)", function () {
     testSingleCase(chrono, "8/10/2012", new Date(2012, 7, 10), (result) => {
         expect(result.start).not.toBeNull();
         expect(result.start.get("year")).toBe(2012);
@@ -61,22 +37,6 @@ test("Test - Single Expression", function () {
         expect(result.start).toBeDate(new Date(2012, 8 - 1, 1, 12));
     });
 
-    testSingleCase(chrono, "8/10", new Date(2012, 7, 10), (result) => {
-        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.index).toBe(0);
-        expect(result.text).toBe("8/10");
-
-        expect(result.start.isCertain("day")).toBe(true);
-        expect(result.start.isCertain("month")).toBe(true);
-        expect(result.start.isCertain("year")).toBe(false);
-
-        expect(result.start).toBeDate(new Date(2012, 8 - 1, 10, 12));
-    });
-
     testSingleCase(chrono, "The Deadline is 8/10/2012", new Date(2012, 7, 10), (result) => {
         expect(result.index).toBe(16);
         expect(result.text).toBe("8/10/2012");
@@ -103,7 +63,7 @@ test("Test - Single Expression", function () {
     });
 });
 
-test("Test - Single Expression Little-Endian", function () {
+test("Test - Single Expression Little-Endian (dd/MM/yyyy)", function () {
     testSingleCase(chrono.en.GB, "8/10/2012", new Date(2012, 7, 10), (result) => {
         expect(result.start).not.toBeNull();
         expect(result.start.get("year")).toBe(2012);
@@ -153,6 +113,50 @@ test("Test - Single Expression Little-Endian with Month name", function () {
     });
 });
 
+test("Test - Single Expression Shorten (mm/yyyy)", () => {
+    testSingleCase(chrono, "The event is going ahead (04/2016)", new Date(2012, 7, 10), (result) => {
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2016);
+        expect(result.start.get("month")).toBe(4);
+        expect(result.start.get("day")).toBe(1);
+
+        expect(result.index).toBe(26);
+        expect(result.text).toBe("04/2016");
+
+        expect(result.start).toBeDate(new Date(2016, 4 - 1, 1, 12));
+    });
+
+    testSingleCase(chrono, "Published: 06/2004", new Date(2012, 7, 10), (result) => {
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2004);
+        expect(result.start.get("month")).toBe(6);
+        expect(result.start.get("day")).toBe(1);
+
+        expect(result.index).toBe(11);
+        expect(result.text).toBe("06/2004");
+
+        expect(result.start).toBeDate(new Date(2004, 6 - 1, 1, 12));
+    });
+});
+
+test("Test - Single Expression Shorten (dd/mm)", () => {
+    testSingleCase(chrono, "8/10", new Date(2012, 7, 10), (result) => {
+        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.index).toBe(0);
+        expect(result.text).toBe("8/10");
+
+        expect(result.start.isCertain("day")).toBe(true);
+        expect(result.start.isCertain("month")).toBe(true);
+        expect(result.start.isCertain("year")).toBe(false);
+
+        expect(result.start).toBeDate(new Date(2012, 8 - 1, 10, 12));
+    });
+});
+
 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);
@@ -235,6 +239,7 @@ test("Test - Impossible Dates and Unexpected Results", function () {
     testUnexpectedResult(chrono, "06/-31/2022");
     testUnexpectedResult(chrono, "18/13/2022");
     testUnexpectedResult(chrono, "15/28/2022");
+    testUnexpectedResult(chrono, "4/13/1");
 });
 
 test("Test - forward dates only option", function () {

package/test/en/en_time_exp.test.ts

@@ -27,6 +27,11 @@ test("Test - Time expression", function () {
 test("Test - Time expression after date", function () {
     testSingleCase(chrono, "05/31/2024 14:15", new Date(2016, 10 - 1, 1, 8), (result, text) => {
         expect(result.text).toBe(text);
+
+        expect(result.start.get("year")).toBe(2024);
+        expect(result.start.get("month")).toBe(5);
+        expect(result.start.get("day")).toBe(31);
+
         expect(result.start.get("hour")).toBe(14);
         expect(result.start.get("minute")).toBe(15);
         expect(result.start.get("meridiem")).toBe(Meridiem.PM);
@@ -34,6 +39,11 @@ test("Test - Time expression after date", function () {
 
     testSingleCase(chrono, "05/31/2024.14:15", new Date(2016, 10 - 1, 1, 8), (result, text) => {
         expect(result.text).toBe(text);
+
+        expect(result.start.get("year")).toBe(2024);
+        expect(result.start.get("month")).toBe(5);
+        expect(result.start.get("day")).toBe(31);
+
         expect(result.start.get("hour")).toBe(14);
         expect(result.start.get("minute")).toBe(15);
         expect(result.start.get("meridiem")).toBe(Meridiem.PM);
@@ -41,6 +51,11 @@ test("Test - Time expression after date", function () {
 
     testSingleCase(chrono, "05/31/2024:14:15", new Date(2016, 10 - 1, 1, 8), (result, text) => {
         expect(result.text).toBe(text);
+
+        expect(result.start.get("year")).toBe(2024);
+        expect(result.start.get("month")).toBe(5);
+        expect(result.start.get("day")).toBe(31);
+
         expect(result.start.get("hour")).toBe(14);
         expect(result.start.get("minute")).toBe(15);
         expect(result.start.get("meridiem")).toBe(Meridiem.PM);
@@ -48,10 +63,53 @@ test("Test - Time expression after date", function () {
 
     testSingleCase(chrono, "05/31/2024-14:15", new Date(2016, 10 - 1, 1, 8), (result, text) => {
         expect(result.text).toBe(text);
+
+        expect(result.start.get("year")).toBe(2024);
+        expect(result.start.get("month")).toBe(5);
+        expect(result.start.get("day")).toBe(31);
+
+        expect(result.start.get("hour")).toBe(14);
+        expect(result.start.get("minute")).toBe(15);
+        expect(result.start.get("meridiem")).toBe(Meridiem.PM);
+    });
+});
+
+test("Test - Time expression before date", () => {
+    testSingleCase(chrono, "14:15 05/31/2024", new Date(2016, 10 - 1, 1, 8), (result, text) => {
+        expect(result.text).toBe(text);
+
+        expect(result.start.get("year")).toBe(2024);
+        expect(result.start.get("month")).toBe(5);
+        expect(result.start.get("day")).toBe(31);
+
         expect(result.start.get("hour")).toBe(14);
         expect(result.start.get("minute")).toBe(15);
         expect(result.start.get("meridiem")).toBe(Meridiem.PM);
     });
+
+    testSingleCase(chrono, "8:23 AM, Jul 9", new Date(2016, 10 - 1, 1, 8), (result, text) => {
+        expect(result.text).toBe(text);
+
+        expect(result.start.get("year")).toBe(2016);
+        expect(result.start.get("month")).toBe(7);
+        expect(result.start.get("day")).toBe(9);
+
+        expect(result.start.get("hour")).toBe(8);
+        expect(result.start.get("minute")).toBe(23);
+        expect(result.start.get("meridiem")).toBe(Meridiem.AM);
+    });
+
+    testSingleCase(chrono, "8:23 AM ∙ Jul 9", new Date(2016, 10 - 1, 1, 8), (result, text) => {
+        expect(result.text).toBe(text);
+
+        expect(result.start.get("year")).toBe(2016);
+        expect(result.start.get("month")).toBe(7);
+        expect(result.start.get("day")).toBe(9);
+
+        expect(result.start.get("hour")).toBe(8);
+        expect(result.start.get("minute")).toBe(23);
+        expect(result.start.get("meridiem")).toBe(Meridiem.AM);
+    });
 });
 
 test("Test - Time range expression", function () {

package/test/en/en_time_units_ago.test.ts

@@ -312,8 +312,42 @@ test("Test - Strict mode", function () {
     testUnexpectedResult(chrono.strict, "5 h ago", new Date(2012, 7, 10, 12, 14));
 });
 
+test("Test - Forward date", () => {
+    // Note that it is actually impossible for X ago to be "forward dates".
+    // In such situation, we still return the correct actual extracted dates and make sure the option doesn't affect the results.
+    const reference = new Date("2024-09-10T12:00:00");
+    const options = { forwardDate: true };
+
+    testSingleCase(chrono, "2 days ago", reference, options, (result, text) => {
+        expect(result.start.get("year")).toBe(2024);
+        expect(result.start.get("month")).toBe(9);
+        expect(result.start.get("day")).toBe(8);
+    });
+
+    testSingleCase(chrono, "2 weeks ago", reference, options, (result, text) => {
+        expect(result.start.get("year")).toBe(2024);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(27);
+    });
+
+    testSingleCase(chrono, "2 months ago", reference, options, (result, text) => {
+        expect(result.start.get("year")).toBe(2024);
+        expect(result.start.get("month")).toBe(7);
+        expect(result.start.get("day")).toBe(10);
+    });
+
+    testSingleCase(chrono, "2 years ago", reference, options, (result, text) => {
+        expect(result.start.get("year")).toBe(2022);
+        expect(result.start.get("month")).toBe(9);
+        expect(result.start.get("day")).toBe(10);
+    });
+});
+
 test("Test - Negative cases", function () {
     testUnexpectedResult(chrono, "15 hours 29 min");
     testUnexpectedResult(chrono, "a few hour");
     testUnexpectedResult(chrono, "5 days");
+
+    testUnexpectedResult(chrono, "am ago");
+    testUnexpectedResult(chrono, "them ago");
 });

package/test/en/en_time_units_casual_relative.test.ts

@@ -164,4 +164,7 @@ test("Test - Negative cases", () => {
     testUnexpectedResult(chrono.casual, "1 m", new Date(2015, 7 - 1, 10, 12, 14));
     testUnexpectedResult(chrono.casual, "the day", new Date(2015, 7 - 1, 10, 12, 14));
     testUnexpectedResult(chrono.casual, "a day", new Date(2015, 7 - 1, 10, 12, 14));
+
+    testUnexpectedResult(chrono, "+am");
+    testUnexpectedResult(chrono, "+them");
 });

package/test/en/en_time_units_later.test.ts

@@ -354,3 +354,7 @@ test("Test - Plus after reference", () => {
         expect(result.start.get("minute")).toBe(10);
     });
 });
+
+test("Test - Negative cases", () => {
+    testUnexpectedResult(chrono, "tell them later");
+});

package/test/en/en_time_units_within.test.ts

@@ -408,3 +408,8 @@ test("Test - Forward date option", () => {
         expect(result.start.get("day")).toBe(1);
     });
 });
+
+test("Test - Negative cases", () => {
+    testUnexpectedResult(chrono, "in am");
+    testUnexpectedResult(chrono, "in them");
+});

package/test/en/en_year.test.ts

@@ -1,6 +1,6 @@
 import * as chrono from "../../src";
 import { testSingleCase, testUnexpectedResult } from "../test_util";
-import ENTimeExpressionParser from "../../src/locales/en/parsers/ENTimeExpressionParser";
+import { Meridiem } from "../../src";
 
 test("Test - Year numbers with BCE/CE Era label", () => {
     testSingleCase(chrono, "10 August 234 BCE", new Date(2012, 7, 10), (result) => {
@@ -73,3 +73,28 @@ test("Test - Year numbers with Buddhist Era label", () => {
         expect(result.start).toBeDate(new Date(2012, 8 - 1, 10, 12));
     });
 });
+
+test("Test - Year number after date/time expression", () => {
+    testSingleCase(chrono, "Thu Oct 26 11:00:09 2023", new Date(2016, 10 - 1, 1, 8), (result, text) => {
+        expect(result.start.get("year")).toBe(2023);
+        expect(result.start.get("month")).toBe(10);
+        expect(result.start.get("day")).toBe(26);
+
+        expect(result.start.get("hour")).toBe(11);
+        expect(result.start.get("minute")).toBe(0);
+        expect(result.start.get("second")).toBe(9);
+        expect(result.start.get("meridiem")).toBe(Meridiem.AM);
+    });
+
+    testSingleCase(chrono, "Thu Oct 26 11:00:09 EDT 2023", new Date(2016, 10 - 1, 1, 8), (result, text) => {
+        expect(result.start.get("year")).toBe(2023);
+        expect(result.start.get("month")).toBe(10);
+        expect(result.start.get("day")).toBe(26);
+
+        expect(result.start.get("hour")).toBe(11);
+        expect(result.start.get("minute")).toBe(0);
+        expect(result.start.get("second")).toBe(9);
+        expect(result.start.get("meridiem")).toBe(Meridiem.AM);
+        expect(result.start.get("timezoneOffset")).toBe(-240);
+    });
+});

package/test/en/{en_casual_year_month_day.test.ts → en_year_month_day.test.ts}

@@ -1,7 +1,7 @@
 import { testSingleCase, testUnexpectedResult } from "../test_util";
 import * as chrono from "../../src";
 
-test("Test - Single Expression Start with Year", function () {
+test("Test - Single Expression (yyyy/MM/dd)", function () {
     testSingleCase(chrono, "2012/8/10", new Date(2012, 7, 10), (result) => {
         expect(result.start).not.toBeNull();
         expect(result.start.get("year")).toBe(2012);
@@ -41,7 +41,7 @@ test("Test - Single Expression Start with Year", function () {
     });
 });
 
-test("Test - Single Expression Start with Year and Month Name", function () {
+test("Test - Single Expression with month name (yyyy/MMM/dd)", function () {
     testSingleCase(chrono, "2012/Aug/10", new Date(2012, 7, 10), (result) => {
         expect(result.start).not.toBeNull();
         expect(result.start.get("year")).toBe(2012);
@@ -73,8 +73,29 @@ test("Test - Single Expression Start with Year and Month Name", function () {
     });
 });
 
-test("Test - Negative year-month-day like pattern", function () {
-    testUnexpectedResult(chrono, "2012-80-10", new Date(2012, 7, 10));
+test("Test - Allow swap date/month order in casual mode", () => {
+    testUnexpectedResult(chrono.strict, "2024/13/1");
+    testUnexpectedResult(chrono.strict, "2024-13-01");
 
+    testSingleCase(chrono.casual, "2024/13/1", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2024);
+        expect(result.start.get("month")).toBe(1);
+        expect(result.start.get("day")).toBe(13);
+    });
+
+    testSingleCase(chrono.casual, "2024-13-01", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2024);
+        expect(result.start.get("month")).toBe(1);
+        expect(result.start.get("day")).toBe(13);
+    });
+});
+
+test("Test - Not parse unlikely xxxx-xx-xx pattern", function () {
+    testUnexpectedResult(chrono, "2012/80/10", new Date(2012, 7, 10));
     testUnexpectedResult(chrono, "2012 80 10", new Date(2012, 7, 10));
 });
+
+test("Test - Not parse impossible dates", function () {
+    testUnexpectedResult(chrono, "2014-08-32");
+    testUnexpectedResult(chrono, "2014-02-30");
+});

package/test/system.test.ts

@@ -241,4 +241,6 @@ test("Test - Compare with native js", () => {
     testByCompareWithNative("Fri, 31 Mar 2000 07:00:00 UTC");
 
     testByCompareWithNative("2014-12-14T18:22:14.759Z");
+
+    testByCompareWithNative("2024-01-01T00:00");
 });

package/dist/cjs/locales/en/parsers/ENCasualYearMonthDayParser.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ENCasualYearMonthDayParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENCasualYearMonthDayParser.ts"],"names":[],"mappings":";;AACA,4CAAgD;AAChD,oDAAyD;AACzD,2GAAgH;AAShH,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,uBAAuB;IACnB,OAAO,yBAAe,CAAC,4BAAgB,CAAC,4BAA4B;IACpE,cAAc;IACd,WAAW,EACf,GAAG,CACN,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAC5B,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAC7B,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAE5B,MAAqB,0BAA2B,SAAQ,uEAAsC;IAC1F,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,KAAK,GAAG,KAAK,CAAC,kBAAkB,CAAC;YACnC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YACrC,CAAC,CAAC,4BAAgB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAE9D,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE,EAAE;YACzB,OAAO,IAAI,CAAC;SACf;QAED,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAE/C,OAAO;YACH,GAAG,EAAE,GAAG;YACR,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,IAAI;SACb,CAAC;IACN,CAAC;CACJ;AAvBD,6CAuBC"}

package/dist/esm/locales/en/parsers/ENCasualYearMonthDayParser.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ENCasualYearMonthDayParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENCasualYearMonthDayParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAShH,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,uBAAuB;IACnB,OAAO,eAAe,CAAC,gBAAgB,CAAC,4BAA4B;IACpE,cAAc;IACd,WAAW,EACf,GAAG,CACN,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAC5B,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAC7B,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAE5B,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,sCAAsC;IAC1F,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,KAAK,GAAG,KAAK,CAAC,kBAAkB,CAAC;YACnC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YACrC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAE9D,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE,EAAE;YACzB,OAAO,IAAI,CAAC;SACf;QAED,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAE/C,OAAO;YACH,GAAG,EAAE,GAAG;YACR,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,IAAI;SACb,CAAC;IACN,CAAC;CACJ"}