chrono-node 2.7.5 → 2.7.7
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 +1 -1
- package/dist/cjs/common/parsers/AbstractTimeExpressionParser.js +11 -2
- package/dist/cjs/common/parsers/AbstractTimeExpressionParser.js.map +1 -1
- package/dist/cjs/common/parsers/ISOFormatParser.d.ts +1 -12
- package/dist/cjs/common/parsers/ISOFormatParser.js +30 -28
- package/dist/cjs/common/parsers/ISOFormatParser.js.map +1 -1
- package/dist/cjs/common/parsers/SlashDateFormatParser.js +13 -6
- package/dist/cjs/common/parsers/SlashDateFormatParser.js.map +1 -1
- package/dist/cjs/common/refiners/ForwardDateRefiner.js +8 -5
- package/dist/cjs/common/refiners/ForwardDateRefiner.js.map +1 -1
- package/dist/cjs/locales/en/configuration.js +4 -2
- package/dist/cjs/locales/en/configuration.js.map +1 -1
- package/dist/cjs/locales/en/constants.d.ts +1 -1
- package/dist/cjs/locales/en/constants.js +6 -0
- package/dist/cjs/locales/en/constants.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENMonthNameLittleEndianParser.js +1 -1
- package/dist/cjs/locales/en/parsers/ENMonthNameLittleEndianParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitAgoFormatParser.js +3 -0
- package/dist/cjs/locales/en/parsers/ENTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js +3 -0
- package/dist/cjs/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitLaterFormatParser.js +5 -2
- package/dist/cjs/locales/en/parsers/ENTimeUnitLaterFormatParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitWithinFormatParser.js +3 -0
- package/dist/cjs/locales/en/parsers/ENTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/{ENCasualYearMonthDayParser.d.ts → ENYearMonthDayParser.d.ts} +3 -1
- package/dist/cjs/locales/en/parsers/{ENCasualYearMonthDayParser.js → ENYearMonthDayParser.js} +20 -8
- package/dist/cjs/locales/en/parsers/ENYearMonthDayParser.js.map +1 -0
- package/dist/cjs/locales/en/refiners/ENExtractYearSuffixRefiner.d.ts +5 -0
- package/dist/cjs/locales/en/refiners/ENExtractYearSuffixRefiner.js +31 -0
- package/dist/cjs/locales/en/refiners/ENExtractYearSuffixRefiner.js.map +1 -0
- package/dist/cjs/locales/en/refiners/ENMergeDateTimeRefiner.js +1 -1
- package/dist/cjs/locales/en/refiners/ENMergeDateTimeRefiner.js.map +1 -1
- package/dist/cjs/locales/zh/index.d.ts +12 -1
- package/dist/cjs/locales/zh/index.js +65 -5
- package/dist/cjs/locales/zh/index.js.map +1 -1
- package/dist/cjs/results.js +7 -4
- package/dist/cjs/results.js.map +1 -1
- package/dist/esm/common/parsers/AbstractTimeExpressionParser.js +11 -2
- package/dist/esm/common/parsers/AbstractTimeExpressionParser.js.map +1 -1
- package/dist/esm/common/parsers/ISOFormatParser.d.ts +1 -12
- package/dist/esm/common/parsers/ISOFormatParser.js +30 -28
- package/dist/esm/common/parsers/ISOFormatParser.js.map +1 -1
- package/dist/esm/common/parsers/SlashDateFormatParser.js +13 -6
- package/dist/esm/common/parsers/SlashDateFormatParser.js.map +1 -1
- package/dist/esm/common/refiners/ForwardDateRefiner.js +8 -5
- package/dist/esm/common/refiners/ForwardDateRefiner.js.map +1 -1
- package/dist/esm/locales/en/configuration.js +4 -2
- package/dist/esm/locales/en/configuration.js.map +1 -1
- package/dist/esm/locales/en/constants.d.ts +1 -1
- package/dist/esm/locales/en/constants.js +6 -0
- package/dist/esm/locales/en/constants.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENMonthNameLittleEndianParser.js +1 -1
- package/dist/esm/locales/en/parsers/ENMonthNameLittleEndianParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENTimeUnitAgoFormatParser.js +3 -0
- package/dist/esm/locales/en/parsers/ENTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js +3 -0
- package/dist/esm/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENTimeUnitLaterFormatParser.js +5 -2
- package/dist/esm/locales/en/parsers/ENTimeUnitLaterFormatParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENTimeUnitWithinFormatParser.js +3 -0
- package/dist/esm/locales/en/parsers/ENTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/{ENCasualYearMonthDayParser.d.ts → ENYearMonthDayParser.d.ts} +3 -1
- package/dist/esm/locales/en/parsers/{ENCasualYearMonthDayParser.js → ENYearMonthDayParser.js} +19 -7
- package/dist/esm/locales/en/parsers/ENYearMonthDayParser.js.map +1 -0
- package/dist/esm/locales/en/refiners/ENExtractYearSuffixRefiner.d.ts +5 -0
- package/dist/esm/locales/en/refiners/ENExtractYearSuffixRefiner.js +28 -0
- package/dist/esm/locales/en/refiners/ENExtractYearSuffixRefiner.js.map +1 -0
- package/dist/esm/locales/en/refiners/ENMergeDateTimeRefiner.js +1 -1
- package/dist/esm/locales/en/refiners/ENMergeDateTimeRefiner.js.map +1 -1
- package/dist/esm/locales/zh/index.d.ts +12 -1
- package/dist/esm/locales/zh/index.js +53 -1
- package/dist/esm/locales/zh/index.js.map +1 -1
- package/dist/esm/results.js +7 -4
- package/dist/esm/results.js.map +1 -1
- package/package.json +1 -1
- package/src/common/parsers/AbstractTimeExpressionParser.ts +16 -2
- package/src/common/parsers/ISOFormatParser.ts +30 -32
- package/src/common/parsers/SlashDateFormatParser.ts +13 -10
- package/src/common/refiners/ForwardDateRefiner.ts +8 -5
- package/src/locales/en/configuration.ts +8 -2
- package/src/locales/en/constants.ts +7 -1
- package/src/locales/en/parsers/ENMonthNameLittleEndianParser.ts +1 -1
- package/src/locales/en/parsers/ENTimeUnitAgoFormatParser.ts +3 -1
- package/src/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.ts +4 -2
- package/src/locales/en/parsers/ENTimeUnitLaterFormatParser.ts +5 -2
- package/src/locales/en/parsers/ENTimeUnitWithinFormatParser.ts +4 -2
- package/src/locales/en/parsers/{ENCasualYearMonthDayParser.ts → ENYearMonthDayParser.ts} +18 -7
- package/src/locales/en/refiners/ENExtractYearSuffixRefiner.ts +34 -0
- package/src/locales/en/refiners/ENMergeDateTimeRefiner.ts +1 -1
- package/src/locales/zh/index.ts +73 -1
- package/src/results.ts +8 -5
- package/test/en/en_casual.test.ts +6 -0
- package/test/en/en_inter_std.test.ts +30 -28
- package/test/en/en_merging_relative_dates.test.ts +3 -4
- package/test/en/en_slash.test.ts +62 -42
- package/test/en/en_time_exp.test.ts +88 -0
- package/test/en/en_time_units_ago.test.ts +34 -0
- package/test/en/en_time_units_casual_relative.test.ts +3 -0
- package/test/en/en_time_units_later.test.ts +4 -0
- package/test/en/en_time_units_within.test.ts +5 -0
- package/test/en/en_year.test.ts +26 -1
- package/test/en/{en_casual_year_month_day.test.ts → en_year_month_day.test.ts} +25 -4
- package/test/system.test.ts +2 -0
- package/test/system_timezone.test.ts +11 -0
- package/test/zh/{zh_hans_casual.test.ts → hans/zh_hans_casual.test.ts} +2 -2
- package/test/zh/{zh_hans_date.test.ts → hans/zh_hans_date.test.ts} +2 -2
- package/test/zh/{zh_hans_deadline.test.ts → hans/zh_hans_deadline.test.ts} +2 -2
- package/test/zh/{zh_hans_time_exp.test.ts → hans/zh_hans_time_exp.test.ts} +16 -2
- package/test/zh/{zh_hans_weekday.test.ts → hans/zh_hans_weekday.test.ts} +2 -2
- package/test/zh/{zh_hant_casual.test.ts → hant/zh_hant_casual.test.ts} +2 -2
- package/test/zh/{zh_hant_date.test.ts → hant/zh_hant_date.test.ts} +2 -2
- package/test/zh/{zh_hant_deadline.test.ts → hant/zh_hant_deadline.test.ts} +2 -2
- package/test/zh/{zh_hant_time_exp.test.ts → hant/zh_hant_time_exp.test.ts} +2 -2
- package/test/zh/{zh_hant_weekday.test.ts → hant/zh_hant_weekday.test.ts} +2 -2
- package/test/zh/zh.test.ts +18 -0
- package/dist/cjs/locales/en/parsers/ENCasualYearMonthDayParser.js.map +0 -1
- package/dist/esm/locales/en/parsers/ENCasualYearMonthDayParser.js.map +0 -1
package/README.md
CHANGED
|
@@ -76,7 +76,7 @@ The meaning of the referenced dates depends on when and where they are mentioned
|
|
|
76
76
|
Chrono lets you define the reference as `Date` or `ParsingReference` object:
|
|
77
77
|
|
|
78
78
|
```javascript
|
|
79
|
-
// (Note: the
|
|
79
|
+
// (Note: the examples run on JST timezone)
|
|
80
80
|
|
|
81
81
|
chrono.parseDate('Friday', new Date(2012, 8 - 1, 23));
|
|
82
82
|
// Fri Aug 24 2012 12:00:00 GMT+0900 (JST)
|
|
@@ -65,6 +65,10 @@ class AbstractTimeExpressionParser {
|
|
|
65
65
|
extract(context, match) {
|
|
66
66
|
const startComponents = this.extractPrimaryTimeComponents(context, match);
|
|
67
67
|
if (!startComponents) {
|
|
68
|
+
if (match[0].match(/^\d{4}/)) {
|
|
69
|
+
match.index += 4;
|
|
70
|
+
return null;
|
|
71
|
+
}
|
|
68
72
|
match.index += match[0].length;
|
|
69
73
|
return null;
|
|
70
74
|
}
|
|
@@ -75,8 +79,13 @@ class AbstractTimeExpressionParser {
|
|
|
75
79
|
const remainingText = context.text.substring(match.index);
|
|
76
80
|
const followingPattern = this.getFollowingTimePatternThroughCache();
|
|
77
81
|
const followingMatch = followingPattern.exec(remainingText);
|
|
78
|
-
if (text.match(/^\d{3,4}/) && followingMatch
|
|
79
|
-
|
|
82
|
+
if (text.match(/^\d{3,4}/) && followingMatch) {
|
|
83
|
+
if (followingMatch[0].match(/^\s*([+-])\s*\d{2,4}$/)) {
|
|
84
|
+
return null;
|
|
85
|
+
}
|
|
86
|
+
if (followingMatch[0].match(/^\s*([+-])\s*\d{2}\W\d{2}/)) {
|
|
87
|
+
return null;
|
|
88
|
+
}
|
|
80
89
|
}
|
|
81
90
|
if (!followingMatch ||
|
|
82
91
|
followingMatch[0].match(/^\s*([+-])\s*\d{3,4}$/)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractTimeExpressionParser.js","sourceRoot":"","sources":["../../../../src/common/parsers/AbstractTimeExpressionParser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"AbstractTimeExpressionParser.js","sourceRoot":"","sources":["../../../../src/common/parsers/AbstractTimeExpressionParser.ts"],"names":[],"mappings":";;;AAEA,uCAAuC;AAGvC,SAAS,kBAAkB,CAAC,YAAoB,EAAE,aAAqB,EAAE,aAAqB,EAAE,KAAa;IACzG,OAAO,IAAI,MAAM,CACT,GAAG,YAAY,EAAE;QACjB,GAAG,aAAa,EAAE;QAClB,YAAY;QACZ,KAAK;QACD,aAAa;QACb,YAAY;QACZ,KAAK;QACD,SAAS;QACT,UAAU;QACV,oBAAoB;QACxB,IAAI;QACR,IAAI;QACJ,sCAAsC;QACtC,GAAG,aAAa,EAAE,EACtB,KAAK,CACR,CAAC;AACN,CAAC;AAGD,SAAS,mBAAmB,CAAC,cAAsB,EAAE,eAAuB;IACxE,OAAO,IAAI,MAAM,CACb,KAAK,cAAc,GAAG;QAClB,YAAY;QACZ,KAAK;QACD,iBAAiB;QACjB,YAAY;QACZ,KAAK;QACD,iBAAiB;QACjB,8BAA8B;QAClC,IAAI;QACR,IAAI;QACJ,sCAAsC;QACtC,GAAG,eAAe,EAAE,EACxB,GAAG,CACN,CAAC;AACN,CAAC;AAED,MAAM,UAAU,GAAG,CAAC,CAAC;AACrB,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAC7B,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAE3B,MAAsB,4BAA4B;IAK9C,YAAY,UAAU,GAAG,KAAK;QA+VtB,wBAAmB,GAAG,IAAI,CAAC;QAC3B,wBAAmB,GAAG,IAAI,CAAC;QAC3B,6BAAwB,GAAG,IAAI,CAAC;QAqBhC,yBAAoB,GAAG,IAAI,CAAC;QAC5B,0BAAqB,GAAG,IAAI,CAAC;QAC7B,8BAAyB,GAAG,IAAI,CAAC;QAvXrC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,YAAY;QACR,OAAO,GAAG,CAAC;IACf,CAAC;IAED,0BAA0B;QACtB,OAAO,eAAe,CAAC;IAC3B,CAAC;IAED,aAAa;QACT,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAED,eAAe;QACX,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAED,OAAO,CAAC,OAAuB;QAC3B,OAAO,IAAI,CAAC,iCAAiC,EAAE,CAAC;IACpD,CAAC;IAED,OAAO,CAAC,OAAuB,EAAE,KAAuB;QACpD,MAAM,eAAe,GAAG,IAAI,CAAC,4BAA4B,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC1E,IAAI,CAAC,eAAe,EAAE;YAGlB,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;gBAC1B,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC;gBACjB,OAAO,IAAI,CAAC;aACf;YAED,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC/B,OAAO,IAAI,CAAC;SACf;QAED,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAC5C,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,KAAK,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;QACzE,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAE/B,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1D,MAAM,gBAAgB,GAAG,IAAI,CAAC,mCAAmC,EAAE,CAAC;QACpE,MAAM,cAAc,GAAG,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAG5D,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,cAAc,EAAE;YAE1C,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,uBAAuB,CAAC,EAAE;gBAClD,OAAO,IAAI,CAAC;aACf;YAED,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,2BAA2B,CAAC,EAAE;gBACtD,OAAO,IAAI,CAAC;aACf;SACJ;QAED,IACI,CAAC,cAAc;YAEf,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,uBAAuB,CAAC,EAClD;YACE,OAAO,IAAI,CAAC,qCAAqC,CAAC,MAAM,CAAC,CAAC;SAC7D;QAED,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,8BAA8B,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;QAClF,IAAI,MAAM,CAAC,GAAG,EAAE;YACZ,MAAM,CAAC,IAAI,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC;SACpC;QAED,OAAO,IAAI,CAAC,kCAAkC,CAAC,MAAM,CAAC,CAAC;IAC3D,CAAC;IAED,4BAA4B,CACxB,OAAuB,EACvB,KAAuB,EACvB,MAAM,GAAG,KAAK;QAEd,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;QACrD,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,IAAI,QAAQ,GAAG,IAAI,CAAC;QAGpB,IAAI,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;QACvC,IAAI,IAAI,GAAG,GAAG,EAAE;YACZ,IAAI,IAAI,CAAC,UAAU,IAAI,KAAK,CAAC,YAAY,CAAC,IAAI,IAAI,EAAE;gBAChD,OAAO,IAAI,CAAC;aACf;YAED,MAAM,GAAG,IAAI,GAAG,GAAG,CAAC;YACpB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC;SACjC;QAED,IAAI,IAAI,GAAG,EAAE,EAAE;YACX,OAAO,IAAI,CAAC;SACf;QAGD,IAAI,KAAK,CAAC,YAAY,CAAC,IAAI,IAAI,EAAE;YAC7B,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE;gBAE7D,OAAO,IAAI,CAAC;aACf;YAED,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;SAC1C;QAED,IAAI,MAAM,IAAI,EAAE,EAAE;YACd,OAAO,IAAI,CAAC;SACf;QAED,IAAI,IAAI,GAAG,EAAE,EAAE;YACX,QAAQ,GAAG,gBAAQ,CAAC,EAAE,CAAC;SAC1B;QAGD,IAAI,KAAK,CAAC,gBAAgB,CAAC,IAAI,IAAI,EAAE;YACjC,IAAI,IAAI,GAAG,EAAE;gBAAE,OAAO,IAAI,CAAC;YAC3B,MAAM,IAAI,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;YACtD,IAAI,IAAI,IAAI,GAAG,EAAE;gBACb,QAAQ,GAAG,gBAAQ,CAAC,EAAE,CAAC;gBACvB,IAAI,IAAI,IAAI,EAAE,EAAE;oBACZ,IAAI,GAAG,CAAC,CAAC;iBACZ;aACJ;YAED,IAAI,IAAI,IAAI,GAAG,EAAE;gBACb,QAAQ,GAAG,gBAAQ,CAAC,EAAE,CAAC;gBACvB,IAAI,IAAI,IAAI,EAAE,EAAE;oBACZ,IAAI,IAAI,EAAE,CAAC;iBACd;aACJ;SACJ;QAED,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAChC,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAEpC,IAAI,QAAQ,KAAK,IAAI,EAAE;YACnB,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;SAC3C;aAAM;YACH,IAAI,IAAI,GAAG,EAAE,EAAE;gBACX,UAAU,CAAC,KAAK,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;aAC7C;iBAAM;gBACH,UAAU,CAAC,KAAK,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;aAC7C;SACJ;QAGD,IAAI,KAAK,CAAC,kBAAkB,CAAC,IAAI,IAAI,EAAE;YACnC,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACxE,IAAI,WAAW,IAAI,IAAI;gBAAE,OAAO,IAAI,CAAC;YAErC,UAAU,CAAC,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;SACjD;QAGD,IAAI,KAAK,CAAC,YAAY,CAAC,IAAI,IAAI,EAAE;YAC7B,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;YAC7C,IAAI,MAAM,IAAI,EAAE;gBAAE,OAAO,IAAI,CAAC;YAE9B,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;SACvC;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,8BAA8B,CAC1B,OAAuB,EACvB,KAAuB,EACvB,MAAqB;QAErB,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;QAGrD,IAAI,KAAK,CAAC,kBAAkB,CAAC,IAAI,IAAI,EAAE;YACnC,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACxE,IAAI,WAAW,IAAI,IAAI;gBAAE,OAAO,IAAI,CAAC;YAErC,UAAU,CAAC,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;SACjD;QAGD,IAAI,KAAK,CAAC,YAAY,CAAC,IAAI,IAAI,EAAE;YAC7B,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;YAC7C,IAAI,MAAM,IAAI,EAAE;gBAAE,OAAO,IAAI,CAAC;YAE9B,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;SACvC;QAED,IAAI,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;QACvC,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,IAAI,QAAQ,GAAG,CAAC,CAAC,CAAC;QAGlB,IAAI,KAAK,CAAC,YAAY,CAAC,IAAI,IAAI,EAAE;YAC7B,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;SAC1C;aAAM,IAAI,IAAI,GAAG,GAAG,EAAE;YACnB,MAAM,GAAG,IAAI,GAAG,GAAG,CAAC;YACpB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC;SACjC;QAED,IAAI,MAAM,IAAI,EAAE,IAAI,IAAI,GAAG,EAAE,EAAE;YAC3B,OAAO,IAAI,CAAC;SACf;QAED,IAAI,IAAI,IAAI,EAAE,EAAE;YACZ,QAAQ,GAAG,gBAAQ,CAAC,EAAE,CAAC;SAC1B;QAGD,IAAI,KAAK,CAAC,gBAAgB,CAAC,IAAI,IAAI,EAAE;YACjC,IAAI,IAAI,GAAG,EAAE,EAAE;gBACX,OAAO,IAAI,CAAC;aACf;YAED,MAAM,IAAI,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;YACtD,IAAI,IAAI,IAAI,GAAG,EAAE;gBACb,QAAQ,GAAG,gBAAQ,CAAC,EAAE,CAAC;gBACvB,IAAI,IAAI,IAAI,EAAE,EAAE;oBACZ,IAAI,GAAG,CAAC,CAAC;oBACT,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;wBAC9B,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;qBACtD;iBACJ;aACJ;YAED,IAAI,IAAI,IAAI,GAAG,EAAE;gBACb,QAAQ,GAAG,gBAAQ,CAAC,EAAE,CAAC;gBACvB,IAAI,IAAI,IAAI,EAAE;oBAAE,IAAI,IAAI,EAAE,CAAC;aAC9B;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE;gBACrC,IAAI,QAAQ,IAAI,gBAAQ,CAAC,EAAE,EAAE;oBACzB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;oBAE5C,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE;wBAChC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;qBAClC;iBACJ;qBAAM;oBACH,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;oBAE5C,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE;wBAChC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;qBAC9D;iBACJ;aACJ;SACJ;QAED,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAChC,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAEpC,IAAI,QAAQ,IAAI,CAAC,EAAE;YACf,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;SAC3C;aAAM;YACH,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;YACtF,IAAI,SAAS,EAAE;gBACX,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE;oBAEtC,UAAU,CAAC,KAAK,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;iBAC7C;qBAAM,IAAI,IAAI,IAAI,EAAE,EAAE;oBACnB,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;oBACrC,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;iBAC9C;aACJ;iBAAM,IAAI,IAAI,GAAG,EAAE,EAAE;gBAClB,UAAU,CAAC,KAAK,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;aAC7C;iBAAM,IAAI,IAAI,IAAI,EAAE,EAAE;gBACnB,UAAU,CAAC,KAAK,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;aAC7C;SACJ;QAED,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE;YAC7D,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;SACtD;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAEO,qCAAqC,CAAC,MAAM;QAEhD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;YAC3B,OAAO,IAAI,CAAC;SACf;QAGD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;YAChC,OAAO,IAAI,CAAC;SACf;QAGD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;YAChC,OAAO,IAAI,CAAC;SACf;QAGD,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAClE,IAAI,iBAAiB,EAAE;YACnB,MAAM,aAAa,GAAW,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAGnD,IAAI,IAAI,CAAC,UAAU,EAAE;gBACjB,OAAO,IAAI,CAAC;aACf;YAGD,IAAI,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE;gBACtE,OAAO,IAAI,CAAC;aACf;YAGD,MAAM,eAAe,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;YAChD,IAAI,eAAe,GAAG,EAAE,EAAE;gBACtB,OAAO,IAAI,CAAC;aACf;SACJ;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,kCAAkC,CAAC,MAAM;QAC7C,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;YAChC,OAAO,IAAI,CAAC;SACf;QAGD,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACnF,IAAI,iBAAiB,EAAE;YAEnB,IAAI,IAAI,CAAC,UAAU,EAAE;gBACjB,OAAO,IAAI,CAAC;aACf;YAED,MAAM,eAAe,GAAW,iBAAiB,CAAC,CAAC,CAAC,CAAC;YACrD,MAAM,aAAa,GAAW,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAEnD,IAAI,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE;gBACtE,OAAO,IAAI,CAAC;aACf;YAGD,MAAM,eAAe,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;YAChD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAC;YACpD,IAAI,eAAe,GAAG,EAAE,IAAI,iBAAiB,GAAG,EAAE,EAAE;gBAChD,OAAO,IAAI,CAAC;aACf;SACJ;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAMD,iCAAiC;QAC7B,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QAC3C,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QAE3C,IAAI,IAAI,CAAC,mBAAmB,KAAK,aAAa,IAAI,IAAI,CAAC,mBAAmB,KAAK,aAAa,EAAE;YAC1F,OAAO,IAAI,CAAC,wBAAwB,CAAC;SACxC;QAED,IAAI,CAAC,wBAAwB,GAAG,kBAAkB,CAC9C,IAAI,CAAC,0BAA0B,EAAE,EACjC,aAAa,EACb,aAAa,EACb,IAAI,CAAC,YAAY,EAAE,CACtB,CAAC;QACF,IAAI,CAAC,mBAAmB,GAAG,aAAa,CAAC;QACzC,IAAI,CAAC,mBAAmB,GAAG,aAAa,CAAC;QACzC,OAAO,IAAI,CAAC,wBAAwB,CAAC;IACzC,CAAC;IAMD,mCAAmC;QAC/B,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7C,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAE/C,IAAI,IAAI,CAAC,oBAAoB,KAAK,cAAc,IAAI,IAAI,CAAC,qBAAqB,KAAK,eAAe,EAAE;YAChG,OAAO,IAAI,CAAC,yBAAyB,CAAC;SACzC;QAED,IAAI,CAAC,yBAAyB,GAAG,mBAAmB,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;QACtF,IAAI,CAAC,oBAAoB,GAAG,cAAc,CAAC;QAC3C,IAAI,CAAC,qBAAqB,GAAG,eAAe,CAAC;QAC7C,OAAO,IAAI,CAAC,yBAAyB,CAAC;IAC1C,CAAC;CACJ;AA5YD,oEA4YC"}
|
|
@@ -2,16 +2,5 @@ import { ParsingContext } from "../../chrono";
|
|
|
2
2
|
import { AbstractParserWithWordBoundaryChecking } from "./AbstractParserWithWordBoundary";
|
|
3
3
|
export default class ISOFormatParser extends AbstractParserWithWordBoundaryChecking {
|
|
4
4
|
innerPattern(): RegExp;
|
|
5
|
-
innerExtract(context: ParsingContext, match: RegExpMatchArray):
|
|
6
|
-
day?: number;
|
|
7
|
-
hour?: number;
|
|
8
|
-
minute?: number;
|
|
9
|
-
month?: number;
|
|
10
|
-
second?: number;
|
|
11
|
-
weekday?: number;
|
|
12
|
-
year?: number;
|
|
13
|
-
millisecond?: number;
|
|
14
|
-
meridiem?: number;
|
|
15
|
-
timezoneOffset?: number;
|
|
16
|
-
};
|
|
5
|
+
innerExtract(context: ParsingContext, match: RegExpMatchArray): import("../..").ParsingComponents;
|
|
17
6
|
}
|
|
@@ -7,7 +7,7 @@ const PATTERN = new RegExp("([0-9]{4})\\-([0-9]{1,2})\\-([0-9]{1,2})" +
|
|
|
7
7
|
"(?:" +
|
|
8
8
|
":([0-9]{1,2})(?:\\.(\\d{1,4}))?" +
|
|
9
9
|
")?" +
|
|
10
|
-
"(
|
|
10
|
+
"(" +
|
|
11
11
|
"Z|([+-]\\d{2}):?(\\d{2})?" +
|
|
12
12
|
")?" +
|
|
13
13
|
")?" +
|
|
@@ -19,46 +19,48 @@ const HOUR_NUMBER_GROUP = 4;
|
|
|
19
19
|
const MINUTE_NUMBER_GROUP = 5;
|
|
20
20
|
const SECOND_NUMBER_GROUP = 6;
|
|
21
21
|
const MILLISECOND_NUMBER_GROUP = 7;
|
|
22
|
-
const
|
|
23
|
-
const
|
|
22
|
+
const TZD_GROUP = 8;
|
|
23
|
+
const TZD_HOUR_OFFSET_GROUP = 9;
|
|
24
|
+
const TZD_MINUTE_OFFSET_GROUP = 10;
|
|
24
25
|
class ISOFormatParser extends AbstractParserWithWordBoundary_1.AbstractParserWithWordBoundaryChecking {
|
|
25
26
|
innerPattern() {
|
|
26
27
|
return PATTERN;
|
|
27
28
|
}
|
|
28
29
|
innerExtract(context, match) {
|
|
29
|
-
const components = {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
30
|
+
const components = context.createParsingComponents({
|
|
31
|
+
"year": parseInt(match[YEAR_NUMBER_GROUP]),
|
|
32
|
+
"month": parseInt(match[MONTH_NUMBER_GROUP]),
|
|
33
|
+
"day": parseInt(match[DATE_NUMBER_GROUP]),
|
|
34
|
+
});
|
|
33
35
|
if (match[HOUR_NUMBER_GROUP] != null) {
|
|
34
|
-
components
|
|
35
|
-
components
|
|
36
|
+
components.assign("hour", parseInt(match[HOUR_NUMBER_GROUP]));
|
|
37
|
+
components.assign("minute", parseInt(match[MINUTE_NUMBER_GROUP]));
|
|
36
38
|
if (match[SECOND_NUMBER_GROUP] != null) {
|
|
37
|
-
components
|
|
39
|
+
components.assign("second", parseInt(match[SECOND_NUMBER_GROUP]));
|
|
38
40
|
}
|
|
39
41
|
if (match[MILLISECOND_NUMBER_GROUP] != null) {
|
|
40
|
-
components
|
|
41
|
-
}
|
|
42
|
-
if (match[TZD_HOUR_OFFSET_GROUP] == null) {
|
|
43
|
-
components["timezoneOffset"] = 0;
|
|
42
|
+
components.assign("millisecond", parseInt(match[MILLISECOND_NUMBER_GROUP]));
|
|
44
43
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
minuteOffset =
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
offset
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
44
|
+
if (match[TZD_GROUP] != null) {
|
|
45
|
+
let offset = 0;
|
|
46
|
+
if (match[TZD_HOUR_OFFSET_GROUP]) {
|
|
47
|
+
const hourOffset = parseInt(match[TZD_HOUR_OFFSET_GROUP]);
|
|
48
|
+
let minuteOffset = 0;
|
|
49
|
+
if (match[TZD_MINUTE_OFFSET_GROUP] != null) {
|
|
50
|
+
minuteOffset = parseInt(match[TZD_MINUTE_OFFSET_GROUP]);
|
|
51
|
+
}
|
|
52
|
+
offset = hourOffset * 60;
|
|
53
|
+
if (offset < 0) {
|
|
54
|
+
offset -= minuteOffset;
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
offset += minuteOffset;
|
|
58
|
+
}
|
|
57
59
|
}
|
|
58
|
-
components
|
|
60
|
+
components.assign("timezoneOffset", offset);
|
|
59
61
|
}
|
|
60
62
|
}
|
|
61
|
-
return components;
|
|
63
|
+
return components.addTag("parser/ISOFormatParser");
|
|
62
64
|
}
|
|
63
65
|
}
|
|
64
66
|
exports.default = ISOFormatParser;
|
|
@@ -1 +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,
|
|
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,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"}
|
|
@@ -19,18 +19,25 @@ class SlashDateFormatParser {
|
|
|
19
19
|
return PATTERN;
|
|
20
20
|
}
|
|
21
21
|
extract(context, match) {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
22
|
+
const index = match.index + match[OPENING_GROUP].length;
|
|
23
|
+
const indexEnd = match.index + match[0].length - match[ENDING_GROUP].length;
|
|
24
|
+
if (index > 0) {
|
|
25
|
+
const textBefore = context.text.substring(0, index);
|
|
26
|
+
if (textBefore.match("\\d/?$")) {
|
|
25
27
|
return;
|
|
26
28
|
}
|
|
27
29
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
+
if (indexEnd < context.text.length) {
|
|
31
|
+
const textAfter = context.text.substring(indexEnd);
|
|
32
|
+
if (textAfter.match("^/?\\d")) {
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
const text = context.text.substring(index, indexEnd);
|
|
30
37
|
if (text.match(/^\d\.\d$/) || text.match(/^\d\.\d{1,2}\.\d{1,2}\s*$/)) {
|
|
31
38
|
return;
|
|
32
39
|
}
|
|
33
|
-
if (!match[YEAR_GROUP] &&
|
|
40
|
+
if (!match[YEAR_GROUP] && text.indexOf("/") < 0) {
|
|
34
41
|
return;
|
|
35
42
|
}
|
|
36
43
|
const result = context.createParsingResult(index, text);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SlashDateFormatParser.js","sourceRoot":"","sources":["../../../../src/common/parsers/SlashDateFormatParser.ts"],"names":[],"mappings":";;AAEA,mDAAqF;AASrF,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,YAAY;IACR,qDAAqD;IACrD,qCAAqC;IACrC,SAAS,EACb,GAAG,CACN,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,CAAC;AACxB,MAAM,YAAY,GAAG,CAAC,CAAC;AAEvB,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAE/B,MAAM,UAAU,GAAG,CAAC,CAAC;AAErB,MAAqB,qBAAqB;IAItC,YAAY,YAAqB;QAC7B,IAAI,CAAC,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,mBAAmB,CAAC;QAClF,IAAI,CAAC,cAAc,GAAG,YAAY,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,oBAAoB,CAAC;IACpF,CAAC;IAED,OAAO;QACH,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,OAAO,CAAC,OAAuB,EAAE,KAAuB;QAGpD,
|
|
1
|
+
{"version":3,"file":"SlashDateFormatParser.js","sourceRoot":"","sources":["../../../../src/common/parsers/SlashDateFormatParser.ts"],"names":[],"mappings":";;AAEA,mDAAqF;AASrF,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,YAAY;IACR,qDAAqD;IACrD,qCAAqC;IACrC,SAAS,EACb,GAAG,CACN,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,CAAC;AACxB,MAAM,YAAY,GAAG,CAAC,CAAC;AAEvB,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAE/B,MAAM,UAAU,GAAG,CAAC,CAAC;AAErB,MAAqB,qBAAqB;IAItC,YAAY,YAAqB;QAC7B,IAAI,CAAC,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,mBAAmB,CAAC;QAClF,IAAI,CAAC,cAAc,GAAG,YAAY,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,oBAAoB,CAAC;IACpF,CAAC;IAED,OAAO;QACH,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,OAAO,CAAC,OAAuB,EAAE,KAAuB;QAGpD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC;QACxD,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC;QAC5E,IAAI,KAAK,GAAG,CAAC,EAAE;YACX,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;YACpD,IAAI,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;gBAC5B,OAAO;aACV;SACJ;QACD,IAAI,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE;YAChC,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YACnD,IAAI,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;gBAC3B,OAAO;aACV;SACJ;QAED,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAGrD,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,2BAA2B,CAAC,EAAE;YACnE,OAAO;SACV;QAID,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC7C,OAAO;SACV;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACxD,IAAI,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;QACnD,IAAI,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;QAC/C,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE,EAAE;YACzB,IAAI,KAAK,GAAG,EAAE,EAAE;gBACZ,IAAI,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,EAAE,IAAI,KAAK,IAAI,EAAE,EAAE;oBACtC,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;iBAC/B;qBAAM;oBACH,OAAO,IAAI,CAAC;iBACf;aACJ;SACJ;QAED,IAAI,GAAG,GAAG,CAAC,IAAI,GAAG,GAAG,EAAE,EAAE;YACrB,OAAO,IAAI,CAAC;SACf;QAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAChC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAEpC,IAAI,KAAK,CAAC,UAAU,CAAC,EAAE;YACnB,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;YAClD,MAAM,IAAI,GAAG,4BAAoB,CAAC,aAAa,CAAC,CAAC;YACjD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SACrC;aAAM;YACH,MAAM,IAAI,GAAG,4BAAoB,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;YAC/D,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SACpC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AA3ED,wCA2EC"}
|
|
@@ -10,7 +10,7 @@ class ForwardDateRefiner {
|
|
|
10
10
|
if (!context.option.forwardDate) {
|
|
11
11
|
return results;
|
|
12
12
|
}
|
|
13
|
-
results.forEach(
|
|
13
|
+
results.forEach((result) => {
|
|
14
14
|
let refMoment = dayjs_1.default(context.refDate);
|
|
15
15
|
if (result.start.isOnlyTime() && refMoment.isAfter(result.start.dayjs())) {
|
|
16
16
|
refMoment = refMoment.add(1, "day");
|
|
@@ -22,6 +22,9 @@ class ForwardDateRefiner {
|
|
|
22
22
|
dayjs_2.implySimilarDate(result.end, refMoment);
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
|
+
context.debug(() => {
|
|
26
|
+
console.log(`${this.constructor.name} adjusted ${result} time result (${result.start})`);
|
|
27
|
+
});
|
|
25
28
|
}
|
|
26
29
|
if (result.start.isOnlyWeekdayComponent() && refMoment.isAfter(result.start.dayjs())) {
|
|
27
30
|
if (refMoment.day() >= result.start.get("weekday")) {
|
|
@@ -34,7 +37,7 @@ class ForwardDateRefiner {
|
|
|
34
37
|
result.start.imply("month", refMoment.month() + 1);
|
|
35
38
|
result.start.imply("year", refMoment.year());
|
|
36
39
|
context.debug(() => {
|
|
37
|
-
console.log(
|
|
40
|
+
console.log(`${this.constructor.name} adjusted ${result} weekday (${result.start})`);
|
|
38
41
|
});
|
|
39
42
|
if (result.end && result.end.isOnlyWeekdayComponent()) {
|
|
40
43
|
if (refMoment.day() > result.end.get("weekday")) {
|
|
@@ -47,7 +50,7 @@ class ForwardDateRefiner {
|
|
|
47
50
|
result.end.imply("month", refMoment.month() + 1);
|
|
48
51
|
result.end.imply("year", refMoment.year());
|
|
49
52
|
context.debug(() => {
|
|
50
|
-
console.log(
|
|
53
|
+
console.log(`${this.constructor.name} adjusted ${result} weekday (${result.end})`);
|
|
51
54
|
});
|
|
52
55
|
}
|
|
53
56
|
}
|
|
@@ -55,12 +58,12 @@ class ForwardDateRefiner {
|
|
|
55
58
|
for (let i = 0; i < 3 && refMoment.isAfter(result.start.dayjs()); i++) {
|
|
56
59
|
result.start.imply("year", result.start.get("year") + 1);
|
|
57
60
|
context.debug(() => {
|
|
58
|
-
console.log(
|
|
61
|
+
console.log(`${this.constructor.name} adjusted ${result} year (${result.start})`);
|
|
59
62
|
});
|
|
60
63
|
if (result.end && !result.end.isCertain("year")) {
|
|
61
64
|
result.end.imply("year", result.end.get("year") + 1);
|
|
62
65
|
context.debug(() => {
|
|
63
|
-
console.log(
|
|
66
|
+
console.log(`${this.constructor.name} adjusted ${result} month (${result.start})`);
|
|
64
67
|
});
|
|
65
68
|
}
|
|
66
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ForwardDateRefiner.js","sourceRoot":"","sources":["../../../../src/common/refiners/ForwardDateRefiner.ts"],"names":[],"mappings":";;;;;AAQA,kDAA0B;AAC1B,6CAAqD;AAErD,MAAqB,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,
|
|
1
|
+
{"version":3,"file":"ForwardDateRefiner.js","sourceRoot":"","sources":["../../../../src/common/refiners/ForwardDateRefiner.ts"],"names":[],"mappings":";;;;;AAQA,kDAA0B;AAC1B,6CAAqD;AAErD,MAAqB,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,CAAC,MAAM,EAAE,EAAE;YACvB,IAAI,SAAS,GAAG,eAAK,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,wBAAgB,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;gBAC1C,IAAI,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE;oBACvC,wBAAgB,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,wBAAgB,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;qBAC3C;iBACJ;gBACD,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;oBACf,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,aAAa,MAAM,iBAAiB,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;gBAC7F,CAAC,CAAC,CAAC;aACN;YAED,IAAI,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,IAAI,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE;gBAClF,IAAI,SAAS,CAAC,GAAG,EAAE,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;oBAChD,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;iBAC9D;qBAAM;oBACH,SAAS,GAAG,SAAS,CAAC,GAAG,CAAS,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;iBAClE;gBAED,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC5C,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;gBACnD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC7C,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;oBACf,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,aAAa,MAAM,aAAa,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;gBACzF,CAAC,CAAC,CAAC;gBAEH,IAAI,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,sBAAsB,EAAE,EAAE;oBAEnD,IAAI,SAAS,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;wBAC7C,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;qBAC5D;yBAAM;wBACH,SAAS,GAAG,SAAS,CAAC,GAAG,CAAS,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;qBAChE;oBAED,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;oBAC1C,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;oBACjD,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;oBAC3C,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;wBACf,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,aAAa,MAAM,aAAa,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC;oBACvF,CAAC,CAAC,CAAC;iBACN;aACJ;YAID,IAAI,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,IAAI,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE;gBACjF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;oBACnE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;oBACzD,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;wBACf,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,aAAa,MAAM,UAAU,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;oBACtF,CAAC,CAAC,CAAC;oBAEH,IAAI,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;wBAC7C,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;wBACrD,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;4BACf,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,aAAa,MAAM,WAAW,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;wBACvF,CAAC,CAAC,CAAC;qBACN;iBACJ;aACJ;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACnB,CAAC;CACJ;AA5ED,qCA4EC"}
|
|
@@ -7,7 +7,7 @@ const ENTimeUnitWithinFormatParser_1 = __importDefault(require("./parsers/ENTime
|
|
|
7
7
|
const ENMonthNameLittleEndianParser_1 = __importDefault(require("./parsers/ENMonthNameLittleEndianParser"));
|
|
8
8
|
const ENMonthNameMiddleEndianParser_1 = __importDefault(require("./parsers/ENMonthNameMiddleEndianParser"));
|
|
9
9
|
const ENMonthNameParser_1 = __importDefault(require("./parsers/ENMonthNameParser"));
|
|
10
|
-
const
|
|
10
|
+
const ENYearMonthDayParser_1 = __importDefault(require("./parsers/ENYearMonthDayParser"));
|
|
11
11
|
const ENSlashMonthFormatParser_1 = __importDefault(require("./parsers/ENSlashMonthFormatParser"));
|
|
12
12
|
const ENTimeExpressionParser_1 = __importDefault(require("./parsers/ENTimeExpressionParser"));
|
|
13
13
|
const ENTimeUnitAgoFormatParser_1 = __importDefault(require("./parsers/ENTimeUnitAgoFormatParser"));
|
|
@@ -24,6 +24,7 @@ const ENTimeUnitCasualRelativeFormatParser_1 = __importDefault(require("./parser
|
|
|
24
24
|
const ENMergeRelativeAfterDateRefiner_1 = __importDefault(require("./refiners/ENMergeRelativeAfterDateRefiner"));
|
|
25
25
|
const ENMergeRelativeFollowByDateRefiner_1 = __importDefault(require("./refiners/ENMergeRelativeFollowByDateRefiner"));
|
|
26
26
|
const OverlapRemovalRefiner_1 = __importDefault(require("../../common/refiners/OverlapRemovalRefiner"));
|
|
27
|
+
const ENExtractYearSuffixRefiner_1 = __importDefault(require("./refiners/ENExtractYearSuffixRefiner"));
|
|
27
28
|
class ENDefaultConfiguration {
|
|
28
29
|
createCasualConfiguration(littleEndian = false) {
|
|
29
30
|
const option = this.createConfiguration(false, littleEndian);
|
|
@@ -42,7 +43,6 @@ class ENDefaultConfiguration {
|
|
|
42
43
|
new ENMonthNameLittleEndianParser_1.default(),
|
|
43
44
|
new ENMonthNameMiddleEndianParser_1.default(littleEndian),
|
|
44
45
|
new ENWeekdayParser_1.default(),
|
|
45
|
-
new ENCasualYearMonthDayParser_1.default(),
|
|
46
46
|
new ENSlashMonthFormatParser_1.default(),
|
|
47
47
|
new ENTimeExpressionParser_1.default(strictMode),
|
|
48
48
|
new ENTimeUnitAgoFormatParser_1.default(strictMode),
|
|
@@ -50,10 +50,12 @@ class ENDefaultConfiguration {
|
|
|
50
50
|
],
|
|
51
51
|
refiners: [new ENMergeDateTimeRefiner_1.default()],
|
|
52
52
|
}, strictMode);
|
|
53
|
+
options.parsers.unshift(new ENYearMonthDayParser_1.default(strictMode));
|
|
53
54
|
options.refiners.unshift(new ENMergeRelativeFollowByDateRefiner_1.default());
|
|
54
55
|
options.refiners.unshift(new ENMergeRelativeAfterDateRefiner_1.default());
|
|
55
56
|
options.refiners.unshift(new OverlapRemovalRefiner_1.default());
|
|
56
57
|
options.refiners.push(new ENMergeDateTimeRefiner_1.default());
|
|
58
|
+
options.refiners.push(new ENExtractYearSuffixRefiner_1.default());
|
|
57
59
|
options.refiners.push(new ENMergeDateRangeRefiner_1.default());
|
|
58
60
|
return options;
|
|
59
61
|
}
|
|
@@ -1 +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,
|
|
1
|
+
{"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;AAE/E,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,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;AAxDD,yCAwDC"}
|
|
@@ -30,4 +30,4 @@ export declare const YEAR_PATTERN = "(?:[1-9][0-9]{0,3}\\s{0,2}(?:BE|AD|BC|BCE|C
|
|
|
30
30
|
export declare function parseYear(match: string): number;
|
|
31
31
|
export declare const TIME_UNITS_PATTERN: string;
|
|
32
32
|
export declare const TIME_UNITS_NO_ABBR_PATTERN: string;
|
|
33
|
-
export declare function parseTimeUnits(timeunitText: any): TimeUnits;
|
|
33
|
+
export declare function parseTimeUnits(timeunitText: any): null | TimeUnits;
|
|
@@ -188,10 +188,16 @@ function parseTimeUnits(timeunitText) {
|
|
|
188
188
|
remainingText = remainingText.substring(match[0].length).trim();
|
|
189
189
|
match = SINGLE_TIME_UNIT_REGEX.exec(remainingText);
|
|
190
190
|
}
|
|
191
|
+
if (Object.keys(fragments).length == 0) {
|
|
192
|
+
return null;
|
|
193
|
+
}
|
|
191
194
|
return fragments;
|
|
192
195
|
}
|
|
193
196
|
exports.parseTimeUnits = parseTimeUnits;
|
|
194
197
|
function collectDateTimeFragment(fragments, match) {
|
|
198
|
+
if (match[0].match(/^[a-zA-Z]+$/)) {
|
|
199
|
+
return;
|
|
200
|
+
}
|
|
195
201
|
const num = parseNumberPattern(match[1]);
|
|
196
202
|
const unit = exports.TIME_UNIT_DICTIONARY[match[2].toLowerCase()];
|
|
197
203
|
fragments[unit] = num;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/locales/en/constants.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/locales/en/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ const PATTERN = new RegExp(`(?:on\\s{0,3})?` +
|
|
|
16
16
|
`(${pattern_1.matchAnyPattern(constants_1.MONTH_DICTIONARY)})` +
|
|
17
17
|
"(?:" +
|
|
18
18
|
`(?:-|/|,?\\s{0,3})` +
|
|
19
|
-
`(${constants_2.YEAR_PATTERN}(
|
|
19
|
+
`(${constants_2.YEAR_PATTERN}(?!\\w))` +
|
|
20
20
|
")?" +
|
|
21
21
|
"(?=\\W|$)", "i");
|
|
22
22
|
const DATE_GROUP = 1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ENMonthNameLittleEndianParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENMonthNameLittleEndianParser.ts"],"names":[],"mappings":";;AAEA,sDAAkE;AAClE,4CAAgD;AAChD,4CAAuD;AACvD,4CAAiF;AACjF,oDAAyD;AACzD,2GAAgH;AAGhH,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,iBAAiB;IACb,IAAI,kCAAsB,GAAG;IAC7B,KAAK;IACD,oDAAoD;IACpD,IAAI,kCAAsB,GAAG;IACjC,IAAI;IACJ,iCAAiC;IACjC,IAAI,yBAAe,CAAC,4BAAgB,CAAC,GAAG;IACxC,KAAK;IACD,oBAAoB;IACpB,IAAI,wBAAY,
|
|
1
|
+
{"version":3,"file":"ENMonthNameLittleEndianParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENMonthNameLittleEndianParser.ts"],"names":[],"mappings":";;AAEA,sDAAkE;AAClE,4CAAgD;AAChD,4CAAuD;AACvD,4CAAiF;AACjF,oDAAyD;AACzD,2GAAgH;AAGhH,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,iBAAiB;IACb,IAAI,kCAAsB,GAAG;IAC7B,KAAK;IACD,oDAAoD;IACpD,IAAI,kCAAsB,GAAG;IACjC,IAAI;IACJ,iCAAiC;IACjC,IAAI,yBAAe,CAAC,4BAAgB,CAAC,GAAG;IACxC,KAAK;IACD,oBAAoB;IACpB,IAAI,wBAAY,UAAU;IAC9B,IAAI;IACJ,WAAW,EACf,GAAG,CACN,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,CAAC;AACrB,MAAM,aAAa,GAAG,CAAC,CAAC;AACxB,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,UAAU,GAAG,CAAC,CAAC;AAErB,MAAqB,6BAA8B,SAAQ,uEAAsC;IAC7F,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAElE,MAAM,KAAK,GAAG,4BAAgB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QACtE,MAAM,GAAG,GAAG,qCAAyB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;QACzD,IAAI,GAAG,GAAG,EAAE,EAAE;YAEV,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC;YACrD,OAAO,IAAI,CAAC;SACf;QAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACpC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAEhC,IAAI,KAAK,CAAC,UAAU,CAAC,EAAE;YACnB,MAAM,UAAU,GAAG,qBAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;YAChD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;SAC3C;aAAM;YACH,MAAM,IAAI,GAAG,4BAAoB,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;YAC/D,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SACpC;QAED,IAAI,KAAK,CAAC,aAAa,CAAC,EAAE;YACtB,MAAM,OAAO,GAAG,qCAAyB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;YAEhE,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YAClC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SACrC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AApCD,gDAoCC"}
|
|
@@ -16,6 +16,9 @@ class ENTimeUnitAgoFormatParser extends AbstractParserWithWordBoundary_1.Abstrac
|
|
|
16
16
|
}
|
|
17
17
|
innerExtract(context, match) {
|
|
18
18
|
const timeUnits = constants_1.parseTimeUnits(match[1]);
|
|
19
|
+
if (!timeUnits) {
|
|
20
|
+
return null;
|
|
21
|
+
}
|
|
19
22
|
const outputTimeUnits = timeunits_1.reverseTimeUnits(timeUnits);
|
|
20
23
|
return results_1.ParsingComponents.createRelativeFromReference(context.reference, outputTimeUnits);
|
|
21
24
|
}
|
|
@@ -1 +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;
|
|
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,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"}
|
|
@@ -17,6 +17,9 @@ class ENTimeUnitCasualRelativeFormatParser extends AbstractParserWithWordBoundar
|
|
|
17
17
|
innerExtract(context, match) {
|
|
18
18
|
const prefix = match[1].toLowerCase();
|
|
19
19
|
let timeUnits = constants_1.parseTimeUnits(match[2]);
|
|
20
|
+
if (!timeUnits) {
|
|
21
|
+
return null;
|
|
22
|
+
}
|
|
20
23
|
switch (prefix) {
|
|
21
24
|
case "last":
|
|
22
25
|
case "past":
|
|
@@ -1 +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;
|
|
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,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"}
|
|
@@ -15,8 +15,11 @@ class ENTimeUnitLaterFormatParser extends AbstractParserWithWordBoundary_1.Abstr
|
|
|
15
15
|
return this.strictMode ? STRICT_PATTERN : PATTERN;
|
|
16
16
|
}
|
|
17
17
|
innerExtract(context, match) {
|
|
18
|
-
const
|
|
19
|
-
|
|
18
|
+
const timeUnits = constants_1.parseTimeUnits(match[GROUP_NUM_TIMEUNITS]);
|
|
19
|
+
if (!timeUnits) {
|
|
20
|
+
return null;
|
|
21
|
+
}
|
|
22
|
+
return results_1.ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
|
|
20
23
|
}
|
|
21
24
|
}
|
|
22
25
|
exports.default = ENTimeUnitLaterFormatParser;
|
|
@@ -1 +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;
|
|
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,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"}
|
|
@@ -25,6 +25,9 @@ class ENTimeUnitWithinFormatParser extends AbstractParserWithWordBoundary_1.Abst
|
|
|
25
25
|
return null;
|
|
26
26
|
}
|
|
27
27
|
const timeUnits = constants_1.parseTimeUnits(match[1]);
|
|
28
|
+
if (!timeUnits) {
|
|
29
|
+
return null;
|
|
30
|
+
}
|
|
28
31
|
return results_1.ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
|
|
29
32
|
}
|
|
30
33
|
}
|
|
@@ -1 +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;
|
|
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;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/{ENCasualYearMonthDayParser.d.ts → ENYearMonthDayParser.d.ts}
RENAMED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { ParsingContext } from "../../../chrono";
|
|
2
2
|
import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
|
|
3
|
-
export default class
|
|
3
|
+
export default class ENYearMonthDayParser extends AbstractParserWithWordBoundaryChecking {
|
|
4
|
+
private strictMonthDateOrder;
|
|
5
|
+
constructor(strictMonthDateOrder: boolean);
|
|
4
6
|
innerPattern(): RegExp;
|
|
5
7
|
innerExtract(context: ParsingContext, match: RegExpMatchArray): {
|
|
6
8
|
day: number;
|
package/dist/cjs/locales/en/parsers/{ENCasualYearMonthDayParser.js → ENYearMonthDayParser.js}
RENAMED
|
@@ -3,27 +3,39 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const constants_1 = require("../constants");
|
|
4
4
|
const pattern_1 = require("../../../utils/pattern");
|
|
5
5
|
const AbstractParserWithWordBoundary_1 = require("../../../common/parsers/AbstractParserWithWordBoundary");
|
|
6
|
-
const PATTERN = new RegExp(`([0-9]{4})[
|
|
7
|
-
`(?:(${pattern_1.matchAnyPattern(constants_1.MONTH_DICTIONARY)})|([0-9]{1,2}))[
|
|
6
|
+
const PATTERN = new RegExp(`([0-9]{4})[-\\.\\/\\s]` +
|
|
7
|
+
`(?:(${pattern_1.matchAnyPattern(constants_1.MONTH_DICTIONARY)})|([0-9]{1,2}))[-\\.\\/\\s]` +
|
|
8
8
|
`([0-9]{1,2})` +
|
|
9
9
|
"(?=\\W|$)", "i");
|
|
10
10
|
const YEAR_NUMBER_GROUP = 1;
|
|
11
11
|
const MONTH_NAME_GROUP = 2;
|
|
12
12
|
const MONTH_NUMBER_GROUP = 3;
|
|
13
13
|
const DATE_NUMBER_GROUP = 4;
|
|
14
|
-
class
|
|
14
|
+
class ENYearMonthDayParser extends AbstractParserWithWordBoundary_1.AbstractParserWithWordBoundaryChecking {
|
|
15
|
+
constructor(strictMonthDateOrder) {
|
|
16
|
+
super();
|
|
17
|
+
this.strictMonthDateOrder = strictMonthDateOrder;
|
|
18
|
+
}
|
|
15
19
|
innerPattern() {
|
|
16
20
|
return PATTERN;
|
|
17
21
|
}
|
|
18
22
|
innerExtract(context, match) {
|
|
19
|
-
const
|
|
23
|
+
const year = parseInt(match[YEAR_NUMBER_GROUP]);
|
|
24
|
+
let day = parseInt(match[DATE_NUMBER_GROUP]);
|
|
25
|
+
let month = match[MONTH_NUMBER_GROUP]
|
|
20
26
|
? parseInt(match[MONTH_NUMBER_GROUP])
|
|
21
27
|
: constants_1.MONTH_DICTIONARY[match[MONTH_NAME_GROUP].toLowerCase()];
|
|
22
28
|
if (month < 1 || month > 12) {
|
|
29
|
+
if (this.strictMonthDateOrder) {
|
|
30
|
+
return null;
|
|
31
|
+
}
|
|
32
|
+
if (day >= 1 && day <= 12) {
|
|
33
|
+
[month, day] = [day, month];
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
if (day < 1 || day > 31) {
|
|
23
37
|
return null;
|
|
24
38
|
}
|
|
25
|
-
const year = parseInt(match[YEAR_NUMBER_GROUP]);
|
|
26
|
-
const day = parseInt(match[DATE_NUMBER_GROUP]);
|
|
27
39
|
return {
|
|
28
40
|
day: day,
|
|
29
41
|
month: month,
|
|
@@ -31,5 +43,5 @@ class ENCasualYearMonthDayParser extends AbstractParserWithWordBoundary_1.Abstra
|
|
|
31
43
|
};
|
|
32
44
|
}
|
|
33
45
|
}
|
|
34
|
-
exports.default =
|
|
35
|
-
//# sourceMappingURL=
|
|
46
|
+
exports.default = ENYearMonthDayParser;
|
|
47
|
+
//# sourceMappingURL=ENYearMonthDayParser.js.map
|