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.
- package/dist/cjs/calculation/duration.d.ts +5 -0
- package/dist/cjs/calculation/duration.js +6 -0
- package/dist/cjs/calculation/duration.js.map +1 -1
- package/dist/cjs/calculation/mergingCalculation.js +5 -4
- package/dist/cjs/calculation/mergingCalculation.js.map +1 -1
- package/dist/cjs/calculation/weekdays.js +1 -2
- package/dist/cjs/calculation/weekdays.js.map +1 -1
- package/dist/cjs/calculation/years.js +11 -16
- package/dist/cjs/calculation/years.js.map +1 -1
- package/dist/cjs/common/casualReferences.d.ts +1 -1
- package/dist/cjs/common/casualReferences.js +29 -31
- package/dist/cjs/common/casualReferences.js.map +1 -1
- package/dist/cjs/common/parsers/AbstractTimeExpressionParser.js +3 -0
- package/dist/cjs/common/parsers/AbstractTimeExpressionParser.js.map +1 -1
- package/dist/cjs/common/refiners/AbstractMergeDateRangeRefiner.js +20 -19
- package/dist/cjs/common/refiners/AbstractMergeDateRangeRefiner.js.map +1 -1
- package/dist/cjs/common/refiners/ForwardDateRefiner.js +16 -24
- package/dist/cjs/common/refiners/ForwardDateRefiner.js.map +1 -1
- package/dist/cjs/index.d.ts +3 -1
- package/dist/cjs/index.js +5 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/locales/de/constants.d.ts +4 -4
- package/dist/cjs/locales/de/constants.js +5 -5
- package/dist/cjs/locales/de/constants.js.map +1 -1
- package/dist/cjs/locales/de/parsers/DECasualDateParser.js +18 -15
- package/dist/cjs/locales/de/parsers/DECasualDateParser.js.map +1 -1
- package/dist/cjs/locales/de/parsers/DECasualTimeParser.js +4 -9
- package/dist/cjs/locales/de/parsers/DECasualTimeParser.js.map +1 -1
- package/dist/cjs/locales/de/parsers/DETimeUnitRelativeFormatParser.js +2 -2
- package/dist/cjs/locales/de/parsers/DETimeUnitRelativeFormatParser.js.map +1 -1
- package/dist/cjs/locales/de/parsers/DETimeUnitWithinFormatParser.js +1 -1
- package/dist/cjs/locales/de/parsers/DETimeUnitWithinFormatParser.js.map +1 -1
- package/dist/cjs/locales/en/constants.d.ts +5 -6
- package/dist/cjs/locales/en/constants.js +5 -5
- package/dist/cjs/locales/en/constants.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENCasualDateParser.js +7 -9
- package/dist/cjs/locales/en/parsers/ENCasualDateParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENRelativeDateFormatParser.js +14 -18
- package/dist/cjs/locales/en/parsers/ENRelativeDateFormatParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitAgoFormatParser.js +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitLaterFormatParser.js +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitLaterFormatParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitWithinFormatParser.js +1 -5
- package/dist/cjs/locales/en/parsers/ENTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/cjs/locales/en/refiners/ENMergeRelativeAfterDateRefiner.js +3 -3
- package/dist/cjs/locales/en/refiners/ENMergeRelativeAfterDateRefiner.js.map +1 -1
- package/dist/cjs/locales/en/refiners/ENMergeRelativeFollowByDateRefiner.js +1 -1
- package/dist/cjs/locales/en/refiners/ENMergeRelativeFollowByDateRefiner.js.map +1 -1
- package/dist/cjs/locales/es/constants.d.ts +4 -5
- package/dist/cjs/locales/es/constants.js +4 -4
- package/dist/cjs/locales/es/constants.js.map +1 -1
- package/dist/cjs/locales/es/parsers/ESCasualTimeParser.js +6 -7
- package/dist/cjs/locales/es/parsers/ESCasualTimeParser.js.map +1 -1
- package/dist/cjs/locales/es/parsers/ESTimeUnitWithinFormatParser.js +1 -1
- package/dist/cjs/locales/es/parsers/ESTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/cjs/locales/fr/constants.d.ts +4 -5
- package/dist/cjs/locales/fr/constants.js +4 -4
- package/dist/cjs/locales/fr/constants.js.map +1 -1
- package/dist/cjs/locales/fr/parsers/FRCasualDateParser.js +6 -9
- package/dist/cjs/locales/fr/parsers/FRCasualDateParser.js.map +1 -1
- package/dist/cjs/locales/fr/parsers/FRTimeUnitAgoFormatParser.js +3 -3
- package/dist/cjs/locales/fr/parsers/FRTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/cjs/locales/fr/parsers/FRTimeUnitRelativeFormatParser.js +2 -2
- package/dist/cjs/locales/fr/parsers/FRTimeUnitRelativeFormatParser.js.map +1 -1
- package/dist/cjs/locales/fr/parsers/FRTimeUnitWithinFormatParser.js +1 -1
- package/dist/cjs/locales/fr/parsers/FRTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/cjs/locales/it/constants.d.ts +4 -4
- package/dist/cjs/locales/it/constants.js +4 -4
- package/dist/cjs/locales/it/constants.js.map +1 -1
- package/dist/cjs/locales/it/parsers/ITCasualDateParser.d.ts +1 -1
- package/dist/cjs/locales/it/parsers/ITCasualDateParser.js +9 -11
- package/dist/cjs/locales/it/parsers/ITCasualDateParser.js.map +1 -1
- package/dist/cjs/locales/it/parsers/ITCasualTimeParser.d.ts +1 -1
- package/dist/cjs/locales/it/parsers/ITCasualTimeParser.js +8 -9
- package/dist/cjs/locales/it/parsers/ITCasualTimeParser.js.map +1 -1
- package/dist/cjs/locales/it/parsers/ITRelativeDateFormatParser.js +14 -18
- package/dist/cjs/locales/it/parsers/ITRelativeDateFormatParser.js.map +1 -1
- package/dist/cjs/locales/it/parsers/ITTimeUnitAgoFormatParser.js +3 -3
- package/dist/cjs/locales/it/parsers/ITTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/cjs/locales/it/parsers/ITTimeUnitCasualRelativeFormatParser.js +3 -3
- package/dist/cjs/locales/it/parsers/ITTimeUnitCasualRelativeFormatParser.js.map +1 -1
- package/dist/cjs/locales/it/parsers/ITTimeUnitLaterFormatParser.js +1 -1
- package/dist/cjs/locales/it/parsers/ITTimeUnitLaterFormatParser.js.map +1 -1
- package/dist/cjs/locales/it/parsers/ITTimeUnitWithinFormatParser.js +1 -1
- package/dist/cjs/locales/it/parsers/ITTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/cjs/locales/it/refiners/ITMergeRelativeDateRefiner.js +3 -3
- package/dist/cjs/locales/it/refiners/ITMergeRelativeDateRefiner.js.map +1 -1
- package/dist/cjs/locales/ja/parsers/JPCasualDateParser.js +4 -8
- package/dist/cjs/locales/ja/parsers/JPCasualDateParser.js.map +1 -1
- package/dist/cjs/locales/ja/parsers/JPStandardParser.js +1 -6
- package/dist/cjs/locales/ja/parsers/JPStandardParser.js.map +1 -1
- package/dist/cjs/locales/ja/parsers/JPTimeExpressionParser.d.ts +1 -1
- package/dist/cjs/locales/ja/parsers/JPTimeExpressionParser.js +77 -187
- package/dist/cjs/locales/ja/parsers/JPTimeExpressionParser.js.map +1 -1
- package/dist/cjs/locales/nl/constants.d.ts +4 -4
- package/dist/cjs/locales/nl/constants.js +4 -4
- package/dist/cjs/locales/nl/constants.js.map +1 -1
- package/dist/cjs/locales/nl/parsers/NLCasualDateTimeParser.js +10 -9
- package/dist/cjs/locales/nl/parsers/NLCasualDateTimeParser.js.map +1 -1
- package/dist/cjs/locales/nl/parsers/NLCasualTimeParser.js +6 -7
- package/dist/cjs/locales/nl/parsers/NLCasualTimeParser.js.map +1 -1
- package/dist/cjs/locales/nl/parsers/NLRelativeDateFormatParser.js +14 -18
- package/dist/cjs/locales/nl/parsers/NLRelativeDateFormatParser.js.map +1 -1
- package/dist/cjs/locales/nl/parsers/NLTimeUnitAgoFormatParser.js +3 -3
- package/dist/cjs/locales/nl/parsers/NLTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/cjs/locales/nl/parsers/NLTimeUnitCasualRelativeFormatParser.js +3 -3
- package/dist/cjs/locales/nl/parsers/NLTimeUnitCasualRelativeFormatParser.js.map +1 -1
- package/dist/cjs/locales/nl/parsers/NLTimeUnitLaterFormatParser.js +1 -1
- package/dist/cjs/locales/nl/parsers/NLTimeUnitLaterFormatParser.js.map +1 -1
- package/dist/cjs/locales/nl/parsers/NLTimeUnitWithinFormatParser.js +1 -1
- package/dist/cjs/locales/nl/parsers/NLTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/cjs/locales/pt/parsers/PTCasualTimeParser.js +6 -7
- package/dist/cjs/locales/pt/parsers/PTCasualTimeParser.js.map +1 -1
- package/dist/cjs/locales/ru/constants.d.ts +4 -4
- package/dist/cjs/locales/ru/constants.js +7 -7
- package/dist/cjs/locales/ru/constants.js.map +1 -1
- package/dist/cjs/locales/ru/parsers/RUCasualTimeParser.js +6 -9
- package/dist/cjs/locales/ru/parsers/RUCasualTimeParser.js.map +1 -1
- package/dist/cjs/locales/ru/parsers/RURelativeDateFormatParser.js +14 -18
- package/dist/cjs/locales/ru/parsers/RURelativeDateFormatParser.js.map +1 -1
- package/dist/cjs/locales/ru/parsers/RUTimeUnitAgoFormatParser.js +3 -3
- package/dist/cjs/locales/ru/parsers/RUTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/cjs/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js +3 -3
- package/dist/cjs/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js.map +1 -1
- package/dist/cjs/locales/ru/parsers/RUTimeUnitWithinFormatParser.js +1 -1
- package/dist/cjs/locales/ru/parsers/RUTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/cjs/locales/sv/constants.d.ts +8 -4
- package/dist/cjs/locales/sv/constants.js +25 -7
- package/dist/cjs/locales/sv/constants.js.map +1 -1
- package/dist/cjs/locales/sv/index.js +2 -0
- package/dist/cjs/locales/sv/index.js.map +1 -1
- package/dist/cjs/locales/sv/parsers/SVCasualDateParser.js +14 -13
- package/dist/cjs/locales/sv/parsers/SVCasualDateParser.js.map +1 -1
- package/dist/cjs/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.d.ts +9 -0
- package/dist/cjs/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.js +34 -0
- package/dist/cjs/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.js.map +1 -0
- package/dist/cjs/locales/uk/constants.d.ts +4 -4
- package/dist/cjs/locales/uk/constants.js +8 -8
- package/dist/cjs/locales/uk/constants.js.map +1 -1
- package/dist/cjs/locales/uk/parsers/UKCasualTimeParser.js +6 -9
- package/dist/cjs/locales/uk/parsers/UKCasualTimeParser.js.map +1 -1
- package/dist/cjs/locales/uk/parsers/UKRelativeDateFormatParser.js +14 -18
- package/dist/cjs/locales/uk/parsers/UKRelativeDateFormatParser.js.map +1 -1
- package/dist/cjs/locales/uk/parsers/UKTimeUnitAgoFormatParser.js +3 -3
- package/dist/cjs/locales/uk/parsers/UKTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/cjs/locales/uk/parsers/UKTimeUnitCasualRelativeFormatParser.js +3 -3
- package/dist/cjs/locales/uk/parsers/UKTimeUnitCasualRelativeFormatParser.js.map +1 -1
- package/dist/cjs/locales/uk/parsers/UKTimeUnitWithinFormatParser.js +1 -1
- package/dist/cjs/locales/uk/parsers/UKTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/cjs/locales/zh/hans/parsers/ZHHansCasualDateParser.js +23 -27
- package/dist/cjs/locales/zh/hans/parsers/ZHHansCasualDateParser.js.map +1 -1
- package/dist/cjs/locales/zh/hans/parsers/ZHHansDateParser.js +2 -7
- package/dist/cjs/locales/zh/hans/parsers/ZHHansDateParser.js.map +1 -1
- package/dist/cjs/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.js +20 -21
- package/dist/cjs/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.js.map +1 -1
- package/dist/cjs/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.js +17 -22
- package/dist/cjs/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.js.map +1 -1
- package/dist/cjs/locales/zh/hans/parsers/ZHHansTimeExpressionParser.js +71 -76
- package/dist/cjs/locales/zh/hans/parsers/ZHHansTimeExpressionParser.js.map +1 -1
- package/dist/cjs/locales/zh/hans/parsers/ZHHansWeekdayParser.js +14 -19
- package/dist/cjs/locales/zh/hans/parsers/ZHHansWeekdayParser.js.map +1 -1
- package/dist/cjs/locales/zh/hant/parsers/ZHHantCasualDateParser.js +23 -27
- package/dist/cjs/locales/zh/hant/parsers/ZHHantCasualDateParser.js.map +1 -1
- package/dist/cjs/locales/zh/hant/parsers/ZHHantDateParser.js +2 -7
- package/dist/cjs/locales/zh/hant/parsers/ZHHantDateParser.js.map +1 -1
- package/dist/cjs/locales/zh/hant/parsers/ZHHantDeadlineFormatParser.js +20 -21
- package/dist/cjs/locales/zh/hant/parsers/ZHHantDeadlineFormatParser.js.map +1 -1
- package/dist/cjs/locales/zh/hant/parsers/ZHHantRelationWeekdayParser.js +17 -22
- package/dist/cjs/locales/zh/hant/parsers/ZHHantRelationWeekdayParser.js.map +1 -1
- package/dist/cjs/locales/zh/hant/parsers/ZHHantTimeExpressionParser.js +73 -78
- package/dist/cjs/locales/zh/hant/parsers/ZHHantTimeExpressionParser.js.map +1 -1
- package/dist/cjs/locales/zh/hant/parsers/ZHHantWeekdayParser.js +14 -19
- package/dist/cjs/locales/zh/hant/parsers/ZHHantWeekdayParser.js.map +1 -1
- package/dist/cjs/results.d.ts +3 -4
- package/dist/cjs/results.js +74 -60
- package/dist/cjs/results.js.map +1 -1
- package/dist/cjs/timezone.js +1 -6
- package/dist/cjs/timezone.js.map +1 -1
- package/dist/cjs/types.d.ts +1 -1
- package/dist/esm/calculation/duration.d.ts +5 -0
- package/dist/esm/calculation/duration.js +5 -0
- package/dist/esm/calculation/duration.js.map +1 -1
- package/dist/esm/calculation/mergingCalculation.js +5 -4
- package/dist/esm/calculation/mergingCalculation.js.map +1 -1
- package/dist/esm/calculation/weekdays.js +1 -2
- package/dist/esm/calculation/weekdays.js.map +1 -1
- package/dist/esm/calculation/years.js +11 -13
- package/dist/esm/calculation/years.js.map +1 -1
- package/dist/esm/common/casualReferences.d.ts +1 -1
- package/dist/esm/common/casualReferences.js +21 -20
- package/dist/esm/common/casualReferences.js.map +1 -1
- package/dist/esm/common/parsers/AbstractTimeExpressionParser.js +3 -0
- package/dist/esm/common/parsers/AbstractTimeExpressionParser.js.map +1 -1
- package/dist/esm/common/refiners/AbstractMergeDateRangeRefiner.js +20 -19
- package/dist/esm/common/refiners/AbstractMergeDateRangeRefiner.js.map +1 -1
- package/dist/esm/common/refiners/ForwardDateRefiner.js +16 -21
- package/dist/esm/common/refiners/ForwardDateRefiner.js.map +1 -1
- package/dist/esm/index.d.ts +3 -1
- package/dist/esm/index.js +3 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/locales/de/constants.d.ts +4 -4
- package/dist/esm/locales/de/constants.js +4 -4
- package/dist/esm/locales/de/constants.js.map +1 -1
- package/dist/esm/locales/de/parsers/DECasualDateParser.js +13 -10
- package/dist/esm/locales/de/parsers/DECasualDateParser.js.map +1 -1
- package/dist/esm/locales/de/parsers/DECasualTimeParser.js +3 -5
- package/dist/esm/locales/de/parsers/DECasualTimeParser.js.map +1 -1
- package/dist/esm/locales/de/parsers/DETimeUnitRelativeFormatParser.js +2 -2
- package/dist/esm/locales/de/parsers/DETimeUnitRelativeFormatParser.js.map +1 -1
- package/dist/esm/locales/de/parsers/DETimeUnitWithinFormatParser.js +2 -2
- package/dist/esm/locales/de/parsers/DETimeUnitWithinFormatParser.js.map +1 -1
- package/dist/esm/locales/en/constants.d.ts +5 -6
- package/dist/esm/locales/en/constants.js +7 -7
- package/dist/esm/locales/en/constants.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENCasualDateParser.js +6 -5
- package/dist/esm/locales/en/parsers/ENCasualDateParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENRelativeDateFormatParser.js +14 -15
- package/dist/esm/locales/en/parsers/ENRelativeDateFormatParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENTimeUnitAgoFormatParser.js +2 -2
- package/dist/esm/locales/en/parsers/ENTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js +2 -2
- package/dist/esm/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENTimeUnitLaterFormatParser.js +2 -2
- package/dist/esm/locales/en/parsers/ENTimeUnitLaterFormatParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENTimeUnitWithinFormatParser.js +2 -6
- package/dist/esm/locales/en/parsers/ENTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/esm/locales/en/refiners/ENMergeRelativeAfterDateRefiner.js +4 -4
- package/dist/esm/locales/en/refiners/ENMergeRelativeAfterDateRefiner.js.map +1 -1
- package/dist/esm/locales/en/refiners/ENMergeRelativeFollowByDateRefiner.js +2 -2
- package/dist/esm/locales/en/refiners/ENMergeRelativeFollowByDateRefiner.js.map +1 -1
- package/dist/esm/locales/es/constants.d.ts +4 -5
- package/dist/esm/locales/es/constants.js +3 -3
- package/dist/esm/locales/es/constants.js.map +1 -1
- package/dist/esm/locales/es/parsers/ESCasualTimeParser.js +6 -4
- package/dist/esm/locales/es/parsers/ESCasualTimeParser.js.map +1 -1
- package/dist/esm/locales/es/parsers/ESTimeUnitWithinFormatParser.js +2 -2
- package/dist/esm/locales/es/parsers/ESTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/esm/locales/fr/constants.d.ts +4 -5
- package/dist/esm/locales/fr/constants.js +3 -3
- package/dist/esm/locales/fr/constants.js.map +1 -1
- package/dist/esm/locales/fr/parsers/FRCasualDateParser.js +5 -5
- package/dist/esm/locales/fr/parsers/FRCasualDateParser.js.map +1 -1
- package/dist/esm/locales/fr/parsers/FRTimeUnitAgoFormatParser.js +4 -4
- package/dist/esm/locales/fr/parsers/FRTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/esm/locales/fr/parsers/FRTimeUnitRelativeFormatParser.js +2 -2
- package/dist/esm/locales/fr/parsers/FRTimeUnitRelativeFormatParser.js.map +1 -1
- package/dist/esm/locales/fr/parsers/FRTimeUnitWithinFormatParser.js +2 -2
- package/dist/esm/locales/fr/parsers/FRTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/esm/locales/it/constants.d.ts +4 -4
- package/dist/esm/locales/it/constants.js +3 -3
- package/dist/esm/locales/it/constants.js.map +1 -1
- package/dist/esm/locales/it/parsers/ITCasualDateParser.d.ts +1 -1
- package/dist/esm/locales/it/parsers/ITCasualDateParser.js +7 -6
- package/dist/esm/locales/it/parsers/ITCasualDateParser.js.map +1 -1
- package/dist/esm/locales/it/parsers/ITCasualTimeParser.d.ts +1 -1
- package/dist/esm/locales/it/parsers/ITCasualTimeParser.js +7 -5
- package/dist/esm/locales/it/parsers/ITCasualTimeParser.js.map +1 -1
- package/dist/esm/locales/it/parsers/ITRelativeDateFormatParser.js +14 -15
- package/dist/esm/locales/it/parsers/ITRelativeDateFormatParser.js.map +1 -1
- package/dist/esm/locales/it/parsers/ITTimeUnitAgoFormatParser.js +4 -4
- package/dist/esm/locales/it/parsers/ITTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/esm/locales/it/parsers/ITTimeUnitCasualRelativeFormatParser.js +4 -4
- package/dist/esm/locales/it/parsers/ITTimeUnitCasualRelativeFormatParser.js.map +1 -1
- package/dist/esm/locales/it/parsers/ITTimeUnitLaterFormatParser.js +2 -2
- package/dist/esm/locales/it/parsers/ITTimeUnitLaterFormatParser.js.map +1 -1
- package/dist/esm/locales/it/parsers/ITTimeUnitWithinFormatParser.js +2 -2
- package/dist/esm/locales/it/parsers/ITTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/esm/locales/it/refiners/ITMergeRelativeDateRefiner.js +4 -4
- package/dist/esm/locales/it/refiners/ITMergeRelativeDateRefiner.js.map +1 -1
- package/dist/esm/locales/ja/parsers/JPCasualDateParser.js +4 -5
- package/dist/esm/locales/ja/parsers/JPCasualDateParser.js.map +1 -1
- package/dist/esm/locales/ja/parsers/JPStandardParser.js +1 -3
- package/dist/esm/locales/ja/parsers/JPStandardParser.js.map +1 -1
- package/dist/esm/locales/ja/parsers/JPTimeExpressionParser.d.ts +1 -1
- package/dist/esm/locales/ja/parsers/JPTimeExpressionParser.js +75 -186
- package/dist/esm/locales/ja/parsers/JPTimeExpressionParser.js.map +1 -1
- package/dist/esm/locales/nl/constants.d.ts +4 -4
- package/dist/esm/locales/nl/constants.js +3 -3
- package/dist/esm/locales/nl/constants.js.map +1 -1
- package/dist/esm/locales/nl/parsers/NLCasualDateTimeParser.js +9 -5
- package/dist/esm/locales/nl/parsers/NLCasualDateTimeParser.js.map +1 -1
- package/dist/esm/locales/nl/parsers/NLCasualTimeParser.js +6 -4
- package/dist/esm/locales/nl/parsers/NLCasualTimeParser.js.map +1 -1
- package/dist/esm/locales/nl/parsers/NLRelativeDateFormatParser.js +14 -15
- package/dist/esm/locales/nl/parsers/NLRelativeDateFormatParser.js.map +1 -1
- package/dist/esm/locales/nl/parsers/NLTimeUnitAgoFormatParser.js +4 -4
- package/dist/esm/locales/nl/parsers/NLTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/esm/locales/nl/parsers/NLTimeUnitCasualRelativeFormatParser.js +4 -4
- package/dist/esm/locales/nl/parsers/NLTimeUnitCasualRelativeFormatParser.js.map +1 -1
- package/dist/esm/locales/nl/parsers/NLTimeUnitLaterFormatParser.js +2 -2
- package/dist/esm/locales/nl/parsers/NLTimeUnitLaterFormatParser.js.map +1 -1
- package/dist/esm/locales/nl/parsers/NLTimeUnitWithinFormatParser.js +2 -2
- package/dist/esm/locales/nl/parsers/NLTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/esm/locales/pt/parsers/PTCasualTimeParser.js +6 -4
- package/dist/esm/locales/pt/parsers/PTCasualTimeParser.js.map +1 -1
- package/dist/esm/locales/ru/constants.d.ts +4 -4
- package/dist/esm/locales/ru/constants.js +6 -6
- package/dist/esm/locales/ru/constants.js.map +1 -1
- package/dist/esm/locales/ru/parsers/RUCasualTimeParser.js +6 -6
- package/dist/esm/locales/ru/parsers/RUCasualTimeParser.js.map +1 -1
- package/dist/esm/locales/ru/parsers/RURelativeDateFormatParser.js +14 -15
- package/dist/esm/locales/ru/parsers/RURelativeDateFormatParser.js.map +1 -1
- package/dist/esm/locales/ru/parsers/RUTimeUnitAgoFormatParser.js +4 -4
- package/dist/esm/locales/ru/parsers/RUTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/esm/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js +4 -4
- package/dist/esm/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.js.map +1 -1
- package/dist/esm/locales/ru/parsers/RUTimeUnitWithinFormatParser.js +2 -2
- package/dist/esm/locales/ru/parsers/RUTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/esm/locales/sv/constants.d.ts +8 -4
- package/dist/esm/locales/sv/constants.js +23 -5
- package/dist/esm/locales/sv/constants.js.map +1 -1
- package/dist/esm/locales/sv/index.js +2 -0
- package/dist/esm/locales/sv/index.js.map +1 -1
- package/dist/esm/locales/sv/parsers/SVCasualDateParser.js +14 -10
- package/dist/esm/locales/sv/parsers/SVCasualDateParser.js.map +1 -1
- package/dist/esm/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.d.ts +9 -0
- package/dist/esm/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.js +32 -0
- package/dist/esm/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.js.map +1 -0
- package/dist/esm/locales/uk/constants.d.ts +4 -4
- package/dist/esm/locales/uk/constants.js +7 -7
- package/dist/esm/locales/uk/constants.js.map +1 -1
- package/dist/esm/locales/uk/parsers/UKCasualTimeParser.js +6 -6
- package/dist/esm/locales/uk/parsers/UKCasualTimeParser.js.map +1 -1
- package/dist/esm/locales/uk/parsers/UKRelativeDateFormatParser.js +14 -15
- package/dist/esm/locales/uk/parsers/UKRelativeDateFormatParser.js.map +1 -1
- package/dist/esm/locales/uk/parsers/UKTimeUnitAgoFormatParser.js +4 -4
- package/dist/esm/locales/uk/parsers/UKTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/esm/locales/uk/parsers/UKTimeUnitCasualRelativeFormatParser.js +4 -4
- package/dist/esm/locales/uk/parsers/UKTimeUnitCasualRelativeFormatParser.js.map +1 -1
- package/dist/esm/locales/uk/parsers/UKTimeUnitWithinFormatParser.js +2 -2
- package/dist/esm/locales/uk/parsers/UKTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/esm/locales/zh/hans/parsers/ZHHansCasualDateParser.js +23 -24
- package/dist/esm/locales/zh/hans/parsers/ZHHansCasualDateParser.js.map +1 -1
- package/dist/esm/locales/zh/hans/parsers/ZHHansDateParser.js +2 -4
- package/dist/esm/locales/zh/hans/parsers/ZHHansDateParser.js.map +1 -1
- package/dist/esm/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.js +20 -18
- package/dist/esm/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.js.map +1 -1
- package/dist/esm/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.js +17 -19
- package/dist/esm/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.js.map +1 -1
- package/dist/esm/locales/zh/hans/parsers/ZHHansTimeExpressionParser.js +71 -73
- package/dist/esm/locales/zh/hans/parsers/ZHHansTimeExpressionParser.js.map +1 -1
- package/dist/esm/locales/zh/hans/parsers/ZHHansWeekdayParser.js +14 -16
- package/dist/esm/locales/zh/hans/parsers/ZHHansWeekdayParser.js.map +1 -1
- package/dist/esm/locales/zh/hant/parsers/ZHHantCasualDateParser.js +23 -24
- package/dist/esm/locales/zh/hant/parsers/ZHHantCasualDateParser.js.map +1 -1
- package/dist/esm/locales/zh/hant/parsers/ZHHantDateParser.js +2 -4
- package/dist/esm/locales/zh/hant/parsers/ZHHantDateParser.js.map +1 -1
- package/dist/esm/locales/zh/hant/parsers/ZHHantDeadlineFormatParser.js +20 -18
- package/dist/esm/locales/zh/hant/parsers/ZHHantDeadlineFormatParser.js.map +1 -1
- package/dist/esm/locales/zh/hant/parsers/ZHHantRelationWeekdayParser.js +17 -19
- package/dist/esm/locales/zh/hant/parsers/ZHHantRelationWeekdayParser.js.map +1 -1
- package/dist/esm/locales/zh/hant/parsers/ZHHantTimeExpressionParser.js +73 -75
- package/dist/esm/locales/zh/hant/parsers/ZHHantTimeExpressionParser.js.map +1 -1
- package/dist/esm/locales/zh/hant/parsers/ZHHantWeekdayParser.js +14 -16
- package/dist/esm/locales/zh/hant/parsers/ZHHantWeekdayParser.js.map +1 -1
- package/dist/esm/results.d.ts +3 -4
- package/dist/esm/results.js +75 -58
- package/dist/esm/results.js.map +1 -1
- package/dist/esm/timezone.js +1 -3
- package/dist/esm/timezone.js.map +1 -1
- package/dist/esm/types.d.ts +1 -1
- package/package.json +2 -4
- package/src/calculation/duration.ts +10 -0
- package/src/calculation/mergingCalculation.ts +5 -4
- package/src/calculation/weekdays.ts +2 -2
- package/src/calculation/years.ts +11 -16
- package/src/common/casualReferences.ts +23 -33
- package/src/common/parsers/AbstractTimeExpressionParser.ts +6 -0
- package/src/common/refiners/AbstractMergeDateRangeRefiner.ts +20 -21
- package/src/common/refiners/ForwardDateRefiner.ts +17 -22
- package/src/index.ts +3 -1
- package/src/locales/de/constants.ts +8 -8
- package/src/locales/de/parsers/DECasualDateParser.ts +13 -10
- package/src/locales/de/parsers/DECasualTimeParser.ts +3 -5
- package/src/locales/de/parsers/DETimeUnitRelativeFormatParser.ts +2 -2
- package/src/locales/de/parsers/DETimeUnitWithinFormatParser.ts +2 -2
- package/src/locales/en/constants.ts +12 -13
- package/src/locales/en/parsers/ENCasualDateParser.ts +6 -5
- package/src/locales/en/parsers/ENRelativeDateFormatParser.ts +14 -16
- package/src/locales/en/parsers/ENTimeUnitAgoFormatParser.ts +2 -2
- package/src/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.ts +2 -2
- package/src/locales/en/parsers/ENTimeUnitLaterFormatParser.ts +2 -2
- package/src/locales/en/parsers/ENTimeUnitWithinFormatParser.ts +2 -7
- package/src/locales/en/refiners/ENMergeRelativeAfterDateRefiner.ts +4 -4
- package/src/locales/en/refiners/ENMergeRelativeFollowByDateRefiner.ts +2 -2
- package/src/locales/es/constants.ts +7 -6
- package/src/locales/es/parsers/ESCasualTimeParser.ts +6 -4
- package/src/locales/es/parsers/ESTimeUnitWithinFormatParser.ts +2 -2
- package/src/locales/fr/constants.ts +7 -6
- package/src/locales/fr/parsers/FRCasualDateParser.ts +5 -5
- package/src/locales/fr/parsers/FRTimeUnitAgoFormatParser.ts +4 -4
- package/src/locales/fr/parsers/FRTimeUnitRelativeFormatParser.ts +2 -2
- package/src/locales/fr/parsers/FRTimeUnitWithinFormatParser.ts +2 -2
- package/src/locales/it/constants.ts +7 -7
- package/src/locales/it/parsers/ITCasualDateParser.ts +7 -6
- package/src/locales/it/parsers/ITCasualTimeParser.ts +7 -5
- package/src/locales/it/parsers/ITRelativeDateFormatParser.ts +14 -16
- package/src/locales/it/parsers/ITTimeUnitAgoFormatParser.ts +4 -4
- package/src/locales/it/parsers/ITTimeUnitCasualRelativeFormatParser.ts +4 -4
- package/src/locales/it/parsers/ITTimeUnitLaterFormatParser.ts +2 -2
- package/src/locales/it/parsers/ITTimeUnitWithinFormatParser.ts +2 -2
- package/src/locales/it/refiners/ITMergeRelativeDateRefiner.ts +4 -4
- package/src/locales/ja/parsers/JPCasualDateParser.ts +4 -5
- package/src/locales/ja/parsers/JPStandardParser.ts +1 -4
- package/src/locales/ja/parsers/JPTimeExpressionParser.ts +91 -190
- package/src/locales/nl/constants.ts +7 -7
- package/src/locales/nl/parsers/NLCasualDateTimeParser.ts +9 -5
- package/src/locales/nl/parsers/NLCasualTimeParser.ts +6 -4
- package/src/locales/nl/parsers/NLRelativeDateFormatParser.ts +14 -16
- package/src/locales/nl/parsers/NLTimeUnitAgoFormatParser.ts +4 -4
- package/src/locales/nl/parsers/NLTimeUnitCasualRelativeFormatParser.ts +4 -4
- package/src/locales/nl/parsers/NLTimeUnitLaterFormatParser.ts +2 -2
- package/src/locales/nl/parsers/NLTimeUnitWithinFormatParser.ts +2 -2
- package/src/locales/pt/parsers/PTCasualTimeParser.ts +6 -4
- package/src/locales/ru/constants.ts +10 -10
- package/src/locales/ru/parsers/RUCasualTimeParser.ts +6 -6
- package/src/locales/ru/parsers/RURelativeDateFormatParser.ts +15 -18
- package/src/locales/ru/parsers/RUTimeUnitAgoFormatParser.ts +4 -4
- package/src/locales/ru/parsers/RUTimeUnitCasualRelativeFormatParser.ts +4 -4
- package/src/locales/ru/parsers/RUTimeUnitWithinFormatParser.ts +2 -2
- package/src/locales/sv/constants.ts +31 -9
- package/src/locales/sv/index.ts +2 -0
- package/src/locales/sv/parsers/SVCasualDateParser.ts +14 -10
- package/src/locales/sv/parsers/SVTimeUnitCasualRelativeFormatParser.ts +42 -0
- package/src/locales/uk/constants.ts +11 -11
- package/src/locales/uk/parsers/UKCasualTimeParser.ts +6 -6
- package/src/locales/uk/parsers/UKRelativeDateFormatParser.ts +14 -16
- package/src/locales/uk/parsers/UKTimeUnitAgoFormatParser.ts +4 -4
- package/src/locales/uk/parsers/UKTimeUnitCasualRelativeFormatParser.ts +4 -4
- package/src/locales/uk/parsers/UKTimeUnitWithinFormatParser.ts +2 -2
- package/src/locales/zh/hans/parsers/ZHHansCasualDateParser.ts +23 -24
- package/src/locales/zh/hans/parsers/ZHHansDateParser.ts +2 -4
- package/src/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.ts +20 -18
- package/src/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.ts +18 -18
- package/src/locales/zh/hans/parsers/ZHHansTimeExpressionParser.ts +71 -73
- package/src/locales/zh/hans/parsers/ZHHansWeekdayParser.ts +16 -15
- package/src/locales/zh/hant/parsers/ZHHantCasualDateParser.ts +23 -24
- package/src/locales/zh/hant/parsers/ZHHantDateParser.ts +2 -4
- package/src/locales/zh/hant/parsers/ZHHantDeadlineFormatParser.ts +20 -18
- package/src/locales/zh/hant/parsers/ZHHantRelationWeekdayParser.ts +18 -18
- package/src/locales/zh/hant/parsers/ZHHantTimeExpressionParser.ts +73 -75
- package/src/locales/zh/hant/parsers/ZHHantWeekdayParser.ts +16 -15
- package/src/results.ts +82 -58
- package/src/timezone.ts +1 -5
- package/src/types.ts +1 -1
- package/test/calculation_weekdays.test.ts +17 -0
- package/test/en/en_time_exp.test.ts +2 -0
- package/test/it/it_casual.test.ts +44 -0
- package/test/it/it_month_name_little_endian.test.ts +28 -0
- package/test/it/it_weekday.test.ts +37 -0
- package/test/ja/ja_time_exp.test.ts +82 -21
- package/test/result.test.ts +74 -0
- package/test/sv/sv_casual.test.ts +42 -0
- package/test/sv/sv_month_name_little_endian.test.ts +48 -0
- package/test/sv/sv_time_units_casual_relative.test.ts +143 -0
- package/test/zh/hans/zh_hans_casual.test.ts +14 -0
- package/test/zh/hans/zh_hans_date.test.ts +14 -0
- package/test/zh/hans/zh_hans_deadline.test.ts +39 -0
- package/test/zh/hans/zh_hans_time_exp.test.ts +51 -0
- package/test/zh/hans/zh_hans_weekday.test.ts +87 -0
- package/test/zh/hant/zh_hant_casual.test.ts +14 -0
- package/test/zh/hant/zh_hant_date.test.ts +14 -0
- package/test/zh/hant/zh_hant_weekday.test.ts +43 -0
- package/dist/cjs/utils/dayjs.d.ts +0 -8
- package/dist/cjs/utils/dayjs.js +0 -48
- package/dist/cjs/utils/dayjs.js.map +0 -1
- package/dist/cjs/utils/timeunits.d.ts +0 -7
- package/dist/cjs/utils/timeunits.js +0 -30
- package/dist/cjs/utils/timeunits.js.map +0 -1
- package/dist/esm/utils/dayjs.d.ts +0 -8
- package/dist/esm/utils/dayjs.js +0 -40
- package/dist/esm/utils/dayjs.js.map +0 -1
- package/dist/esm/utils/timeunits.d.ts +0 -7
- package/dist/esm/utils/timeunits.js +0 -26
- package/dist/esm/utils/timeunits.js.map +0 -1
- package/src/utils/dayjs.ts +0 -52
- package/src/utils/timeunits.ts +0 -47
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import dayjs from "dayjs";
|
|
2
1
|
import { AbstractParserWithWordBoundaryChecking } from "../../../../common/parsers/AbstractParserWithWordBoundary.js";
|
|
3
2
|
import { WEEKDAY_OFFSET } from "../constants.js";
|
|
4
3
|
const PATTERN = new RegExp("(?<prefix>上|下|这)(?:个)?(?:星期|礼拜|周)(?<weekday>" + Object.keys(WEEKDAY_OFFSET).join("|") + ")");
|
|
@@ -23,41 +22,40 @@ export default class ZHHansRelationWeekdayParser extends AbstractParserWithWordB
|
|
|
23
22
|
else if (prefix == "这") {
|
|
24
23
|
modifier = "this";
|
|
25
24
|
}
|
|
26
|
-
|
|
25
|
+
const date = new Date(context.refDate.getTime());
|
|
27
26
|
let startMomentFixed = false;
|
|
28
|
-
const refOffset =
|
|
27
|
+
const refOffset = date.getDay();
|
|
29
28
|
if (modifier == "last" || modifier == "past") {
|
|
30
|
-
|
|
29
|
+
date.setDate(date.getDate() + (offset - 7 - refOffset));
|
|
31
30
|
startMomentFixed = true;
|
|
32
31
|
}
|
|
33
32
|
else if (modifier == "next") {
|
|
34
|
-
|
|
33
|
+
date.setDate(date.getDate() + (offset + 7 - refOffset));
|
|
35
34
|
startMomentFixed = true;
|
|
36
35
|
}
|
|
37
36
|
else if (modifier == "this") {
|
|
38
|
-
|
|
37
|
+
date.setDate(date.getDate() + (offset - refOffset));
|
|
39
38
|
}
|
|
40
39
|
else {
|
|
41
|
-
|
|
42
|
-
|
|
40
|
+
let diff = offset - refOffset;
|
|
41
|
+
if (Math.abs(diff - 7) < Math.abs(diff)) {
|
|
42
|
+
diff -= 7;
|
|
43
43
|
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
}
|
|
47
|
-
else {
|
|
48
|
-
startMoment = startMoment.day(offset);
|
|
44
|
+
if (Math.abs(diff + 7) < Math.abs(diff)) {
|
|
45
|
+
diff += 7;
|
|
49
46
|
}
|
|
47
|
+
date.setDate(date.getDate() + diff);
|
|
50
48
|
}
|
|
51
49
|
result.start.assign("weekday", offset);
|
|
52
50
|
if (startMomentFixed) {
|
|
53
|
-
result.start.assign("day",
|
|
54
|
-
result.start.assign("month",
|
|
55
|
-
result.start.assign("year",
|
|
51
|
+
result.start.assign("day", date.getDate());
|
|
52
|
+
result.start.assign("month", date.getMonth() + 1);
|
|
53
|
+
result.start.assign("year", date.getFullYear());
|
|
56
54
|
}
|
|
57
55
|
else {
|
|
58
|
-
result.start.imply("day",
|
|
59
|
-
result.start.imply("month",
|
|
60
|
-
result.start.imply("year",
|
|
56
|
+
result.start.imply("day", date.getDate());
|
|
57
|
+
result.start.imply("month", date.getMonth() + 1);
|
|
58
|
+
result.start.imply("year", date.getFullYear());
|
|
61
59
|
}
|
|
62
60
|
return result;
|
|
63
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ZHHansRelationWeekdayParser.js","sourceRoot":"","sources":["../../../../../../src/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ZHHansRelationWeekdayParser.js","sourceRoot":"","sources":["../../../../../../src/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import dayjs from "dayjs";
|
|
2
1
|
import { AbstractParserWithWordBoundaryChecking } from "../../../../common/parsers/AbstractParserWithWordBoundary.js";
|
|
3
2
|
import { NUMBER, zhStringToNumber } from "../constants.js";
|
|
4
3
|
const FIRST_REG_PATTERN = new RegExp("(?:从|自)?" +
|
|
@@ -60,63 +59,62 @@ export default class ZHHansTimeExpressionParser extends AbstractParserWithWordBo
|
|
|
60
59
|
if (match.index > 0 && context.text[match.index - 1].match(/\w/)) {
|
|
61
60
|
return null;
|
|
62
61
|
}
|
|
63
|
-
const refMoment = dayjs(context.refDate);
|
|
64
62
|
const result = context.createParsingResult(match.index, match[0]);
|
|
65
|
-
|
|
63
|
+
const startMoment = new Date(context.refDate.getTime());
|
|
66
64
|
if (match[DAY_GROUP_1]) {
|
|
67
65
|
const day1 = match[DAY_GROUP_1];
|
|
68
66
|
if (day1 == "明") {
|
|
69
|
-
if (
|
|
70
|
-
startMoment
|
|
67
|
+
if (context.refDate.getHours() > 1) {
|
|
68
|
+
startMoment.setDate(startMoment.getDate() + 1);
|
|
71
69
|
}
|
|
72
70
|
}
|
|
73
71
|
else if (day1 == "昨") {
|
|
74
|
-
startMoment
|
|
72
|
+
startMoment.setDate(startMoment.getDate() - 1);
|
|
75
73
|
}
|
|
76
74
|
else if (day1 == "前") {
|
|
77
|
-
startMoment
|
|
75
|
+
startMoment.setDate(startMoment.getDate() - 2);
|
|
78
76
|
}
|
|
79
77
|
else if (day1 == "大前") {
|
|
80
|
-
startMoment
|
|
78
|
+
startMoment.setDate(startMoment.getDate() - 3);
|
|
81
79
|
}
|
|
82
80
|
else if (day1 == "后") {
|
|
83
|
-
startMoment
|
|
81
|
+
startMoment.setDate(startMoment.getDate() + 2);
|
|
84
82
|
}
|
|
85
83
|
else if (day1 == "大后") {
|
|
86
|
-
startMoment
|
|
84
|
+
startMoment.setDate(startMoment.getDate() + 3);
|
|
87
85
|
}
|
|
88
|
-
result.start.assign("day", startMoment.
|
|
89
|
-
result.start.assign("month", startMoment.
|
|
90
|
-
result.start.assign("year", startMoment.
|
|
86
|
+
result.start.assign("day", startMoment.getDate());
|
|
87
|
+
result.start.assign("month", startMoment.getMonth() + 1);
|
|
88
|
+
result.start.assign("year", startMoment.getFullYear());
|
|
91
89
|
}
|
|
92
90
|
else if (match[DAY_GROUP_3]) {
|
|
93
91
|
const day3 = match[DAY_GROUP_3];
|
|
94
92
|
if (day3 == "明") {
|
|
95
|
-
startMoment
|
|
93
|
+
startMoment.setDate(startMoment.getDate() + 1);
|
|
96
94
|
}
|
|
97
95
|
else if (day3 == "昨") {
|
|
98
|
-
startMoment
|
|
96
|
+
startMoment.setDate(startMoment.getDate() - 1);
|
|
99
97
|
}
|
|
100
98
|
else if (day3 == "前") {
|
|
101
|
-
startMoment
|
|
99
|
+
startMoment.setDate(startMoment.getDate() - 2);
|
|
102
100
|
}
|
|
103
101
|
else if (day3 == "大前") {
|
|
104
|
-
startMoment
|
|
102
|
+
startMoment.setDate(startMoment.getDate() - 3);
|
|
105
103
|
}
|
|
106
104
|
else if (day3 == "后") {
|
|
107
|
-
startMoment
|
|
105
|
+
startMoment.setDate(startMoment.getDate() + 2);
|
|
108
106
|
}
|
|
109
107
|
else if (day3 == "大后") {
|
|
110
|
-
startMoment
|
|
108
|
+
startMoment.setDate(startMoment.getDate() + 3);
|
|
111
109
|
}
|
|
112
|
-
result.start.assign("day", startMoment.
|
|
113
|
-
result.start.assign("month", startMoment.
|
|
114
|
-
result.start.assign("year", startMoment.
|
|
110
|
+
result.start.assign("day", startMoment.getDate());
|
|
111
|
+
result.start.assign("month", startMoment.getMonth() + 1);
|
|
112
|
+
result.start.assign("year", startMoment.getFullYear());
|
|
115
113
|
}
|
|
116
114
|
else {
|
|
117
|
-
result.start.imply("day", startMoment.
|
|
118
|
-
result.start.imply("month", startMoment.
|
|
119
|
-
result.start.imply("year", startMoment.
|
|
115
|
+
result.start.imply("day", startMoment.getDate());
|
|
116
|
+
result.start.imply("month", startMoment.getMonth() + 1);
|
|
117
|
+
result.start.imply("year", startMoment.getFullYear());
|
|
120
118
|
}
|
|
121
119
|
let hour = 0;
|
|
122
120
|
let minute = 0;
|
|
@@ -231,97 +229,97 @@ export default class ZHHansTimeExpressionParser extends AbstractParserWithWordBo
|
|
|
231
229
|
result.start.imply("meridiem", 1);
|
|
232
230
|
}
|
|
233
231
|
}
|
|
234
|
-
|
|
235
|
-
if (!
|
|
232
|
+
const secondMatch = SECOND_REG_PATTERN.exec(context.text.substring(result.index + result.text.length));
|
|
233
|
+
if (!secondMatch) {
|
|
236
234
|
if (result.text.match(/^\d+$/)) {
|
|
237
235
|
return null;
|
|
238
236
|
}
|
|
239
237
|
return result;
|
|
240
238
|
}
|
|
241
|
-
|
|
239
|
+
const endMoment = new Date(startMoment.getTime());
|
|
242
240
|
result.end = context.createParsingComponents();
|
|
243
|
-
if (
|
|
244
|
-
const day1 =
|
|
241
|
+
if (secondMatch[DAY_GROUP_1]) {
|
|
242
|
+
const day1 = secondMatch[DAY_GROUP_1];
|
|
245
243
|
if (day1 == "明") {
|
|
246
|
-
if (
|
|
247
|
-
endMoment
|
|
244
|
+
if (context.refDate.getHours() > 1) {
|
|
245
|
+
endMoment.setDate(endMoment.getDate() + 1);
|
|
248
246
|
}
|
|
249
247
|
}
|
|
250
248
|
else if (day1 == "昨") {
|
|
251
|
-
endMoment
|
|
249
|
+
endMoment.setDate(endMoment.getDate() - 1);
|
|
252
250
|
}
|
|
253
251
|
else if (day1 == "前") {
|
|
254
|
-
endMoment
|
|
252
|
+
endMoment.setDate(endMoment.getDate() - 2);
|
|
255
253
|
}
|
|
256
254
|
else if (day1 == "大前") {
|
|
257
|
-
endMoment
|
|
255
|
+
endMoment.setDate(endMoment.getDate() - 3);
|
|
258
256
|
}
|
|
259
257
|
else if (day1 == "后") {
|
|
260
|
-
endMoment
|
|
258
|
+
endMoment.setDate(endMoment.getDate() + 2);
|
|
261
259
|
}
|
|
262
260
|
else if (day1 == "大后") {
|
|
263
|
-
endMoment
|
|
261
|
+
endMoment.setDate(endMoment.getDate() + 3);
|
|
264
262
|
}
|
|
265
|
-
result.end.assign("day", endMoment.
|
|
266
|
-
result.end.assign("month", endMoment.
|
|
267
|
-
result.end.assign("year", endMoment.
|
|
263
|
+
result.end.assign("day", endMoment.getDate());
|
|
264
|
+
result.end.assign("month", endMoment.getMonth() + 1);
|
|
265
|
+
result.end.assign("year", endMoment.getFullYear());
|
|
268
266
|
}
|
|
269
|
-
else if (
|
|
270
|
-
const day3 =
|
|
267
|
+
else if (secondMatch[DAY_GROUP_3]) {
|
|
268
|
+
const day3 = secondMatch[DAY_GROUP_3];
|
|
271
269
|
if (day3 == "明") {
|
|
272
|
-
endMoment
|
|
270
|
+
endMoment.setDate(endMoment.getDate() + 1);
|
|
273
271
|
}
|
|
274
272
|
else if (day3 == "昨") {
|
|
275
|
-
endMoment
|
|
273
|
+
endMoment.setDate(endMoment.getDate() - 1);
|
|
276
274
|
}
|
|
277
275
|
else if (day3 == "前") {
|
|
278
|
-
endMoment
|
|
276
|
+
endMoment.setDate(endMoment.getDate() - 2);
|
|
279
277
|
}
|
|
280
278
|
else if (day3 == "大前") {
|
|
281
|
-
endMoment
|
|
279
|
+
endMoment.setDate(endMoment.getDate() - 3);
|
|
282
280
|
}
|
|
283
281
|
else if (day3 == "后") {
|
|
284
|
-
endMoment
|
|
282
|
+
endMoment.setDate(endMoment.getDate() + 2);
|
|
285
283
|
}
|
|
286
284
|
else if (day3 == "大后") {
|
|
287
|
-
endMoment
|
|
285
|
+
endMoment.setDate(endMoment.getDate() + 3);
|
|
288
286
|
}
|
|
289
|
-
result.end.assign("day", endMoment.
|
|
290
|
-
result.end.assign("month", endMoment.
|
|
291
|
-
result.end.assign("year", endMoment.
|
|
287
|
+
result.end.assign("day", endMoment.getDate());
|
|
288
|
+
result.end.assign("month", endMoment.getMonth() + 1);
|
|
289
|
+
result.end.assign("year", endMoment.getFullYear());
|
|
292
290
|
}
|
|
293
291
|
else {
|
|
294
|
-
result.end.imply("day", endMoment.
|
|
295
|
-
result.end.imply("month", endMoment.
|
|
296
|
-
result.end.imply("year", endMoment.
|
|
292
|
+
result.end.imply("day", endMoment.getDate());
|
|
293
|
+
result.end.imply("month", endMoment.getMonth() + 1);
|
|
294
|
+
result.end.imply("year", endMoment.getFullYear());
|
|
297
295
|
}
|
|
298
296
|
hour = 0;
|
|
299
297
|
minute = 0;
|
|
300
298
|
meridiem = -1;
|
|
301
|
-
if (
|
|
302
|
-
let second = parseInt(
|
|
299
|
+
if (secondMatch[SECOND_GROUP]) {
|
|
300
|
+
let second = parseInt(secondMatch[SECOND_GROUP]);
|
|
303
301
|
if (isNaN(second)) {
|
|
304
|
-
second = zhStringToNumber(
|
|
302
|
+
second = zhStringToNumber(secondMatch[SECOND_GROUP]);
|
|
305
303
|
}
|
|
306
304
|
if (second >= 60)
|
|
307
305
|
return null;
|
|
308
306
|
result.end.assign("second", second);
|
|
309
307
|
}
|
|
310
|
-
hour = parseInt(
|
|
308
|
+
hour = parseInt(secondMatch[HOUR_GROUP]);
|
|
311
309
|
if (isNaN(hour)) {
|
|
312
|
-
hour = zhStringToNumber(
|
|
310
|
+
hour = zhStringToNumber(secondMatch[HOUR_GROUP]);
|
|
313
311
|
}
|
|
314
|
-
if (
|
|
315
|
-
if (
|
|
312
|
+
if (secondMatch[MINUTE_GROUP]) {
|
|
313
|
+
if (secondMatch[MINUTE_GROUP] == "半") {
|
|
316
314
|
minute = 30;
|
|
317
315
|
}
|
|
318
|
-
else if (
|
|
316
|
+
else if (secondMatch[MINUTE_GROUP] == "正" || secondMatch[MINUTE_GROUP] == "整") {
|
|
319
317
|
minute = 0;
|
|
320
318
|
}
|
|
321
319
|
else {
|
|
322
|
-
minute = parseInt(
|
|
320
|
+
minute = parseInt(secondMatch[MINUTE_GROUP]);
|
|
323
321
|
if (isNaN(minute)) {
|
|
324
|
-
minute = zhStringToNumber(
|
|
322
|
+
minute = zhStringToNumber(secondMatch[MINUTE_GROUP]);
|
|
325
323
|
}
|
|
326
324
|
}
|
|
327
325
|
}
|
|
@@ -338,10 +336,10 @@ export default class ZHHansTimeExpressionParser extends AbstractParserWithWordBo
|
|
|
338
336
|
if (hour >= 12) {
|
|
339
337
|
meridiem = 1;
|
|
340
338
|
}
|
|
341
|
-
if (
|
|
339
|
+
if (secondMatch[AM_PM_HOUR_GROUP]) {
|
|
342
340
|
if (hour > 12)
|
|
343
341
|
return null;
|
|
344
|
-
const ampm =
|
|
342
|
+
const ampm = secondMatch[AM_PM_HOUR_GROUP][0].toLowerCase();
|
|
345
343
|
if (ampm == "a") {
|
|
346
344
|
meridiem = 0;
|
|
347
345
|
if (hour == 12)
|
|
@@ -367,8 +365,8 @@ export default class ZHHansTimeExpressionParser extends AbstractParserWithWordBo
|
|
|
367
365
|
}
|
|
368
366
|
}
|
|
369
367
|
}
|
|
370
|
-
else if (
|
|
371
|
-
const zhAMPMString1 =
|
|
368
|
+
else if (secondMatch[ZH_AM_PM_HOUR_GROUP_1]) {
|
|
369
|
+
const zhAMPMString1 = secondMatch[ZH_AM_PM_HOUR_GROUP_1];
|
|
372
370
|
const zhAMPM1 = zhAMPMString1[0];
|
|
373
371
|
if (zhAMPM1 == "早") {
|
|
374
372
|
meridiem = 0;
|
|
@@ -381,8 +379,8 @@ export default class ZHHansTimeExpressionParser extends AbstractParserWithWordBo
|
|
|
381
379
|
hour += 12;
|
|
382
380
|
}
|
|
383
381
|
}
|
|
384
|
-
else if (
|
|
385
|
-
const zhAMPMString2 =
|
|
382
|
+
else if (secondMatch[ZH_AM_PM_HOUR_GROUP_2]) {
|
|
383
|
+
const zhAMPMString2 = secondMatch[ZH_AM_PM_HOUR_GROUP_2];
|
|
386
384
|
const zhAMPM2 = zhAMPMString2[0];
|
|
387
385
|
if (zhAMPM2 == "上" || zhAMPM2 == "早" || zhAMPM2 == "凌") {
|
|
388
386
|
meridiem = 0;
|
|
@@ -395,8 +393,8 @@ export default class ZHHansTimeExpressionParser extends AbstractParserWithWordBo
|
|
|
395
393
|
hour += 12;
|
|
396
394
|
}
|
|
397
395
|
}
|
|
398
|
-
else if (
|
|
399
|
-
const zhAMPMString3 =
|
|
396
|
+
else if (secondMatch[ZH_AM_PM_HOUR_GROUP_3]) {
|
|
397
|
+
const zhAMPMString3 = secondMatch[ZH_AM_PM_HOUR_GROUP_3];
|
|
400
398
|
const zhAMPM3 = zhAMPMString3[0];
|
|
401
399
|
if (zhAMPM3 == "上" || zhAMPM3 == "早" || zhAMPM3 == "凌") {
|
|
402
400
|
meridiem = 0;
|
|
@@ -409,7 +407,7 @@ export default class ZHHansTimeExpressionParser extends AbstractParserWithWordBo
|
|
|
409
407
|
hour += 12;
|
|
410
408
|
}
|
|
411
409
|
}
|
|
412
|
-
result.text = result.text +
|
|
410
|
+
result.text = result.text + secondMatch[0];
|
|
413
411
|
result.end.assign("hour", hour);
|
|
414
412
|
result.end.assign("minute", minute);
|
|
415
413
|
if (meridiem >= 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ZHHansTimeExpressionParser.js","sourceRoot":"","sources":["../../../../../../src/locales/zh/hans/parsers/ZHHansTimeExpressionParser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ZHHansTimeExpressionParser.js","sourceRoot":"","sources":["../../../../../../src/locales/zh/hans/parsers/ZHHansTimeExpressionParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import dayjs from "dayjs";
|
|
2
1
|
import { AbstractParserWithWordBoundaryChecking } from "../../../../common/parsers/AbstractParserWithWordBoundary.js";
|
|
3
2
|
import { WEEKDAY_OFFSET } from "../constants.js";
|
|
4
3
|
const PATTERN = new RegExp("(?:星期|礼拜|周)(?<weekday>" + Object.keys(WEEKDAY_OFFSET).join("|") + ")");
|
|
@@ -12,28 +11,27 @@ export default class ZHHansWeekdayParser extends AbstractParserWithWordBoundaryC
|
|
|
12
11
|
const offset = WEEKDAY_OFFSET[dayOfWeek];
|
|
13
12
|
if (offset === undefined)
|
|
14
13
|
return null;
|
|
15
|
-
|
|
14
|
+
const date = new Date(context.refDate.getTime());
|
|
16
15
|
const startMomentFixed = false;
|
|
17
|
-
const refOffset =
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
const refOffset = date.getDay();
|
|
17
|
+
let diff = offset - refOffset;
|
|
18
|
+
if (Math.abs(diff - 7) < Math.abs(diff)) {
|
|
19
|
+
diff -= 7;
|
|
20
20
|
}
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
}
|
|
24
|
-
else {
|
|
25
|
-
startMoment = startMoment.day(offset);
|
|
21
|
+
if (Math.abs(diff + 7) < Math.abs(diff)) {
|
|
22
|
+
diff += 7;
|
|
26
23
|
}
|
|
24
|
+
date.setDate(date.getDate() + diff);
|
|
27
25
|
result.start.assign("weekday", offset);
|
|
28
26
|
if (startMomentFixed) {
|
|
29
|
-
result.start.assign("day",
|
|
30
|
-
result.start.assign("month",
|
|
31
|
-
result.start.assign("year",
|
|
27
|
+
result.start.assign("day", date.getDate());
|
|
28
|
+
result.start.assign("month", date.getMonth() + 1);
|
|
29
|
+
result.start.assign("year", date.getFullYear());
|
|
32
30
|
}
|
|
33
31
|
else {
|
|
34
|
-
result.start.imply("day",
|
|
35
|
-
result.start.imply("month",
|
|
36
|
-
result.start.imply("year",
|
|
32
|
+
result.start.imply("day", date.getDate());
|
|
33
|
+
result.start.imply("month", date.getMonth() + 1);
|
|
34
|
+
result.start.imply("year", date.getFullYear());
|
|
37
35
|
}
|
|
38
36
|
return result;
|
|
39
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ZHHansWeekdayParser.js","sourceRoot":"","sources":["../../../../../../src/locales/zh/hans/parsers/ZHHansWeekdayParser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ZHHansWeekdayParser.js","sourceRoot":"","sources":["../../../../../../src/locales/zh/hans/parsers/ZHHansWeekdayParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sCAAsC,EAAE,MAAM,2DAA2D,CAAC;AAEnH,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,wBAAwB,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;AAEnG,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,sCAAsC;IACnF,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAElE,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;QACvC,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAEtC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QACjD,MAAM,gBAAgB,GAAG,KAAK,CAAC;QAC/B,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAEhC,IAAI,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;QAC9B,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACtC,IAAI,IAAI,CAAC,CAAC;QACd,CAAC;QACD,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACtC,IAAI,IAAI,CAAC,CAAC;QACd,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QAEpC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACvC,IAAI,gBAAgB,EAAE,CAAC;YACnB,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YAC3C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;YAClD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YAC1C,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;YACjD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import dayjs from "dayjs";
|
|
2
1
|
import { AbstractParserWithWordBoundaryChecking } from "../../../../common/parsers/AbstractParserWithWordBoundary.js";
|
|
3
2
|
const NOW_GROUP = 1;
|
|
4
3
|
const DAY_GROUP_1 = 2;
|
|
@@ -18,36 +17,36 @@ export default class ZHHantCasualDateParser extends AbstractParserWithWordBounda
|
|
|
18
17
|
innerExtract(context, match) {
|
|
19
18
|
const index = match.index;
|
|
20
19
|
const result = context.createParsingResult(index, match[0]);
|
|
21
|
-
const
|
|
22
|
-
let
|
|
20
|
+
const refDate = context.refDate;
|
|
21
|
+
let date = new Date(refDate.getTime());
|
|
23
22
|
if (match[NOW_GROUP]) {
|
|
24
|
-
result.start.imply("hour",
|
|
25
|
-
result.start.imply("minute",
|
|
26
|
-
result.start.imply("second",
|
|
27
|
-
result.start.imply("millisecond",
|
|
23
|
+
result.start.imply("hour", refDate.getHours());
|
|
24
|
+
result.start.imply("minute", refDate.getMinutes());
|
|
25
|
+
result.start.imply("second", refDate.getSeconds());
|
|
26
|
+
result.start.imply("millisecond", refDate.getMilliseconds());
|
|
28
27
|
}
|
|
29
28
|
else if (match[DAY_GROUP_1]) {
|
|
30
29
|
const day1 = match[DAY_GROUP_1];
|
|
31
30
|
const time1 = match[TIME_GROUP_1];
|
|
32
31
|
if (day1 == "明" || day1 == "聽") {
|
|
33
|
-
if (
|
|
34
|
-
|
|
32
|
+
if (refDate.getHours() > 1) {
|
|
33
|
+
date.setDate(date.getDate() + 1);
|
|
35
34
|
}
|
|
36
35
|
}
|
|
37
36
|
else if (day1 == "昨" || day1 == "尋" || day1 == "琴") {
|
|
38
|
-
|
|
37
|
+
date.setDate(date.getDate() - 1);
|
|
39
38
|
}
|
|
40
39
|
else if (day1 == "前") {
|
|
41
|
-
|
|
40
|
+
date.setDate(date.getDate() - 2);
|
|
42
41
|
}
|
|
43
42
|
else if (day1 == "大前") {
|
|
44
|
-
|
|
43
|
+
date.setDate(date.getDate() - 3);
|
|
45
44
|
}
|
|
46
45
|
else if (day1 == "後") {
|
|
47
|
-
|
|
46
|
+
date.setDate(date.getDate() + 2);
|
|
48
47
|
}
|
|
49
48
|
else if (day1 == "大後") {
|
|
50
|
-
|
|
49
|
+
date.setDate(date.getDate() + 3);
|
|
51
50
|
}
|
|
52
51
|
if (time1 == "早" || time1 == "朝") {
|
|
53
52
|
result.start.imply("hour", 6);
|
|
@@ -82,24 +81,24 @@ export default class ZHHantCasualDateParser extends AbstractParserWithWordBounda
|
|
|
82
81
|
else if (match[DAY_GROUP_3]) {
|
|
83
82
|
const day3 = match[DAY_GROUP_3];
|
|
84
83
|
if (day3 == "明" || day3 == "聽") {
|
|
85
|
-
if (
|
|
86
|
-
|
|
84
|
+
if (refDate.getHours() > 1) {
|
|
85
|
+
date.setDate(date.getDate() + 1);
|
|
87
86
|
}
|
|
88
87
|
}
|
|
89
88
|
else if (day3 == "昨" || day3 == "尋" || day3 == "琴") {
|
|
90
|
-
|
|
89
|
+
date.setDate(date.getDate() - 1);
|
|
91
90
|
}
|
|
92
91
|
else if (day3 == "前") {
|
|
93
|
-
|
|
92
|
+
date.setDate(date.getDate() - 2);
|
|
94
93
|
}
|
|
95
94
|
else if (day3 == "大前") {
|
|
96
|
-
|
|
95
|
+
date.setDate(date.getDate() - 3);
|
|
97
96
|
}
|
|
98
97
|
else if (day3 == "後") {
|
|
99
|
-
|
|
98
|
+
date.setDate(date.getDate() + 2);
|
|
100
99
|
}
|
|
101
100
|
else if (day3 == "大後") {
|
|
102
|
-
|
|
101
|
+
date.setDate(date.getDate() + 3);
|
|
103
102
|
}
|
|
104
103
|
const timeString3 = match[TIME_GROUP_3];
|
|
105
104
|
if (timeString3) {
|
|
@@ -124,9 +123,9 @@ export default class ZHHantCasualDateParser extends AbstractParserWithWordBounda
|
|
|
124
123
|
}
|
|
125
124
|
}
|
|
126
125
|
}
|
|
127
|
-
result.start.assign("day",
|
|
128
|
-
result.start.assign("month",
|
|
129
|
-
result.start.assign("year",
|
|
126
|
+
result.start.assign("day", date.getDate());
|
|
127
|
+
result.start.assign("month", date.getMonth() + 1);
|
|
128
|
+
result.start.assign("year", date.getFullYear());
|
|
130
129
|
return result;
|
|
131
130
|
}
|
|
132
131
|
}
|