chrono-node 2.9.1 → 2.10.0

package/src/locales/zh/hant/parsers/ZHHantAgoFormatParser.ts

@@ -0,0 +1,87 @@
+import { ParsingContext } from "../../../../chrono";
+import { AbstractParserWithWordBoundaryChecking } from "../../../../common/parsers/AbstractParserWithWordBoundary";
+import { addDuration, Duration, reverseDuration } from "../../../../calculation/duration";
+import { NUMBER, zhStringToNumber } from "../constants";
+
+const PATTERN = new RegExp(
+    "(\\d+|[" +
+        Object.keys(NUMBER).join("") +
+        "]+|半|幾)(?:\\s*)" +
+        "(?:個)?" +
+        "(秒(?:鐘)?|分鐘|小時|鐘|日|天|星期|禮拜|月|年)" +
+        "(?:之)?前",
+    "i"
+);
+
+const NUMBER_GROUP = 1;
+const UNIT_GROUP = 2;
+
+export default class ZHHantAgoFormatParser extends AbstractParserWithWordBoundaryChecking {
+    innerPattern(): RegExp {
+        return PATTERN;
+    }
+
+    innerExtract(context: ParsingContext, match: RegExpMatchArray) {
+        const result = context.createParsingResult(match.index, match[0]);
+
+        let number = parseInt(match[NUMBER_GROUP]);
+        if (isNaN(number)) {
+            number = zhStringToNumber(match[NUMBER_GROUP]);
+        }
+
+        if (isNaN(number)) {
+            const string = match[NUMBER_GROUP];
+            if (string === "幾") {
+                number = 3;
+            } else if (string === "半") {
+                number = 0.5;
+            } else {
+                //just in case
+                return null;
+            }
+        }
+
+        let duration: Duration = {};
+        const unit = match[UNIT_GROUP];
+        const unitAbbr = unit[0];
+
+        if (unitAbbr.match(/[日天星禮月年]/)) {
+            if (unitAbbr == "日" || unitAbbr == "天") {
+                duration.day = number;
+            } else if (unitAbbr == "星" || unitAbbr == "禮") {
+                duration.week = number;
+            } else if (unitAbbr == "月") {
+                duration.month = number;
+            } else if (unitAbbr == "年") {
+                duration.year = number;
+            }
+
+            duration = reverseDuration(duration);
+
+            const date = addDuration(context.refDate, duration);
+            result.start.assign("year", date.getFullYear());
+            result.start.assign("month", date.getMonth() + 1);
+            result.start.assign("day", date.getDate());
+            return result;
+        }
+
+        if (unitAbbr == "秒") {
+            duration.second = number;
+        } else if (unitAbbr == "分") {
+            duration.minute = number;
+        } else if (unitAbbr == "小" || unitAbbr == "鐘") {
+            duration.hour = number;
+        }
+
+        duration = reverseDuration(duration);
+
+        const date = addDuration(context.refDate, duration);
+        result.start.imply("year", date.getFullYear());
+        result.start.imply("month", date.getMonth() + 1);
+        result.start.imply("day", date.getDate());
+        result.start.assign("hour", date.getHours());
+        result.start.assign("minute", date.getMinutes());
+        result.start.assign("second", date.getSeconds());
+        return result;
+    }
+}

package/src/results.ts

@@ -232,13 +232,26 @@ export class ParsingComponents implements ParsedComponents {
     }
 
     isValidDate(): boolean {
-        const date = this.dateWithoutTimezoneAdjustment();
+        // Check calendar validity in UTC. The local Date constructor would wrongly reject real
+        // times falling in the system timezone's DST gap, making validity depend on where it runs.
+        const date = new Date(
+            Date.UTC(
+                this.get("year"),
+                this.get("month") - 1,
+                this.get("day"),
+                this.get("hour"),
+                this.get("minute"),
+                this.get("second"),
+                this.get("millisecond")
+            )
+        );
+        date.setUTCFullYear(this.get("year"));
 
-        if (date.getFullYear() !== this.get("year")) return false;
-        if (date.getMonth() !== this.get("month") - 1) return false;
-        if (date.getDate() !== this.get("day")) return false;
-        if (this.get("hour") != null && date.getHours() != this.get("hour")) return false;
-        if (this.get("minute") != null && date.getMinutes() != this.get("minute")) return false;
+        if (date.getUTCFullYear() !== this.get("year")) return false;
+        if (date.getUTCMonth() !== this.get("month") - 1) return false;
+        if (date.getUTCDate() !== this.get("day")) return false;
+        if (this.get("hour") != null && date.getUTCHours() != this.get("hour")) return false;
+        if (this.get("minute") != null && date.getUTCMinutes() != this.get("minute")) return false;
 
         return true;
     }
@@ -252,9 +265,27 @@ export class ParsingComponents implements ParsedComponents {
     }
 
     date(): Date {
-        const date = this.dateWithoutTimezoneAdjustment();
-        const timezoneAdjustment = this.reference.getSystemTimezoneAdjustmentMinute(date, this.get("timezoneOffset"));
-        return new Date(date.getTime() + timezoneAdjustment * 60000);
+        const timezoneOffset = this.get("timezoneOffset") ?? this.reference.timezoneOffset;
+        if (timezoneOffset === null || timezoneOffset === undefined) {
+            // No timezone known: interpret the components as system-local time.
+            return this.dateWithoutTimezoneAdjustment();
+        }
+
+        // The offset fully determines the instant, so build it from UTC. The local Date constructor
+        // would be ambiguous for wall-clock times in the system timezone's DST gap/overlap.
+        const date = new Date(
+            Date.UTC(
+                this.get("year"),
+                this.get("month") - 1,
+                this.get("day"),
+                this.get("hour"),
+                this.get("minute"),
+                this.get("second"),
+                this.get("millisecond")
+            )
+        );
+        date.setUTCFullYear(this.get("year"));
+        return new Date(date.getTime() - timezoneOffset * 60000);
     }
 
     addTag(tag: string): ParsingComponents {

package/test/calculation_duration.test.ts

@@ -1,165 +0,0 @@
-import { addDuration, reverseDuration } from "../src/calculation/duration";
-
-test("Test - Adding Duration w/ single timeunit", () => {
-    {
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "year": 1 });
-        expect(output).toStrictEqual(new Date("Sun, Aug 27 2023 12:52:11"));
-    }
-    {
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "month": 1 });
-        expect(output).toStrictEqual(new Date("Wed, Sep 27 2022 12:52:11"));
-    }
-    {
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "week": 1 });
-        expect(output).toStrictEqual(new Date("Sat, Sep 3 2022 12:52:11"));
-    }
-    {
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "day": 1 });
-        expect(output).toStrictEqual(new Date("Sat, Aug 28 2022 12:52:11"));
-    }
-    {
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "hour": 1 });
-        expect(output).toStrictEqual(new Date("Sat, Aug 27 2022 13:52:11"));
-    }
-    {
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "minute": 1 });
-        expect(output).toStrictEqual(new Date("Sat, Aug 27 2022 12:53:11"));
-    }
-    {
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "second": 1 });
-        expect(output).toStrictEqual(new Date("Sat, Aug 27 2022 12:52:12"));
-    }
-    {
-        const reference = new Date("Sat, Aug 27 2022 12:52:11:00");
-        const output = addDuration(reference, { "millisecond": 1 });
-        expect(output).toStrictEqual(new Date("Sat, Aug 27 2022 12:52:11:01"));
-    }
-});
-
-test("Test - Adding Duration w/ single timeunit shorten", () => {
-    {
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "y": 1 });
-        expect(output).toStrictEqual(new Date("Sun, Aug 27 2023 12:52:11"));
-    }
-    {
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "M": 1 });
-        expect(output).toStrictEqual(new Date("Wed, Sep 27 2022 12:52:11"));
-    }
-    {
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "w": 1 });
-        expect(output).toStrictEqual(new Date("Sat, Sep 3 2022 12:52:11"));
-    }
-    {
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "d": 1 });
-        expect(output).toStrictEqual(new Date("Sat, Aug 28 2022 12:52:11"));
-    }
-    {
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "h": 1 });
-        expect(output).toStrictEqual(new Date("Sat, Aug 27 2022 13:52:11"));
-    }
-    {
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "m": 1 });
-        expect(output).toStrictEqual(new Date("Sat, Aug 27 2022 12:53:11"));
-    }
-    {
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "s": 1 });
-        expect(output).toStrictEqual(new Date("Sat, Aug 27 2022 12:52:12"));
-    }
-    {
-        const reference = new Date("Sat, Aug 27 2022 12:52:11:00");
-        const output = addDuration(reference, { "ms": 1 });
-        expect(output).toStrictEqual(new Date("Sat, Aug 27 2022 12:52:11:01"));
-    }
-});
-
-test("Test - Adding Duration w/ multiple timeunits", () => {
-    {
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "month": 1, "day": 4 });
-        expect(output).toStrictEqual(new Date("Wed, Oct 1 2022 12:52:11"));
-    }
-    {
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "month": 1, "day": 4, "hour": 12 });
-        expect(output).toStrictEqual(new Date("Wed, Oct 2 2022 00:52:11"));
-    }
-});
-
-test("Test - Adding Duration w/ fractions", () => {
-    {
-        // 0.5 year (aka. half year) => 6 months
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "year": 0.5 });
-        expect(output).toStrictEqual(new Date("Mon, Feb 27 2023 12:52:11"));
-    }
-    {
-        // 0.5 month => 2 weeks
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "month": 0.5 });
-        expect(output).toStrictEqual(new Date("Sat, Sep 10 2022 12:52:11"));
-    }
-    {
-        // 0.5 week => 4 days (actually 3.5 days, but we round up to 4 days)
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "week": 0.5 });
-        expect(output).toStrictEqual(new Date("Sat, Aug 31 2022 12:52:11"));
-    }
-    {
-        // 0.5 day (aka. half day) => 12 hours
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "day": 0.5 });
-        expect(output).toStrictEqual(new Date("Sat, Aug 28 2022 00:52:11"));
-    }
-    {
-        // 0.5 hour (aka. half hour) => 30 minutes
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "hour": 0.5 });
-        expect(output).toStrictEqual(new Date("Sat, Aug 27 2022 13:22:11"));
-    }
-    {
-        // 0.5 minute (aka. half minute) => 30 seconds
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "minute": 0.5 });
-        expect(output).toStrictEqual(new Date("Sat, Aug 27 2022 12:52:41"));
-    }
-    {
-        // 0.5 second (aka. half second) => 500 milliseconds
-        const reference = new Date("Sat, Aug 27 2022 12:52:11:00");
-        const output = addDuration(reference, { "second": 0.5 });
-        expect(output).toStrictEqual(new Date("Sat, Aug 27 2022 12:52:11:500"));
-    }
-});
-
-test("Test - Adding Duration w/ multiple fractions", () => {
-    {
-        // 0.5 year (aka. half year) => 6 months
-        const reference = new Date("Sat, Aug 27 2022 12:52:11");
-        const output = addDuration(reference, { "year": 0.5, "month": 2 });
-        expect(output).toStrictEqual(new Date("Thu, April 27 2023 12:52:11"));
-    }
-});
-
-test("Test - Reverse Duration", () => {
-    {
-        const timeunits = { year: 5, month: 5 };
-        expect(reverseDuration(timeunits)).toStrictEqual({ year: -5, month: -5 });
-    }
-    {
-        const timeunits = { year: -5, month: -5 };
-        expect(reverseDuration(timeunits)).toStrictEqual({ year: 5, month: 5 });
-    }
-});

package/test/calculation_weekdays.test.ts

@@ -1,133 +0,0 @@
-import { createParsingComponentsAtWeekday, getDaysToWeekday } from "../src/calculation/weekdays";
-import { Weekday } from "../src";
-import { ReferenceWithTimezone } from "../src/results";
-
-test("Test - This Weekday Calculation", () => {
-    {
-        const reference = new ReferenceWithTimezone(new Date("Sat, 20 Aug 2022 12:00:00"));
-        const output = createParsingComponentsAtWeekday(reference, Weekday.MONDAY, "this");
-        expect(output.date()).toStrictEqual(new Date("Mon, Aug 22 2022 12:00:00"));
-    }
-    {
-        const reference = new ReferenceWithTimezone(new Date("Sun, 21 Aug 2022 12:00:00"));
-        const output = createParsingComponentsAtWeekday(reference, Weekday.FRIDAY, "this");
-        expect(output.date()).toStrictEqual(new Date("Fri, Aug 26 2022 12:00:00"));
-    }
-    {
-        const reference = new ReferenceWithTimezone(new Date("Tue, Aug 2 2022 12:00:00"));
-        const output = createParsingComponentsAtWeekday(reference, Weekday.SUNDAY, "this");
-        expect(output.date()).toStrictEqual(new Date("Sun, Aug 7 2022 12:00:00"));
-    }
-});
-
-test("Test - Last Weekday Calculation", () => {
-    {
-        const reference = new ReferenceWithTimezone(new Date("Sat, 20 Aug 2022 12:00:00"));
-        const output = createParsingComponentsAtWeekday(reference, Weekday.FRIDAY, "last");
-        expect(output.date()).toStrictEqual(new Date("Fri, Aug 19 2022 12:00:00"));
-    }
-    {
-        const reference = new ReferenceWithTimezone(new Date("Sat, 20 Aug 2022 12:00:00"));
-        const output = createParsingComponentsAtWeekday(reference, Weekday.MONDAY, "last");
-        expect(output.date()).toStrictEqual(new Date("Mon, Aug 15 2022 12:00:00"));
-    }
-    {
-        const reference = new ReferenceWithTimezone(new Date("Sat, 20 Aug 2022 12:00:00"));
-        const output = createParsingComponentsAtWeekday(reference, Weekday.SUNDAY, "last");
-        expect(output.date()).toStrictEqual(new Date("Sun, Aug 14 2022 12:00:00"));
-    }
-    {
-        const reference = new ReferenceWithTimezone(new Date("Sat, 20 Aug 2022 12:00:00"));
-        const output = createParsingComponentsAtWeekday(reference, Weekday.SATURDAY, "last");
-        expect(output.date()).toStrictEqual(new Date("Sat, Aug 13 2022 12:00:00"));
-    }
-});
-
-test("Test - Next Weekday Calculation", () => {
-    {
-        const reference = new ReferenceWithTimezone(new Date("Sun, Aug 21 2022 12:00:00"));
-        const output = createParsingComponentsAtWeekday(reference, Weekday.MONDAY, "next");
-        expect(output.date()).toStrictEqual(new Date("Mon, Aug 22 2022 12:00:00"));
-    }
-    {
-        const reference = new ReferenceWithTimezone(new Date("Sun, Aug 21 2022 12:00:00"));
-        const output = createParsingComponentsAtWeekday(reference, Weekday.SATURDAY, "next");
-        expect(output.date()).toStrictEqual(new Date("Sat, Aug 27 2022 12:00:00"));
-    }
-    {
-        const reference = new ReferenceWithTimezone(new Date("Sun, Aug 21 2022 12:00:00"));
-        const output = createParsingComponentsAtWeekday(reference, Weekday.SUNDAY, "next");
-        expect(output.date()).toStrictEqual(new Date("Sun, Aug 28 2022 12:00:00"));
-    }
-    {
-        const reference = new ReferenceWithTimezone(new Date("Sat, Aug 20 2022 12:00:00"));
-        const output = createParsingComponentsAtWeekday(reference, Weekday.FRIDAY, "next");
-        expect(output.date()).toStrictEqual(new Date("Fri, Aug 26 2022 12:00:00"));
-    }
-    {
-        const reference = new ReferenceWithTimezone(new Date("Sat, Aug 20 2022 12:00:00"));
-        const output = createParsingComponentsAtWeekday(reference, Weekday.SATURDAY, "next");
-        expect(output.date()).toStrictEqual(new Date("Sat, Aug 27 2022 12:00:00"));
-    }
-    {
-        const reference = new ReferenceWithTimezone(new Date("Sat, Aug 20 2022 12:00:00"));
-        const output = createParsingComponentsAtWeekday(reference, Weekday.SUNDAY, "next");
-        expect(output.date()).toStrictEqual(new Date("Sun, Aug 28 2022 12:00:00"));
-    }
-    {
-        const reference = new ReferenceWithTimezone(new Date("Tue, Aug 2 2022 12:00:00"));
-        const output = createParsingComponentsAtWeekday(reference, Weekday.MONDAY, "next");
-        expect(output.date()).toStrictEqual(new Date("Mon, Aug 8 2022 12:00:00"));
-    }
-    {
-        const reference = new ReferenceWithTimezone(new Date("Tue, Aug 2 2022 12:00:00"));
-        const output = createParsingComponentsAtWeekday(reference, Weekday.FRIDAY, "next");
-        expect(output.date()).toStrictEqual(new Date("Fri, Aug 12 2022 12:00:00"));
-    }
-
-    {
-        const reference = new ReferenceWithTimezone(new Date("Tue, Aug 2 2022 12:00:00"));
-        const output = createParsingComponentsAtWeekday(reference, Weekday.SUNDAY, "next");
-        expect(output.date()).toStrictEqual(new Date("Sun, Aug 14 2022 12:00:00"));
-    }
-});
-
-test("Test - Closest Weekday Calculation", () => {
-    {
-        const refDate = new Date("Sat, 20 Aug 2022 12:00:00");
-        expect(getDaysToWeekday(refDate, Weekday.MONDAY)).toBe(2);
-    }
-    {
-        const refDate = new Date("Sat, 20 Aug 2022 12:00:00");
-        expect(getDaysToWeekday(refDate, Weekday.TUESDAY)).toBe(3);
-    }
-    {
-        const refDate = new Date("Sat, 20 Aug 2022 12:00:00");
-        expect(getDaysToWeekday(refDate, Weekday.FRIDAY)).toBe(-1);
-    }
-    {
-        const refDate = new Date("Sat, 20 Aug 2022 12:00:00");
-        expect(getDaysToWeekday(refDate, Weekday.THURSDAY)).toBe(-2);
-    }
-    {
-        const refDate = new Date("Sat, 20 Aug 2022 12:00:00");
-        expect(getDaysToWeekday(refDate, Weekday.WEDNESDAY)).toBe(-3);
-    }
-});
-
-test("Test - Weekdays calculation with timezone", () => {
-    // Thu Feb 27 2025 17:00:00 GMT+0000
-    // Thu Feb 27 2025 09:00:00 GMT-0800 (PST)
-    // Fri Feb 28 2025 02:00:00 GMT+0900 (JST)
-    const refInstant = new Date("2025-02-27T17:00:00.000Z");
-    {
-        const reference = ReferenceWithTimezone.fromInput({ instant: refInstant, timezone: "JST" });
-        const output = createParsingComponentsAtWeekday(reference, Weekday.FRIDAY, "this");
-        expect(output.date()).toStrictEqual(new Date("Fri Feb 28 2025 12:00:00 GMT+0900 (JST)"));
-    }
-    {
-        const reference = ReferenceWithTimezone.fromInput({ instant: refInstant, timezone: "PST" });
-        const output = createParsingComponentsAtWeekday(reference, Weekday.FRIDAY, "this");
-        expect(output.date()).toStrictEqual(new Date("Fri Feb 28 2025 12:00:00 GMT-0800 (PST)"));
-    }
-});