chrono-node 2.8.3 → 2.8.5

package/dist/cjs/calculation/duration.d.ts

@@ -4,5 +4,10 @@ export type TimeunitSpecial = "quarter";
 export type Duration = {
     [c in Timeunit | TimeunitSpecial | TimeunitShorten]?: number;
 };
+export declare const EmptyDuration: {
+    day: number;
+    second: number;
+    millisecond: number;
+};
 export declare function addDuration(ref: Date, duration: Duration): Date;
 export declare function reverseDuration(duration: Duration): Duration;

package/dist/cjs/calculation/duration.js

@@ -1,7 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.EmptyDuration = void 0;
 exports.addDuration = addDuration;
 exports.reverseDuration = reverseDuration;
+exports.EmptyDuration = {
+    day: 0,
+    second: 0,
+    millisecond: 0,
+};
 function addDuration(ref, duration) {
     var _a, _b, _c, _d, _e, _f, _g;
     let date = new Date(ref);

package/dist/cjs/calculation/duration.js.map

@@ -1 +1 @@
-{"version":3,"file":"duration.js","sourceRoot":"","sources":["../../../src/calculation/duration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"duration.js","sourceRoot":"","sources":["../../../src/calculation/duration.ts"],"names":[],"mappings":"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"}

package/dist/cjs/calculation/mergingCalculation.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeDateTimeResult = mergeDateTimeResult;
 exports.mergeDateTimeComponent = mergeDateTimeComponent;
 const types_1 = require("../types");
-const dayjs_1 = require("../utils/dayjs");
+const dates_1 = require("../utils/dates");
 function mergeDateTimeResult(dateResult, timeResult) {
     const result = dateResult.clone();
     const beginDate = dateResult.start;
@@ -14,12 +14,13 @@ function mergeDateTimeResult(dateResult, timeResult) {
         const endTime = timeResult.end == null ? timeResult.start : timeResult.end;
         const endDateTime = mergeDateTimeComponent(endDate, endTime);
         if (dateResult.end == null && endDateTime.date().getTime() < result.start.date().getTime()) {
-            const nextDayJs = endDateTime.dayjs().add(1, "day");
+            const nextDay = new Date(endDateTime.date().getTime());
+            nextDay.setDate(nextDay.getDate() + 1);
             if (endDateTime.isCertain("day")) {
-                (0, dayjs_1.assignSimilarDate)(endDateTime, nextDayJs);
+                (0, dates_1.assignSimilarDate)(endDateTime, nextDay);
             }
             else {
-                (0, dayjs_1.implySimilarDate)(endDateTime, nextDayJs);
+                (0, dates_1.implySimilarDate)(endDateTime, nextDay);
             }
         }
         result.end = endDateTime;

package/dist/cjs/calculation/mergingCalculation.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergingCalculation.js","sourceRoot":"","sources":["../../../src/calculation/mergingCalculation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mergingCalculation.js","sourceRoot":"","sources":["../../../src/calculation/mergingCalculation.ts"],"names":[],"mappings":"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"}

package/dist/cjs/calculation/weekdays.js

@@ -7,12 +7,11 @@ exports.getDaysForwardToWeekday = getDaysForwardToWeekday;
 exports.getBackwardDaysToWeekday = getBackwardDaysToWeekday;
 const types_1 = require("../types");
 const results_1 = require("../results");
-const timeunits_1 = require("../utils/timeunits");
 function createParsingComponentsAtWeekday(reference, weekday, modifier) {
     const refDate = reference.getDateWithAdjustedTimezone();
     const daysToWeekday = getDaysToWeekday(refDate, weekday, modifier);
     let components = new results_1.ParsingComponents(reference);
-    components = (0, timeunits_1.addImpliedTimeUnits)(components, { "day": daysToWeekday });
+    components = components.addDurationAsImplied({ day: daysToWeekday });
     components.assign("weekday", weekday);
     return components;
 }

package/dist/cjs/calculation/weekdays.js.map

@@ -1 +1 @@
-{"version":3,"file":"weekdays.js","sourceRoot":"","sources":["../../../src/calculation/weekdays.ts"],"names":[],"mappings":";;AAWA,4EAaC;AAQD,4CA+BC;AAED,0DAKC;AAED,0DAOC;AAED,4DAOC;AAxFD,oCAAmC;AACnC,wCAAsE;AACtE,kDAAyD;AASzD,SAAgB,gCAAgC,CAC5C,SAAgC,EAChC,OAAgB,EAChB,QAAmC;IAEnC,MAAM,OAAO,GAAG,SAAS,CAAC,2BAA2B,EAAE,CAAC;IACxD,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAEnE,IAAI,UAAU,GAAG,IAAI,2BAAiB,CAAC,SAAS,CAAC,CAAC;IAClD,UAAU,GAAG,IAAA,+BAAmB,EAAC,UAAU,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC;IACvE,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAEtC,OAAO,UAAU,CAAC;AACtB,CAAC;AAQD,SAAgB,gBAAgB,CAAC,OAAa,EAAE,OAAgB,EAAE,QAAmC;IACjG,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,EAAa,CAAC;IAC/C,QAAQ,QAAQ,EAAE,CAAC;QACf,KAAK,MAAM;YACP,OAAO,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACrD,KAAK,MAAM;YACP,OAAO,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACtD,KAAK,MAAM;YAGP,IAAI,UAAU,IAAI,eAAO,CAAC,MAAM,EAAE,CAAC;gBAC/B,OAAO,OAAO,IAAI,eAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACnD,CAAC;YAID,IAAI,UAAU,IAAI,eAAO,CAAC,QAAQ,EAAE,CAAC;gBACjC,IAAI,OAAO,IAAI,eAAO,CAAC,QAAQ;oBAAE,OAAO,CAAC,CAAC;gBAC1C,IAAI,OAAO,IAAI,eAAO,CAAC,MAAM;oBAAE,OAAO,CAAC,CAAC;gBACxC,OAAO,CAAC,GAAG,OAAO,CAAC;YACvB,CAAC;YAID,IAAI,OAAO,GAAG,UAAU,IAAI,OAAO,IAAI,eAAO,CAAC,MAAM,EAAE,CAAC;gBACpD,OAAO,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACrD,CAAC;iBAAM,CAAC;gBACJ,OAAO,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;YACzD,CAAC;IACT,CAAC;IACD,OAAO,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACrD,CAAC;AAED,SAAgB,uBAAuB,CAAC,OAAa,EAAE,OAAgB;IACnE,MAAM,QAAQ,GAAG,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5D,MAAM,OAAO,GAAG,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE1D,OAAO,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;AACpD,CAAC;AAED,SAAgB,uBAAuB,CAAC,OAAa,EAAE,OAAgB;IACnE,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IACpC,IAAI,YAAY,GAAG,OAAO,GAAG,UAAU,CAAC;IACxC,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;QACnB,YAAY,IAAI,CAAC,CAAC;IACtB,CAAC;IACD,OAAO,YAAY,CAAC;AACxB,CAAC;AAED,SAAgB,wBAAwB,CAAC,OAAa,EAAE,OAAgB;IACpE,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IACpC,IAAI,aAAa,GAAG,OAAO,GAAG,UAAU,CAAC;IACzC,IAAI,aAAa,IAAI,CAAC,EAAE,CAAC;QACrB,aAAa,IAAI,CAAC,CAAC;IACvB,CAAC;IACD,OAAO,aAAa,CAAC;AACzB,CAAC"}
+{"version":3,"file":"weekdays.js","sourceRoot":"","sources":["../../../src/calculation/weekdays.ts"],"names":[],"mappings":"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"}

package/dist/cjs/calculation/years.js

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findMostLikelyADYear = findMostLikelyADYear;
 exports.findYearClosestToRef = findYearClosestToRef;
-const dayjs_1 = __importDefault(require("dayjs"));
+const duration_1 = require("./duration");
 function findMostLikelyADYear(yearNumber) {
     if (yearNumber < 100) {
         if (yearNumber > 50) {
@@ -18,19 +15,17 @@ function findMostLikelyADYear(yearNumber) {
     return yearNumber;
 }
 function findYearClosestToRef(refDate, day, month) {
-    const refMoment = (0, dayjs_1.default)(refDate);
-    let dateMoment = refMoment;
-    dateMoment = dateMoment.month(month - 1);
-    dateMoment = dateMoment.date(day);
-    dateMoment = dateMoment.year(refMoment.year());
-    const nextYear = dateMoment.add(1, "y");
-    const lastYear = dateMoment.add(-1, "y");
-    if (Math.abs(nextYear.diff(refMoment)) < Math.abs(dateMoment.diff(refMoment))) {
-        dateMoment = nextYear;
+    let date = new Date(refDate);
+    date.setMonth(month - 1);
+    date.setDate(day);
+    const nextYear = (0, duration_1.addDuration)(date, { "year": 1 });
+    const lastYear = (0, duration_1.addDuration)(date, { "year": -1 });
+    if (Math.abs(nextYear.getTime() - refDate.getTime()) < Math.abs(date.getTime() - refDate.getTime())) {
+        date = nextYear;
     }
-    else if (Math.abs(lastYear.diff(refMoment)) < Math.abs(dateMoment.diff(refMoment))) {
-        dateMoment = lastYear;
+    else if (Math.abs(lastYear.getTime() - refDate.getTime()) < Math.abs(date.getTime() - refDate.getTime())) {
+        date = lastYear;
     }
-    return dateMoment.year();
+    return date.getFullYear();
 }
 //# sourceMappingURL=years.js.map

package/dist/cjs/calculation/years.js.map

@@ -1 +1 @@
-{"version":3,"file":"years.js","sourceRoot":"","sources":["../../../src/calculation/years.ts"],"names":[],"mappings":";;;;;AAQA,oDAUC;AAED,oDAiBC;AArCD,kDAA0B;AAQ1B,SAAgB,oBAAoB,CAAC,UAAkB;IACnD,IAAI,UAAU,GAAG,GAAG,EAAE,CAAC;QACnB,IAAI,UAAU,GAAG,EAAE,EAAE,CAAC;YAClB,UAAU,GAAG,UAAU,GAAG,IAAI,CAAC;QACnC,CAAC;aAAM,CAAC;YACJ,UAAU,GAAG,UAAU,GAAG,IAAI,CAAC;QACnC,CAAC;IACL,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAgB,oBAAoB,CAAC,OAAa,EAAE,GAAW,EAAE,KAAa;IAE1E,MAAM,SAAS,GAAG,IAAA,eAAK,EAAC,OAAO,CAAC,CAAC;IACjC,IAAI,UAAU,GAAG,SAAS,CAAC;IAC3B,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IACzC,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClC,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;IAE/C,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACxC,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACzC,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;QAC5E,UAAU,GAAG,QAAQ,CAAC;IAC1B,CAAC;SAAM,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;QACnF,UAAU,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAED,OAAO,UAAU,CAAC,IAAI,EAAE,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"years.js","sourceRoot":"","sources":["../../../src/calculation/years.ts"],"names":[],"mappings":";;AAQA,oDAUC;AAED,oDAYC;AAhCD,yCAAyC;AAQzC,SAAgB,oBAAoB,CAAC,UAAkB;IACnD,IAAI,UAAU,GAAG,GAAG,EAAE,CAAC;QACnB,IAAI,UAAU,GAAG,EAAE,EAAE,CAAC;YAClB,UAAU,GAAG,UAAU,GAAG,IAAI,CAAC;QACnC,CAAC;aAAM,CAAC;YACJ,UAAU,GAAG,UAAU,GAAG,IAAI,CAAC;QACnC,CAAC;IACL,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAgB,oBAAoB,CAAC,OAAa,EAAE,GAAW,EAAE,KAAa;IAC1E,IAAI,IAAI,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7B,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IACzB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAClB,MAAM,QAAQ,GAAG,IAAA,sBAAW,EAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IAClD,MAAM,QAAQ,GAAG,IAAA,sBAAW,EAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IACnD,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;QAClG,IAAI,GAAG,QAAQ,CAAC;IACpB,CAAC;SAAM,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;QACzG,IAAI,GAAG,QAAQ,CAAC;IACpB,CAAC;IACD,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;AAC9B,CAAC"}

package/dist/cjs/chrono.js

@@ -78,8 +78,8 @@ exports.Chrono = Chrono;
 class ParsingContext {
     constructor(text, refDate, option) {
         this.text = text;
-        this.reference = new results_1.ReferenceWithTimezone(refDate);
         this.option = option !== null && option !== void 0 ? option : {};
+        this.reference = results_1.ReferenceWithTimezone.fromInput(refDate, this.option.timezones);
         this.refDate = this.reference.instant;
     }
     createParsingComponents(components) {

package/dist/cjs/chrono.js.map

@@ -1 +1 @@
-{"version":3,"file":"chrono.js","sourceRoot":"","sources":["../../src/chrono.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chrono.js","sourceRoot":"","sources":["../../src/chrono.ts"],"names":[],"mappings":"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"}

package/dist/cjs/common/casualReferences.js

@@ -1,7 +1,4 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.now = now;
 exports.today = today;
@@ -18,23 +15,23 @@ exports.morning = morning;
 exports.afternoon = afternoon;
 exports.noon = noon;
 const results_1 = require("../results");
-const dayjs_1 = __importDefault(require("dayjs"));
-const dayjs_2 = require("../utils/dayjs");
+const dates_1 = require("../utils/dates");
 const types_1 = require("../types");
 function now(reference) {
-    const targetDate = (0, dayjs_1.default)(reference.getDateWithAdjustedTimezone());
+    const targetDate = reference.getDateWithAdjustedTimezone();
     const component = new results_1.ParsingComponents(reference, {});
-    (0, dayjs_2.assignSimilarDate)(component, targetDate);
-    (0, dayjs_2.assignSimilarTime)(component, targetDate);
+    (0, dates_1.assignSimilarDate)(component, targetDate);
+    (0, dates_1.assignSimilarTime)(component, targetDate);
     component.assign("timezoneOffset", reference.getTimezoneOffset());
     component.addTag("casualReference/now");
     return component;
 }
 function today(reference) {
-    const targetDate = (0, dayjs_1.default)(reference.getDateWithAdjustedTimezone());
+    const targetDate = reference.getDateWithAdjustedTimezone();
     const component = new results_1.ParsingComponents(reference, {});
-    (0, dayjs_2.assignSimilarDate)(component, targetDate);
-    (0, dayjs_2.implySimilarTime)(component, targetDate);
+    (0, dates_1.assignSimilarDate)(component, targetDate);
+    (0, dates_1.implySimilarTime)(component, targetDate);
+    component.delete("meridiem");
     component.addTag("casualReference/today");
     return component;
 }
@@ -48,29 +45,31 @@ function tomorrow(reference) {
     return theDayAfter(reference, 1).addTag("casualReference/tomorrow");
 }
 function theDayAfter(reference, nDays) {
-    let targetDate = (0, dayjs_1.default)(reference.getDateWithAdjustedTimezone());
+    const targetDate = reference.getDateWithAdjustedTimezone();
     const component = new results_1.ParsingComponents(reference, {});
-    targetDate = targetDate.add(nDays, "day");
-    (0, dayjs_2.assignSimilarDate)(component, targetDate);
-    (0, dayjs_2.implySimilarTime)(component, targetDate);
+    const newDate = new Date(targetDate.getTime());
+    newDate.setDate(newDate.getDate() + nDays);
+    (0, dates_1.assignSimilarDate)(component, newDate);
+    (0, dates_1.implySimilarTime)(component, newDate);
+    component.delete("meridiem");
     return component;
 }
 function tonight(reference, implyHour = 22) {
-    const targetDate = (0, dayjs_1.default)(reference.getDateWithAdjustedTimezone());
+    const targetDate = reference.getDateWithAdjustedTimezone();
     const component = new results_1.ParsingComponents(reference, {});
-    (0, dayjs_2.assignSimilarDate)(component, targetDate);
+    (0, dates_1.assignSimilarDate)(component, targetDate);
     component.imply("hour", implyHour);
     component.imply("meridiem", types_1.Meridiem.PM);
     component.addTag("casualReference/tonight");
     return component;
 }
 function lastNight(reference, implyHour = 0) {
-    let targetDate = (0, dayjs_1.default)(reference.getDateWithAdjustedTimezone());
+    let targetDate = reference.getDateWithAdjustedTimezone();
     const component = new results_1.ParsingComponents(reference, {});
-    if (targetDate.hour() < 6) {
-        targetDate = targetDate.add(-1, "day");
+    if (targetDate.getHours() < 6) {
+        targetDate = new Date(targetDate.getTime() - 24 * 60 * 60 * 1000);
     }
-    (0, dayjs_2.assignSimilarDate)(component, targetDate);
+    (0, dates_1.assignSimilarDate)(component, targetDate);
     component.imply("hour", implyHour);
     return component;
 }
@@ -82,10 +81,10 @@ function evening(reference, implyHour = 20) {
     return component;
 }
 function yesterdayEvening(reference, implyHour = 20) {
-    let targetDate = (0, dayjs_1.default)(reference.getDateWithAdjustedTimezone());
+    let targetDate = reference.getDateWithAdjustedTimezone();
     const component = new results_1.ParsingComponents(reference, {});
-    targetDate = targetDate.add(-1, "day");
-    (0, dayjs_2.assignSimilarDate)(component, targetDate);
+    targetDate = new Date(targetDate.getTime() - 24 * 60 * 60 * 1000);
+    (0, dates_1.assignSimilarDate)(component, targetDate);
     component.imply("hour", implyHour);
     component.imply("meridiem", types_1.Meridiem.PM);
     component.addTag("casualReference/yesterday");
@@ -94,9 +93,8 @@ function yesterdayEvening(reference, implyHour = 20) {
 }
 function midnight(reference) {
     const component = new results_1.ParsingComponents(reference, {});
-    const targetDate = (0, dayjs_1.default)(reference.getDateWithAdjustedTimezone());
-    if (targetDate.hour() > 2) {
-        (0, dayjs_2.implyTheNextDay)(component, targetDate);
+    if (reference.getDateWithAdjustedTimezone().getHours() > 2) {
+        component.addDurationAsImplied({ day: 1 });
     }
     component.assign("hour", 0);
     component.imply("minute", 0);

package/dist/cjs/common/casualReferences.js.map

@@ -1 +1 @@
-{"version":3,"file":"casualReferences.js","sourceRoot":"","sources":["../../../src/common/casualReferences.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"casualReferences.js","sourceRoot":"","sources":["../../../src/common/casualReferences.ts"],"names":[],"mappings":"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"}

package/dist/cjs/common/parsers/AbstractTimeExpressionParser.js

@@ -103,6 +103,9 @@ class AbstractTimeExpressionParser {
         let meridiem = null;
         let hour = parseInt(match[HOUR_GROUP]);
         if (hour > 100) {
+            if (match[HOUR_GROUP].length == 4 && match[MINUTE_GROUP] == null && !match[AM_PM_HOUR_GROUP]) {
+                return null;
+            }
             if (this.strictMode || match[MINUTE_GROUP] != null) {
                 return null;
             }

package/dist/cjs/common/parsers/AbstractTimeExpressionParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractTimeExpressionParser.js","sourceRoot":"","sources":["../../../../src/common/parsers/AbstractTimeExpressionParser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AbstractTimeExpressionParser.js","sourceRoot":"","sources":["../../../../src/common/parsers/AbstractTimeExpressionParser.ts"],"names":[],"mappings":"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"}

package/dist/cjs/common/refiners/AbstractMergeDateRangeRefiner.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const abstractRefiners_1 = require("../abstractRefiners");
+const duration_1 = require("../../calculation/duration");
 class AbstractMergeDateRangeRefiner extends abstractRefiners_1.MergingRefiner {
     shouldMergeResults(textBetween, currentResult, nextResult) {
         return !currentResult.end && !nextResult.end && textBetween.match(this.patternBetween()) != null;
@@ -18,28 +19,28 @@ class AbstractMergeDateRangeRefiner extends abstractRefiners_1.MergingRefiner {
                 }
             });
         }
-        if (fromResult.start.date().getTime() > toResult.start.date().getTime()) {
-            let fromMoment = fromResult.start.dayjs();
-            let toMoment = toResult.start.dayjs();
-            if (toResult.start.isOnlyWeekdayComponent() && toMoment.add(7, "days").isAfter(fromMoment)) {
-                toMoment = toMoment.add(7, "days");
-                toResult.start.imply("day", toMoment.date());
-                toResult.start.imply("month", toMoment.month() + 1);
-                toResult.start.imply("year", toMoment.year());
+        if (fromResult.start.date() > toResult.start.date()) {
+            let fromDate = fromResult.start.date();
+            let toDate = toResult.start.date();
+            if (toResult.start.isOnlyWeekdayComponent() && (0, duration_1.addDuration)(toDate, { day: 7 }) > fromDate) {
+                toDate = (0, duration_1.addDuration)(toDate, { day: 7 });
+                toResult.start.imply("day", toDate.getDate());
+                toResult.start.imply("month", toDate.getMonth() + 1);
+                toResult.start.imply("year", toDate.getFullYear());
             }
-            else if (fromResult.start.isOnlyWeekdayComponent() && fromMoment.add(-7, "days").isBefore(toMoment)) {
-                fromMoment = fromMoment.add(-7, "days");
-                fromResult.start.imply("day", fromMoment.date());
-                fromResult.start.imply("month", fromMoment.month() + 1);
-                fromResult.start.imply("year", fromMoment.year());
+            else if (fromResult.start.isOnlyWeekdayComponent() && (0, duration_1.addDuration)(fromDate, { day: -7 }) < toDate) {
+                fromDate = (0, duration_1.addDuration)(fromDate, { day: -7 });
+                fromResult.start.imply("day", fromDate.getDate());
+                fromResult.start.imply("month", fromDate.getMonth() + 1);
+                fromResult.start.imply("year", fromDate.getFullYear());
             }
-            else if (toResult.start.isDateWithUnknownYear() && toMoment.add(1, "years").isAfter(fromMoment)) {
-                toMoment = toMoment.add(1, "years");
-                toResult.start.imply("year", toMoment.year());
+            else if (toResult.start.isDateWithUnknownYear() && (0, duration_1.addDuration)(toDate, { year: 1 }) > fromDate) {
+                toDate = (0, duration_1.addDuration)(toDate, { year: 1 });
+                toResult.start.imply("year", toDate.getFullYear());
             }
-            else if (fromResult.start.isDateWithUnknownYear() && fromMoment.add(-1, "years").isBefore(toMoment)) {
-                fromMoment = fromMoment.add(-1, "years");
-                fromResult.start.imply("year", fromMoment.year());
+            else if (fromResult.start.isDateWithUnknownYear() && (0, duration_1.addDuration)(fromDate, { year: -1 }) < toDate) {
+                fromDate = (0, duration_1.addDuration)(fromDate, { year: -1 });
+                fromResult.start.imply("year", fromDate.getFullYear());
             }
             else {
                 [toResult, fromResult] = [fromResult, toResult];

package/dist/cjs/common/refiners/AbstractMergeDateRangeRefiner.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractMergeDateRangeRefiner.js","sourceRoot":"","sources":["../../../../src/common/refiners/AbstractMergeDateRangeRefiner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AbstractMergeDateRangeRefiner.js","sourceRoot":"","sources":["../../../../src/common/refiners/AbstractMergeDateRangeRefiner.ts"],"names":[],"mappings":"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"}

package/dist/cjs/common/refiners/ForwardDateRefiner.js

@@ -32,19 +32,17 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const dayjs_1 = __importDefault(require("dayjs"));
 const dates = __importStar(require("../../utils/dates"));
+const dates_1 = require("../../utils/dates");
+const duration_1 = require("../../calculation/duration");
 class ForwardDateRefiner {
     refine(context, results) {
         if (!context.option.forwardDate) {
             return results;
         }
         results.forEach((result) => {
-            let refMoment = (0, dayjs_1.default)(context.reference.getDateWithAdjustedTimezone());
+            let refDate = context.reference.getDateWithAdjustedTimezone();
             if (result.start.isOnlyTime() && context.reference.instant > result.start.date()) {
                 const refDate = context.reference.getDateWithAdjustedTimezone();
                 const refFollowingDay = new Date(refDate);
@@ -61,36 +59,30 @@ class ForwardDateRefiner {
                     }
                 }
             }
-            if (result.start.isOnlyWeekdayComponent() && refMoment.isAfter(result.start.dayjs())) {
-                if (refMoment.day() >= result.start.get("weekday")) {
-                    refMoment = refMoment.day(result.start.get("weekday") + 7);
+            if (result.start.isOnlyWeekdayComponent() && refDate > result.start.date()) {
+                let daysToAdd = result.start.get("weekday") - refDate.getDay();
+                if (daysToAdd <= 0) {
+                    daysToAdd += 7;
                 }
-                else {
-                    refMoment = refMoment.day(result.start.get("weekday"));
-                }
-                result.start.imply("day", refMoment.date());
-                result.start.imply("month", refMoment.month() + 1);
-                result.start.imply("year", refMoment.year());
+                refDate = (0, duration_1.addDuration)(refDate, { day: daysToAdd });
+                (0, dates_1.implySimilarDate)(result.start, refDate);
                 context.debug(() => {
                     console.log(`${this.constructor.name} adjusted ${result} weekday (${result.start})`);
                 });
                 if (result.end && result.end.isOnlyWeekdayComponent()) {
-                    if (refMoment.day() > result.end.get("weekday")) {
-                        refMoment = refMoment.day(result.end.get("weekday") + 7);
-                    }
-                    else {
-                        refMoment = refMoment.day(result.end.get("weekday"));
+                    let daysToAdd = result.end.get("weekday") - refDate.getDay();
+                    if (daysToAdd <= 0) {
+                        daysToAdd += 7;
                     }
-                    result.end.imply("day", refMoment.date());
-                    result.end.imply("month", refMoment.month() + 1);
-                    result.end.imply("year", refMoment.year());
+                    refDate = (0, duration_1.addDuration)(refDate, { day: daysToAdd });
+                    (0, dates_1.implySimilarDate)(result.end, refDate);
                     context.debug(() => {
                         console.log(`${this.constructor.name} adjusted ${result} weekday (${result.end})`);
                     });
                 }
             }
-            if (result.start.isDateWithUnknownYear() && refMoment.isAfter(result.start.dayjs())) {
-                for (let i = 0; i < 3 && refMoment.isAfter(result.start.dayjs()); i++) {
+            if (result.start.isDateWithUnknownYear() && refDate > result.start.date()) {
+                for (let i = 0; i < 3 && refDate > result.start.date(); i++) {
                     result.start.imply("year", result.start.get("year") + 1);
                     context.debug(() => {
                         console.log(`${this.constructor.name} adjusted ${result} year (${result.start})`);