chrono-node 2.8.4 → 2.8.5

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 (478) 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.js +25 -27
  11. package/dist/cjs/common/casualReferences.js.map +1 -1
  12. package/dist/cjs/common/parsers/AbstractTimeExpressionParser.js +3 -0
  13. package/dist/cjs/common/parsers/AbstractTimeExpressionParser.js.map +1 -1
  14. package/dist/cjs/common/refiners/AbstractMergeDateRangeRefiner.js +20 -19
  15. package/dist/cjs/common/refiners/AbstractMergeDateRangeRefiner.js.map +1 -1
  16. package/dist/cjs/common/refiners/ForwardDateRefiner.js +16 -24
  17. package/dist/cjs/common/refiners/ForwardDateRefiner.js.map +1 -1
  18. package/dist/cjs/index.d.ts +3 -1
  19. package/dist/cjs/index.js +5 -1
  20. package/dist/cjs/index.js.map +1 -1
  21. package/dist/cjs/locales/de/constants.d.ts +4 -4
  22. package/dist/cjs/locales/de/constants.js +5 -5
  23. package/dist/cjs/locales/de/constants.js.map +1 -1
  24. package/dist/cjs/locales/de/parsers/DECasualDateParser.js +18 -15
  25. package/dist/cjs/locales/de/parsers/DECasualDateParser.js.map +1 -1
  26. package/dist/cjs/locales/de/parsers/DECasualTimeParser.js +4 -9
  27. package/dist/cjs/locales/de/parsers/DECasualTimeParser.js.map +1 -1
  28. package/dist/cjs/locales/de/parsers/DETimeUnitRelativeFormatParser.js +2 -2
  29. package/dist/cjs/locales/de/parsers/DETimeUnitRelativeFormatParser.js.map +1 -1
  30. package/dist/cjs/locales/de/parsers/DETimeUnitWithinFormatParser.js +1 -1
  31. package/dist/cjs/locales/de/parsers/DETimeUnitWithinFormatParser.js.map +1 -1
  32. package/dist/cjs/locales/en/constants.d.ts +5 -6
  33. package/dist/cjs/locales/en/constants.js +5 -5
  34. package/dist/cjs/locales/en/constants.js.map +1 -1
  35. package/dist/cjs/locales/en/parsers/ENCasualDateParser.js +7 -9
  36. package/dist/cjs/locales/en/parsers/ENCasualDateParser.js.map +1 -1
  37. package/dist/cjs/locales/en/parsers/ENRelativeDateFormatParser.js +14 -18
  38. package/dist/cjs/locales/en/parsers/ENRelativeDateFormatParser.js.map +1 -1
  39. package/dist/cjs/locales/en/parsers/ENTimeUnitAgoFormatParser.js +1 -1
  40. package/dist/cjs/locales/en/parsers/ENTimeUnitAgoFormatParser.js.map +1 -1
  41. package/dist/cjs/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js +1 -1
  42. package/dist/cjs/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js.map +1 -1
  43. package/dist/cjs/locales/en/parsers/ENTimeUnitLaterFormatParser.js +1 -1
  44. package/dist/cjs/locales/en/parsers/ENTimeUnitLaterFormatParser.js.map +1 -1
  45. package/dist/cjs/locales/en/parsers/ENTimeUnitWithinFormatParser.js +1 -5
  46. package/dist/cjs/locales/en/parsers/ENTimeUnitWithinFormatParser.js.map +1 -1
  47. package/dist/cjs/locales/en/refiners/ENMergeRelativeAfterDateRefiner.js +3 -3
  48. package/dist/cjs/locales/en/refiners/ENMergeRelativeAfterDateRefiner.js.map +1 -1
  49. package/dist/cjs/locales/en/refiners/ENMergeRelativeFollowByDateRefiner.js +1 -1
  50. package/dist/cjs/locales/en/refiners/ENMergeRelativeFollowByDateRefiner.js.map +1 -1
  51. package/dist/cjs/locales/es/constants.d.ts +4 -5
  52. package/dist/cjs/locales/es/constants.js +4 -4
  53. package/dist/cjs/locales/es/constants.js.map +1 -1
  54. package/dist/cjs/locales/es/parsers/ESCasualTimeParser.js +6 -7
  55. package/dist/cjs/locales/es/parsers/ESCasualTimeParser.js.map +1 -1
  56. package/dist/cjs/locales/es/parsers/ESTimeUnitWithinFormatParser.js +1 -1
  57. package/dist/cjs/locales/es/parsers/ESTimeUnitWithinFormatParser.js.map +1 -1
  58. package/dist/cjs/locales/fr/constants.d.ts +4 -5
  59. package/dist/cjs/locales/fr/constants.js +4 -4
  60. package/dist/cjs/locales/fr/constants.js.map +1 -1
  61. package/dist/cjs/locales/fr/parsers/FRCasualDateParser.js +6 -9
  62. package/dist/cjs/locales/fr/parsers/FRCasualDateParser.js.map +1 -1
  63. package/dist/cjs/locales/fr/parsers/FRTimeUnitAgoFormatParser.js +3 -3
  64. package/dist/cjs/locales/fr/parsers/FRTimeUnitAgoFormatParser.js.map +1 -1
  65. package/dist/cjs/locales/fr/parsers/FRTimeUnitRelativeFormatParser.js +2 -2
  66. package/dist/cjs/locales/fr/parsers/FRTimeUnitRelativeFormatParser.js.map +1 -1
  67. package/dist/cjs/locales/fr/parsers/FRTimeUnitWithinFormatParser.js +1 -1
  68. package/dist/cjs/locales/fr/parsers/FRTimeUnitWithinFormatParser.js.map +1 -1
  69. package/dist/cjs/locales/it/constants.d.ts +4 -4
  70. package/dist/cjs/locales/it/constants.js +4 -4
  71. package/dist/cjs/locales/it/constants.js.map +1 -1
  72. package/dist/cjs/locales/it/parsers/ITCasualDateParser.d.ts +1 -1
  73. package/dist/cjs/locales/it/parsers/ITCasualDateParser.js +9 -11
  74. package/dist/cjs/locales/it/parsers/ITCasualDateParser.js.map +1 -1
  75. package/dist/cjs/locales/it/parsers/ITCasualTimeParser.d.ts +1 -1
  76. package/dist/cjs/locales/it/parsers/ITCasualTimeParser.js +8 -9
  77. package/dist/cjs/locales/it/parsers/ITCasualTimeParser.js.map +1 -1
  78. package/dist/cjs/locales/it/parsers/ITRelativeDateFormatParser.js +14 -18
  79. package/dist/cjs/locales/it/parsers/ITRelativeDateFormatParser.js.map +1 -1
  80. package/dist/cjs/locales/it/parsers/ITTimeUnitAgoFormatParser.js +3 -3
  81. package/dist/cjs/locales/it/parsers/ITTimeUnitAgoFormatParser.js.map +1 -1
  82. package/dist/cjs/locales/it/parsers/ITTimeUnitCasualRelativeFormatParser.js +3 -3
  83. package/dist/cjs/locales/it/parsers/ITTimeUnitCasualRelativeFormatParser.js.map +1 -1
  84. package/dist/cjs/locales/it/parsers/ITTimeUnitLaterFormatParser.js +1 -1
  85. package/dist/cjs/locales/it/parsers/ITTimeUnitLaterFormatParser.js.map +1 -1
  86. package/dist/cjs/locales/it/parsers/ITTimeUnitWithinFormatParser.js +1 -1
  87. package/dist/cjs/locales/it/parsers/ITTimeUnitWithinFormatParser.js.map +1 -1
  88. package/dist/cjs/locales/it/refiners/ITMergeRelativeDateRefiner.js +3 -3
  89. package/dist/cjs/locales/it/refiners/ITMergeRelativeDateRefiner.js.map +1 -1
  90. package/dist/cjs/locales/ja/parsers/JPCasualDateParser.js +4 -8
  91. package/dist/cjs/locales/ja/parsers/JPCasualDateParser.js.map +1 -1
  92. package/dist/cjs/locales/ja/parsers/JPStandardParser.js +1 -6
  93. package/dist/cjs/locales/ja/parsers/JPStandardParser.js.map +1 -1
  94. package/dist/cjs/locales/ja/parsers/JPTimeExpressionParser.d.ts +1 -1
  95. package/dist/cjs/locales/ja/parsers/JPTimeExpressionParser.js +77 -187
  96. package/dist/cjs/locales/ja/parsers/JPTimeExpressionParser.js.map +1 -1
  97. package/dist/cjs/locales/nl/constants.d.ts +4 -4
  98. package/dist/cjs/locales/nl/constants.js +4 -4
  99. package/dist/cjs/locales/nl/constants.js.map +1 -1
  100. package/dist/cjs/locales/nl/parsers/NLCasualDateTimeParser.js +10 -9
  101. package/dist/cjs/locales/nl/parsers/NLCasualDateTimeParser.js.map +1 -1
  102. package/dist/cjs/locales/nl/parsers/NLCasualTimeParser.js +6 -7
  103. package/dist/cjs/locales/nl/parsers/NLCasualTimeParser.js.map +1 -1
  104. package/dist/cjs/locales/nl/parsers/NLRelativeDateFormatParser.js +14 -18
  105. package/dist/cjs/locales/nl/parsers/NLRelativeDateFormatParser.js.map +1 -1
  106. package/dist/cjs/locales/nl/parsers/NLTimeUnitAgoFormatParser.js +3 -3
  107. package/dist/cjs/locales/nl/parsers/NLTimeUnitAgoFormatParser.js.map +1 -1
  108. package/dist/cjs/locales/nl/parsers/NLTimeUnitCasualRelativeFormatParser.js +3 -3
  109. package/dist/cjs/locales/nl/parsers/NLTimeUnitCasualRelativeFormatParser.js.map +1 -1
  110. package/dist/cjs/locales/nl/parsers/NLTimeUnitLaterFormatParser.js +1 -1
  111. package/dist/cjs/locales/nl/parsers/NLTimeUnitLaterFormatParser.js.map +1 -1
  112. package/dist/cjs/locales/nl/parsers/NLTimeUnitWithinFormatParser.js +1 -1
  113. package/dist/cjs/locales/nl/parsers/NLTimeUnitWithinFormatParser.js.map +1 -1
  114. package/dist/cjs/locales/pt/parsers/PTCasualTimeParser.js +6 -7
  115. package/dist/cjs/locales/pt/parsers/PTCasualTimeParser.js.map +1 -1
  116. package/dist/cjs/locales/ru/constants.d.ts +4 -4
  117. package/dist/cjs/locales/ru/constants.js +7 -7
  118. package/dist/cjs/locales/ru/constants.js.map +1 -1
  119. package/dist/cjs/locales/ru/parsers/RUCasualTimeParser.js +6 -9
  120. package/dist/cjs/locales/ru/parsers/RUCasualTimeParser.js.map +1 -1
  121. package/dist/cjs/locales/ru/parsers/RURelativeDateFormatParser.js +14 -18
  122. package/dist/cjs/locales/ru/parsers/RURelativeDateFormatParser.js.map +1 -1
  123. package/dist/cjs/locales/ru/parsers/RUTimeUnitAgoFormatParser.js +3 -3
  124. package/dist/cjs/locales/ru/parsers/RUTimeUnitAgoFormatParser.js.map +1 -1
  125. package/dist/cjs/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js +3 -3
  126. package/dist/cjs/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js.map +1 -1
  127. package/dist/cjs/locales/ru/parsers/RUTimeUnitWithinFormatParser.js +1 -1
  128. package/dist/cjs/locales/ru/parsers/RUTimeUnitWithinFormatParser.js.map +1 -1
  129. package/dist/cjs/locales/sv/constants.d.ts +8 -4
  130. package/dist/cjs/locales/sv/constants.js +25 -7
  131. package/dist/cjs/locales/sv/constants.js.map +1 -1
  132. package/dist/cjs/locales/sv/index.js +2 -0
  133. package/dist/cjs/locales/sv/index.js.map +1 -1
  134. package/dist/cjs/locales/sv/parsers/SVCasualDateParser.js +14 -13
  135. package/dist/cjs/locales/sv/parsers/SVCasualDateParser.js.map +1 -1
  136. package/dist/cjs/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.d.ts +9 -0
  137. package/dist/cjs/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.js +34 -0
  138. package/dist/cjs/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.js.map +1 -0
  139. package/dist/cjs/locales/uk/constants.d.ts +4 -4
  140. package/dist/cjs/locales/uk/constants.js +8 -8
  141. package/dist/cjs/locales/uk/constants.js.map +1 -1
  142. package/dist/cjs/locales/uk/parsers/UKCasualTimeParser.js +6 -9
  143. package/dist/cjs/locales/uk/parsers/UKCasualTimeParser.js.map +1 -1
  144. package/dist/cjs/locales/uk/parsers/UKRelativeDateFormatParser.js +14 -18
  145. package/dist/cjs/locales/uk/parsers/UKRelativeDateFormatParser.js.map +1 -1
  146. package/dist/cjs/locales/uk/parsers/UKTimeUnitAgoFormatParser.js +3 -3
  147. package/dist/cjs/locales/uk/parsers/UKTimeUnitAgoFormatParser.js.map +1 -1
  148. package/dist/cjs/locales/uk/parsers/UKTimeUnitCasualRelativeFormatParser.js +3 -3
  149. package/dist/cjs/locales/uk/parsers/UKTimeUnitCasualRelativeFormatParser.js.map +1 -1
  150. package/dist/cjs/locales/uk/parsers/UKTimeUnitWithinFormatParser.js +1 -1
  151. package/dist/cjs/locales/uk/parsers/UKTimeUnitWithinFormatParser.js.map +1 -1
  152. package/dist/cjs/locales/zh/hans/parsers/ZHHansCasualDateParser.js +23 -27
  153. package/dist/cjs/locales/zh/hans/parsers/ZHHansCasualDateParser.js.map +1 -1
  154. package/dist/cjs/locales/zh/hans/parsers/ZHHansDateParser.js +2 -7
  155. package/dist/cjs/locales/zh/hans/parsers/ZHHansDateParser.js.map +1 -1
  156. package/dist/cjs/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.js +20 -21
  157. package/dist/cjs/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.js.map +1 -1
  158. package/dist/cjs/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.js +17 -22
  159. package/dist/cjs/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.js.map +1 -1
  160. package/dist/cjs/locales/zh/hans/parsers/ZHHansTimeExpressionParser.js +71 -76
  161. package/dist/cjs/locales/zh/hans/parsers/ZHHansTimeExpressionParser.js.map +1 -1
  162. package/dist/cjs/locales/zh/hans/parsers/ZHHansWeekdayParser.js +14 -19
  163. package/dist/cjs/locales/zh/hans/parsers/ZHHansWeekdayParser.js.map +1 -1
  164. package/dist/cjs/locales/zh/hant/parsers/ZHHantCasualDateParser.js +23 -27
  165. package/dist/cjs/locales/zh/hant/parsers/ZHHantCasualDateParser.js.map +1 -1
  166. package/dist/cjs/locales/zh/hant/parsers/ZHHantDateParser.js +2 -7
  167. package/dist/cjs/locales/zh/hant/parsers/ZHHantDateParser.js.map +1 -1
  168. package/dist/cjs/locales/zh/hant/parsers/ZHHantDeadlineFormatParser.js +20 -21
  169. package/dist/cjs/locales/zh/hant/parsers/ZHHantDeadlineFormatParser.js.map +1 -1
  170. package/dist/cjs/locales/zh/hant/parsers/ZHHantRelationWeekdayParser.js +17 -22
  171. package/dist/cjs/locales/zh/hant/parsers/ZHHantRelationWeekdayParser.js.map +1 -1
  172. package/dist/cjs/locales/zh/hant/parsers/ZHHantTimeExpressionParser.js +73 -78
  173. package/dist/cjs/locales/zh/hant/parsers/ZHHantTimeExpressionParser.js.map +1 -1
  174. package/dist/cjs/locales/zh/hant/parsers/ZHHantWeekdayParser.js +14 -19
  175. package/dist/cjs/locales/zh/hant/parsers/ZHHantWeekdayParser.js.map +1 -1
  176. package/dist/cjs/results.d.ts +3 -2
  177. package/dist/cjs/results.js +74 -51
  178. package/dist/cjs/results.js.map +1 -1
  179. package/dist/cjs/timezone.js +1 -6
  180. package/dist/cjs/timezone.js.map +1 -1
  181. package/dist/cjs/types.d.ts +1 -1
  182. package/dist/esm/calculation/duration.d.ts +5 -0
  183. package/dist/esm/calculation/duration.js +5 -0
  184. package/dist/esm/calculation/duration.js.map +1 -1
  185. package/dist/esm/calculation/mergingCalculation.js +5 -4
  186. package/dist/esm/calculation/mergingCalculation.js.map +1 -1
  187. package/dist/esm/calculation/weekdays.js +1 -2
  188. package/dist/esm/calculation/weekdays.js.map +1 -1
  189. package/dist/esm/calculation/years.js +11 -13
  190. package/dist/esm/calculation/years.js.map +1 -1
  191. package/dist/esm/common/casualReferences.js +18 -17
  192. package/dist/esm/common/casualReferences.js.map +1 -1
  193. package/dist/esm/common/parsers/AbstractTimeExpressionParser.js +3 -0
  194. package/dist/esm/common/parsers/AbstractTimeExpressionParser.js.map +1 -1
  195. package/dist/esm/common/refiners/AbstractMergeDateRangeRefiner.js +20 -19
  196. package/dist/esm/common/refiners/AbstractMergeDateRangeRefiner.js.map +1 -1
  197. package/dist/esm/common/refiners/ForwardDateRefiner.js +16 -21
  198. package/dist/esm/common/refiners/ForwardDateRefiner.js.map +1 -1
  199. package/dist/esm/index.d.ts +3 -1
  200. package/dist/esm/index.js +3 -1
  201. package/dist/esm/index.js.map +1 -1
  202. package/dist/esm/locales/de/constants.d.ts +4 -4
  203. package/dist/esm/locales/de/constants.js +4 -4
  204. package/dist/esm/locales/de/constants.js.map +1 -1
  205. package/dist/esm/locales/de/parsers/DECasualDateParser.js +13 -10
  206. package/dist/esm/locales/de/parsers/DECasualDateParser.js.map +1 -1
  207. package/dist/esm/locales/de/parsers/DECasualTimeParser.js +3 -5
  208. package/dist/esm/locales/de/parsers/DECasualTimeParser.js.map +1 -1
  209. package/dist/esm/locales/de/parsers/DETimeUnitRelativeFormatParser.js +2 -2
  210. package/dist/esm/locales/de/parsers/DETimeUnitRelativeFormatParser.js.map +1 -1
  211. package/dist/esm/locales/de/parsers/DETimeUnitWithinFormatParser.js +2 -2
  212. package/dist/esm/locales/de/parsers/DETimeUnitWithinFormatParser.js.map +1 -1
  213. package/dist/esm/locales/en/constants.d.ts +5 -6
  214. package/dist/esm/locales/en/constants.js +7 -7
  215. package/dist/esm/locales/en/constants.js.map +1 -1
  216. package/dist/esm/locales/en/parsers/ENCasualDateParser.js +6 -5
  217. package/dist/esm/locales/en/parsers/ENCasualDateParser.js.map +1 -1
  218. package/dist/esm/locales/en/parsers/ENRelativeDateFormatParser.js +14 -15
  219. package/dist/esm/locales/en/parsers/ENRelativeDateFormatParser.js.map +1 -1
  220. package/dist/esm/locales/en/parsers/ENTimeUnitAgoFormatParser.js +2 -2
  221. package/dist/esm/locales/en/parsers/ENTimeUnitAgoFormatParser.js.map +1 -1
  222. package/dist/esm/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js +2 -2
  223. package/dist/esm/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js.map +1 -1
  224. package/dist/esm/locales/en/parsers/ENTimeUnitLaterFormatParser.js +2 -2
  225. package/dist/esm/locales/en/parsers/ENTimeUnitLaterFormatParser.js.map +1 -1
  226. package/dist/esm/locales/en/parsers/ENTimeUnitWithinFormatParser.js +2 -6
  227. package/dist/esm/locales/en/parsers/ENTimeUnitWithinFormatParser.js.map +1 -1
  228. package/dist/esm/locales/en/refiners/ENMergeRelativeAfterDateRefiner.js +4 -4
  229. package/dist/esm/locales/en/refiners/ENMergeRelativeAfterDateRefiner.js.map +1 -1
  230. package/dist/esm/locales/en/refiners/ENMergeRelativeFollowByDateRefiner.js +2 -2
  231. package/dist/esm/locales/en/refiners/ENMergeRelativeFollowByDateRefiner.js.map +1 -1
  232. package/dist/esm/locales/es/constants.d.ts +4 -5
  233. package/dist/esm/locales/es/constants.js +3 -3
  234. package/dist/esm/locales/es/constants.js.map +1 -1
  235. package/dist/esm/locales/es/parsers/ESCasualTimeParser.js +6 -4
  236. package/dist/esm/locales/es/parsers/ESCasualTimeParser.js.map +1 -1
  237. package/dist/esm/locales/es/parsers/ESTimeUnitWithinFormatParser.js +2 -2
  238. package/dist/esm/locales/es/parsers/ESTimeUnitWithinFormatParser.js.map +1 -1
  239. package/dist/esm/locales/fr/constants.d.ts +4 -5
  240. package/dist/esm/locales/fr/constants.js +3 -3
  241. package/dist/esm/locales/fr/constants.js.map +1 -1
  242. package/dist/esm/locales/fr/parsers/FRCasualDateParser.js +5 -5
  243. package/dist/esm/locales/fr/parsers/FRCasualDateParser.js.map +1 -1
  244. package/dist/esm/locales/fr/parsers/FRTimeUnitAgoFormatParser.js +4 -4
  245. package/dist/esm/locales/fr/parsers/FRTimeUnitAgoFormatParser.js.map +1 -1
  246. package/dist/esm/locales/fr/parsers/FRTimeUnitRelativeFormatParser.js +2 -2
  247. package/dist/esm/locales/fr/parsers/FRTimeUnitRelativeFormatParser.js.map +1 -1
  248. package/dist/esm/locales/fr/parsers/FRTimeUnitWithinFormatParser.js +2 -2
  249. package/dist/esm/locales/fr/parsers/FRTimeUnitWithinFormatParser.js.map +1 -1
  250. package/dist/esm/locales/it/constants.d.ts +4 -4
  251. package/dist/esm/locales/it/constants.js +3 -3
  252. package/dist/esm/locales/it/constants.js.map +1 -1
  253. package/dist/esm/locales/it/parsers/ITCasualDateParser.d.ts +1 -1
  254. package/dist/esm/locales/it/parsers/ITCasualDateParser.js +7 -6
  255. package/dist/esm/locales/it/parsers/ITCasualDateParser.js.map +1 -1
  256. package/dist/esm/locales/it/parsers/ITCasualTimeParser.d.ts +1 -1
  257. package/dist/esm/locales/it/parsers/ITCasualTimeParser.js +7 -5
  258. package/dist/esm/locales/it/parsers/ITCasualTimeParser.js.map +1 -1
  259. package/dist/esm/locales/it/parsers/ITRelativeDateFormatParser.js +14 -15
  260. package/dist/esm/locales/it/parsers/ITRelativeDateFormatParser.js.map +1 -1
  261. package/dist/esm/locales/it/parsers/ITTimeUnitAgoFormatParser.js +4 -4
  262. package/dist/esm/locales/it/parsers/ITTimeUnitAgoFormatParser.js.map +1 -1
  263. package/dist/esm/locales/it/parsers/ITTimeUnitCasualRelativeFormatParser.js +4 -4
  264. package/dist/esm/locales/it/parsers/ITTimeUnitCasualRelativeFormatParser.js.map +1 -1
  265. package/dist/esm/locales/it/parsers/ITTimeUnitLaterFormatParser.js +2 -2
  266. package/dist/esm/locales/it/parsers/ITTimeUnitLaterFormatParser.js.map +1 -1
  267. package/dist/esm/locales/it/parsers/ITTimeUnitWithinFormatParser.js +2 -2
  268. package/dist/esm/locales/it/parsers/ITTimeUnitWithinFormatParser.js.map +1 -1
  269. package/dist/esm/locales/it/refiners/ITMergeRelativeDateRefiner.js +4 -4
  270. package/dist/esm/locales/it/refiners/ITMergeRelativeDateRefiner.js.map +1 -1
  271. package/dist/esm/locales/ja/parsers/JPCasualDateParser.js +4 -5
  272. package/dist/esm/locales/ja/parsers/JPCasualDateParser.js.map +1 -1
  273. package/dist/esm/locales/ja/parsers/JPStandardParser.js +1 -3
  274. package/dist/esm/locales/ja/parsers/JPStandardParser.js.map +1 -1
  275. package/dist/esm/locales/ja/parsers/JPTimeExpressionParser.d.ts +1 -1
  276. package/dist/esm/locales/ja/parsers/JPTimeExpressionParser.js +75 -186
  277. package/dist/esm/locales/ja/parsers/JPTimeExpressionParser.js.map +1 -1
  278. package/dist/esm/locales/nl/constants.d.ts +4 -4
  279. package/dist/esm/locales/nl/constants.js +3 -3
  280. package/dist/esm/locales/nl/constants.js.map +1 -1
  281. package/dist/esm/locales/nl/parsers/NLCasualDateTimeParser.js +9 -5
  282. package/dist/esm/locales/nl/parsers/NLCasualDateTimeParser.js.map +1 -1
  283. package/dist/esm/locales/nl/parsers/NLCasualTimeParser.js +6 -4
  284. package/dist/esm/locales/nl/parsers/NLCasualTimeParser.js.map +1 -1
  285. package/dist/esm/locales/nl/parsers/NLRelativeDateFormatParser.js +14 -15
  286. package/dist/esm/locales/nl/parsers/NLRelativeDateFormatParser.js.map +1 -1
  287. package/dist/esm/locales/nl/parsers/NLTimeUnitAgoFormatParser.js +4 -4
  288. package/dist/esm/locales/nl/parsers/NLTimeUnitAgoFormatParser.js.map +1 -1
  289. package/dist/esm/locales/nl/parsers/NLTimeUnitCasualRelativeFormatParser.js +4 -4
  290. package/dist/esm/locales/nl/parsers/NLTimeUnitCasualRelativeFormatParser.js.map +1 -1
  291. package/dist/esm/locales/nl/parsers/NLTimeUnitLaterFormatParser.js +2 -2
  292. package/dist/esm/locales/nl/parsers/NLTimeUnitLaterFormatParser.js.map +1 -1
  293. package/dist/esm/locales/nl/parsers/NLTimeUnitWithinFormatParser.js +2 -2
  294. package/dist/esm/locales/nl/parsers/NLTimeUnitWithinFormatParser.js.map +1 -1
  295. package/dist/esm/locales/pt/parsers/PTCasualTimeParser.js +6 -4
  296. package/dist/esm/locales/pt/parsers/PTCasualTimeParser.js.map +1 -1
  297. package/dist/esm/locales/ru/constants.d.ts +4 -4
  298. package/dist/esm/locales/ru/constants.js +6 -6
  299. package/dist/esm/locales/ru/constants.js.map +1 -1
  300. package/dist/esm/locales/ru/parsers/RUCasualTimeParser.js +6 -6
  301. package/dist/esm/locales/ru/parsers/RUCasualTimeParser.js.map +1 -1
  302. package/dist/esm/locales/ru/parsers/RURelativeDateFormatParser.js +14 -15
  303. package/dist/esm/locales/ru/parsers/RURelativeDateFormatParser.js.map +1 -1
  304. package/dist/esm/locales/ru/parsers/RUTimeUnitAgoFormatParser.js +4 -4
  305. package/dist/esm/locales/ru/parsers/RUTimeUnitAgoFormatParser.js.map +1 -1
  306. package/dist/esm/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js +4 -4
  307. package/dist/esm/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js.map +1 -1
  308. package/dist/esm/locales/ru/parsers/RUTimeUnitWithinFormatParser.js +2 -2
  309. package/dist/esm/locales/ru/parsers/RUTimeUnitWithinFormatParser.js.map +1 -1
  310. package/dist/esm/locales/sv/constants.d.ts +8 -4
  311. package/dist/esm/locales/sv/constants.js +23 -5
  312. package/dist/esm/locales/sv/constants.js.map +1 -1
  313. package/dist/esm/locales/sv/index.js +2 -0
  314. package/dist/esm/locales/sv/index.js.map +1 -1
  315. package/dist/esm/locales/sv/parsers/SVCasualDateParser.js +14 -10
  316. package/dist/esm/locales/sv/parsers/SVCasualDateParser.js.map +1 -1
  317. package/dist/esm/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.d.ts +9 -0
  318. package/dist/esm/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.js +32 -0
  319. package/dist/esm/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.js.map +1 -0
  320. package/dist/esm/locales/uk/constants.d.ts +4 -4
  321. package/dist/esm/locales/uk/constants.js +7 -7
  322. package/dist/esm/locales/uk/constants.js.map +1 -1
  323. package/dist/esm/locales/uk/parsers/UKCasualTimeParser.js +6 -6
  324. package/dist/esm/locales/uk/parsers/UKCasualTimeParser.js.map +1 -1
  325. package/dist/esm/locales/uk/parsers/UKRelativeDateFormatParser.js +14 -15
  326. package/dist/esm/locales/uk/parsers/UKRelativeDateFormatParser.js.map +1 -1
  327. package/dist/esm/locales/uk/parsers/UKTimeUnitAgoFormatParser.js +4 -4
  328. package/dist/esm/locales/uk/parsers/UKTimeUnitAgoFormatParser.js.map +1 -1
  329. package/dist/esm/locales/uk/parsers/UKTimeUnitCasualRelativeFormatParser.js +4 -4
  330. package/dist/esm/locales/uk/parsers/UKTimeUnitCasualRelativeFormatParser.js.map +1 -1
  331. package/dist/esm/locales/uk/parsers/UKTimeUnitWithinFormatParser.js +2 -2
  332. package/dist/esm/locales/uk/parsers/UKTimeUnitWithinFormatParser.js.map +1 -1
  333. package/dist/esm/locales/zh/hans/parsers/ZHHansCasualDateParser.js +23 -24
  334. package/dist/esm/locales/zh/hans/parsers/ZHHansCasualDateParser.js.map +1 -1
  335. package/dist/esm/locales/zh/hans/parsers/ZHHansDateParser.js +2 -4
  336. package/dist/esm/locales/zh/hans/parsers/ZHHansDateParser.js.map +1 -1
  337. package/dist/esm/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.js +20 -18
  338. package/dist/esm/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.js.map +1 -1
  339. package/dist/esm/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.js +17 -19
  340. package/dist/esm/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.js.map +1 -1
  341. package/dist/esm/locales/zh/hans/parsers/ZHHansTimeExpressionParser.js +71 -73
  342. package/dist/esm/locales/zh/hans/parsers/ZHHansTimeExpressionParser.js.map +1 -1
  343. package/dist/esm/locales/zh/hans/parsers/ZHHansWeekdayParser.js +14 -16
  344. package/dist/esm/locales/zh/hans/parsers/ZHHansWeekdayParser.js.map +1 -1
  345. package/dist/esm/locales/zh/hant/parsers/ZHHantCasualDateParser.js +23 -24
  346. package/dist/esm/locales/zh/hant/parsers/ZHHantCasualDateParser.js.map +1 -1
  347. package/dist/esm/locales/zh/hant/parsers/ZHHantDateParser.js +2 -4
  348. package/dist/esm/locales/zh/hant/parsers/ZHHantDateParser.js.map +1 -1
  349. package/dist/esm/locales/zh/hant/parsers/ZHHantDeadlineFormatParser.js +20 -18
  350. package/dist/esm/locales/zh/hant/parsers/ZHHantDeadlineFormatParser.js.map +1 -1
  351. package/dist/esm/locales/zh/hant/parsers/ZHHantRelationWeekdayParser.js +17 -19
  352. package/dist/esm/locales/zh/hant/parsers/ZHHantRelationWeekdayParser.js.map +1 -1
  353. package/dist/esm/locales/zh/hant/parsers/ZHHantTimeExpressionParser.js +73 -75
  354. package/dist/esm/locales/zh/hant/parsers/ZHHantTimeExpressionParser.js.map +1 -1
  355. package/dist/esm/locales/zh/hant/parsers/ZHHantWeekdayParser.js +14 -16
  356. package/dist/esm/locales/zh/hant/parsers/ZHHantWeekdayParser.js.map +1 -1
  357. package/dist/esm/results.d.ts +3 -2
  358. package/dist/esm/results.js +75 -52
  359. package/dist/esm/results.js.map +1 -1
  360. package/dist/esm/timezone.js +1 -3
  361. package/dist/esm/timezone.js.map +1 -1
  362. package/dist/esm/types.d.ts +1 -1
  363. package/package.json +1 -1
  364. package/src/calculation/duration.ts +10 -0
  365. package/src/calculation/mergingCalculation.ts +5 -4
  366. package/src/calculation/weekdays.ts +2 -2
  367. package/src/calculation/years.ts +11 -16
  368. package/src/common/casualReferences.ts +19 -23
  369. package/src/common/parsers/AbstractTimeExpressionParser.ts +6 -0
  370. package/src/common/refiners/AbstractMergeDateRangeRefiner.ts +20 -21
  371. package/src/common/refiners/ForwardDateRefiner.ts +17 -22
  372. package/src/index.ts +3 -1
  373. package/src/locales/de/constants.ts +8 -8
  374. package/src/locales/de/parsers/DECasualDateParser.ts +13 -10
  375. package/src/locales/de/parsers/DECasualTimeParser.ts +3 -5
  376. package/src/locales/de/parsers/DETimeUnitRelativeFormatParser.ts +2 -2
  377. package/src/locales/de/parsers/DETimeUnitWithinFormatParser.ts +2 -2
  378. package/src/locales/en/constants.ts +12 -13
  379. package/src/locales/en/parsers/ENCasualDateParser.ts +6 -5
  380. package/src/locales/en/parsers/ENRelativeDateFormatParser.ts +14 -16
  381. package/src/locales/en/parsers/ENTimeUnitAgoFormatParser.ts +2 -2
  382. package/src/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.ts +2 -2
  383. package/src/locales/en/parsers/ENTimeUnitLaterFormatParser.ts +2 -2
  384. package/src/locales/en/parsers/ENTimeUnitWithinFormatParser.ts +2 -7
  385. package/src/locales/en/refiners/ENMergeRelativeAfterDateRefiner.ts +4 -4
  386. package/src/locales/en/refiners/ENMergeRelativeFollowByDateRefiner.ts +2 -2
  387. package/src/locales/es/constants.ts +7 -6
  388. package/src/locales/es/parsers/ESCasualTimeParser.ts +6 -4
  389. package/src/locales/es/parsers/ESTimeUnitWithinFormatParser.ts +2 -2
  390. package/src/locales/fr/constants.ts +7 -6
  391. package/src/locales/fr/parsers/FRCasualDateParser.ts +5 -5
  392. package/src/locales/fr/parsers/FRTimeUnitAgoFormatParser.ts +4 -4
  393. package/src/locales/fr/parsers/FRTimeUnitRelativeFormatParser.ts +2 -2
  394. package/src/locales/fr/parsers/FRTimeUnitWithinFormatParser.ts +2 -2
  395. package/src/locales/it/constants.ts +7 -7
  396. package/src/locales/it/parsers/ITCasualDateParser.ts +7 -6
  397. package/src/locales/it/parsers/ITCasualTimeParser.ts +7 -5
  398. package/src/locales/it/parsers/ITRelativeDateFormatParser.ts +14 -16
  399. package/src/locales/it/parsers/ITTimeUnitAgoFormatParser.ts +4 -4
  400. package/src/locales/it/parsers/ITTimeUnitCasualRelativeFormatParser.ts +4 -4
  401. package/src/locales/it/parsers/ITTimeUnitLaterFormatParser.ts +2 -2
  402. package/src/locales/it/parsers/ITTimeUnitWithinFormatParser.ts +2 -2
  403. package/src/locales/it/refiners/ITMergeRelativeDateRefiner.ts +4 -4
  404. package/src/locales/ja/parsers/JPCasualDateParser.ts +4 -5
  405. package/src/locales/ja/parsers/JPStandardParser.ts +1 -4
  406. package/src/locales/ja/parsers/JPTimeExpressionParser.ts +91 -190
  407. package/src/locales/nl/constants.ts +7 -7
  408. package/src/locales/nl/parsers/NLCasualDateTimeParser.ts +9 -5
  409. package/src/locales/nl/parsers/NLCasualTimeParser.ts +6 -4
  410. package/src/locales/nl/parsers/NLRelativeDateFormatParser.ts +14 -16
  411. package/src/locales/nl/parsers/NLTimeUnitAgoFormatParser.ts +4 -4
  412. package/src/locales/nl/parsers/NLTimeUnitCasualRelativeFormatParser.ts +4 -4
  413. package/src/locales/nl/parsers/NLTimeUnitLaterFormatParser.ts +2 -2
  414. package/src/locales/nl/parsers/NLTimeUnitWithinFormatParser.ts +2 -2
  415. package/src/locales/pt/parsers/PTCasualTimeParser.ts +6 -4
  416. package/src/locales/ru/constants.ts +10 -10
  417. package/src/locales/ru/parsers/RUCasualTimeParser.ts +6 -6
  418. package/src/locales/ru/parsers/RURelativeDateFormatParser.ts +15 -18
  419. package/src/locales/ru/parsers/RUTimeUnitAgoFormatParser.ts +4 -4
  420. package/src/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.ts +4 -4
  421. package/src/locales/ru/parsers/RUTimeUnitWithinFormatParser.ts +2 -2
  422. package/src/locales/sv/constants.ts +31 -9
  423. package/src/locales/sv/index.ts +2 -0
  424. package/src/locales/sv/parsers/SVCasualDateParser.ts +14 -10
  425. package/src/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.ts +42 -0
  426. package/src/locales/uk/constants.ts +11 -11
  427. package/src/locales/uk/parsers/UKCasualTimeParser.ts +6 -6
  428. package/src/locales/uk/parsers/UKRelativeDateFormatParser.ts +14 -16
  429. package/src/locales/uk/parsers/UKTimeUnitAgoFormatParser.ts +4 -4
  430. package/src/locales/uk/parsers/UKTimeUnitCasualRelativeFormatParser.ts +4 -4
  431. package/src/locales/uk/parsers/UKTimeUnitWithinFormatParser.ts +2 -2
  432. package/src/locales/zh/hans/parsers/ZHHansCasualDateParser.ts +23 -24
  433. package/src/locales/zh/hans/parsers/ZHHansDateParser.ts +2 -4
  434. package/src/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.ts +20 -18
  435. package/src/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.ts +18 -18
  436. package/src/locales/zh/hans/parsers/ZHHansTimeExpressionParser.ts +71 -73
  437. package/src/locales/zh/hans/parsers/ZHHansWeekdayParser.ts +16 -15
  438. package/src/locales/zh/hant/parsers/ZHHantCasualDateParser.ts +23 -24
  439. package/src/locales/zh/hant/parsers/ZHHantDateParser.ts +2 -4
  440. package/src/locales/zh/hant/parsers/ZHHantDeadlineFormatParser.ts +20 -18
  441. package/src/locales/zh/hant/parsers/ZHHantRelationWeekdayParser.ts +18 -18
  442. package/src/locales/zh/hant/parsers/ZHHantTimeExpressionParser.ts +73 -75
  443. package/src/locales/zh/hant/parsers/ZHHantWeekdayParser.ts +16 -15
  444. package/src/results.ts +82 -51
  445. package/src/timezone.ts +1 -5
  446. package/src/types.ts +1 -1
  447. package/test/calculation_weekdays.test.ts +17 -0
  448. package/test/en/en_time_exp.test.ts +2 -0
  449. package/test/it/it_casual.test.ts +44 -0
  450. package/test/it/it_month_name_little_endian.test.ts +28 -0
  451. package/test/it/it_weekday.test.ts +37 -0
  452. package/test/ja/ja_time_exp.test.ts +82 -21
  453. package/test/result.test.ts +74 -0
  454. package/test/sv/sv_casual.test.ts +42 -0
  455. package/test/sv/sv_month_name_little_endian.test.ts +48 -0
  456. package/test/sv/sv_time_units_casual_relative.test.ts +143 -0
  457. package/test/zh/hans/zh_hans_casual.test.ts +14 -0
  458. package/test/zh/hans/zh_hans_date.test.ts +14 -0
  459. package/test/zh/hans/zh_hans_deadline.test.ts +39 -0
  460. package/test/zh/hans/zh_hans_time_exp.test.ts +51 -0
  461. package/test/zh/hans/zh_hans_weekday.test.ts +87 -0
  462. package/test/zh/hant/zh_hant_casual.test.ts +14 -0
  463. package/test/zh/hant/zh_hant_date.test.ts +14 -0
  464. package/test/zh/hant/zh_hant_weekday.test.ts +43 -0
  465. package/dist/cjs/utils/dayjs.d.ts +0 -8
  466. package/dist/cjs/utils/dayjs.js +0 -48
  467. package/dist/cjs/utils/dayjs.js.map +0 -1
  468. package/dist/cjs/utils/timeunits.d.ts +0 -7
  469. package/dist/cjs/utils/timeunits.js +0 -30
  470. package/dist/cjs/utils/timeunits.js.map +0 -1
  471. package/dist/esm/utils/dayjs.d.ts +0 -8
  472. package/dist/esm/utils/dayjs.js +0 -40
  473. package/dist/esm/utils/dayjs.js.map +0 -1
  474. package/dist/esm/utils/timeunits.d.ts +0 -7
  475. package/dist/esm/utils/timeunits.js +0 -26
  476. package/dist/esm/utils/timeunits.js.map +0 -1
  477. package/src/utils/dayjs.ts +0 -52
  478. package/src/utils/timeunits.ts +0 -47
@@ -1,11 +1,7 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
3
  const constants_1 = require("../constants");
7
4
  const results_1 = require("../../../results");
8
- const dayjs_1 = __importDefault(require("dayjs"));
9
5
  const pattern_1 = require("../../../utils/pattern");
10
6
  const AbstractParserWithWordBoundaryChecking_1 = require("./AbstractParserWithWordBoundaryChecking");
11
7
  const MODIFIER_WORD_GROUP = 1;
@@ -36,25 +32,25 @@ class UKRelativeDateFormatParser extends AbstractParserWithWordBoundaryChecking_
36
32
  return results_1.ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
37
33
  }
38
34
  const components = context.createParsingComponents();
39
- let date = (0, dayjs_1.default)(context.reference.instant);
35
+ let date = new Date(context.reference.instant.getTime());
40
36
  if (timeunit.match(/week/i)) {
41
- date = date.add(-date.get("d"), "d");
42
- components.imply("day", date.date());
43
- components.imply("month", date.month() + 1);
44
- components.imply("year", date.year());
37
+ date.setDate(date.getDate() - date.getDay());
38
+ components.imply("day", date.getDate());
39
+ components.imply("month", date.getMonth() + 1);
40
+ components.imply("year", date.getFullYear());
45
41
  }
46
42
  else if (timeunit.match(/month/i)) {
47
- date = date.add(-date.date() + 1, "d");
48
- components.imply("day", date.date());
49
- components.assign("year", date.year());
50
- components.assign("month", date.month() + 1);
43
+ date.setDate(1);
44
+ components.imply("day", date.getDate());
45
+ components.assign("year", date.getFullYear());
46
+ components.assign("month", date.getMonth() + 1);
51
47
  }
52
48
  else if (timeunit.match(/year/i)) {
53
- date = date.add(-date.date() + 1, "d");
54
- date = date.add(-date.month(), "month");
55
- components.imply("day", date.date());
56
- components.imply("month", date.month() + 1);
57
- components.assign("year", date.year());
49
+ date.setDate(1);
50
+ date.setMonth(0);
51
+ components.imply("day", date.getDate());
52
+ components.imply("month", date.getMonth() + 1);
53
+ components.assign("year", date.getFullYear());
58
54
  }
59
55
  return components;
60
56
  }
@@ -1 +1 @@
1
- {"version":3,"file":"UKRelativeDateFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/uk/parsers/UKRelativeDateFormatParser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"UKRelativeDateFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/uk/parsers/UKRelativeDateFormatParser.ts"],"names":[],"mappings":";;AAAA,4CAAoD;AAEpD,8CAAqD;AACrD,oDAAyD;AACzD,qGAAuG;AAEvG,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAE9B,MAAqB,0BAA2B,SAAQ,oFAA2C;IAC/F,kBAAkB,CAAC,OAAuB;QACtC,OAAO,CACH,oIAAoI;YACpI,IAAI,IAAA,yBAAe,EAAC,gCAAoB,CAAC,WAAW,CACvD,CAAC;IACN,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,gCAAoB,CAAC,QAAQ,CAAC,CAAC;QAEhD,IACI,QAAQ,IAAI,eAAe;YAC3B,QAAQ,IAAI,cAAc;YAC1B,QAAQ,IAAI,cAAc;YAC1B,QAAQ,IAAI,YAAY,EAC1B,CAAC;YACC,MAAM,SAAS,GAAG,EAAE,CAAC;YACrB,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YACxB,OAAO,2BAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACvF,CAAC;QAED,IACI,QAAQ,IAAI,aAAa;YACzB,QAAQ,IAAI,YAAY;YACxB,QAAQ,IAAI,YAAY;YACxB,QAAQ,IAAI,UAAU,EACxB,CAAC;YACC,MAAM,SAAS,GAAG,EAAE,CAAC;YACrB,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;YACzB,OAAO,2BAAiB,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;AAjED,6CAiEC"}
@@ -2,15 +2,15 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const constants_1 = require("../constants");
4
4
  const results_1 = require("../../../results");
5
- const timeunits_1 = require("../../../utils/timeunits");
6
5
  const AbstractParserWithWordBoundaryChecking_1 = require("./AbstractParserWithWordBoundaryChecking");
6
+ const duration_1 = require("../../../calculation/duration");
7
7
  class UKTimeUnitAgoFormatParser extends AbstractParserWithWordBoundaryChecking_1.AbstractParserWithLeftBoundaryChecking {
8
8
  innerPatternString(context) {
9
9
  return `(${constants_1.TIME_UNITS_PATTERN})\\s{0,5}тому(?=(?:\\W|$))`;
10
10
  }
11
11
  innerExtract(context, match) {
12
- const timeUnits = (0, constants_1.parseTimeUnits)(match[1]);
13
- const outputTimeUnits = (0, timeunits_1.reverseTimeUnits)(timeUnits);
12
+ const timeUnits = (0, constants_1.parseDuration)(match[1]);
13
+ const outputTimeUnits = (0, duration_1.reverseDuration)(timeUnits);
14
14
  return results_1.ParsingComponents.createRelativeFromReference(context.reference, outputTimeUnits);
15
15
  }
16
16
  }
@@ -1 +1 @@
1
- {"version":3,"file":"UKTimeUnitAgoFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/uk/parsers/UKTimeUnitAgoFormatParser.ts"],"names":[],"mappings":";;AACA,4CAAkE;AAClE,8CAAqD;AACrD,wDAA4D;AAC5D,qGAAkG;AAElG,MAAqB,yBAA0B,SAAQ,+EAAsC;IACzF,kBAAkB,CAAC,OAAuB;QACtC,OAAO,IAAI,8BAAkB,4BAA4B,CAAC;IAC9D,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,IAAA,0BAAc,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,eAAe,GAAG,IAAA,4BAAgB,EAAC,SAAS,CAAC,CAAC;QAEpD,OAAO,2BAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IAC7F,CAAC;CACJ;AAXD,4CAWC"}
1
+ {"version":3,"file":"UKTimeUnitAgoFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/uk/parsers/UKTimeUnitAgoFormatParser.ts"],"names":[],"mappings":";;AACA,4CAAiE;AACjE,8CAAqD;AACrD,qGAAkG;AAClG,4DAAgE;AAEhE,MAAqB,yBAA0B,SAAQ,+EAAsC;IACzF,kBAAkB,CAAC,OAAuB;QACtC,OAAO,IAAI,8BAAkB,4BAA4B,CAAC;IAC9D,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,IAAA,yBAAa,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,MAAM,eAAe,GAAG,IAAA,0BAAe,EAAC,SAAS,CAAC,CAAC;QAEnD,OAAO,2BAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IAC7F,CAAC;CACJ;AAXD,4CAWC"}
@@ -2,20 +2,20 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const constants_1 = require("../constants");
4
4
  const results_1 = require("../../../results");
5
- const timeunits_1 = require("../../../utils/timeunits");
6
5
  const AbstractParserWithWordBoundaryChecking_1 = require("./AbstractParserWithWordBoundaryChecking");
6
+ const duration_1 = require("../../../calculation/duration");
7
7
  class UKTimeUnitCasualRelativeFormatParser extends AbstractParserWithWordBoundaryChecking_1.AbstractParserWithLeftRightBoundaryChecking {
8
8
  innerPatternString(context) {
9
9
  return `(ці|останні|минулі|майбутні|наступні|після|через|\\+|-)\\s*(${constants_1.TIME_UNITS_PATTERN})`;
10
10
  }
11
11
  innerExtract(context, match) {
12
12
  const prefix = match[1].toLowerCase();
13
- let timeUnits = (0, constants_1.parseTimeUnits)(match[3]);
13
+ let timeUnits = (0, constants_1.parseDuration)(match[3]);
14
14
  switch (prefix) {
15
15
  case "останні":
16
16
  case "минулі":
17
17
  case "-":
18
- timeUnits = (0, timeunits_1.reverseTimeUnits)(timeUnits);
18
+ timeUnits = (0, duration_1.reverseDuration)(timeUnits);
19
19
  break;
20
20
  }
21
21
  return results_1.ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
@@ -1 +1 @@
1
- {"version":3,"file":"UKTimeUnitCasualRelativeFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/uk/parsers/UKTimeUnitCasualRelativeFormatParser.ts"],"names":[],"mappings":";;AAAA,4CAA+E;AAE/E,8CAAqD;AACrD,wDAA4D;AAC5D,qGAAuG;AAEvG,MAAqB,oCAAqC,SAAQ,oFAA2C;IACzG,kBAAkB,CAAC,OAAuB;QACtC,OAAO,+DAA+D,8BAAkB,GAAG,CAAC;IAChG,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACtC,IAAI,SAAS,GAAG,IAAA,0BAAc,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,QAAQ,MAAM,EAAE,CAAC;YACb,KAAK,SAAS,CAAC;YACf,KAAK,QAAQ,CAAC;YACd,KAAK,GAAG;gBACJ,SAAS,GAAG,IAAA,4BAAgB,EAAC,SAAS,CAAC,CAAC;gBACxC,MAAM;QACd,CAAC;QAED,OAAO,2BAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;CACJ;AAlBD,uDAkBC"}
1
+ {"version":3,"file":"UKTimeUnitCasualRelativeFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/uk/parsers/UKTimeUnitCasualRelativeFormatParser.ts"],"names":[],"mappings":";;AAAA,4CAA8E;AAE9E,8CAAqD;AACrD,qGAAuG;AACvG,4DAAgE;AAEhE,MAAqB,oCAAqC,SAAQ,oFAA2C;IACzG,kBAAkB,CAAC,OAAuB;QACtC,OAAO,+DAA+D,8BAAkB,GAAG,CAAC;IAChG,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACtC,IAAI,SAAS,GAAG,IAAA,yBAAa,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACxC,QAAQ,MAAM,EAAE,CAAC;YACb,KAAK,SAAS,CAAC;YACf,KAAK,QAAQ,CAAC;YACd,KAAK,GAAG;gBACJ,SAAS,GAAG,IAAA,0BAAe,EAAC,SAAS,CAAC,CAAC;gBACvC,MAAM;QACd,CAAC;QAED,OAAO,2BAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;CACJ;AAlBD,uDAkBC"}
@@ -14,7 +14,7 @@ class UKTimeUnitWithinFormatParser extends AbstractParserWithWordBoundary_1.Abst
14
14
  : new RegExp(`(?:протягом|на протязі|протягом|упродовж|впродовж)\\s*${PATTERN}`, constants_1.REGEX_PARTS.flags);
15
15
  }
16
16
  innerExtract(context, match) {
17
- const timeUnits = (0, constants_1.parseTimeUnits)(match[1]);
17
+ const timeUnits = (0, constants_1.parseDuration)(match[1]);
18
18
  return results_1.ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
19
19
  }
20
20
  }
@@ -1 +1 @@
1
- {"version":3,"file":"UKTimeUnitWithinFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/uk/parsers/UKTimeUnitWithinFormatParser.ts"],"names":[],"mappings":";;AAAA,4CAA+E;AAE/E,8CAAqD;AACrD,2GAAgH;AAEhH,MAAM,OAAO,GAAG,+CAA+C,8BAAkB,IAAI,uBAAW,CAAC,aAAa,EAAE,CAAC;AAEjH,MAAqB,4BAA6B,SAAQ,uEAAsC;IAC5F,mBAAmB;QACf,OAAO,uBAAW,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,YAAY,CAAC,OAAuB;QAChC,OAAO,OAAO,CAAC,MAAM,CAAC,WAAW;YAC7B,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC;YAC1B,CAAC,CAAC,IAAI,MAAM,CAAC,yDAAyD,OAAO,EAAE,EAAE,uBAAW,CAAC,KAAK,CAAC,CAAC;IAC5G,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,IAAA,0BAAc,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,OAAO,2BAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;CACJ;AAfD,+CAeC"}
1
+ {"version":3,"file":"UKTimeUnitWithinFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/uk/parsers/UKTimeUnitWithinFormatParser.ts"],"names":[],"mappings":";;AAAA,4CAA8E;AAE9E,8CAAqD;AACrD,2GAAgH;AAEhH,MAAM,OAAO,GAAG,+CAA+C,8BAAkB,IAAI,uBAAW,CAAC,aAAa,EAAE,CAAC;AAEjH,MAAqB,4BAA6B,SAAQ,uEAAsC;IAC5F,mBAAmB;QACf,OAAO,uBAAW,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,YAAY,CAAC,OAAuB;QAChC,OAAO,OAAO,CAAC,MAAM,CAAC,WAAW;YAC7B,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC;YAC1B,CAAC,CAAC,IAAI,MAAM,CAAC,yDAAyD,OAAO,EAAE,EAAE,uBAAW,CAAC,KAAK,CAAC,CAAC;IAC5G,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,IAAA,yBAAa,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,OAAO,2BAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;CACJ;AAfD,+CAeC"}
@@ -1,9 +1,5 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
- const dayjs_1 = __importDefault(require("dayjs"));
7
3
  const AbstractParserWithWordBoundary_1 = require("../../../../common/parsers/AbstractParserWithWordBoundary");
8
4
  const NOW_GROUP = 1;
9
5
  const DAY_GROUP_1 = 2;
@@ -23,36 +19,36 @@ class ZHHansCasualDateParser extends AbstractParserWithWordBoundary_1.AbstractPa
23
19
  innerExtract(context, match) {
24
20
  const index = match.index;
25
21
  const result = context.createParsingResult(index, match[0]);
26
- const refMoment = (0, dayjs_1.default)(context.refDate);
27
- let startMoment = refMoment;
22
+ const refDate = context.refDate;
23
+ let date = new Date(refDate.getTime());
28
24
  if (match[NOW_GROUP]) {
29
- result.start.imply("hour", refMoment.hour());
30
- result.start.imply("minute", refMoment.minute());
31
- result.start.imply("second", refMoment.second());
32
- result.start.imply("millisecond", refMoment.millisecond());
25
+ result.start.imply("hour", refDate.getHours());
26
+ result.start.imply("minute", refDate.getMinutes());
27
+ result.start.imply("second", refDate.getSeconds());
28
+ result.start.imply("millisecond", refDate.getMilliseconds());
33
29
  }
34
30
  else if (match[DAY_GROUP_1]) {
35
31
  const day1 = match[DAY_GROUP_1];
36
32
  const time1 = match[TIME_GROUP_1];
37
33
  if (day1 == "明") {
38
- if (refMoment.hour() > 1) {
39
- startMoment = startMoment.add(1, "day");
34
+ if (refDate.getHours() > 1) {
35
+ date.setDate(date.getDate() + 1);
40
36
  }
41
37
  }
42
38
  else if (day1 == "昨") {
43
- startMoment = startMoment.add(-1, "day");
39
+ date.setDate(date.getDate() - 1);
44
40
  }
45
41
  else if (day1 == "前") {
46
- startMoment = startMoment.add(-2, "day");
42
+ date.setDate(date.getDate() - 2);
47
43
  }
48
44
  else if (day1 == "大前") {
49
- startMoment = startMoment.add(-3, "day");
45
+ date.setDate(date.getDate() - 3);
50
46
  }
51
47
  else if (day1 == "后") {
52
- startMoment = startMoment.add(2, "day");
48
+ date.setDate(date.getDate() + 2);
53
49
  }
54
50
  else if (day1 == "大后") {
55
- startMoment = startMoment.add(3, "day");
51
+ date.setDate(date.getDate() + 3);
56
52
  }
57
53
  if (time1 == "早") {
58
54
  result.start.imply("hour", 6);
@@ -87,24 +83,24 @@ class ZHHansCasualDateParser extends AbstractParserWithWordBoundary_1.AbstractPa
87
83
  else if (match[DAY_GROUP_3]) {
88
84
  const day3 = match[DAY_GROUP_3];
89
85
  if (day3 == "明") {
90
- if (refMoment.hour() > 1) {
91
- startMoment = startMoment.add(1, "day");
86
+ if (refDate.getHours() > 1) {
87
+ date.setDate(date.getDate() + 1);
92
88
  }
93
89
  }
94
90
  else if (day3 == "昨") {
95
- startMoment = startMoment.add(-1, "day");
91
+ date.setDate(date.getDate() - 1);
96
92
  }
97
93
  else if (day3 == "前") {
98
- startMoment = startMoment.add(-2, "day");
94
+ date.setDate(date.getDate() - 2);
99
95
  }
100
96
  else if (day3 == "大前") {
101
- startMoment = startMoment.add(-3, "day");
97
+ date.setDate(date.getDate() - 3);
102
98
  }
103
99
  else if (day3 == "后") {
104
- startMoment = startMoment.add(2, "day");
100
+ date.setDate(date.getDate() + 2);
105
101
  }
106
102
  else if (day3 == "大后") {
107
- startMoment = startMoment.add(3, "day");
103
+ date.setDate(date.getDate() + 3);
108
104
  }
109
105
  const timeString3 = match[TIME_GROUP_3];
110
106
  if (timeString3) {
@@ -129,9 +125,9 @@ class ZHHansCasualDateParser extends AbstractParserWithWordBoundary_1.AbstractPa
129
125
  }
130
126
  }
131
127
  }
132
- result.start.assign("day", startMoment.date());
133
- result.start.assign("month", startMoment.month() + 1);
134
- result.start.assign("year", startMoment.year());
128
+ result.start.assign("day", date.getDate());
129
+ result.start.assign("month", date.getMonth() + 1);
130
+ result.start.assign("year", date.getFullYear());
135
131
  return result;
136
132
  }
137
133
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ZHHansCasualDateParser.js","sourceRoot":"","sources":["../../../../../../src/locales/zh/hans/parsers/ZHHansCasualDateParser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ZHHansCasualDateParser.js","sourceRoot":"","sources":["../../../../../../src/locales/zh/hans/parsers/ZHHansCasualDateParser.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,5 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
- const dayjs_1 = __importDefault(require("dayjs"));
7
3
  const AbstractParserWithWordBoundary_1 = require("../../../../common/parsers/AbstractParserWithWordBoundary");
8
4
  const constants_1 = require("../constants");
9
5
  const YEAR_GROUP = 1;
@@ -42,7 +38,6 @@ class ZHHansDateParser extends AbstractParserWithWordBoundary_1.AbstractParserWi
42
38
  "(?:日|号)?");
43
39
  }
44
40
  innerExtract(context, match) {
45
- const startMoment = (0, dayjs_1.default)(context.refDate);
46
41
  const result = context.createParsingResult(match.index, match[0]);
47
42
  let month = parseInt(match[MONTH_GROUP]);
48
43
  if (isNaN(month))
@@ -55,7 +50,7 @@ class ZHHansDateParser extends AbstractParserWithWordBoundary_1.AbstractParserWi
55
50
  result.start.assign("day", day);
56
51
  }
57
52
  else {
58
- result.start.imply("day", startMoment.date());
53
+ result.start.imply("day", context.refDate.getDate());
59
54
  }
60
55
  if (match[YEAR_GROUP]) {
61
56
  let year = parseInt(match[YEAR_GROUP]);
@@ -64,7 +59,7 @@ class ZHHansDateParser extends AbstractParserWithWordBoundary_1.AbstractParserWi
64
59
  result.start.assign("year", year);
65
60
  }
66
61
  else {
67
- result.start.imply("year", startMoment.year());
62
+ result.start.imply("year", context.refDate.getFullYear());
68
63
  }
69
64
  return result;
70
65
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ZHHansDateParser.js","sourceRoot":"","sources":["../../../../../../src/locales/zh/hans/parsers/ZHHansDateParser.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAE1B,8GAAmH;AACnH,4CAAwE;AAExE,MAAM,UAAU,GAAG,CAAC,CAAC;AACrB,MAAM,WAAW,GAAG,CAAC,CAAC;AACtB,MAAM,SAAS,GAAG,CAAC,CAAC;AAEpB,MAAqB,gBAAiB,SAAQ,uEAAsC;IAChF,YAAY;QAER,OAAO,IAAI,MAAM,CACb,GAAG;YACC,WAAW;YACX,GAAG;YACH,MAAM,CAAC,IAAI,CAAC,kBAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,OAAO;YACP,GAAG;YACH,MAAM,CAAC,IAAI,CAAC,kBAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,MAAM;YACN,IAAI;YACJ,UAAU;YACV,QAAQ;YACR,gBAAgB;YAChB,GAAG;YACH,WAAW;YACX,GAAG;YACH,MAAM,CAAC,IAAI,CAAC,kBAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,QAAQ;YACR,GAAG;YACH,UAAU;YACV,OAAO;YACP,UAAU;YACV,GAAG;YACH,WAAW;YACX,GAAG;YACH,MAAM,CAAC,IAAI,CAAC,kBAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,QAAQ;YACR,IAAI;YACJ,UAAU;YACV,UAAU,CACjB,CAAC;IACN,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,WAAW,GAAG,IAAA,eAAK,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAGlE,IAAI,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,KAAK,CAAC;YAAE,KAAK,GAAG,IAAA,4BAAgB,EAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QAC/D,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAGpC,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;YACnB,IAAI,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;YACrC,IAAI,KAAK,CAAC,GAAG,CAAC;gBAAE,GAAG,GAAG,IAAA,4BAAgB,EAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;YACzD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACpC,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;QAClD,CAAC;QAGD,IAAI,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;YACpB,IAAI,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;YACvC,IAAI,KAAK,CAAC,IAAI,CAAC;gBAAE,IAAI,GAAG,IAAA,0BAAc,EAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;YAC1D,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACtC,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAjED,mCAiEC"}
1
+ {"version":3,"file":"ZHHansDateParser.js","sourceRoot":"","sources":["../../../../../../src/locales/zh/hans/parsers/ZHHansDateParser.ts"],"names":[],"mappings":";;AACA,8GAAmH;AACnH,4CAAwE;AAExE,MAAM,UAAU,GAAG,CAAC,CAAC;AACrB,MAAM,WAAW,GAAG,CAAC,CAAC;AACtB,MAAM,SAAS,GAAG,CAAC,CAAC;AAEpB,MAAqB,gBAAiB,SAAQ,uEAAsC;IAChF,YAAY;QAER,OAAO,IAAI,MAAM,CACb,GAAG;YACC,WAAW;YACX,GAAG;YACH,MAAM,CAAC,IAAI,CAAC,kBAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,OAAO;YACP,GAAG;YACH,MAAM,CAAC,IAAI,CAAC,kBAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,MAAM;YACN,IAAI;YACJ,UAAU;YACV,QAAQ;YACR,gBAAgB;YAChB,GAAG;YACH,WAAW;YACX,GAAG;YACH,MAAM,CAAC,IAAI,CAAC,kBAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,QAAQ;YACR,GAAG;YACH,UAAU;YACV,OAAO;YACP,UAAU;YACV,GAAG;YACH,WAAW;YACX,GAAG;YACH,MAAM,CAAC,IAAI,CAAC,kBAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,QAAQ;YACR,IAAI;YACJ,UAAU;YACV,UAAU,CACjB,CAAC;IACN,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAGlE,IAAI,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,KAAK,CAAC;YAAE,KAAK,GAAG,IAAA,4BAAgB,EAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QAC/D,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAGpC,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;YACnB,IAAI,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;YACrC,IAAI,KAAK,CAAC,GAAG,CAAC;gBAAE,GAAG,GAAG,IAAA,4BAAgB,EAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;YACzD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACpC,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QACzD,CAAC;QAGD,IAAI,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;YACpB,IAAI,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;YACvC,IAAI,KAAK,CAAC,IAAI,CAAC;gBAAE,IAAI,GAAG,IAAA,0BAAc,EAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;YAC1D,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACtC,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;QAC9D,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAhED,mCAgEC"}
@@ -1,10 +1,7 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
- const dayjs_1 = __importDefault(require("dayjs"));
7
3
  const AbstractParserWithWordBoundary_1 = require("../../../../common/parsers/AbstractParserWithWordBoundary");
4
+ const duration_1 = require("../../../../calculation/duration");
8
5
  const constants_1 = require("../constants");
9
6
  const PATTERN = new RegExp("(\\d+|[" +
10
7
  Object.keys(constants_1.NUMBER).join("") +
@@ -36,42 +33,44 @@ class ZHHansDeadlineFormatParser extends AbstractParserWithWordBoundary_1.Abstra
36
33
  return null;
37
34
  }
38
35
  }
39
- let date = (0, dayjs_1.default)(context.refDate);
36
+ const duration = {};
40
37
  const unit = match[UNIT_GROUP];
41
38
  const unitAbbr = unit[0];
42
39
  if (unitAbbr.match(/[日天星礼月年]/)) {
43
40
  if (unitAbbr == "日" || unitAbbr == "天") {
44
- date = date.add(number, "d");
41
+ duration.day = number;
45
42
  }
46
43
  else if (unitAbbr == "星" || unitAbbr == "礼") {
47
- date = date.add(number * 7, "d");
44
+ duration.week = number;
48
45
  }
49
46
  else if (unitAbbr == "月") {
50
- date = date.add(number, "month");
47
+ duration.month = number;
51
48
  }
52
49
  else if (unitAbbr == "年") {
53
- date = date.add(number, "year");
50
+ duration.year = number;
54
51
  }
55
- result.start.assign("year", date.year());
56
- result.start.assign("month", date.month() + 1);
57
- result.start.assign("day", date.date());
52
+ const date = (0, duration_1.addDuration)(context.refDate, duration);
53
+ result.start.assign("year", date.getFullYear());
54
+ result.start.assign("month", date.getMonth() + 1);
55
+ result.start.assign("day", date.getDate());
58
56
  return result;
59
57
  }
60
58
  if (unitAbbr == "秒") {
61
- date = date.add(number, "second");
59
+ duration.second = number;
62
60
  }
63
61
  else if (unitAbbr == "分") {
64
- date = date.add(number, "minute");
62
+ duration.minute = number;
65
63
  }
66
64
  else if (unitAbbr == "小" || unitAbbr == "钟") {
67
- date = date.add(number, "hour");
65
+ duration.hour = number;
68
66
  }
69
- result.start.imply("year", date.year());
70
- result.start.imply("month", date.month() + 1);
71
- result.start.imply("day", date.date());
72
- result.start.assign("hour", date.hour());
73
- result.start.assign("minute", date.minute());
74
- result.start.assign("second", date.second());
67
+ const date = (0, duration_1.addDuration)(context.refDate, duration);
68
+ result.start.imply("year", date.getFullYear());
69
+ result.start.imply("month", date.getMonth() + 1);
70
+ result.start.imply("day", date.getDate());
71
+ result.start.assign("hour", date.getHours());
72
+ result.start.assign("minute", date.getMinutes());
73
+ result.start.assign("second", date.getSeconds());
75
74
  return result;
76
75
  }
77
76
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ZHHansDeadlineFormatParser.js","sourceRoot":"","sources":["../../../../../../src/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ZHHansDeadlineFormatParser.js","sourceRoot":"","sources":["../../../../../../src/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,5 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
- const dayjs_1 = __importDefault(require("dayjs"));
7
3
  const AbstractParserWithWordBoundary_1 = require("../../../../common/parsers/AbstractParserWithWordBoundary");
8
4
  const constants_1 = require("../constants");
9
5
  const PATTERN = new RegExp("(?<prefix>上|下|这)(?:个)?(?:星期|礼拜|周)(?<weekday>" + Object.keys(constants_1.WEEKDAY_OFFSET).join("|") + ")");
@@ -28,41 +24,40 @@ class ZHHansRelationWeekdayParser extends AbstractParserWithWordBoundary_1.Abstr
28
24
  else if (prefix == "这") {
29
25
  modifier = "this";
30
26
  }
31
- let startMoment = (0, dayjs_1.default)(context.refDate);
27
+ const date = new Date(context.refDate.getTime());
32
28
  let startMomentFixed = false;
33
- const refOffset = startMoment.day();
29
+ const refOffset = date.getDay();
34
30
  if (modifier == "last" || modifier == "past") {
35
- startMoment = startMoment.day(offset - 7);
31
+ date.setDate(date.getDate() + (offset - 7 - refOffset));
36
32
  startMomentFixed = true;
37
33
  }
38
34
  else if (modifier == "next") {
39
- startMoment = startMoment.day(offset + 7);
35
+ date.setDate(date.getDate() + (offset + 7 - refOffset));
40
36
  startMomentFixed = true;
41
37
  }
42
38
  else if (modifier == "this") {
43
- startMoment = startMoment.day(offset);
39
+ date.setDate(date.getDate() + (offset - refOffset));
44
40
  }
45
41
  else {
46
- if (Math.abs(offset - 7 - refOffset) < Math.abs(offset - refOffset)) {
47
- startMoment = startMoment.day(offset - 7);
42
+ let diff = offset - refOffset;
43
+ if (Math.abs(diff - 7) < Math.abs(diff)) {
44
+ diff -= 7;
48
45
  }
49
- else if (Math.abs(offset + 7 - refOffset) < Math.abs(offset - refOffset)) {
50
- startMoment = startMoment.day(offset + 7);
51
- }
52
- else {
53
- startMoment = startMoment.day(offset);
46
+ if (Math.abs(diff + 7) < Math.abs(diff)) {
47
+ diff += 7;
54
48
  }
49
+ date.setDate(date.getDate() + diff);
55
50
  }
56
51
  result.start.assign("weekday", offset);
57
52
  if (startMomentFixed) {
58
- result.start.assign("day", startMoment.date());
59
- result.start.assign("month", startMoment.month() + 1);
60
- result.start.assign("year", startMoment.year());
53
+ result.start.assign("day", date.getDate());
54
+ result.start.assign("month", date.getMonth() + 1);
55
+ result.start.assign("year", date.getFullYear());
61
56
  }
62
57
  else {
63
- result.start.imply("day", startMoment.date());
64
- result.start.imply("month", startMoment.month() + 1);
65
- result.start.imply("year", startMoment.year());
58
+ result.start.imply("day", date.getDate());
59
+ result.start.imply("month", date.getMonth() + 1);
60
+ result.start.imply("year", date.getFullYear());
66
61
  }
67
62
  return result;
68
63
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ZHHansRelationWeekdayParser.js","sourceRoot":"","sources":["../../../../../../src/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ZHHansRelationWeekdayParser.js","sourceRoot":"","sources":["../../../../../../src/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.ts"],"names":[],"mappings":"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"}