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.
Files changed (130) hide show
  1. package/dist/cjs/calculation/mergingCalculation.js +2 -0
  2. package/dist/cjs/calculation/mergingCalculation.js.map +1 -1
  3. package/dist/cjs/common/casualReferences.js +13 -3
  4. package/dist/cjs/common/casualReferences.js.map +1 -1
  5. package/dist/cjs/common/parsers/AbstractParserWithWordBoundary.d.ts +2 -1
  6. package/dist/cjs/common/parsers/AbstractParserWithWordBoundary.js +9 -5
  7. package/dist/cjs/common/parsers/AbstractParserWithWordBoundary.js.map +1 -1
  8. package/dist/cjs/locales/en/parsers/ENCasualDateParser.js +12 -6
  9. package/dist/cjs/locales/en/parsers/ENCasualDateParser.js.map +1 -1
  10. package/dist/cjs/locales/en/parsers/ENCasualTimeParser.d.ts +1 -1
  11. package/dist/cjs/locales/en/parsers/ENCasualTimeParser.js +15 -6
  12. package/dist/cjs/locales/en/parsers/ENCasualTimeParser.js.map +1 -1
  13. package/dist/cjs/locales/en/parsers/ENTimeExpressionParser.js +23 -22
  14. package/dist/cjs/locales/en/parsers/ENTimeExpressionParser.js.map +1 -1
  15. package/dist/cjs/locales/en/parsers/ENTimeUnitWithinFormatParser.js +3 -2
  16. package/dist/cjs/locales/en/parsers/ENTimeUnitWithinFormatParser.js.map +1 -1
  17. package/dist/cjs/locales/ru/parsers/AbstractParserWithWordBoundaryChecking.d.ts +11 -0
  18. package/dist/cjs/locales/ru/parsers/AbstractParserWithWordBoundaryChecking.js +24 -0
  19. package/dist/cjs/locales/ru/parsers/AbstractParserWithWordBoundaryChecking.js.map +1 -0
  20. package/dist/cjs/locales/ru/parsers/RUCasualDateParser.d.ts +3 -4
  21. package/dist/cjs/locales/ru/parsers/RUCasualDateParser.js +4 -9
  22. package/dist/cjs/locales/ru/parsers/RUCasualDateParser.js.map +1 -1
  23. package/dist/cjs/locales/ru/parsers/RUCasualTimeParser.d.ts +3 -4
  24. package/dist/cjs/locales/ru/parsers/RUCasualTimeParser.js +4 -10
  25. package/dist/cjs/locales/ru/parsers/RUCasualTimeParser.js.map +1 -1
  26. package/dist/cjs/locales/ru/parsers/RUMonthNameLittleEndianParser.d.ts +3 -4
  27. package/dist/cjs/locales/ru/parsers/RUMonthNameLittleEndianParser.js +14 -19
  28. package/dist/cjs/locales/ru/parsers/RUMonthNameLittleEndianParser.js.map +1 -1
  29. package/dist/cjs/locales/ru/parsers/RUMonthNameParser.d.ts +3 -4
  30. package/dist/cjs/locales/ru/parsers/RUMonthNameParser.js +10 -14
  31. package/dist/cjs/locales/ru/parsers/RUMonthNameParser.js.map +1 -1
  32. package/dist/cjs/locales/ru/parsers/RURelativeDateFormatParser.d.ts +3 -4
  33. package/dist/cjs/locales/ru/parsers/RURelativeDateFormatParser.js +4 -8
  34. package/dist/cjs/locales/ru/parsers/RURelativeDateFormatParser.js.map +1 -1
  35. package/dist/cjs/locales/ru/parsers/RUTimeUnitAgoFormatParser.d.ts +3 -4
  36. package/dist/cjs/locales/ru/parsers/RUTimeUnitAgoFormatParser.js +4 -8
  37. package/dist/cjs/locales/ru/parsers/RUTimeUnitAgoFormatParser.js.map +1 -1
  38. package/dist/cjs/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.d.ts +3 -4
  39. package/dist/cjs/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js +4 -8
  40. package/dist/cjs/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js.map +1 -1
  41. package/dist/cjs/locales/ru/parsers/RUTimeUnitWithinFormatParser.d.ts +3 -0
  42. package/dist/cjs/locales/ru/parsers/RUTimeUnitWithinFormatParser.js +6 -3
  43. package/dist/cjs/locales/ru/parsers/RUTimeUnitWithinFormatParser.js.map +1 -1
  44. package/dist/cjs/locales/ru/parsers/RUWeekdayParser.d.ts +3 -4
  45. package/dist/cjs/locales/ru/parsers/RUWeekdayParser.js +9 -14
  46. package/dist/cjs/locales/ru/parsers/RUWeekdayParser.js.map +1 -1
  47. package/dist/cjs/results.d.ts +5 -0
  48. package/dist/cjs/results.js +30 -2
  49. package/dist/cjs/results.js.map +1 -1
  50. package/dist/cjs/types.d.ts +2 -0
  51. package/dist/cjs/types.js.map +1 -1
  52. package/dist/esm/calculation/mergingCalculation.js +2 -0
  53. package/dist/esm/calculation/mergingCalculation.js.map +1 -1
  54. package/dist/esm/common/casualReferences.js +13 -3
  55. package/dist/esm/common/casualReferences.js.map +1 -1
  56. package/dist/esm/common/parsers/AbstractParserWithWordBoundary.d.ts +2 -1
  57. package/dist/esm/common/parsers/AbstractParserWithWordBoundary.js +9 -5
  58. package/dist/esm/common/parsers/AbstractParserWithWordBoundary.js.map +1 -1
  59. package/dist/esm/locales/en/parsers/ENCasualDateParser.js +12 -6
  60. package/dist/esm/locales/en/parsers/ENCasualDateParser.js.map +1 -1
  61. package/dist/esm/locales/en/parsers/ENCasualTimeParser.d.ts +1 -1
  62. package/dist/esm/locales/en/parsers/ENCasualTimeParser.js +15 -6
  63. package/dist/esm/locales/en/parsers/ENCasualTimeParser.js.map +1 -1
  64. package/dist/esm/locales/en/parsers/ENTimeExpressionParser.js +23 -22
  65. package/dist/esm/locales/en/parsers/ENTimeExpressionParser.js.map +1 -1
  66. package/dist/esm/locales/en/parsers/ENTimeUnitWithinFormatParser.js +3 -2
  67. package/dist/esm/locales/en/parsers/ENTimeUnitWithinFormatParser.js.map +1 -1
  68. package/dist/esm/locales/ru/parsers/AbstractParserWithWordBoundaryChecking.d.ts +11 -0
  69. package/dist/esm/locales/ru/parsers/AbstractParserWithWordBoundaryChecking.js +19 -0
  70. package/dist/esm/locales/ru/parsers/AbstractParserWithWordBoundaryChecking.js.map +1 -0
  71. package/dist/esm/locales/ru/parsers/RUCasualDateParser.d.ts +3 -4
  72. package/dist/esm/locales/ru/parsers/RUCasualDateParser.js +4 -9
  73. package/dist/esm/locales/ru/parsers/RUCasualDateParser.js.map +1 -1
  74. package/dist/esm/locales/ru/parsers/RUCasualTimeParser.d.ts +3 -4
  75. package/dist/esm/locales/ru/parsers/RUCasualTimeParser.js +4 -10
  76. package/dist/esm/locales/ru/parsers/RUCasualTimeParser.js.map +1 -1
  77. package/dist/esm/locales/ru/parsers/RUMonthNameLittleEndianParser.d.ts +3 -4
  78. package/dist/esm/locales/ru/parsers/RUMonthNameLittleEndianParser.js +15 -20
  79. package/dist/esm/locales/ru/parsers/RUMonthNameLittleEndianParser.js.map +1 -1
  80. package/dist/esm/locales/ru/parsers/RUMonthNameParser.d.ts +3 -4
  81. package/dist/esm/locales/ru/parsers/RUMonthNameParser.js +11 -15
  82. package/dist/esm/locales/ru/parsers/RUMonthNameParser.js.map +1 -1
  83. package/dist/esm/locales/ru/parsers/RURelativeDateFormatParser.d.ts +3 -4
  84. package/dist/esm/locales/ru/parsers/RURelativeDateFormatParser.js +5 -9
  85. package/dist/esm/locales/ru/parsers/RURelativeDateFormatParser.js.map +1 -1
  86. package/dist/esm/locales/ru/parsers/RUTimeUnitAgoFormatParser.d.ts +3 -4
  87. package/dist/esm/locales/ru/parsers/RUTimeUnitAgoFormatParser.js +5 -9
  88. package/dist/esm/locales/ru/parsers/RUTimeUnitAgoFormatParser.js.map +1 -1
  89. package/dist/esm/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.d.ts +3 -4
  90. package/dist/esm/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js +5 -9
  91. package/dist/esm/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js.map +1 -1
  92. package/dist/esm/locales/ru/parsers/RUTimeUnitWithinFormatParser.d.ts +3 -0
  93. package/dist/esm/locales/ru/parsers/RUTimeUnitWithinFormatParser.js +6 -3
  94. package/dist/esm/locales/ru/parsers/RUTimeUnitWithinFormatParser.js.map +1 -1
  95. package/dist/esm/locales/ru/parsers/RUWeekdayParser.d.ts +3 -4
  96. package/dist/esm/locales/ru/parsers/RUWeekdayParser.js +10 -15
  97. package/dist/esm/locales/ru/parsers/RUWeekdayParser.js.map +1 -1
  98. package/dist/esm/results.d.ts +5 -0
  99. package/dist/esm/results.js +30 -2
  100. package/dist/esm/results.js.map +1 -1
  101. package/dist/esm/types.d.ts +2 -0
  102. package/dist/esm/types.js.map +1 -1
  103. package/package.json +1 -1
  104. package/src/calculation/mergingCalculation.ts +2 -0
  105. package/src/common/casualReferences.ts +13 -3
  106. package/src/common/parsers/AbstractParserWithWordBoundary.ts +17 -9
  107. package/src/locales/en/parsers/ENCasualDateParser.ts +12 -7
  108. package/src/locales/en/parsers/ENCasualTimeParser.ts +15 -6
  109. package/src/locales/en/parsers/ENTimeExpressionParser.ts +24 -22
  110. package/src/locales/en/parsers/ENTimeUnitWithinFormatParser.ts +4 -3
  111. package/src/locales/ru/parsers/AbstractParserWithWordBoundaryChecking.ts +25 -0
  112. package/src/locales/ru/parsers/RUCasualDateParser.ts +4 -14
  113. package/src/locales/ru/parsers/RUCasualTimeParser.ts +4 -14
  114. package/src/locales/ru/parsers/RUMonthNameLittleEndianParser.ts +16 -26
  115. package/src/locales/ru/parsers/RUMonthNameParser.ts +13 -20
  116. package/src/locales/ru/parsers/RURelativeDateFormatParser.ts +6 -14
  117. package/src/locales/ru/parsers/RUTimeUnitAgoFormatParser.ts +5 -11
  118. package/src/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.ts +4 -13
  119. package/src/locales/ru/parsers/RUTimeUnitWithinFormatParser.ts +10 -4
  120. package/src/locales/ru/parsers/RUWeekdayParser.ts +12 -20
  121. package/src/results.ts +34 -4
  122. package/src/types.ts +11 -1
  123. package/test/en/en.test.ts +3 -3
  124. package/test/en/en_time_units_within.test.ts +22 -1
  125. package/test/result.test.ts +65 -3
  126. package/test/ru/ru_relative.test.ts +44 -11
  127. package/test/ru/ru_time_units_casual_relative.test.ts +96 -30
  128. package/test/system.test.ts +37 -0
  129. package/test/uk/uk_relative.test.ts +44 -11
  130. package/test/uk/uk_time_units_casual_relative.test.ts +40 -10
@@ -3,16 +3,20 @@ export class AbstractParserWithWordBoundaryChecking {
3
3
  this.cachedInnerPattern = null;
4
4
  this.cachedPattern = null;
5
5
  }
6
+ innerPatternHasChange(context, currentInnerPattern) {
7
+ return this.innerPattern(context) !== currentInnerPattern;
8
+ }
6
9
  patternLeftBoundary() {
7
10
  return `(\\W|^)`;
8
11
  }
9
12
  pattern(context) {
10
- const innerPattern = this.innerPattern(context);
11
- if (innerPattern == this.cachedInnerPattern) {
12
- return this.cachedPattern;
13
+ if (this.cachedInnerPattern) {
14
+ if (!this.innerPatternHasChange(context, this.cachedInnerPattern)) {
15
+ return this.cachedPattern;
16
+ }
13
17
  }
14
- this.cachedPattern = new RegExp(`${this.patternLeftBoundary()}${innerPattern.source}`, innerPattern.flags);
15
- this.cachedInnerPattern = innerPattern;
18
+ this.cachedInnerPattern = this.innerPattern(context);
19
+ this.cachedPattern = new RegExp(`${this.patternLeftBoundary()}${this.cachedInnerPattern.source}`, this.cachedInnerPattern.flags);
16
20
  return this.cachedPattern;
17
21
  }
18
22
  extract(context, match) {
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractParserWithWordBoundary.js","sourceRoot":"","sources":["../../../../src/common/parsers/AbstractParserWithWordBoundary.ts"],"names":[],"mappings":"AAOA,MAAM,OAAgB,sCAAsC;IAA5D;QAOY,uBAAkB,GAAY,IAAI,CAAC;QACnC,kBAAa,GAAY,IAAI,CAAC;IA2B1C,CAAC;IAzBG,mBAAmB;QACf,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,CAAC,OAAuB;QAC3B,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAChD,IAAI,YAAY,IAAI,IAAI,CAAC,kBAAkB,EAAE;YACzC,OAAO,IAAI,CAAC,aAAa,CAAC;SAC7B;QAED,IAAI,CAAC,aAAa,GAAG,IAAI,MAAM,CAAC,GAAG,IAAI,CAAC,mBAAmB,EAAE,GAAG,YAAY,CAAC,MAAM,EAAE,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;QAC3G,IAAI,CAAC,kBAAkB,GAAG,YAAY,CAAC;QACvC,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED,OAAO,CAAC,OAAuB,EAAE,KAAuB;QACpD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,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"}
1
+ {"version":3,"file":"AbstractParserWithWordBoundary.js","sourceRoot":"","sources":["../../../../src/common/parsers/AbstractParserWithWordBoundary.ts"],"names":[],"mappings":"AAOA,MAAM,OAAgB,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,KAAK,CAAC,CAAC,CAAC,IAAI,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"}
@@ -10,20 +10,25 @@ export default class ENCasualDateParser extends AbstractParserWithWordBoundaryCh
10
10
  innerExtract(context, match) {
11
11
  let targetDate = dayjs(context.refDate);
12
12
  const lowerText = match[0].toLowerCase();
13
- const component = context.createParsingComponents();
13
+ let component = context.createParsingComponents();
14
14
  switch (lowerText) {
15
15
  case "now":
16
- return references.now(context.reference);
16
+ component = references.now(context.reference);
17
+ break;
17
18
  case "today":
18
- return references.today(context.reference);
19
+ component = references.today(context.reference);
20
+ break;
19
21
  case "yesterday":
20
- return references.yesterday(context.reference);
22
+ component = references.yesterday(context.reference);
23
+ break;
21
24
  case "tomorrow":
22
25
  case "tmr":
23
26
  case "tmrw":
24
- return references.tomorrow(context.reference);
27
+ component = references.tomorrow(context.reference);
28
+ break;
25
29
  case "tonight":
26
- return references.tonight(context.reference);
30
+ component = references.tonight(context.reference);
31
+ break;
27
32
  default:
28
33
  if (lowerText.match(/last\s*night/)) {
29
34
  if (targetDate.hour() > 6) {
@@ -34,6 +39,7 @@ export default class ENCasualDateParser extends AbstractParserWithWordBoundaryCh
34
39
  }
35
40
  break;
36
41
  }
42
+ component.addTag("parser/ENCasualDateParser");
37
43
  return component;
38
44
  }
39
45
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ENCasualDateParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENCasualDateParser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,UAAU,MAAM,kCAAkC,CAAC;AAE/D,MAAM,OAAO,GAAG,uEAAuE,CAAC;AAExF,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,sCAAsC;IAClF,YAAY,CAAC,OAAuB;QAChC,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,IAAI,UAAU,GAAG,KAAK,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,QAAQ,SAAS,EAAE;YACf,KAAK,KAAK;gBACN,OAAO,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAE7C,KAAK,OAAO;gBACR,OAAO,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAE/C,KAAK,WAAW;gBACZ,OAAO,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAEnD,KAAK,UAAU,CAAC;YAChB,KAAK,KAAK,CAAC;YACX,KAAK,MAAM;gBACP,OAAO,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAElD,KAAK,SAAS;gBACV,OAAO,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAEjD;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,iBAAiB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;oBACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;iBAC9B;gBACD,MAAM;SACb;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ"}
1
+ {"version":3,"file":"ENCasualDateParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENCasualDateParser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,UAAU,MAAM,kCAAkC,CAAC;AAE/D,MAAM,OAAO,GAAG,uEAAuE,CAAC;AAExF,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,sCAAsC;IAClF,YAAY,CAAC,OAAuB;QAChC,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,IAAI,UAAU,GAAG,KAAK,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,iBAAiB,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"}
@@ -2,5 +2,5 @@ import { ParsingContext } from "../../../chrono.js";
2
2
  import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
3
3
  export default class ENCasualTimeParser extends AbstractParserWithWordBoundaryChecking {
4
4
  innerPattern(): RegExp;
5
- innerExtract(context: ParsingContext, match: RegExpMatchArray): import("../index.js").ParsingComponents;
5
+ innerExtract(context: ParsingContext, match: RegExpMatchArray): any;
6
6
  }
@@ -6,21 +6,30 @@ export default class ENCasualTimeParser extends AbstractParserWithWordBoundaryCh
6
6
  return PATTERN;
7
7
  }
8
8
  innerExtract(context, match) {
9
+ let component = null;
9
10
  switch (match[1].toLowerCase()) {
10
11
  case "afternoon":
11
- return casualReferences.afternoon(context.reference);
12
+ component = casualReferences.afternoon(context.reference);
13
+ break;
12
14
  case "evening":
13
15
  case "night":
14
- return casualReferences.evening(context.reference);
16
+ component = casualReferences.evening(context.reference);
17
+ break;
15
18
  case "midnight":
16
- return casualReferences.midnight(context.reference);
19
+ component = casualReferences.midnight(context.reference);
20
+ break;
17
21
  case "morning":
18
- return casualReferences.morning(context.reference);
22
+ component = casualReferences.morning(context.reference);
23
+ break;
19
24
  case "noon":
20
25
  case "midday":
21
- return casualReferences.noon(context.reference);
26
+ component = casualReferences.noon(context.reference);
27
+ break;
22
28
  }
23
- return null;
29
+ if (component) {
30
+ component.addTag("parser/ENCasualTimeParser");
31
+ }
32
+ return component;
24
33
  }
25
34
  }
26
35
  //# sourceMappingURL=ENCasualTimeParser.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ENCasualTimeParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENCasualTimeParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,KAAK,gBAAgB,MAAM,kCAAkC,CAAC;AAErE,MAAM,OAAO,GAAG,iFAAiF,CAAC;AAElG,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,sCAAsC;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,OAAO,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACzD,KAAK,SAAS,CAAC;YACf,KAAK,OAAO;gBACR,OAAO,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACvD,KAAK,UAAU;gBACX,OAAO,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACxD,KAAK,SAAS;gBACV,OAAO,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACvD,KAAK,MAAM,CAAC;YACZ,KAAK,QAAQ;gBACT,OAAO,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACvD;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}
1
+ {"version":3,"file":"ENCasualTimeParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENCasualTimeParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,KAAK,gBAAgB,MAAM,kCAAkC,CAAC;AAErE,MAAM,OAAO,GAAG,iFAAiF,CAAC;AAElG,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,sCAAsC;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"}
@@ -15,33 +15,34 @@ export default class ENTimeExpressionParser extends AbstractTimeExpressionParser
15
15
  }
16
16
  extractPrimaryTimeComponents(context, match) {
17
17
  const components = super.extractPrimaryTimeComponents(context, match);
18
- if (components) {
19
- if (match[0].endsWith("night")) {
20
- const hour = components.get("hour");
21
- if (hour >= 6 && hour < 12) {
22
- components.assign("hour", components.get("hour") + 12);
23
- components.assign("meridiem", Meridiem.PM);
24
- }
25
- else if (hour < 6) {
26
- components.assign("meridiem", Meridiem.AM);
27
- }
28
- }
29
- if (match[0].endsWith("afternoon")) {
18
+ if (!components) {
19
+ return components;
20
+ }
21
+ if (match[0].endsWith("night")) {
22
+ const hour = components.get("hour");
23
+ if (hour >= 6 && hour < 12) {
24
+ components.assign("hour", components.get("hour") + 12);
30
25
  components.assign("meridiem", Meridiem.PM);
31
- const hour = components.get("hour");
32
- if (hour >= 0 && hour <= 6) {
33
- components.assign("hour", components.get("hour") + 12);
34
- }
35
26
  }
36
- if (match[0].endsWith("morning")) {
27
+ else if (hour < 6) {
37
28
  components.assign("meridiem", Meridiem.AM);
38
- const hour = components.get("hour");
39
- if (hour < 12) {
40
- components.assign("hour", components.get("hour"));
41
- }
42
29
  }
43
30
  }
44
- return components;
31
+ if (match[0].endsWith("afternoon")) {
32
+ components.assign("meridiem", Meridiem.PM);
33
+ const hour = components.get("hour");
34
+ if (hour >= 0 && hour <= 6) {
35
+ components.assign("hour", components.get("hour") + 12);
36
+ }
37
+ }
38
+ if (match[0].endsWith("morning")) {
39
+ components.assign("meridiem", Meridiem.AM);
40
+ const hour = components.get("hour");
41
+ if (hour < 12) {
42
+ components.assign("hour", components.get("hour"));
43
+ }
44
+ }
45
+ return components.addTag("parser/ENTimeExpressionParser");
45
46
  }
46
47
  }
47
48
  //# sourceMappingURL=ENTimeExpressionParser.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ENTimeExpressionParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeExpressionParser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AAEpG,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,4BAA4B;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;YACZ,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAC5B,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACpC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,GAAG,EAAE,EAAE;oBACxB,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;oBACvD,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;iBAC9C;qBAAM,IAAI,IAAI,GAAG,CAAC,EAAE;oBACjB,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;iBAC9C;aACJ;YAED,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;gBAChC,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC3C,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACpC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE;oBACxB,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;iBAC1D;aACJ;YAED,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBAC9B,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC3C,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACpC,IAAI,IAAI,GAAG,EAAE,EAAE;oBACX,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;iBACrD;aACJ;SACJ;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;CACJ"}
1
+ {"version":3,"file":"ENTimeExpressionParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeExpressionParser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AAEpG,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,4BAA4B;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,QAAQ,CAAC,EAAE,CAAC,CAAC;aAC9C;iBAAM,IAAI,IAAI,GAAG,CAAC,EAAE;gBACjB,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,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,QAAQ,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,QAAQ,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"}
@@ -1,7 +1,8 @@
1
1
  import { TIME_UNITS_PATTERN, parseTimeUnits, TIME_UNITS_NO_ABBR_PATTERN } from "../constants.js";
2
2
  import { ParsingComponents } from "../../../results.js";
3
3
  import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
4
- const PATTERN_WITHOUT_PREFIX = new RegExp(`(?:(?:about|around|roughly|approximately|just)\\s*(?:~\\s*)?)?(${TIME_UNITS_PATTERN})(?=\\W|$)`, "i");
4
+ const PATTERN_WITH_OPTIONAL_PREFIX = new RegExp(`(?:(?:within|in|for)\\s*)?` +
5
+ `(?:(?:about|around|roughly|approximately|just)\\s*(?:~\\s*)?)?(${TIME_UNITS_PATTERN})(?=\\W|$)`, "i");
5
6
  const PATTERN_WITH_PREFIX = new RegExp(`(?:within|in|for)\\s*` +
6
7
  `(?:(?:about|around|roughly|approximately|just)\\s*(?:~\\s*)?)?(${TIME_UNITS_PATTERN})(?=\\W|$)`, "i");
7
8
  const PATTERN_WITH_PREFIX_STRICT = new RegExp(`(?:within|in|for)\\s*` +
@@ -15,7 +16,7 @@ export default class ENTimeUnitWithinFormatParser extends AbstractParserWithWord
15
16
  if (this.strictMode) {
16
17
  return PATTERN_WITH_PREFIX_STRICT;
17
18
  }
18
- return context.option.forwardDate ? PATTERN_WITHOUT_PREFIX : PATTERN_WITH_PREFIX;
19
+ return context.option.forwardDate ? PATTERN_WITH_OPTIONAL_PREFIX : PATTERN_WITH_PREFIX;
19
20
  }
20
21
  innerExtract(context, match) {
21
22
  const timeUnits = parseTimeUnits(match[1]);
@@ -1 +1 @@
1
- {"version":3,"file":"ENTimeUnitWithinFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeUnitWithinFormatParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAE9F,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAEhH,MAAM,sBAAsB,GAAG,IAAI,MAAM,CACrC,kEAAkE,kBAAkB,YAAY,EAChG,GAAG,CACN,CAAC;AAEF,MAAM,mBAAmB,GAAG,IAAI,MAAM,CAClC,uBAAuB;IACnB,kEAAkE,kBAAkB,YAAY,EACpG,GAAG,CACN,CAAC;AAEF,MAAM,0BAA0B,GAAG,IAAI,MAAM,CACzC,uBAAuB;IACnB,kEAAkE,0BAA0B,YAAY,EAC5G,GAAG,CACN,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,4BAA6B,SAAQ,sCAAsC;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,sBAAsB,CAAC,CAAC,CAAC,mBAAmB,CAAC;IACrF,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,OAAO,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;CACJ"}
1
+ {"version":3,"file":"ENTimeUnitWithinFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeUnitWithinFormatParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAE9F,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAEhH,MAAM,4BAA4B,GAAG,IAAI,MAAM,CAC3C,4BAA4B;IACxB,kEAAkE,kBAAkB,YAAY,EACpG,GAAG,CACN,CAAC;AAEF,MAAM,mBAAmB,GAAG,IAAI,MAAM,CAClC,uBAAuB;IACnB,kEAAkE,kBAAkB,YAAY,EACpG,GAAG,CACN,CAAC;AAEF,MAAM,0BAA0B,GAAG,IAAI,MAAM,CACzC,uBAAuB;IACnB,kEAAkE,0BAA0B,YAAY,EAC5G,GAAG,CACN,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,4BAA6B,SAAQ,sCAAsC;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,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,OAAO,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;CACJ"}
@@ -0,0 +1,11 @@
1
+ import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
2
+ import { ParsingContext } from "../../../chrono.js";
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,19 @@
1
+ import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
2
+ import { REGEX_PARTS } from "../constants.js";
3
+ export class AbstractParserWithLeftBoundaryChecking extends AbstractParserWithWordBoundaryChecking {
4
+ patternLeftBoundary() {
5
+ return REGEX_PARTS.leftBoundary;
6
+ }
7
+ innerPattern(context) {
8
+ return new RegExp(this.innerPatternString(context), REGEX_PARTS.flags);
9
+ }
10
+ innerPatternHasChange(context, currentInnerPattern) {
11
+ return false;
12
+ }
13
+ }
14
+ export class AbstractParserWithLeftRightBoundaryChecking extends AbstractParserWithLeftBoundaryChecking {
15
+ innerPattern(context) {
16
+ return new RegExp(`${this.innerPatternString(context)}${REGEX_PARTS.rightBoundary}`, REGEX_PARTS.flags);
17
+ }
18
+ }
19
+ //# sourceMappingURL=AbstractParserWithWordBoundaryChecking.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"AbstractParserWithWordBoundaryChecking.js","sourceRoot":"","sources":["../../../../../src/locales/ru/parsers/AbstractParserWithWordBoundaryChecking.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAG3C,MAAM,OAAgB,sCAAuC,SAAQ,sCAAsC;IAGvG,mBAAmB;QACf,OAAO,WAAW,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,YAAY,CAAC,OAAuB;QAChC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;IAC3E,CAAC;IAED,qBAAqB,CAAC,OAAuB,EAAE,mBAA2B;QACtE,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AAED,MAAM,OAAgB,2CAA4C,SAAQ,sCAAsC;IAC5G,YAAY,CAAC,OAAuB;QAChC,OAAO,IAAI,MAAM,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,GAAG,WAAW,CAAC,aAAa,EAAE,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;IAC5G,CAAC;CACJ"}
@@ -1,8 +1,7 @@
1
1
  import { ParsingContext } from "../../../chrono.js";
2
2
  import { ParsingComponents, ParsingResult } from "../../../results.js";
3
- import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
4
- export default class RUCasualDateParser extends AbstractParserWithWordBoundaryChecking {
5
- patternLeftBoundary(): string;
6
- innerPattern(context: ParsingContext): RegExp;
3
+ import { AbstractParserWithLeftRightBoundaryChecking } from "./AbstractParserWithWordBoundaryChecking.js";
4
+ export default class RUCasualDateParser extends AbstractParserWithLeftRightBoundaryChecking {
5
+ innerPatternString(context: ParsingContext): string;
7
6
  innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents | ParsingResult;
8
7
  }
@@ -1,13 +1,8 @@
1
- import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
2
1
  import * as references from "../../../common/casualReferences.js";
3
- import { REGEX_PARTS } from "../constants.js";
4
- const PATTERN = new RegExp(`(?:с|со)?\\s*(сегодня|вчера|завтра|послезавтра|послепослезавтра|позапозавчера|позавчера)${REGEX_PARTS.rightBoundary}`, REGEX_PARTS.flags);
5
- export default class RUCasualDateParser extends AbstractParserWithWordBoundaryChecking {
6
- patternLeftBoundary() {
7
- return REGEX_PARTS.leftBoundary;
8
- }
9
- innerPattern(context) {
10
- return PATTERN;
2
+ import { AbstractParserWithLeftRightBoundaryChecking } from "./AbstractParserWithWordBoundaryChecking.js";
3
+ export default class RUCasualDateParser extends AbstractParserWithLeftRightBoundaryChecking {
4
+ innerPatternString(context) {
5
+ return `(?:с|со)?\\s*(сегодня|вчера|завтра|послезавтра|послепослезавтра|позапозавчера|позавчера)`;
11
6
  }
12
7
  innerExtract(context, match) {
13
8
  const lowerText = match[1].toLowerCase();
@@ -1 +1 @@
1
- {"version":3,"file":"RUCasualDateParser.js","sourceRoot":"","sources":["../../../../../src/locales/ru/parsers/RUCasualDateParser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,KAAK,UAAU,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,2FAA2F,WAAW,CAAC,aAAa,EAAE,EACtH,WAAW,CAAC,KAAK,CACpB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,sCAAsC;IAClF,mBAAmB;QACf,OAAO,WAAW,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,YAAY,CAAC,OAAuB;QAChC,OAAO,OAAO,CAAC;IACnB,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"}
1
+ {"version":3,"file":"RUCasualDateParser.js","sourceRoot":"","sources":["../../../../../src/locales/ru/parsers/RUCasualDateParser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,UAAU,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,2CAA2C,EAAE,MAAM,0CAA0C,CAAC;AAEvG,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,2CAA2C;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"}
@@ -1,7 +1,6 @@
1
1
  import { ParsingContext } from "../../../chrono.js";
2
- import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
3
- export default class RUCasualTimeParser extends AbstractParserWithWordBoundaryChecking {
4
- patternLeftBoundary(): string;
5
- innerPattern(): RegExp;
2
+ import { AbstractParserWithLeftRightBoundaryChecking } from "./AbstractParserWithWordBoundaryChecking.js";
3
+ export default class RUCasualTimeParser extends AbstractParserWithLeftRightBoundaryChecking {
4
+ innerPatternString(context: ParsingContext): string;
6
5
  innerExtract(context: ParsingContext, match: RegExpMatchArray): import("../index.js").ParsingComponents;
7
6
  }
@@ -1,16 +1,10 @@
1
- import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
2
1
  import * as references from "../../../common/casualReferences.js";
3
2
  import { assignSimilarDate } from "../../../utils/dayjs.js";
4
3
  import dayjs from "dayjs";
5
- import { REGEX_PARTS } from "../constants.js";
6
- const PATTERN = new RegExp(`(сейчас|прошлым\\s*вечером|прошлой\\s*ночью|следующей\\s*ночью|сегодня\\s*ночью|этой\\s*ночью|ночью|этим утром|утром|утра|в\\s*полдень|вечером|вечера|в\\s*полночь)` +
7
- `${REGEX_PARTS.rightBoundary}`, REGEX_PARTS.flags);
8
- export default class RUCasualTimeParser extends AbstractParserWithWordBoundaryChecking {
9
- patternLeftBoundary() {
10
- return REGEX_PARTS.leftBoundary;
11
- }
12
- innerPattern() {
13
- return PATTERN;
4
+ import { AbstractParserWithLeftRightBoundaryChecking } from "./AbstractParserWithWordBoundaryChecking.js";
5
+ export default class RUCasualTimeParser extends AbstractParserWithLeftRightBoundaryChecking {
6
+ innerPatternString(context) {
7
+ return `(сейчас|прошлым\\s*вечером|прошлой\\s*ночью|следующей\\s*ночью|сегодня\\s*ночью|этой\\s*ночью|ночью|этим утром|утром|утра|в\\s*полдень|вечером|вечера|в\\s*полночь)`;
14
8
  }
15
9
  innerExtract(context, match) {
16
10
  let targetDate = dayjs(context.refDate);
@@ -1 +1 @@
1
- {"version":3,"file":"RUCasualTimeParser.js","sourceRoot":"","sources":["../../../../../src/locales/ru/parsers/RUCasualTimeParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,KAAK,UAAU,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,qKAAqK;IACjK,GAAG,WAAW,CAAC,aAAa,EAAE,EAClC,WAAW,CAAC,KAAK,CACpB,CAAC;AACF,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,sCAAsC;IAClF,mBAAmB;QACf,OAAO,WAAW,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,IAAI,UAAU,GAAG,KAAK,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,iBAAiB,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"}
1
+ {"version":3,"file":"RUCasualTimeParser.js","sourceRoot":"","sources":["../../../../../src/locales/ru/parsers/RUCasualTimeParser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,UAAU,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,2CAA2C,EAAE,MAAM,0CAA0C,CAAC;AAEvG,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,2CAA2C;IACvF,kBAAkB,CAAC,OAAuB;QACtC,OAAO,qKAAqK,CAAC;IACjL,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,IAAI,UAAU,GAAG,KAAK,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,iBAAiB,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"}
@@ -1,8 +1,7 @@
1
1
  import { ParsingContext } from "../../../chrono.js";
2
2
  import { ParsingResult } from "../../../results.js";
3
- import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
4
- export default class RUMonthNameLittleEndianParser extends AbstractParserWithWordBoundaryChecking {
5
- patternLeftBoundary(): string;
6
- innerPattern(): RegExp;
3
+ import { AbstractParserWithLeftRightBoundaryChecking } from "./AbstractParserWithWordBoundaryChecking.js";
4
+ export default class RUMonthNameLittleEndianParser extends AbstractParserWithLeftRightBoundaryChecking {
5
+ innerPatternString(context: ParsingContext): string;
7
6
  innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingResult;
8
7
  }
@@ -1,31 +1,26 @@
1
1
  import { findYearClosestToRef } from "../../../calculation/years.js";
2
- import { MONTH_DICTIONARY, REGEX_PARTS } from "../constants.js";
2
+ import { MONTH_DICTIONARY } from "../constants.js";
3
3
  import { YEAR_PATTERN, parseYear } from "../constants.js";
4
4
  import { ORDINAL_NUMBER_PATTERN, parseOrdinalNumberPattern } from "../constants.js";
5
5
  import { matchAnyPattern } from "../../../utils/pattern.js";
6
- import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
7
- const PATTERN = new RegExp(`(?:с)?\\s*(${ORDINAL_NUMBER_PATTERN})` +
8
- `(?:` +
9
- `\\s{0,3}(?:по|-|–|до)?\\s{0,3}` +
10
- `(${ORDINAL_NUMBER_PATTERN})` +
11
- `)?` +
12
- `(?:-|\\/|\\s{0,3}(?:of)?\\s{0,3})` +
13
- `(${matchAnyPattern(MONTH_DICTIONARY)})` +
14
- `(?:` +
15
- `(?:-|\\/|,?\\s{0,3})` +
16
- `(${YEAR_PATTERN}(?![^\\s]\\d))` +
17
- `)?` +
18
- `${REGEX_PARTS.rightBoundary}`, REGEX_PARTS.flags);
6
+ import { AbstractParserWithLeftRightBoundaryChecking } from "./AbstractParserWithWordBoundaryChecking.js";
19
7
  const DATE_GROUP = 1;
20
8
  const DATE_TO_GROUP = 2;
21
9
  const MONTH_NAME_GROUP = 3;
22
10
  const YEAR_GROUP = 4;
23
- export default class RUMonthNameLittleEndianParser extends AbstractParserWithWordBoundaryChecking {
24
- patternLeftBoundary() {
25
- return REGEX_PARTS.leftBoundary;
26
- }
27
- innerPattern() {
28
- return PATTERN;
11
+ export default class RUMonthNameLittleEndianParser extends AbstractParserWithLeftRightBoundaryChecking {
12
+ innerPatternString(context) {
13
+ return `(?:с)?\\s*(${ORDINAL_NUMBER_PATTERN})` +
14
+ `(?:` +
15
+ `\\s{0,3}(?:по|-|–|до)?\\s{0,3}` +
16
+ `(${ORDINAL_NUMBER_PATTERN})` +
17
+ `)?` +
18
+ `(?:-|\\/|\\s{0,3}(?:of)?\\s{0,3})` +
19
+ `(${matchAnyPattern(MONTH_DICTIONARY)})` +
20
+ `(?:` +
21
+ `(?:-|\\/|,?\\s{0,3})` +
22
+ `(${YEAR_PATTERN}(?![^\\s]\\d))` +
23
+ `)?`;
29
24
  }
30
25
  innerExtract(context, match) {
31
26
  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,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAGhH,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,cAAc,sBAAsB,GAAG;IACnC,KAAK;IACD,gCAAgC;IAChC,IAAI,sBAAsB,GAAG;IACjC,IAAI;IACJ,mCAAmC;IACnC,IAAI,eAAe,CAAC,gBAAgB,CAAC,GAAG;IACxC,KAAK;IACD,sBAAsB;IACtB,IAAI,YAAY,gBAAgB;IACpC,IAAI;IACR,GAAG,WAAW,CAAC,aAAa,EAAE,EAC9B,WAAW,CAAC,KAAK,CACpB,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,MAAM,CAAC,OAAO,OAAO,6BAA8B,SAAQ,sCAAsC;IAC7F,mBAAmB;QACf,OAAO,WAAW,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,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,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QACtE,MAAM,GAAG,GAAG,yBAAyB,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,SAAS,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,oBAAoB,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,yBAAyB,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"}
1
+ {"version":3,"file":"RUMonthNameLittleEndianParser.js","sourceRoot":"","sources":["../../../../../src/locales/ru/parsers/RUMonthNameLittleEndianParser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,2CAA2C,EAAE,MAAM,0CAA0C,CAAC;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,MAAM,CAAC,OAAO,OAAO,6BAA8B,SAAQ,2CAA2C;IAClG,kBAAkB,CAAC,OAAuB;QAEtC,OAAO,cAAc,sBAAsB,GAAG;YAC1C,KAAK;YACD,gCAAgC;YAChC,IAAI,sBAAsB,GAAG;YACjC,IAAI;YACA,mCAAmC;YACnC,IAAI,eAAe,CAAC,gBAAgB,CAAC,GAAG;YAC5C,KAAK;YACD,sBAAsB;YACtB,IAAI,YAAY,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,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QACtE,MAAM,GAAG,GAAG,yBAAyB,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,SAAS,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,oBAAoB,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,yBAAyB,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"}
@@ -1,7 +1,6 @@
1
1
  import { ParsingContext } from "../../../chrono.js";
2
- import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
3
- export default class RUMonthNameParser extends AbstractParserWithWordBoundaryChecking {
4
- patternLeftBoundary(): string;
5
- innerPattern(): RegExp;
2
+ import { AbstractParserWithLeftBoundaryChecking } from "./AbstractParserWithWordBoundaryChecking.js";
3
+ export default class RUMonthNameParser extends AbstractParserWithLeftBoundaryChecking {
4
+ innerPatternString(context: ParsingContext): string;
6
5
  innerExtract(context: ParsingContext, match: RegExpMatchArray): import("../index.js").ParsingResult;
7
6
  }
@@ -1,23 +1,19 @@
1
- import { FULL_MONTH_NAME_DICTIONARY, MONTH_DICTIONARY, REGEX_PARTS } from "../constants.js";
1
+ import { FULL_MONTH_NAME_DICTIONARY, MONTH_DICTIONARY } from "../constants.js";
2
2
  import { findYearClosestToRef } from "../../../calculation/years.js";
3
3
  import { matchAnyPattern } from "../../../utils/pattern.js";
4
4
  import { YEAR_PATTERN, parseYear } from "../constants.js";
5
- import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
6
- const PATTERN = new RegExp(`((?:в)\\s*)?` +
7
- `(${matchAnyPattern(MONTH_DICTIONARY)})` +
8
- `\\s*` +
9
- `(?:` +
10
- `[,-]?\\s*(${YEAR_PATTERN})?` +
11
- `)?` +
12
- `(?=[^\\s\\w]|\\s+[^0-9]|\\s+$|$)`, REGEX_PARTS.flags);
5
+ import { AbstractParserWithLeftBoundaryChecking } from "./AbstractParserWithWordBoundaryChecking.js";
13
6
  const MONTH_NAME_GROUP = 2;
14
7
  const YEAR_GROUP = 3;
15
- export default class RUMonthNameParser extends AbstractParserWithWordBoundaryChecking {
16
- patternLeftBoundary() {
17
- return REGEX_PARTS.leftBoundary;
18
- }
19
- innerPattern() {
20
- return PATTERN;
8
+ export default class RUMonthNameParser extends AbstractParserWithLeftBoundaryChecking {
9
+ innerPatternString(context) {
10
+ return (`((?:в)\\s*)?` +
11
+ `(${matchAnyPattern(MONTH_DICTIONARY)})` +
12
+ `\\s*` +
13
+ `(?:` +
14
+ `[,-]?\\s*(${YEAR_PATTERN})?` +
15
+ `)?` +
16
+ `(?=[^\\s\\w]|\\s+[^0-9]|\\s+$|$)`);
21
17
  }
22
18
  innerExtract(context, match) {
23
19
  const monthName = match[MONTH_NAME_GROUP].toLowerCase();
@@ -1 +1 @@
1
- {"version":3,"file":"RUMonthNameParser.js","sourceRoot":"","sources":["../../../../../src/locales/ru/parsers/RUMonthNameParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAEhH,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,cAAc;IACV,IAAI,eAAe,CAAC,gBAAgB,CAAC,GAAG;IACxC,MAAM;IACN,KAAK;IACL,aAAa,YAAY,IAAI;IAC7B,IAAI;IACJ,kCAAkC,EACtC,WAAW,CAAC,KAAK,CACpB,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,UAAU,GAAG,CAAC,CAAC;AAQrB,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,sCAAsC;IACjF,mBAAmB;QACf,OAAO,WAAW,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,CAAC;QAGxD,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,SAAS,CAAC,EAAE;YAChE,OAAO,IAAI,CAAC;SACf;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACvF,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAE7B,MAAM,KAAK,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC1C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAEpC,IAAI,KAAK,CAAC,UAAU,CAAC,EAAE;YACnB,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;YAC1C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SACrC;aAAM;YACH,MAAM,IAAI,GAAG,oBAAoB,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;YAC7D,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SACpC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}
1
+ {"version":3,"file":"RUMonthNameParser.js","sourceRoot":"","sources":["../../../../../src/locales/ru/parsers/RUMonthNameParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAE5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,sCAAsC,EAAE,MAAM,0CAA0C,CAAC;AAElG,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,UAAU,GAAG,CAAC,CAAC;AAQrB,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,sCAAsC;IACjF,kBAAkB,CAAC,OAAuB;QACtC,OAAO,CACH,cAAc;YACd,IAAI,eAAe,CAAC,gBAAgB,CAAC,GAAG;YACxC,MAAM;YACN,KAAK;YACL,aAAa,YAAY,IAAI;YAC7B,IAAI;YACJ,kCAAkC,CACrC,CAAC;IACN,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,CAAC;QAGxD,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,SAAS,CAAC,EAAE;YAChE,OAAO,IAAI,CAAC;SACf;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACvF,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAE7B,MAAM,KAAK,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC1C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAEpC,IAAI,KAAK,CAAC,UAAU,CAAC,EAAE;YACnB,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;YAC1C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SACrC;aAAM;YACH,MAAM,IAAI,GAAG,oBAAoB,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;YAC7D,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SACpC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}
@@ -1,8 +1,7 @@
1
1
  import { ParsingContext } from "../../../chrono.js";
2
2
  import { ParsingComponents } from "../../../results.js";
3
- import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
4
- export default class RURelativeDateFormatParser extends AbstractParserWithWordBoundaryChecking {
5
- patternLeftBoundary(): string;
6
- innerPattern(): RegExp;
3
+ import { AbstractParserWithLeftRightBoundaryChecking } from "./AbstractParserWithWordBoundaryChecking.js";
4
+ export default class RURelativeDateFormatParser extends AbstractParserWithLeftRightBoundaryChecking {
5
+ innerPatternString(context: ParsingContext): string;
7
6
  innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents;
8
7
  }
@@ -1,17 +1,13 @@
1
- import { REGEX_PARTS, TIME_UNIT_DICTIONARY } from "../constants.js";
1
+ import { TIME_UNIT_DICTIONARY } from "../constants.js";
2
2
  import { ParsingComponents } from "../../../results.js";
3
3
  import dayjs from "dayjs";
4
- import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
5
4
  import { matchAnyPattern } from "../../../utils/pattern.js";
6
- const PATTERN = new RegExp(`(в прошлом|на прошлой|на следующей|в следующем|на этой|в этом)\\s*(${matchAnyPattern(TIME_UNIT_DICTIONARY)})(?=\\s*)${REGEX_PARTS.rightBoundary}`, REGEX_PARTS.flags);
5
+ import { AbstractParserWithLeftRightBoundaryChecking } from "./AbstractParserWithWordBoundaryChecking.js";
7
6
  const MODIFIER_WORD_GROUP = 1;
8
7
  const RELATIVE_WORD_GROUP = 2;
9
- export default class RURelativeDateFormatParser extends AbstractParserWithWordBoundaryChecking {
10
- patternLeftBoundary() {
11
- return REGEX_PARTS.leftBoundary;
12
- }
13
- innerPattern() {
14
- return PATTERN;
8
+ export default class RURelativeDateFormatParser extends AbstractParserWithLeftRightBoundaryChecking {
9
+ innerPatternString(context) {
10
+ return `(в прошлом|на прошлой|на следующей|в следующем|на этой|в этом)\\s*(${matchAnyPattern(TIME_UNIT_DICTIONARY)})`;
15
11
  }
16
12
  innerExtract(context, match) {
17
13
  const modifier = match[MODIFIER_WORD_GROUP].toLowerCase();
@@ -1 +1 @@
1
- {"version":3,"file":"RURelativeDateFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/ru/parsers/RURelativeDateFormatParser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RURelativeDateFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/ru/parsers/RURelativeDateFormatParser.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,7 @@
1
1
  import { ParsingContext } from "../../../chrono.js";
2
2
  import { ParsingComponents } from "../../../results.js";
3
- import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
4
- export default class RUTimeUnitAgoFormatParser extends AbstractParserWithWordBoundaryChecking {
5
- patternLeftBoundary(): string;
6
- innerPattern(): RegExp;
3
+ import { AbstractParserWithLeftBoundaryChecking } from "./AbstractParserWithWordBoundaryChecking.js";
4
+ export default class RUTimeUnitAgoFormatParser extends AbstractParserWithLeftBoundaryChecking {
5
+ innerPatternString(context: ParsingContext): string;
7
6
  innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents;
8
7
  }
@@ -1,14 +1,10 @@
1
- import { parseTimeUnits, REGEX_PARTS, TIME_UNITS_PATTERN } from "../constants.js";
1
+ import { parseTimeUnits, TIME_UNITS_PATTERN } from "../constants.js";
2
2
  import { ParsingComponents } from "../../../results.js";
3
- import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
4
3
  import { reverseTimeUnits } from "../../../utils/timeunits.js";
5
- const PATTERN = new RegExp(`(${TIME_UNITS_PATTERN})\\s{0,5}назад(?=(?:\\W|$))`, REGEX_PARTS.flags);
6
- export default class RUTimeUnitAgoFormatParser extends AbstractParserWithWordBoundaryChecking {
7
- patternLeftBoundary() {
8
- return REGEX_PARTS.leftBoundary;
9
- }
10
- innerPattern() {
11
- return PATTERN;
4
+ import { AbstractParserWithLeftBoundaryChecking } from "./AbstractParserWithWordBoundaryChecking.js";
5
+ export default class RUTimeUnitAgoFormatParser extends AbstractParserWithLeftBoundaryChecking {
6
+ innerPatternString(context) {
7
+ return `(${TIME_UNITS_PATTERN})\\s{0,5}назад(?=(?:\\W|$))`;
12
8
  }
13
9
  innerExtract(context, match) {
14
10
  const timeUnits = parseTimeUnits(match[1]);
@@ -1 +1 @@
1
- {"version":3,"file":"RUTimeUnitAgoFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/ru/parsers/RUTimeUnitAgoFormatParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,IAAI,kBAAkB,6BAA6B,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;AAEnG,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,sCAAsC;IACzF,mBAAmB;QACf,OAAO,WAAW,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,eAAe,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAEpD,OAAO,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IAC7F,CAAC;CACJ"}
1
+ {"version":3,"file":"RUTimeUnitAgoFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/ru/parsers/RUTimeUnitAgoFormatParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,sCAAsC,EAAE,MAAM,0CAA0C,CAAC;AAElG,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,sCAAsC;IACzF,kBAAkB,CAAC,OAAuB;QACtC,OAAO,IAAI,kBAAkB,6BAA6B,CAAC;IAC/D,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,eAAe,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAEpD,OAAO,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IAC7F,CAAC;CACJ"}