chrono-node 2.6.2 → 2.6.3

package/README.md

@@ -2,8 +2,8 @@
 
 A natural language date parser in Javascript. 
 
-[![Build Status](https://travis-ci.org/wanasit/chrono.svg?branch=master)](https://travis-ci.org/wanasit/chrono)
-[![Coverage Status](https://img.shields.io/coveralls/wanasit/chrono.svg)](https://coveralls.io/r/wanasit/chrono?branch=master)
+![Build Status](https://github.com/github/docs/actions/workflows/test.yml/badge.svg)
+[![Coverage Status](https://img.shields.io/coverallsCoverage/github/wanasit/chrono.svg)](https://coveralls.io/r/wanasit/chrono?branch=master)
 
 It is designed to handle most date/time format and extract information from any given text:
 
@@ -114,6 +114,36 @@ chrono.parseDate('Friday', referenceDate, { forwardDate: true });
 // Fri Aug 31 2012 12:00:00 GMT+0900 (JST) -- The following Friday
 ```
 
+`timezones` Override or add custom mappings between timezone abbreviations and offsets. Use this when you want Chrono to parse certain text into a given timezone offset. Chrono supports both unambiguous (normal) timezone mappings and ambigous mappings where the offset is different during and outside of daylight savings.
+
+```javascript
+// Chrono doesn't understand XYZ, so no timezone is parsed
+chrono.parse('at 10:00 XYZ', new Date(2023, 3, 20))
+// "knownValues": {"hour": 10, "minute": 0}
+
+// Make Chrono parse XYZ as offset GMT-0300 (180 minutes)
+chrono.parse('at 10:00 XYZ', new Date(2023, 3, 20), { timezones: { XYZ: -180 } })
+// "knownValues": {"hour": 10, "minute": 0, "timezoneOffset": -180}
+
+// Make Chrono parse XYZ as offset GMT-0300 outside of DST, and GMT-0200 during DST. Assume DST is between 
+import { getLastDayOfMonthTransition } from "timezone";
+import { Weekday, Month } from "index";
+
+const parseXYZAsAmbiguousTz = {
+  timezoneOffsetDuringDst: -120,
+  timezoneOffsetNonDst: -180,
+  dstStart: (year: number) => getLastWeekdayOfMonth(year, Month.FEBRUARY, Weekday.SUNDAY, 2),
+  dstEnd: (year: number) => getLastWeekdayOfMonth(year, Month.SEPTEMBER, Weekday.SUNDAY, 3)
+};
+// Parsing a date which falls within DST
+chrono.parse('Jan 1st 2023 at 10:00 XYZ', new Date(2023, 3, 20), { timezones: { XYZ: parseXYZAsAmbiguousTz } })
+// "knownValues": {"month": 1, ..., "timezoneOffset": -180}
+
+// Parsing a non-DST date
+chrono.parse('Jun 1st 2023 at 10:00 XYZ', new Date(2023, 3, 20), { timezones: { XYZ: parseXYZAsAmbiguousTz } })
+// "knownValues": {"month": 6, ..., "timezoneOffset": -120}
+```
+
 ### Parsed Results and Components
 
 #### ParsedResult

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

@@ -9,30 +9,38 @@ class AbstractMergeDateRangeRefiner extends abstractRefiners_1.MergingRefiner {
         if (!fromResult.start.isOnlyWeekdayComponent() && !toResult.start.isOnlyWeekdayComponent()) {
             toResult.start.getCertainComponents().forEach((key) => {
                 if (!fromResult.start.isCertain(key)) {
-                    fromResult.start.assign(key, toResult.start.get(key));
+                    fromResult.start.imply(key, toResult.start.get(key));
                 }
             });
             fromResult.start.getCertainComponents().forEach((key) => {
                 if (!toResult.start.isCertain(key)) {
-                    toResult.start.assign(key, fromResult.start.get(key));
+                    toResult.start.imply(key, fromResult.start.get(key));
                 }
             });
         }
         if (fromResult.start.date().getTime() > toResult.start.date().getTime()) {
             let fromMoment = fromResult.start.dayjs();
             let toMoment = toResult.start.dayjs();
-            if (fromResult.start.isOnlyWeekdayComponent() && fromMoment.add(-7, "days").isBefore(toMoment)) {
+            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());
+            }
+            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 (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);
+            else if (toResult.start.isDateWithUnknownYear() && toMoment.add(1, "years").isAfter(fromMoment)) {
+                toMoment = toMoment.add(1, "years");
                 toResult.start.imply("year", toMoment.year());
             }
+            else if (fromResult.start.isDateWithUnknownYear() && fromMoment.add(-1, "years").isBefore(toMoment)) {
+                fromMoment = fromMoment.add(-1, "years");
+                fromResult.start.imply("year", fromMoment.year());
+            }
             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/ExtractTimezoneAbbrRefiner.d.ts

@@ -1,9 +1,8 @@
 import { ParsingContext, Refiner } from "../../chrono";
+import { TimezoneAbbrMap } from "../../index";
 import { ParsingResult } from "../../results";
 export default class ExtractTimezoneAbbrRefiner implements Refiner {
-    private readonly timezone;
-    constructor(timezoneOverrides?: {
-        string: number;
-    });
+    private readonly timezoneOverrides?;
+    constructor(timezoneOverrides?: TimezoneAbbrMap);
     refine(context: ParsingContext, results: ParsingResult[]): ParsingResult[];
 }

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

@@ -1,202 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const timezone_1 = require("../../timezone");
 const TIMEZONE_NAME_PATTERN = new RegExp("^\\s*,?\\s*\\(?([A-Z]{2,4})\\)?(?=\\W|$)", "i");
-const DEFAULT_TIMEZONE_ABBR_MAP = {
-    ACDT: 630,
-    ACST: 570,
-    ADT: -180,
-    AEDT: 660,
-    AEST: 600,
-    AFT: 270,
-    AKDT: -480,
-    AKST: -540,
-    ALMT: 360,
-    AMST: -180,
-    AMT: -240,
-    ANAST: 720,
-    ANAT: 720,
-    AQTT: 300,
-    ART: -180,
-    AST: -240,
-    AWDT: 540,
-    AWST: 480,
-    AZOST: 0,
-    AZOT: -60,
-    AZST: 300,
-    AZT: 240,
-    BNT: 480,
-    BOT: -240,
-    BRST: -120,
-    BRT: -180,
-    BST: 60,
-    BTT: 360,
-    CAST: 480,
-    CAT: 120,
-    CCT: 390,
-    CDT: -300,
-    CEST: 120,
-    CET: 60,
-    CHADT: 825,
-    CHAST: 765,
-    CKT: -600,
-    CLST: -180,
-    CLT: -240,
-    COT: -300,
-    CST: -360,
-    CVT: -60,
-    CXT: 420,
-    ChST: 600,
-    DAVT: 420,
-    EASST: -300,
-    EAST: -360,
-    EAT: 180,
-    ECT: -300,
-    EDT: -240,
-    EEST: 180,
-    EET: 120,
-    EGST: 0,
-    EGT: -60,
-    EST: -300,
-    ET: -300,
-    FJST: 780,
-    FJT: 720,
-    FKST: -180,
-    FKT: -240,
-    FNT: -120,
-    GALT: -360,
-    GAMT: -540,
-    GET: 240,
-    GFT: -180,
-    GILT: 720,
-    GMT: 0,
-    GST: 240,
-    GYT: -240,
-    HAA: -180,
-    HAC: -300,
-    HADT: -540,
-    HAE: -240,
-    HAP: -420,
-    HAR: -360,
-    HAST: -600,
-    HAT: -90,
-    HAY: -480,
-    HKT: 480,
-    HLV: -210,
-    HNA: -240,
-    HNC: -360,
-    HNE: -300,
-    HNP: -480,
-    HNR: -420,
-    HNT: -150,
-    HNY: -540,
-    HOVT: 420,
-    ICT: 420,
-    IDT: 180,
-    IOT: 360,
-    IRDT: 270,
-    IRKST: 540,
-    IRKT: 540,
-    IRST: 210,
-    IST: 330,
-    JST: 540,
-    KGT: 360,
-    KRAST: 480,
-    KRAT: 480,
-    KST: 540,
-    KUYT: 240,
-    LHDT: 660,
-    LHST: 630,
-    LINT: 840,
-    MAGST: 720,
-    MAGT: 720,
-    MART: -510,
-    MAWT: 300,
-    MDT: -360,
-    MESZ: 120,
-    MEZ: 60,
-    MHT: 720,
-    MMT: 390,
-    MSD: 240,
-    MSK: 240,
-    MST: -420,
-    MUT: 240,
-    MVT: 300,
-    MYT: 480,
-    NCT: 660,
-    NDT: -90,
-    NFT: 690,
-    NOVST: 420,
-    NOVT: 360,
-    NPT: 345,
-    NST: -150,
-    NUT: -660,
-    NZDT: 780,
-    NZST: 720,
-    OMSST: 420,
-    OMST: 420,
-    PDT: -420,
-    PET: -300,
-    PETST: 720,
-    PETT: 720,
-    PGT: 600,
-    PHOT: 780,
-    PHT: 480,
-    PKT: 300,
-    PMDT: -120,
-    PMST: -180,
-    PONT: 660,
-    PST: -480,
-    PT: -480,
-    PWT: 540,
-    PYST: -180,
-    PYT: -240,
-    RET: 240,
-    SAMT: 240,
-    SAST: 120,
-    SBT: 660,
-    SCT: 240,
-    SGT: 480,
-    SRT: -180,
-    SST: -660,
-    TAHT: -600,
-    TFT: 300,
-    TJT: 300,
-    TKT: 780,
-    TLT: 540,
-    TMT: 300,
-    TVT: 720,
-    ULAT: 480,
-    UTC: 0,
-    UYST: -120,
-    UYT: -180,
-    UZT: 300,
-    VET: -210,
-    VLAST: 660,
-    VLAT: 660,
-    VUT: 660,
-    WAST: 120,
-    WAT: 60,
-    WEST: 60,
-    WESZ: 60,
-    WET: 0,
-    WEZ: 0,
-    WFT: 720,
-    WGST: -120,
-    WGT: -180,
-    WIB: 420,
-    WIT: 540,
-    WITA: 480,
-    WST: 780,
-    WT: 0,
-    YAKST: 600,
-    YAKT: 600,
-    YAPT: 600,
-    YEKST: 360,
-    YEKT: 360,
-};
 class ExtractTimezoneAbbrRefiner {
     constructor(timezoneOverrides) {
-        this.timezone = Object.assign(Object.assign({}, DEFAULT_TIMEZONE_ABBR_MAP), timezoneOverrides);
+        this.timezoneOverrides = timezoneOverrides;
     }
     refine(context, results) {
         var _a;
@@ -209,8 +17,10 @@ class ExtractTimezoneAbbrRefiner {
                 return;
             }
             const timezoneAbbr = match[1].toUpperCase();
-            const extractedTimezoneOffset = (_b = (_a = timezoneOverrides[timezoneAbbr]) !== null && _a !== void 0 ? _a : this.timezone[timezoneAbbr]) !== null && _b !== void 0 ? _b : null;
-            if (extractedTimezoneOffset === null) {
+            const refDate = (_b = (_a = result.start.date()) !== null && _a !== void 0 ? _a : result.refDate) !== null && _b !== void 0 ? _b : new Date();
+            const tzOverrides = Object.assign(Object.assign({}, this.timezoneOverrides), timezoneOverrides);
+            const extractedTimezoneOffset = timezone_1.toTimezoneOffset(timezoneAbbr, refDate, tzOverrides);
+            if (extractedTimezoneOffset == null) {
                 return;
             }
             context.debug(() => {

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

@@ -1 +1 @@
-{"version":3,"file":"ExtractTimezoneAbbrRefiner.js","sourceRoot":"","sources":["../../../../src/common/refiners/ExtractTimezoneAbbrRefiner.ts"],"names":[],"mappings":"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IAAI,EAAE,GAAG;IACT,IAAI,EAAE,GAAG;IACT,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,GAAG;IACT,IAAI,EAAE,CAAC,GAAG;IACV,IAAI,EAAE,GAAG;IACT,GAAG,EAAE,CAAC,GAAG;IACT,IAAI,EAAE,GAAG;IACT,GAAG,EAAE,EAAE;IACP,GAAG,EAAE,GAAG;IACR,GAAG,EAAE,GAAG;IACR,GAAG,EAAE,GAAG;IACR,GAAG,EAAE,GAAG;IACR,GAAG,EAAE,CAAC,GAAG;IACT,GAAG,EAAE,GAAG;IACR,GAAG,EAAE,GAAG;IACR,GAAG,EAAE,GAAG;IACR,GAAG,EAAE,GAAG;IACR,GAAG,EAAE,CAAC,EAAE;IACR,GAAG,EAAE,GAAG;IACR,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,GAAG;IACT,GAAG,EAAE,GAAG;IACR,GAAG,EAAE,CAAC,GAAG;IACT,GAAG,EAAE,CAAC,GAAG;IACT,IAAI,EAAE,GAAG;IACT,IAAI,EAAE,GAAG;IACT,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,GAAG;IACT,GAAG,EAAE,CAAC,GAAG;IACT,GAAG,EAAE,CAAC,GAAG;IACT,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,GAAG;IACT,GAAG,EAAE,GAAG;IACR,IAAI,EAAE,GAAG;IACT,GAAG,EAAE,GAAG;IACR,GAAG,EAAE,GAAG;IACR,IAAI,EAAE,CAAC,GAAG;IACV,IAAI,EAAE,CAAC,GAAG;IACV,IAAI,EAAE,GAAG;IACT,GAAG,EAAE,CAAC,GAAG;IACT,EAAE,EAAE,CAAC,GAAG;IACR,GAAG,EAAE,GAAG;IACR,IAAI,EAAE,CAAC,GAAG;IACV,GAAG,EAAE,CAAC,GAAG;IACT,GAAG,EAAE,GAAG;IACR,IAAI,EAAE,GAAG;IACT,IAAI,EAAE,GAAG;IACT,GAAG,EAAE,GAAG;IACR,GAAG,EAAE,GAAG;IACR,GAAG,EAAE,GAAG;IACR,GAAG,EAAE,CAAC,GAAG;IACT,GAAG,EAAE,CAAC,GAAG;IACT,IAAI,EAAE,CAAC,GAAG;IACV,GAAG,EAAE,GAAG;IACR,GAAG,EAAE,GAAG;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"}
+{"version":3,"file":"ExtractTimezoneAbbrRefiner.js","sourceRoot":"","sources":["../../../../src/common/refiners/ExtractTimezoneAbbrRefiner.ts"],"names":[],"mappings":";;AAIA,6CAAkD;AAElD,MAAM,qBAAqB,GAAG,IAAI,MAAM,CAAC,0CAA0C,EAAE,GAAG,CAAC,CAAC;AAE1F,MAAqB,0BAA0B;IAC3C,YAA6B,iBAAmC;QAAnC,sBAAiB,GAAjB,iBAAiB,CAAkB;IAAG,CAAC;IAEpE,MAAM,CAAC,OAAuB,EAAE,OAAwB;;QACpD,MAAM,iBAAiB,GAAG,MAAA,OAAO,CAAC,MAAM,CAAC,SAAS,mCAAI,EAAE,CAAC;QAEzD,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;YACvB,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzE,MAAM,KAAK,GAAG,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjD,IAAI,CAAC,KAAK,EAAE;gBACR,OAAO;aACV;YAED,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5C,MAAM,OAAO,GAAG,MAAA,MAAA,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,mCAAI,MAAM,CAAC,OAAO,mCAAI,IAAI,IAAI,EAAE,CAAC;YACpE,MAAM,WAAW,mCAAQ,IAAI,CAAC,iBAAiB,GAAK,iBAAiB,CAAE,CAAC;YACxE,MAAM,uBAAuB,GAAG,2BAAgB,CAAC,YAAY,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;YACrF,IAAI,uBAAuB,IAAI,IAAI,EAAE;gBACjC,OAAO;aACV;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;gBACf,OAAO,CAAC,GAAG,CACP,yBAAyB,YAAY,WAAW,uBAAuB,SAAS,MAAM,CAAC,KAAK,EAAE,CACjG,CAAC;YACN,CAAC,CAAC,CAAC;YAEH,MAAM,qBAAqB,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YACjE,IAAI,qBAAqB,KAAK,IAAI,IAAI,uBAAuB,IAAI,qBAAqB,EAAE;gBAIpF,IAAI,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE;oBAC1C,OAAO;iBACV;gBAID,IAAI,YAAY,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;oBAC1B,OAAO;iBACV;aACJ;YAED,IAAI,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE;gBAG3B,IAAI,YAAY,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;oBAC1B,OAAO;iBACV;aACJ;YAED,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;YAExB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE;gBAC3C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,gBAAgB,EAAE,uBAAuB,CAAC,CAAC;aAClE;YAED,IAAI,MAAM,CAAC,GAAG,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE;gBAC/D,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,uBAAuB,CAAC,CAAC;aAChE;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACnB,CAAC;CACJ;AA/DD,6CA+DC"}

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

@@ -23,20 +23,6 @@ class ForwardDateRefiner {
                     }
                 }
             }
-            if (result.start.isOnlyDayMonthComponent() && refMoment.isAfter(result.start.dayjs())) {
-                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})`);
-                    });
-                    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})`);
-                        });
-                    }
-                }
-            }
             if (result.start.isOnlyWeekdayComponent() && refMoment.isAfter(result.start.dayjs())) {
                 if (refMoment.day() >= result.start.get("weekday")) {
                     refMoment = refMoment.day(result.start.get("weekday") + 7);
@@ -65,6 +51,20 @@ class ForwardDateRefiner {
                     });
                 }
             }
+            if (result.start.isDateWithUnknownYear() && refMoment.isAfter(result.start.dayjs())) {
+                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})`);
+                    });
+                    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})`);
+                        });
+                    }
+                }
+            }
         });
         return results;
     }

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/configurations.js

@@ -14,9 +14,9 @@ const MergeWeekdayComponentRefiner_1 = __importDefault(require("./common/refiner
 function includeCommonConfiguration(configuration, strictMode = false) {
     configuration.parsers.unshift(new ISOFormatParser_1.default());
     configuration.refiners.unshift(new MergeWeekdayComponentRefiner_1.default());
-    configuration.refiners.unshift(new ExtractTimezoneAbbrRefiner_1.default());
     configuration.refiners.unshift(new ExtractTimezoneOffsetRefiner_1.default());
     configuration.refiners.unshift(new OverlapRemovalRefiner_1.default());
+    configuration.refiners.push(new ExtractTimezoneAbbrRefiner_1.default());
     configuration.refiners.push(new OverlapRemovalRefiner_1.default());
     configuration.refiners.push(new ForwardDateRefiner_1.default());
     configuration.refiners.push(new UnlikelyFormatFilter_1.default(strictMode));

package/dist/cjs/configurations.js.map

@@ -1 +1 @@
-{"version":3,"file":"configurations.js","sourceRoot":"","sources":["../../src/configurations.ts"],"names":[],"mappings":";;;;;;AAEA,8GAAsF;AACtF,kHAA0F;AAC1F,oGAA4E;AAC5E,8FAAsE;AACtE,kGAA0E;AAC1E,uFAA+D;AAC/D,kHAA0F;AAE1F,SAAgB,0BAA0B,CAAC,aAA4B,EAAE,UAAU,GAAG,KAAK;IACvF,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,yBAAe,EAAE,CAAC,CAAC;IAErD,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,sCAA4B,EAAE,CAAC,CAAC;IACnE,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,oCAA0B,EAAE,CAAC,CAAC;IACjE,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,sCAA4B,EAAE,CAAC,CAAC;IACnE,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,+BAAqB,EAAE,CAAC,CAAC;IAE5D,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,+BAAqB,EAAE,CAAC,CAAC;IACzD,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,4BAAkB,EAAE,CAAC,CAAC;IACtD,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,8BAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;IAClE,OAAO,aAAa,CAAC;AACzB,CAAC;AAZD,gEAYC"}
+{"version":3,"file":"configurations.js","sourceRoot":"","sources":["../../src/configurations.ts"],"names":[],"mappings":";;;;;;AAEA,8GAAsF;AACtF,kHAA0F;AAC1F,oGAA4E;AAC5E,8FAAsE;AACtE,kGAA0E;AAC1E,uFAA+D;AAC/D,kHAA0F;AAE1F,SAAgB,0BAA0B,CAAC,aAA4B,EAAE,UAAU,GAAG,KAAK;IACvF,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,yBAAe,EAAE,CAAC,CAAC;IAErD,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,sCAA4B,EAAE,CAAC,CAAC;IACnE,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,sCAA4B,EAAE,CAAC,CAAC;IACnE,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,+BAAqB,EAAE,CAAC,CAAC;IAI5D,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,oCAA0B,EAAE,CAAC,CAAC;IAC9D,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,+BAAqB,EAAE,CAAC,CAAC;IACzD,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,4BAAkB,EAAE,CAAC,CAAC;IACtD,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,8BAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;IAClE,OAAO,aAAa,CAAC;AACzB,CAAC;AAdD,gEAcC"}

package/dist/cjs/index.d.ts

@@ -4,10 +4,17 @@ import type { ParsingResult } from "./results";
 export { en, Chrono, Parser, Refiner, ParsingResult };
 export interface ParsingOption {
     forwardDate?: boolean;
-    timezones?: {
-        [tzKeyword: string]: number;
-    };
+    timezones?: TimezoneAbbrMap;
 }
+export interface AmbiguousTimezoneMap {
+    timezoneOffsetDuringDst: number;
+    timezoneOffsetNonDst: number;
+    dstStart: (year: number) => Date;
+    dstEnd: (year: number) => Date;
+}
+export declare type TimezoneAbbrMap = {
+    [key: string]: number | AmbiguousTimezoneMap;
+};
 export interface ParsingReference {
     instant?: Date;
     timezone?: string | number;
@@ -39,6 +46,20 @@ export declare enum Weekday {
     FRIDAY = 5,
     SATURDAY = 6
 }
+export declare enum Month {
+    JANUARY = 1,
+    FEBRUARY = 2,
+    MARCH = 3,
+    APRIL = 4,
+    MAY = 5,
+    JUNE = 6,
+    JULY = 7,
+    AUGUST = 8,
+    SEPTEMBER = 9,
+    OCTOBER = 10,
+    NOVEMBER = 11,
+    DECEMBER = 12
+}
 import * as de from "./locales/de";
 import * as fr from "./locales/fr";
 import * as ja from "./locales/ja";

package/dist/cjs/index.js

@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseDate = exports.parse = exports.casual = exports.strict = exports.es = exports.ru = exports.zh = exports.nl = exports.pt = exports.ja = exports.fr = exports.de = exports.Weekday = exports.Meridiem = exports.Chrono = exports.en = void 0;
+exports.parseDate = exports.parse = exports.casual = exports.strict = exports.es = exports.ru = exports.zh = exports.nl = exports.pt = exports.ja = exports.fr = exports.de = exports.Month = exports.Weekday = exports.Meridiem = exports.Chrono = exports.en = void 0;
 const en = __importStar(require("./locales/en"));
 exports.en = en;
 const chrono_1 = require("./chrono");
@@ -39,6 +39,21 @@ var Weekday;
     Weekday[Weekday["FRIDAY"] = 5] = "FRIDAY";
     Weekday[Weekday["SATURDAY"] = 6] = "SATURDAY";
 })(Weekday = exports.Weekday || (exports.Weekday = {}));
+var Month;
+(function (Month) {
+    Month[Month["JANUARY"] = 1] = "JANUARY";
+    Month[Month["FEBRUARY"] = 2] = "FEBRUARY";
+    Month[Month["MARCH"] = 3] = "MARCH";
+    Month[Month["APRIL"] = 4] = "APRIL";
+    Month[Month["MAY"] = 5] = "MAY";
+    Month[Month["JUNE"] = 6] = "JUNE";
+    Month[Month["JULY"] = 7] = "JULY";
+    Month[Month["AUGUST"] = 8] = "AUGUST";
+    Month[Month["SEPTEMBER"] = 9] = "SEPTEMBER";
+    Month[Month["OCTOBER"] = 10] = "OCTOBER";
+    Month[Month["NOVEMBER"] = 11] = "NOVEMBER";
+    Month[Month["DECEMBER"] = 12] = "DECEMBER";
+})(Month = exports.Month || (exports.Month = {}));
 const de = __importStar(require("./locales/de"));
 exports.de = de;
 const fr = __importStar(require("./locales/fr"));

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AACA,iDAAmC;AAI1B,gBAAE;AAHX,qCAAmD;AAGtC,uFAHJ,eAAM,OAGI;AA4FnB,IAAY,QAGX;AAHD,WAAY,QAAQ;IAChB,mCAAM,CAAA;IACN,mCAAM,CAAA;AACV,CAAC,EAHW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAGnB;AAED,IAAY,OAQX;AARD,WAAY,OAAO;IACf,yCAAU,CAAA;IACV,yCAAU,CAAA;IACV,2CAAW,CAAA;IACX,+CAAa,CAAA;IACb,6CAAY,CAAA;IACZ,yCAAU,CAAA;IACV,6CAAY,CAAA;AAChB,CAAC,EARW,OAAO,GAAP,eAAO,KAAP,eAAO,QAQlB;AAGD,iDAAmC;AAQ1B,gBAAE;AAPX,iDAAmC;AAOtB,gBAAE;AANf,iDAAmC;AAMlB,gBAAE;AALnB,iDAAmC;AAKd,gBAAE;AAJvB,iDAAmC;AAIV,gBAAE;AAH3B,iDAAmC;AAGN,gBAAE;AAF/B,iDAAmC;AAEF,gBAAE;AADnC,iDAAmC;AACE,gBAAE;AAK1B,QAAA,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;AAKnB,QAAA,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;AAKhC,SAAgB,KAAK,CAAC,IAAY,EAAE,GAA6B,EAAE,MAAsB;IACrF,OAAO,cAAM,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC3C,CAAC;AAFD,sBAEC;AAKD,SAAgB,SAAS,CAAC,IAAY,EAAE,GAA6B,EAAE,MAAsB;IACzF,OAAO,cAAM,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC/C,CAAC;AAFD,8BAEC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AACA,iDAAmC;AAI1B,gBAAE;AAHX,qCAAmD;AAGtC,uFAHJ,eAAM,OAGI;AAyHnB,IAAY,QAGX;AAHD,WAAY,QAAQ;IAChB,mCAAM,CAAA;IACN,mCAAM,CAAA;AACV,CAAC,EAHW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAGnB;AAED,IAAY,OAQX;AARD,WAAY,OAAO;IACf,yCAAU,CAAA;IACV,yCAAU,CAAA;IACV,2CAAW,CAAA;IACX,+CAAa,CAAA;IACb,6CAAY,CAAA;IACZ,yCAAU,CAAA;IACV,6CAAY,CAAA;AAChB,CAAC,EARW,OAAO,GAAP,eAAO,KAAP,eAAO,QAQlB;AAED,IAAY,KAaX;AAbD,WAAY,KAAK;IACb,uCAAW,CAAA;IACX,yCAAY,CAAA;IACZ,mCAAS,CAAA;IACT,mCAAS,CAAA;IACT,+BAAO,CAAA;IACP,iCAAQ,CAAA;IACR,iCAAQ,CAAA;IACR,qCAAU,CAAA;IACV,2CAAa,CAAA;IACb,wCAAY,CAAA;IACZ,0CAAa,CAAA;IACb,0CAAa,CAAA;AACjB,CAAC,EAbW,KAAK,GAAL,aAAK,KAAL,aAAK,QAahB;AAGD,iDAAmC;AAQ1B,gBAAE;AAPX,iDAAmC;AAOtB,gBAAE;AANf,iDAAmC;AAMlB,gBAAE;AALnB,iDAAmC;AAKd,gBAAE;AAJvB,iDAAmC;AAIV,gBAAE;AAH3B,iDAAmC;AAGN,gBAAE;AAF/B,iDAAmC;AAEF,gBAAE;AADnC,iDAAmC;AACE,gBAAE;AAK1B,QAAA,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;AAKnB,QAAA,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;AAKhC,SAAgB,KAAK,CAAC,IAAY,EAAE,GAA6B,EAAE,MAAsB;IACrF,OAAO,cAAM,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC3C,CAAC;AAFD,sBAEC;AAKD,SAAgB,SAAS,CAAC,IAAY,EAAE,GAA6B,EAAE,MAAsB;IACzF,OAAO,cAAM,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC/C,CAAC;AAFD,8BAEC"}

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

@@ -16,6 +16,9 @@ export declare const INTEGER_WORD_DICTIONARY: {
 export declare const ORDINAL_WORD_DICTIONARY: {
     [word: string]: number;
 };
+export declare const TIME_UNIT_DICTIONARY_NO_ABBR: {
+    [word: string]: OpUnitType | QUnitType;
+};
 export declare const TIME_UNIT_DICTIONARY: {
     [word: string]: OpUnitType | QUnitType;
 };
@@ -26,4 +29,5 @@ export declare function parseOrdinalNumberPattern(match: string): number;
 export declare const YEAR_PATTERN = "(?:[1-9][0-9]{0,3}\\s{0,2}(?:BE|AD|BC|BCE|CE)|[1-2][0-9]{3}|[5-9][0-9])";
 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;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseTimeUnits = exports.TIME_UNITS_PATTERN = exports.parseYear = exports.YEAR_PATTERN = exports.parseOrdinalNumberPattern = exports.ORDINAL_NUMBER_PATTERN = exports.parseNumberPattern = exports.NUMBER_PATTERN = exports.TIME_UNIT_DICTIONARY = exports.ORDINAL_WORD_DICTIONARY = exports.INTEGER_WORD_DICTIONARY = exports.MONTH_DICTIONARY = exports.FULL_MONTH_NAME_DICTIONARY = exports.WEEKDAY_DICTIONARY = void 0;
+exports.parseTimeUnits = exports.TIME_UNITS_NO_ABBR_PATTERN = exports.TIME_UNITS_PATTERN = exports.parseYear = exports.YEAR_PATTERN = exports.parseOrdinalNumberPattern = exports.ORDINAL_NUMBER_PATTERN = exports.parseNumberPattern = exports.NUMBER_PATTERN = exports.TIME_UNIT_DICTIONARY = exports.TIME_UNIT_DICTIONARY_NO_ABBR = exports.ORDINAL_WORD_DICTIONARY = exports.INTEGER_WORD_DICTIONARY = exports.MONTH_DICTIONARY = exports.FULL_MONTH_NAME_DICTIONARY = exports.WEEKDAY_DICTIONARY = void 0;
 const pattern_1 = require("../../utils/pattern");
 const years_1 = require("../../calculation/years");
 exports.WEEKDAY_DICTIONARY = {
@@ -102,40 +102,25 @@ exports.ORDINAL_WORD_DICTIONARY = {
     "thirty first": 31,
     "thirty-first": 31,
 };
-exports.TIME_UNIT_DICTIONARY = {
-    s: "second",
-    sec: "second",
+exports.TIME_UNIT_DICTIONARY_NO_ABBR = {
     second: "second",
     seconds: "second",
-    m: "minute",
-    min: "minute",
-    mins: "minute",
     minute: "minute",
     minutes: "minute",
-    h: "hour",
-    hr: "hour",
-    hrs: "hour",
     hour: "hour",
     hours: "hour",
-    d: "d",
     day: "d",
     days: "d",
-    w: "w",
     week: "week",
     weeks: "week",
-    mo: "month",
-    mon: "month",
-    mos: "month",
     month: "month",
     months: "month",
-    qtr: "quarter",
     quarter: "quarter",
     quarters: "quarter",
-    y: "year",
-    yr: "year",
     year: "year",
     years: "year",
 };
+exports.TIME_UNIT_DICTIONARY = Object.assign({ s: "second", sec: "second", second: "second", seconds: "second", m: "minute", min: "minute", mins: "minute", minute: "minute", minutes: "minute", h: "hour", hr: "hour", hrs: "hour", hour: "hour", hours: "hour", d: "d", day: "d", days: "d", w: "w", week: "week", weeks: "week", mo: "month", mon: "month", mos: "month", month: "month", months: "month", qtr: "quarter", quarter: "quarter", quarters: "quarter", y: "year", yr: "year", year: "year", years: "year" }, exports.TIME_UNIT_DICTIONARY_NO_ABBR);
 exports.NUMBER_PATTERN = `(?:${pattern_1.matchAnyPattern(exports.INTEGER_WORD_DICTIONARY)}|[0-9]+|[0-9]+\\.[0-9]+|half(?:\\s{0,2}an?)?|an?\\b(?:\\s{0,2}few)?|few|several|the|a?\\s{0,2}couple\\s{0,2}(?:of)?)`;
 function parseNumberPattern(match) {
     const num = match.toLowerCase();
@@ -190,7 +175,9 @@ function parseYear(match) {
 exports.parseYear = parseYear;
 const SINGLE_TIME_UNIT_PATTERN = `(${exports.NUMBER_PATTERN})\\s{0,3}(${pattern_1.matchAnyPattern(exports.TIME_UNIT_DICTIONARY)})`;
 const SINGLE_TIME_UNIT_REGEX = new RegExp(SINGLE_TIME_UNIT_PATTERN, "i");
+const SINGLE_TIME_UNIT_NO_ABBR_PATTERN = `(${exports.NUMBER_PATTERN})\\s{0,3}(${pattern_1.matchAnyPattern(exports.TIME_UNIT_DICTIONARY_NO_ABBR)})`;
 exports.TIME_UNITS_PATTERN = pattern_1.repeatedTimeunitPattern(`(?:(?:about|around)\\s{0,3})?`, SINGLE_TIME_UNIT_PATTERN);
+exports.TIME_UNITS_NO_ABBR_PATTERN = pattern_1.repeatedTimeunitPattern(`(?:(?:about|around)\\s{0,3})?`, SINGLE_TIME_UNIT_NO_ABBR_PATTERN);
 function parseTimeUnits(timeunitText) {
     const fragments = {};
     let remainingText = timeunitText;

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":";;;AACA,iDAA+E;AAC/E,mDAA+D;AAIlD,QAAA,kBAAkB,GAAgC;IAC3D,MAAM,EAAE,CAAC;IACT,GAAG,EAAE,CAAC;IACN,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,GAAG,EAAE,CAAC;IACN,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,GAAG,EAAE,CAAC;IACN,MAAM,EAAE,CAAC;IACT,SAAS,EAAE,CAAC;IACZ,GAAG,EAAE,CAAC;IACN,MAAM,EAAE,CAAC;IACT,QAAQ,EAAE,CAAC;IACX,KAAK,EAAE,CAAC;IACR,QAAQ,EAAE,CAAC;IACX,IAAI,EAAE,CAAC;IACP,OAAO,EAAE,CAAC;IACV,GAAG,EAAE,CAAC;IACN,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,GAAG,EAAE,CAAC;IACN,MAAM,EAAE,CAAC;IACT,QAAQ,EAAE,CAAC;IACX,GAAG,EAAE,CAAC;IACN,MAAM,EAAE,CAAC;CACZ,CAAC;AAEW,QAAA,0BAA0B,GAA+B;IAClE,OAAO,EAAE,CAAC;IACV,QAAQ,EAAE,CAAC;IACX,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;IACR,GAAG,EAAE,CAAC;IACN,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,CAAC;IACT,SAAS,EAAE,CAAC;IACZ,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,EAAE;IACZ,QAAQ,EAAE,EAAE;CACf,CAAC;AAEW,QAAA,gBAAgB,mCACtB,kCAA0B,KAC7B,GAAG,EAAE,CAAC,EACN,MAAM,EAAE,CAAC,EACT,GAAG,EAAE,CAAC,EACN,MAAM,EAAE,CAAC,EACT,GAAG,EAAE,CAAC,EACN,MAAM,EAAE,CAAC,EACT,GAAG,EAAE,CAAC,EACN,MAAM,EAAE,CAAC,EACT,GAAG,EAAE,CAAC,EACN,MAAM,EAAE,CAAC,EACT,GAAG,EAAE,CAAC,EACN,MAAM,EAAE,CAAC,EACT,GAAG,EAAE,CAAC,EACN,MAAM,EAAE,CAAC,EACT,GAAG,EAAE,CAAC,EACN,MAAM,EAAE,CAAC,EACT,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,CAAC,EACV,GAAG,EAAE,EAAE,EACP,MAAM,EAAE,EAAE,EACV,GAAG,EAAE,EAAE,EACP,MAAM,EAAE,EAAE,EACV,GAAG,EAAE,EAAE,EACP,MAAM,EAAE,EAAE,IACZ;AAEW,QAAA,uBAAuB,GAA+B;IAC/D,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,CAAC;IACN,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,GAAG,EAAE,CAAC;IACN,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,GAAG,EAAE,EAAE;IACP,MAAM,EAAE,EAAE;IACV,MAAM,EAAE,EAAE;CACb,CAAC;AAEW,QAAA,uBAAuB,GAA+B;IAC/D,KAAK,EAAE,CAAC;IACR,MAAM,EAAE,CAAC;IACT,KAAK,EAAE,CAAC;IACR,MAAM,EAAE,CAAC;IACT,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;IACR,OAAO,EAAE,CAAC;IACV,MAAM,EAAE,CAAC;IACT,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,EAAE;IACT,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE,EAAE;IACX,UAAU,EAAE,EAAE;IACd,UAAU,EAAE,EAAE;IACd,SAAS,EAAE,EAAE;IACb,SAAS,EAAE,EAAE;IACb,WAAW,EAAE,EAAE;IACf,UAAU,EAAE,EAAE;IACd,UAAU,EAAE,EAAE;IACd,SAAS,EAAE,EAAE;IACb,cAAc,EAAE,EAAE;IAClB,cAAc,EAAE,EAAE;IAClB,eAAe,EAAE,EAAE;IACnB,eAAe,EAAE,EAAE;IACnB,cAAc,EAAE,EAAE;IAClB,cAAc,EAAE,EAAE;IAClB,eAAe,EAAE,EAAE;IACnB,eAAe,EAAE,EAAE;IACnB,cAAc,EAAE,EAAE;IAClB,cAAc,EAAE,EAAE;IAClB,cAAc,EAAE,EAAE;IAClB,cAAc,EAAE,EAAE;IAClB,gBAAgB,EAAE,EAAE;IACpB,gBAAgB,EAAE,EAAE;IACpB,eAAe,EAAE,EAAE;IACnB,eAAe,EAAE,EAAE;IACnB,cAAc,EAAE,EAAE;IAClB,cAAc,EAAE,EAAE;IAClB,WAAW,EAAE,EAAE;IACf,cAAc,EAAE,EAAE;IAClB,cAAc,EAAE,EAAE;CACrB,CAAC;AAEW,QAAA,4BAA4B,GAA+C;IACpF,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,QAAQ;IACjB,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,QAAQ;IACjB,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,MAAM;IACb,GAAG,EAAE,GAAG;IACR,IAAI,EAAE,GAAG;IACT,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,OAAO;IACf,OAAO,EAAE,SAAS;IAClB,QAAQ,EAAE,SAAS;IACnB,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,MAAM;CAChB,CAAC;AAEW,QAAA,oBAAoB,mBAC7B,CAAC,EAAE,QAAQ,EACX,GAAG,EAAE,QAAQ,EACb,MAAM,EAAE,QAAQ,EAChB,OAAO,EAAE,QAAQ,EACjB,CAAC,EAAE,QAAQ,EACX,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,QAAQ,EAChB,OAAO,EAAE,QAAQ,EACjB,CAAC,EAAE,MAAM,EACT,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,CAAC,EAAE,GAAG,EACN,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,GAAG,EACT,CAAC,EAAE,GAAG,EACN,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,OAAO,EACX,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,OAAO,EACf,GAAG,EAAE,SAAS,EACd,OAAO,EAAE,SAAS,EAClB,QAAQ,EAAE,SAAS,EACnB,CAAC,EAAE,MAAM,EACT,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,IAGV,oCAA4B,EACjC;AAIW,QAAA,cAAc,GAAG,MAAM,yBAAe,CAC/C,+BAAuB,CAC1B,sHAAsH,CAAC;AAExH,SAAgB,kBAAkB,CAAC,KAAa;IAC5C,MAAM,GAAG,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IAChC,IAAI,+BAAuB,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE;QAC5C,OAAO,+BAAuB,CAAC,GAAG,CAAC,CAAC;KACvC;SAAM,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,IAAI,KAAK,EAAE;QACpD,OAAO,CAAC,CAAC;KACZ;SAAM,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;QACzB,OAAO,CAAC,CAAC;KACZ;SAAM,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;QAC1B,OAAO,GAAG,CAAC;KACd;SAAM,IAAI,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;QAC5B,OAAO,CAAC,CAAC;KACZ;SAAM,IAAI,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE;QAC7B,OAAO,CAAC,CAAC;KACZ;IAED,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC;AAC3B,CAAC;AAjBD,gDAiBC;AAIY,QAAA,sBAAsB,GAAG,MAAM,yBAAe,CAAC,+BAAuB,CAAC,8BAA8B,CAAC;AACnH,SAAgB,yBAAyB,CAAC,KAAa;IACnD,IAAI,GAAG,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IAC9B,IAAI,+BAAuB,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE;QAC5C,OAAO,+BAAuB,CAAC,GAAG,CAAC,CAAC;KACvC;IAED,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;IAC3C,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC;AARD,8DAQC;AAIY,QAAA,YAAY,GAAG,yEAAyE,CAAC;AACtG,SAAgB,SAAS,CAAC,KAAa;IACnC,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QAEnB,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACjC,OAAO,QAAQ,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;KAChC;IAED,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QAErB,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;KAC3B;IAED,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QAExB,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACtC,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;KAC1B;IAED,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtC,OAAO,4BAAoB,CAAC,aAAa,CAAC,CAAC;AAC/C,CAAC;AArBD,8BAqBC;AAID,MAAM,wBAAwB,GAAG,IAAI,sBAAc,aAAa,yBAAe,CAAC,4BAAoB,CAAC,GAAG,CAAC;AACzG,MAAM,sBAAsB,GAAG,IAAI,MAAM,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;AAEzE,MAAM,gCAAgC,GAAG,IAAI,sBAAc,aAAa,yBAAe,CACnF,oCAA4B,CAC/B,GAAG,CAAC;AAEQ,QAAA,kBAAkB,GAAG,iCAAuB,CAAC,+BAA+B,EAAE,wBAAwB,CAAC,CAAC;AACxG,QAAA,0BAA0B,GAAG,iCAAuB,CAC7D,+BAA+B,EAC/B,gCAAgC,CACnC,CAAC;AAEF,SAAgB,cAAc,CAAC,YAAY;IACvC,MAAM,SAAS,GAAG,EAAE,CAAC;IACrB,IAAI,aAAa,GAAG,YAAY,CAAC;IACjC,IAAI,KAAK,GAAG,sBAAsB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACvD,OAAO,KAAK,EAAE;QACV,uBAAuB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC1C,aAAa,GAAG,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QAChE,KAAK,GAAG,sBAAsB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;KACtD;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAVD,wCAUC;AAED,SAAS,uBAAuB,CAAC,SAAS,EAAE,KAAK;IAC7C,MAAM,GAAG,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACzC,MAAM,IAAI,GAAG,4BAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IAC1D,SAAS,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;AAC1B,CAAC"}