chrono-node 2.8.4 → 2.9.0

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 (480) hide show
  1. package/dist/cjs/calculation/duration.d.ts +5 -0
  2. package/dist/cjs/calculation/duration.js +6 -0
  3. package/dist/cjs/calculation/duration.js.map +1 -1
  4. package/dist/cjs/calculation/mergingCalculation.js +5 -4
  5. package/dist/cjs/calculation/mergingCalculation.js.map +1 -1
  6. package/dist/cjs/calculation/weekdays.js +1 -2
  7. package/dist/cjs/calculation/weekdays.js.map +1 -1
  8. package/dist/cjs/calculation/years.js +11 -16
  9. package/dist/cjs/calculation/years.js.map +1 -1
  10. package/dist/cjs/common/casualReferences.d.ts +1 -1
  11. package/dist/cjs/common/casualReferences.js +29 -31
  12. package/dist/cjs/common/casualReferences.js.map +1 -1
  13. package/dist/cjs/common/parsers/AbstractTimeExpressionParser.js +3 -0
  14. package/dist/cjs/common/parsers/AbstractTimeExpressionParser.js.map +1 -1
  15. package/dist/cjs/common/refiners/AbstractMergeDateRangeRefiner.js +20 -19
  16. package/dist/cjs/common/refiners/AbstractMergeDateRangeRefiner.js.map +1 -1
  17. package/dist/cjs/common/refiners/ForwardDateRefiner.js +16 -24
  18. package/dist/cjs/common/refiners/ForwardDateRefiner.js.map +1 -1
  19. package/dist/cjs/index.d.ts +3 -1
  20. package/dist/cjs/index.js +5 -1
  21. package/dist/cjs/index.js.map +1 -1
  22. package/dist/cjs/locales/de/constants.d.ts +4 -4
  23. package/dist/cjs/locales/de/constants.js +5 -5
  24. package/dist/cjs/locales/de/constants.js.map +1 -1
  25. package/dist/cjs/locales/de/parsers/DECasualDateParser.js +18 -15
  26. package/dist/cjs/locales/de/parsers/DECasualDateParser.js.map +1 -1
  27. package/dist/cjs/locales/de/parsers/DECasualTimeParser.js +4 -9
  28. package/dist/cjs/locales/de/parsers/DECasualTimeParser.js.map +1 -1
  29. package/dist/cjs/locales/de/parsers/DETimeUnitRelativeFormatParser.js +2 -2
  30. package/dist/cjs/locales/de/parsers/DETimeUnitRelativeFormatParser.js.map +1 -1
  31. package/dist/cjs/locales/de/parsers/DETimeUnitWithinFormatParser.js +1 -1
  32. package/dist/cjs/locales/de/parsers/DETimeUnitWithinFormatParser.js.map +1 -1
  33. package/dist/cjs/locales/en/constants.d.ts +5 -6
  34. package/dist/cjs/locales/en/constants.js +5 -5
  35. package/dist/cjs/locales/en/constants.js.map +1 -1
  36. package/dist/cjs/locales/en/parsers/ENCasualDateParser.js +7 -9
  37. package/dist/cjs/locales/en/parsers/ENCasualDateParser.js.map +1 -1
  38. package/dist/cjs/locales/en/parsers/ENRelativeDateFormatParser.js +14 -18
  39. package/dist/cjs/locales/en/parsers/ENRelativeDateFormatParser.js.map +1 -1
  40. package/dist/cjs/locales/en/parsers/ENTimeUnitAgoFormatParser.js +1 -1
  41. package/dist/cjs/locales/en/parsers/ENTimeUnitAgoFormatParser.js.map +1 -1
  42. package/dist/cjs/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js +1 -1
  43. package/dist/cjs/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js.map +1 -1
  44. package/dist/cjs/locales/en/parsers/ENTimeUnitLaterFormatParser.js +1 -1
  45. package/dist/cjs/locales/en/parsers/ENTimeUnitLaterFormatParser.js.map +1 -1
  46. package/dist/cjs/locales/en/parsers/ENTimeUnitWithinFormatParser.js +1 -5
  47. package/dist/cjs/locales/en/parsers/ENTimeUnitWithinFormatParser.js.map +1 -1
  48. package/dist/cjs/locales/en/refiners/ENMergeRelativeAfterDateRefiner.js +3 -3
  49. package/dist/cjs/locales/en/refiners/ENMergeRelativeAfterDateRefiner.js.map +1 -1
  50. package/dist/cjs/locales/en/refiners/ENMergeRelativeFollowByDateRefiner.js +1 -1
  51. package/dist/cjs/locales/en/refiners/ENMergeRelativeFollowByDateRefiner.js.map +1 -1
  52. package/dist/cjs/locales/es/constants.d.ts +4 -5
  53. package/dist/cjs/locales/es/constants.js +4 -4
  54. package/dist/cjs/locales/es/constants.js.map +1 -1
  55. package/dist/cjs/locales/es/parsers/ESCasualTimeParser.js +6 -7
  56. package/dist/cjs/locales/es/parsers/ESCasualTimeParser.js.map +1 -1
  57. package/dist/cjs/locales/es/parsers/ESTimeUnitWithinFormatParser.js +1 -1
  58. package/dist/cjs/locales/es/parsers/ESTimeUnitWithinFormatParser.js.map +1 -1
  59. package/dist/cjs/locales/fr/constants.d.ts +4 -5
  60. package/dist/cjs/locales/fr/constants.js +4 -4
  61. package/dist/cjs/locales/fr/constants.js.map +1 -1
  62. package/dist/cjs/locales/fr/parsers/FRCasualDateParser.js +6 -9
  63. package/dist/cjs/locales/fr/parsers/FRCasualDateParser.js.map +1 -1
  64. package/dist/cjs/locales/fr/parsers/FRTimeUnitAgoFormatParser.js +3 -3
  65. package/dist/cjs/locales/fr/parsers/FRTimeUnitAgoFormatParser.js.map +1 -1
  66. package/dist/cjs/locales/fr/parsers/FRTimeUnitRelativeFormatParser.js +2 -2
  67. package/dist/cjs/locales/fr/parsers/FRTimeUnitRelativeFormatParser.js.map +1 -1
  68. package/dist/cjs/locales/fr/parsers/FRTimeUnitWithinFormatParser.js +1 -1
  69. package/dist/cjs/locales/fr/parsers/FRTimeUnitWithinFormatParser.js.map +1 -1
  70. package/dist/cjs/locales/it/constants.d.ts +4 -4
  71. package/dist/cjs/locales/it/constants.js +4 -4
  72. package/dist/cjs/locales/it/constants.js.map +1 -1
  73. package/dist/cjs/locales/it/parsers/ITCasualDateParser.d.ts +1 -1
  74. package/dist/cjs/locales/it/parsers/ITCasualDateParser.js +9 -11
  75. package/dist/cjs/locales/it/parsers/ITCasualDateParser.js.map +1 -1
  76. package/dist/cjs/locales/it/parsers/ITCasualTimeParser.d.ts +1 -1
  77. package/dist/cjs/locales/it/parsers/ITCasualTimeParser.js +8 -9
  78. package/dist/cjs/locales/it/parsers/ITCasualTimeParser.js.map +1 -1
  79. package/dist/cjs/locales/it/parsers/ITRelativeDateFormatParser.js +14 -18
  80. package/dist/cjs/locales/it/parsers/ITRelativeDateFormatParser.js.map +1 -1
  81. package/dist/cjs/locales/it/parsers/ITTimeUnitAgoFormatParser.js +3 -3
  82. package/dist/cjs/locales/it/parsers/ITTimeUnitAgoFormatParser.js.map +1 -1
  83. package/dist/cjs/locales/it/parsers/ITTimeUnitCasualRelativeFormatParser.js +3 -3
  84. package/dist/cjs/locales/it/parsers/ITTimeUnitCasualRelativeFormatParser.js.map +1 -1
  85. package/dist/cjs/locales/it/parsers/ITTimeUnitLaterFormatParser.js +1 -1
  86. package/dist/cjs/locales/it/parsers/ITTimeUnitLaterFormatParser.js.map +1 -1
  87. package/dist/cjs/locales/it/parsers/ITTimeUnitWithinFormatParser.js +1 -1
  88. package/dist/cjs/locales/it/parsers/ITTimeUnitWithinFormatParser.js.map +1 -1
  89. package/dist/cjs/locales/it/refiners/ITMergeRelativeDateRefiner.js +3 -3
  90. package/dist/cjs/locales/it/refiners/ITMergeRelativeDateRefiner.js.map +1 -1
  91. package/dist/cjs/locales/ja/parsers/JPCasualDateParser.js +4 -8
  92. package/dist/cjs/locales/ja/parsers/JPCasualDateParser.js.map +1 -1
  93. package/dist/cjs/locales/ja/parsers/JPStandardParser.js +1 -6
  94. package/dist/cjs/locales/ja/parsers/JPStandardParser.js.map +1 -1
  95. package/dist/cjs/locales/ja/parsers/JPTimeExpressionParser.d.ts +1 -1
  96. package/dist/cjs/locales/ja/parsers/JPTimeExpressionParser.js +77 -187
  97. package/dist/cjs/locales/ja/parsers/JPTimeExpressionParser.js.map +1 -1
  98. package/dist/cjs/locales/nl/constants.d.ts +4 -4
  99. package/dist/cjs/locales/nl/constants.js +4 -4
  100. package/dist/cjs/locales/nl/constants.js.map +1 -1
  101. package/dist/cjs/locales/nl/parsers/NLCasualDateTimeParser.js +10 -9
  102. package/dist/cjs/locales/nl/parsers/NLCasualDateTimeParser.js.map +1 -1
  103. package/dist/cjs/locales/nl/parsers/NLCasualTimeParser.js +6 -7
  104. package/dist/cjs/locales/nl/parsers/NLCasualTimeParser.js.map +1 -1
  105. package/dist/cjs/locales/nl/parsers/NLRelativeDateFormatParser.js +14 -18
  106. package/dist/cjs/locales/nl/parsers/NLRelativeDateFormatParser.js.map +1 -1
  107. package/dist/cjs/locales/nl/parsers/NLTimeUnitAgoFormatParser.js +3 -3
  108. package/dist/cjs/locales/nl/parsers/NLTimeUnitAgoFormatParser.js.map +1 -1
  109. package/dist/cjs/locales/nl/parsers/NLTimeUnitCasualRelativeFormatParser.js +3 -3
  110. package/dist/cjs/locales/nl/parsers/NLTimeUnitCasualRelativeFormatParser.js.map +1 -1
  111. package/dist/cjs/locales/nl/parsers/NLTimeUnitLaterFormatParser.js +1 -1
  112. package/dist/cjs/locales/nl/parsers/NLTimeUnitLaterFormatParser.js.map +1 -1
  113. package/dist/cjs/locales/nl/parsers/NLTimeUnitWithinFormatParser.js +1 -1
  114. package/dist/cjs/locales/nl/parsers/NLTimeUnitWithinFormatParser.js.map +1 -1
  115. package/dist/cjs/locales/pt/parsers/PTCasualTimeParser.js +6 -7
  116. package/dist/cjs/locales/pt/parsers/PTCasualTimeParser.js.map +1 -1
  117. package/dist/cjs/locales/ru/constants.d.ts +4 -4
  118. package/dist/cjs/locales/ru/constants.js +7 -7
  119. package/dist/cjs/locales/ru/constants.js.map +1 -1
  120. package/dist/cjs/locales/ru/parsers/RUCasualTimeParser.js +6 -9
  121. package/dist/cjs/locales/ru/parsers/RUCasualTimeParser.js.map +1 -1
  122. package/dist/cjs/locales/ru/parsers/RURelativeDateFormatParser.js +14 -18
  123. package/dist/cjs/locales/ru/parsers/RURelativeDateFormatParser.js.map +1 -1
  124. package/dist/cjs/locales/ru/parsers/RUTimeUnitAgoFormatParser.js +3 -3
  125. package/dist/cjs/locales/ru/parsers/RUTimeUnitAgoFormatParser.js.map +1 -1
  126. package/dist/cjs/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js +3 -3
  127. package/dist/cjs/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js.map +1 -1
  128. package/dist/cjs/locales/ru/parsers/RUTimeUnitWithinFormatParser.js +1 -1
  129. package/dist/cjs/locales/ru/parsers/RUTimeUnitWithinFormatParser.js.map +1 -1
  130. package/dist/cjs/locales/sv/constants.d.ts +8 -4
  131. package/dist/cjs/locales/sv/constants.js +25 -7
  132. package/dist/cjs/locales/sv/constants.js.map +1 -1
  133. package/dist/cjs/locales/sv/index.js +2 -0
  134. package/dist/cjs/locales/sv/index.js.map +1 -1
  135. package/dist/cjs/locales/sv/parsers/SVCasualDateParser.js +14 -13
  136. package/dist/cjs/locales/sv/parsers/SVCasualDateParser.js.map +1 -1
  137. package/dist/cjs/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.d.ts +9 -0
  138. package/dist/cjs/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.js +34 -0
  139. package/dist/cjs/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.js.map +1 -0
  140. package/dist/cjs/locales/uk/constants.d.ts +4 -4
  141. package/dist/cjs/locales/uk/constants.js +8 -8
  142. package/dist/cjs/locales/uk/constants.js.map +1 -1
  143. package/dist/cjs/locales/uk/parsers/UKCasualTimeParser.js +6 -9
  144. package/dist/cjs/locales/uk/parsers/UKCasualTimeParser.js.map +1 -1
  145. package/dist/cjs/locales/uk/parsers/UKRelativeDateFormatParser.js +14 -18
  146. package/dist/cjs/locales/uk/parsers/UKRelativeDateFormatParser.js.map +1 -1
  147. package/dist/cjs/locales/uk/parsers/UKTimeUnitAgoFormatParser.js +3 -3
  148. package/dist/cjs/locales/uk/parsers/UKTimeUnitAgoFormatParser.js.map +1 -1
  149. package/dist/cjs/locales/uk/parsers/UKTimeUnitCasualRelativeFormatParser.js +3 -3
  150. package/dist/cjs/locales/uk/parsers/UKTimeUnitCasualRelativeFormatParser.js.map +1 -1
  151. package/dist/cjs/locales/uk/parsers/UKTimeUnitWithinFormatParser.js +1 -1
  152. package/dist/cjs/locales/uk/parsers/UKTimeUnitWithinFormatParser.js.map +1 -1
  153. package/dist/cjs/locales/zh/hans/parsers/ZHHansCasualDateParser.js +23 -27
  154. package/dist/cjs/locales/zh/hans/parsers/ZHHansCasualDateParser.js.map +1 -1
  155. package/dist/cjs/locales/zh/hans/parsers/ZHHansDateParser.js +2 -7
  156. package/dist/cjs/locales/zh/hans/parsers/ZHHansDateParser.js.map +1 -1
  157. package/dist/cjs/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.js +20 -21
  158. package/dist/cjs/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.js.map +1 -1
  159. package/dist/cjs/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.js +17 -22
  160. package/dist/cjs/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.js.map +1 -1
  161. package/dist/cjs/locales/zh/hans/parsers/ZHHansTimeExpressionParser.js +71 -76
  162. package/dist/cjs/locales/zh/hans/parsers/ZHHansTimeExpressionParser.js.map +1 -1
  163. package/dist/cjs/locales/zh/hans/parsers/ZHHansWeekdayParser.js +14 -19
  164. package/dist/cjs/locales/zh/hans/parsers/ZHHansWeekdayParser.js.map +1 -1
  165. package/dist/cjs/locales/zh/hant/parsers/ZHHantCasualDateParser.js +23 -27
  166. package/dist/cjs/locales/zh/hant/parsers/ZHHantCasualDateParser.js.map +1 -1
  167. package/dist/cjs/locales/zh/hant/parsers/ZHHantDateParser.js +2 -7
  168. package/dist/cjs/locales/zh/hant/parsers/ZHHantDateParser.js.map +1 -1
  169. package/dist/cjs/locales/zh/hant/parsers/ZHHantDeadlineFormatParser.js +20 -21
  170. package/dist/cjs/locales/zh/hant/parsers/ZHHantDeadlineFormatParser.js.map +1 -1
  171. package/dist/cjs/locales/zh/hant/parsers/ZHHantRelationWeekdayParser.js +17 -22
  172. package/dist/cjs/locales/zh/hant/parsers/ZHHantRelationWeekdayParser.js.map +1 -1
  173. package/dist/cjs/locales/zh/hant/parsers/ZHHantTimeExpressionParser.js +73 -78
  174. package/dist/cjs/locales/zh/hant/parsers/ZHHantTimeExpressionParser.js.map +1 -1
  175. package/dist/cjs/locales/zh/hant/parsers/ZHHantWeekdayParser.js +14 -19
  176. package/dist/cjs/locales/zh/hant/parsers/ZHHantWeekdayParser.js.map +1 -1
  177. package/dist/cjs/results.d.ts +3 -4
  178. package/dist/cjs/results.js +74 -60
  179. package/dist/cjs/results.js.map +1 -1
  180. package/dist/cjs/timezone.js +1 -6
  181. package/dist/cjs/timezone.js.map +1 -1
  182. package/dist/cjs/types.d.ts +1 -1
  183. package/dist/esm/calculation/duration.d.ts +5 -0
  184. package/dist/esm/calculation/duration.js +5 -0
  185. package/dist/esm/calculation/duration.js.map +1 -1
  186. package/dist/esm/calculation/mergingCalculation.js +5 -4
  187. package/dist/esm/calculation/mergingCalculation.js.map +1 -1
  188. package/dist/esm/calculation/weekdays.js +1 -2
  189. package/dist/esm/calculation/weekdays.js.map +1 -1
  190. package/dist/esm/calculation/years.js +11 -13
  191. package/dist/esm/calculation/years.js.map +1 -1
  192. package/dist/esm/common/casualReferences.d.ts +1 -1
  193. package/dist/esm/common/casualReferences.js +21 -20
  194. package/dist/esm/common/casualReferences.js.map +1 -1
  195. package/dist/esm/common/parsers/AbstractTimeExpressionParser.js +3 -0
  196. package/dist/esm/common/parsers/AbstractTimeExpressionParser.js.map +1 -1
  197. package/dist/esm/common/refiners/AbstractMergeDateRangeRefiner.js +20 -19
  198. package/dist/esm/common/refiners/AbstractMergeDateRangeRefiner.js.map +1 -1
  199. package/dist/esm/common/refiners/ForwardDateRefiner.js +16 -21
  200. package/dist/esm/common/refiners/ForwardDateRefiner.js.map +1 -1
  201. package/dist/esm/index.d.ts +3 -1
  202. package/dist/esm/index.js +3 -1
  203. package/dist/esm/index.js.map +1 -1
  204. package/dist/esm/locales/de/constants.d.ts +4 -4
  205. package/dist/esm/locales/de/constants.js +4 -4
  206. package/dist/esm/locales/de/constants.js.map +1 -1
  207. package/dist/esm/locales/de/parsers/DECasualDateParser.js +13 -10
  208. package/dist/esm/locales/de/parsers/DECasualDateParser.js.map +1 -1
  209. package/dist/esm/locales/de/parsers/DECasualTimeParser.js +3 -5
  210. package/dist/esm/locales/de/parsers/DECasualTimeParser.js.map +1 -1
  211. package/dist/esm/locales/de/parsers/DETimeUnitRelativeFormatParser.js +2 -2
  212. package/dist/esm/locales/de/parsers/DETimeUnitRelativeFormatParser.js.map +1 -1
  213. package/dist/esm/locales/de/parsers/DETimeUnitWithinFormatParser.js +2 -2
  214. package/dist/esm/locales/de/parsers/DETimeUnitWithinFormatParser.js.map +1 -1
  215. package/dist/esm/locales/en/constants.d.ts +5 -6
  216. package/dist/esm/locales/en/constants.js +7 -7
  217. package/dist/esm/locales/en/constants.js.map +1 -1
  218. package/dist/esm/locales/en/parsers/ENCasualDateParser.js +6 -5
  219. package/dist/esm/locales/en/parsers/ENCasualDateParser.js.map +1 -1
  220. package/dist/esm/locales/en/parsers/ENRelativeDateFormatParser.js +14 -15
  221. package/dist/esm/locales/en/parsers/ENRelativeDateFormatParser.js.map +1 -1
  222. package/dist/esm/locales/en/parsers/ENTimeUnitAgoFormatParser.js +2 -2
  223. package/dist/esm/locales/en/parsers/ENTimeUnitAgoFormatParser.js.map +1 -1
  224. package/dist/esm/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js +2 -2
  225. package/dist/esm/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js.map +1 -1
  226. package/dist/esm/locales/en/parsers/ENTimeUnitLaterFormatParser.js +2 -2
  227. package/dist/esm/locales/en/parsers/ENTimeUnitLaterFormatParser.js.map +1 -1
  228. package/dist/esm/locales/en/parsers/ENTimeUnitWithinFormatParser.js +2 -6
  229. package/dist/esm/locales/en/parsers/ENTimeUnitWithinFormatParser.js.map +1 -1
  230. package/dist/esm/locales/en/refiners/ENMergeRelativeAfterDateRefiner.js +4 -4
  231. package/dist/esm/locales/en/refiners/ENMergeRelativeAfterDateRefiner.js.map +1 -1
  232. package/dist/esm/locales/en/refiners/ENMergeRelativeFollowByDateRefiner.js +2 -2
  233. package/dist/esm/locales/en/refiners/ENMergeRelativeFollowByDateRefiner.js.map +1 -1
  234. package/dist/esm/locales/es/constants.d.ts +4 -5
  235. package/dist/esm/locales/es/constants.js +3 -3
  236. package/dist/esm/locales/es/constants.js.map +1 -1
  237. package/dist/esm/locales/es/parsers/ESCasualTimeParser.js +6 -4
  238. package/dist/esm/locales/es/parsers/ESCasualTimeParser.js.map +1 -1
  239. package/dist/esm/locales/es/parsers/ESTimeUnitWithinFormatParser.js +2 -2
  240. package/dist/esm/locales/es/parsers/ESTimeUnitWithinFormatParser.js.map +1 -1
  241. package/dist/esm/locales/fr/constants.d.ts +4 -5
  242. package/dist/esm/locales/fr/constants.js +3 -3
  243. package/dist/esm/locales/fr/constants.js.map +1 -1
  244. package/dist/esm/locales/fr/parsers/FRCasualDateParser.js +5 -5
  245. package/dist/esm/locales/fr/parsers/FRCasualDateParser.js.map +1 -1
  246. package/dist/esm/locales/fr/parsers/FRTimeUnitAgoFormatParser.js +4 -4
  247. package/dist/esm/locales/fr/parsers/FRTimeUnitAgoFormatParser.js.map +1 -1
  248. package/dist/esm/locales/fr/parsers/FRTimeUnitRelativeFormatParser.js +2 -2
  249. package/dist/esm/locales/fr/parsers/FRTimeUnitRelativeFormatParser.js.map +1 -1
  250. package/dist/esm/locales/fr/parsers/FRTimeUnitWithinFormatParser.js +2 -2
  251. package/dist/esm/locales/fr/parsers/FRTimeUnitWithinFormatParser.js.map +1 -1
  252. package/dist/esm/locales/it/constants.d.ts +4 -4
  253. package/dist/esm/locales/it/constants.js +3 -3
  254. package/dist/esm/locales/it/constants.js.map +1 -1
  255. package/dist/esm/locales/it/parsers/ITCasualDateParser.d.ts +1 -1
  256. package/dist/esm/locales/it/parsers/ITCasualDateParser.js +7 -6
  257. package/dist/esm/locales/it/parsers/ITCasualDateParser.js.map +1 -1
  258. package/dist/esm/locales/it/parsers/ITCasualTimeParser.d.ts +1 -1
  259. package/dist/esm/locales/it/parsers/ITCasualTimeParser.js +7 -5
  260. package/dist/esm/locales/it/parsers/ITCasualTimeParser.js.map +1 -1
  261. package/dist/esm/locales/it/parsers/ITRelativeDateFormatParser.js +14 -15
  262. package/dist/esm/locales/it/parsers/ITRelativeDateFormatParser.js.map +1 -1
  263. package/dist/esm/locales/it/parsers/ITTimeUnitAgoFormatParser.js +4 -4
  264. package/dist/esm/locales/it/parsers/ITTimeUnitAgoFormatParser.js.map +1 -1
  265. package/dist/esm/locales/it/parsers/ITTimeUnitCasualRelativeFormatParser.js +4 -4
  266. package/dist/esm/locales/it/parsers/ITTimeUnitCasualRelativeFormatParser.js.map +1 -1
  267. package/dist/esm/locales/it/parsers/ITTimeUnitLaterFormatParser.js +2 -2
  268. package/dist/esm/locales/it/parsers/ITTimeUnitLaterFormatParser.js.map +1 -1
  269. package/dist/esm/locales/it/parsers/ITTimeUnitWithinFormatParser.js +2 -2
  270. package/dist/esm/locales/it/parsers/ITTimeUnitWithinFormatParser.js.map +1 -1
  271. package/dist/esm/locales/it/refiners/ITMergeRelativeDateRefiner.js +4 -4
  272. package/dist/esm/locales/it/refiners/ITMergeRelativeDateRefiner.js.map +1 -1
  273. package/dist/esm/locales/ja/parsers/JPCasualDateParser.js +4 -5
  274. package/dist/esm/locales/ja/parsers/JPCasualDateParser.js.map +1 -1
  275. package/dist/esm/locales/ja/parsers/JPStandardParser.js +1 -3
  276. package/dist/esm/locales/ja/parsers/JPStandardParser.js.map +1 -1
  277. package/dist/esm/locales/ja/parsers/JPTimeExpressionParser.d.ts +1 -1
  278. package/dist/esm/locales/ja/parsers/JPTimeExpressionParser.js +75 -186
  279. package/dist/esm/locales/ja/parsers/JPTimeExpressionParser.js.map +1 -1
  280. package/dist/esm/locales/nl/constants.d.ts +4 -4
  281. package/dist/esm/locales/nl/constants.js +3 -3
  282. package/dist/esm/locales/nl/constants.js.map +1 -1
  283. package/dist/esm/locales/nl/parsers/NLCasualDateTimeParser.js +9 -5
  284. package/dist/esm/locales/nl/parsers/NLCasualDateTimeParser.js.map +1 -1
  285. package/dist/esm/locales/nl/parsers/NLCasualTimeParser.js +6 -4
  286. package/dist/esm/locales/nl/parsers/NLCasualTimeParser.js.map +1 -1
  287. package/dist/esm/locales/nl/parsers/NLRelativeDateFormatParser.js +14 -15
  288. package/dist/esm/locales/nl/parsers/NLRelativeDateFormatParser.js.map +1 -1
  289. package/dist/esm/locales/nl/parsers/NLTimeUnitAgoFormatParser.js +4 -4
  290. package/dist/esm/locales/nl/parsers/NLTimeUnitAgoFormatParser.js.map +1 -1
  291. package/dist/esm/locales/nl/parsers/NLTimeUnitCasualRelativeFormatParser.js +4 -4
  292. package/dist/esm/locales/nl/parsers/NLTimeUnitCasualRelativeFormatParser.js.map +1 -1
  293. package/dist/esm/locales/nl/parsers/NLTimeUnitLaterFormatParser.js +2 -2
  294. package/dist/esm/locales/nl/parsers/NLTimeUnitLaterFormatParser.js.map +1 -1
  295. package/dist/esm/locales/nl/parsers/NLTimeUnitWithinFormatParser.js +2 -2
  296. package/dist/esm/locales/nl/parsers/NLTimeUnitWithinFormatParser.js.map +1 -1
  297. package/dist/esm/locales/pt/parsers/PTCasualTimeParser.js +6 -4
  298. package/dist/esm/locales/pt/parsers/PTCasualTimeParser.js.map +1 -1
  299. package/dist/esm/locales/ru/constants.d.ts +4 -4
  300. package/dist/esm/locales/ru/constants.js +6 -6
  301. package/dist/esm/locales/ru/constants.js.map +1 -1
  302. package/dist/esm/locales/ru/parsers/RUCasualTimeParser.js +6 -6
  303. package/dist/esm/locales/ru/parsers/RUCasualTimeParser.js.map +1 -1
  304. package/dist/esm/locales/ru/parsers/RURelativeDateFormatParser.js +14 -15
  305. package/dist/esm/locales/ru/parsers/RURelativeDateFormatParser.js.map +1 -1
  306. package/dist/esm/locales/ru/parsers/RUTimeUnitAgoFormatParser.js +4 -4
  307. package/dist/esm/locales/ru/parsers/RUTimeUnitAgoFormatParser.js.map +1 -1
  308. package/dist/esm/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js +4 -4
  309. package/dist/esm/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js.map +1 -1
  310. package/dist/esm/locales/ru/parsers/RUTimeUnitWithinFormatParser.js +2 -2
  311. package/dist/esm/locales/ru/parsers/RUTimeUnitWithinFormatParser.js.map +1 -1
  312. package/dist/esm/locales/sv/constants.d.ts +8 -4
  313. package/dist/esm/locales/sv/constants.js +23 -5
  314. package/dist/esm/locales/sv/constants.js.map +1 -1
  315. package/dist/esm/locales/sv/index.js +2 -0
  316. package/dist/esm/locales/sv/index.js.map +1 -1
  317. package/dist/esm/locales/sv/parsers/SVCasualDateParser.js +14 -10
  318. package/dist/esm/locales/sv/parsers/SVCasualDateParser.js.map +1 -1
  319. package/dist/esm/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.d.ts +9 -0
  320. package/dist/esm/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.js +32 -0
  321. package/dist/esm/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.js.map +1 -0
  322. package/dist/esm/locales/uk/constants.d.ts +4 -4
  323. package/dist/esm/locales/uk/constants.js +7 -7
  324. package/dist/esm/locales/uk/constants.js.map +1 -1
  325. package/dist/esm/locales/uk/parsers/UKCasualTimeParser.js +6 -6
  326. package/dist/esm/locales/uk/parsers/UKCasualTimeParser.js.map +1 -1
  327. package/dist/esm/locales/uk/parsers/UKRelativeDateFormatParser.js +14 -15
  328. package/dist/esm/locales/uk/parsers/UKRelativeDateFormatParser.js.map +1 -1
  329. package/dist/esm/locales/uk/parsers/UKTimeUnitAgoFormatParser.js +4 -4
  330. package/dist/esm/locales/uk/parsers/UKTimeUnitAgoFormatParser.js.map +1 -1
  331. package/dist/esm/locales/uk/parsers/UKTimeUnitCasualRelativeFormatParser.js +4 -4
  332. package/dist/esm/locales/uk/parsers/UKTimeUnitCasualRelativeFormatParser.js.map +1 -1
  333. package/dist/esm/locales/uk/parsers/UKTimeUnitWithinFormatParser.js +2 -2
  334. package/dist/esm/locales/uk/parsers/UKTimeUnitWithinFormatParser.js.map +1 -1
  335. package/dist/esm/locales/zh/hans/parsers/ZHHansCasualDateParser.js +23 -24
  336. package/dist/esm/locales/zh/hans/parsers/ZHHansCasualDateParser.js.map +1 -1
  337. package/dist/esm/locales/zh/hans/parsers/ZHHansDateParser.js +2 -4
  338. package/dist/esm/locales/zh/hans/parsers/ZHHansDateParser.js.map +1 -1
  339. package/dist/esm/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.js +20 -18
  340. package/dist/esm/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.js.map +1 -1
  341. package/dist/esm/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.js +17 -19
  342. package/dist/esm/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.js.map +1 -1
  343. package/dist/esm/locales/zh/hans/parsers/ZHHansTimeExpressionParser.js +71 -73
  344. package/dist/esm/locales/zh/hans/parsers/ZHHansTimeExpressionParser.js.map +1 -1
  345. package/dist/esm/locales/zh/hans/parsers/ZHHansWeekdayParser.js +14 -16
  346. package/dist/esm/locales/zh/hans/parsers/ZHHansWeekdayParser.js.map +1 -1
  347. package/dist/esm/locales/zh/hant/parsers/ZHHantCasualDateParser.js +23 -24
  348. package/dist/esm/locales/zh/hant/parsers/ZHHantCasualDateParser.js.map +1 -1
  349. package/dist/esm/locales/zh/hant/parsers/ZHHantDateParser.js +2 -4
  350. package/dist/esm/locales/zh/hant/parsers/ZHHantDateParser.js.map +1 -1
  351. package/dist/esm/locales/zh/hant/parsers/ZHHantDeadlineFormatParser.js +20 -18
  352. package/dist/esm/locales/zh/hant/parsers/ZHHantDeadlineFormatParser.js.map +1 -1
  353. package/dist/esm/locales/zh/hant/parsers/ZHHantRelationWeekdayParser.js +17 -19
  354. package/dist/esm/locales/zh/hant/parsers/ZHHantRelationWeekdayParser.js.map +1 -1
  355. package/dist/esm/locales/zh/hant/parsers/ZHHantTimeExpressionParser.js +73 -75
  356. package/dist/esm/locales/zh/hant/parsers/ZHHantTimeExpressionParser.js.map +1 -1
  357. package/dist/esm/locales/zh/hant/parsers/ZHHantWeekdayParser.js +14 -16
  358. package/dist/esm/locales/zh/hant/parsers/ZHHantWeekdayParser.js.map +1 -1
  359. package/dist/esm/results.d.ts +3 -4
  360. package/dist/esm/results.js +75 -58
  361. package/dist/esm/results.js.map +1 -1
  362. package/dist/esm/timezone.js +1 -3
  363. package/dist/esm/timezone.js.map +1 -1
  364. package/dist/esm/types.d.ts +1 -1
  365. package/package.json +2 -4
  366. package/src/calculation/duration.ts +10 -0
  367. package/src/calculation/mergingCalculation.ts +5 -4
  368. package/src/calculation/weekdays.ts +2 -2
  369. package/src/calculation/years.ts +11 -16
  370. package/src/common/casualReferences.ts +23 -33
  371. package/src/common/parsers/AbstractTimeExpressionParser.ts +6 -0
  372. package/src/common/refiners/AbstractMergeDateRangeRefiner.ts +20 -21
  373. package/src/common/refiners/ForwardDateRefiner.ts +17 -22
  374. package/src/index.ts +3 -1
  375. package/src/locales/de/constants.ts +8 -8
  376. package/src/locales/de/parsers/DECasualDateParser.ts +13 -10
  377. package/src/locales/de/parsers/DECasualTimeParser.ts +3 -5
  378. package/src/locales/de/parsers/DETimeUnitRelativeFormatParser.ts +2 -2
  379. package/src/locales/de/parsers/DETimeUnitWithinFormatParser.ts +2 -2
  380. package/src/locales/en/constants.ts +12 -13
  381. package/src/locales/en/parsers/ENCasualDateParser.ts +6 -5
  382. package/src/locales/en/parsers/ENRelativeDateFormatParser.ts +14 -16
  383. package/src/locales/en/parsers/ENTimeUnitAgoFormatParser.ts +2 -2
  384. package/src/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.ts +2 -2
  385. package/src/locales/en/parsers/ENTimeUnitLaterFormatParser.ts +2 -2
  386. package/src/locales/en/parsers/ENTimeUnitWithinFormatParser.ts +2 -7
  387. package/src/locales/en/refiners/ENMergeRelativeAfterDateRefiner.ts +4 -4
  388. package/src/locales/en/refiners/ENMergeRelativeFollowByDateRefiner.ts +2 -2
  389. package/src/locales/es/constants.ts +7 -6
  390. package/src/locales/es/parsers/ESCasualTimeParser.ts +6 -4
  391. package/src/locales/es/parsers/ESTimeUnitWithinFormatParser.ts +2 -2
  392. package/src/locales/fr/constants.ts +7 -6
  393. package/src/locales/fr/parsers/FRCasualDateParser.ts +5 -5
  394. package/src/locales/fr/parsers/FRTimeUnitAgoFormatParser.ts +4 -4
  395. package/src/locales/fr/parsers/FRTimeUnitRelativeFormatParser.ts +2 -2
  396. package/src/locales/fr/parsers/FRTimeUnitWithinFormatParser.ts +2 -2
  397. package/src/locales/it/constants.ts +7 -7
  398. package/src/locales/it/parsers/ITCasualDateParser.ts +7 -6
  399. package/src/locales/it/parsers/ITCasualTimeParser.ts +7 -5
  400. package/src/locales/it/parsers/ITRelativeDateFormatParser.ts +14 -16
  401. package/src/locales/it/parsers/ITTimeUnitAgoFormatParser.ts +4 -4
  402. package/src/locales/it/parsers/ITTimeUnitCasualRelativeFormatParser.ts +4 -4
  403. package/src/locales/it/parsers/ITTimeUnitLaterFormatParser.ts +2 -2
  404. package/src/locales/it/parsers/ITTimeUnitWithinFormatParser.ts +2 -2
  405. package/src/locales/it/refiners/ITMergeRelativeDateRefiner.ts +4 -4
  406. package/src/locales/ja/parsers/JPCasualDateParser.ts +4 -5
  407. package/src/locales/ja/parsers/JPStandardParser.ts +1 -4
  408. package/src/locales/ja/parsers/JPTimeExpressionParser.ts +91 -190
  409. package/src/locales/nl/constants.ts +7 -7
  410. package/src/locales/nl/parsers/NLCasualDateTimeParser.ts +9 -5
  411. package/src/locales/nl/parsers/NLCasualTimeParser.ts +6 -4
  412. package/src/locales/nl/parsers/NLRelativeDateFormatParser.ts +14 -16
  413. package/src/locales/nl/parsers/NLTimeUnitAgoFormatParser.ts +4 -4
  414. package/src/locales/nl/parsers/NLTimeUnitCasualRelativeFormatParser.ts +4 -4
  415. package/src/locales/nl/parsers/NLTimeUnitLaterFormatParser.ts +2 -2
  416. package/src/locales/nl/parsers/NLTimeUnitWithinFormatParser.ts +2 -2
  417. package/src/locales/pt/parsers/PTCasualTimeParser.ts +6 -4
  418. package/src/locales/ru/constants.ts +10 -10
  419. package/src/locales/ru/parsers/RUCasualTimeParser.ts +6 -6
  420. package/src/locales/ru/parsers/RURelativeDateFormatParser.ts +15 -18
  421. package/src/locales/ru/parsers/RUTimeUnitAgoFormatParser.ts +4 -4
  422. package/src/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.ts +4 -4
  423. package/src/locales/ru/parsers/RUTimeUnitWithinFormatParser.ts +2 -2
  424. package/src/locales/sv/constants.ts +31 -9
  425. package/src/locales/sv/index.ts +2 -0
  426. package/src/locales/sv/parsers/SVCasualDateParser.ts +14 -10
  427. package/src/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.ts +42 -0
  428. package/src/locales/uk/constants.ts +11 -11
  429. package/src/locales/uk/parsers/UKCasualTimeParser.ts +6 -6
  430. package/src/locales/uk/parsers/UKRelativeDateFormatParser.ts +14 -16
  431. package/src/locales/uk/parsers/UKTimeUnitAgoFormatParser.ts +4 -4
  432. package/src/locales/uk/parsers/UKTimeUnitCasualRelativeFormatParser.ts +4 -4
  433. package/src/locales/uk/parsers/UKTimeUnitWithinFormatParser.ts +2 -2
  434. package/src/locales/zh/hans/parsers/ZHHansCasualDateParser.ts +23 -24
  435. package/src/locales/zh/hans/parsers/ZHHansDateParser.ts +2 -4
  436. package/src/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.ts +20 -18
  437. package/src/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.ts +18 -18
  438. package/src/locales/zh/hans/parsers/ZHHansTimeExpressionParser.ts +71 -73
  439. package/src/locales/zh/hans/parsers/ZHHansWeekdayParser.ts +16 -15
  440. package/src/locales/zh/hant/parsers/ZHHantCasualDateParser.ts +23 -24
  441. package/src/locales/zh/hant/parsers/ZHHantDateParser.ts +2 -4
  442. package/src/locales/zh/hant/parsers/ZHHantDeadlineFormatParser.ts +20 -18
  443. package/src/locales/zh/hant/parsers/ZHHantRelationWeekdayParser.ts +18 -18
  444. package/src/locales/zh/hant/parsers/ZHHantTimeExpressionParser.ts +73 -75
  445. package/src/locales/zh/hant/parsers/ZHHantWeekdayParser.ts +16 -15
  446. package/src/results.ts +82 -58
  447. package/src/timezone.ts +1 -5
  448. package/src/types.ts +1 -1
  449. package/test/calculation_weekdays.test.ts +17 -0
  450. package/test/en/en_time_exp.test.ts +2 -0
  451. package/test/it/it_casual.test.ts +44 -0
  452. package/test/it/it_month_name_little_endian.test.ts +28 -0
  453. package/test/it/it_weekday.test.ts +37 -0
  454. package/test/ja/ja_time_exp.test.ts +82 -21
  455. package/test/result.test.ts +74 -0
  456. package/test/sv/sv_casual.test.ts +42 -0
  457. package/test/sv/sv_month_name_little_endian.test.ts +48 -0
  458. package/test/sv/sv_time_units_casual_relative.test.ts +143 -0
  459. package/test/zh/hans/zh_hans_casual.test.ts +14 -0
  460. package/test/zh/hans/zh_hans_date.test.ts +14 -0
  461. package/test/zh/hans/zh_hans_deadline.test.ts +39 -0
  462. package/test/zh/hans/zh_hans_time_exp.test.ts +51 -0
  463. package/test/zh/hans/zh_hans_weekday.test.ts +87 -0
  464. package/test/zh/hant/zh_hant_casual.test.ts +14 -0
  465. package/test/zh/hant/zh_hant_date.test.ts +14 -0
  466. package/test/zh/hant/zh_hant_weekday.test.ts +43 -0
  467. package/dist/cjs/utils/dayjs.d.ts +0 -8
  468. package/dist/cjs/utils/dayjs.js +0 -48
  469. package/dist/cjs/utils/dayjs.js.map +0 -1
  470. package/dist/cjs/utils/timeunits.d.ts +0 -7
  471. package/dist/cjs/utils/timeunits.js +0 -30
  472. package/dist/cjs/utils/timeunits.js.map +0 -1
  473. package/dist/esm/utils/dayjs.d.ts +0 -8
  474. package/dist/esm/utils/dayjs.js +0 -40
  475. package/dist/esm/utils/dayjs.js.map +0 -1
  476. package/dist/esm/utils/timeunits.d.ts +0 -7
  477. package/dist/esm/utils/timeunits.js +0 -26
  478. package/dist/esm/utils/timeunits.js.map +0 -1
  479. package/src/utils/dayjs.ts +0 -52
  480. package/src/utils/timeunits.ts +0 -47
@@ -1,6 +1,5 @@
1
- import dayjs from "dayjs";
2
1
  import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
3
- import { assignSimilarDate } from "../../../utils/dayjs.js";
2
+ import { assignSimilarDate } from "../../../utils/dates.js";
4
3
  import * as references from "../../../common/casualReferences.js";
5
4
  const PATTERN = /(now|today|tonight|tomorrow|overmorrow|tmr|tmrw|yesterday|last\s*night)(?=\W|$)/i;
6
5
  export default class ENCasualDateParser extends AbstractParserWithWordBoundaryChecking {
@@ -8,7 +7,7 @@ export default class ENCasualDateParser extends AbstractParserWithWordBoundaryCh
8
7
  return PATTERN;
9
8
  }
10
9
  innerExtract(context, match) {
11
- let targetDate = dayjs(context.refDate);
10
+ let targetDate = context.refDate;
12
11
  const lowerText = match[0].toLowerCase();
13
12
  let component = context.createParsingComponents();
14
13
  switch (lowerText) {
@@ -34,8 +33,10 @@ export default class ENCasualDateParser extends AbstractParserWithWordBoundaryCh
34
33
  break;
35
34
  default:
36
35
  if (lowerText.match(/last\s*night/)) {
37
- if (targetDate.hour() > 6) {
38
- targetDate = targetDate.add(-1, "day");
36
+ if (targetDate.getHours() > 6) {
37
+ const previousDay = new Date(targetDate.getTime());
38
+ previousDay.setDate(previousDay.getDate() - 1);
39
+ targetDate = previousDay;
39
40
  }
40
41
  assignSimilarDate(component, targetDate);
41
42
  component.imply("hour", 0);
@@ -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,kFAAkF,CAAC;AAEnG,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,CAAC;YAChB,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,KAAK,YAAY;gBACb,SAAS,GAAG,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;gBACzD,MAAM;YAEV;gBACI,IAAI,SAAS,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;oBAClC,IAAI,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;wBACxB,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;oBAC3C,CAAC;oBAED,iBAAiB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;oBACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC/B,CAAC;gBACD,MAAM;QACd,CAAC;QACD,SAAS,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC;QAC9C,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ"}
1
+ {"version":3,"file":"ENCasualDateParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENCasualDateParser.ts"],"names":[],"mappings":"AAEA,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,kFAAkF,CAAC;AAEnG,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,OAAO,CAAC,OAAO,CAAC;QACjC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACzC,IAAI,SAAS,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;QAElD,QAAQ,SAAS,EAAE,CAAC;YAChB,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,KAAK,YAAY;gBACb,SAAS,GAAG,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;gBACzD,MAAM;YAEV;gBACI,IAAI,SAAS,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;oBAClC,IAAI,UAAU,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,CAAC;wBAC5B,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC;wBACnD,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;wBAC/C,UAAU,GAAG,WAAW,CAAC;oBAC7B,CAAC;oBAED,iBAAiB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;oBACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC/B,CAAC;gBACD,MAAM;QACd,CAAC;QACD,SAAS,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC;QAC9C,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ"}
@@ -1,6 +1,5 @@
1
1
  import { TIME_UNIT_DICTIONARY } from "../constants.js";
2
2
  import { ParsingComponents } from "../../../results.js";
3
- import dayjs from "dayjs";
4
3
  import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
5
4
  import { matchAnyPattern } from "../../../utils/pattern.js";
6
5
  const PATTERN = new RegExp(`(this|last|past|next|after\\s*this)\\s*(${matchAnyPattern(TIME_UNIT_DICTIONARY)})(?=\\s*)` + "(?=\\W|$)", "i");
@@ -25,25 +24,25 @@ export default class ENRelativeDateFormatParser extends AbstractParserWithWordBo
25
24
  return ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
26
25
  }
27
26
  const components = context.createParsingComponents();
28
- let date = dayjs(context.reference.instant);
27
+ let date = new Date(context.reference.instant.getTime());
29
28
  if (unitWord.match(/week/i)) {
30
- date = date.add(-date.get("d"), "d");
31
- components.imply("day", date.date());
32
- components.imply("month", date.month() + 1);
33
- components.imply("year", date.year());
29
+ date.setDate(date.getDate() - date.getDay());
30
+ components.imply("day", date.getDate());
31
+ components.imply("month", date.getMonth() + 1);
32
+ components.imply("year", date.getFullYear());
34
33
  }
35
34
  else if (unitWord.match(/month/i)) {
36
- date = date.add(-date.date() + 1, "d");
37
- components.imply("day", date.date());
38
- components.assign("year", date.year());
39
- components.assign("month", date.month() + 1);
35
+ date.setDate(1);
36
+ components.imply("day", date.getDate());
37
+ components.assign("year", date.getFullYear());
38
+ components.assign("month", date.getMonth() + 1);
40
39
  }
41
40
  else if (unitWord.match(/year/i)) {
42
- date = date.add(-date.date() + 1, "d");
43
- date = date.add(-date.month(), "month");
44
- components.imply("day", date.date());
45
- components.imply("month", date.month() + 1);
46
- components.assign("year", date.year());
41
+ date.setDate(1);
42
+ date.setMonth(0);
43
+ components.imply("day", date.getDate());
44
+ components.imply("month", date.getMonth() + 1);
45
+ components.assign("year", date.getFullYear());
47
46
  }
48
47
  return components;
49
48
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ENRelativeDateFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENRelativeDateFormatParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,2CAA2C,eAAe,CAAC,oBAAoB,CAAC,WAAW,GAAG,WAAW,EACzG,GAAG,CACN,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAE9B,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,sCAAsC;IAC1F,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,QAAQ,GAAG,KAAK,CAAC,mBAAmB,CAAC,CAAC,WAAW,EAAE,CAAC;QAC1D,MAAM,QAAQ,GAAG,KAAK,CAAC,mBAAmB,CAAC,CAAC,WAAW,EAAE,CAAC;QAC1D,MAAM,QAAQ,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAEhD,IAAI,QAAQ,IAAI,MAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YACrD,MAAM,SAAS,GAAG,EAAE,CAAC;YACrB,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YACxB,OAAO,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACvF,CAAC;QAED,IAAI,QAAQ,IAAI,MAAM,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;YAC3C,MAAM,SAAS,GAAG,EAAE,CAAC;YACrB,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;YACzB,OAAO,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACvF,CAAC;QAED,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;QACrD,IAAI,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAG5C,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1B,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;YACrC,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACrC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;YAC5C,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1C,CAAC;aAGI,IAAI,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;YACvC,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACrC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACvC,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QACjD,CAAC;aAGI,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/B,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;YACvC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;YAExC,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACrC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;YAC5C,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3C,CAAC;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;CACJ"}
1
+ {"version":3,"file":"ENRelativeDateFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENRelativeDateFormatParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,2CAA2C,eAAe,CAAC,oBAAoB,CAAC,WAAW,GAAG,WAAW,EACzG,GAAG,CACN,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAE9B,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,sCAAsC;IAC1F,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,QAAQ,GAAG,KAAK,CAAC,mBAAmB,CAAC,CAAC,WAAW,EAAE,CAAC;QAC1D,MAAM,QAAQ,GAAG,KAAK,CAAC,mBAAmB,CAAC,CAAC,WAAW,EAAE,CAAC;QAC1D,MAAM,QAAQ,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAEhD,IAAI,QAAQ,IAAI,MAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YACrD,MAAM,SAAS,GAAG,EAAE,CAAC;YACrB,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YACxB,OAAO,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACvF,CAAC;QAED,IAAI,QAAQ,IAAI,MAAM,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;YAC3C,MAAM,SAAS,GAAG,EAAE,CAAC;YACrB,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;YACzB,OAAO,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACvF,CAAC;QAED,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;QACrD,IAAI,IAAI,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAGzD,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;YAC7C,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACxC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;YAC/C,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QACjD,CAAC;aAGI,IAAI,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAChB,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACxC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YAC9C,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;QACpD,CAAC;aAGI,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/B,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAChB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YACjB,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACxC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;YAC/C,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAClD,CAAC;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;CACJ"}
@@ -1,4 +1,4 @@
1
- import { parseTimeUnits, TIME_UNITS_NO_ABBR_PATTERN, TIME_UNITS_PATTERN } from "../constants.js";
1
+ import { parseDuration, TIME_UNITS_NO_ABBR_PATTERN, TIME_UNITS_PATTERN } from "../constants.js";
2
2
  import { ParsingComponents } from "../../../results.js";
3
3
  import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
4
4
  import { reverseDuration } from "../../../calculation/duration.js";
@@ -14,7 +14,7 @@ export default class ENTimeUnitAgoFormatParser extends AbstractParserWithWordBou
14
14
  return this.strictMode ? STRICT_PATTERN : PATTERN;
15
15
  }
16
16
  innerExtract(context, match) {
17
- const duration = parseTimeUnits(match[1]);
17
+ const duration = parseDuration(match[1]);
18
18
  if (!duration) {
19
19
  return null;
20
20
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ENTimeUnitAgoFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeUnitAgoFormatParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAC9F,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,IAAI,kBAAkB,0CAA0C,EAAE,GAAG,CAAC,CAAC;AAClG,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,IAAI,0BAA0B,0CAA0C,EAAE,GAAG,CAAC,CAAC;AAEjH,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,sCAAsC;IACrE;IAApB,YAAoB,UAAmB;QACnC,KAAK,EAAE,CAAC;QADQ,eAAU,GAAV,UAAU,CAAS;IAEvC,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC;IACtD,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;IACvG,CAAC;CACJ"}
1
+ {"version":3,"file":"ENTimeUnitAgoFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeUnitAgoFormatParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,IAAI,kBAAkB,0CAA0C,EAAE,GAAG,CAAC,CAAC;AAClG,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,IAAI,0BAA0B,0CAA0C,EAAE,GAAG,CAAC,CAAC;AAEjH,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,sCAAsC;IACrE;IAApB,YAAoB,UAAmB;QACnC,KAAK,EAAE,CAAC;QADQ,eAAU,GAAV,UAAU,CAAS;IAEvC,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC;IACtD,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;IACvG,CAAC;CACJ"}
@@ -1,4 +1,4 @@
1
- import { TIME_UNITS_PATTERN, parseTimeUnits, TIME_UNITS_NO_ABBR_PATTERN } from "../constants.js";
1
+ import { TIME_UNITS_PATTERN, parseDuration, 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
4
  import { reverseDuration } from "../../../calculation/duration.js";
@@ -15,7 +15,7 @@ export default class ENTimeUnitCasualRelativeFormatParser extends AbstractParser
15
15
  }
16
16
  innerExtract(context, match) {
17
17
  const prefix = match[1].toLowerCase();
18
- let duration = parseTimeUnits(match[2]);
18
+ let duration = parseDuration(match[2]);
19
19
  if (!duration) {
20
20
  return null;
21
21
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ENTimeUnitCasualRelativeFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.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;AAChH,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,yCAAyC,kBAAkB,YAAY,EAAE,GAAG,CAAC,CAAC;AACzG,MAAM,eAAe,GAAG,IAAI,MAAM,CAC9B,yCAAyC,0BAA0B,YAAY,EAC/E,GAAG,CACN,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,oCAAqC,SAAQ,sCAAsC;IAChF;IAApB,YAAoB,qBAA8B,IAAI;QAClD,KAAK,EAAE,CAAC;QADQ,uBAAkB,GAAlB,kBAAkB,CAAgB;IAEtD,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC;IAC/D,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACtC,IAAI,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACxC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,QAAQ,MAAM,EAAE,CAAC;YACb,KAAK,MAAM,CAAC;YACZ,KAAK,MAAM,CAAC;YACZ,KAAK,GAAG;gBACJ,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;gBACrC,MAAM;QACd,CAAC;QACD,OAAO,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACtF,CAAC;CACJ"}
1
+ {"version":3,"file":"ENTimeUnitCasualRelativeFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAE7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,yCAAyC,kBAAkB,YAAY,EAAE,GAAG,CAAC,CAAC;AACzG,MAAM,eAAe,GAAG,IAAI,MAAM,CAC9B,yCAAyC,0BAA0B,YAAY,EAC/E,GAAG,CACN,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,oCAAqC,SAAQ,sCAAsC;IAChF;IAApB,YAAoB,qBAA8B,IAAI;QAClD,KAAK,EAAE,CAAC;QADQ,uBAAkB,GAAlB,kBAAkB,CAAgB;IAEtD,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC;IAC/D,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACtC,IAAI,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,QAAQ,MAAM,EAAE,CAAC;YACb,KAAK,MAAM,CAAC;YACZ,KAAK,MAAM,CAAC;YACZ,KAAK,GAAG;gBACJ,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;gBACrC,MAAM;QACd,CAAC;QACD,OAAO,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACtF,CAAC;CACJ"}
@@ -1,4 +1,4 @@
1
- import { parseTimeUnits, TIME_UNITS_NO_ABBR_PATTERN, TIME_UNITS_PATTERN } from "../constants.js";
1
+ import { parseDuration, TIME_UNITS_NO_ABBR_PATTERN, TIME_UNITS_PATTERN } from "../constants.js";
2
2
  import { ParsingComponents } from "../../../results.js";
3
3
  import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
4
4
  const PATTERN = new RegExp(`(${TIME_UNITS_PATTERN})\\s{0,5}(?:later|after|from now|henceforth|forward|out)` + "(?=(?:\\W|$))", "i");
@@ -14,7 +14,7 @@ export default class ENTimeUnitLaterFormatParser extends AbstractParserWithWordB
14
14
  return this.strictMode ? STRICT_PATTERN : PATTERN;
15
15
  }
16
16
  innerExtract(context, match) {
17
- const timeUnits = parseTimeUnits(match[GROUP_NUM_TIMEUNITS]);
17
+ const timeUnits = parseDuration(match[GROUP_NUM_TIMEUNITS]);
18
18
  if (!timeUnits) {
19
19
  return null;
20
20
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ENTimeUnitLaterFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeUnitLaterFormatParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAC9F,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAEhH,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,IAAI,kBAAkB,0DAA0D,GAAG,eAAe,EAClG,GAAG,CACN,CAAC;AAEF,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,IAAI,0BAA0B,0CAA0C,EAAE,GAAG,CAAC,CAAC;AACjH,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAE9B,MAAM,CAAC,OAAO,OAAO,2BAA4B,SAAQ,sCAAsC;IACvE;IAApB,YAAoB,UAAmB;QACnC,KAAK,EAAE,CAAC;QADQ,eAAU,GAAV,UAAU,CAAS;IAEvC,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC;IACtD,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,cAAc,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAC7D,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;CACJ"}
1
+ {"version":3,"file":"ENTimeUnitLaterFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENTimeUnitLaterFormatParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAEhH,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,IAAI,kBAAkB,0DAA0D,GAAG,eAAe,EAClG,GAAG,CACN,CAAC;AAEF,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,IAAI,0BAA0B,0CAA0C,EAAE,GAAG,CAAC,CAAC;AACjH,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAE9B,MAAM,CAAC,OAAO,OAAO,2BAA4B,SAAQ,sCAAsC;IACvE;IAApB,YAAoB,UAAmB;QACnC,KAAK,EAAE,CAAC;QADQ,eAAU,GAAV,UAAU,CAAS;IAEvC,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC;IACtD,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,aAAa,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;CACJ"}
@@ -1,4 +1,4 @@
1
- import { TIME_UNITS_PATTERN, parseTimeUnits, TIME_UNITS_NO_ABBR_PATTERN } from "../constants.js";
1
+ import { TIME_UNITS_PATTERN, parseDuration, 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
4
  const PATTERN_WITH_OPTIONAL_PREFIX = new RegExp(`(?:(?:within|in|for)\\s*)?` +
@@ -23,14 +23,10 @@ export default class ENTimeUnitWithinFormatParser extends AbstractParserWithWord
23
23
  if (match[0].match(/^for\s*the\s*\w+/)) {
24
24
  return null;
25
25
  }
26
- const timeUnits = parseTimeUnits(match[1]);
26
+ const timeUnits = parseDuration(match[1]);
27
27
  if (!timeUnits) {
28
28
  return null;
29
29
  }
30
- context.debug(() => {
31
- console.log(timeUnits);
32
- console.log(ParsingComponents.createRelativeFromReference(context.reference, timeUnits));
33
- });
34
30
  return ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
35
31
  }
36
32
  }
@@ -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,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;IACxE;IAApB,YAAoB,UAAmB;QACnC,KAAK,EAAE,CAAC;QADQ,eAAU,GAAV,UAAU,CAAS;IAEvC,CAAC;IAED,YAAY,CAAC,OAAuB;QAChC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,OAAO,0BAA0B,CAAC;QACtC,CAAC;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,mBAAmB,CAAC;IAC3F,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QAEzD,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,SAAS,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;YACf,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;QAC7F,CAAC,CAAC,CAAC;QAEH,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,aAAa,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAE7F,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;IACxE;IAApB,YAAoB,UAAmB;QACnC,KAAK,EAAE,CAAC;QADQ,eAAU,GAAV,UAAU,CAAS;IAEvC,CAAC;IAED,YAAY,CAAC,OAAuB;QAChC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,OAAO,0BAA0B,CAAC;QACtC,CAAC;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,mBAAmB,CAAC;IAC3F,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QAEzD,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,SAAS,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;CACJ"}
@@ -1,7 +1,7 @@
1
1
  import { MergingRefiner } from "../../../common/abstractRefiners.js";
2
2
  import { ParsingComponents, ParsingResult, ReferenceWithTimezone } from "../../../results.js";
3
- import { parseTimeUnits } from "../constants.js";
4
- import { reverseTimeUnits } from "../../../utils/timeunits.js";
3
+ import { parseDuration } from "../constants.js";
4
+ import { reverseDuration } from "../../../calculation/duration.js";
5
5
  function IsPositiveFollowingReference(result) {
6
6
  return result.text.match(/^[+-]/i) != null;
7
7
  }
@@ -16,9 +16,9 @@ export default class ENMergeRelativeAfterDateRefiner extends MergingRefiner {
16
16
  return IsPositiveFollowingReference(nextResult) || IsNegativeFollowingReference(nextResult);
17
17
  }
18
18
  mergeResults(textBetween, currentResult, nextResult, context) {
19
- let timeUnits = parseTimeUnits(nextResult.text);
19
+ let timeUnits = parseDuration(nextResult.text);
20
20
  if (IsNegativeFollowingReference(nextResult)) {
21
- timeUnits = reverseTimeUnits(timeUnits);
21
+ timeUnits = reverseDuration(timeUnits);
22
22
  }
23
23
  const components = ParsingComponents.createRelativeFromReference(ReferenceWithTimezone.fromDate(currentResult.start.date()), timeUnits);
24
24
  return new ParsingResult(currentResult.reference, currentResult.index, `${currentResult.text}${textBetween}${nextResult.text}`, components);
@@ -1 +1 @@
1
- {"version":3,"file":"ENMergeRelativeAfterDateRefiner.js","sourceRoot":"","sources":["../../../../../src/locales/en/refiners/ENMergeRelativeAfterDateRefiner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,SAAS,4BAA4B,CAAC,MAAqB;IACvD,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC;AAC/C,CAAC;AAED,SAAS,4BAA4B,CAAC,MAAqB;IACvD,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC;AAC5C,CAAC;AAOD,MAAM,CAAC,OAAO,OAAO,+BAAgC,SAAQ,cAAc;IACvE,kBAAkB,CAAC,WAAmB,EAAE,aAA4B,EAAE,UAAyB;QAC3F,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/B,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,OAAO,4BAA4B,CAAC,UAAU,CAAC,IAAI,4BAA4B,CAAC,UAAU,CAAC,CAAC;IAChG,CAAC;IAED,YAAY,CAAC,WAAmB,EAAE,aAA4B,EAAE,UAAyB,EAAE,OAAO;QAC9F,IAAI,SAAS,GAAG,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,4BAA4B,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3C,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC5C,CAAC;QAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,2BAA2B,CAC5D,qBAAqB,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAC1D,SAAS,CACZ,CAAC;QAEF,OAAO,IAAI,aAAa,CACpB,aAAa,CAAC,SAAS,EACvB,aAAa,CAAC,KAAK,EACnB,GAAG,aAAa,CAAC,IAAI,GAAG,WAAW,GAAG,UAAU,CAAC,IAAI,EAAE,EACvD,UAAU,CACb,CAAC;IACN,CAAC;CACJ"}
1
+ {"version":3,"file":"ENMergeRelativeAfterDateRefiner.js","sourceRoot":"","sources":["../../../../../src/locales/en/refiners/ENMergeRelativeAfterDateRefiner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,SAAS,4BAA4B,CAAC,MAAqB;IACvD,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC;AAC/C,CAAC;AAED,SAAS,4BAA4B,CAAC,MAAqB;IACvD,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC;AAC5C,CAAC;AAOD,MAAM,CAAC,OAAO,OAAO,+BAAgC,SAAQ,cAAc;IACvE,kBAAkB,CAAC,WAAmB,EAAE,aAA4B,EAAE,UAAyB;QAC3F,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/B,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,OAAO,4BAA4B,CAAC,UAAU,CAAC,IAAI,4BAA4B,CAAC,UAAU,CAAC,CAAC;IAChG,CAAC;IAED,YAAY,CAAC,WAAmB,EAAE,aAA4B,EAAE,UAAyB,EAAE,OAAO;QAC9F,IAAI,SAAS,GAAG,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,4BAA4B,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3C,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,2BAA2B,CAC5D,qBAAqB,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAC1D,SAAS,CACZ,CAAC;QAEF,OAAO,IAAI,aAAa,CACpB,aAAa,CAAC,SAAS,EACvB,aAAa,CAAC,KAAK,EACnB,GAAG,aAAa,CAAC,IAAI,GAAG,WAAW,GAAG,UAAU,CAAC,IAAI,EAAE,EACvD,UAAU,CACb,CAAC;IACN,CAAC;CACJ"}
@@ -1,6 +1,6 @@
1
1
  import { MergingRefiner } from "../../../common/abstractRefiners.js";
2
2
  import { ParsingComponents, ParsingResult, ReferenceWithTimezone } from "../../../results.js";
3
- import { parseTimeUnits } from "../constants.js";
3
+ import { parseDuration } from "../constants.js";
4
4
  import { reverseDuration } from "../../../calculation/duration.js";
5
5
  function hasImpliedEarlierReferenceDate(result) {
6
6
  return result.text.match(/\s+(before|from)$/i) != null;
@@ -22,7 +22,7 @@ export default class ENMergeRelativeFollowByDateRefiner extends MergingRefiner {
22
22
  return !!nextResult.start.get("day") && !!nextResult.start.get("month") && !!nextResult.start.get("year");
23
23
  }
24
24
  mergeResults(textBetween, currentResult, nextResult) {
25
- let duration = parseTimeUnits(currentResult.text);
25
+ let duration = parseDuration(currentResult.text);
26
26
  if (hasImpliedEarlierReferenceDate(currentResult)) {
27
27
  duration = reverseDuration(duration);
28
28
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ENMergeRelativeFollowByDateRefiner.js","sourceRoot":"","sources":["../../../../../src/locales/en/refiners/ENMergeRelativeFollowByDateRefiner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,SAAS,8BAA8B,CAAC,MAAqB;IACzD,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,IAAI,IAAI,CAAC;AAC3D,CAAC;AAED,SAAS,4BAA4B,CAAC,MAAqB;IACvD,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,IAAI,IAAI,CAAC;AAC3D,CAAC;AAOD,MAAM,CAAC,OAAO,OAAO,kCAAmC,SAAQ,cAAc;IAC1E,cAAc;QACV,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,kBAAkB,CAAC,WAAmB,EAAE,aAA4B,EAAE,UAAyB;QAE3F,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC;YAC5C,OAAO,KAAK,CAAC;QACjB,CAAC;QAID,IAAI,CAAC,8BAA8B,CAAC,aAAa,CAAC,IAAI,CAAC,4BAA4B,CAAC,aAAa,CAAC,EAAE,CAAC;YACjG,OAAO,KAAK,CAAC;QACjB,CAAC;QAGD,OAAO,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9G,CAAC;IAED,YAAY,CAAC,WAAmB,EAAE,aAA4B,EAAE,UAAyB;QACrF,IAAI,QAAQ,GAAG,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,8BAA8B,CAAC,aAAa,CAAC,EAAE,CAAC;YAChD,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;QACzC,CAAC;QAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,2BAA2B,CAC5D,qBAAqB,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EACvD,QAAQ,CACX,CAAC;QAEF,OAAO,IAAI,aAAa,CACpB,UAAU,CAAC,SAAS,EACpB,aAAa,CAAC,KAAK,EACnB,GAAG,aAAa,CAAC,IAAI,GAAG,WAAW,GAAG,UAAU,CAAC,IAAI,EAAE,EACvD,UAAU,CACb,CAAC;IACN,CAAC;CACJ"}
1
+ {"version":3,"file":"ENMergeRelativeFollowByDateRefiner.js","sourceRoot":"","sources":["../../../../../src/locales/en/refiners/ENMergeRelativeFollowByDateRefiner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,SAAS,8BAA8B,CAAC,MAAqB;IACzD,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,IAAI,IAAI,CAAC;AAC3D,CAAC;AAED,SAAS,4BAA4B,CAAC,MAAqB;IACvD,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,IAAI,IAAI,CAAC;AAC3D,CAAC;AAOD,MAAM,CAAC,OAAO,OAAO,kCAAmC,SAAQ,cAAc;IAC1E,cAAc;QACV,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,kBAAkB,CAAC,WAAmB,EAAE,aAA4B,EAAE,UAAyB;QAE3F,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC;YAC5C,OAAO,KAAK,CAAC;QACjB,CAAC;QAID,IAAI,CAAC,8BAA8B,CAAC,aAAa,CAAC,IAAI,CAAC,4BAA4B,CAAC,aAAa,CAAC,EAAE,CAAC;YACjG,OAAO,KAAK,CAAC;QACjB,CAAC;QAGD,OAAO,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9G,CAAC;IAED,YAAY,CAAC,WAAmB,EAAE,aAA4B,EAAE,UAAyB;QACrF,IAAI,QAAQ,GAAG,aAAa,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,8BAA8B,CAAC,aAAa,CAAC,EAAE,CAAC;YAChD,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;QACzC,CAAC;QAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,2BAA2B,CAC5D,qBAAqB,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EACvD,QAAQ,CACX,CAAC;QAEF,OAAO,IAAI,aAAa,CACpB,UAAU,CAAC,SAAS,EACpB,aAAa,CAAC,KAAK,EACnB,GAAG,aAAa,CAAC,IAAI,GAAG,WAAW,GAAG,UAAU,CAAC,IAAI,EAAE,EACvD,UAAU,CACb,CAAC;IACN,CAAC;CACJ"}
@@ -1,4 +1,4 @@
1
- import { OpUnitType, QUnitType } from "dayjs";
1
+ import { Timeunit } from "../../types.js";
2
2
  export declare const WEEKDAY_DICTIONARY: {
3
3
  [word: string]: number;
4
4
  };
@@ -9,13 +9,12 @@ export declare const INTEGER_WORD_DICTIONARY: {
9
9
  [word: string]: number;
10
10
  };
11
11
  export declare const TIME_UNIT_DICTIONARY: {
12
- [word: string]: OpUnitType | QUnitType;
12
+ [word: string]: Timeunit;
13
13
  };
14
14
  export declare const NUMBER_PATTERN: string;
15
15
  export declare function parseNumberPattern(match: string): number;
16
16
  export declare const YEAR_PATTERN = "[0-9]{1,4}(?![^\\s]\\d)(?:\\s*[a|d]\\.?\\s*c\\.?|\\s*a\\.?\\s*d\\.?)?";
17
17
  export declare function parseYear(match: string): number;
18
18
  export declare const TIME_UNITS_PATTERN: string;
19
- export declare function parseTimeUnits(timeunitText: any): {
20
- [c in OpUnitType | QUnitType]?: number;
21
- };
19
+ import { Duration } from "../../calculation/duration.js";
20
+ export declare function parseDuration(timeunitText: any): Duration;
@@ -86,8 +86,8 @@ export const TIME_UNIT_DICTIONARY = {
86
86
  "hrs": "hour",
87
87
  "hora": "hour",
88
88
  "horas": "hour",
89
- "día": "d",
90
- "días": "d",
89
+ "día": "day",
90
+ "días": "day",
91
91
  "semana": "week",
92
92
  "semanas": "week",
93
93
  "mes": "month",
@@ -140,7 +140,7 @@ export function parseYear(match) {
140
140
  const SINGLE_TIME_UNIT_PATTERN = `(${NUMBER_PATTERN})\\s{0,5}(${matchAnyPattern(TIME_UNIT_DICTIONARY)})\\s{0,5}`;
141
141
  const SINGLE_TIME_UNIT_REGEX = new RegExp(SINGLE_TIME_UNIT_PATTERN, "i");
142
142
  export const TIME_UNITS_PATTERN = repeatedTimeunitPattern("", SINGLE_TIME_UNIT_PATTERN);
143
- export function parseTimeUnits(timeunitText) {
143
+ export function parseDuration(timeunitText) {
144
144
  const fragments = {};
145
145
  let remainingText = timeunitText;
146
146
  let match = SINGLE_TIME_UNIT_REGEX.exec(remainingText);
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/locales/es/constants.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/locales/es/constants.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,12 @@
1
1
  import { Meridiem } from "../../../types.js";
2
2
  import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
3
- import { assignTheNextDay } from "../../../utils/dayjs.js";
4
- import dayjs from "dayjs";
3
+ import { assignSimilarDate, implySimilarTime } from "../../../utils/dates.js";
5
4
  export default class ESCasualTimeParser extends AbstractParserWithWordBoundaryChecking {
6
5
  innerPattern() {
7
6
  return /(?:esta\s*)?(mañana|tarde|medianoche|mediodia|mediodía|noche)(?=\W|$)/i;
8
7
  }
9
8
  innerExtract(context, match) {
10
- const targetDate = dayjs(context.refDate);
9
+ const targetDate = context.refDate;
11
10
  const component = context.createParsingComponents();
12
11
  switch (match[1].toLowerCase()) {
13
12
  case "tarde":
@@ -23,7 +22,10 @@ export default class ESCasualTimeParser extends AbstractParserWithWordBoundaryCh
23
22
  component.imply("hour", 6);
24
23
  break;
25
24
  case "medianoche":
26
- assignTheNextDay(component, targetDate);
25
+ const nextDay = new Date(targetDate.getTime());
26
+ nextDay.setDate(nextDay.getDate() + 1);
27
+ assignSimilarDate(component, nextDay);
28
+ implySimilarTime(component, nextDay);
27
29
  component.imply("hour", 0);
28
30
  component.imply("minute", 0);
29
31
  component.imply("second", 0);
@@ -1 +1 @@
1
- {"version":3,"file":"ESCasualTimeParser.js","sourceRoot":"","sources":["../../../../../src/locales/es/parsers/ESCasualTimeParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,sCAAsC;IAClF,YAAY;QACR,OAAO,wEAAwE,CAAC;IACpF,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,SAAS,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;QACpD,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;YAC7B,KAAK,OAAO;gBACR,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBAC5B,MAAM;YAEV,KAAK,OAAO;gBACR,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBAC5B,MAAM;YAEV,KAAK,QAAQ;gBACT,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC3B,MAAM;YAEV,KAAK,YAAY;gBACb,gBAAgB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;gBACxC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC3B,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;gBAC7B,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;gBAC7B,MAAM;YAEV,KAAK,UAAU,CAAC;YAChB,KAAK,UAAU;gBACX,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBAC5B,MAAM;QACd,CAAC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ"}
1
+ {"version":3,"file":"ESCasualTimeParser.js","sourceRoot":"","sources":["../../../../../src/locales/es/parsers/ESCasualTimeParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE3E,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,sCAAsC;IAClF,YAAY;QACR,OAAO,wEAAwE,CAAC;IACpF,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;QACnC,MAAM,SAAS,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;QACpD,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;YAC7B,KAAK,OAAO;gBACR,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBAC5B,MAAM;YAEV,KAAK,OAAO;gBACR,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBAC5B,MAAM;YAEV,KAAK,QAAQ;gBACT,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC3B,MAAM;YAEV,KAAK,YAAY;gBACb,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC/C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;gBACvC,iBAAiB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBACtC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBACrC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC3B,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;gBAC7B,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;gBAC7B,MAAM;YAEV,KAAK,UAAU,CAAC;YAChB,KAAK,UAAU;gBACX,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBAC5B,MAAM;QACd,CAAC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ"}
@@ -1,4 +1,4 @@
1
- import { TIME_UNITS_PATTERN, parseTimeUnits } from "../constants.js";
1
+ import { TIME_UNITS_PATTERN, parseDuration } from "../constants.js";
2
2
  import { ParsingComponents } from "../../../results.js";
3
3
  import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
4
4
  export default class ESTimeUnitWithinFormatParser extends AbstractParserWithWordBoundaryChecking {
@@ -6,7 +6,7 @@ export default class ESTimeUnitWithinFormatParser extends AbstractParserWithWord
6
6
  return new RegExp(`(?:en|por|durante|de|dentro de)\\s*(${TIME_UNITS_PATTERN})(?=\\W|$)`, "i");
7
7
  }
8
8
  innerExtract(context, match) {
9
- const timeUnits = parseTimeUnits(match[1]);
9
+ const timeUnits = parseDuration(match[1]);
10
10
  return ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
11
11
  }
12
12
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ESTimeUnitWithinFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/es/parsers/ESTimeUnitWithinFormatParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAElE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAEhH,MAAM,CAAC,OAAO,OAAO,4BAA6B,SAAQ,sCAAsC;IAC5F,YAAY;QACR,OAAO,IAAI,MAAM,CAAC,uCAAuC,kBAAkB,YAAY,EAAE,GAAG,CAAC,CAAC;IAClG,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":"ESTimeUnitWithinFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/es/parsers/ESTimeUnitWithinFormatParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAEhH,MAAM,CAAC,OAAO,OAAO,4BAA6B,SAAQ,sCAAsC;IAC5F,YAAY;QACR,OAAO,IAAI,MAAM,CAAC,uCAAuC,kBAAkB,YAAY,EAAE,GAAG,CAAC,CAAC;IAClG,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,OAAO,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;CACJ"}
@@ -1,4 +1,4 @@
1
- import { OpUnitType, QUnitType } from "dayjs";
1
+ import { Timeunit } from "../../types.js";
2
2
  export declare const WEEKDAY_DICTIONARY: {
3
3
  [word: string]: number;
4
4
  };
@@ -9,7 +9,7 @@ export declare const INTEGER_WORD_DICTIONARY: {
9
9
  [word: string]: number;
10
10
  };
11
11
  export declare const TIME_UNIT_DICTIONARY: {
12
- [word: string]: OpUnitType | QUnitType;
12
+ [word: string]: Timeunit;
13
13
  };
14
14
  export declare const NUMBER_PATTERN: string;
15
15
  export declare function parseNumberPattern(match: string): number;
@@ -18,6 +18,5 @@ export declare function parseOrdinalNumberPattern(match: string): number;
18
18
  export declare const YEAR_PATTERN = "(?:[1-9][0-9]{0,3}\\s*(?:AC|AD|p\\.\\s*C(?:hr?)?\\.\\s*n\\.)|[1-2][0-9]{3}|[5-9][0-9])";
19
19
  export declare function parseYear(match: string): number;
20
20
  export declare const TIME_UNITS_PATTERN: string;
21
- export declare function parseTimeUnits(timeunitText: any): {
22
- [c in OpUnitType | QUnitType]?: number;
23
- };
21
+ import { Duration } from "../../calculation/duration.js";
22
+ export declare function parseDuration(timeunitText: any): Duration;
@@ -84,8 +84,8 @@ export const TIME_UNIT_DICTIONARY = {
84
84
  "hrs": "hour",
85
85
  "heure": "hour",
86
86
  "heures": "hour",
87
- "jour": "d",
88
- "jours": "d",
87
+ "jour": "day",
88
+ "jours": "day",
89
89
  "semaine": "week",
90
90
  "semaines": "week",
91
91
  "mois": "month",
@@ -142,7 +142,7 @@ export function parseYear(match) {
142
142
  const SINGLE_TIME_UNIT_PATTERN = `(${NUMBER_PATTERN})\\s{0,5}(${matchAnyPattern(TIME_UNIT_DICTIONARY)})\\s{0,5}`;
143
143
  const SINGLE_TIME_UNIT_REGEX = new RegExp(SINGLE_TIME_UNIT_PATTERN, "i");
144
144
  export const TIME_UNITS_PATTERN = repeatedTimeunitPattern("", SINGLE_TIME_UNIT_PATTERN);
145
- export function parseTimeUnits(timeunitText) {
145
+ export function parseDuration(timeunitText) {
146
146
  const fragments = {};
147
147
  let remainingText = timeunitText;
148
148
  let match = SINGLE_TIME_UNIT_REGEX.exec(remainingText);
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/locales/fr/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAE/E,MAAM,CAAC,MAAM,kBAAkB,GAA+B;IAC1D,UAAU,EAAE,CAAC;IACb,KAAK,EAAE,CAAC;IACR,OAAO,EAAE,CAAC;IACV,KAAK,EAAE,CAAC;IACR,OAAO,EAAE,CAAC;IACV,KAAK,EAAE,CAAC;IACR,UAAU,EAAE,CAAC;IACb,KAAK,EAAE,CAAC;IACR,OAAO,EAAE,CAAC;IACV,KAAK,EAAE,CAAC;IACR,UAAU,EAAE,CAAC;IACb,KAAK,EAAE,CAAC;IACR,QAAQ,EAAE,CAAC;IACX,KAAK,EAAE,CAAC;CACX,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAA+B;IACxD,SAAS,EAAE,CAAC;IACZ,KAAK,EAAE,CAAC;IACR,MAAM,EAAE,CAAC;IACT,SAAS,EAAE,CAAC;IACZ,KAAK,EAAE,CAAC;IACR,MAAM,EAAE,CAAC;IACT,SAAS,EAAE,CAAC;IACZ,KAAK,EAAE,CAAC;IACR,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,KAAK,EAAE,CAAC;IACR,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,KAAK,EAAE,CAAC;IACR,MAAM,EAAE,CAAC;IACT,KAAK,EAAE,CAAC;IACR,MAAM,EAAE,CAAC;IACT,KAAK,EAAE,CAAC;IACR,SAAS,EAAE,CAAC;IACZ,MAAM,EAAE,CAAC;IACT,KAAK,EAAE,CAAC;IACR,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,WAAW,EAAE,CAAC;IACd,KAAK,EAAE,CAAC;IACR,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,SAAS,EAAE,EAAE;IACb,KAAK,EAAE,EAAE;IACT,MAAM,EAAE,EAAE;IACV,UAAU,EAAE,EAAE;IACd,KAAK,EAAE,EAAE;IACT,MAAM,EAAE,EAAE;IACV,UAAU,EAAE,EAAE;IACd,UAAU,EAAE,EAAE;IACd,KAAK,EAAE,EAAE;IACT,MAAM,EAAE,EAAE;CACb,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAA+B;IAC/D,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,QAAQ,EAAE,CAAC;IACX,MAAM,EAAE,CAAC;IACT,KAAK,EAAE,CAAC;IACR,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,KAAK,EAAE,EAAE;IACT,MAAM,EAAE,EAAE;IACV,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,EAAE;CACf,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAA+C;IAC5E,KAAK,EAAE,QAAQ;IACf,SAAS,EAAE,QAAQ;IACnB,UAAU,EAAE,QAAQ;IACpB,KAAK,EAAE,QAAQ;IACf,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,QAAQ;IAClB,SAAS,EAAE,QAAQ;IACnB,GAAG,EAAE,MAAM;IACX,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,MAAM;IACb,OAAO,EAAE,MAAM;IACf,QAAQ,EAAE,MAAM;IAChB,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,GAAG;IACZ,SAAS,EAAE,MAAM;IACjB,UAAU,EAAE,MAAM;IAClB,MAAM,EAAE,OAAO;IACf,WAAW,EAAE,SAAS;IACtB,YAAY,EAAE,SAAS;IACvB,KAAK,EAAE,MAAM;IACb,OAAO,EAAE,MAAM;IACf,QAAQ,EAAE,MAAM;CACnB,CAAC;AAIF,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,eAAe,CAC/C,uBAAuB,CAC1B,mDAAmD,CAAC;AAErD,MAAM,UAAU,kBAAkB,CAAC,KAAa;IAC5C,MAAM,GAAG,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IAChC,IAAI,uBAAuB,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;QAC7C,OAAO,uBAAuB,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;SAAM,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACvC,OAAO,CAAC,CAAC;IACb,CAAC;SAAM,IAAI,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,CAAC;IACb,CAAC;SAAM,IAAI,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7B,OAAO,GAAG,CAAC;IACf,CAAC;IAED,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC;AAC3B,CAAC;AAID,MAAM,CAAC,MAAM,sBAAsB,GAAG,uBAAuB,CAAC;AAC9D,MAAM,UAAU,yBAAyB,CAAC,KAAa;IACnD,IAAI,GAAG,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IAC9B,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAClC,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC;AAKD,MAAM,CAAC,MAAM,YAAY,GAAG,wFAAwF,CAAC;AACrH,MAAM,UAAU,SAAS,CAAC,KAAa;IACnC,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACpB,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACjC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACxC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACrC,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAED,IAAI,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACjC,IAAI,UAAU,GAAG,GAAG,EAAE,CAAC;QACnB,IAAI,UAAU,GAAG,EAAE,EAAE,CAAC;YAClB,UAAU,GAAG,UAAU,GAAG,IAAI,CAAC;QACnC,CAAC;aAAM,CAAC;YACJ,UAAU,GAAG,UAAU,GAAG,IAAI,CAAC;QACnC,CAAC;IACL,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC;AAID,MAAM,wBAAwB,GAAG,IAAI,cAAc,aAAa,eAAe,CAAC,oBAAoB,CAAC,WAAW,CAAC;AACjH,MAAM,sBAAsB,GAAG,IAAI,MAAM,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;AAEzE,MAAM,CAAC,MAAM,kBAAkB,GAAG,uBAAuB,CAAC,EAAE,EAAE,wBAAwB,CAAC,CAAC;AAExF,MAAM,UAAU,cAAc,CAAC,YAAY;IACvC,MAAM,SAAS,GAAG,EAAE,CAAC;IACrB,IAAI,aAAa,GAAG,YAAY,CAAC;IACjC,IAAI,KAAK,GAAG,sBAAsB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACvD,OAAO,KAAK,EAAE,CAAC;QACX,uBAAuB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC1C,aAAa,GAAG,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACzD,KAAK,GAAG,sBAAsB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,SAAuD,CAAC;AACnE,CAAC;AAED,SAAS,uBAAuB,CAAC,SAAS,EAAE,KAAK;IAC7C,MAAM,GAAG,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACzC,MAAM,IAAI,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IAC1D,SAAS,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;AAC1B,CAAC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/locales/fr/constants.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,13 @@
1
- import dayjs from "dayjs";
2
1
  import { Meridiem } from "../../../types.js";
3
2
  import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
4
- import { assignSimilarDate } from "../../../utils/dayjs.js";
3
+ import { assignSimilarDate } from "../../../utils/dates.js";
5
4
  import * as references from "../../../common/casualReferences.js";
6
5
  export default class FRCasualDateParser extends AbstractParserWithWordBoundaryChecking {
7
6
  innerPattern(context) {
8
7
  return /(maintenant|aujourd'hui|demain|hier|cette\s*nuit|la\s*veille)(?=\W|$)/i;
9
8
  }
10
9
  innerExtract(context, match) {
11
- let targetDate = dayjs(context.refDate);
10
+ const targetDate = context.refDate;
12
11
  const lowerText = match[0].toLowerCase();
13
12
  const component = context.createParsingComponents();
14
13
  switch (lowerText) {
@@ -27,8 +26,9 @@ export default class FRCasualDateParser extends AbstractParserWithWordBoundaryCh
27
26
  component.imply("meridiem", Meridiem.PM);
28
27
  }
29
28
  else if (lowerText.match(/la\s*veille/)) {
30
- targetDate = targetDate.add(-1, "day");
31
- assignSimilarDate(component, targetDate);
29
+ const previousDay = new Date(targetDate.getTime());
30
+ previousDay.setDate(previousDay.getDate() - 1);
31
+ assignSimilarDate(component, previousDay);
32
32
  component.imply("hour", 0);
33
33
  }
34
34
  }
@@ -1 +1 @@
1
- {"version":3,"file":"FRCasualDateParser.js","sourceRoot":"","sources":["../../../../../src/locales/fr/parsers/FRCasualDateParser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,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,CAAC,OAAO,OAAO,kBAAmB,SAAQ,sCAAsC;IAClF,YAAY,CAAC,OAAuB;QAChC,OAAO,wEAAwE,CAAC;IACpF,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,CAAC;YAChB,KAAK,YAAY;gBACb,OAAO,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAE7C,KAAK,aAAa;gBACd,OAAO,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAE/C,KAAK,MAAM;gBACP,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;gBACI,IAAI,SAAS,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;oBAClC,iBAAiB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;oBACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;oBAC5B,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC7C,CAAC;qBAAM,IAAI,SAAS,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;oBACxC,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;oBACvC,iBAAiB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;oBACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC/B,CAAC;QACT,CAAC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ"}
1
+ {"version":3,"file":"FRCasualDateParser.js","sourceRoot":"","sources":["../../../../../src/locales/fr/parsers/FRCasualDateParser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,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,CAAC,OAAO,OAAO,kBAAmB,SAAQ,sCAAsC;IAClF,YAAY,CAAC,OAAuB;QAChC,OAAO,wEAAwE,CAAC;IACpF,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;QACnC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;QAEpD,QAAQ,SAAS,EAAE,CAAC;YAChB,KAAK,YAAY;gBACb,OAAO,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAE7C,KAAK,aAAa;gBACd,OAAO,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAE/C,KAAK,MAAM;gBACP,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;gBACI,IAAI,SAAS,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;oBAClC,iBAAiB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;oBACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;oBAC5B,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC7C,CAAC;qBAAM,IAAI,SAAS,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;oBACxC,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC;oBACnD,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;oBAC/C,iBAAiB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;oBAC1C,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC/B,CAAC;QACT,CAAC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ"}
@@ -1,7 +1,7 @@
1
- import { parseTimeUnits, TIME_UNITS_PATTERN } from "../constants.js";
1
+ import { parseDuration, TIME_UNITS_PATTERN } from "../constants.js";
2
2
  import { ParsingComponents } from "../../../results.js";
3
3
  import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
4
- import { reverseTimeUnits } from "../../../utils/timeunits.js";
4
+ import { reverseDuration } from "../../../calculation/duration.js";
5
5
  export default class FRTimeUnitAgoFormatParser extends AbstractParserWithWordBoundaryChecking {
6
6
  constructor() {
7
7
  super();
@@ -10,8 +10,8 @@ export default class FRTimeUnitAgoFormatParser extends AbstractParserWithWordBou
10
10
  return new RegExp(`il y a\\s*(${TIME_UNITS_PATTERN})(?=(?:\\W|$))`, "i");
11
11
  }
12
12
  innerExtract(context, match) {
13
- const timeUnits = parseTimeUnits(match[1]);
14
- const outputTimeUnits = reverseTimeUnits(timeUnits);
13
+ const timeUnits = parseDuration(match[1]);
14
+ const outputTimeUnits = reverseDuration(timeUnits);
15
15
  return ParsingComponents.createRelativeFromReference(context.reference, outputTimeUnits);
16
16
  }
17
17
  }
@@ -1 +1 @@
1
- {"version":3,"file":"FRTimeUnitAgoFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/fr/parsers/FRTimeUnitAgoFormatParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClE,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,CAAC,OAAO,OAAO,yBAA0B,SAAQ,sCAAsC;IACzF;QACI,KAAK,EAAE,CAAC;IACZ,CAAC;IAED,YAAY;QACR,OAAO,IAAI,MAAM,CAAC,cAAc,kBAAkB,gBAAgB,EAAE,GAAG,CAAC,CAAC;IAC7E,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":"FRTimeUnitAgoFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/fr/parsers/FRTimeUnitAgoFormatParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,sCAAsC;IACzF;QACI,KAAK,EAAE,CAAC;IACZ,CAAC;IAED,YAAY;QACR,OAAO,IAAI,MAAM,CAAC,cAAc,kBAAkB,gBAAgB,EAAE,GAAG,CAAC,CAAC;IAC7E,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,MAAM,eAAe,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAEnD,OAAO,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IAC7F,CAAC;CACJ"}
@@ -1,8 +1,8 @@
1
1
  import { NUMBER_PATTERN, parseNumberPattern, TIME_UNIT_DICTIONARY } from "../constants.js";
2
2
  import { ParsingComponents } from "../../../results.js";
3
3
  import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
4
- import { reverseTimeUnits } from "../../../utils/timeunits.js";
5
4
  import { matchAnyPattern } from "../../../utils/pattern.js";
5
+ import { reverseDuration } from "../../../calculation/duration.js";
6
6
  export default class FRTimeUnitAgoFormatParser extends AbstractParserWithWordBoundaryChecking {
7
7
  constructor() {
8
8
  super();
@@ -25,7 +25,7 @@ export default class FRTimeUnitAgoFormatParser extends AbstractParserWithWordBou
25
25
  return;
26
26
  }
27
27
  if (/derni[eè]re?s?/.test(modifier) || /pass[ée]e?s?/.test(modifier) || /pr[ée]c[ée]dents?/.test(modifier)) {
28
- timeUnits = reverseTimeUnits(timeUnits);
28
+ timeUnits = reverseDuration(timeUnits);
29
29
  }
30
30
  return ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
31
31
  }
@@ -1 +1 @@
1
- {"version":3,"file":"FRTimeUnitRelativeFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/fr/parsers/FRTimeUnitRelativeFormatParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,sCAAsC;IACzF;QACI,KAAK,EAAE,CAAC;IACZ,CAAC;IAED,YAAY;QACR,OAAO,IAAI,MAAM,CACb,4BAA4B;YACxB,IAAI,cAAc,IAAI;YACtB,mFAAmF;YACnF,QAAQ,eAAe,CAAC,oBAAoB,CAAC,GAAG;YAChD,mFAAmF,EACvF,GAAG,CACN,CAAC;IACN,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxD,MAAM,IAAI,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAC1D,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,SAAS,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;QAGtB,IAAI,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC1C,QAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;QAClC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO;QACX,CAAC;QAED,IAAI,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzG,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC5C,CAAC;QAED,OAAO,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;CACJ"}
1
+ {"version":3,"file":"FRTimeUnitRelativeFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/fr/parsers/FRTimeUnitRelativeFormatParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,sCAAsC;IACzF;QACI,KAAK,EAAE,CAAC;IACZ,CAAC;IAED,YAAY;QACR,OAAO,IAAI,MAAM,CACb,4BAA4B;YACxB,IAAI,cAAc,IAAI;YACtB,mFAAmF;YACnF,QAAQ,eAAe,CAAC,oBAAoB,CAAC,GAAG;YAChD,mFAAmF,EACvF,GAAG,CACN,CAAC;IACN,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxD,MAAM,IAAI,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAC1D,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,SAAS,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;QAGtB,IAAI,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC1C,QAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;QAClC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO;QACX,CAAC;QAED,IAAI,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzG,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAC3C,CAAC;QAED,OAAO,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;CACJ"}
@@ -1,4 +1,4 @@
1
- import { TIME_UNITS_PATTERN, parseTimeUnits } from "../constants.js";
1
+ import { TIME_UNITS_PATTERN, parseDuration } from "../constants.js";
2
2
  import { ParsingComponents } from "../../../results.js";
3
3
  import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
4
4
  export default class FRTimeUnitWithinFormatParser extends AbstractParserWithWordBoundaryChecking {
@@ -6,7 +6,7 @@ export default class FRTimeUnitWithinFormatParser extends AbstractParserWithWord
6
6
  return new RegExp(`(?:dans|en|pour|pendant|de)\\s*(${TIME_UNITS_PATTERN})(?=\\W|$)`, "i");
7
7
  }
8
8
  innerExtract(context, match) {
9
- const timeUnits = parseTimeUnits(match[1]);
9
+ const timeUnits = parseDuration(match[1]);
10
10
  return ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
11
11
  }
12
12
  }