chrono-node 2.6.1 → 2.6.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +32 -2
- package/dist/cjs/common/refiners/AbstractMergeDateRangeRefiner.js +15 -7
- package/dist/cjs/common/refiners/AbstractMergeDateRangeRefiner.js.map +1 -1
- package/dist/cjs/common/refiners/ExtractTimezoneAbbrRefiner.d.ts +3 -4
- package/dist/cjs/common/refiners/ExtractTimezoneAbbrRefiner.js +6 -196
- package/dist/cjs/common/refiners/ExtractTimezoneAbbrRefiner.js.map +1 -1
- package/dist/cjs/common/refiners/ForwardDateRefiner.js +14 -14
- package/dist/cjs/common/refiners/ForwardDateRefiner.js.map +1 -1
- package/dist/cjs/configurations.js +1 -1
- package/dist/cjs/configurations.js.map +1 -1
- package/dist/cjs/index.d.ts +26 -4
- package/dist/cjs/index.js +16 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/locales/en/constants.d.ts +4 -0
- package/dist/cjs/locales/en/constants.js +5 -18
- package/dist/cjs/locales/en/constants.js.map +1 -1
- package/dist/cjs/locales/en/index.js +1 -1
- package/dist/cjs/locales/en/index.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENMonthNameMiddleEndianParser.d.ts +1 -1
- package/dist/cjs/locales/en/parsers/ENMonthNameParser.d.ts +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitAgoFormatParser.js +2 -2
- package/dist/cjs/locales/en/parsers/ENTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.d.ts +2 -0
- package/dist/cjs/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js +6 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitLaterFormatParser.js +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitLaterFormatParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitWithinFormatParser.d.ts +2 -0
- package/dist/cjs/locales/en/parsers/ENTimeUnitWithinFormatParser.js +10 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/cjs/locales/nl/parsers/NLMonthNameMiddleEndianParser.d.ts +1 -1
- package/dist/cjs/locales/ru/constants.js +4 -1
- package/dist/cjs/locales/ru/constants.js.map +1 -1
- package/dist/cjs/locales/ru/parsers/RUMonthNameParser.d.ts +1 -1
- package/dist/cjs/locales/zh/hans/parsers/ZHHansDateParser.d.ts +1 -1
- package/dist/cjs/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.d.ts +1 -1
- package/dist/cjs/locales/zh/hans/parsers/ZHHansTimeExpressionParser.d.ts +1 -1
- package/dist/cjs/locales/zh/hant/parsers/ZHHantDateParser.d.ts +1 -1
- package/dist/cjs/locales/zh/hant/parsers/ZHHantDeadlineFormatParser.d.ts +1 -1
- package/dist/cjs/locales/zh/hant/parsers/ZHHantTimeExpressionParser.d.ts +1 -1
- package/dist/cjs/package.json +1 -1
- package/dist/cjs/results.d.ts +1 -1
- package/dist/cjs/results.js +3 -3
- package/dist/cjs/results.js.map +1 -1
- package/dist/cjs/timezone.d.ts +5 -194
- package/dist/cjs/timezone.js +80 -7
- package/dist/cjs/timezone.js.map +1 -1
- package/dist/esm/common/refiners/AbstractMergeDateRangeRefiner.js +15 -7
- package/dist/esm/common/refiners/AbstractMergeDateRangeRefiner.js.map +1 -1
- package/dist/esm/common/refiners/ExtractTimezoneAbbrRefiner.d.ts +3 -4
- package/dist/esm/common/refiners/ExtractTimezoneAbbrRefiner.js +6 -196
- package/dist/esm/common/refiners/ExtractTimezoneAbbrRefiner.js.map +1 -1
- package/dist/esm/common/refiners/ForwardDateRefiner.js +14 -14
- package/dist/esm/common/refiners/ForwardDateRefiner.js.map +1 -1
- package/dist/esm/configurations.js +1 -1
- package/dist/esm/configurations.js.map +1 -1
- package/dist/esm/index.d.ts +26 -4
- package/dist/esm/index.js +15 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/locales/en/constants.d.ts +4 -0
- package/dist/esm/locales/en/constants.js +21 -0
- package/dist/esm/locales/en/constants.js.map +1 -1
- package/dist/esm/locales/en/index.js +1 -1
- package/dist/esm/locales/en/index.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENMonthNameMiddleEndianParser.d.ts +1 -1
- package/dist/esm/locales/en/parsers/ENMonthNameParser.d.ts +1 -1
- package/dist/esm/locales/en/parsers/ENTimeUnitAgoFormatParser.js +3 -3
- package/dist/esm/locales/en/parsers/ENTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.d.ts +2 -0
- package/dist/esm/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js +7 -2
- package/dist/esm/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENTimeUnitLaterFormatParser.js +2 -2
- package/dist/esm/locales/en/parsers/ENTimeUnitLaterFormatParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENTimeUnitWithinFormatParser.d.ts +2 -0
- package/dist/esm/locales/en/parsers/ENTimeUnitWithinFormatParser.js +11 -2
- package/dist/esm/locales/en/parsers/ENTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/esm/locales/nl/parsers/NLMonthNameMiddleEndianParser.d.ts +1 -1
- package/dist/esm/locales/ru/constants.js +4 -1
- package/dist/esm/locales/ru/constants.js.map +1 -1
- package/dist/esm/locales/ru/parsers/RUMonthNameParser.d.ts +1 -1
- package/dist/esm/locales/zh/hans/parsers/ZHHansDateParser.d.ts +1 -1
- package/dist/esm/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.d.ts +1 -1
- package/dist/esm/locales/zh/hans/parsers/ZHHansTimeExpressionParser.d.ts +1 -1
- package/dist/esm/locales/zh/hant/parsers/ZHHantDateParser.d.ts +1 -1
- package/dist/esm/locales/zh/hant/parsers/ZHHantDeadlineFormatParser.d.ts +1 -1
- package/dist/esm/locales/zh/hant/parsers/ZHHantTimeExpressionParser.d.ts +1 -1
- package/dist/esm/package.json +1 -1
- package/dist/esm/results.d.ts +1 -1
- package/dist/esm/results.js +3 -3
- package/dist/esm/results.js.map +1 -1
- package/dist/esm/timezone.d.ts +5 -194
- package/dist/esm/timezone.js +74 -6
- package/dist/esm/timezone.js.map +1 -1
- package/package.json +6 -7
- package/src/common/refiners/AbstractMergeDateRangeRefiner.ts +13 -8
- package/src/common/refiners/ExtractTimezoneAbbrRefiner.ts +7 -201
- package/src/common/refiners/ForwardDateRefiner.ts +18 -16
- package/src/configurations.ts +3 -1
- package/src/index.ts +48 -3
- package/src/locales/en/constants.ts +30 -0
- package/src/locales/en/index.ts +1 -1
- package/src/locales/en/parsers/ENTimeUnitAgoFormatParser.ts +3 -3
- package/src/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.ts +10 -2
- package/src/locales/en/parsers/ENTimeUnitLaterFormatParser.ts +5 -2
- package/src/locales/en/parsers/ENTimeUnitWithinFormatParser.ts +16 -3
- package/src/locales/ru/constants.ts +4 -1
- package/src/results.ts +3 -3
- package/src/timezone.ts +124 -7
- package/test/de/de_time_exp.test.ts +7 -7
- package/test/en/en_month.test.ts +70 -0
- package/test/en/en_time_units_ago.test.ts +12 -0
- package/test/en/en_time_units_casual_relative.test.ts +18 -0
- package/test/en/en_time_units_later.test.ts +13 -10
- package/test/en/en_time_units_within.test.ts +12 -1
- package/test/en/en_timezone_exp.test.ts +142 -0
- package/test/en/en_weekday.test.ts +26 -0
- package/test/en/negative_cases.test.ts +2 -0
- package/test/fr/fr_time_exp.test.ts +2 -2
- package/test/system.test.ts +23 -1
package/dist/cjs/timezone.js
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.toTimezoneOffset = exports.TIMEZONE_ABBR_MAP = void 0;
|
|
6
|
+
exports.toTimezoneOffset = exports.getLastWeekdayOfMonth = exports.getNthWeekdayOfMonth = exports.TIMEZONE_ABBR_MAP = void 0;
|
|
7
|
+
const dayjs_1 = __importDefault(require("dayjs"));
|
|
8
|
+
const index_1 = require("./index");
|
|
4
9
|
exports.TIMEZONE_ABBR_MAP = {
|
|
5
10
|
ACDT: 630,
|
|
6
11
|
ACST: 570,
|
|
@@ -35,7 +40,12 @@ exports.TIMEZONE_ABBR_MAP = {
|
|
|
35
40
|
CCT: 390,
|
|
36
41
|
CDT: -300,
|
|
37
42
|
CEST: 120,
|
|
38
|
-
CET:
|
|
43
|
+
CET: {
|
|
44
|
+
timezoneOffsetDuringDst: 2 * 60,
|
|
45
|
+
timezoneOffsetNonDst: 60,
|
|
46
|
+
dstStart: (year) => getLastWeekdayOfMonth(year, index_1.Month.MARCH, index_1.Weekday.SUNDAY, 2),
|
|
47
|
+
dstEnd: (year) => getLastWeekdayOfMonth(year, index_1.Month.OCTOBER, index_1.Weekday.SUNDAY, 3),
|
|
48
|
+
},
|
|
39
49
|
CHADT: 825,
|
|
40
50
|
CHAST: 765,
|
|
41
51
|
CKT: -600,
|
|
@@ -43,6 +53,12 @@ exports.TIMEZONE_ABBR_MAP = {
|
|
|
43
53
|
CLT: -240,
|
|
44
54
|
COT: -300,
|
|
45
55
|
CST: -360,
|
|
56
|
+
CT: {
|
|
57
|
+
timezoneOffsetDuringDst: -5 * 60,
|
|
58
|
+
timezoneOffsetNonDst: -6 * 60,
|
|
59
|
+
dstStart: (year) => getNthWeekdayOfMonth(year, index_1.Month.MARCH, index_1.Weekday.SUNDAY, 2, 2),
|
|
60
|
+
dstEnd: (year) => getNthWeekdayOfMonth(year, index_1.Month.NOVEMBER, index_1.Weekday.SUNDAY, 1, 2),
|
|
61
|
+
},
|
|
46
62
|
CVT: -60,
|
|
47
63
|
CXT: 420,
|
|
48
64
|
ChST: 600,
|
|
@@ -57,7 +73,12 @@ exports.TIMEZONE_ABBR_MAP = {
|
|
|
57
73
|
EGST: 0,
|
|
58
74
|
EGT: -60,
|
|
59
75
|
EST: -300,
|
|
60
|
-
ET:
|
|
76
|
+
ET: {
|
|
77
|
+
timezoneOffsetDuringDst: -4 * 60,
|
|
78
|
+
timezoneOffsetNonDst: -5 * 60,
|
|
79
|
+
dstStart: (year) => getNthWeekdayOfMonth(year, index_1.Month.MARCH, index_1.Weekday.SUNDAY, 2, 2),
|
|
80
|
+
dstEnd: (year) => getNthWeekdayOfMonth(year, index_1.Month.NOVEMBER, index_1.Weekday.SUNDAY, 1, 2),
|
|
81
|
+
},
|
|
61
82
|
FJST: 780,
|
|
62
83
|
FJT: 720,
|
|
63
84
|
FKST: -180,
|
|
@@ -119,6 +140,12 @@ exports.TIMEZONE_ABBR_MAP = {
|
|
|
119
140
|
MSD: 240,
|
|
120
141
|
MSK: 180,
|
|
121
142
|
MST: -420,
|
|
143
|
+
MT: {
|
|
144
|
+
timezoneOffsetDuringDst: -6 * 60,
|
|
145
|
+
timezoneOffsetNonDst: -7 * 60,
|
|
146
|
+
dstStart: (year) => getNthWeekdayOfMonth(year, index_1.Month.MARCH, index_1.Weekday.SUNDAY, 2, 2),
|
|
147
|
+
dstEnd: (year) => getNthWeekdayOfMonth(year, index_1.Month.NOVEMBER, index_1.Weekday.SUNDAY, 1, 2),
|
|
148
|
+
},
|
|
122
149
|
MUT: 240,
|
|
123
150
|
MVT: 300,
|
|
124
151
|
MYT: 480,
|
|
@@ -146,7 +173,12 @@ exports.TIMEZONE_ABBR_MAP = {
|
|
|
146
173
|
PMST: -180,
|
|
147
174
|
PONT: 660,
|
|
148
175
|
PST: -480,
|
|
149
|
-
PT:
|
|
176
|
+
PT: {
|
|
177
|
+
timezoneOffsetDuringDst: -7 * 60,
|
|
178
|
+
timezoneOffsetNonDst: -8 * 60,
|
|
179
|
+
dstStart: (year) => getNthWeekdayOfMonth(year, index_1.Month.MARCH, index_1.Weekday.SUNDAY, 2, 2),
|
|
180
|
+
dstEnd: (year) => getNthWeekdayOfMonth(year, index_1.Month.NOVEMBER, index_1.Weekday.SUNDAY, 1, 2),
|
|
181
|
+
},
|
|
150
182
|
PWT: 540,
|
|
151
183
|
PYST: -180,
|
|
152
184
|
PYT: -240,
|
|
@@ -194,15 +226,56 @@ exports.TIMEZONE_ABBR_MAP = {
|
|
|
194
226
|
YEKST: 360,
|
|
195
227
|
YEKT: 360,
|
|
196
228
|
};
|
|
197
|
-
function
|
|
229
|
+
function getNthWeekdayOfMonth(year, month, weekday, n, hour = 0) {
|
|
230
|
+
let dayOfMonth = 0;
|
|
231
|
+
let i = 0;
|
|
232
|
+
while (i < n) {
|
|
233
|
+
dayOfMonth++;
|
|
234
|
+
const date = new Date(year, month - 1, dayOfMonth);
|
|
235
|
+
if (date.getDay() === weekday)
|
|
236
|
+
i++;
|
|
237
|
+
}
|
|
238
|
+
return new Date(year, month - 1, dayOfMonth, hour);
|
|
239
|
+
}
|
|
240
|
+
exports.getNthWeekdayOfMonth = getNthWeekdayOfMonth;
|
|
241
|
+
function getLastWeekdayOfMonth(year, month, weekday, hour = 0) {
|
|
242
|
+
const oneIndexedWeekday = weekday === 0 ? 7 : weekday;
|
|
243
|
+
const date = new Date(year, month - 1 + 1, 1, 12);
|
|
244
|
+
const firstWeekdayNextMonth = date.getDay() === 0 ? 7 : date.getDay();
|
|
245
|
+
let dayDiff;
|
|
246
|
+
if (firstWeekdayNextMonth === oneIndexedWeekday)
|
|
247
|
+
dayDiff = 7;
|
|
248
|
+
else if (firstWeekdayNextMonth < oneIndexedWeekday)
|
|
249
|
+
dayDiff = 7 + firstWeekdayNextMonth - oneIndexedWeekday;
|
|
250
|
+
else
|
|
251
|
+
dayDiff = firstWeekdayNextMonth - oneIndexedWeekday;
|
|
252
|
+
date.setDate(date.getDate() - dayDiff);
|
|
253
|
+
return new Date(year, month - 1, date.getDate(), hour);
|
|
254
|
+
}
|
|
255
|
+
exports.getLastWeekdayOfMonth = getLastWeekdayOfMonth;
|
|
256
|
+
function toTimezoneOffset(timezoneInput, date, timezoneOverrides = {}) {
|
|
198
257
|
var _a;
|
|
199
|
-
if (timezoneInput
|
|
258
|
+
if (timezoneInput == null) {
|
|
200
259
|
return null;
|
|
201
260
|
}
|
|
202
261
|
if (typeof timezoneInput === "number") {
|
|
203
262
|
return timezoneInput;
|
|
204
263
|
}
|
|
205
|
-
|
|
264
|
+
const matchedTimezone = (_a = timezoneOverrides[timezoneInput]) !== null && _a !== void 0 ? _a : exports.TIMEZONE_ABBR_MAP[timezoneInput];
|
|
265
|
+
if (matchedTimezone == null) {
|
|
266
|
+
return null;
|
|
267
|
+
}
|
|
268
|
+
if (typeof matchedTimezone == "number") {
|
|
269
|
+
return matchedTimezone;
|
|
270
|
+
}
|
|
271
|
+
if (date == null) {
|
|
272
|
+
return null;
|
|
273
|
+
}
|
|
274
|
+
if (dayjs_1.default(date).isAfter(matchedTimezone.dstStart(date.getFullYear())) &&
|
|
275
|
+
!dayjs_1.default(date).isAfter(matchedTimezone.dstEnd(date.getFullYear()))) {
|
|
276
|
+
return matchedTimezone.timezoneOffsetDuringDst;
|
|
277
|
+
}
|
|
278
|
+
return matchedTimezone.timezoneOffsetNonDst;
|
|
206
279
|
}
|
|
207
280
|
exports.toTimezoneOffset = toTimezoneOffset;
|
|
208
281
|
//# sourceMappingURL=timezone.js.map
|
package/dist/cjs/timezone.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timezone.js","sourceRoot":"","sources":["../../src/timezone.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"timezone.js","sourceRoot":"","sources":["../../src/timezone.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,30 +7,38 @@ export default class AbstractMergeDateRangeRefiner extends MergingRefiner {
|
|
|
7
7
|
if (!fromResult.start.isOnlyWeekdayComponent() && !toResult.start.isOnlyWeekdayComponent()) {
|
|
8
8
|
toResult.start.getCertainComponents().forEach((key) => {
|
|
9
9
|
if (!fromResult.start.isCertain(key)) {
|
|
10
|
-
fromResult.start.
|
|
10
|
+
fromResult.start.imply(key, toResult.start.get(key));
|
|
11
11
|
}
|
|
12
12
|
});
|
|
13
13
|
fromResult.start.getCertainComponents().forEach((key) => {
|
|
14
14
|
if (!toResult.start.isCertain(key)) {
|
|
15
|
-
toResult.start.
|
|
15
|
+
toResult.start.imply(key, fromResult.start.get(key));
|
|
16
16
|
}
|
|
17
17
|
});
|
|
18
18
|
}
|
|
19
19
|
if (fromResult.start.date().getTime() > toResult.start.date().getTime()) {
|
|
20
20
|
let fromMoment = fromResult.start.dayjs();
|
|
21
21
|
let toMoment = toResult.start.dayjs();
|
|
22
|
-
if (
|
|
22
|
+
if (toResult.start.isOnlyWeekdayComponent() && toMoment.add(7, "days").isAfter(fromMoment)) {
|
|
23
|
+
toMoment = toMoment.add(7, "days");
|
|
24
|
+
toResult.start.imply("day", toMoment.date());
|
|
25
|
+
toResult.start.imply("month", toMoment.month() + 1);
|
|
26
|
+
toResult.start.imply("year", toMoment.year());
|
|
27
|
+
}
|
|
28
|
+
else if (fromResult.start.isOnlyWeekdayComponent() && fromMoment.add(-7, "days").isBefore(toMoment)) {
|
|
23
29
|
fromMoment = fromMoment.add(-7, "days");
|
|
24
30
|
fromResult.start.imply("day", fromMoment.date());
|
|
25
31
|
fromResult.start.imply("month", fromMoment.month() + 1);
|
|
26
32
|
fromResult.start.imply("year", fromMoment.year());
|
|
27
33
|
}
|
|
28
|
-
else if (toResult.start.
|
|
29
|
-
toMoment = toMoment.add(
|
|
30
|
-
toResult.start.imply("day", toMoment.date());
|
|
31
|
-
toResult.start.imply("month", toMoment.month() + 1);
|
|
34
|
+
else if (toResult.start.isDateWithUnknownYear() && toMoment.add(1, "years").isAfter(fromMoment)) {
|
|
35
|
+
toMoment = toMoment.add(1, "years");
|
|
32
36
|
toResult.start.imply("year", toMoment.year());
|
|
33
37
|
}
|
|
38
|
+
else if (fromResult.start.isDateWithUnknownYear() && fromMoment.add(-1, "years").isBefore(toMoment)) {
|
|
39
|
+
fromMoment = fromMoment.add(-1, "years");
|
|
40
|
+
fromResult.start.imply("year", fromMoment.year());
|
|
41
|
+
}
|
|
34
42
|
else {
|
|
35
43
|
[toResult, fromResult] = [fromResult, toResult];
|
|
36
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractMergeDateRangeRefiner.js","sourceRoot":"","sources":["../../../../src/common/refiners/AbstractMergeDateRangeRefiner.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,CAAC,OAAO,OAAgB,6BAA8B,SAAQ,cAAc;IAG9E,kBAAkB,CAAC,WAAW,EAAE,aAAa,EAAE,UAAU;QACrD,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,IAAI,IAAI,CAAC;IACrG,CAAC;IAED,YAAY,CAAC,WAAW,EAAE,UAAU,EAAE,QAAQ;QAC1C,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,sBAAsB,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,sBAAsB,EAAE,EAAE;YACxF,QAAQ,CAAC,KAAK,CAAC,oBAAoB,EAAE,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAClD,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;oBAClC,UAAU,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"AbstractMergeDateRangeRefiner.js","sourceRoot":"","sources":["../../../../src/common/refiners/AbstractMergeDateRangeRefiner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { ParsingContext, Refiner } from "../../chrono.js";
|
|
2
|
+
import { TimezoneAbbrMap } from "../../index.js";
|
|
2
3
|
import { ParsingResult } from "../../results.js";
|
|
3
4
|
export default class ExtractTimezoneAbbrRefiner implements Refiner {
|
|
4
|
-
private readonly
|
|
5
|
-
constructor(timezoneOverrides?:
|
|
6
|
-
string: number;
|
|
7
|
-
});
|
|
5
|
+
private readonly timezoneOverrides?;
|
|
6
|
+
constructor(timezoneOverrides?: TimezoneAbbrMap);
|
|
8
7
|
refine(context: ParsingContext, results: ParsingResult[]): ParsingResult[];
|
|
9
8
|
}
|
|
@@ -1,200 +1,8 @@
|
|
|
1
|
+
import { toTimezoneOffset } from "../../timezone.js";
|
|
1
2
|
const TIMEZONE_NAME_PATTERN = new RegExp("^\\s*,?\\s*\\(?([A-Z]{2,4})\\)?(?=\\W|$)", "i");
|
|
2
|
-
const DEFAULT_TIMEZONE_ABBR_MAP = {
|
|
3
|
-
ACDT: 630,
|
|
4
|
-
ACST: 570,
|
|
5
|
-
ADT: -180,
|
|
6
|
-
AEDT: 660,
|
|
7
|
-
AEST: 600,
|
|
8
|
-
AFT: 270,
|
|
9
|
-
AKDT: -480,
|
|
10
|
-
AKST: -540,
|
|
11
|
-
ALMT: 360,
|
|
12
|
-
AMST: -180,
|
|
13
|
-
AMT: -240,
|
|
14
|
-
ANAST: 720,
|
|
15
|
-
ANAT: 720,
|
|
16
|
-
AQTT: 300,
|
|
17
|
-
ART: -180,
|
|
18
|
-
AST: -240,
|
|
19
|
-
AWDT: 540,
|
|
20
|
-
AWST: 480,
|
|
21
|
-
AZOST: 0,
|
|
22
|
-
AZOT: -60,
|
|
23
|
-
AZST: 300,
|
|
24
|
-
AZT: 240,
|
|
25
|
-
BNT: 480,
|
|
26
|
-
BOT: -240,
|
|
27
|
-
BRST: -120,
|
|
28
|
-
BRT: -180,
|
|
29
|
-
BST: 60,
|
|
30
|
-
BTT: 360,
|
|
31
|
-
CAST: 480,
|
|
32
|
-
CAT: 120,
|
|
33
|
-
CCT: 390,
|
|
34
|
-
CDT: -300,
|
|
35
|
-
CEST: 120,
|
|
36
|
-
CET: 60,
|
|
37
|
-
CHADT: 825,
|
|
38
|
-
CHAST: 765,
|
|
39
|
-
CKT: -600,
|
|
40
|
-
CLST: -180,
|
|
41
|
-
CLT: -240,
|
|
42
|
-
COT: -300,
|
|
43
|
-
CST: -360,
|
|
44
|
-
CVT: -60,
|
|
45
|
-
CXT: 420,
|
|
46
|
-
ChST: 600,
|
|
47
|
-
DAVT: 420,
|
|
48
|
-
EASST: -300,
|
|
49
|
-
EAST: -360,
|
|
50
|
-
EAT: 180,
|
|
51
|
-
ECT: -300,
|
|
52
|
-
EDT: -240,
|
|
53
|
-
EEST: 180,
|
|
54
|
-
EET: 120,
|
|
55
|
-
EGST: 0,
|
|
56
|
-
EGT: -60,
|
|
57
|
-
EST: -300,
|
|
58
|
-
ET: -300,
|
|
59
|
-
FJST: 780,
|
|
60
|
-
FJT: 720,
|
|
61
|
-
FKST: -180,
|
|
62
|
-
FKT: -240,
|
|
63
|
-
FNT: -120,
|
|
64
|
-
GALT: -360,
|
|
65
|
-
GAMT: -540,
|
|
66
|
-
GET: 240,
|
|
67
|
-
GFT: -180,
|
|
68
|
-
GILT: 720,
|
|
69
|
-
GMT: 0,
|
|
70
|
-
GST: 240,
|
|
71
|
-
GYT: -240,
|
|
72
|
-
HAA: -180,
|
|
73
|
-
HAC: -300,
|
|
74
|
-
HADT: -540,
|
|
75
|
-
HAE: -240,
|
|
76
|
-
HAP: -420,
|
|
77
|
-
HAR: -360,
|
|
78
|
-
HAST: -600,
|
|
79
|
-
HAT: -90,
|
|
80
|
-
HAY: -480,
|
|
81
|
-
HKT: 480,
|
|
82
|
-
HLV: -210,
|
|
83
|
-
HNA: -240,
|
|
84
|
-
HNC: -360,
|
|
85
|
-
HNE: -300,
|
|
86
|
-
HNP: -480,
|
|
87
|
-
HNR: -420,
|
|
88
|
-
HNT: -150,
|
|
89
|
-
HNY: -540,
|
|
90
|
-
HOVT: 420,
|
|
91
|
-
ICT: 420,
|
|
92
|
-
IDT: 180,
|
|
93
|
-
IOT: 360,
|
|
94
|
-
IRDT: 270,
|
|
95
|
-
IRKST: 540,
|
|
96
|
-
IRKT: 540,
|
|
97
|
-
IRST: 210,
|
|
98
|
-
IST: 330,
|
|
99
|
-
JST: 540,
|
|
100
|
-
KGT: 360,
|
|
101
|
-
KRAST: 480,
|
|
102
|
-
KRAT: 480,
|
|
103
|
-
KST: 540,
|
|
104
|
-
KUYT: 240,
|
|
105
|
-
LHDT: 660,
|
|
106
|
-
LHST: 630,
|
|
107
|
-
LINT: 840,
|
|
108
|
-
MAGST: 720,
|
|
109
|
-
MAGT: 720,
|
|
110
|
-
MART: -510,
|
|
111
|
-
MAWT: 300,
|
|
112
|
-
MDT: -360,
|
|
113
|
-
MESZ: 120,
|
|
114
|
-
MEZ: 60,
|
|
115
|
-
MHT: 720,
|
|
116
|
-
MMT: 390,
|
|
117
|
-
MSD: 240,
|
|
118
|
-
MSK: 240,
|
|
119
|
-
MST: -420,
|
|
120
|
-
MUT: 240,
|
|
121
|
-
MVT: 300,
|
|
122
|
-
MYT: 480,
|
|
123
|
-
NCT: 660,
|
|
124
|
-
NDT: -90,
|
|
125
|
-
NFT: 690,
|
|
126
|
-
NOVST: 420,
|
|
127
|
-
NOVT: 360,
|
|
128
|
-
NPT: 345,
|
|
129
|
-
NST: -150,
|
|
130
|
-
NUT: -660,
|
|
131
|
-
NZDT: 780,
|
|
132
|
-
NZST: 720,
|
|
133
|
-
OMSST: 420,
|
|
134
|
-
OMST: 420,
|
|
135
|
-
PDT: -420,
|
|
136
|
-
PET: -300,
|
|
137
|
-
PETST: 720,
|
|
138
|
-
PETT: 720,
|
|
139
|
-
PGT: 600,
|
|
140
|
-
PHOT: 780,
|
|
141
|
-
PHT: 480,
|
|
142
|
-
PKT: 300,
|
|
143
|
-
PMDT: -120,
|
|
144
|
-
PMST: -180,
|
|
145
|
-
PONT: 660,
|
|
146
|
-
PST: -480,
|
|
147
|
-
PT: -480,
|
|
148
|
-
PWT: 540,
|
|
149
|
-
PYST: -180,
|
|
150
|
-
PYT: -240,
|
|
151
|
-
RET: 240,
|
|
152
|
-
SAMT: 240,
|
|
153
|
-
SAST: 120,
|
|
154
|
-
SBT: 660,
|
|
155
|
-
SCT: 240,
|
|
156
|
-
SGT: 480,
|
|
157
|
-
SRT: -180,
|
|
158
|
-
SST: -660,
|
|
159
|
-
TAHT: -600,
|
|
160
|
-
TFT: 300,
|
|
161
|
-
TJT: 300,
|
|
162
|
-
TKT: 780,
|
|
163
|
-
TLT: 540,
|
|
164
|
-
TMT: 300,
|
|
165
|
-
TVT: 720,
|
|
166
|
-
ULAT: 480,
|
|
167
|
-
UTC: 0,
|
|
168
|
-
UYST: -120,
|
|
169
|
-
UYT: -180,
|
|
170
|
-
UZT: 300,
|
|
171
|
-
VET: -210,
|
|
172
|
-
VLAST: 660,
|
|
173
|
-
VLAT: 660,
|
|
174
|
-
VUT: 660,
|
|
175
|
-
WAST: 120,
|
|
176
|
-
WAT: 60,
|
|
177
|
-
WEST: 60,
|
|
178
|
-
WESZ: 60,
|
|
179
|
-
WET: 0,
|
|
180
|
-
WEZ: 0,
|
|
181
|
-
WFT: 720,
|
|
182
|
-
WGST: -120,
|
|
183
|
-
WGT: -180,
|
|
184
|
-
WIB: 420,
|
|
185
|
-
WIT: 540,
|
|
186
|
-
WITA: 480,
|
|
187
|
-
WST: 780,
|
|
188
|
-
WT: 0,
|
|
189
|
-
YAKST: 600,
|
|
190
|
-
YAKT: 600,
|
|
191
|
-
YAPT: 600,
|
|
192
|
-
YEKST: 360,
|
|
193
|
-
YEKT: 360,
|
|
194
|
-
};
|
|
195
3
|
export default class ExtractTimezoneAbbrRefiner {
|
|
196
4
|
constructor(timezoneOverrides) {
|
|
197
|
-
this.
|
|
5
|
+
this.timezoneOverrides = timezoneOverrides;
|
|
198
6
|
}
|
|
199
7
|
refine(context, results) {
|
|
200
8
|
const timezoneOverrides = context.option.timezones ?? {};
|
|
@@ -205,8 +13,10 @@ export default class ExtractTimezoneAbbrRefiner {
|
|
|
205
13
|
return;
|
|
206
14
|
}
|
|
207
15
|
const timezoneAbbr = match[1].toUpperCase();
|
|
208
|
-
const
|
|
209
|
-
|
|
16
|
+
const refDate = result.start.date() ?? result.refDate ?? new Date();
|
|
17
|
+
const tzOverrides = { ...this.timezoneOverrides, ...timezoneOverrides };
|
|
18
|
+
const extractedTimezoneOffset = toTimezoneOffset(timezoneAbbr, refDate, tzOverrides);
|
|
19
|
+
if (extractedTimezoneOffset == null) {
|
|
210
20
|
return;
|
|
211
21
|
}
|
|
212
22
|
context.debug(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExtractTimezoneAbbrRefiner.js","sourceRoot":"","sources":["../../../../src/common/refiners/ExtractTimezoneAbbrRefiner.ts"],"names":[],"mappings":"AAIA,
|
|
1
|
+
{"version":3,"file":"ExtractTimezoneAbbrRefiner.js","sourceRoot":"","sources":["../../../../src/common/refiners/ExtractTimezoneAbbrRefiner.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,qBAAqB,GAAG,IAAI,MAAM,CAAC,0CAA0C,EAAE,GAAG,CAAC,CAAC;AAE1F,MAAM,CAAC,OAAO,OAAO,0BAA0B;IAC3C,YAA6B,iBAAmC;QAAnC,sBAAiB,GAAjB,iBAAiB,CAAkB;IAAG,CAAC;IAEpE,MAAM,CAAC,OAAuB,EAAE,OAAwB;QACpD,MAAM,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,IAAI,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,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,MAAM,CAAC,OAAO,IAAI,IAAI,IAAI,EAAE,CAAC;YACpE,MAAM,WAAW,GAAG,EAAE,GAAG,IAAI,CAAC,iBAAiB,EAAE,GAAG,iBAAiB,EAAE,CAAC;YACxE,MAAM,uBAAuB,GAAG,gBAAgB,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"}
|
|
@@ -18,20 +18,6 @@ export default class ForwardDateRefiner {
|
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
-
if (result.start.isOnlyDayMonthComponent() && refMoment.isAfter(result.start.dayjs())) {
|
|
22
|
-
for (let i = 0; i < 3 && refMoment.isAfter(result.start.dayjs()); i++) {
|
|
23
|
-
result.start.imply("year", result.start.get("year") + 1);
|
|
24
|
-
context.debug(() => {
|
|
25
|
-
console.log(`Forward yearly adjusted for ${result} (${result.start})`);
|
|
26
|
-
});
|
|
27
|
-
if (result.end && !result.end.isCertain("year")) {
|
|
28
|
-
result.end.imply("year", result.end.get("year") + 1);
|
|
29
|
-
context.debug(() => {
|
|
30
|
-
console.log(`Forward yearly adjusted for ${result} (${result.end})`);
|
|
31
|
-
});
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
21
|
if (result.start.isOnlyWeekdayComponent() && refMoment.isAfter(result.start.dayjs())) {
|
|
36
22
|
if (refMoment.day() >= result.start.get("weekday")) {
|
|
37
23
|
refMoment = refMoment.day(result.start.get("weekday") + 7);
|
|
@@ -60,6 +46,20 @@ export default class ForwardDateRefiner {
|
|
|
60
46
|
});
|
|
61
47
|
}
|
|
62
48
|
}
|
|
49
|
+
if (result.start.isDateWithUnknownYear() && refMoment.isAfter(result.start.dayjs())) {
|
|
50
|
+
for (let i = 0; i < 3 && refMoment.isAfter(result.start.dayjs()); i++) {
|
|
51
|
+
result.start.imply("year", result.start.get("year") + 1);
|
|
52
|
+
context.debug(() => {
|
|
53
|
+
console.log(`Forward yearly adjusted for ${result} (${result.start})`);
|
|
54
|
+
});
|
|
55
|
+
if (result.end && !result.end.isCertain("year")) {
|
|
56
|
+
result.end.imply("year", result.end.get("year") + 1);
|
|
57
|
+
context.debug(() => {
|
|
58
|
+
console.log(`Forward yearly adjusted for ${result} (${result.end})`);
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
63
|
});
|
|
64
64
|
return results;
|
|
65
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ForwardDateRefiner.js","sourceRoot":"","sources":["../../../../src/common/refiners/ForwardDateRefiner.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,MAAM,CAAC,OAAO,OAAO,kBAAkB;IACnC,MAAM,CAAC,OAAuB,EAAE,OAAwB;QACpD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE;YAC7B,OAAO,OAAO,CAAC;SAClB;QAED,OAAO,CAAC,OAAO,CAAC,UAAU,MAAM;YAC5B,IAAI,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAEvC,IAAI,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE;gBACtE,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;gBACpC,gBAAgB,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;gBAC1C,IAAI,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE;oBACvC,gBAAgB,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;oBACxC,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE;wBAClD,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;wBACpC,gBAAgB,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;qBAC3C;iBACJ;aACJ;YAED,IAAI,MAAM,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"ForwardDateRefiner.js","sourceRoot":"","sources":["../../../../src/common/refiners/ForwardDateRefiner.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,9 +8,9 @@ import MergeWeekdayComponentRefiner from "./common/refiners/MergeWeekdayComponen
|
|
|
8
8
|
export function includeCommonConfiguration(configuration, strictMode = false) {
|
|
9
9
|
configuration.parsers.unshift(new ISOFormatParser());
|
|
10
10
|
configuration.refiners.unshift(new MergeWeekdayComponentRefiner());
|
|
11
|
-
configuration.refiners.unshift(new ExtractTimezoneAbbrRefiner());
|
|
12
11
|
configuration.refiners.unshift(new ExtractTimezoneOffsetRefiner());
|
|
13
12
|
configuration.refiners.unshift(new OverlapRemovalRefiner());
|
|
13
|
+
configuration.refiners.push(new ExtractTimezoneAbbrRefiner());
|
|
14
14
|
configuration.refiners.push(new OverlapRemovalRefiner());
|
|
15
15
|
configuration.refiners.push(new ForwardDateRefiner());
|
|
16
16
|
configuration.refiners.push(new UnlikelyFormatFilter(strictMode));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configurations.js","sourceRoot":"","sources":["../../src/configurations.ts"],"names":[],"mappings":"AAEA,OAAO,0BAA0B,MAAM,8CAA8C,CAAC;AACtF,OAAO,4BAA4B,MAAM,gDAAgD,CAAC;AAC1F,OAAO,qBAAqB,MAAM,yCAAyC,CAAC;AAC5E,OAAO,kBAAkB,MAAM,sCAAsC,CAAC;AACtE,OAAO,oBAAoB,MAAM,wCAAwC,CAAC;AAC1E,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,4BAA4B,MAAM,gDAAgD,CAAC;AAE1F,MAAM,UAAU,0BAA0B,CAAC,aAA4B,EAAE,UAAU,GAAG,KAAK;IACvF,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,CAAC;IAErD,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,4BAA4B,EAAE,CAAC,CAAC;IACnE,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"configurations.js","sourceRoot":"","sources":["../../src/configurations.ts"],"names":[],"mappings":"AAEA,OAAO,0BAA0B,MAAM,8CAA8C,CAAC;AACtF,OAAO,4BAA4B,MAAM,gDAAgD,CAAC;AAC1F,OAAO,qBAAqB,MAAM,yCAAyC,CAAC;AAC5E,OAAO,kBAAkB,MAAM,sCAAsC,CAAC;AACtE,OAAO,oBAAoB,MAAM,wCAAwC,CAAC;AAC1E,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,4BAA4B,MAAM,gDAAgD,CAAC;AAE1F,MAAM,UAAU,0BAA0B,CAAC,aAA4B,EAAE,UAAU,GAAG,KAAK;IACvF,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,CAAC;IAErD,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,4BAA4B,EAAE,CAAC,CAAC;IACnE,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,4BAA4B,EAAE,CAAC,CAAC;IACnE,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,qBAAqB,EAAE,CAAC,CAAC;IAI5D,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,0BAA0B,EAAE,CAAC,CAAC;IAC9D,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,qBAAqB,EAAE,CAAC,CAAC;IACzD,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,kBAAkB,EAAE,CAAC,CAAC;IACtD,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;IAClE,OAAO,aAAa,CAAC;AACzB,CAAC"}
|
package/dist/esm/index.d.ts
CHANGED
|
@@ -1,12 +1,20 @@
|
|
|
1
1
|
import * as en from "./locales/en/index.js";
|
|
2
2
|
import { Chrono, Parser, Refiner } from "./chrono.js";
|
|
3
|
-
|
|
3
|
+
import type { ParsingResult } from "./results.js";
|
|
4
|
+
export { en, Chrono, Parser, Refiner, ParsingResult };
|
|
4
5
|
export interface ParsingOption {
|
|
5
6
|
forwardDate?: boolean;
|
|
6
|
-
timezones?:
|
|
7
|
-
[tzKeyword: string]: number;
|
|
8
|
-
};
|
|
7
|
+
timezones?: TimezoneAbbrMap;
|
|
9
8
|
}
|
|
9
|
+
export interface AmbiguousTimezoneMap {
|
|
10
|
+
timezoneOffsetDuringDst: number;
|
|
11
|
+
timezoneOffsetNonDst: number;
|
|
12
|
+
dstStart: (year: number) => Date;
|
|
13
|
+
dstEnd: (year: number) => Date;
|
|
14
|
+
}
|
|
15
|
+
export declare type TimezoneAbbrMap = {
|
|
16
|
+
[key: string]: number | AmbiguousTimezoneMap;
|
|
17
|
+
};
|
|
10
18
|
export interface ParsingReference {
|
|
11
19
|
instant?: Date;
|
|
12
20
|
timezone?: string | number;
|
|
@@ -38,6 +46,20 @@ export declare enum Weekday {
|
|
|
38
46
|
FRIDAY = 5,
|
|
39
47
|
SATURDAY = 6
|
|
40
48
|
}
|
|
49
|
+
export declare enum Month {
|
|
50
|
+
JANUARY = 1,
|
|
51
|
+
FEBRUARY = 2,
|
|
52
|
+
MARCH = 3,
|
|
53
|
+
APRIL = 4,
|
|
54
|
+
MAY = 5,
|
|
55
|
+
JUNE = 6,
|
|
56
|
+
JULY = 7,
|
|
57
|
+
AUGUST = 8,
|
|
58
|
+
SEPTEMBER = 9,
|
|
59
|
+
OCTOBER = 10,
|
|
60
|
+
NOVEMBER = 11,
|
|
61
|
+
DECEMBER = 12
|
|
62
|
+
}
|
|
41
63
|
import * as de from "./locales/de/index.js";
|
|
42
64
|
import * as fr from "./locales/fr/index.js";
|
|
43
65
|
import * as ja from "./locales/ja/index.js";
|
package/dist/esm/index.js
CHANGED
|
@@ -16,6 +16,21 @@ export var Weekday;
|
|
|
16
16
|
Weekday[Weekday["FRIDAY"] = 5] = "FRIDAY";
|
|
17
17
|
Weekday[Weekday["SATURDAY"] = 6] = "SATURDAY";
|
|
18
18
|
})(Weekday || (Weekday = {}));
|
|
19
|
+
export var Month;
|
|
20
|
+
(function (Month) {
|
|
21
|
+
Month[Month["JANUARY"] = 1] = "JANUARY";
|
|
22
|
+
Month[Month["FEBRUARY"] = 2] = "FEBRUARY";
|
|
23
|
+
Month[Month["MARCH"] = 3] = "MARCH";
|
|
24
|
+
Month[Month["APRIL"] = 4] = "APRIL";
|
|
25
|
+
Month[Month["MAY"] = 5] = "MAY";
|
|
26
|
+
Month[Month["JUNE"] = 6] = "JUNE";
|
|
27
|
+
Month[Month["JULY"] = 7] = "JULY";
|
|
28
|
+
Month[Month["AUGUST"] = 8] = "AUGUST";
|
|
29
|
+
Month[Month["SEPTEMBER"] = 9] = "SEPTEMBER";
|
|
30
|
+
Month[Month["OCTOBER"] = 10] = "OCTOBER";
|
|
31
|
+
Month[Month["NOVEMBER"] = 11] = "NOVEMBER";
|
|
32
|
+
Month[Month["DECEMBER"] = 12] = "DECEMBER";
|
|
33
|
+
})(Month || (Month = {}));
|
|
19
34
|
import * as de from "./locales/de/index.js";
|
|
20
35
|
import * as fr from "./locales/fr/index.js";
|
|
21
36
|
import * as ja from "./locales/ja/index.js";
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,MAAM,EAAmB,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,MAAM,EAAmB,MAAM,UAAU,CAAC;AAGnD,OAAO,EAAE,EAAE,EAAE,MAAM,EAAkC,CAAC;AAyHtD,MAAM,CAAN,IAAY,QAGX;AAHD,WAAY,QAAQ;IAChB,mCAAM,CAAA;IACN,mCAAM,CAAA;AACV,CAAC,EAHW,QAAQ,KAAR,QAAQ,QAGnB;AAED,MAAM,CAAN,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,KAAP,OAAO,QAQlB;AAED,MAAM,CAAN,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,KAAL,KAAK,QAahB;AAGD,OAAO,KAAK,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,KAAK,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,KAAK,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,KAAK,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,KAAK,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,KAAK,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,KAAK,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,KAAK,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;AAK1C,MAAM,CAAC,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;AAKhC,MAAM,CAAC,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;AAKhC,MAAM,UAAU,KAAK,CAAC,IAAY,EAAE,GAA6B,EAAE,MAAsB;IACrF,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC3C,CAAC;AAKD,MAAM,UAAU,SAAS,CAAC,IAAY,EAAE,GAA6B,EAAE,MAAsB;IACzF,OAAO,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC/C,CAAC"}
|