chrono-node 2.7.6 → 2.7.8

package/README.md

@@ -76,7 +76,7 @@ The meaning of the referenced dates depends on when and where they are mentioned
 Chrono lets you define the reference as `Date` or `ParsingReference` object:
 
 ```javascript
-// (Note: the exmaples run on JST timezone)
+// (Note: the examples run on JST timezone)
 
 chrono.parseDate('Friday', new Date(2012, 8 - 1, 23)); 
 // Fri Aug 24 2012 12:00:00 GMT+0900 (JST)

package/dist/cjs/common/parsers/ISOFormatParser.d.ts

@@ -2,16 +2,5 @@ import { ParsingContext } from "../../chrono";
 import { AbstractParserWithWordBoundaryChecking } from "./AbstractParserWithWordBoundary";
 export default class ISOFormatParser extends AbstractParserWithWordBoundaryChecking {
     innerPattern(): RegExp;
-    innerExtract(context: ParsingContext, match: RegExpMatchArray): {
-        day?: number;
-        hour?: number;
-        minute?: number;
-        month?: number;
-        second?: number;
-        weekday?: number;
-        year?: number;
-        millisecond?: number;
-        meridiem?: number;
-        timezoneOffset?: number;
-    };
+    innerExtract(context: ParsingContext, match: RegExpMatchArray): import("../..").ParsingComponents;
 }

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

@@ -7,7 +7,7 @@ const PATTERN = new RegExp("([0-9]{4})\\-([0-9]{1,2})\\-([0-9]{1,2})" +
     "(?:" +
     ":([0-9]{1,2})(?:\\.(\\d{1,4}))?" +
     ")?" +
-    "(?:" +
+    "(" +
     "Z|([+-]\\d{2}):?(\\d{2})?" +
     ")?" +
     ")?" +
@@ -19,46 +19,48 @@ const HOUR_NUMBER_GROUP = 4;
 const MINUTE_NUMBER_GROUP = 5;
 const SECOND_NUMBER_GROUP = 6;
 const MILLISECOND_NUMBER_GROUP = 7;
-const TZD_HOUR_OFFSET_GROUP = 8;
-const TZD_MINUTE_OFFSET_GROUP = 9;
+const TZD_GROUP = 8;
+const TZD_HOUR_OFFSET_GROUP = 9;
+const TZD_MINUTE_OFFSET_GROUP = 10;
 class ISOFormatParser extends AbstractParserWithWordBoundary_1.AbstractParserWithWordBoundaryChecking {
     innerPattern() {
         return PATTERN;
     }
     innerExtract(context, match) {
-        const components = {};
-        components["year"] = parseInt(match[YEAR_NUMBER_GROUP]);
-        components["month"] = parseInt(match[MONTH_NUMBER_GROUP]);
-        components["day"] = parseInt(match[DATE_NUMBER_GROUP]);
+        const components = context.createParsingComponents({
+            "year": parseInt(match[YEAR_NUMBER_GROUP]),
+            "month": parseInt(match[MONTH_NUMBER_GROUP]),
+            "day": parseInt(match[DATE_NUMBER_GROUP]),
+        });
         if (match[HOUR_NUMBER_GROUP] != null) {
-            components["hour"] = parseInt(match[HOUR_NUMBER_GROUP]);
-            components["minute"] = parseInt(match[MINUTE_NUMBER_GROUP]);
+            components.assign("hour", parseInt(match[HOUR_NUMBER_GROUP]));
+            components.assign("minute", parseInt(match[MINUTE_NUMBER_GROUP]));
             if (match[SECOND_NUMBER_GROUP] != null) {
-                components["second"] = parseInt(match[SECOND_NUMBER_GROUP]);
+                components.assign("second", parseInt(match[SECOND_NUMBER_GROUP]));
             }
             if (match[MILLISECOND_NUMBER_GROUP] != null) {
-                components["millisecond"] = parseInt(match[MILLISECOND_NUMBER_GROUP]);
-            }
-            if (match[TZD_HOUR_OFFSET_GROUP] == null) {
-                components["timezoneOffset"] = 0;
+                components.assign("millisecond", parseInt(match[MILLISECOND_NUMBER_GROUP]));
             }
-            else {
-                const hourOffset = parseInt(match[TZD_HOUR_OFFSET_GROUP]);
-                let minuteOffset = 0;
-                if (match[TZD_MINUTE_OFFSET_GROUP] != null) {
-                    minuteOffset = parseInt(match[TZD_MINUTE_OFFSET_GROUP]);
-                }
-                let offset = hourOffset * 60;
-                if (offset < 0) {
-                    offset -= minuteOffset;
-                }
-                else {
-                    offset += minuteOffset;
+            if (match[TZD_GROUP] != null) {
+                let offset = 0;
+                if (match[TZD_HOUR_OFFSET_GROUP]) {
+                    const hourOffset = parseInt(match[TZD_HOUR_OFFSET_GROUP]);
+                    let minuteOffset = 0;
+                    if (match[TZD_MINUTE_OFFSET_GROUP] != null) {
+                        minuteOffset = parseInt(match[TZD_MINUTE_OFFSET_GROUP]);
+                    }
+                    offset = hourOffset * 60;
+                    if (offset < 0) {
+                        offset -= minuteOffset;
+                    }
+                    else {
+                        offset += minuteOffset;
+                    }
                 }
-                components["timezoneOffset"] = offset;
+                components.assign("timezoneOffset", offset);
             }
         }
-        return components;
+        return components.addTag("parser/ISOFormatParser");
     }
 }
 exports.default = ISOFormatParser;

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

@@ -1 +1 @@
-{"version":3,"file":"ISOFormatParser.js","sourceRoot":"","sources":["../../../../src/common/parsers/ISOFormatParser.ts"],"names":[],"mappings":";;AAEA,qFAA0F;AAW1F,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,0CAA0C;IAC1C,MAAM;IACF,2BAA2B;IAC3B,KAAK;IACD,iCAAiC;IACrC,IAAI;IACJ,KAAK;IACD,2BAA2B;IAC/B,IAAI;IACR,IAAI;IACJ,WAAW,EACX,GAAG,CACN,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAC5B,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAC7B,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAC5B,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAC5B,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,wBAAwB,GAAG,CAAC,CAAC;AACnC,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAChC,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAElC,MAAqB,eAAgB,SAAQ,uEAAsC;IAC/E,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,UAAU,GAA0C,EAAE,CAAC;QAC7D,UAAU,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACxD,UAAU,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAC1D,UAAU,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAEvD,IAAI,KAAK,CAAC,iBAAiB,CAAC,IAAI,IAAI,EAAE;YAClC,UAAU,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACxD,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAE5D,IAAI,KAAK,CAAC,mBAAmB,CAAC,IAAI,IAAI,EAAE;gBACpC,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;aAC/D;YAED,IAAI,KAAK,CAAC,wBAAwB,CAAC,IAAI,IAAI,EAAE;gBACzC,UAAU,CAAC,aAAa,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC;aACzE;YAED,IAAI,KAAK,CAAC,qBAAqB,CAAC,IAAI,IAAI,EAAE;gBACtC,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;aACpC;iBAAM;gBACH,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;gBAE1D,IAAI,YAAY,GAAG,CAAC,CAAC;gBACrB,IAAI,KAAK,CAAC,uBAAuB,CAAC,IAAI,IAAI,EAAE;oBACxC,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC;iBAC3D;gBAED,IAAI,MAAM,GAAG,UAAU,GAAG,EAAE,CAAC;gBAC7B,IAAI,MAAM,GAAG,CAAC,EAAE;oBACZ,MAAM,IAAI,YAAY,CAAC;iBAC1B;qBAAM;oBACH,MAAM,IAAI,YAAY,CAAC;iBAC1B;gBAED,UAAU,CAAC,gBAAgB,CAAC,GAAG,MAAM,CAAC;aACzC;SACJ;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;CACJ;AA9CD,kCA8CC"}
+{"version":3,"file":"ISOFormatParser.js","sourceRoot":"","sources":["../../../../src/common/parsers/ISOFormatParser.ts"],"names":[],"mappings":";;AAEA,qFAA0F;AAW1F,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,0CAA0C;IAC1C,MAAM;IACF,2BAA2B;IAC3B,KAAK;IACD,iCAAiC;IACrC,IAAI;IACJ,GAAG;IACC,2BAA2B;IAC/B,IAAI;IACR,IAAI;IACJ,WAAW,EACX,GAAG,CACN,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAC5B,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAC7B,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAC5B,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAC5B,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,wBAAwB,GAAG,CAAC,CAAC;AACnC,MAAM,SAAS,GAAG,CAAC,CAAC;AACpB,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAChC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAEnC,MAAqB,eAAgB,SAAQ,uEAAsC;IAC/E,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC;YAC/C,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;YAC1C,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAC5C,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;SAC5C,CAAC,CAAC;QACH,IAAI,KAAK,CAAC,iBAAiB,CAAC,IAAI,IAAI,EAAE;YAClC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAC9D,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;YAElE,IAAI,KAAK,CAAC,mBAAmB,CAAC,IAAI,IAAI,EAAE;gBACpC,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;aACrE;YAED,IAAI,KAAK,CAAC,wBAAwB,CAAC,IAAI,IAAI,EAAE;gBACzC,UAAU,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;aAC/E;YACD,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,IAAI,EAAE;gBAE1B,IAAI,MAAM,GAAG,CAAC,CAAC;gBACf,IAAI,KAAK,CAAC,qBAAqB,CAAC,EAAE;oBAC9B,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;oBAC1D,IAAI,YAAY,GAAG,CAAC,CAAC;oBACrB,IAAI,KAAK,CAAC,uBAAuB,CAAC,IAAI,IAAI,EAAE;wBACxC,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC;qBAC3D;oBACD,MAAM,GAAG,UAAU,GAAG,EAAE,CAAC;oBACzB,IAAI,MAAM,GAAG,CAAC,EAAE;wBACZ,MAAM,IAAI,YAAY,CAAC;qBAC1B;yBAAM;wBACH,MAAM,IAAI,YAAY,CAAC;qBAC1B;iBACJ;gBACD,UAAU,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;aAC/C;SACJ;QACD,OAAO,UAAU,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;IACvD,CAAC;CACJ;AA3CD,kCA2CC"}

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

@@ -19,18 +19,25 @@ class SlashDateFormatParser {
         return PATTERN;
     }
     extract(context, match) {
-        if (match[OPENING_GROUP].length == 0 && match.index > 0 && match.index < context.text.length) {
-            const previousChar = context.text[match.index - 1];
-            if (previousChar >= "0" && previousChar <= "9") {
+        const index = match.index + match[OPENING_GROUP].length;
+        const indexEnd = match.index + match[0].length - match[ENDING_GROUP].length;
+        if (index > 0) {
+            const textBefore = context.text.substring(0, index);
+            if (textBefore.match("\\d/?$")) {
                 return;
             }
         }
-        const index = match.index + match[OPENING_GROUP].length;
-        const text = match[0].substr(match[OPENING_GROUP].length, match[0].length - match[OPENING_GROUP].length - match[ENDING_GROUP].length);
+        if (indexEnd < context.text.length) {
+            const textAfter = context.text.substring(indexEnd);
+            if (textAfter.match("^/?\\d")) {
+                return;
+            }
+        }
+        const text = context.text.substring(index, indexEnd);
         if (text.match(/^\d\.\d$/) || text.match(/^\d\.\d{1,2}\.\d{1,2}\s*$/)) {
             return;
         }
-        if (!match[YEAR_GROUP] && match[0].indexOf("/") < 0) {
+        if (!match[YEAR_GROUP] && text.indexOf("/") < 0) {
             return;
         }
         const result = context.createParsingResult(index, text);
@@ -60,7 +67,7 @@ class SlashDateFormatParser {
             const year = years_1.findYearClosestToRef(context.refDate, day, month);
             result.start.imply("year", year);
         }
-        return result;
+        return result.addTag("parser/SlashDateFormatParser");
     }
 }
 exports.default = SlashDateFormatParser;

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

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

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

@@ -10,7 +10,7 @@ class ForwardDateRefiner {
         if (!context.option.forwardDate) {
             return results;
         }
-        results.forEach(function (result) {
+        results.forEach((result) => {
             let refMoment = dayjs_1.default(context.refDate);
             if (result.start.isOnlyTime() && refMoment.isAfter(result.start.dayjs())) {
                 refMoment = refMoment.add(1, "day");
@@ -22,6 +22,9 @@ class ForwardDateRefiner {
                         dayjs_2.implySimilarDate(result.end, refMoment);
                     }
                 }
+                context.debug(() => {
+                    console.log(`${this.constructor.name} adjusted ${result} time result (${result.start})`);
+                });
             }
             if (result.start.isOnlyWeekdayComponent() && refMoment.isAfter(result.start.dayjs())) {
                 if (refMoment.day() >= result.start.get("weekday")) {
@@ -34,7 +37,7 @@ class ForwardDateRefiner {
                 result.start.imply("month", refMoment.month() + 1);
                 result.start.imply("year", refMoment.year());
                 context.debug(() => {
-                    console.log(`Forward weekly adjusted for ${result} (${result.start})`);
+                    console.log(`${this.constructor.name} adjusted ${result} weekday (${result.start})`);
                 });
                 if (result.end && result.end.isOnlyWeekdayComponent()) {
                     if (refMoment.day() > result.end.get("weekday")) {
@@ -47,7 +50,7 @@ class ForwardDateRefiner {
                     result.end.imply("month", refMoment.month() + 1);
                     result.end.imply("year", refMoment.year());
                     context.debug(() => {
-                        console.log(`Forward weekly adjusted for ${result} (${result.end})`);
+                        console.log(`${this.constructor.name} adjusted ${result} weekday (${result.end})`);
                     });
                 }
             }
@@ -55,12 +58,12 @@ class ForwardDateRefiner {
                 for (let i = 0; i < 3 && refMoment.isAfter(result.start.dayjs()); i++) {
                     result.start.imply("year", result.start.get("year") + 1);
                     context.debug(() => {
-                        console.log(`Forward yearly adjusted for ${result} (${result.start})`);
+                        console.log(`${this.constructor.name} adjusted ${result} year (${result.start})`);
                     });
                     if (result.end && !result.end.isCertain("year")) {
                         result.end.imply("year", result.end.get("year") + 1);
                         context.debug(() => {
-                            console.log(`Forward yearly adjusted for ${result} (${result.end})`);
+                            console.log(`${this.constructor.name} adjusted ${result} month (${result.start})`);
                         });
                     }
                 }

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

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

package/dist/cjs/locales/en/configuration.js

@@ -7,7 +7,7 @@ const ENTimeUnitWithinFormatParser_1 = __importDefault(require("./parsers/ENTime
 const ENMonthNameLittleEndianParser_1 = __importDefault(require("./parsers/ENMonthNameLittleEndianParser"));
 const ENMonthNameMiddleEndianParser_1 = __importDefault(require("./parsers/ENMonthNameMiddleEndianParser"));
 const ENMonthNameParser_1 = __importDefault(require("./parsers/ENMonthNameParser"));
-const ENCasualYearMonthDayParser_1 = __importDefault(require("./parsers/ENCasualYearMonthDayParser"));
+const ENYearMonthDayParser_1 = __importDefault(require("./parsers/ENYearMonthDayParser"));
 const ENSlashMonthFormatParser_1 = __importDefault(require("./parsers/ENSlashMonthFormatParser"));
 const ENTimeExpressionParser_1 = __importDefault(require("./parsers/ENTimeExpressionParser"));
 const ENTimeUnitAgoFormatParser_1 = __importDefault(require("./parsers/ENTimeUnitAgoFormatParser"));
@@ -24,6 +24,8 @@ const ENTimeUnitCasualRelativeFormatParser_1 = __importDefault(require("./parser
 const ENMergeRelativeAfterDateRefiner_1 = __importDefault(require("./refiners/ENMergeRelativeAfterDateRefiner"));
 const ENMergeRelativeFollowByDateRefiner_1 = __importDefault(require("./refiners/ENMergeRelativeFollowByDateRefiner"));
 const OverlapRemovalRefiner_1 = __importDefault(require("../../common/refiners/OverlapRemovalRefiner"));
+const ENExtractYearSuffixRefiner_1 = __importDefault(require("./refiners/ENExtractYearSuffixRefiner"));
+const ENUnlikelyFormatFilter_1 = __importDefault(require("./refiners/ENUnlikelyFormatFilter"));
 class ENDefaultConfiguration {
     createCasualConfiguration(littleEndian = false) {
         const option = this.createConfiguration(false, littleEndian);
@@ -32,6 +34,7 @@ class ENDefaultConfiguration {
         option.parsers.push(new ENMonthNameParser_1.default());
         option.parsers.push(new ENRelativeDateFormatParser_1.default());
         option.parsers.push(new ENTimeUnitCasualRelativeFormatParser_1.default());
+        option.refiners.push(new ENUnlikelyFormatFilter_1.default());
         return option;
     }
     createConfiguration(strictMode = true, littleEndian = false) {
@@ -42,7 +45,6 @@ class ENDefaultConfiguration {
                 new ENMonthNameLittleEndianParser_1.default(),
                 new ENMonthNameMiddleEndianParser_1.default(littleEndian),
                 new ENWeekdayParser_1.default(),
-                new ENCasualYearMonthDayParser_1.default(),
                 new ENSlashMonthFormatParser_1.default(),
                 new ENTimeExpressionParser_1.default(strictMode),
                 new ENTimeUnitAgoFormatParser_1.default(strictMode),
@@ -50,10 +52,12 @@ class ENDefaultConfiguration {
             ],
             refiners: [new ENMergeDateTimeRefiner_1.default()],
         }, strictMode);
+        options.parsers.unshift(new ENYearMonthDayParser_1.default(strictMode));
         options.refiners.unshift(new ENMergeRelativeFollowByDateRefiner_1.default());
         options.refiners.unshift(new ENMergeRelativeAfterDateRefiner_1.default());
         options.refiners.unshift(new OverlapRemovalRefiner_1.default());
         options.refiners.push(new ENMergeDateTimeRefiner_1.default());
+        options.refiners.push(new ENExtractYearSuffixRefiner_1.default());
         options.refiners.push(new ENMergeDateRangeRefiner_1.default());
         return options;
     }

package/dist/cjs/locales/en/configuration.js.map

@@ -1 +1 @@
-{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../src/locales/en/configuration.ts"],"names":[],"mappings":";;;;;AAEA,0GAAkF;AAClF,4GAAoF;AACpF,4GAAoF;AACpF,oFAA4D;AAC5D,sGAA8E;AAC9E,kGAA0E;AAC1E,8FAAsE;AACtE,oGAA4E;AAC5E,wGAAgF;AAChF,iGAAyE;AACzE,+FAAuE;AAEvE,yDAAkE;AAClE,sFAA8D;AAC9D,sFAA8D;AAC9D,gFAAwD;AACxD,sGAA8E;AAE9E,uGAA+E;AAC/E,0HAAkG;AAClG,iHAAyF;AACzF,uHAA+F;AAC/F,wGAAgF;AAEhF,MAAqB,sBAAsB;IAKvC,yBAAyB,CAAC,YAAY,GAAG,KAAK;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QAC7D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,4BAAkB,EAAE,CAAC,CAAC;QAC9C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,4BAAkB,EAAE,CAAC,CAAC;QAC9C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,2BAAiB,EAAE,CAAC,CAAC;QAC7C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,oCAA0B,EAAE,CAAC,CAAC;QACtD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,8CAAoC,EAAE,CAAC,CAAC;QAChE,OAAO,MAAM,CAAC;IAClB,CAAC;IAQD,mBAAmB,CAAC,UAAU,GAAG,IAAI,EAAE,YAAY,GAAG,KAAK;QACvD,MAAM,OAAO,GAAG,2CAA0B,CACtC;YACI,OAAO,EAAE;gBACL,IAAI,+BAAqB,CAAC,YAAY,CAAC;gBACvC,IAAI,sCAA4B,CAAC,UAAU,CAAC;gBAC5C,IAAI,uCAA6B,EAAE;gBACnC,IAAI,uCAA6B,CAA6B,YAAY,CAAC;gBAC3E,IAAI,yBAAe,EAAE;gBACrB,IAAI,oCAA0B,EAAE;gBAChC,IAAI,kCAAwB,EAAE;gBAC9B,IAAI,gCAAsB,CAAC,UAAU,CAAC;gBACtC,IAAI,mCAAyB,CAAC,UAAU,CAAC;gBACzC,IAAI,qCAA2B,CAAC,UAAU,CAAC;aAC9C;YACD,QAAQ,EAAE,CAAC,IAAI,gCAAsB,EAAE,CAAC;SAC3C,EACD,UAAU,CACb,CAAC;QAEF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,4CAAkC,EAAE,CAAC,CAAC;QACnE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,yCAA+B,EAAE,CAAC,CAAC;QAChE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,+BAAqB,EAAE,CAAC,CAAC;QAGtD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,gCAAsB,EAAE,CAAC,CAAC;QAEpD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,iCAAuB,EAAE,CAAC,CAAC;QACrD,OAAO,OAAO,CAAC;IACnB,CAAC;CACJ;AAnDD,yCAmDC"}
+{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../src/locales/en/configuration.ts"],"names":[],"mappings":";;;;;AAEA,0GAAkF;AAClF,4GAAoF;AACpF,4GAAoF;AACpF,oFAA4D;AAC5D,0FAAkE;AAClE,kGAA0E;AAC1E,8FAAsE;AACtE,oGAA4E;AAC5E,wGAAgF;AAChF,iGAAyE;AACzE,+FAAuE;AAEvE,yDAAkE;AAClE,sFAA8D;AAC9D,sFAA8D;AAC9D,gFAAwD;AACxD,sGAA8E;AAE9E,uGAA+E;AAC/E,0HAAkG;AAClG,iHAAyF;AACzF,uHAA+F;AAC/F,wGAAgF;AAChF,uGAA+E;AAC/E,+FAAuE;AAEvE,MAAqB,sBAAsB;IAKvC,yBAAyB,CAAC,YAAY,GAAG,KAAK;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QAC7D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,4BAAkB,EAAE,CAAC,CAAC;QAC9C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,4BAAkB,EAAE,CAAC,CAAC;QAC9C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,2BAAiB,EAAE,CAAC,CAAC;QAC7C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,oCAA0B,EAAE,CAAC,CAAC;QACtD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,8CAAoC,EAAE,CAAC,CAAC;QAChE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,gCAAsB,EAAE,CAAC,CAAC;QACnD,OAAO,MAAM,CAAC;IAClB,CAAC;IAQD,mBAAmB,CAAC,UAAU,GAAG,IAAI,EAAE,YAAY,GAAG,KAAK;QACvD,MAAM,OAAO,GAAG,2CAA0B,CACtC;YACI,OAAO,EAAE;gBACL,IAAI,+BAAqB,CAAC,YAAY,CAAC;gBACvC,IAAI,sCAA4B,CAAC,UAAU,CAAC;gBAC5C,IAAI,uCAA6B,EAAE;gBACnC,IAAI,uCAA6B,CAA6B,YAAY,CAAC;gBAC3E,IAAI,yBAAe,EAAE;gBACrB,IAAI,kCAAwB,EAAE;gBAC9B,IAAI,gCAAsB,CAAC,UAAU,CAAC;gBACtC,IAAI,mCAAyB,CAAC,UAAU,CAAC;gBACzC,IAAI,qCAA2B,CAAC,UAAU,CAAC;aAC9C;YACD,QAAQ,EAAE,CAAC,IAAI,gCAAsB,EAAE,CAAC;SAC3C,EACD,UAAU,CACb,CAAC;QACF,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAoB,CAA2B,UAAU,CAAC,CAAC,CAAC;QAGxF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,4CAAkC,EAAE,CAAC,CAAC;QACnE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,yCAA+B,EAAE,CAAC,CAAC;QAChE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,+BAAqB,EAAE,CAAC,CAAC;QAGtD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,gCAAsB,EAAE,CAAC,CAAC;QAGpD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,oCAA0B,EAAE,CAAC,CAAC;QAGxD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,iCAAuB,EAAE,CAAC,CAAC;QACrD,OAAO,OAAO,CAAC;IACnB,CAAC;CACJ;AAzDD,yCAyDC"}

package/dist/cjs/locales/en/constants.d.ts

@@ -30,4 +30,4 @@ export declare const YEAR_PATTERN = "(?:[1-9][0-9]{0,3}\\s{0,2}(?:BE|AD|BC|BCE|C
 export declare function parseYear(match: string): number;
 export declare const TIME_UNITS_PATTERN: string;
 export declare const TIME_UNITS_NO_ABBR_PATTERN: string;
-export declare function parseTimeUnits(timeunitText: any): TimeUnits;
+export declare function parseTimeUnits(timeunitText: any): null | TimeUnits;

package/dist/cjs/locales/en/constants.js

@@ -188,10 +188,16 @@ function parseTimeUnits(timeunitText) {
         remainingText = remainingText.substring(match[0].length).trim();
         match = SINGLE_TIME_UNIT_REGEX.exec(remainingText);
     }
+    if (Object.keys(fragments).length == 0) {
+        return null;
+    }
     return fragments;
 }
 exports.parseTimeUnits = parseTimeUnits;
 function collectDateTimeFragment(fragments, match) {
+    if (match[0].match(/^[a-zA-Z]+$/)) {
+        return;
+    }
     const num = parseNumberPattern(match[1]);
     const unit = exports.TIME_UNIT_DICTIONARY[match[2].toLowerCase()];
     fragments[unit] = num;

package/dist/cjs/locales/en/constants.js.map

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

package/dist/cjs/locales/en/parsers/ENMonthNameParser.js

@@ -9,7 +9,7 @@ const PATTERN = new RegExp(`((?:in)\\s*)?` +
     `(${pattern_1.matchAnyPattern(constants_1.MONTH_DICTIONARY)})` +
     `\\s*` +
     `(?:` +
-    `[,-]?\\s*(${constants_2.YEAR_PATTERN})?` +
+    `(?:,|-|of)?\\s*(${constants_2.YEAR_PATTERN})?` +
     ")?" +
     "(?=[^\\s\\w]|\\s+[^0-9]|\\s+$|$)", "i");
 const PREFIX_GROUP = 1;

package/dist/cjs/locales/en/parsers/ENMonthNameParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"ENMonthNameParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENMonthNameParser.ts"],"names":[],"mappings":";;AAAA,4CAA4E;AAE5E,sDAAkE;AAClE,oDAAyD;AACzD,4CAAuD;AACvD,2GAAgH;AAEhH,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,eAAe;IACX,IAAI,yBAAe,CAAC,4BAAgB,CAAC,GAAG;IACxC,MAAM;IACN,KAAK;IACL,aAAa,wBAAY,IAAI;IAC7B,IAAI;IACJ,kCAAkC,EACtC,GAAG,CACN,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,UAAU,GAAG,CAAC,CAAC;AASrB,MAAqB,iBAAkB,SAAQ,uEAAsC;IACjF,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,CAAC;QAGxD,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,sCAA0B,CAAC,SAAS,CAAC,EAAE;YAChE,OAAO,IAAI,CAAC;SACf;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CACtC,KAAK,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,EAChD,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAChC,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC7B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC;QAEhD,MAAM,KAAK,GAAG,4BAAgB,CAAC,SAAS,CAAC,CAAC;QAC1C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAEpC,IAAI,KAAK,CAAC,UAAU,CAAC,EAAE;YACnB,MAAM,IAAI,GAAG,qBAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;YAC1C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SACrC;aAAM;YACH,MAAM,IAAI,GAAG,4BAAoB,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;YAC7D,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SACpC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAjCD,oCAiCC"}
+{"version":3,"file":"ENMonthNameParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENMonthNameParser.ts"],"names":[],"mappings":";;AAAA,4CAA4E;AAE5E,sDAAkE;AAClE,oDAAyD;AACzD,4CAAuD;AACvD,2GAAgH;AAEhH,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,eAAe;IACX,IAAI,yBAAe,CAAC,4BAAgB,CAAC,GAAG;IACxC,MAAM;IACN,KAAK;IACL,mBAAmB,wBAAY,IAAI;IACnC,IAAI;IACJ,kCAAkC,EACtC,GAAG,CACN,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,UAAU,GAAG,CAAC,CAAC;AASrB,MAAqB,iBAAkB,SAAQ,uEAAsC;IACjF,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,CAAC;QAGxD,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,sCAA0B,CAAC,SAAS,CAAC,EAAE;YAChE,OAAO,IAAI,CAAC;SACf;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CACtC,KAAK,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,EAChD,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAChC,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC7B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC;QAEhD,MAAM,KAAK,GAAG,4BAAgB,CAAC,SAAS,CAAC,CAAC;QAC1C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAEpC,IAAI,KAAK,CAAC,UAAU,CAAC,EAAE;YACnB,MAAM,IAAI,GAAG,qBAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;YAC1C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SACrC;aAAM;YACH,MAAM,IAAI,GAAG,4BAAoB,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;YAC7D,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SACpC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAjCD,oCAiCC"}

package/dist/cjs/locales/en/parsers/ENTimeExpressionParser.d.ts

@@ -1,5 +1,5 @@
 import { ParsingContext } from "../../../chrono";
-import { ParsingComponents } from "../../../results";
+import { ParsingComponents, ParsingResult } from "../../../results";
 import { AbstractTimeExpressionParser } from "../../../common/parsers/AbstractTimeExpressionParser";
 export default class ENTimeExpressionParser extends AbstractTimeExpressionParser {
     constructor(strictMode: any);
@@ -7,4 +7,5 @@ export default class ENTimeExpressionParser extends AbstractTimeExpressionParser
     primaryPrefix(): string;
     primarySuffix(): string;
     extractPrimaryTimeComponents(context: ParsingContext, match: RegExpMatchArray): null | ParsingComponents;
+    extractFollowingTimeComponents(context: ParsingContext, match: RegExpMatchArray, result: ParsingResult): ParsingComponents | null;
 }

package/dist/cjs/locales/en/parsers/ENTimeExpressionParser.js

@@ -46,6 +46,13 @@ class ENTimeExpressionParser extends AbstractTimeExpressionParser_1.AbstractTime
         }
         return components.addTag("parser/ENTimeExpressionParser");
     }
+    extractFollowingTimeComponents(context, match, result) {
+        const followingComponents = super.extractFollowingTimeComponents(context, match, result);
+        if (followingComponents) {
+            followingComponents.addTag("parser/ENTimeExpressionParser");
+        }
+        return followingComponents;
+    }
 }
 exports.default = ENTimeExpressionParser;
 //# sourceMappingURL=ENTimeExpressionParser.js.map

package/dist/cjs/locales/en/parsers/ENTimeExpressionParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"ENTimeExpressionParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeExpressionParser.ts"],"names":[],"mappings":";;AAEA,0CAA0C;AAC1C,uGAAoG;AAEpG,MAAqB,sBAAuB,SAAQ,2DAA4B;IAC5E,YAAY,UAAU;QAClB,KAAK,CAAC,UAAU,CAAC,CAAC;IACtB,CAAC;IAED,cAAc;QACV,OAAO,uDAAuD,CAAC;IACnE,CAAC;IAED,aAAa;QACT,OAAO,uBAAuB,CAAC;IACnC,CAAC;IAED,aAAa;QACT,OAAO,sFAAsF,CAAC;IAClG,CAAC;IAED,4BAA4B,CAAC,OAAuB,EAAE,KAAuB;QACzE,MAAM,UAAU,GAAG,KAAK,CAAC,4BAA4B,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACtE,IAAI,CAAC,UAAU,EAAE;YACb,OAAO,UAAU,CAAC;SACrB;QAED,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC5B,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACpC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,GAAG,EAAE,EAAE;gBACxB,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;gBACvD,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;aAC9C;iBAAM,IAAI,IAAI,GAAG,CAAC,EAAE;gBACjB,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;aAC9C;SACJ;QAED,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAChC,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;YAC3C,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACpC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE;gBACxB,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;aAC1D;SACJ;QAED,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YAC9B,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;YAC3C,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACpC,IAAI,IAAI,GAAG,EAAE,EAAE;gBACX,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;aACrD;SACJ;QAED,OAAO,UAAU,CAAC,MAAM,CAAC,+BAA+B,CAAC,CAAC;IAC9D,CAAC;CACJ;AAnDD,yCAmDC"}
+{"version":3,"file":"ENTimeExpressionParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeExpressionParser.ts"],"names":[],"mappings":";;AAEA,0CAA0C;AAC1C,uGAAoG;AAEpG,MAAqB,sBAAuB,SAAQ,2DAA4B;IAC5E,YAAY,UAAU;QAClB,KAAK,CAAC,UAAU,CAAC,CAAC;IACtB,CAAC;IAED,cAAc;QACV,OAAO,uDAAuD,CAAC;IACnE,CAAC;IAED,aAAa;QACT,OAAO,uBAAuB,CAAC;IACnC,CAAC;IAED,aAAa;QACT,OAAO,sFAAsF,CAAC;IAClG,CAAC;IAED,4BAA4B,CAAC,OAAuB,EAAE,KAAuB;QACzE,MAAM,UAAU,GAAG,KAAK,CAAC,4BAA4B,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACtE,IAAI,CAAC,UAAU,EAAE;YACb,OAAO,UAAU,CAAC;SACrB;QAED,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC5B,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACpC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,GAAG,EAAE,EAAE;gBACxB,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;gBACvD,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;aAC9C;iBAAM,IAAI,IAAI,GAAG,CAAC,EAAE;gBACjB,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;aAC9C;SACJ;QAED,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAChC,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;YAC3C,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACpC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE;gBACxB,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;aAC1D;SACJ;QAED,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YAC9B,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;YAC3C,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACpC,IAAI,IAAI,GAAG,EAAE,EAAE;gBACX,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;aACrD;SACJ;QAED,OAAO,UAAU,CAAC,MAAM,CAAC,+BAA+B,CAAC,CAAC;IAC9D,CAAC;IAED,8BAA8B,CAC1B,OAAuB,EACvB,KAAuB,EACvB,MAAqB;QAErB,MAAM,mBAAmB,GAAG,KAAK,CAAC,8BAA8B,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACzF,IAAI,mBAAmB,EAAE;YACrB,mBAAmB,CAAC,MAAM,CAAC,+BAA+B,CAAC,CAAC;SAC/D;QACD,OAAO,mBAAmB,CAAC;IAC/B,CAAC;CACJ;AA/DD,yCA+DC"}

package/dist/cjs/locales/en/parsers/ENTimeUnitAgoFormatParser.js

@@ -16,6 +16,9 @@ class ENTimeUnitAgoFormatParser extends AbstractParserWithWordBoundary_1.Abstrac
     }
     innerExtract(context, match) {
         const timeUnits = constants_1.parseTimeUnits(match[1]);
+        if (!timeUnits) {
+            return null;
+        }
         const outputTimeUnits = timeunits_1.reverseTimeUnits(timeUnits);
         return results_1.ParsingComponents.createRelativeFromReference(context.reference, outputTimeUnits);
     }

package/dist/cjs/locales/en/parsers/ENTimeUnitAgoFormatParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"ENTimeUnitAgoFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeUnitAgoFormatParser.ts"],"names":[],"mappings":";;AACA,4CAA8F;AAC9F,8CAAqD;AACrD,2GAAgH;AAChH,wDAA4D;AAE5D,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,IAAI,8BAAkB,0CAA0C,EAAE,GAAG,CAAC,CAAC;AAClG,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,IAAI,sCAA0B,0CAA0C,EAAE,GAAG,CAAC,CAAC;AAEjH,MAAqB,yBAA0B,SAAQ,uEAAsC;IACzF,YAAoB,UAAmB;QACnC,KAAK,EAAE,CAAC;QADQ,eAAU,GAAV,UAAU,CAAS;IAEvC,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC;IACtD,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,0BAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,eAAe,GAAG,4BAAgB,CAAC,SAAS,CAAC,CAAC;QAEpD,OAAO,2BAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IAC7F,CAAC;CACJ;AAfD,4CAeC"}
+{"version":3,"file":"ENTimeUnitAgoFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeUnitAgoFormatParser.ts"],"names":[],"mappings":";;AACA,4CAA8F;AAC9F,8CAAqD;AACrD,2GAAgH;AAChH,wDAA4D;AAE5D,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,IAAI,8BAAkB,0CAA0C,EAAE,GAAG,CAAC,CAAC;AAClG,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,IAAI,sCAA0B,0CAA0C,EAAE,GAAG,CAAC,CAAC;AAEjH,MAAqB,yBAA0B,SAAQ,uEAAsC;IACzF,YAAoB,UAAmB;QACnC,KAAK,EAAE,CAAC;QADQ,eAAU,GAAV,UAAU,CAAS;IAEvC,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC;IACtD,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,0BAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO,IAAI,CAAC;SACf;QACD,MAAM,eAAe,GAAG,4BAAgB,CAAC,SAAS,CAAC,CAAC;QACpD,OAAO,2BAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IAC7F,CAAC;CACJ;AAjBD,4CAiBC"}

package/dist/cjs/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js

@@ -17,6 +17,9 @@ class ENTimeUnitCasualRelativeFormatParser extends AbstractParserWithWordBoundar
     innerExtract(context, match) {
         const prefix = match[1].toLowerCase();
         let timeUnits = constants_1.parseTimeUnits(match[2]);
+        if (!timeUnits) {
+            return null;
+        }
         switch (prefix) {
             case "last":
             case "past":

package/dist/cjs/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"ENTimeUnitCasualRelativeFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.ts"],"names":[],"mappings":";;AAAA,4CAA8F;AAE9F,8CAAqD;AACrD,2GAAgH;AAChH,wDAA4D;AAE5D,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,yCAAyC,8BAAkB,YAAY,EAAE,GAAG,CAAC,CAAC;AACzG,MAAM,eAAe,GAAG,IAAI,MAAM,CAC9B,yCAAyC,sCAA0B,YAAY,EAC/E,GAAG,CACN,CAAC;AAEF,MAAqB,oCAAqC,SAAQ,uEAAsC;IACpG,YAAoB,qBAA8B,IAAI;QAClD,KAAK,EAAE,CAAC;QADQ,uBAAkB,GAAlB,kBAAkB,CAAgB;IAEtD,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC;IAC/D,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACtC,IAAI,SAAS,GAAG,0BAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,QAAQ,MAAM,EAAE;YACZ,KAAK,MAAM,CAAC;YACZ,KAAK,MAAM,CAAC;YACZ,KAAK,GAAG;gBACJ,SAAS,GAAG,4BAAgB,CAAC,SAAS,CAAC,CAAC;gBACxC,MAAM;SACb;QAED,OAAO,2BAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;CACJ;AAtBD,uDAsBC"}
+{"version":3,"file":"ENTimeUnitCasualRelativeFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.ts"],"names":[],"mappings":";;AAAA,4CAA8F;AAE9F,8CAAqD;AACrD,2GAAgH;AAChH,wDAA4D;AAE5D,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,yCAAyC,8BAAkB,YAAY,EAAE,GAAG,CAAC,CAAC;AACzG,MAAM,eAAe,GAAG,IAAI,MAAM,CAC9B,yCAAyC,sCAA0B,YAAY,EAC/E,GAAG,CACN,CAAC;AAEF,MAAqB,oCAAqC,SAAQ,uEAAsC;IACpG,YAAoB,qBAA8B,IAAI;QAClD,KAAK,EAAE,CAAC;QADQ,uBAAkB,GAAlB,kBAAkB,CAAgB;IAEtD,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC;IAC/D,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACtC,IAAI,SAAS,GAAG,0BAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO,IAAI,CAAC;SACf;QACD,QAAQ,MAAM,EAAE;YACZ,KAAK,MAAM,CAAC;YACZ,KAAK,MAAM,CAAC;YACZ,KAAK,GAAG;gBACJ,SAAS,GAAG,4BAAgB,CAAC,SAAS,CAAC,CAAC;gBACxC,MAAM;SACb;QACD,OAAO,2BAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;CACJ;AAxBD,uDAwBC"}

package/dist/cjs/locales/en/parsers/ENTimeUnitLaterFormatParser.js

@@ -15,8 +15,11 @@ class ENTimeUnitLaterFormatParser extends AbstractParserWithWordBoundary_1.Abstr
         return this.strictMode ? STRICT_PATTERN : PATTERN;
     }
     innerExtract(context, match) {
-        const fragments = constants_1.parseTimeUnits(match[GROUP_NUM_TIMEUNITS]);
-        return results_1.ParsingComponents.createRelativeFromReference(context.reference, fragments);
+        const timeUnits = constants_1.parseTimeUnits(match[GROUP_NUM_TIMEUNITS]);
+        if (!timeUnits) {
+            return null;
+        }
+        return results_1.ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
     }
 }
 exports.default = ENTimeUnitLaterFormatParser;

package/dist/cjs/locales/en/parsers/ENTimeUnitLaterFormatParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"ENTimeUnitLaterFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeUnitLaterFormatParser.ts"],"names":[],"mappings":";;AACA,4CAA8F;AAC9F,8CAAqD;AACrD,2GAAgH;AAEhH,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,IAAI,8BAAkB,0DAA0D,GAAG,eAAe,EAClG,GAAG,CACN,CAAC;AAEF,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,IAAI,sCAA0B,0CAA0C,EAAE,GAAG,CAAC,CAAC;AACjH,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAE9B,MAAqB,2BAA4B,SAAQ,uEAAsC;IAC3F,YAAoB,UAAmB;QACnC,KAAK,EAAE,CAAC;QADQ,eAAU,GAAV,UAAU,CAAS;IAEvC,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC;IACtD,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,0BAAc,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAC7D,OAAO,2BAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;CACJ;AAbD,8CAaC"}
+{"version":3,"file":"ENTimeUnitLaterFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeUnitLaterFormatParser.ts"],"names":[],"mappings":";;AACA,4CAA8F;AAC9F,8CAAqD;AACrD,2GAAgH;AAEhH,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,IAAI,8BAAkB,0DAA0D,GAAG,eAAe,EAClG,GAAG,CACN,CAAC;AAEF,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,IAAI,sCAA0B,0CAA0C,EAAE,GAAG,CAAC,CAAC;AACjH,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAE9B,MAAqB,2BAA4B,SAAQ,uEAAsC;IAC3F,YAAoB,UAAmB;QACnC,KAAK,EAAE,CAAC;QADQ,eAAU,GAAV,UAAU,CAAS;IAEvC,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC;IACtD,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,0BAAc,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAC7D,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO,IAAI,CAAC;SACf;QACD,OAAO,2BAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;CACJ;AAhBD,8CAgBC"}

package/dist/cjs/locales/en/parsers/ENTimeUnitWithinFormatParser.js

@@ -25,6 +25,9 @@ class ENTimeUnitWithinFormatParser extends AbstractParserWithWordBoundary_1.Abst
             return null;
         }
         const timeUnits = constants_1.parseTimeUnits(match[1]);
+        if (!timeUnits) {
+            return null;
+        }
         return results_1.ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
     }
 }

package/dist/cjs/locales/en/parsers/ENTimeUnitWithinFormatParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"ENTimeUnitWithinFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeUnitWithinFormatParser.ts"],"names":[],"mappings":";;AAAA,4CAA8F;AAE9F,8CAAqD;AACrD,2GAAgH;AAEhH,MAAM,4BAA4B,GAAG,IAAI,MAAM,CAC3C,4BAA4B;IACxB,kEAAkE,8BAAkB,YAAY,EACpG,GAAG,CACN,CAAC;AAEF,MAAM,mBAAmB,GAAG,IAAI,MAAM,CAClC,uBAAuB;IACnB,kEAAkE,8BAAkB,YAAY,EACpG,GAAG,CACN,CAAC;AAEF,MAAM,0BAA0B,GAAG,IAAI,MAAM,CACzC,uBAAuB;IACnB,kEAAkE,sCAA0B,YAAY,EAC5G,GAAG,CACN,CAAC;AAEF,MAAqB,4BAA6B,SAAQ,uEAAsC;IAC5F,YAAoB,UAAmB;QACnC,KAAK,EAAE,CAAC;QADQ,eAAU,GAAV,UAAU,CAAS;IAEvC,CAAC;IAED,YAAY,CAAC,OAAuB;QAChC,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,OAAO,0BAA0B,CAAC;SACrC;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,mBAAmB,CAAC;IAC3F,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QAEzD,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE;YACpC,OAAO,IAAI,CAAC;SACf;QAED,MAAM,SAAS,GAAG,0BAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,OAAO,2BAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;CACJ;AArBD,+CAqBC"}
+{"version":3,"file":"ENTimeUnitWithinFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeUnitWithinFormatParser.ts"],"names":[],"mappings":";;AAAA,4CAA8F;AAE9F,8CAAqD;AACrD,2GAAgH;AAEhH,MAAM,4BAA4B,GAAG,IAAI,MAAM,CAC3C,4BAA4B;IACxB,kEAAkE,8BAAkB,YAAY,EACpG,GAAG,CACN,CAAC;AAEF,MAAM,mBAAmB,GAAG,IAAI,MAAM,CAClC,uBAAuB;IACnB,kEAAkE,8BAAkB,YAAY,EACpG,GAAG,CACN,CAAC;AAEF,MAAM,0BAA0B,GAAG,IAAI,MAAM,CACzC,uBAAuB;IACnB,kEAAkE,sCAA0B,YAAY,EAC5G,GAAG,CACN,CAAC;AAEF,MAAqB,4BAA6B,SAAQ,uEAAsC;IAC5F,YAAoB,UAAmB;QACnC,KAAK,EAAE,CAAC;QADQ,eAAU,GAAV,UAAU,CAAS;IAEvC,CAAC;IAED,YAAY,CAAC,OAAuB;QAChC,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,OAAO,0BAA0B,CAAC;SACrC;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,mBAAmB,CAAC;IAC3F,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QAEzD,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE;YACpC,OAAO,IAAI,CAAC;SACf;QACD,MAAM,SAAS,GAAG,0BAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO,IAAI,CAAC;SACf;QACD,OAAO,2BAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;CACJ;AAvBD,+CAuBC"}

package/dist/cjs/locales/en/parsers/ENWeekdayParser.d.ts

@@ -3,5 +3,5 @@ import { ParsingComponents } from "../../../results";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
 export default class ENWeekdayParser extends AbstractParserWithWordBoundaryChecking {
     innerPattern(): RegExp;
-    innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents;
+    innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents | null;
 }

package/dist/cjs/locales/en/parsers/ENWeekdayParser.js

@@ -4,10 +4,11 @@ const constants_1 = require("../constants");
 const pattern_1 = require("../../../utils/pattern");
 const AbstractParserWithWordBoundary_1 = require("../../../common/parsers/AbstractParserWithWordBoundary");
 const weekdays_1 = require("../../../common/calculation/weekdays");
+const types_1 = require("../../../types");
 const PATTERN = new RegExp("(?:(?:\\,|\\(|\\（)\\s*)?" +
     "(?:on\\s*?)?" +
     "(?:(this|last|past|next)\\s*)?" +
-    `(${pattern_1.matchAnyPattern(constants_1.WEEKDAY_DICTIONARY)})` +
+    `(${pattern_1.matchAnyPattern(constants_1.WEEKDAY_DICTIONARY)}|weekend|weekday)` +
     "(?:\\s*(?:\\,|\\)|\\）))?" +
     "(?:\\s*(this|last|past|next)\\s*week)?" +
     "(?=\\W|$)", "i");
@@ -19,8 +20,6 @@ class ENWeekdayParser extends AbstractParserWithWordBoundary_1.AbstractParserWit
         return PATTERN;
     }
     innerExtract(context, match) {
-        const dayOfWeek = match[WEEKDAY_GROUP].toLowerCase();
-        const weekday = constants_1.WEEKDAY_DICTIONARY[dayOfWeek];
         const prefix = match[PREFIX_GROUP];
         const postfix = match[POSTFIX_GROUP];
         let modifierWord = prefix || postfix;
@@ -36,6 +35,28 @@ class ENWeekdayParser extends AbstractParserWithWordBoundary_1.AbstractParserWit
         else if (modifierWord == "this") {
             modifier = "this";
         }
+        const weekday_word = match[WEEKDAY_GROUP].toLowerCase();
+        let weekday;
+        if (constants_1.WEEKDAY_DICTIONARY[weekday_word] !== undefined) {
+            weekday = constants_1.WEEKDAY_DICTIONARY[weekday_word];
+        }
+        else if (weekday_word == "weekend") {
+            weekday = modifier == "last" ? types_1.Weekday.SUNDAY : types_1.Weekday.SATURDAY;
+        }
+        else if (weekday_word == "weekday") {
+            const refWeekday = context.reference.getDateWithAdjustedTimezone().getDay();
+            if (refWeekday == types_1.Weekday.SUNDAY || refWeekday == types_1.Weekday.SATURDAY) {
+                weekday = modifier == "last" ? types_1.Weekday.FRIDAY : types_1.Weekday.MONDAY;
+            }
+            else {
+                weekday = refWeekday - 1;
+                weekday = modifier == "last" ? weekday - 1 : weekday + 1;
+                weekday = (weekday % 5) + 1;
+            }
+        }
+        else {
+            return null;
+        }
         return weekdays_1.createParsingComponentsAtWeekday(context.reference, weekday, modifier);
     }
 }

package/dist/cjs/locales/en/parsers/ENWeekdayParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"ENWeekdayParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENWeekdayParser.ts"],"names":[],"mappings":";;AAEA,4CAAkD;AAClD,oDAAyD;AACzD,2GAAgH;AAChH,mEAAwF;AAExF,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,0BAA0B;IACtB,cAAc;IACd,gCAAgC;IAChC,IAAI,yBAAe,CAAC,8BAAkB,CAAC,GAAG;IAC1C,0BAA0B;IAC1B,wCAAwC;IACxC,WAAW,EACf,GAAG,CACN,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,aAAa,GAAG,CAAC,CAAC;AACxB,MAAM,aAAa,GAAG,CAAC,CAAC;AAExB,MAAqB,eAAgB,SAAQ,uEAAsC;IAC/E,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAC;QACrD,MAAM,OAAO,GAAG,8BAAkB,CAAC,SAAS,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC;QACrC,IAAI,YAAY,GAAG,MAAM,IAAI,OAAO,CAAC;QACrC,YAAY,GAAG,YAAY,IAAI,EAAE,CAAC;QAClC,YAAY,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;QAE1C,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,IAAI,YAAY,IAAI,MAAM,IAAI,YAAY,IAAI,MAAM,EAAE;YAClD,QAAQ,GAAG,MAAM,CAAC;SACrB;aAAM,IAAI,YAAY,IAAI,MAAM,EAAE;YAC/B,QAAQ,GAAG,MAAM,CAAC;SACrB;aAAM,IAAI,YAAY,IAAI,MAAM,EAAE;YAC/B,QAAQ,GAAG,MAAM,CAAC;SACrB;QAED,OAAO,2CAAgC,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAClF,CAAC;CACJ;AAzBD,kCAyBC"}
+{"version":3,"file":"ENWeekdayParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENWeekdayParser.ts"],"names":[],"mappings":";;AAEA,4CAAkD;AAClD,oDAAyD;AACzD,2GAAgH;AAChH,mEAAwF;AACxF,0CAAyC;AAEzC,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,0BAA0B;IACtB,cAAc;IACd,gCAAgC;IAChC,IAAI,yBAAe,CAAC,8BAAkB,CAAC,mBAAmB;IAC1D,0BAA0B;IAC1B,wCAAwC;IACxC,WAAW,EACf,GAAG,CACN,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,aAAa,GAAG,CAAC,CAAC;AACxB,MAAM,aAAa,GAAG,CAAC,CAAC;AAExB,MAAqB,eAAgB,SAAQ,uEAAsC;IAC/E,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC;QACrC,IAAI,YAAY,GAAG,MAAM,IAAI,OAAO,CAAC;QACrC,YAAY,GAAG,YAAY,IAAI,EAAE,CAAC;QAClC,YAAY,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;QAE1C,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,IAAI,YAAY,IAAI,MAAM,IAAI,YAAY,IAAI,MAAM,EAAE;YAClD,QAAQ,GAAG,MAAM,CAAC;SACrB;aAAM,IAAI,YAAY,IAAI,MAAM,EAAE;YAC/B,QAAQ,GAAG,MAAM,CAAC;SACrB;aAAM,IAAI,YAAY,IAAI,MAAM,EAAE;YAC/B,QAAQ,GAAG,MAAM,CAAC;SACrB;QAED,MAAM,YAAY,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAC;QACxD,IAAI,OAAO,CAAC;QACZ,IAAI,8BAAkB,CAAC,YAAY,CAAC,KAAK,SAAS,EAAE;YAChD,OAAO,GAAG,8BAAkB,CAAC,YAAY,CAAC,CAAC;SAC9C;aAAM,IAAI,YAAY,IAAI,SAAS,EAAE;YAGlC,OAAO,GAAG,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,eAAO,CAAC,MAAM,CAAC,CAAC,CAAC,eAAO,CAAC,QAAQ,CAAC;SACpE;aAAM,IAAI,YAAY,IAAI,SAAS,EAAE;YAKlC,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,2BAA2B,EAAE,CAAC,MAAM,EAAE,CAAC;YAC5E,IAAI,UAAU,IAAI,eAAO,CAAC,MAAM,IAAI,UAAU,IAAI,eAAO,CAAC,QAAQ,EAAE;gBAChE,OAAO,GAAG,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,eAAO,CAAC,MAAM,CAAC,CAAC,CAAC,eAAO,CAAC,MAAM,CAAC;aAClE;iBAAM;gBACH,OAAO,GAAG,UAAU,GAAG,CAAC,CAAC;gBACzB,OAAO,GAAG,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;gBACzD,OAAO,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;aAC/B;SACJ;aAAM;YACH,OAAO,IAAI,CAAC;SACf;QAED,OAAO,2CAAgC,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAClF,CAAC;CACJ;AAhDD,kCAgDC"}

package/dist/cjs/locales/en/parsers/{ENCasualYearMonthDayParser.d.ts → ENYearMonthDayParser.d.ts}

@@ -1,6 +1,8 @@
 import { ParsingContext } from "../../../chrono";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-export default class ENCasualYearMonthDayParser extends AbstractParserWithWordBoundaryChecking {
+export default class ENYearMonthDayParser extends AbstractParserWithWordBoundaryChecking {
+    private strictMonthDateOrder;
+    constructor(strictMonthDateOrder: boolean);
     innerPattern(): RegExp;
     innerExtract(context: ParsingContext, match: RegExpMatchArray): {
         day: number;