chrono-node 2.8.3 → 2.8.5

package/src/locales/es/constants.ts

@@ -1,5 +1,5 @@
-import { OpUnitType, QUnitType } from "dayjs";
 import { matchAnyPattern, repeatedTimeunitPattern } from "../../utils/pattern";
+import { Timeunit } from "../../types";
 
 export const WEEKDAY_DICTIONARY: { [word: string]: number } = {
     "domingo": 0,
@@ -78,7 +78,7 @@ export const INTEGER_WORD_DICTIONARY: { [word: string]: number } = {
     "trece": 13,
 };
 
-export const TIME_UNIT_DICTIONARY: { [word: string]: OpUnitType | QUnitType } = {
+export const TIME_UNIT_DICTIONARY: { [word: string]: Timeunit } = {
     "sec": "second",
     "segundo": "second",
     "segundos": "second",
@@ -91,8 +91,8 @@ export const TIME_UNIT_DICTIONARY: { [word: string]: OpUnitType | QUnitType } =
     "hrs": "hour",
     "hora": "hour",
     "horas": "hour",
-    "día": "d",
-    "días": "d",
+    "día": "day",
+    "días": "day",
     "semana": "week",
     "semanas": "week",
     "mes": "month",
@@ -155,7 +155,8 @@ const SINGLE_TIME_UNIT_REGEX = new RegExp(SINGLE_TIME_UNIT_PATTERN, "i");
 
 export const TIME_UNITS_PATTERN = repeatedTimeunitPattern("", SINGLE_TIME_UNIT_PATTERN);
 
-export function parseTimeUnits(timeunitText): { [c in OpUnitType | QUnitType]?: number } {
+import { Duration } from "../../calculation/duration";
+export function parseDuration(timeunitText): Duration {
     const fragments = {};
     let remainingText = timeunitText;
     let match = SINGLE_TIME_UNIT_REGEX.exec(remainingText);
@@ -164,7 +165,7 @@ export function parseTimeUnits(timeunitText): { [c in OpUnitType | QUnitType]?:
         remainingText = remainingText.substring(match[0].length);
         match = SINGLE_TIME_UNIT_REGEX.exec(remainingText);
     }
-    return fragments as { [c in OpUnitType | QUnitType]?: number };
+    return fragments as Duration;
 }
 
 function collectDateTimeFragment(fragments, match) {

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

@@ -1,8 +1,7 @@
 import { ParsingContext } from "../../../chrono";
 import { Meridiem } from "../../../types";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-import { assignTheNextDay } from "../../../utils/dayjs";
-import dayjs from "dayjs";
+import { assignSimilarDate, implySimilarTime } from "../../../utils/dates";
 
 export default class ESCasualTimeParser extends AbstractParserWithWordBoundaryChecking {
     innerPattern() {
@@ -10,7 +9,7 @@ export default class ESCasualTimeParser extends AbstractParserWithWordBoundaryCh
     }
 
     innerExtract(context: ParsingContext, match: RegExpMatchArray) {
-        const targetDate = dayjs(context.refDate);
+        const targetDate = context.refDate;
         const component = context.createParsingComponents();
         switch (match[1].toLowerCase()) {
             case "tarde":
@@ -29,7 +28,10 @@ export default class ESCasualTimeParser extends AbstractParserWithWordBoundaryCh
                 break;
 
             case "medianoche":
-                assignTheNextDay(component, targetDate);
+                const nextDay = new Date(targetDate.getTime());
+                nextDay.setDate(nextDay.getDate() + 1);
+                assignSimilarDate(component, nextDay);
+                implySimilarTime(component, nextDay);
                 component.imply("hour", 0);
                 component.imply("minute", 0);
                 component.imply("second", 0);

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

@@ -1,4 +1,4 @@
-import { TIME_UNITS_PATTERN, parseTimeUnits } from "../constants";
+import { TIME_UNITS_PATTERN, parseDuration } from "../constants";
 import { ParsingContext } from "../../../chrono";
 import { ParsingComponents } from "../../../results";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
@@ -9,7 +9,7 @@ export default class ESTimeUnitWithinFormatParser extends AbstractParserWithWord
     }
 
     innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents {
-        const timeUnits = parseTimeUnits(match[1]);
+        const timeUnits = parseDuration(match[1]);
         return ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
     }
 }

package/src/locales/fr/constants.ts

@@ -1,5 +1,5 @@
-import { OpUnitType, QUnitType } from "dayjs";
 import { matchAnyPattern, repeatedTimeunitPattern } from "../../utils/pattern";
+import { Timeunit } from "../../types";
 
 export const WEEKDAY_DICTIONARY: { [word: string]: number } = {
     "dimanche": 0,
@@ -76,7 +76,7 @@ export const INTEGER_WORD_DICTIONARY: { [word: string]: number } = {
     "treize": 13,
 };
 
-export const TIME_UNIT_DICTIONARY: { [word: string]: OpUnitType | QUnitType } = {
+export const TIME_UNIT_DICTIONARY: { [word: string]: Timeunit } = {
     "sec": "second",
     "seconde": "second",
     "secondes": "second",
@@ -89,8 +89,8 @@ export const TIME_UNIT_DICTIONARY: { [word: string]: OpUnitType | QUnitType } =
     "hrs": "hour",
     "heure": "hour",
     "heures": "hour",
-    "jour": "d",
-    "jours": "d",
+    "jour": "day",
+    "jours": "day",
     "semaine": "week",
     "semaines": "week",
     "mois": "month",
@@ -165,7 +165,8 @@ const SINGLE_TIME_UNIT_REGEX = new RegExp(SINGLE_TIME_UNIT_PATTERN, "i");
 
 export const TIME_UNITS_PATTERN = repeatedTimeunitPattern("", SINGLE_TIME_UNIT_PATTERN);
 
-export function parseTimeUnits(timeunitText): { [c in OpUnitType | QUnitType]?: number } {
+import { Duration } from "../../calculation/duration";
+export function parseDuration(timeunitText): Duration {
     const fragments = {};
     let remainingText = timeunitText;
     let match = SINGLE_TIME_UNIT_REGEX.exec(remainingText);
@@ -174,7 +175,7 @@ export function parseTimeUnits(timeunitText): { [c in OpUnitType | QUnitType]?:
         remainingText = remainingText.substring(match[0].length);
         match = SINGLE_TIME_UNIT_REGEX.exec(remainingText);
     }
-    return fragments as { [c in OpUnitType | QUnitType]?: number };
+    return fragments as Duration;
 }
 
 function collectDateTimeFragment(fragments, match) {

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

@@ -1,9 +1,8 @@
 import { ParsingContext } from "../../../chrono";
 import { ParsingComponents, ParsingResult } from "../../../results";
-import dayjs from "dayjs";
 import { Meridiem } from "../../../types";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-import { assignSimilarDate } from "../../../utils/dayjs";
+import { assignSimilarDate } from "../../../utils/dates";
 import * as references from "../../../common/casualReferences";
 
 export default class FRCasualDateParser extends AbstractParserWithWordBoundaryChecking {
@@ -12,7 +11,7 @@ export default class FRCasualDateParser extends AbstractParserWithWordBoundaryCh
     }
 
     innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents | ParsingResult {
-        let targetDate = dayjs(context.refDate);
+        const targetDate = context.refDate;
         const lowerText = match[0].toLowerCase();
         const component = context.createParsingComponents();
 
@@ -35,8 +34,9 @@ export default class FRCasualDateParser extends AbstractParserWithWordBoundaryCh
                     component.imply("hour", 22);
                     component.imply("meridiem", Meridiem.PM);
                 } else if (lowerText.match(/la\s*veille/)) {
-                    targetDate = targetDate.add(-1, "day");
-                    assignSimilarDate(component, targetDate);
+                    const previousDay = new Date(targetDate.getTime());
+                    previousDay.setDate(previousDay.getDate() - 1);
+                    assignSimilarDate(component, previousDay);
                     component.imply("hour", 0);
                 }
         }

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

@@ -1,8 +1,8 @@
 import { ParsingContext } from "../../../chrono";
-import { parseTimeUnits, TIME_UNITS_PATTERN } from "../constants";
+import { parseDuration, 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";
 
 export default class FRTimeUnitAgoFormatParser extends AbstractParserWithWordBoundaryChecking {
     constructor() {
@@ -14,8 +14,8 @@ export default class FRTimeUnitAgoFormatParser extends AbstractParserWithWordBou
     }
 
     innerExtract(context: ParsingContext, match: RegExpMatchArray) {
-        const timeUnits = parseTimeUnits(match[1]);
-        const outputTimeUnits = reverseTimeUnits(timeUnits);
+        const timeUnits = parseDuration(match[1]);
+        const outputTimeUnits = reverseDuration(timeUnits);
 
         return ParsingComponents.createRelativeFromReference(context.reference, outputTimeUnits);
     }

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

@@ -2,8 +2,8 @@ import { ParsingContext } from "../../../chrono";
 import { NUMBER_PATTERN, parseNumberPattern, TIME_UNIT_DICTIONARY } from "../constants";
 import { ParsingComponents } from "../../../results";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-import { reverseTimeUnits } from "../../../utils/timeunits";
 import { matchAnyPattern } from "../../../utils/pattern";
+import { reverseDuration } from "../../../calculation/duration";
 
 export default class FRTimeUnitAgoFormatParser extends AbstractParserWithWordBoundaryChecking {
     constructor() {
@@ -35,7 +35,7 @@ export default class FRTimeUnitAgoFormatParser extends AbstractParserWithWordBou
         }
 
         if (/derni[eè]re?s?/.test(modifier) || /pass[ée]e?s?/.test(modifier) || /pr[ée]c[ée]dents?/.test(modifier)) {
-            timeUnits = reverseTimeUnits(timeUnits);
+            timeUnits = reverseDuration(timeUnits);
         }
 
         return ParsingComponents.createRelativeFromReference(context.reference, timeUnits);

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

@@ -1,4 +1,4 @@
-import { TIME_UNITS_PATTERN, parseTimeUnits } from "../constants";
+import { TIME_UNITS_PATTERN, parseDuration } from "../constants";
 import { ParsingContext } from "../../../chrono";
 import { ParsingComponents } from "../../../results";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
@@ -9,7 +9,7 @@ export default class FRTimeUnitWithinFormatParser extends AbstractParserWithWord
     }
 
     innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents {
-        const timeUnits = parseTimeUnits(match[1]);
+        const timeUnits = parseDuration(match[1]);
         return ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
     }
 }

package/src/locales/it/constants.ts

@@ -1,7 +1,7 @@
-import { OpUnitType, QUnitType } from "dayjs";
 import { matchAnyPattern, repeatedTimeunitPattern } from "../../utils/pattern";
 import { findMostLikelyADYear } from "../../calculation/years";
-import { TimeUnits } from "../../utils/timeunits";
+import { Duration } from "../../calculation/duration";
+import { Timeunit } from "../../types";
 
 export const WEEKDAY_DICTIONARY: { [word: string]: number } = {
     "domenica": 0,
@@ -115,7 +115,7 @@ export const ORDINAL_WORD_DICTIONARY: { [word: string]: number } = {
     "trentunesimo": 31,
 };
 
-export const TIME_UNIT_DICTIONARY: { [word: string]: OpUnitType | QUnitType } = {
+export const TIME_UNIT_DICTIONARY: { [word: string]: Timeunit } = {
     "sec": "second",
     "secondo": "second",
     "secondi": "second",
@@ -127,8 +127,8 @@ export const TIME_UNIT_DICTIONARY: { [word: string]: OpUnitType | QUnitType } =
     "o": "hour",
     "ora": "hour",
     "ore": "hour",
-    "giorno": "d",
-    "giorni": "d",
+    "giorno": "day",
+    "giorni": "day",
     "settimana": "week",
     "settimane": "week",
     "mese": "month",
@@ -211,7 +211,7 @@ const SINGLE_TIME_UNIT_REGEX = new RegExp(SINGLE_TIME_UNIT_PATTERN, "i");
 
 export const TIME_UNITS_PATTERN = repeatedTimeunitPattern(`(?:(?:about|around)\\s{0,3})?`, SINGLE_TIME_UNIT_PATTERN);
 
-export function parseTimeUnits(timeunitText): TimeUnits {
+export function parseDuration(timeunitText): Duration {
     const fragments = {};
     let remainingText = timeunitText;
     let match = SINGLE_TIME_UNIT_REGEX.exec(remainingText);
@@ -220,7 +220,7 @@ export function parseTimeUnits(timeunitText): TimeUnits {
         remainingText = remainingText.substring(match[0].length).trim();
         match = SINGLE_TIME_UNIT_REGEX.exec(remainingText);
     }
-    return fragments;
+    return fragments as Duration;
 }
 
 function collectDateTimeFragment(fragments, match) {

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

@@ -1,19 +1,18 @@
 import { ParsingContext } from "../../../chrono";
 import { ParsingComponents, ParsingResult } from "../../../results";
-import dayjs from "dayjs";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-import { assignSimilarDate } from "../../../utils/dayjs";
+import { assignSimilarDate } from "../../../utils/dates";
 import * as references from "../../../common/casualReferences";
 
 const PATTERN = /(ora|oggi|stasera|questa sera|domani|dmn|ieri\s*sera)(?=\W|$)/i;
 
-export default class ENCasualDateParser extends AbstractParserWithWordBoundaryChecking {
+export default class ITCasualDateParser extends AbstractParserWithWordBoundaryChecking {
     innerPattern(context: ParsingContext): RegExp {
         return PATTERN;
     }
 
     innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents | ParsingResult {
-        let targetDate = dayjs(context.refDate);
+        let targetDate = context.refDate;
         const lowerText = match[0].toLowerCase();
         const component = context.createParsingComponents();
 
@@ -37,8 +36,10 @@ export default class ENCasualDateParser extends AbstractParserWithWordBoundaryCh
 
             default:
                 if (lowerText.match(/ieri\s*sera/)) {
-                    if (targetDate.hour() > 6) {
-                        targetDate = targetDate.add(-1, "day");
+                    if (targetDate.getHours() > 6) {
+                        const previousDay = new Date(targetDate.getTime());
+                        previousDay.setDate(previousDay.getDate() - 1);
+                        targetDate = previousDay;
                     }
 
                     assignSimilarDate(component, targetDate);

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

@@ -1,18 +1,17 @@
 import { ParsingContext } from "../../../chrono";
 import { Meridiem } from "../../../index";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-import dayjs from "dayjs";
-import { assignTheNextDay } from "../../../utils/dayjs";
+import { assignSimilarDate, implySimilarTime } from "../../../utils/dates";
 
 const PATTERN = /(?:questo|questa)?\s{0,3}(mattina|pomeriggio|sera|notte|mezzanotte|mezzogiorno)(?=\W|$)/i;
 
-export default class ENCasualTimeParser extends AbstractParserWithWordBoundaryChecking {
+export default class ITCasualTimeParser extends AbstractParserWithWordBoundaryChecking {
     innerPattern() {
         return PATTERN;
     }
 
     innerExtract(context: ParsingContext, match: RegExpMatchArray) {
-        const targetDate = dayjs(context.refDate);
+        const targetDate = context.refDate;
         const component = context.createParsingComponents();
 
         switch (match[1].toLowerCase()) {
@@ -28,7 +27,10 @@ export default class ENCasualTimeParser extends AbstractParserWithWordBoundaryCh
                 break;
 
             case "mezzanotte":
-                assignTheNextDay(component, targetDate);
+                const nextDay = new Date(targetDate.getTime());
+                nextDay.setDate(nextDay.getDate() + 1);
+                assignSimilarDate(component, nextDay);
+                implySimilarTime(component, nextDay);
                 component.imply("hour", 0);
                 component.imply("minute", 0);
                 component.imply("second", 0);

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

@@ -1,7 +1,6 @@
 import { TIME_UNIT_DICTIONARY } from "../constants";
 import { ParsingContext } from "../../../chrono";
 import { ParsingComponents } from "../../../results";
-import dayjs from "dayjs";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
 import { matchAnyPattern } from "../../../utils/pattern";
 
@@ -38,32 +37,31 @@ export default class ITRelativeDateFormatParser extends AbstractParserWithWordBo
         }
 
         const components = context.createParsingComponents();
-        let date = dayjs(context.reference.instant);
+        let date = new Date(context.reference.instant.getTime());
 
         // This week
         if (unitWord.match(/settimana/i)) {
-            date = date.add(-date.get("d"), "d");
-            components.imply("day", date.date());
-            components.imply("month", date.month() + 1);
-            components.imply("year", date.year());
+            date.setDate(date.getDate() - date.getDay());
+            components.imply("day", date.getDate());
+            components.imply("month", date.getMonth() + 1);
+            components.imply("year", date.getFullYear());
         }
 
         // This month
         else if (unitWord.match(/mese/i)) {
-            date = date.add(-date.date() + 1, "d");
-            components.imply("day", date.date());
-            components.assign("year", date.year());
-            components.assign("month", date.month() + 1);
+            date.setDate(1);
+            components.imply("day", date.getDate());
+            components.assign("year", date.getFullYear());
+            components.assign("month", date.getMonth() + 1);
         }
 
         // This year
         else if (unitWord.match(/anno/i)) {
-            date = date.add(-date.date() + 1, "d");
-            date = date.add(-date.month(), "month");
-
-            components.imply("day", date.date());
-            components.imply("month", date.month() + 1);
-            components.assign("year", date.year());
+            date.setDate(1);
+            date.setMonth(0);
+            components.imply("day", date.getDate());
+            components.imply("month", date.getMonth() + 1);
+            components.assign("year", date.getFullYear());
         }
 
         return components;

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

@@ -1,8 +1,8 @@
 import { ParsingContext } from "../../../chrono";
-import { parseTimeUnits, TIME_UNITS_PATTERN } from "../constants";
+import { parseDuration, 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}(?:fa|prima|precedente)(?=(?:\\W|$))`, "i");
 const STRICT_PATTERN = new RegExp(`(${TIME_UNITS_PATTERN})\\s{0,5}fa(?=(?:\\W|$))`, "i");
@@ -17,8 +17,8 @@ export default class ENTimeUnitAgoFormatParser extends AbstractParserWithWordBou
     }
 
     innerExtract(context: ParsingContext, match: RegExpMatchArray) {
-        const timeUnits = parseTimeUnits(match[1]);
-        const outputTimeUnits = reverseTimeUnits(timeUnits);
+        const timeUnits = parseDuration(match[1]);
+        const outputTimeUnits = reverseDuration(timeUnits);
 
         return ParsingComponents.createRelativeFromReference(context.reference, outputTimeUnits);
     }

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

@@ -1,8 +1,8 @@
-import { TIME_UNITS_PATTERN, parseTimeUnits } from "../constants";
+import { TIME_UNITS_PATTERN, parseDuration } from "../constants";
 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(
     `(questo|ultimo|passato|prossimo|dopo|questa|ultima|passata|prossima|\\+|-)\\s*(${TIME_UNITS_PATTERN})(?=\\W|$)`,
@@ -16,12 +16,12 @@ export default class ENTimeUnitCasualRelativeFormatParser extends AbstractParser
 
     innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents {
         const prefix = match[1].toLowerCase();
-        let timeUnits = parseTimeUnits(match[2]);
+        let timeUnits = parseDuration(match[2]);
         switch (prefix) {
             case "last":
             case "past":
             case "-":
-                timeUnits = reverseTimeUnits(timeUnits);
+                timeUnits = reverseDuration(timeUnits);
                 break;
         }
 

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

@@ -1,5 +1,5 @@
 import { ParsingContext } from "../../../chrono";
-import { parseTimeUnits, TIME_UNITS_PATTERN } from "../constants";
+import { parseDuration, TIME_UNITS_PATTERN } from "../constants";
 import { ParsingComponents } from "../../../results";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
 
@@ -21,7 +21,7 @@ export default class ENTimeUnitLaterFormatParser extends AbstractParserWithWordB
     }
 
     innerExtract(context: ParsingContext, match: RegExpMatchArray) {
-        const fragments = parseTimeUnits(match[GROUP_NUM_TIMEUNITS]);
+        const fragments = parseDuration(match[GROUP_NUM_TIMEUNITS]);
         return ParsingComponents.createRelativeFromReference(context.reference, fragments);
     }
 }

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

@@ -1,4 +1,4 @@
-import { TIME_UNITS_PATTERN, parseTimeUnits } from "../constants";
+import { TIME_UNITS_PATTERN, parseDuration } from "../constants";
 import { ParsingContext } from "../../../chrono";
 import { ParsingComponents } from "../../../results";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
@@ -20,7 +20,7 @@ export default class ENTimeUnitWithinFormatParser extends AbstractParserWithWord
     }
 
     innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents {
-        const timeUnits = parseTimeUnits(match[1]);
+        const timeUnits = parseDuration(match[1]);
         return ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
     }
 }

package/src/locales/it/refiners/ITMergeRelativeDateRefiner.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 { parseDuration } from "../constants";
+import { reverseDuration } from "../../../calculation/duration";
 
 function hasImpliedEarlierReferenceDate(result: ParsingResult): boolean {
     return result.text.match(/\s+(prima|dal)$/i) != null;
@@ -38,13 +38,13 @@ export default class ENMergeRelativeDateRefiner extends MergingRefiner {
     }
 
     mergeResults(textBetween: string, currentResult: ParsingResult, nextResult: ParsingResult): ParsingResult {
-        let timeUnits = parseTimeUnits(currentResult.text);
+        let timeUnits = parseDuration(currentResult.text);
         if (hasImpliedEarlierReferenceDate(currentResult)) {
-            timeUnits = reverseTimeUnits(timeUnits);
+            timeUnits = reverseDuration(timeUnits);
         }
 
         const components = ParsingComponents.createRelativeFromReference(
-            new ReferenceWithTimezone(nextResult.start.date()),
+            ReferenceWithTimezone.fromDate(nextResult.start.date()),
             timeUnits
         );
 

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

@@ -1,5 +1,4 @@
 import { Parser, ParsingContext } from "../../../chrono";
-import dayjs from "dayjs";
 import { Meridiem } from "../../../types";
 import * as references from "../../../common/casualReferences";
 
@@ -36,7 +35,6 @@ export default class JPCasualDateParser implements Parser {
     extract(context: ParsingContext, match: RegExpMatchArray) {
         const text = normalizeTextToKanji(match[0]);
 
-        const date = dayjs(context.refDate);
         const components = context.createParsingComponents();
 
         switch (text) {
@@ -59,9 +57,10 @@ export default class JPCasualDateParser implements Parser {
             components.assign("meridiem", Meridiem.AM);
         }
 
-        components.assign("day", date.date());
-        components.assign("month", date.month() + 1);
-        components.assign("year", date.year());
+        const date = context.refDate;
+        components.assign("day", date.getDate());
+        components.assign("month", date.getMonth() + 1);
+        components.assign("year", date.getFullYear());
         return components;
     }
 }

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

@@ -2,8 +2,6 @@ import { Parser, ParsingContext } from "../../../chrono";
 import { toHankaku } from "../constants";
 import { findYearClosestToRef } from "../../../calculation/years";
 
-import dayjs from "dayjs";
-
 const PATTERN =
     /(?:(?:([同今本])|((昭和|平成|令和)?([0-9０-９]{1,4}|元)))年\s*)?([0-9０-９]{1,2})月\s*([0-9０-９]{1,2})日/i;
 const SPECIAL_YEAR_GROUP = 1;
@@ -27,8 +25,7 @@ export default class JPStandardParser implements Parser {
         });
 
         if (match[SPECIAL_YEAR_GROUP] && match[SPECIAL_YEAR_GROUP].match("同|今|本")) {
-            const moment = dayjs(context.refDate);
-            components.assign("year", moment.year());
+            components.assign("year", context.reference.getDateWithAdjustedTimezone().getFullYear());
         }
 
         if (match[TYPICAL_YEAR_GROUP]) {