chrono-node 2.3.3 → 2.3.4

package/dist/common/casualReferences.js

@@ -13,7 +13,9 @@ function now(reference) {
     const component = new results_1.ParsingComponents(reference, {});
     dayjs_2.assignSimilarDate(component, targetDate);
     dayjs_2.assignSimilarTime(component, targetDate);
-    component.assign("timezoneOffset", targetDate.utcOffset());
+    if (reference.timezoneOffset !== null) {
+        component.assign("timezoneOffset", targetDate.utcOffset());
+    }
     return component;
 }
 exports.now = now;

package/dist/results.js

@@ -120,17 +120,20 @@ class ParsingComponents {
     }
     date() {
         const date = this.dateWithoutTimezoneAdjustment();
-        return new Date(date.getTime() + this.getSystemTimezoneAdjustmentMinute() * 60000);
+        return new Date(date.getTime() + this.getSystemTimezoneAdjustmentMinute(date) * 60000);
     }
     dateWithoutTimezoneAdjustment() {
         const date = new Date(this.get("year"), this.get("month") - 1, this.get("day"), this.get("hour"), this.get("minute"), this.get("second"), this.get("millisecond"));
         date.setFullYear(this.get("year"));
         return date;
     }
-    getSystemTimezoneAdjustmentMinute() {
-        var _a;
-        const currentTimezoneOffset = -new Date().getTimezoneOffset();
-        const targetTimezoneOffset = (_a = this.get("timezoneOffset")) !== null && _a !== void 0 ? _a : this.reference.timezoneOffset;
+    getSystemTimezoneAdjustmentMinute(date) {
+        var _a, _b;
+        if (!date || date.getTime() < 0) {
+            date = new Date();
+        }
+        const currentTimezoneOffset = -date.getTimezoneOffset();
+        const targetTimezoneOffset = (_b = (_a = this.get("timezoneOffset")) !== null && _a !== void 0 ? _a : this.reference.timezoneOffset) !== null && _b !== void 0 ? _b : currentTimezoneOffset;
         return currentTimezoneOffset - targetTimezoneOffset;
     }
     static createRelativeFromReference(reference, fragments) {

package/package.json

@@ -15,7 +15,7 @@
     "preset": "ts-jest"
   },
   "license": "MIT",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "directories": {
     "source": "./src",
     "test": "./test"

package/src/common/casualReferences.ts

@@ -8,7 +8,9 @@ export function now(reference: ReferenceWithTimezone): ParsingComponents {
     const component = new ParsingComponents(reference, {});
     assignSimilarDate(component, targetDate);
     assignSimilarTime(component, targetDate);
-    component.assign("timezoneOffset", targetDate.utcOffset());
+    if (reference.timezoneOffset !== null) {
+        component.assign("timezoneOffset", targetDate.utcOffset());
+    }
     return component;
 }
 

package/src/results.ts

@@ -142,7 +142,7 @@ export class ParsingComponents implements ParsedComponents {
 
     date(): Date {
         const date = this.dateWithoutTimezoneAdjustment();
-        return new Date(date.getTime() + this.getSystemTimezoneAdjustmentMinute() * 60000);
+        return new Date(date.getTime() + this.getSystemTimezoneAdjustmentMinute(date) * 60000);
     }
 
     private dateWithoutTimezoneAdjustment() {
@@ -160,9 +160,16 @@ export class ParsingComponents implements ParsedComponents {
         return date;
     }
 
-    private getSystemTimezoneAdjustmentMinute() {
-        const currentTimezoneOffset = -new Date().getTimezoneOffset();
-        const targetTimezoneOffset = this.get("timezoneOffset") ?? this.reference.timezoneOffset;
+    private getSystemTimezoneAdjustmentMinute(date?: Date) {
+        if (!date || date.getTime() < 0) {
+            // Javascript date timezone calculation got effect when the time epoch < 0
+            // e.g. new Date('Tue Feb 02 1300 00:00:00 GMT+0900 (JST)') => Tue Feb 02 1300 00:18:59 GMT+0918 (JST)
+            date = new Date();
+        }
+
+        const currentTimezoneOffset = -date.getTimezoneOffset();
+        const targetTimezoneOffset =
+            this.get("timezoneOffset") ?? this.reference.timezoneOffset ?? currentTimezoneOffset;
 
         return currentTimezoneOffset - targetTimezoneOffset;
     }

package/test/en/en_casual.test.ts

@@ -21,6 +21,17 @@ test("Test - Single Expression", () => {
         expect(result.start).toBeDate(new Date(2012, 7, 10, 8, 9, 10, 11));
     });
 
+    testSingleCase(
+        chrono.casual,
+        "The Deadline is now, without implicit local timezone",
+        { instant: new Date(1637674343000), timezone: null },
+        (result) => {
+            expect(result.text).toBe("now");
+            expect(result.start).toBeDate(new Date(1637674343000));
+            expect(result.start.isCertain("timezoneOffset")).toBe(false);
+        }
+    );
+
     testSingleCase(chrono.casual, "The Deadline is today", new Date(2012, 7, 10, 14, 12), (result) => {
         expect(result.index).toBe(16);
         expect(result.text).toBe("today");

package/test/en/en_timezone_exp.test.ts

@@ -81,20 +81,95 @@ test("Test - Parsing date with timezone abbreviation", function () {
 });
 
 test("Test - Not parsing timezone from relative time", function () {
-    const refDate = new Date(2020, 11 - 1, 14, 13, 48, 22);
+    {
+        const refInstant = new Date("Sun Nov 29 2020 13:24:13 GMT+0900 (Japan Standard Time)");
+        const expectedInstant = new Date("Sun Nov 29 2020 14:24:13 GMT+0900 (Japan Standard Time)");
+
+        testSingleCase(chrono, "in 1 hour get eggs and milk", refInstant, (result, text) => {
+            expect(result.text).toBe("in 1 hour");
+            expect(result.start.get("timezoneOffset")).toBe(-refInstant.getTimezoneOffset());
+            expect(result.start).toBeDate(expectedInstant);
+        });
+    }
+
+    {
+        const refInstant = new Date("Sun Nov 29 2020 13:24:13 GMT+0900 (Japan Standard Time)");
+        const expectedInstant = new Date("Sun Nov 29 2020 14:24:13 GMT+0900 (Japan Standard Time)");
+
+        testSingleCase(chrono, "in 1 hour GMT", refInstant, (result, text) => {
+            expect(result.text).toBe("in 1 hour");
+            expect(result.start).toBeDate(expectedInstant);
+        });
+    }
+
+    {
+        const refInstant = new Date("Sun Nov 29 2020 13:24:13 GMT+0900 (Japan Standard Time)");
+        const expectedInstant = new Date("Sun Nov 29 2020 14:24:13 GMT+0900 (Japan Standard Time)");
+
+        testSingleCase(chrono, "in 1 hour GMT", { instant: refInstant, timezone: "JST" }, (result, text) => {
+            expect(result.text).toBe("in 1 hour");
+            expect(result.start).toBeDate(expectedInstant);
+        });
+    }
+
+    {
+        const refInstant = new Date("Sun Nov 29 2020 13:24:13 GMT+0900 (Japan Standard Time)");
+        const expectedInstant = new Date("Sun Nov 29 2020 14:24:13 GMT+0900 (Japan Standard Time)");
+
+        testSingleCase(chrono, "in 1 hour GMT", { instant: refInstant, timezone: "BST" }, (result, text) => {
+            expect(result.text).toBe("in 1 hour");
+            expect(result.start).toBeDate(expectedInstant);
+        });
+    }
+});
 
-    testSingleCase(chrono, "in 1 hour get eggs and milk", refDate, (result, text) => {
-        expect(result.text).toBe("in 1 hour");
-        expect(result.start.get("timezoneOffset")).toBe(-refDate.getTimezoneOffset());
+test("Test - Relative time (Now) is not effected by timezone setting", function () {
+    const refInstant = new Date(1637674343000);
+
+    testSingleCase(chrono, "now", { instant: refInstant }, (result) => {
+        expect(result.text).toBe("now");
+        expect(result.start).toBeDate(refInstant);
+    });
+
+    testSingleCase(chrono, "now", { instant: refInstant, timezone: null }, (result) => {
+        expect(result.text).toBe("now");
+        expect(result.start).toBeDate(refInstant);
+    });
+
+    testSingleCase(chrono, "now", { instant: refInstant, timezone: "BST" }, (result) => {
+        expect(result.text).toBe("now");
+        expect(result.start).toBeDate(refInstant);
+    });
+
+    testSingleCase(chrono, "now", { instant: refInstant, timezone: "JST" }, (result) => {
+        expect(result.text).toBe("now");
+        expect(result.start).toBeDate(refInstant);
     });
+});
 
-    // This test fail when the system/assume timezone is exactly similar to the mentioned timezone
-    // Temporary disable this test
+test("Test - Relative time (2 hour later) is not effected by timezone setting", function () {
+    const refInstant = new Date(1637674343000);
+    const expectedInstant = new Date(1637674343000 + 2 * 60 * 60 * 1000);
 
-    // testSingleCase(chrono, "in 3 hours GMT", refDate, (result, text) => {
-    //     expect(result.text).toBe("in 3 hours");
-    //     expect(result.start.get("timezoneOffset")).toBe(-refDate.getTimezoneOffset());
-    // });
+    testSingleCase(chrono, "2 hour later", { instant: refInstant }, (result) => {
+        expect(result.text).toBe("2 hour later");
+        expect(result.start).toBeDate(expectedInstant);
+    });
+
+    testSingleCase(chrono, "2 hour later", { instant: refInstant, timezone: null }, (result) => {
+        expect(result.text).toBe("2 hour later");
+        expect(result.start).toBeDate(expectedInstant);
+    });
+
+    testSingleCase(chrono, "2 hour later", { instant: refInstant, timezone: "BST" }, (result) => {
+        expect(result.text).toBe("2 hour later");
+        expect(result.start).toBeDate(expectedInstant);
+    });
+
+    testSingleCase(chrono, "2 hour later", { instant: refInstant, timezone: "JST" }, (result) => {
+        expect(result.text).toBe("2 hour later");
+        expect(result.start).toBeDate(expectedInstant);
+    });
 });
 
 test("Test - Parsing timezone from relative date when valid", function () {