Skip to content

Commit 02fe93d

Browse files
wanasitwanasit
authored
Merge pull request #613 from wanasit/remove-reverse-time-units
Refactor: Remove deprecated timeunits.reverseTimeUnits
2 parents 56aa016 + 091cffb commit 02fe93d

14 files changed

+26
-39
lines changed

‎src/locales/de/parsers/DETimeUnitRelativeFormatParser.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { ParsingContext } from "../../../chrono";
22
import { NUMBER_PATTERN, parseNumberPattern, TIME_UNIT_DICTIONARY } from "../constants";
33
import { ParsingComponents } from "../../../results";
44
import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
5-
import { reverseTimeUnits } from "../../../utils/timeunits";
65
import { matchAnyPattern } from "../../../utils/pattern";
6+
import { reverseDuration } from "../../../calculation/duration";
77

88
export default class DETimeUnitAgoFormatParser extends AbstractParserWithWordBoundaryChecking {
99
constructor() {
@@ -34,7 +34,7 @@ export default class DETimeUnitAgoFormatParser extends AbstractParserWithWordBou
3434
}
3535

3636
if (/vor/.test(modifier) || /letzte/.test(modifier) || /vergangen/.test(modifier)) {
37-
timeUnits = reverseTimeUnits(timeUnits);
37+
timeUnits = reverseDuration(timeUnits);
3838
}
3939

4040
return ParsingComponents.createRelativeFromReference(context.reference, timeUnits);

‎src/locales/en/refiners/ENMergeRelativeAfterDateRefiner.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { MergingRefiner } from "../../../common/abstractRefiners";
22
import { ParsingComponents, ParsingResult, ReferenceWithTimezone } from "../../../results";
33
import { parseTimeUnits } from "../constants";
4-
import { reverseTimeUnits } from "../../../utils/timeunits";
4+
import { reverseDuration } from "../../../calculation/duration";
55

66
function IsPositiveFollowingReference(result: ParsingResult): boolean {
77
return result.text.match(/^[+-]/i) != null;
@@ -28,7 +28,7 @@ export default class ENMergeRelativeAfterDateRefiner extends MergingRefiner {
2828
mergeResults(textBetween: string, currentResult: ParsingResult, nextResult: ParsingResult, context): ParsingResult {
2929
let timeUnits = parseTimeUnits(nextResult.text);
3030
if (IsNegativeFollowingReference(nextResult)) {
31-
timeUnits = reverseTimeUnits(timeUnits);
31+
timeUnits = reverseDuration(timeUnits);
3232
}
3333

3434
const components = ParsingComponents.createRelativeFromReference(

‎src/locales/fr/parsers/FRTimeUnitAgoFormatParser.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ParsingContext } from "../../../chrono";
22
import { parseTimeUnits, TIME_UNITS_PATTERN } from "../constants";
33
import { ParsingComponents } from "../../../results";
44
import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
5-
import { reverseTimeUnits } from "../../../utils/timeunits";
5+
import { reverseDuration } from "../../../calculation/duration";
66

77
export default class FRTimeUnitAgoFormatParser extends AbstractParserWithWordBoundaryChecking {
88
constructor() {
@@ -15,7 +15,7 @@ export default class FRTimeUnitAgoFormatParser extends AbstractParserWithWordBou
1515

1616
innerExtract(context: ParsingContext, match: RegExpMatchArray) {
1717
const timeUnits = parseTimeUnits(match[1]);
18-
const outputTimeUnits = reverseTimeUnits(timeUnits);
18+
const outputTimeUnits = reverseDuration(timeUnits);
1919

2020
return ParsingComponents.createRelativeFromReference(context.reference, outputTimeUnits);
2121
}

‎src/locales/fr/parsers/FRTimeUnitRelativeFormatParser.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { ParsingContext } from "../../../chrono";
22
import { NUMBER_PATTERN, parseNumberPattern, TIME_UNIT_DICTIONARY } from "../constants";
33
import { ParsingComponents } from "../../../results";
44
import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
5-
import { reverseTimeUnits } from "../../../utils/timeunits";
65
import { matchAnyPattern } from "../../../utils/pattern";
6+
import { reverseDuration } from "../../../calculation/duration";
77

88
export default class FRTimeUnitAgoFormatParser extends AbstractParserWithWordBoundaryChecking {
99
constructor() {
@@ -35,7 +35,7 @@ export default class FRTimeUnitAgoFormatParser extends AbstractParserWithWordBou
3535
}
3636

3737
if (/derni[eè]re?s?/.test(modifier) || /pass[ée]e?s?/.test(modifier) || /pr[ée]c[ée]dents?/.test(modifier)) {
38-
timeUnits = reverseTimeUnits(timeUnits);
38+
timeUnits = reverseDuration(timeUnits);
3939
}
4040

4141
return ParsingComponents.createRelativeFromReference(context.reference, timeUnits);

‎src/locales/it/parsers/ITTimeUnitAgoFormatParser.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ParsingContext } from "../../../chrono";
22
import { parseTimeUnits, TIME_UNITS_PATTERN } from "../constants";
33
import { ParsingComponents } from "../../../results";
44
import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
5-
import { reverseTimeUnits } from "../../../utils/timeunits";
5+
import { reverseDuration } from "../../../calculation/duration";
66

77
const PATTERN = new RegExp(`(${TIME_UNITS_PATTERN})\\s{0,5}(?:fa|prima|precedente)(?=(?:\\W|$))`, "i");
88
const STRICT_PATTERN = new RegExp(`(${TIME_UNITS_PATTERN})\\s{0,5}fa(?=(?:\\W|$))`, "i");
@@ -18,7 +18,7 @@ export default class ENTimeUnitAgoFormatParser extends AbstractParserWithWordBou
1818

1919
innerExtract(context: ParsingContext, match: RegExpMatchArray) {
2020
const timeUnits = parseTimeUnits(match[1]);
21-
const outputTimeUnits = reverseTimeUnits(timeUnits);
21+
const outputTimeUnits = reverseDuration(timeUnits);
2222

2323
return ParsingComponents.createRelativeFromReference(context.reference, outputTimeUnits);
2424
}

‎src/locales/it/parsers/ITTimeUnitCasualRelativeFormatParser.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { TIME_UNITS_PATTERN, parseTimeUnits } from "../constants";
22
import { ParsingContext } from "../../../chrono";
33
import { ParsingComponents } from "../../../results";
44
import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
5-
import { reverseTimeUnits } from "../../../utils/timeunits";
5+
import { reverseDuration } from "../../../calculation/duration";
66

77
const PATTERN = new RegExp(
88
`(questo|ultimo|passato|prossimo|dopo|questa|ultima|passata|prossima|\\+|-)\\s*(${TIME_UNITS_PATTERN})(?=\\W|$)`,
@@ -21,7 +21,7 @@ export default class ENTimeUnitCasualRelativeFormatParser extends AbstractParser
2121
case "last":
2222
case "past":
2323
case "-":
24-
timeUnits = reverseTimeUnits(timeUnits);
24+
timeUnits = reverseDuration(timeUnits);
2525
break;
2626
}
2727

‎src/locales/it/refiners/ITMergeRelativeDateRefiner.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { MergingRefiner } from "../../../common/abstractRefiners";
22
import { ParsingComponents, ParsingResult, ReferenceWithTimezone } from "../../../results";
33
import { parseTimeUnits } from "../constants";
4-
import { reverseTimeUnits } from "../../../utils/timeunits";
4+
import { reverseDuration } from "../../../calculation/duration";
55

66
function hasImpliedEarlierReferenceDate(result: ParsingResult): boolean {
77
return result.text.match(/\s+(prima|dal)$/i) != null;
@@ -40,7 +40,7 @@ export default class ENMergeRelativeDateRefiner extends MergingRefiner {
4040
mergeResults(textBetween: string, currentResult: ParsingResult, nextResult: ParsingResult): ParsingResult {
4141
let timeUnits = parseTimeUnits(currentResult.text);
4242
if (hasImpliedEarlierReferenceDate(currentResult)) {
43-
timeUnits = reverseTimeUnits(timeUnits);
43+
timeUnits = reverseDuration(timeUnits);
4444
}
4545

4646
const components = ParsingComponents.createRelativeFromReference(

‎src/locales/nl/parsers/NLTimeUnitAgoFormatParser.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ParsingContext } from "../../../chrono";
22
import { parseTimeUnits, TIME_UNITS_PATTERN } from "../constants";
33
import { ParsingComponents } from "../../../results";
44
import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
5-
import { reverseTimeUnits } from "../../../utils/timeunits";
5+
import { reverseDuration } from "../../../calculation/duration";
66

77
const PATTERN = new RegExp("" + "(" + TIME_UNITS_PATTERN + ")" + "(?:geleden|voor|eerder)(?=(?:\\W|$))", "i");
88

@@ -19,7 +19,7 @@ export default class NLTimeUnitAgoFormatParser extends AbstractParserWithWordBou
1919

2020
innerExtract(context: ParsingContext, match: RegExpMatchArray) {
2121
const timeUnits = parseTimeUnits(match[1]);
22-
const outputTimeUnits = reverseTimeUnits(timeUnits);
22+
const outputTimeUnits = reverseDuration(timeUnits);
2323

2424
return ParsingComponents.createRelativeFromReference(context.reference, outputTimeUnits);
2525
}

‎src/locales/nl/parsers/NLTimeUnitCasualRelativeFormatParser.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { TIME_UNITS_PATTERN, parseTimeUnits } from "../constants";
22
import { ParsingContext } from "../../../chrono";
33
import { ParsingComponents } from "../../../results";
44
import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
5-
import { reverseTimeUnits } from "../../../utils/timeunits";
5+
import { reverseDuration } from "../../../calculation/duration";
66

77
const PATTERN = new RegExp(
88
`(dit|deze|vorig|afgelopen|(?:aan)?komend|over|\\+|-)e?\\s*(${TIME_UNITS_PATTERN})(?=\\W|$)`,
@@ -24,7 +24,7 @@ export default class NLTimeUnitCasualRelativeFormatParser extends AbstractParser
2424
case "vorig":
2525
case "afgelopen":
2626
case "-":
27-
timeUnits = reverseTimeUnits(timeUnits);
27+
timeUnits = reverseDuration(timeUnits);
2828
break;
2929
}
3030

‎src/locales/ru/parsers/RUTimeUnitAgoFormatParser.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { ParsingContext } from "../../../chrono";
22
import { parseTimeUnits, TIME_UNITS_PATTERN } from "../constants";
33
import { ParsingComponents } from "../../../results";
4-
import { reverseTimeUnits } from "../../../utils/timeunits";
54
import { AbstractParserWithLeftBoundaryChecking } from "./AbstractParserWithWordBoundaryChecking";
5+
import { reverseDuration } from "../../../calculation/duration";
66

77
export default class RUTimeUnitAgoFormatParser extends AbstractParserWithLeftBoundaryChecking {
88
innerPatternString(context: ParsingContext): string {
@@ -11,7 +11,7 @@ export default class RUTimeUnitAgoFormatParser extends AbstractParserWithLeftBou
1111

1212
innerExtract(context: ParsingContext, match: RegExpMatchArray) {
1313
const timeUnits = parseTimeUnits(match[1]);
14-
const outputTimeUnits = reverseTimeUnits(timeUnits);
14+
const outputTimeUnits = reverseDuration(timeUnits);
1515

1616
return ParsingComponents.createRelativeFromReference(context.reference, outputTimeUnits);
1717
}

0 commit comments

Comments
 (0)