chrono-node 2.7.9 → 2.8.0

package/test/nl/nl_relative.test.ts

@@ -185,42 +185,58 @@ test("Test - Relative date components' certainty", () => {
     });
 });
 
-test("Test - Relative date components' certainty and imply timezone", () => {
+test("Test - Relative date when the timezone is irrelevant", () => {
     const refDate = new Date("Sun Nov 29 2020 13:24:13 GMT+0900 (Japan Standard Time)");
-
     {
         // now
         const text = "nu";
         const result = chrono.nl.parse(text, refDate)[0] as ParsingResult;
+        expect(result).toBeDate(new Date("Sun Nov 29 2020 13:24:13 GMT+0900 (Japan Standard Time)"));
+        expect(result).toBeDate(new Date("Sun Nov 29 2020 5:24:13 GMT+0100"));
 
-        expect(result.text).toBe(text);
         result.start.imply("timezoneOffset", 60);
-
         expect(result).toBeDate(new Date("Sun Nov 29 2020 13:24:13 GMT+0900 (Japan Standard Time)"));
         expect(result).toBeDate(new Date("Sun Nov 29 2020 5:24:13 GMT+0100"));
     }
-
     {
-        // tomorrow at 5pm
-        const text = "morgen om 17 uur";
+        // in 10 minutes
+        const text = "binnen 10 minuten";
         const result = chrono.nl.parse(text, refDate)[0] as ParsingResult;
+        expect(result).toBeDate(new Date("Sun Nov 29 2020 13:34:13 GMT+0900 (Japan Standard Time)"));
+        expect(result).toBeDate(new Date("Sun Nov 29 2020 5:34:13 GMT+0100"));
 
-        expect(result.text).toBe(text);
         result.start.imply("timezoneOffset", 60);
-
-        expect(result).toBeDate(new Date("Sun Dec 1 2020 1:00:00 GMT+0900 (Japan Standard Time)"));
-        expect(result).toBeDate(new Date("Sun Nov 30 2020 17:00:00 GMT+0100"));
+        expect(result).toBeDate(new Date("Sun Nov 29 2020 13:34:13 GMT+0900 (Japan Standard Time)"));
+        expect(result).toBeDate(new Date("Sun Nov 29 2020 5:34:13 GMT+0100"));
     }
+});
 
+test("Test - Relative date when the timezone is relevant and known", () => {
+    // Sun Nov 29 2020 13:24:13 GMT+0900 (JST)
+    // Sat Nov 28 2020 21:24:13 GMT-0700 (PDT)
+    const refInstant = new Date("Sun Nov 29 2020 13:24:13 GMT+0900 (Japan Standard Time)");
     {
-        // in 10 minutes
-        const text = "binnen 10 minuten";
-        const result = chrono.nl.parse(text, refDate)[0] as ParsingResult;
+        // In JST (Nov 29 2020 13:24:13 GMT+0900), "tomorrow at 5pm"
+        const text = "morgen om 17 uur";
+        const result = chrono.nl.parse(text, { instant: refInstant, timezone: "JST" })[0] as ParsingResult;
+        expect(result).toBeDate(new Date("Mon Nov 30 2020 17:00:00 GMT+0900 (JST)"));
+        expect(result.start.get("month")).toBe(11);
+        expect(result.start.get("day")).toBe(30);
+        expect(result.start.get("hour")).toBe(17);
 
-        expect(result.text).toBe(text);
         result.start.imply("timezoneOffset", 60);
+        expect(result).toBeDate(new Date("Mon Nov 30 2020 17:00:00 GMT+0100 (BST)"));
+    }
+    {
+        // In PDT (Sat Nov 28 2020 21:24:13 GMT-0700), "tomorrow at 5pm"
+        const text = "morgen om 17 uur";
+        const result = chrono.nl.parse(text, { instant: refInstant, timezone: -7 * 60 })[0] as ParsingResult;
+        expect(result).toBeDate(new Date("Sun Nov 29 2020 17:00:00 GMT-0700 (PST)"));
+        expect(result.start.get("month")).toBe(11);
+        expect(result.start.get("day")).toBe(29);
+        expect(result.start.get("hour")).toBe(17);
 
-        expect(result).toBeDate(new Date("Sun Nov 29 2020 13:34:13 GMT+0900 (Japan Standard Time)"));
-        expect(result).toBeDate(new Date("Sun Nov 29 2020 5:34:13 GMT+0100"));
+        result.start.imply("timezoneOffset", 60);
+        expect(result).toBeDate(new Date("Sun Nov 29 2020 17:00:00 GMT+0100 (BST)"));
     }
 });

package/test/result.test.ts

@@ -175,3 +175,27 @@ test("Test - Checking non-existing date during DST skip", () => {
         ).toBe(true);
     }
 });
+
+test("Test - Getting timezone adjust date from references", () => {
+    {
+        const reference = new ReferenceWithTimezone({
+            instant: new Date("Wed Jun 09 2021 07:21:32 GMT+0900 (JST)"),
+            timezone: 9 * 60,
+        });
+        expect(reference.getDateWithAdjustedTimezone()).toStrictEqual(new Date(2021, 6 - 1, 9, 7, 21, 32));
+    }
+    {
+        const reference = new ReferenceWithTimezone({
+            instant: new Date("Wed Jun 09 2021 07:21:32 GMT+0900 (JST)"),
+            timezone: "JST",
+        });
+        expect(reference.getDateWithAdjustedTimezone()).toStrictEqual(new Date(2021, 6 - 1, 9, 7, 21, 32));
+    }
+    {
+        const reference = new ReferenceWithTimezone({
+            instant: new Date("Wed Jun 09 2021 07:21:32 GMT-0500 (CDT)"),
+            timezone: "CDT",
+        });
+        expect(reference.getDateWithAdjustedTimezone()).toStrictEqual(new Date(2021, 6 - 1, 9, 7, 21, 32));
+    }
+});

package/test/system_timezone.test.ts

@@ -1,7 +1,7 @@
 import * as chrono from "../src/";
 import { testSingleCase } from "./test_util";
 
-test("Test - Timezone difference on reference example", function () {
+test("Test - Using reference with timezone", function () {
     testSingleCase(
         chrono,
         "Friday at 4pm",
@@ -11,12 +11,26 @@ test("Test - Timezone difference on reference example", function () {
         },
         (result) => {
             expect(result).toBeDate(new Date("Fri Jun 11 2021 16:00:00 GMT-0500 (CDT)"));
-            expect(result).toBeDate(new Date("Fri Jun 12 2021 06:00:00 GMT+0900 (JST)"));
+            expect(result).toBeDate(new Date("Sat Jun 12 2021 06:00:00 GMT+0900 (JST)"));
+        }
+    );
+    testSingleCase(
+        chrono,
+        "1am",
+        {
+            instant: new Date("Wed May 26 2022 01:57:00 GMT-0500 (CDT)"),
+            timezone: "CDT",
+        },
+        (result) => {
+            expect(result.start.get("year")).toBe(2022);
+            expect(result.start.get("month")).toBe(5);
+            expect(result.start.get("day")).toBe(26);
+            expect(result.start.get("hour")).toBe(1);
         }
     );
 });
 
-test("Test - Timezone difference on default timezone", function () {
+test("Test - Using reference with missing/default timezone", function () {
     const INPUT = "Friday at 4pm";
     const REF_INSTANT = new Date(2021, 6 - 1, 9, 7, 0, 0);
     const EXPECTED_INSTANT = new Date(2021, 6 - 1, 11, 16, 0, 0);
@@ -38,16 +52,18 @@ test("Test - Timezone difference on default timezone", function () {
     });
 });
 
-test("Test - Timezone difference on reference date", function () {
+test("Test - Using reference instance with different timezone", function () {
     // Sun Jun 06 2021 19:00:00 GMT+0900 (JST)
     // Sun Jun 06 2021 11:00:00 GMT+0100 (BST)
     const refInstant = new Date("Sun Jun 06 2021 19:00:00 GMT+0900 (JST)");
 
+    // "At 4pm tomorrow" at "Sun Jun 06 2021 11:00:00 (BST)"
     testSingleCase(chrono, "At 4pm tomorrow", { instant: refInstant, timezone: "BST" }, (result) => {
         const expectedInstant = new Date("Mon Jun 07 2021 16:00:00 GMT+0100 (BST)");
         expect(result).toBeDate(expectedInstant);
     });
 
+    // "At 4pm tomorrow" at "Sun Jun 06 2021 19:00:00 (JST)"
     testSingleCase(chrono, "At 4pm tomorrow", { instant: refInstant, timezone: "JST" }, (result) => {
         const expectedInstant = new Date("Mon Jun 07 2021 16:00:00 GMT+0900 (JST)");
         expect(result).toBeDate(expectedInstant);