chrono-node 2.6.6 → 2.7.1
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/dist/cjs/calculation/mergingCalculation.js +2 -0
- package/dist/cjs/calculation/mergingCalculation.js.map +1 -1
- package/dist/cjs/common/casualReferences.js +13 -3
- package/dist/cjs/common/casualReferences.js.map +1 -1
- package/dist/cjs/common/parsers/AbstractParserWithWordBoundary.d.ts +2 -1
- package/dist/cjs/common/parsers/AbstractParserWithWordBoundary.js +9 -5
- package/dist/cjs/common/parsers/AbstractParserWithWordBoundary.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENCasualDateParser.js +12 -6
- package/dist/cjs/locales/en/parsers/ENCasualDateParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENCasualTimeParser.d.ts +1 -1
- package/dist/cjs/locales/en/parsers/ENCasualTimeParser.js +15 -6
- package/dist/cjs/locales/en/parsers/ENCasualTimeParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeExpressionParser.js +23 -22
- package/dist/cjs/locales/en/parsers/ENTimeExpressionParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitWithinFormatParser.js +3 -2
- package/dist/cjs/locales/en/parsers/ENTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/cjs/locales/ru/parsers/AbstractParserWithWordBoundaryChecking.d.ts +11 -0
- package/dist/cjs/locales/ru/parsers/AbstractParserWithWordBoundaryChecking.js +24 -0
- package/dist/cjs/locales/ru/parsers/AbstractParserWithWordBoundaryChecking.js.map +1 -0
- package/dist/cjs/locales/ru/parsers/RUCasualDateParser.d.ts +3 -4
- package/dist/cjs/locales/ru/parsers/RUCasualDateParser.js +4 -9
- package/dist/cjs/locales/ru/parsers/RUCasualDateParser.js.map +1 -1
- package/dist/cjs/locales/ru/parsers/RUCasualTimeParser.d.ts +3 -4
- package/dist/cjs/locales/ru/parsers/RUCasualTimeParser.js +4 -10
- package/dist/cjs/locales/ru/parsers/RUCasualTimeParser.js.map +1 -1
- package/dist/cjs/locales/ru/parsers/RUMonthNameLittleEndianParser.d.ts +3 -4
- package/dist/cjs/locales/ru/parsers/RUMonthNameLittleEndianParser.js +14 -19
- package/dist/cjs/locales/ru/parsers/RUMonthNameLittleEndianParser.js.map +1 -1
- package/dist/cjs/locales/ru/parsers/RUMonthNameParser.d.ts +3 -4
- package/dist/cjs/locales/ru/parsers/RUMonthNameParser.js +10 -14
- package/dist/cjs/locales/ru/parsers/RUMonthNameParser.js.map +1 -1
- package/dist/cjs/locales/ru/parsers/RURelativeDateFormatParser.d.ts +3 -4
- package/dist/cjs/locales/ru/parsers/RURelativeDateFormatParser.js +4 -8
- package/dist/cjs/locales/ru/parsers/RURelativeDateFormatParser.js.map +1 -1
- package/dist/cjs/locales/ru/parsers/RUTimeUnitAgoFormatParser.d.ts +3 -4
- package/dist/cjs/locales/ru/parsers/RUTimeUnitAgoFormatParser.js +4 -8
- package/dist/cjs/locales/ru/parsers/RUTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/cjs/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.d.ts +3 -4
- package/dist/cjs/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js +4 -8
- package/dist/cjs/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js.map +1 -1
- package/dist/cjs/locales/ru/parsers/RUTimeUnitWithinFormatParser.d.ts +3 -0
- package/dist/cjs/locales/ru/parsers/RUTimeUnitWithinFormatParser.js +6 -3
- package/dist/cjs/locales/ru/parsers/RUTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/cjs/locales/ru/parsers/RUWeekdayParser.d.ts +3 -4
- package/dist/cjs/locales/ru/parsers/RUWeekdayParser.js +9 -14
- package/dist/cjs/locales/ru/parsers/RUWeekdayParser.js.map +1 -1
- package/dist/cjs/results.d.ts +5 -0
- package/dist/cjs/results.js +30 -2
- package/dist/cjs/results.js.map +1 -1
- package/dist/cjs/types.d.ts +2 -0
- package/dist/cjs/types.js.map +1 -1
- package/dist/esm/calculation/mergingCalculation.js +2 -0
- package/dist/esm/calculation/mergingCalculation.js.map +1 -1
- package/dist/esm/common/casualReferences.js +13 -3
- package/dist/esm/common/casualReferences.js.map +1 -1
- package/dist/esm/common/parsers/AbstractParserWithWordBoundary.d.ts +2 -1
- package/dist/esm/common/parsers/AbstractParserWithWordBoundary.js +9 -5
- package/dist/esm/common/parsers/AbstractParserWithWordBoundary.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENCasualDateParser.js +12 -6
- package/dist/esm/locales/en/parsers/ENCasualDateParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENCasualTimeParser.d.ts +1 -1
- package/dist/esm/locales/en/parsers/ENCasualTimeParser.js +15 -6
- package/dist/esm/locales/en/parsers/ENCasualTimeParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENTimeExpressionParser.js +23 -22
- package/dist/esm/locales/en/parsers/ENTimeExpressionParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENTimeUnitWithinFormatParser.js +3 -2
- package/dist/esm/locales/en/parsers/ENTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/esm/locales/ru/parsers/AbstractParserWithWordBoundaryChecking.d.ts +11 -0
- package/dist/esm/locales/ru/parsers/AbstractParserWithWordBoundaryChecking.js +19 -0
- package/dist/esm/locales/ru/parsers/AbstractParserWithWordBoundaryChecking.js.map +1 -0
- package/dist/esm/locales/ru/parsers/RUCasualDateParser.d.ts +3 -4
- package/dist/esm/locales/ru/parsers/RUCasualDateParser.js +4 -9
- package/dist/esm/locales/ru/parsers/RUCasualDateParser.js.map +1 -1
- package/dist/esm/locales/ru/parsers/RUCasualTimeParser.d.ts +3 -4
- package/dist/esm/locales/ru/parsers/RUCasualTimeParser.js +4 -10
- package/dist/esm/locales/ru/parsers/RUCasualTimeParser.js.map +1 -1
- package/dist/esm/locales/ru/parsers/RUMonthNameLittleEndianParser.d.ts +3 -4
- package/dist/esm/locales/ru/parsers/RUMonthNameLittleEndianParser.js +15 -20
- package/dist/esm/locales/ru/parsers/RUMonthNameLittleEndianParser.js.map +1 -1
- package/dist/esm/locales/ru/parsers/RUMonthNameParser.d.ts +3 -4
- package/dist/esm/locales/ru/parsers/RUMonthNameParser.js +11 -15
- package/dist/esm/locales/ru/parsers/RUMonthNameParser.js.map +1 -1
- package/dist/esm/locales/ru/parsers/RURelativeDateFormatParser.d.ts +3 -4
- package/dist/esm/locales/ru/parsers/RURelativeDateFormatParser.js +5 -9
- package/dist/esm/locales/ru/parsers/RURelativeDateFormatParser.js.map +1 -1
- package/dist/esm/locales/ru/parsers/RUTimeUnitAgoFormatParser.d.ts +3 -4
- package/dist/esm/locales/ru/parsers/RUTimeUnitAgoFormatParser.js +5 -9
- package/dist/esm/locales/ru/parsers/RUTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/esm/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.d.ts +3 -4
- package/dist/esm/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js +5 -9
- package/dist/esm/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js.map +1 -1
- package/dist/esm/locales/ru/parsers/RUTimeUnitWithinFormatParser.d.ts +3 -0
- package/dist/esm/locales/ru/parsers/RUTimeUnitWithinFormatParser.js +6 -3
- package/dist/esm/locales/ru/parsers/RUTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/esm/locales/ru/parsers/RUWeekdayParser.d.ts +3 -4
- package/dist/esm/locales/ru/parsers/RUWeekdayParser.js +10 -15
- package/dist/esm/locales/ru/parsers/RUWeekdayParser.js.map +1 -1
- package/dist/esm/results.d.ts +5 -0
- package/dist/esm/results.js +30 -2
- package/dist/esm/results.js.map +1 -1
- package/dist/esm/types.d.ts +2 -0
- package/dist/esm/types.js.map +1 -1
- package/package.json +1 -1
- package/src/calculation/mergingCalculation.ts +2 -0
- package/src/common/casualReferences.ts +13 -3
- package/src/common/parsers/AbstractParserWithWordBoundary.ts +17 -9
- package/src/locales/en/parsers/ENCasualDateParser.ts +12 -7
- package/src/locales/en/parsers/ENCasualTimeParser.ts +15 -6
- package/src/locales/en/parsers/ENTimeExpressionParser.ts +24 -22
- package/src/locales/en/parsers/ENTimeUnitWithinFormatParser.ts +4 -3
- package/src/locales/ru/parsers/AbstractParserWithWordBoundaryChecking.ts +25 -0
- package/src/locales/ru/parsers/RUCasualDateParser.ts +4 -14
- package/src/locales/ru/parsers/RUCasualTimeParser.ts +4 -14
- package/src/locales/ru/parsers/RUMonthNameLittleEndianParser.ts +16 -26
- package/src/locales/ru/parsers/RUMonthNameParser.ts +13 -20
- package/src/locales/ru/parsers/RURelativeDateFormatParser.ts +6 -14
- package/src/locales/ru/parsers/RUTimeUnitAgoFormatParser.ts +5 -11
- package/src/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.ts +4 -13
- package/src/locales/ru/parsers/RUTimeUnitWithinFormatParser.ts +10 -4
- package/src/locales/ru/parsers/RUWeekdayParser.ts +12 -20
- package/src/results.ts +34 -4
- package/src/types.ts +11 -1
- package/test/en/en.test.ts +3 -3
- package/test/en/en_time_units_within.test.ts +22 -1
- package/test/result.test.ts +65 -3
- package/test/ru/ru_relative.test.ts +44 -11
- package/test/ru/ru_time_units_casual_relative.test.ts +96 -30
- package/test/system.test.ts +37 -0
- package/test/uk/uk_relative.test.ts +44 -11
- package/test/uk/uk_time_units_casual_relative.test.ts +40 -10
|
@@ -68,6 +68,8 @@ function mergeDateTimeComponent(dateComponent, timeComponent) {
|
|
|
68
68
|
dateTimeComponent.imply("hour", dateTimeComponent.get("hour") + 12);
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
|
+
dateTimeComponent.addTags(dateComponent.tags());
|
|
72
|
+
dateTimeComponent.addTags(timeComponent.tags());
|
|
71
73
|
return dateTimeComponent;
|
|
72
74
|
}
|
|
73
75
|
exports.mergeDateTimeComponent = mergeDateTimeComponent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergingCalculation.js","sourceRoot":"","sources":["../../../src/calculation/mergingCalculation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mergingCalculation.js","sourceRoot":"","sources":["../../../src/calculation/mergingCalculation.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ function now(reference) {
|
|
|
16
16
|
if (reference.timezoneOffset !== null) {
|
|
17
17
|
component.assign("timezoneOffset", targetDate.utcOffset());
|
|
18
18
|
}
|
|
19
|
+
component.addTag("casualReference/now");
|
|
19
20
|
return component;
|
|
20
21
|
}
|
|
21
22
|
exports.now = now;
|
|
@@ -24,11 +25,12 @@ function today(reference) {
|
|
|
24
25
|
const component = new results_1.ParsingComponents(reference, {});
|
|
25
26
|
dayjs_2.assignSimilarDate(component, targetDate);
|
|
26
27
|
dayjs_2.implySimilarTime(component, targetDate);
|
|
28
|
+
component.addTag("casualReference/today");
|
|
27
29
|
return component;
|
|
28
30
|
}
|
|
29
31
|
exports.today = today;
|
|
30
32
|
function yesterday(reference) {
|
|
31
|
-
return theDayBefore(reference, 1);
|
|
33
|
+
return theDayBefore(reference, 1).addTag("casualReference/yesterday");
|
|
32
34
|
}
|
|
33
35
|
exports.yesterday = yesterday;
|
|
34
36
|
function theDayBefore(reference, numDay) {
|
|
@@ -36,7 +38,7 @@ function theDayBefore(reference, numDay) {
|
|
|
36
38
|
}
|
|
37
39
|
exports.theDayBefore = theDayBefore;
|
|
38
40
|
function tomorrow(reference) {
|
|
39
|
-
return theDayAfter(reference, 1);
|
|
41
|
+
return theDayAfter(reference, 1).addTag("casualReference/tomorrow");
|
|
40
42
|
}
|
|
41
43
|
exports.tomorrow = tomorrow;
|
|
42
44
|
function theDayAfter(reference, nDays) {
|
|
@@ -51,9 +53,10 @@ exports.theDayAfter = theDayAfter;
|
|
|
51
53
|
function tonight(reference, implyHour = 22) {
|
|
52
54
|
const targetDate = dayjs_1.default(reference.instant);
|
|
53
55
|
const component = new results_1.ParsingComponents(reference, {});
|
|
56
|
+
dayjs_2.assignSimilarDate(component, targetDate);
|
|
54
57
|
component.imply("hour", implyHour);
|
|
55
58
|
component.imply("meridiem", types_1.Meridiem.PM);
|
|
56
|
-
|
|
59
|
+
component.addTag("casualReference/tonight");
|
|
57
60
|
return component;
|
|
58
61
|
}
|
|
59
62
|
exports.tonight = tonight;
|
|
@@ -72,6 +75,7 @@ function evening(reference, implyHour = 20) {
|
|
|
72
75
|
const component = new results_1.ParsingComponents(reference, {});
|
|
73
76
|
component.imply("meridiem", types_1.Meridiem.PM);
|
|
74
77
|
component.imply("hour", implyHour);
|
|
78
|
+
component.addTag("casualReference/evening");
|
|
75
79
|
return component;
|
|
76
80
|
}
|
|
77
81
|
exports.evening = evening;
|
|
@@ -82,6 +86,8 @@ function yesterdayEvening(reference, implyHour = 20) {
|
|
|
82
86
|
dayjs_2.assignSimilarDate(component, targetDate);
|
|
83
87
|
component.imply("hour", implyHour);
|
|
84
88
|
component.imply("meridiem", types_1.Meridiem.PM);
|
|
89
|
+
component.addTag("casualReference/yesterday");
|
|
90
|
+
component.addTag("casualReference/evening");
|
|
85
91
|
return component;
|
|
86
92
|
}
|
|
87
93
|
exports.yesterdayEvening = yesterdayEvening;
|
|
@@ -95,6 +101,7 @@ function midnight(reference) {
|
|
|
95
101
|
component.imply("minute", 0);
|
|
96
102
|
component.imply("second", 0);
|
|
97
103
|
component.imply("millisecond", 0);
|
|
104
|
+
component.addTag("casualReference/midnight");
|
|
98
105
|
return component;
|
|
99
106
|
}
|
|
100
107
|
exports.midnight = midnight;
|
|
@@ -105,6 +112,7 @@ function morning(reference, implyHour = 6) {
|
|
|
105
112
|
component.imply("minute", 0);
|
|
106
113
|
component.imply("second", 0);
|
|
107
114
|
component.imply("millisecond", 0);
|
|
115
|
+
component.addTag("casualReference/morning");
|
|
108
116
|
return component;
|
|
109
117
|
}
|
|
110
118
|
exports.morning = morning;
|
|
@@ -115,6 +123,7 @@ function afternoon(reference, implyHour = 15) {
|
|
|
115
123
|
component.imply("minute", 0);
|
|
116
124
|
component.imply("second", 0);
|
|
117
125
|
component.imply("millisecond", 0);
|
|
126
|
+
component.addTag("casualReference/afternoon");
|
|
118
127
|
return component;
|
|
119
128
|
}
|
|
120
129
|
exports.afternoon = afternoon;
|
|
@@ -125,6 +134,7 @@ function noon(reference) {
|
|
|
125
134
|
component.imply("minute", 0);
|
|
126
135
|
component.imply("second", 0);
|
|
127
136
|
component.imply("millisecond", 0);
|
|
137
|
+
component.addTag("casualReference/noon");
|
|
128
138
|
return component;
|
|
129
139
|
}
|
|
130
140
|
exports.noon = noon;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"casualReferences.js","sourceRoot":"","sources":["../../../src/common/casualReferences.ts"],"names":[],"mappings":";;;;;;AAAA,wCAAsE;AACtE,kDAA0B;AAC1B,0CAMwB;AACxB,oCAAoC;AAEpC,SAAgB,GAAG,CAAC,SAAgC;IAChD,MAAM,UAAU,GAAG,eAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC5C,MAAM,SAAS,GAAG,IAAI,2BAAiB,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IACvD,yBAAiB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACzC,yBAAiB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACzC,IAAI,SAAS,CAAC,cAAc,KAAK,IAAI,EAAE;QACnC,SAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC;KAC9D;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;
|
|
1
|
+
{"version":3,"file":"casualReferences.js","sourceRoot":"","sources":["../../../src/common/casualReferences.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,9 +6,10 @@ export declare abstract class AbstractParserWithWordBoundaryChecking implements
|
|
|
6
6
|
abstract innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents | ParsingResult | {
|
|
7
7
|
[c in Component]?: number;
|
|
8
8
|
} | null;
|
|
9
|
+
innerPatternHasChange(context: ParsingContext, currentInnerPattern: RegExp): boolean;
|
|
10
|
+
patternLeftBoundary(): string;
|
|
9
11
|
private cachedInnerPattern?;
|
|
10
12
|
private cachedPattern?;
|
|
11
|
-
patternLeftBoundary(): string;
|
|
12
13
|
pattern(context: ParsingContext): RegExp;
|
|
13
14
|
extract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents | ParsingResult | {
|
|
14
15
|
day?: number;
|
|
@@ -6,16 +6,20 @@ class AbstractParserWithWordBoundaryChecking {
|
|
|
6
6
|
this.cachedInnerPattern = null;
|
|
7
7
|
this.cachedPattern = null;
|
|
8
8
|
}
|
|
9
|
+
innerPatternHasChange(context, currentInnerPattern) {
|
|
10
|
+
return this.innerPattern(context) !== currentInnerPattern;
|
|
11
|
+
}
|
|
9
12
|
patternLeftBoundary() {
|
|
10
13
|
return `(\\W|^)`;
|
|
11
14
|
}
|
|
12
15
|
pattern(context) {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
+
if (this.cachedInnerPattern) {
|
|
17
|
+
if (!this.innerPatternHasChange(context, this.cachedInnerPattern)) {
|
|
18
|
+
return this.cachedPattern;
|
|
19
|
+
}
|
|
16
20
|
}
|
|
17
|
-
this.
|
|
18
|
-
this.
|
|
21
|
+
this.cachedInnerPattern = this.innerPattern(context);
|
|
22
|
+
this.cachedPattern = new RegExp(`${this.patternLeftBoundary()}${this.cachedInnerPattern.source}`, this.cachedInnerPattern.flags);
|
|
19
23
|
return this.cachedPattern;
|
|
20
24
|
}
|
|
21
25
|
extract(context, match) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractParserWithWordBoundary.js","sourceRoot":"","sources":["../../../../src/common/parsers/AbstractParserWithWordBoundary.ts"],"names":[],"mappings":";;;AAOA,MAAsB,sCAAsC;IAA5D;
|
|
1
|
+
{"version":3,"file":"AbstractParserWithWordBoundary.js","sourceRoot":"","sources":["../../../../src/common/parsers/AbstractParserWithWordBoundary.ts"],"names":[],"mappings":";;;AAOA,MAAsB,sCAAsC;IAA5D;QAgBY,uBAAkB,GAAY,IAAI,CAAC;QACnC,kBAAa,GAAY,IAAI,CAAC;IA0B1C,CAAC;IAnCG,qBAAqB,CAAC,OAAuB,EAAE,mBAA2B;QACtE,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,mBAAmB,CAAC;IAC9D,CAAC;IAED,mBAAmB;QACf,OAAO,SAAS,CAAC;IACrB,CAAC;IAKD,OAAO,CAAC,OAAuB;QAC3B,IAAI,IAAI,CAAC,kBAAkB,EAAE;YACzB,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,EAAE;gBAC/D,OAAO,IAAI,CAAC,aAAa,CAAC;aAC7B;SACJ;QACD,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACrD,IAAI,CAAC,aAAa,GAAG,IAAI,MAAM,CAC3B,GAAG,IAAI,CAAC,mBAAmB,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAChE,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAChC,CAAC;QACF,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED,OAAO,CAAC,OAAuB,EAAE,KAAuB;;QACpD,MAAM,MAAM,GAAG,MAAA,KAAK,CAAC,CAAC,CAAC,mCAAI,EAAE,CAAC;QAC9B,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC;QAC1C,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACnC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;SAC3B;QAED,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;CACJ;AA3CD,wFA2CC"}
|
|
@@ -34,20 +34,25 @@ class ENCasualDateParser extends AbstractParserWithWordBoundary_1.AbstractParser
|
|
|
34
34
|
innerExtract(context, match) {
|
|
35
35
|
let targetDate = dayjs_1.default(context.refDate);
|
|
36
36
|
const lowerText = match[0].toLowerCase();
|
|
37
|
-
|
|
37
|
+
let component = context.createParsingComponents();
|
|
38
38
|
switch (lowerText) {
|
|
39
39
|
case "now":
|
|
40
|
-
|
|
40
|
+
component = references.now(context.reference);
|
|
41
|
+
break;
|
|
41
42
|
case "today":
|
|
42
|
-
|
|
43
|
+
component = references.today(context.reference);
|
|
44
|
+
break;
|
|
43
45
|
case "yesterday":
|
|
44
|
-
|
|
46
|
+
component = references.yesterday(context.reference);
|
|
47
|
+
break;
|
|
45
48
|
case "tomorrow":
|
|
46
49
|
case "tmr":
|
|
47
50
|
case "tmrw":
|
|
48
|
-
|
|
51
|
+
component = references.tomorrow(context.reference);
|
|
52
|
+
break;
|
|
49
53
|
case "tonight":
|
|
50
|
-
|
|
54
|
+
component = references.tonight(context.reference);
|
|
55
|
+
break;
|
|
51
56
|
default:
|
|
52
57
|
if (lowerText.match(/last\s*night/)) {
|
|
53
58
|
if (targetDate.hour() > 6) {
|
|
@@ -58,6 +63,7 @@ class ENCasualDateParser extends AbstractParserWithWordBoundary_1.AbstractParser
|
|
|
58
63
|
}
|
|
59
64
|
break;
|
|
60
65
|
}
|
|
66
|
+
component.addTag("parser/ENCasualDateParser");
|
|
61
67
|
return component;
|
|
62
68
|
}
|
|
63
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ENCasualDateParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENCasualDateParser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAEA,kDAA0B;AAC1B,2GAAgH;AAChH,gDAAyD;AACzD,6EAA+D;AAE/D,MAAM,OAAO,GAAG,uEAAuE,CAAC;AAExF,MAAqB,kBAAmB,SAAQ,uEAAsC;IAClF,YAAY,CAAC,OAAuB;QAChC,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,IAAI,UAAU,GAAG,eAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACxC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACzC,
|
|
1
|
+
{"version":3,"file":"ENCasualDateParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENCasualDateParser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAEA,kDAA0B;AAC1B,2GAAgH;AAChH,gDAAyD;AACzD,6EAA+D;AAE/D,MAAM,OAAO,GAAG,uEAAuE,CAAC;AAExF,MAAqB,kBAAmB,SAAQ,uEAAsC;IAClF,YAAY,CAAC,OAAuB;QAChC,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,IAAI,UAAU,GAAG,eAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACxC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACzC,IAAI,SAAS,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;QAElD,QAAQ,SAAS,EAAE;YACf,KAAK,KAAK;gBACN,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBAC9C,MAAM;YAEV,KAAK,OAAO;gBACR,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBAChD,MAAM;YAEV,KAAK,WAAW;gBACZ,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBACpD,MAAM;YAEV,KAAK,UAAU,CAAC;YAChB,KAAK,KAAK,CAAC;YACX,KAAK,MAAM;gBACP,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBACnD,MAAM;YAEV,KAAK,SAAS;gBACV,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBAClD,MAAM;YAEV;gBACI,IAAI,SAAS,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE;oBACjC,IAAI,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE;wBACvB,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;qBAC1C;oBAED,yBAAiB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;oBACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;iBAC9B;gBACD,MAAM;SACb;QACD,SAAS,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC;QAC9C,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AA/CD,qCA+CC"}
|
|
@@ -2,5 +2,5 @@ import { ParsingContext } from "../../../chrono";
|
|
|
2
2
|
import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
|
|
3
3
|
export default class ENCasualTimeParser extends AbstractParserWithWordBoundaryChecking {
|
|
4
4
|
innerPattern(): RegExp;
|
|
5
|
-
innerExtract(context: ParsingContext, match: RegExpMatchArray):
|
|
5
|
+
innerExtract(context: ParsingContext, match: RegExpMatchArray): any;
|
|
6
6
|
}
|
|
@@ -27,21 +27,30 @@ class ENCasualTimeParser extends AbstractParserWithWordBoundary_1.AbstractParser
|
|
|
27
27
|
return PATTERN;
|
|
28
28
|
}
|
|
29
29
|
innerExtract(context, match) {
|
|
30
|
+
let component = null;
|
|
30
31
|
switch (match[1].toLowerCase()) {
|
|
31
32
|
case "afternoon":
|
|
32
|
-
|
|
33
|
+
component = casualReferences.afternoon(context.reference);
|
|
34
|
+
break;
|
|
33
35
|
case "evening":
|
|
34
36
|
case "night":
|
|
35
|
-
|
|
37
|
+
component = casualReferences.evening(context.reference);
|
|
38
|
+
break;
|
|
36
39
|
case "midnight":
|
|
37
|
-
|
|
40
|
+
component = casualReferences.midnight(context.reference);
|
|
41
|
+
break;
|
|
38
42
|
case "morning":
|
|
39
|
-
|
|
43
|
+
component = casualReferences.morning(context.reference);
|
|
44
|
+
break;
|
|
40
45
|
case "noon":
|
|
41
46
|
case "midday":
|
|
42
|
-
|
|
47
|
+
component = casualReferences.noon(context.reference);
|
|
48
|
+
break;
|
|
43
49
|
}
|
|
44
|
-
|
|
50
|
+
if (component) {
|
|
51
|
+
component.addTag("parser/ENCasualTimeParser");
|
|
52
|
+
}
|
|
53
|
+
return component;
|
|
45
54
|
}
|
|
46
55
|
}
|
|
47
56
|
exports.default = ENCasualTimeParser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ENCasualTimeParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENCasualTimeParser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AACA,2GAAgH;AAChH,mFAAqE;AAErE,MAAM,OAAO,GAAG,iFAAiF,CAAC;AAElG,MAAqB,kBAAmB,SAAQ,uEAAsC;IAClF,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IACD,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE;YAC5B,KAAK,WAAW;gBACZ,
|
|
1
|
+
{"version":3,"file":"ENCasualTimeParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENCasualTimeParser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AACA,2GAAgH;AAChH,mFAAqE;AAErE,MAAM,OAAO,GAAG,iFAAiF,CAAC;AAElG,MAAqB,kBAAmB,SAAQ,uEAAsC;IAClF,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IACD,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE;YAC5B,KAAK,WAAW;gBACZ,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBAC1D,MAAM;YACV,KAAK,SAAS,CAAC;YACf,KAAK,OAAO;gBACR,SAAS,GAAG,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBACxD,MAAM;YACV,KAAK,UAAU;gBACX,SAAS,GAAG,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBACzD,MAAM;YACV,KAAK,SAAS;gBACV,SAAS,GAAG,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBACxD,MAAM;YACV,KAAK,MAAM,CAAC;YACZ,KAAK,QAAQ;gBACT,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBACrD,MAAM;SACb;QACD,IAAI,SAAS,EAAE;YACX,SAAS,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC;SACjD;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AA9BD,qCA8BC"}
|
|
@@ -17,33 +17,34 @@ class ENTimeExpressionParser extends AbstractTimeExpressionParser_1.AbstractTime
|
|
|
17
17
|
}
|
|
18
18
|
extractPrimaryTimeComponents(context, match) {
|
|
19
19
|
const components = super.extractPrimaryTimeComponents(context, match);
|
|
20
|
-
if (components) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
else if (hour < 6) {
|
|
28
|
-
components.assign("meridiem", types_1.Meridiem.AM);
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
if (match[0].endsWith("afternoon")) {
|
|
20
|
+
if (!components) {
|
|
21
|
+
return components;
|
|
22
|
+
}
|
|
23
|
+
if (match[0].endsWith("night")) {
|
|
24
|
+
const hour = components.get("hour");
|
|
25
|
+
if (hour >= 6 && hour < 12) {
|
|
26
|
+
components.assign("hour", components.get("hour") + 12);
|
|
32
27
|
components.assign("meridiem", types_1.Meridiem.PM);
|
|
33
|
-
const hour = components.get("hour");
|
|
34
|
-
if (hour >= 0 && hour <= 6) {
|
|
35
|
-
components.assign("hour", components.get("hour") + 12);
|
|
36
|
-
}
|
|
37
28
|
}
|
|
38
|
-
if (
|
|
29
|
+
else if (hour < 6) {
|
|
39
30
|
components.assign("meridiem", types_1.Meridiem.AM);
|
|
40
|
-
const hour = components.get("hour");
|
|
41
|
-
if (hour < 12) {
|
|
42
|
-
components.assign("hour", components.get("hour"));
|
|
43
|
-
}
|
|
44
31
|
}
|
|
45
32
|
}
|
|
46
|
-
|
|
33
|
+
if (match[0].endsWith("afternoon")) {
|
|
34
|
+
components.assign("meridiem", types_1.Meridiem.PM);
|
|
35
|
+
const hour = components.get("hour");
|
|
36
|
+
if (hour >= 0 && hour <= 6) {
|
|
37
|
+
components.assign("hour", components.get("hour") + 12);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
if (match[0].endsWith("morning")) {
|
|
41
|
+
components.assign("meridiem", types_1.Meridiem.AM);
|
|
42
|
+
const hour = components.get("hour");
|
|
43
|
+
if (hour < 12) {
|
|
44
|
+
components.assign("hour", components.get("hour"));
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return components.addTag("parser/ENTimeExpressionParser");
|
|
47
48
|
}
|
|
48
49
|
}
|
|
49
50
|
exports.default = ENTimeExpressionParser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ENTimeExpressionParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeExpressionParser.ts"],"names":[],"mappings":";;AAEA,0CAA0C;AAC1C,uGAAoG;AAEpG,MAAqB,sBAAuB,SAAQ,2DAA4B;IAC5E,YAAY,UAAU;QAClB,KAAK,CAAC,UAAU,CAAC,CAAC;IACtB,CAAC;IAED,cAAc;QACV,OAAO,uDAAuD,CAAC;IACnE,CAAC;IAED,aAAa;QACT,OAAO,uBAAuB,CAAC;IACnC,CAAC;IAED,aAAa;QACT,OAAO,sFAAsF,CAAC;IAClG,CAAC;IAED,4BAA4B,CAAC,OAAuB,EAAE,KAAuB;QACzE,MAAM,UAAU,GAAG,KAAK,CAAC,4BAA4B,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACtE,IAAI,UAAU,EAAE;
|
|
1
|
+
{"version":3,"file":"ENTimeExpressionParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeExpressionParser.ts"],"names":[],"mappings":";;AAEA,0CAA0C;AAC1C,uGAAoG;AAEpG,MAAqB,sBAAuB,SAAQ,2DAA4B;IAC5E,YAAY,UAAU;QAClB,KAAK,CAAC,UAAU,CAAC,CAAC;IACtB,CAAC;IAED,cAAc;QACV,OAAO,uDAAuD,CAAC;IACnE,CAAC;IAED,aAAa;QACT,OAAO,uBAAuB,CAAC;IACnC,CAAC;IAED,aAAa;QACT,OAAO,sFAAsF,CAAC;IAClG,CAAC;IAED,4BAA4B,CAAC,OAAuB,EAAE,KAAuB;QACzE,MAAM,UAAU,GAAG,KAAK,CAAC,4BAA4B,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACtE,IAAI,CAAC,UAAU,EAAE;YACb,OAAO,UAAU,CAAC;SACrB;QAED,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC5B,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACpC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,GAAG,EAAE,EAAE;gBACxB,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;gBACvD,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;aAC9C;iBAAM,IAAI,IAAI,GAAG,CAAC,EAAE;gBACjB,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;aAC9C;SACJ;QAED,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAChC,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;YAC3C,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACpC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE;gBACxB,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;aAC1D;SACJ;QAED,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YAC9B,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;YAC3C,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACpC,IAAI,IAAI,GAAG,EAAE,EAAE;gBACX,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;aACrD;SACJ;QAED,OAAO,UAAU,CAAC,MAAM,CAAC,+BAA+B,CAAC,CAAC;IAC9D,CAAC;CACJ;AAnDD,yCAmDC"}
|
|
@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const constants_1 = require("../constants");
|
|
4
4
|
const results_1 = require("../../../results");
|
|
5
5
|
const AbstractParserWithWordBoundary_1 = require("../../../common/parsers/AbstractParserWithWordBoundary");
|
|
6
|
-
const
|
|
6
|
+
const PATTERN_WITH_OPTIONAL_PREFIX = new RegExp(`(?:(?:within|in|for)\\s*)?` +
|
|
7
|
+
`(?:(?:about|around|roughly|approximately|just)\\s*(?:~\\s*)?)?(${constants_1.TIME_UNITS_PATTERN})(?=\\W|$)`, "i");
|
|
7
8
|
const PATTERN_WITH_PREFIX = new RegExp(`(?:within|in|for)\\s*` +
|
|
8
9
|
`(?:(?:about|around|roughly|approximately|just)\\s*(?:~\\s*)?)?(${constants_1.TIME_UNITS_PATTERN})(?=\\W|$)`, "i");
|
|
9
10
|
const PATTERN_WITH_PREFIX_STRICT = new RegExp(`(?:within|in|for)\\s*` +
|
|
@@ -17,7 +18,7 @@ class ENTimeUnitWithinFormatParser extends AbstractParserWithWordBoundary_1.Abst
|
|
|
17
18
|
if (this.strictMode) {
|
|
18
19
|
return PATTERN_WITH_PREFIX_STRICT;
|
|
19
20
|
}
|
|
20
|
-
return context.option.forwardDate ?
|
|
21
|
+
return context.option.forwardDate ? PATTERN_WITH_OPTIONAL_PREFIX : PATTERN_WITH_PREFIX;
|
|
21
22
|
}
|
|
22
23
|
innerExtract(context, match) {
|
|
23
24
|
const timeUnits = constants_1.parseTimeUnits(match[1]);
|
|
@@ -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,
|
|
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;QACzD,MAAM,SAAS,GAAG,0BAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,OAAO,2BAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;CACJ;AAhBD,+CAgBC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
|
|
2
|
+
import { ParsingContext } from "../../../chrono";
|
|
3
|
+
export declare abstract class AbstractParserWithLeftBoundaryChecking extends AbstractParserWithWordBoundaryChecking {
|
|
4
|
+
abstract innerPatternString(context: ParsingContext): string;
|
|
5
|
+
patternLeftBoundary(): string;
|
|
6
|
+
innerPattern(context: ParsingContext): RegExp;
|
|
7
|
+
innerPatternHasChange(context: ParsingContext, currentInnerPattern: RegExp): boolean;
|
|
8
|
+
}
|
|
9
|
+
export declare abstract class AbstractParserWithLeftRightBoundaryChecking extends AbstractParserWithLeftBoundaryChecking {
|
|
10
|
+
innerPattern(context: ParsingContext): RegExp;
|
|
11
|
+
}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AbstractParserWithLeftRightBoundaryChecking = exports.AbstractParserWithLeftBoundaryChecking = void 0;
|
|
4
|
+
const AbstractParserWithWordBoundary_1 = require("../../../common/parsers/AbstractParserWithWordBoundary");
|
|
5
|
+
const constants_1 = require("../constants");
|
|
6
|
+
class AbstractParserWithLeftBoundaryChecking extends AbstractParserWithWordBoundary_1.AbstractParserWithWordBoundaryChecking {
|
|
7
|
+
patternLeftBoundary() {
|
|
8
|
+
return constants_1.REGEX_PARTS.leftBoundary;
|
|
9
|
+
}
|
|
10
|
+
innerPattern(context) {
|
|
11
|
+
return new RegExp(this.innerPatternString(context), constants_1.REGEX_PARTS.flags);
|
|
12
|
+
}
|
|
13
|
+
innerPatternHasChange(context, currentInnerPattern) {
|
|
14
|
+
return false;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
exports.AbstractParserWithLeftBoundaryChecking = AbstractParserWithLeftBoundaryChecking;
|
|
18
|
+
class AbstractParserWithLeftRightBoundaryChecking extends AbstractParserWithLeftBoundaryChecking {
|
|
19
|
+
innerPattern(context) {
|
|
20
|
+
return new RegExp(`${this.innerPatternString(context)}${constants_1.REGEX_PARTS.rightBoundary}`, constants_1.REGEX_PARTS.flags);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
exports.AbstractParserWithLeftRightBoundaryChecking = AbstractParserWithLeftRightBoundaryChecking;
|
|
24
|
+
//# sourceMappingURL=AbstractParserWithWordBoundaryChecking.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AbstractParserWithWordBoundaryChecking.js","sourceRoot":"","sources":["../../../../../src/locales/ru/parsers/AbstractParserWithWordBoundaryChecking.ts"],"names":[],"mappings":";;;AAAA,2GAAgH;AAChH,4CAA2C;AAG3C,MAAsB,sCAAuC,SAAQ,uEAAsC;IAGvG,mBAAmB;QACf,OAAO,uBAAW,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,YAAY,CAAC,OAAuB;QAChC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,uBAAW,CAAC,KAAK,CAAC,CAAC;IAC3E,CAAC;IAED,qBAAqB,CAAC,OAAuB,EAAE,mBAA2B;QACtE,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AAdD,wFAcC;AAED,MAAsB,2CAA4C,SAAQ,sCAAsC;IAC5G,YAAY,CAAC,OAAuB;QAChC,OAAO,IAAI,MAAM,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,GAAG,uBAAW,CAAC,aAAa,EAAE,EAAE,uBAAW,CAAC,KAAK,CAAC,CAAC;IAC5G,CAAC;CACJ;AAJD,kGAIC"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { ParsingContext } from "../../../chrono";
|
|
2
2
|
import { ParsingComponents, ParsingResult } from "../../../results";
|
|
3
|
-
import {
|
|
4
|
-
export default class RUCasualDateParser extends
|
|
5
|
-
|
|
6
|
-
innerPattern(context: ParsingContext): RegExp;
|
|
3
|
+
import { AbstractParserWithLeftRightBoundaryChecking } from "./AbstractParserWithWordBoundaryChecking";
|
|
4
|
+
export default class RUCasualDateParser extends AbstractParserWithLeftRightBoundaryChecking {
|
|
5
|
+
innerPatternString(context: ParsingContext): string;
|
|
7
6
|
innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents | ParsingResult;
|
|
8
7
|
}
|
|
@@ -19,16 +19,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
19
19
|
return result;
|
|
20
20
|
};
|
|
21
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
-
const AbstractParserWithWordBoundary_1 = require("../../../common/parsers/AbstractParserWithWordBoundary");
|
|
23
22
|
const references = __importStar(require("../../../common/casualReferences"));
|
|
24
|
-
const
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
return constants_1.REGEX_PARTS.leftBoundary;
|
|
29
|
-
}
|
|
30
|
-
innerPattern(context) {
|
|
31
|
-
return PATTERN;
|
|
23
|
+
const AbstractParserWithWordBoundaryChecking_1 = require("./AbstractParserWithWordBoundaryChecking");
|
|
24
|
+
class RUCasualDateParser extends AbstractParserWithWordBoundaryChecking_1.AbstractParserWithLeftRightBoundaryChecking {
|
|
25
|
+
innerPatternString(context) {
|
|
26
|
+
return `(?:с|со)?\\s*(сегодня|вчера|завтра|послезавтра|послепослезавтра|позапозавчера|позавчера)`;
|
|
32
27
|
}
|
|
33
28
|
innerExtract(context, match) {
|
|
34
29
|
const lowerText = match[1].toLowerCase();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RUCasualDateParser.js","sourceRoot":"","sources":["../../../../../src/locales/ru/parsers/RUCasualDateParser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAEA,
|
|
1
|
+
{"version":3,"file":"RUCasualDateParser.js","sourceRoot":"","sources":["../../../../../src/locales/ru/parsers/RUCasualDateParser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAEA,6EAA+D;AAC/D,qGAAuG;AAEvG,MAAqB,kBAAmB,SAAQ,oFAA2C;IACvF,kBAAkB,CAAC,OAAuB;QACtC,OAAO,0FAA0F,CAAC;IACtG,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;QAEpD,QAAQ,SAAS,EAAE;YACf,KAAK,SAAS;gBACV,OAAO,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAE/C,KAAK,OAAO;gBACR,OAAO,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAEnD,KAAK,QAAQ;gBACT,OAAO,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAElD,KAAK,aAAa;gBACd,OAAO,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YAExD,KAAK,kBAAkB;gBACnB,OAAO,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YAExD,KAAK,WAAW;gBACZ,OAAO,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YAEzD,KAAK,eAAe;gBAChB,OAAO,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;SAC5D;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AAlCD,qCAkCC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { ParsingContext } from "../../../chrono";
|
|
2
|
-
import {
|
|
3
|
-
export default class RUCasualTimeParser extends
|
|
4
|
-
|
|
5
|
-
innerPattern(): RegExp;
|
|
2
|
+
import { AbstractParserWithLeftRightBoundaryChecking } from "./AbstractParserWithWordBoundaryChecking";
|
|
3
|
+
export default class RUCasualTimeParser extends AbstractParserWithLeftRightBoundaryChecking {
|
|
4
|
+
innerPatternString(context: ParsingContext): string;
|
|
6
5
|
innerExtract(context: ParsingContext, match: RegExpMatchArray): import("..").ParsingComponents;
|
|
7
6
|
}
|
|
@@ -22,19 +22,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
22
22
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
23
23
|
};
|
|
24
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
|
-
const AbstractParserWithWordBoundary_1 = require("../../../common/parsers/AbstractParserWithWordBoundary");
|
|
26
25
|
const references = __importStar(require("../../../common/casualReferences"));
|
|
27
26
|
const dayjs_1 = require("../../../utils/dayjs");
|
|
28
27
|
const dayjs_2 = __importDefault(require("dayjs"));
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
patternLeftBoundary() {
|
|
34
|
-
return constants_1.REGEX_PARTS.leftBoundary;
|
|
35
|
-
}
|
|
36
|
-
innerPattern() {
|
|
37
|
-
return PATTERN;
|
|
28
|
+
const AbstractParserWithWordBoundaryChecking_1 = require("./AbstractParserWithWordBoundaryChecking");
|
|
29
|
+
class RUCasualTimeParser extends AbstractParserWithWordBoundaryChecking_1.AbstractParserWithLeftRightBoundaryChecking {
|
|
30
|
+
innerPatternString(context) {
|
|
31
|
+
return `(сейчас|прошлым\\s*вечером|прошлой\\s*ночью|следующей\\s*ночью|сегодня\\s*ночью|этой\\s*ночью|ночью|этим утром|утром|утра|в\\s*полдень|вечером|вечера|в\\s*полночь)`;
|
|
38
32
|
}
|
|
39
33
|
innerExtract(context, match) {
|
|
40
34
|
let targetDate = dayjs_2.default(context.refDate);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RUCasualTimeParser.js","sourceRoot":"","sources":["../../../../../src/locales/ru/parsers/RUCasualTimeParser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"RUCasualTimeParser.js","sourceRoot":"","sources":["../../../../../src/locales/ru/parsers/RUCasualTimeParser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AACA,6EAA+D;AAC/D,gDAAyD;AACzD,kDAA0B;AAC1B,qGAAuG;AAEvG,MAAqB,kBAAmB,SAAQ,oFAA2C;IACvF,kBAAkB,CAAC,OAAuB;QACtC,OAAO,qKAAqK,CAAC;IACjL,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,IAAI,UAAU,GAAG,eAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACxC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;QAEpD,IAAI,SAAS,KAAK,QAAQ,EAAE;YACxB,OAAO,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SAC5C;QACD,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,QAAQ,EAAE;YACnD,OAAO,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SAChD;QACD,IAAI,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YAC3D,OAAO,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SAChD;QACD,IAAI,SAAS,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE;YAChC,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SAC7C;QACD,IAAI,SAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE;YACpC,OAAO,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SAClD;QACD,IAAI,SAAS,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE;YACtC,OAAO,UAAU,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACzD;QACD,IAAI,SAAS,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE;YACtC,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YAC9C,yBAAiB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;SAC9B;QACD,IAAI,SAAS,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC/D,OAAO,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACjD;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AAvCD,qCAuCC"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { ParsingContext } from "../../../chrono";
|
|
2
2
|
import { ParsingResult } from "../../../results";
|
|
3
|
-
import {
|
|
4
|
-
export default class RUMonthNameLittleEndianParser extends
|
|
5
|
-
|
|
6
|
-
innerPattern(): RegExp;
|
|
3
|
+
import { AbstractParserWithLeftRightBoundaryChecking } from "./AbstractParserWithWordBoundaryChecking";
|
|
4
|
+
export default class RUMonthNameLittleEndianParser extends AbstractParserWithLeftRightBoundaryChecking {
|
|
5
|
+
innerPatternString(context: ParsingContext): string;
|
|
7
6
|
innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingResult;
|
|
8
7
|
}
|
|
@@ -5,29 +5,24 @@ const constants_1 = require("../constants");
|
|
|
5
5
|
const constants_2 = require("../constants");
|
|
6
6
|
const constants_3 = require("../constants");
|
|
7
7
|
const pattern_1 = require("../../../utils/pattern");
|
|
8
|
-
const
|
|
9
|
-
const PATTERN = new RegExp(`(?:с)?\\s*(${constants_3.ORDINAL_NUMBER_PATTERN})` +
|
|
10
|
-
`(?:` +
|
|
11
|
-
`\\s{0,3}(?:по|-|–|до)?\\s{0,3}` +
|
|
12
|
-
`(${constants_3.ORDINAL_NUMBER_PATTERN})` +
|
|
13
|
-
`)?` +
|
|
14
|
-
`(?:-|\\/|\\s{0,3}(?:of)?\\s{0,3})` +
|
|
15
|
-
`(${pattern_1.matchAnyPattern(constants_1.MONTH_DICTIONARY)})` +
|
|
16
|
-
`(?:` +
|
|
17
|
-
`(?:-|\\/|,?\\s{0,3})` +
|
|
18
|
-
`(${constants_2.YEAR_PATTERN}(?![^\\s]\\d))` +
|
|
19
|
-
`)?` +
|
|
20
|
-
`${constants_1.REGEX_PARTS.rightBoundary}`, constants_1.REGEX_PARTS.flags);
|
|
8
|
+
const AbstractParserWithWordBoundaryChecking_1 = require("./AbstractParserWithWordBoundaryChecking");
|
|
21
9
|
const DATE_GROUP = 1;
|
|
22
10
|
const DATE_TO_GROUP = 2;
|
|
23
11
|
const MONTH_NAME_GROUP = 3;
|
|
24
12
|
const YEAR_GROUP = 4;
|
|
25
|
-
class RUMonthNameLittleEndianParser extends
|
|
26
|
-
|
|
27
|
-
return
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
13
|
+
class RUMonthNameLittleEndianParser extends AbstractParserWithWordBoundaryChecking_1.AbstractParserWithLeftRightBoundaryChecking {
|
|
14
|
+
innerPatternString(context) {
|
|
15
|
+
return `(?:с)?\\s*(${constants_3.ORDINAL_NUMBER_PATTERN})` +
|
|
16
|
+
`(?:` +
|
|
17
|
+
`\\s{0,3}(?:по|-|–|до)?\\s{0,3}` +
|
|
18
|
+
`(${constants_3.ORDINAL_NUMBER_PATTERN})` +
|
|
19
|
+
`)?` +
|
|
20
|
+
`(?:-|\\/|\\s{0,3}(?:of)?\\s{0,3})` +
|
|
21
|
+
`(${pattern_1.matchAnyPattern(constants_1.MONTH_DICTIONARY)})` +
|
|
22
|
+
`(?:` +
|
|
23
|
+
`(?:-|\\/|,?\\s{0,3})` +
|
|
24
|
+
`(${constants_2.YEAR_PATTERN}(?![^\\s]\\d))` +
|
|
25
|
+
`)?`;
|
|
31
26
|
}
|
|
32
27
|
innerExtract(context, match) {
|
|
33
28
|
const result = context.createParsingResult(match.index, match[0]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RUMonthNameLittleEndianParser.js","sourceRoot":"","sources":["../../../../../src/locales/ru/parsers/RUMonthNameLittleEndianParser.ts"],"names":[],"mappings":";;AAEA,sDAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"RUMonthNameLittleEndianParser.js","sourceRoot":"","sources":["../../../../../src/locales/ru/parsers/RUMonthNameLittleEndianParser.ts"],"names":[],"mappings":";;AAEA,sDAAkE;AAClE,4CAAgD;AAChD,4CAAuD;AACvD,4CAAiF;AACjF,oDAAyD;AACzD,qGAAuG;AAEvG,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,oFAA2C;IAClG,kBAAkB,CAAC,OAAuB;QAEtC,OAAO,cAAc,kCAAsB,GAAG;YAC1C,KAAK;YACD,gCAAgC;YAChC,IAAI,kCAAsB,GAAG;YACjC,IAAI;YACA,mCAAmC;YACnC,IAAI,yBAAe,CAAC,4BAAgB,CAAC,GAAG;YAC5C,KAAK;YACD,sBAAsB;YACtB,IAAI,wBAAY,gBAAgB;YACpC,IAAI,CAAC;IACb,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;AA/CD,gDA+CC"}
|