chrono-node 2.8.2 → 2.8.3

package/dist/esm/utils/dates.js

@@ -1,3 +1,16 @@
+import { Meridiem } from "../types.js";
+export function assignSimilarDate(component, target) {
+    component.assign("day", target.getDate());
+    component.assign("month", target.getMonth() + 1);
+    component.assign("year", target.getFullYear());
+}
+export function assignSimilarTime(component, target) {
+    component.assign("hour", target.getHours());
+    component.assign("minute", target.getMinutes());
+    component.assign("second", target.getSeconds());
+    component.assign("millisecond", target.getMilliseconds());
+    component.assign("meridiem", target.getHours() < 12 ? Meridiem.AM : Meridiem.PM);
+}
 export function implySimilarDate(component, target) {
     component.imply("day", target.getDate());
     component.imply("month", target.getMonth() + 1);
@@ -8,5 +21,6 @@ export function implySimilarTime(component, target) {
     component.imply("minute", target.getMinutes());
     component.imply("second", target.getSeconds());
     component.imply("millisecond", target.getMilliseconds());
+    component.imply("meridiem", target.getHours() < 12 ? Meridiem.AM : Meridiem.PM);
 }
 //# sourceMappingURL=dates.js.map

package/dist/esm/utils/dates.js.map

@@ -1 +1 @@
-{"version":3,"file":"dates.js","sourceRoot":"","sources":["../../../src/utils/dates.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,gBAAgB,CAAC,SAA4B,EAAE,MAAY;IACvE,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IACzC,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;IAChD,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;AAClD,CAAC;AAOD,MAAM,UAAU,gBAAgB,CAAC,SAA4B,EAAE,MAAY;IACvE,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC3C,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;IAC/C,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;IAC/C,SAAS,CAAC,KAAK,CAAC,aAAa,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;AAC7D,CAAC"}
+{"version":3,"file":"dates.js","sourceRoot":"","sources":["../../../src/utils/dates.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAOpC,MAAM,UAAU,iBAAiB,CAAC,SAA4B,EAAE,MAAY;IACxE,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IAC1C,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;IACjD,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;AACnD,CAAC;AAOD,MAAM,UAAU,iBAAiB,CAAC,SAA4B,EAAE,MAAY;IACxE,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC5C,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;IAChD,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;IAChD,SAAS,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;IAC1D,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AACrF,CAAC;AAOD,MAAM,UAAU,gBAAgB,CAAC,SAA4B,EAAE,MAAY;IACvE,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IACzC,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;IAChD,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;AAClD,CAAC;AAOD,MAAM,UAAU,gBAAgB,CAAC,SAA4B,EAAE,MAAY;IACvE,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC3C,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;IAC/C,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;IAC/C,SAAS,CAAC,KAAK,CAAC,aAAa,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;IACzD,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AACpF,CAAC"}

package/dist/esm/utils/timeunits.js.map

@@ -1 +1 @@
-{"version":3,"file":"timeunits.js","sourceRoot":"","sources":["../../../src/utils/timeunits.ts"],"names":[],"mappings":"AAKA,MAAM,UAAU,gBAAgB,CAAC,SAAoB;IACjD,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAE1B,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,QAAqB,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,UAA6B,EAAE,SAAoB;IACnF,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC;IAElC,IAAI,IAAI,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC;IAC9B,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAE1B,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,GAAgB,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,KAAK,IAAI,SAAS,IAAI,GAAG,IAAI,SAAS,IAAI,MAAM,IAAI,SAAS,IAAI,OAAO,IAAI,SAAS,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC;QAC/G,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACjC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QACxC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,QAAQ,IAAI,SAAS,IAAI,QAAQ,IAAI,SAAS,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC;QACxE,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}
+{"version":3,"file":"timeunits.js","sourceRoot":"","sources":["../../../src/utils/timeunits.ts"],"names":[],"mappings":"AAWA,MAAM,UAAU,gBAAgB,CAAC,SAAoB;IACjD,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAE1B,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,QAAqB,CAAC;AACjC,CAAC;AAKD,MAAM,UAAU,mBAAmB,CAAC,UAA6B,EAAE,SAAoB;IACnF,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC;IAElC,IAAI,IAAI,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC;IAC9B,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAE1B,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,GAAgB,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,KAAK,IAAI,SAAS,IAAI,GAAG,IAAI,SAAS,IAAI,MAAM,IAAI,SAAS,IAAI,OAAO,IAAI,SAAS,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC;QAC/G,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACjC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QACxC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,QAAQ,IAAI,SAAS,IAAI,QAAQ,IAAI,SAAS,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC;QACxE,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}

package/package.json

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

package/src/calculation/duration.ts

@@ -0,0 +1,143 @@
+import { Timeunit } from "../types";
+
+export type TimeunitShorten = "y" | "mo" | "M" | "w" | "d" | "h" | "m" | "s" | "ms";
+export type TimeunitSpecial = "quarter";
+
+/**
+ * A type represent a directed time duration as a set of values by timeunits.
+ * The positive values mean the time duration into the future.
+ */
+export type Duration = { [c in Timeunit | TimeunitSpecial | TimeunitShorten]?: number };
+
+/**
+ * Returns the date after adding the given `duration` to `ref`.
+ * @param ref
+ * @param duration
+ */
+export function addDuration(ref: Date, duration: Duration): Date {
+    let date = new Date(ref);
+
+    // Replace short timeunit keys with full timeunit keys
+    if (duration["y"]) {
+        duration["year"] = duration["y"];
+        delete duration["y"];
+    }
+    if (duration["mo"]) {
+        duration["month"] = duration["mo"];
+        delete duration["mo"];
+    }
+    if (duration["M"]) {
+        duration["month"] = duration["M"];
+        delete duration["M"];
+    }
+    if (duration["w"]) {
+        duration["week"] = duration["w"];
+        delete duration["w"];
+    }
+    if (duration["d"]) {
+        duration["day"] = duration["d"];
+        delete duration["d"];
+    }
+    if (duration["h"]) {
+        duration["hour"] = duration["h"];
+        delete duration["h"];
+    }
+    if (duration["m"]) {
+        duration["minute"] = duration["m"];
+        delete duration["m"];
+    }
+    if (duration["s"]) {
+        duration["second"] = duration["s"];
+        delete duration["s"];
+    }
+    if (duration["ms"]) {
+        duration["millisecond"] = duration["ms"];
+        delete duration["ms"];
+    }
+
+    if ("year" in duration) {
+        const floor = Math.floor(duration["year"]);
+        date.setFullYear(date.getFullYear() + floor);
+        const remainingFraction = duration["year"] - floor;
+        if (remainingFraction > 0) {
+            duration.month = duration?.month ?? 0;
+            duration.month += remainingFraction * 12;
+        }
+    }
+    if ("quarter" in duration) {
+        const floor = Math.floor(duration["quarter"]);
+        date.setMonth(date.getMonth() + floor * 3);
+    }
+    if ("month" in duration) {
+        const floor = Math.floor(duration["month"]);
+        date.setMonth(date.getMonth() + floor);
+        const remainingFraction = duration["month"] - floor;
+        if (remainingFraction > 0) {
+            duration.week = duration?.week ?? 0;
+            duration.week += remainingFraction * 4;
+        }
+    }
+    if ("week" in duration) {
+        const floor = Math.floor(duration["week"]);
+        date.setDate(date.getDate() + floor * 7);
+        const remainingFraction = duration["week"] - floor;
+        if (remainingFraction > 0) {
+            duration.day = duration?.day ?? 0;
+            duration.day += Math.round(remainingFraction * 7);
+        }
+    }
+    if ("day" in duration) {
+        const floor = Math.floor(duration["day"]);
+        date.setDate(date.getDate() + floor);
+        const remainingFraction = duration["day"] - floor;
+        if (remainingFraction > 0) {
+            duration.hour = duration?.hour ?? 0;
+            duration.hour += Math.round(remainingFraction * 24);
+        }
+    }
+    if ("hour" in duration) {
+        const floor = Math.floor(duration["hour"]);
+        date.setHours(date.getHours() + floor);
+        const remainingFraction = duration["hour"] - floor;
+        if (remainingFraction > 0) {
+            duration.minute = duration?.minute ?? 0;
+            duration.minute += Math.round(remainingFraction * 60);
+        }
+    }
+    if ("minute" in duration) {
+        const floor = Math.floor(duration["minute"]);
+        date.setMinutes(date.getMinutes() + floor);
+        const remainingFraction = duration["minute"] - floor;
+        if (remainingFraction > 0) {
+            duration.second = duration?.second ?? 0;
+            duration.second += Math.round(remainingFraction * 60);
+        }
+    }
+    if ("second" in duration) {
+        const floor = Math.floor(duration["second"]);
+        date.setSeconds(date.getSeconds() + floor);
+        const remainingFraction = duration["second"] - floor;
+        if (remainingFraction > 0) {
+            duration.millisecond = duration?.millisecond ?? 0;
+            duration.millisecond += Math.round(remainingFraction * 1000);
+        }
+    }
+    if ("millisecond" in duration) {
+        const floor = Math.floor(duration["millisecond"]);
+        date.setMilliseconds(date.getMilliseconds() + floor);
+    }
+    return date;
+}
+
+/**
+ * Return the reversed duration (e.g. back into the past, instead of future)
+ * @param duration
+ */
+export function reverseDuration(duration: Duration): Duration {
+    const reversed = {};
+    for (const key in duration) {
+        // noinspection JSUnfilteredForInLoop
+        reversed[key] = -duration[key];
+    }
+    return reversed as Duration;
+}

package/src/{common/calculation → calculation}/weekdays.ts

@@ -1,6 +1,6 @@
-import { Weekday } from "../../types";
-import { ParsingComponents, ReferenceWithTimezone } from "../../results";
-import { addImpliedTimeUnits } from "../../utils/timeunits";
+import { Weekday } from "../types";
+import { ParsingComponents, ReferenceWithTimezone } from "../results";
+import { addImpliedTimeUnits } from "../utils/timeunits";
 
 /**
  * Returns the parsing components at the weekday (considering the modifier). The time and timezone is assume to be

package/src/common/casualReferences.ts

@@ -137,7 +137,7 @@ export function afternoon(reference: ReferenceWithTimezone, implyHour = 15): Par
 export function noon(reference: ReferenceWithTimezone): ParsingComponents {
     const component = new ParsingComponents(reference, {});
     component.imply("meridiem", Meridiem.AM);
-    component.imply("hour", 12);
+    component.assign("hour", 12);
     component.imply("minute", 0);
     component.imply("second", 0);
     component.imply("millisecond", 0);

package/src/common/refiners/ForwardDateRefiner.ts

@@ -7,7 +7,6 @@
 import { ParsingContext, Refiner } from "../../chrono";
 import { ParsingResult } from "../../results";
 import dayjs from "dayjs";
-import { implySimilarDate } from "../../utils/dayjs";
 import * as dates from "../../utils/dates";
 
 export default class ForwardDateRefiner implements Refiner {

package/src/common/refiners/UnlikelyFormatFilter.ts

@@ -47,14 +47,6 @@ export default class UnlikelyFormatFilter extends Filter {
             return false;
         }
 
-        if (result.start.isOnlyTime() && (!result.start.isCertain("hour") || !result.start.isCertain("minute"))) {
-            context.debug(() => {
-                console.log(`(Strict) Removing uncertain time component: ${result} (${result.end})`);
-            });
-
-            return false;
-        }
-
         return true;
     }
 }

package/src/index.ts

@@ -1,9 +1,9 @@
 import * as en from "./locales/en";
-import { Chrono, Parser, Refiner } from "./chrono";
+import { Chrono, Parser, ParsingContext, Refiner } from "./chrono";
 import { ParsingResult, ParsingComponents, ReferenceWithTimezone } from "./results";
 import { Component, ParsedComponents, ParsedResult, ParsingOption, ParsingReference, Meridiem, Weekday } from "./types";
 
-export { en, Chrono, Parser, Refiner, ParsingResult, ParsingComponents, ReferenceWithTimezone };
+export { en, Chrono, Parser, ParsingContext, Refiner, ParsingResult, ParsingComponents, ReferenceWithTimezone };
 export { Component, ParsedComponents, ParsedResult, ParsingOption, ParsingReference, Meridiem, Weekday };
 
 // Export all locales

package/src/locales/de/parsers/DEWeekdayParser.ts

@@ -3,7 +3,7 @@ import { ParsingComponents } from "../../../results";
 import { WEEKDAY_DICTIONARY } from "../constants";
 import { matchAnyPattern } from "../../../utils/pattern";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-import { createParsingComponentsAtWeekday } from "../../../common/calculation/weekdays";
+import { createParsingComponentsAtWeekday } from "../../../calculation/weekdays";
 
 const PATTERN = new RegExp(
     "(?:(?:\\,|\\(|\\（)\\s*)?" +

package/src/locales/en/parsers/ENTimeUnitAgoFormatParser.ts

@@ -2,7 +2,7 @@ import { ParsingContext } from "../../../chrono";
 import { parseTimeUnits, TIME_UNITS_NO_ABBR_PATTERN, TIME_UNITS_PATTERN } from "../constants";
 import { ParsingComponents } from "../../../results";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-import { reverseTimeUnits } from "../../../utils/timeunits";
+import { reverseDuration } from "../../../calculation/duration";
 
 const PATTERN = new RegExp(`(${TIME_UNITS_PATTERN})\\s{0,5}(?:ago|before|earlier)(?=\\W|$)`, "i");
 const STRICT_PATTERN = new RegExp(`(${TIME_UNITS_NO_ABBR_PATTERN})\\s{0,5}(?:ago|before|earlier)(?=\\W|$)`, "i");
@@ -17,11 +17,10 @@ export default class ENTimeUnitAgoFormatParser extends AbstractParserWithWordBou
     }
 
     innerExtract(context: ParsingContext, match: RegExpMatchArray) {
-        const timeUnits = parseTimeUnits(match[1]);
-        if (!timeUnits) {
+        const duration = parseTimeUnits(match[1]);
+        if (!duration) {
             return null;
         }
-        const outputTimeUnits = reverseTimeUnits(timeUnits);
-        return ParsingComponents.createRelativeFromReference(context.reference, outputTimeUnits);
+        return ParsingComponents.createRelativeFromReference(context.reference, reverseDuration(duration));
     }
 }

package/src/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.ts

@@ -2,7 +2,7 @@ import { TIME_UNITS_PATTERN, parseTimeUnits, TIME_UNITS_NO_ABBR_PATTERN } from "
 import { ParsingContext } from "../../../chrono";
 import { ParsingComponents } from "../../../results";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-import { reverseTimeUnits } from "../../../utils/timeunits";
+import { reverseDuration } from "../../../calculation/duration";
 
 const PATTERN = new RegExp(`(this|last|past|next|after|\\+|-)\\s*(${TIME_UNITS_PATTERN})(?=\\W|$)`, "i");
 const PATTERN_NO_ABBR = new RegExp(
@@ -21,17 +21,17 @@ export default class ENTimeUnitCasualRelativeFormatParser extends AbstractParser
 
     innerExtract(context: ParsingContext, match: RegExpMatchArray) {
         const prefix = match[1].toLowerCase();
-        let timeUnits = parseTimeUnits(match[2]);
-        if (!timeUnits) {
+        let duration = parseTimeUnits(match[2]);
+        if (!duration) {
             return null;
         }
         switch (prefix) {
             case "last":
             case "past":
             case "-":
-                timeUnits = reverseTimeUnits(timeUnits);
+                duration = reverseDuration(duration);
                 break;
         }
-        return ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
+        return ParsingComponents.createRelativeFromReference(context.reference, duration);
     }
 }

package/src/locales/en/parsers/ENTimeUnitWithinFormatParser.ts

@@ -42,6 +42,11 @@ export default class ENTimeUnitWithinFormatParser extends AbstractParserWithWord
         if (!timeUnits) {
             return null;
         }
+        context.debug(() => {
+            console.log(timeUnits);
+            console.log(ParsingComponents.createRelativeFromReference(context.reference, timeUnits));
+        });
+
         return ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
     }
 }

package/src/locales/en/parsers/ENWeekdayParser.ts

@@ -3,7 +3,7 @@ import { ParsingComponents } from "../../../results";
 import { WEEKDAY_DICTIONARY } from "../constants";
 import { matchAnyPattern } from "../../../utils/pattern";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-import { createParsingComponentsAtWeekday } from "../../../common/calculation/weekdays";
+import { createParsingComponentsAtWeekday } from "../../../calculation/weekdays";
 import { Weekday } from "../../../types";
 
 const PATTERN = new RegExp(

package/src/locales/en/refiners/ENMergeRelativeFollowByDateRefiner.ts

@@ -1,7 +1,7 @@
 import { MergingRefiner } from "../../../common/abstractRefiners";
 import { ParsingComponents, ParsingResult, ReferenceWithTimezone } from "../../../results";
 import { parseTimeUnits } from "../constants";
-import { reverseTimeUnits } from "../../../utils/timeunits";
+import { reverseDuration } from "../../../calculation/duration";
 
 function hasImpliedEarlierReferenceDate(result: ParsingResult): boolean {
     return result.text.match(/\s+(before|from)$/i) != null;
@@ -38,14 +38,14 @@ export default class ENMergeRelativeFollowByDateRefiner extends MergingRefiner {
     }
 
     mergeResults(textBetween: string, currentResult: ParsingResult, nextResult: ParsingResult): ParsingResult {
-        let timeUnits = parseTimeUnits(currentResult.text);
+        let duration = parseTimeUnits(currentResult.text);
         if (hasImpliedEarlierReferenceDate(currentResult)) {
-            timeUnits = reverseTimeUnits(timeUnits);
+            duration = reverseDuration(duration);
         }
 
         const components = ParsingComponents.createRelativeFromReference(
             new ReferenceWithTimezone(nextResult.start.date()),
-            timeUnits
+            duration
         );
 
         return new ParsingResult(

package/src/locales/es/parsers/ESWeekdayParser.ts

@@ -3,7 +3,7 @@ import { ParsingComponents } from "../../../results";
 import { WEEKDAY_DICTIONARY } from "../constants";
 import { matchAnyPattern } from "../../../utils/pattern";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-import { createParsingComponentsAtWeekday } from "../../../common/calculation/weekdays";
+import { createParsingComponentsAtWeekday } from "../../../calculation/weekdays";
 
 const PATTERN = new RegExp(
     "(?:(?:\\,|\\(|\\（)\\s*)?" +

package/src/locales/fr/parsers/FRWeekdayParser.ts

@@ -3,7 +3,7 @@ import { ParsingComponents } from "../../../results";
 import { WEEKDAY_DICTIONARY } from "../constants";
 import { matchAnyPattern } from "../../../utils/pattern";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-import { createParsingComponentsAtWeekday } from "../../../common/calculation/weekdays";
+import { createParsingComponentsAtWeekday } from "../../../calculation/weekdays";
 
 const PATTERN = new RegExp(
     "(?:(?:\\,|\\(|\\（)\\s*)?" +

package/src/locales/it/index.ts

@@ -20,7 +20,7 @@ import { includeCommonConfiguration } from "../../configurations";
 import ENCasualDateParser from "./parsers/ITCasualDateParser";
 import ENCasualTimeParser from "./parsers/ITCasualTimeParser";
 import ENWeekdayParser from "./parsers/ITWeekdayParser";
-import ENRelativeDateFormatParser from "./parsers/ITRelativeDateFormatParser";
+import ITRelativeDateFormatParser from "./parsers/ITRelativeDateFormatParser";
 
 import { ParsedResult, ParsingOption } from "../../index";
 import { Chrono, Configuration } from "../../chrono";
@@ -66,7 +66,7 @@ export function createCasualConfiguration(littleEndian = false): Configuration {
     option.parsers.unshift(new ENCasualDateParser());
     option.parsers.unshift(new ENCasualTimeParser());
     option.parsers.unshift(new ENMonthNameParser());
-    option.parsers.unshift(new ENRelativeDateFormatParser());
+    option.parsers.unshift(new ITRelativeDateFormatParser());
     option.parsers.unshift(new ENTimeUnitCasualRelativeFormatParser());
     return option;
 }

package/src/locales/it/parsers/ITRelativeDateFormatParser.ts

@@ -15,7 +15,7 @@ const PATTERN = new RegExp(
 const MODIFIER_WORD_GROUP = 1;
 const RELATIVE_WORD_GROUP = 2;
 
-export default class ENRelativeDateFormatParser extends AbstractParserWithWordBoundaryChecking {
+export default class ITRelativeDateFormatParser extends AbstractParserWithWordBoundaryChecking {
     innerPattern(): RegExp {
         return PATTERN;
     }

package/src/locales/it/parsers/ITWeekdayParser.ts

@@ -3,7 +3,7 @@ import { ParsingComponents } from "../../../results";
 import { WEEKDAY_DICTIONARY } from "../constants";
 import { matchAnyPattern } from "../../../utils/pattern";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-import { createParsingComponentsAtWeekday } from "../../../common/calculation/weekdays";
+import { createParsingComponentsAtWeekday } from "../../../calculation/weekdays";
 
 const PATTERN = new RegExp(
     "(?:(?:\\,|\\(|\\（)\\s*)?" +

package/src/locales/ja/parsers/JPWeekdayParser.ts

@@ -1,7 +1,7 @@
 import { ParsingContext, Parser } from "../../../chrono";
 import { ParsingComponents } from "../../../results";
 import { WEEKDAY_OFFSET } from "../constants";
-import { createParsingComponentsAtWeekday } from "../../../common/calculation/weekdays";
+import { createParsingComponentsAtWeekday } from "../../../calculation/weekdays";
 
 const PATTERN = new RegExp(
     "((?<prefix>前の|次の|今週))?(?<weekday>" + Object.keys(WEEKDAY_OFFSET).join("|") + ")(?:曜日|曜)",

package/src/locales/ja/parsers/JPWeekdayWithParenthesesParser.ts

@@ -1,7 +1,7 @@
 import { ParsingContext, Parser } from "../../../chrono";
 import { ParsingComponents } from "../../../results";
 import { WEEKDAY_OFFSET } from "../constants";
-import { createParsingComponentsAtWeekday } from "../../../common/calculation/weekdays";
+import { createParsingComponentsAtWeekday } from "../../../calculation/weekdays";
 
 const PATTERN = new RegExp("(?:\\(|\\（)(?<weekday>" + Object.keys(WEEKDAY_OFFSET).join("|") + ")(?:\\)|\\）)", "i");
 

package/src/locales/nl/parsers/NLWeekdayParser.ts

@@ -3,7 +3,7 @@ import { ParsingComponents } from "../../../results";
 import { WEEKDAY_DICTIONARY } from "../../nl/constants";
 import { matchAnyPattern } from "../../../utils/pattern";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-import { createParsingComponentsAtWeekday } from "../../../common/calculation/weekdays";
+import { createParsingComponentsAtWeekday } from "../../../calculation/weekdays";
 
 const PATTERN = new RegExp(
     "(?:(?:\\,|\\(|\\（)\\s*)?" +

package/src/locales/pt/parsers/PTWeekdayParser.ts

@@ -3,7 +3,7 @@ import { ParsingComponents } from "../../../results";
 import { WEEKDAY_DICTIONARY } from "../constants";
 import { matchAnyPattern } from "../../../utils/pattern";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-import { createParsingComponentsAtWeekday } from "../../../common/calculation/weekdays";
+import { createParsingComponentsAtWeekday } from "../../../calculation/weekdays";
 
 const PATTERN = new RegExp(
     "(?:(?:\\,|\\(|\\（)\\s*)?" +

package/src/locales/ru/parsers/RUWeekdayParser.ts

@@ -2,7 +2,7 @@ import { ParsingContext } from "../../../chrono";
 import { ParsingComponents } from "../../../results";
 import { WEEKDAY_DICTIONARY } from "../constants";
 import { matchAnyPattern } from "../../../utils/pattern";
-import { createParsingComponentsAtWeekday } from "../../../common/calculation/weekdays";
+import { createParsingComponentsAtWeekday } from "../../../calculation/weekdays";
 import { AbstractParserWithLeftRightBoundaryChecking } from "./AbstractParserWithWordBoundaryChecking";
 
 const PREFIX_GROUP = 1;

package/src/locales/uk/parsers/UKWeekdayParser.ts

@@ -3,7 +3,7 @@ import { ParsingComponents } from "../../../results";
 // TODO: ADD REGEX_PARTS below
 import { WEEKDAY_DICTIONARY } from "../constants";
 import { matchAnyPattern } from "../../../utils/pattern";
-import { createParsingComponentsAtWeekday } from "../../../common/calculation/weekdays";
+import { createParsingComponentsAtWeekday } from "../../../calculation/weekdays";
 import { AbstractParserWithLeftRightBoundaryChecking } from "./AbstractParserWithWordBoundaryChecking";
 
 const PREFIX_GROUP = 1;

package/src/results.ts

@@ -2,8 +2,9 @@ import { Component, ParsedComponents, ParsedResult, ParsingReference } from "./t
 
 import quarterOfYear from "dayjs/plugin/quarterOfYear";
 import dayjs, { QUnitType } from "dayjs";
-import { assignSimilarDate, assignSimilarTime, implySimilarTime } from "./utils/dayjs";
+import { assignSimilarDate, assignSimilarTime, implySimilarTime } from "./utils/dates";
 import { toTimezoneOffset } from "./timezone";
+import { addDuration, Duration } from "./calculation/duration";
 dayjs.extend(quarterOfYear);
 
 export class ReferenceWithTimezone {
@@ -215,18 +216,12 @@ export class ParsingComponents implements ParsedComponents {
         return date;
     }
 
-    static createRelativeFromReference(
-        reference: ReferenceWithTimezone,
-        fragments: { [c in QUnitType]?: number }
-    ): ParsingComponents {
-        let date = dayjs(reference.getDateWithAdjustedTimezone());
-        for (const key in fragments) {
-            date = date.add(fragments[key as QUnitType], key as QUnitType);
-        }
+    static createRelativeFromReference(reference: ReferenceWithTimezone, duration: Duration): ParsingComponents {
+        let date = addDuration(reference.getDateWithAdjustedTimezone(), duration);
 
         const components = new ParsingComponents(reference);
         components.addTag("result/relativeDate");
-        if (fragments["hour"] || fragments["minute"] || fragments["second"]) {
+        if (duration["hour"] || duration["minute"] || duration["second"]) {
             components.addTag("result/relativeDateAndTime");
             assignSimilarTime(components, date);
             assignSimilarDate(components, date);
@@ -235,26 +230,27 @@ export class ParsingComponents implements ParsedComponents {
             implySimilarTime(components, date);
             components.imply("timezoneOffset", reference.getTimezoneOffset());
 
-            if (fragments["d"]) {
-                components.assign("day", date.date());
-                components.assign("month", date.month() + 1);
-                components.assign("year", date.year());
-            } else if (fragments["week"]) {
-                components.assign("day", date.date());
-                components.assign("month", date.month() + 1);
-                components.assign("year", date.year());
-                components.imply("weekday", date.day());
+            if (duration["day"]) {
+                components.assign("day", date.getDate());
+                components.assign("month", date.getMonth() + 1);
+                components.assign("year", date.getFullYear());
+                components.assign("weekday", date.getDay());
+            } else if (duration["week"]) {
+                components.assign("day", date.getDate());
+                components.assign("month", date.getMonth() + 1);
+                components.assign("year", date.getFullYear());
+                components.imply("weekday", date.getDay());
             } else {
-                components.imply("day", date.date());
-                if (fragments["month"]) {
-                    components.assign("month", date.month() + 1);
-                    components.assign("year", date.year());
+                components.imply("day", date.getDate());
+                if (duration["month"]) {
+                    components.assign("month", date.getMonth() + 1);
+                    components.assign("year", date.getFullYear());
                 } else {
-                    components.imply("month", date.month() + 1);
-                    if (fragments["year"]) {
-                        components.assign("year", date.year());
+                    components.imply("month", date.getMonth() + 1);
+                    if (duration["year"]) {
+                        components.assign("year", date.getFullYear());
                     } else {
-                        components.imply("year", date.year());
+                        components.imply("year", date.getFullYear());
                     }
                 }
             }

package/src/types.ts

@@ -129,6 +129,8 @@ export type Component =
     | "meridiem"
     | "timezoneOffset";
 
+export type Timeunit = "year" | "month" | "week" | "day" | "hour" | "minute" | "second" | "millisecond";
+
 export enum Meridiem {
     AM = 0,
     PM = 1,

package/src/utils/dates.ts

@@ -1,4 +1,29 @@
 import { ParsingComponents } from "../results";
+import { Meridiem } from "../types";
+
+/**
+ * Assign (force update) the parsing component to the same day as the `target`.
+ * @param component the component to be updated.
+ * @param target the target date with timezone adjusted.
+ */
+export function assignSimilarDate(component: ParsingComponents, target: Date) {
+    component.assign("day", target.getDate());
+    component.assign("month", target.getMonth() + 1);
+    component.assign("year", target.getFullYear());
+}
+
+/**
+ * Assign (force update) the parsing component to the same time as the `target`.
+ * @param component the component to be updated.
+ * @param target the target date with timezone adjusted.
+ */
+export function assignSimilarTime(component: ParsingComponents, target: Date) {
+    component.assign("hour", target.getHours());
+    component.assign("minute", target.getMinutes());
+    component.assign("second", target.getSeconds());
+    component.assign("millisecond", target.getMilliseconds());
+    component.assign("meridiem", target.getHours() < 12 ? Meridiem.AM : Meridiem.PM);
+}
 
 /**
  * Imply (weakly update) the parsing component to the same day as the `target`.
@@ -21,4 +46,5 @@ export function implySimilarTime(component: ParsingComponents, target: Date) {
     component.imply("minute", target.getMinutes());
     component.imply("second", target.getSeconds());
     component.imply("millisecond", target.getMilliseconds());
+    component.imply("meridiem", target.getHours() < 12 ? Meridiem.AM : Meridiem.PM);
 }