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
@@ -7,7 +7,7 @@ const FIRST_REG_PATTERN = new RegExp("(?:" +
7
7
  "(?:[\\s,,、]*)" +
8
8
  "(?:([0-90-9]+|[" +
9
9
  Object.keys(NUMBER).join("") +
10
- "]+)(?:\\s*)(?:時|:|:)" +
10
+ "]+)(?:\\s*)(?:時(?!間)|:|:)" +
11
11
  "(?:\\s*)" +
12
12
  "([0-90-9]+|半|[" +
13
13
  Object.keys(NUMBER).join("") +
@@ -48,211 +48,100 @@ export default class JPTimeExpressionParser extends AbstractParserWithWordBounda
48
48
  return null;
49
49
  }
50
50
  const result = context.createParsingResult(match.index, match[0]);
51
- let hour = 0;
52
- let minute = 0;
53
- let meridiem = -1;
54
- if (match[SECOND_GROUP]) {
55
- let second = parseInt(toHankaku(match[SECOND_GROUP]));
56
- if (isNaN(second)) {
57
- second = jaStringToNumber(match[SECOND_GROUP]);
58
- }
59
- if (second >= 60)
60
- return null;
61
- result.start.assign("second", second);
62
- }
63
- hour = parseInt(toHankaku(match[HOUR_GROUP]));
64
- if (isNaN(hour)) {
65
- hour = jaStringToNumber(match[HOUR_GROUP]);
66
- }
67
- if (match[MINUTE_GROUP]) {
68
- if (match[MINUTE_GROUP] === "半") {
69
- minute = 30;
70
- }
71
- else {
72
- minute = parseInt(toHankaku(match[MINUTE_GROUP]));
73
- if (isNaN(minute)) {
74
- minute = jaStringToNumber(match[MINUTE_GROUP]);
75
- }
76
- }
77
- }
78
- else if (hour > 100) {
79
- minute = hour % 100;
80
- hour = Math.floor(hour / 100);
81
- }
82
- if (minute >= 60) {
51
+ result.start = createTimeComponents(context, match[HOUR_GROUP], match[MINUTE_GROUP], match[SECOND_GROUP], match[AM_PM_HOUR_GROUP_1] ?? match[AM_PM_HOUR_GROUP_2]);
52
+ if (!result.start) {
53
+ match.index += match[0].length;
83
54
  return null;
84
55
  }
85
- if (hour > 24) {
86
- return null;
87
- }
88
- if (hour >= 12) {
89
- meridiem = Meridiem.PM;
90
- }
91
- if (match[AM_PM_HOUR_GROUP_1]) {
92
- if (hour > 12)
93
- return null;
94
- const AMPMString = match[AM_PM_HOUR_GROUP_1];
95
- const FirstAMPMString = AMPMString[0].toLowerCase();
96
- if (AMPMString === "午前" || FirstAMPMString === "a") {
97
- meridiem = Meridiem.AM;
98
- if (hour === 12)
99
- hour = 0;
100
- }
101
- else if (AMPMString === "午後" || FirstAMPMString === "p") {
102
- meridiem = Meridiem.PM;
103
- if (hour != 12)
104
- hour += 12;
105
- }
106
- }
107
- else if (match[AM_PM_HOUR_GROUP_2]) {
108
- if (hour > 12)
109
- return null;
110
- const ampm = match[AM_PM_HOUR_GROUP_2][0].toLowerCase();
111
- if (ampm === "a") {
112
- meridiem = Meridiem.AM;
113
- if (hour === 12)
114
- hour = 0;
115
- }
116
- if (ampm === "p") {
117
- meridiem = Meridiem.PM;
118
- if (hour != 12)
119
- hour += 12;
120
- }
121
- }
122
- result.start.assign("hour", hour);
123
- result.start.assign("minute", minute);
124
- if (meridiem >= 0) {
125
- result.start.assign("meridiem", meridiem);
126
- }
127
- else {
128
- if (hour < 12) {
129
- result.start.imply("meridiem", 0);
130
- }
131
- else {
132
- result.start.imply("meridiem", 1);
133
- }
134
- }
135
56
  match = SECOND_REG_PATTERN.exec(context.text.substring(result.index + result.text.length));
136
57
  if (!match) {
137
- if (result.text.match(/^\d+$/)) {
138
- return null;
139
- }
140
58
  return result;
141
59
  }
142
- result.end = context.createParsingComponents();
143
- hour = 0;
144
- minute = 0;
145
- meridiem = -1;
146
- if (match[SECOND_GROUP]) {
147
- let second = parseInt(toHankaku(match[SECOND_GROUP]));
148
- if (isNaN(second)) {
149
- second = jaStringToNumber(match[SECOND_GROUP]);
150
- }
151
- if (second >= 60)
152
- return null;
153
- result.end.assign("second", second);
154
- }
155
- hour = parseInt(toHankaku(match[HOUR_GROUP]));
156
- if (isNaN(hour)) {
157
- hour = jaStringToNumber(match[HOUR_GROUP]);
60
+ result.text = result.text + match[0];
61
+ result.end = createTimeComponents(context, match[HOUR_GROUP], match[MINUTE_GROUP], match[SECOND_GROUP], match[AM_PM_HOUR_GROUP_1] ?? match[AM_PM_HOUR_GROUP_2]);
62
+ if (!result.end) {
63
+ return null;
158
64
  }
159
- if (match[MINUTE_GROUP]) {
160
- if (match[MINUTE_GROUP] === "") {
161
- minute = 30;
162
- }
163
- else {
164
- minute = parseInt(toHankaku(match[MINUTE_GROUP]));
165
- if (isNaN(minute)) {
166
- minute = jaStringToNumber(match[MINUTE_GROUP]);
65
+ if (!result.end.isCertain("meridiem") && result.start.isCertain("meridiem")) {
66
+ result.end.imply("meridiem", result.start.get("meridiem"));
67
+ if (result.start.get("meridiem") === Meridiem.PM) {
68
+ if (result.start.get("hour") - 12 > result.end.get("hour")) {
69
+ result.end.imply("meridiem", Meridiem.AM);
70
+ }
71
+ else if (result.end.get("hour") < 12) {
72
+ result.end.assign("hour", result.end.get("hour") + 12);
167
73
  }
168
74
  }
169
75
  }
170
- else if (hour > 100) {
171
- minute = hour % 100;
172
- hour = Math.floor(hour / 100);
76
+ if (result.end.date().getTime() < result.start.date().getTime()) {
77
+ result.end.imply("day", result.end.get("day") + 1);
173
78
  }
174
- if (minute >= 60) {
175
- return null;
79
+ return result;
80
+ }
81
+ }
82
+ function createTimeComponents(context, matchHour, matchMinute, matchSecond, matchAmPm) {
83
+ let hour = 0;
84
+ let meridiem = -1;
85
+ let targetComponents = context.createParsingComponents();
86
+ hour = parseInt(toHankaku(matchHour));
87
+ if (isNaN(hour)) {
88
+ hour = jaStringToNumber(matchHour);
89
+ }
90
+ if (hour > 24) {
91
+ return null;
92
+ }
93
+ if (matchMinute) {
94
+ let minute;
95
+ if (matchMinute === "半") {
96
+ minute = 30;
176
97
  }
177
- if (hour > 24) {
98
+ else {
99
+ minute = parseInt(toHankaku(matchMinute));
100
+ if (isNaN(minute)) {
101
+ minute = jaStringToNumber(matchMinute);
102
+ }
103
+ }
104
+ if (minute >= 60)
178
105
  return null;
106
+ targetComponents.assign("minute", minute);
107
+ }
108
+ if (matchSecond) {
109
+ let second = parseInt(toHankaku(matchSecond));
110
+ if (isNaN(second)) {
111
+ second = jaStringToNumber(matchSecond);
179
112
  }
180
- if (hour >= 12) {
181
- meridiem = Meridiem.PM;
113
+ if (second >= 60)
114
+ return null;
115
+ targetComponents.assign("second", second);
116
+ }
117
+ if (matchAmPm) {
118
+ if (hour > 12) {
119
+ return null;
182
120
  }
183
- if (match[AM_PM_HOUR_GROUP_1]) {
184
- if (hour > 12)
185
- return null;
186
- const AMPMString = match[AM_PM_HOUR_GROUP_1];
187
- const FirstAMPMString = AMPMString[0].toLowerCase();
188
- if (AMPMString === "午前" || FirstAMPMString === "a") {
189
- meridiem = Meridiem.AM;
190
- if (hour === 12)
191
- hour = 0;
192
- }
193
- else if (AMPMString === "午後" || FirstAMPMString === "p") {
194
- meridiem = Meridiem.PM;
195
- if (hour != 12)
196
- hour += 12;
197
- }
198
- if (!result.start.isCertain("meridiem")) {
199
- if (meridiem === Meridiem.AM) {
200
- result.start.imply("meridiem", Meridiem.AM);
201
- if (result.start.get("hour") === 12) {
202
- result.start.assign("hour", 0);
203
- }
204
- }
205
- else {
206
- result.start.imply("meridiem", 1);
207
- if (result.start.get("hour") != 12) {
208
- result.start.assign("hour", result.start.get("hour") + 12);
209
- }
210
- }
211
- }
121
+ const AMPMString = matchAmPm;
122
+ if (AMPMString === "午前" || AMPMString[0].toLowerCase() === "a") {
123
+ meridiem = Meridiem.AM;
124
+ if (hour === 12)
125
+ hour = 0;
212
126
  }
213
- else if (match[AM_PM_HOUR_GROUP_2]) {
214
- if (hour > 12)
215
- return null;
216
- const ampm = match[AM_PM_HOUR_GROUP_2][0].toLowerCase();
217
- if (ampm === "a") {
218
- meridiem = Meridiem.AM;
219
- if (hour === 12)
220
- hour = 0;
221
- }
222
- if (ampm === "p") {
223
- meridiem = Meridiem.PM;
224
- if (hour != 12)
225
- hour += 12;
226
- }
127
+ else if (AMPMString === "午後" || AMPMString[0].toLowerCase() === "p") {
128
+ meridiem = Meridiem.PM;
129
+ if (hour != 12)
130
+ hour += 12;
227
131
  }
228
- result.text = result.text + match[0];
229
- result.end.assign("hour", hour);
230
- result.end.assign("minute", minute);
231
- if (meridiem >= 0) {
232
- result.end.assign("meridiem", meridiem);
132
+ }
133
+ targetComponents.assign("hour", hour);
134
+ if (meridiem >= 0) {
135
+ targetComponents.assign("meridiem", meridiem);
136
+ }
137
+ else {
138
+ if (hour < 12) {
139
+ targetComponents.imply("meridiem", Meridiem.AM);
233
140
  }
234
141
  else {
235
- const startAtPM = result.start.isCertain("meridiem") && result.start.get("hour") > 12;
236
- if (startAtPM) {
237
- if (result.start.get("hour") - 12 > hour) {
238
- result.end.imply("meridiem", Meridiem.AM);
239
- }
240
- else if (hour <= 12) {
241
- result.end.assign("hour", hour + 12);
242
- result.end.assign("meridiem", Meridiem.PM);
243
- }
244
- }
245
- else if (hour > 12) {
246
- result.end.imply("meridiem", Meridiem.PM);
247
- }
248
- else if (hour <= 12) {
249
- result.end.imply("meridiem", Meridiem.AM);
250
- }
142
+ targetComponents.imply("meridiem", Meridiem.PM);
251
143
  }
252
- if (result.end.date().getTime() < result.start.date().getTime()) {
253
- result.end.imply("day", result.end.get("day") + 1);
254
- }
255
- return result;
256
144
  }
145
+ return targetComponents;
257
146
  }
258
147
  //# sourceMappingURL=JPTimeExpressionParser.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"JPTimeExpressionParser.js","sourceRoot":"","sources":["../../../../../src/locales/ja/parsers/JPTimeExpressionParser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"JPTimeExpressionParser.js","sourceRoot":"","sources":["../../../../../src/locales/ja/parsers/JPTimeExpressionParser.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
- import { OpUnitType } from "dayjs";
2
- import { TimeUnits } from "../../utils/timeunits.js";
1
+ import { Duration } from "../../calculation/duration.js";
2
+ import { Timeunit } from "../../types.js";
3
3
  export declare const WEEKDAY_DICTIONARY: {
4
4
  [word: string]: number;
5
5
  };
@@ -13,7 +13,7 @@ export declare const ORDINAL_WORD_DICTIONARY: {
13
13
  [word: string]: number;
14
14
  };
15
15
  export declare const TIME_UNIT_DICTIONARY: {
16
- [word: string]: OpUnitType;
16
+ [word: string]: Timeunit;
17
17
  };
18
18
  export declare const NUMBER_PATTERN: string;
19
19
  export declare function parseNumberPattern(match: string): number;
@@ -22,4 +22,4 @@ export declare function parseOrdinalNumberPattern(match: string): number;
22
22
  export declare const YEAR_PATTERN = "(?:[1-9][0-9]{0,3}\\s*(?:voor Christus|na Christus)|[1-2][0-9]{3}|[5-9][0-9])";
23
23
  export declare function parseYear(match: string): number;
24
24
  export declare const TIME_UNITS_PATTERN: string;
25
- export declare function parseTimeUnits(timeunitText: any): TimeUnits;
25
+ export declare function parseDuration(timeunitText: any): Duration;
@@ -138,8 +138,8 @@ export const TIME_UNIT_DICTIONARY = {
138
138
  uur: "hour",
139
139
  u: "hour",
140
140
  uren: "hour",
141
- dag: "d",
142
- dagen: "d",
141
+ dag: "day",
142
+ dagen: "day",
143
143
  week: "week",
144
144
  weken: "week",
145
145
  maand: "month",
@@ -187,7 +187,7 @@ export function parseYear(match) {
187
187
  const SINGLE_TIME_UNIT_PATTERN = `(${NUMBER_PATTERN})\\s{0,5}(${matchAnyPattern(TIME_UNIT_DICTIONARY)})\\s{0,5}`;
188
188
  const SINGLE_TIME_UNIT_REGEX = new RegExp(SINGLE_TIME_UNIT_PATTERN, "i");
189
189
  export const TIME_UNITS_PATTERN = repeatedTimeunitPattern(`(?:(?:binnen|in)\\s*)?`, SINGLE_TIME_UNIT_PATTERN);
190
- export function parseTimeUnits(timeunitText) {
190
+ export function parseDuration(timeunitText) {
191
191
  const fragments = {};
192
192
  let remainingText = timeunitText;
193
193
  let match = SINGLE_TIME_UNIT_REGEX.exec(remainingText);
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/locales/nl/constants.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/locales/nl/constants.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,6 @@
1
1
  import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
2
2
  import { Meridiem } from "../../../types.js";
3
- import { assignSimilarDate, assignTheNextDay } from "../../../utils/dayjs.js";
4
- import dayjs from "dayjs";
3
+ import { assignSimilarDate, implySimilarTime } from "../../../utils/dates.js";
5
4
  const DATE_GROUP = 1;
6
5
  const TIME_OF_DAY_GROUP = 2;
7
6
  export default class NLCasualDateTimeParser extends AbstractParserWithWordBoundaryChecking {
@@ -12,16 +11,21 @@ export default class NLCasualDateTimeParser extends AbstractParserWithWordBounda
12
11
  const dateText = match[DATE_GROUP].toLowerCase();
13
12
  const timeText = match[TIME_OF_DAY_GROUP].toLowerCase();
14
13
  const component = context.createParsingComponents();
15
- const targetDate = dayjs(context.refDate);
14
+ const targetDate = context.refDate;
16
15
  switch (dateText) {
17
16
  case "gisteren":
18
- assignSimilarDate(component, targetDate.add(-1, "day"));
17
+ const previousDay = new Date(targetDate.getTime());
18
+ previousDay.setDate(previousDay.getDate() - 1);
19
+ assignSimilarDate(component, previousDay);
19
20
  break;
20
21
  case "van":
21
22
  assignSimilarDate(component, targetDate);
22
23
  break;
23
24
  case "morgen":
24
- assignTheNextDay(component, targetDate);
25
+ const nextDay = new Date(targetDate.getTime());
26
+ nextDay.setDate(nextDay.getDate() + 1);
27
+ assignSimilarDate(component, nextDay);
28
+ implySimilarTime(component, nextDay);
25
29
  break;
26
30
  }
27
31
  switch (timeText) {
@@ -1 +1 @@
1
- {"version":3,"file":"NLCasualDateTimeParser.js","sourceRoot":"","sources":["../../../../../src/locales/nl/parsers/NLCasualDateTimeParser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,KAAK,MAAM,OAAO,CAAC;AAqB1B,MAAM,UAAU,GAAG,CAAC,CAAC;AACrB,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAE5B,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,sCAAsC;IACtF,YAAY,CAAC,OAAuB;QAChC,OAAO,qEAAqE,CAAC;IACjF,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;QACjD,MAAM,QAAQ,GAAG,KAAK,CAAC,iBAAiB,CAAC,CAAC,WAAW,EAAE,CAAC;QACxD,MAAM,SAAS,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;QACpD,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAE1C,QAAQ,QAAQ,EAAE,CAAC;YACf,KAAK,UAAU;gBACX,iBAAiB,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;gBACxD,MAAM;YACV,KAAK,KAAK;gBACN,iBAAiB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;gBACzC,MAAM;YACV,KAAK,QAAQ;gBACT,gBAAgB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;gBACxC,MAAM;QACd,CAAC;QAED,QAAQ,QAAQ,EAAE,CAAC;YACf,KAAK,SAAS;gBACV,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC3B,MAAM;YACV,KAAK,QAAQ;gBACT,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBAC5B,MAAM;YACV,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;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;QACd,CAAC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ"}
1
+ {"version":3,"file":"NLCasualDateTimeParser.js","sourceRoot":"","sources":["../../../../../src/locales/nl/parsers/NLCasualDateTimeParser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAqB3E,MAAM,UAAU,GAAG,CAAC,CAAC;AACrB,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAE5B,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,sCAAsC;IACtF,YAAY,CAAC,OAAuB;QAChC,OAAO,qEAAqE,CAAC;IACjF,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;QACjD,MAAM,QAAQ,GAAG,KAAK,CAAC,iBAAiB,CAAC,CAAC,WAAW,EAAE,CAAC;QACxD,MAAM,SAAS,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;QACpD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;QAEnC,QAAQ,QAAQ,EAAE,CAAC;YACf,KAAK,UAAU;gBACX,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC;gBACnD,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;gBAC/C,iBAAiB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;gBAC1C,MAAM;YACV,KAAK,KAAK;gBACN,iBAAiB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;gBACzC,MAAM;YACV,KAAK,QAAQ;gBACT,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,MAAM;QACd,CAAC;QAED,QAAQ,QAAQ,EAAE,CAAC;YACf,KAAK,SAAS;gBACV,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC3B,MAAM;YACV,KAAK,QAAQ;gBACT,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACzC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBAC5B,MAAM;YACV,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;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;QACd,CAAC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ"}
@@ -1,7 +1,6 @@
1
1
  import { Meridiem } from "../../../types.js";
2
2
  import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary.js";
3
- import dayjs from "dayjs";
4
- import { assignTheNextDay } from "../../../utils/dayjs.js";
3
+ import { assignSimilarDate, implySimilarTime } from "../../../utils/dates.js";
5
4
  const DAY_GROUP = 1;
6
5
  const MOMENT_GROUP = 2;
7
6
  export default class NLCasualTimeParser extends AbstractParserWithWordBoundaryChecking {
@@ -9,7 +8,7 @@ export default class NLCasualTimeParser extends AbstractParserWithWordBoundaryCh
9
8
  return /(deze)?\s*(namiddag|avond|middernacht|ochtend|middag|'s middags|'s avonds|'s ochtends)(?=\W|$)/i;
10
9
  }
11
10
  innerExtract(context, match) {
12
- const targetDate = dayjs(context.refDate);
11
+ const targetDate = context.refDate;
13
12
  const component = context.createParsingComponents();
14
13
  if (match[DAY_GROUP] === "deze") {
15
14
  component.assign("day", context.refDate.getDate());
@@ -28,7 +27,10 @@ export default class NLCasualTimeParser extends AbstractParserWithWordBoundaryCh
28
27
  component.imply("hour", 20);
29
28
  break;
30
29
  case "middernacht":
31
- assignTheNextDay(component, targetDate);
30
+ const nextDay = new Date(targetDate.getTime());
31
+ nextDay.setDate(nextDay.getDate() + 1);
32
+ assignSimilarDate(component, nextDay);
33
+ implySimilarTime(component, nextDay);
32
34
  component.imply("hour", 0);
33
35
  component.imply("minute", 0);
34
36
  component.imply("second", 0);
@@ -1 +1 @@
1
- {"version":3,"file":"NLCasualTimeParser.js","sourceRoot":"","sources":["../../../../../src/locales/nl/parsers/NLCasualTimeParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,sCAAsC,EAAE,MAAM,wDAAwD,CAAC;AAChH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,MAAM,SAAS,GAAG,CAAC,CAAC;AACpB,MAAM,YAAY,GAAG,CAAC,CAAC;AAEvB,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,sCAAsC;IAClF,YAAY;QACR,OAAO,iGAAiG,CAAC;IAC7G,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;QAEpD,IAAI,KAAK,CAAC,SAAS,CAAC,KAAK,MAAM,EAAE,CAAC;YAC9B,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YACnD,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;YAC1D,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;QAC5D,CAAC;QAED,QAAQ,KAAK,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;YACxC,KAAK,UAAU,CAAC;YAChB,KAAK,cAAc;gBACf,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,CAAC;YACb,KAAK,YAAY;gBACb,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,aAAa;gBACd,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,SAAS,CAAC;YACf,KAAK,aAAa;gBACd,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,QAAQ,CAAC;YACd,KAAK,YAAY;gBACb,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":"NLCasualTimeParser.js","sourceRoot":"","sources":["../../../../../src/locales/nl/parsers/NLCasualTimeParser.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,SAAS,GAAG,CAAC,CAAC;AACpB,MAAM,YAAY,GAAG,CAAC,CAAC;AAEvB,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,sCAAsC;IAClF,YAAY;QACR,OAAO,iGAAiG,CAAC;IAC7G,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;QACnC,MAAM,SAAS,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;QAEpD,IAAI,KAAK,CAAC,SAAS,CAAC,KAAK,MAAM,EAAE,CAAC;YAC9B,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YACnD,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;YAC1D,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;QAC5D,CAAC;QAED,QAAQ,KAAK,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;YACxC,KAAK,UAAU,CAAC;YAChB,KAAK,cAAc;gBACf,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,CAAC;YACb,KAAK,YAAY;gBACb,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,aAAa;gBACd,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,SAAS,CAAC;YACf,KAAK,aAAa;gBACd,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,QAAQ,CAAC;YACd,KAAK,YAAY;gBACb,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,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(`(dit|deze|(?:aan)?komend|volgend|afgelopen|vorig)e?\\s*(${matchAnyPattern(TIME_UNIT_DICTIONARY)})(?=\\s*)` +
@@ -26,25 +25,25 @@ export default class NLRelativeDateFormatParser extends AbstractParserWithWordBo
26
25
  return ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
27
26
  }
28
27
  const components = context.createParsingComponents();
29
- let date = dayjs(context.reference.instant);
28
+ let date = new Date(context.reference.instant.getTime());
30
29
  if (unitWord.match(/week/i)) {
31
- date = date.add(-date.get("d"), "d");
32
- components.imply("day", date.date());
33
- components.imply("month", date.month() + 1);
34
- components.imply("year", date.year());
30
+ date.setDate(date.getDate() - date.getDay());
31
+ components.imply("day", date.getDate());
32
+ components.imply("month", date.getMonth() + 1);
33
+ components.imply("year", date.getFullYear());
35
34
  }
36
35
  else if (unitWord.match(/maand/i)) {
37
- date = date.add(-date.date() + 1, "d");
38
- components.imply("day", date.date());
39
- components.assign("year", date.year());
40
- components.assign("month", date.month() + 1);
36
+ date.setDate(1);
37
+ components.imply("day", date.getDate());
38
+ components.assign("year", date.getFullYear());
39
+ components.assign("month", date.getMonth() + 1);
41
40
  }
42
41
  else if (unitWord.match(/jaar/i)) {
43
- date = date.add(-date.date() + 1, "d");
44
- date = date.add(-date.month(), "month");
45
- components.imply("day", date.date());
46
- components.imply("month", date.month() + 1);
47
- components.assign("year", date.year());
42
+ date.setDate(1);
43
+ date.setMonth(0);
44
+ components.imply("day", date.getDate());
45
+ components.imply("month", date.getMonth() + 1);
46
+ components.assign("year", date.getFullYear());
48
47
  }
49
48
  return components;
50
49
  }
@@ -1 +1 @@
1
- {"version":3,"file":"NLRelativeDateFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/nl/parsers/NLRelativeDateFormatParser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"NLRelativeDateFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/nl/parsers/NLRelativeDateFormatParser.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,2DAA2D,eAAe,CAAC,oBAAoB,CAAC,WAAW;IACvG,WAAW,EACf,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,SAAS,IAAI,QAAQ,IAAI,QAAQ,IAAI,QAAQ,IAAI,WAAW,EAAE,CAAC;YAC3E,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,WAAW,IAAI,QAAQ,IAAI,OAAO,EAAE,CAAC;YACjD,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,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
  const PATTERN = new RegExp("" + "(" + TIME_UNITS_PATTERN + ")" + "(?:geleden|voor|eerder)(?=(?:\\W|$))", "i");
6
6
  const STRICT_PATTERN = new RegExp("" + "(" + TIME_UNITS_PATTERN + ")" + "geleden(?=(?:\\W|$))", "i");
7
7
  export default class NLTimeUnitAgoFormatParser extends AbstractParserWithWordBoundaryChecking {
@@ -14,8 +14,8 @@ export default class NLTimeUnitAgoFormatParser extends AbstractParserWithWordBou
14
14
  return this.strictMode ? STRICT_PATTERN : PATTERN;
15
15
  }
16
16
  innerExtract(context, match) {
17
- const timeUnits = parseTimeUnits(match[1]);
18
- const outputTimeUnits = reverseTimeUnits(timeUnits);
17
+ const timeUnits = parseDuration(match[1]);
18
+ const outputTimeUnits = reverseDuration(timeUnits);
19
19
  return ParsingComponents.createRelativeFromReference(context.reference, outputTimeUnits);
20
20
  }
21
21
  }
@@ -1 +1 @@
1
- {"version":3,"file":"NLTimeUnitAgoFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/nl/parsers/NLTimeUnitAgoFormatParser.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,OAAO,GAAG,IAAI,MAAM,CAAC,EAAE,GAAG,GAAG,GAAG,kBAAkB,GAAG,GAAG,GAAG,sCAAsC,EAAE,GAAG,CAAC,CAAC;AAE9G,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,EAAE,GAAG,GAAG,GAAG,kBAAkB,GAAG,GAAG,GAAG,sBAAsB,EAAE,GAAG,CAAC,CAAC;AAErG,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,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":"NLTimeUnitAgoFormatParser.js","sourceRoot":"","sources":["../../../../../src/locales/nl/parsers/NLTimeUnitAgoFormatParser.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,OAAO,GAAG,IAAI,MAAM,CAAC,EAAE,GAAG,GAAG,GAAG,kBAAkB,GAAG,GAAG,GAAG,sCAAsC,EAAE,GAAG,CAAC,CAAC;AAE9G,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,EAAE,GAAG,GAAG,GAAG,kBAAkB,GAAG,GAAG,GAAG,sBAAsB,EAAE,GAAG,CAAC,CAAC;AAErG,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,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,7 +1,7 @@
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
- import { reverseTimeUnits } from "../../../utils/timeunits.js";
4
+ import { reverseDuration } from "../../../calculation/duration.js";
5
5
  const PATTERN = new RegExp(`(dit|deze|vorig|afgelopen|(?:aan)?komend|over|\\+|-)e?\\s*(${TIME_UNITS_PATTERN})(?=\\W|$)`, "i");
6
6
  const PREFIX_WORD_GROUP = 1;
7
7
  const TIME_UNIT_WORD_GROUP = 2;
@@ -11,12 +11,12 @@ export default class NLTimeUnitCasualRelativeFormatParser extends AbstractParser
11
11
  }
12
12
  innerExtract(context, match) {
13
13
  const prefix = match[PREFIX_WORD_GROUP].toLowerCase();
14
- let timeUnits = parseTimeUnits(match[TIME_UNIT_WORD_GROUP]);
14
+ let timeUnits = parseDuration(match[TIME_UNIT_WORD_GROUP]);
15
15
  switch (prefix) {
16
16
  case "vorig":
17
17
  case "afgelopen":
18
18
  case "-":
19
- timeUnits = reverseTimeUnits(timeUnits);
19
+ timeUnits = reverseDuration(timeUnits);
20
20
  break;
21
21
  }
22
22
  return ParsingComponents.createRelativeFromReference(context.reference, timeUnits);