chrono-node 2.3.9 → 2.4.1
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/chrono.js.map +1 -1
- package/dist/common/calculation/weekdays.d.ts +7 -0
- package/dist/common/calculation/weekdays.js +68 -0
- package/dist/common/calculation/weekdays.js.map +1 -0
- package/dist/index.d.ts +9 -0
- package/dist/index.js +11 -1
- package/dist/index.js.map +1 -1
- package/dist/locales/de/parsers/DEWeekdayParser.js +2 -8
- package/dist/locales/de/parsers/DEWeekdayParser.js.map +1 -1
- package/dist/locales/en/constants.d.ts +2 -1
- package/dist/locales/en/constants.js.map +1 -1
- package/dist/locales/en/parsers/ENWeekdayParser.js +3 -9
- package/dist/locales/en/parsers/ENWeekdayParser.js.map +1 -1
- package/dist/locales/fr/parsers/FRWeekdayParser.js +4 -10
- package/dist/locales/fr/parsers/FRWeekdayParser.js.map +1 -1
- package/dist/locales/nl/parsers/NLWeekdayParser.js +3 -9
- package/dist/locales/nl/parsers/NLWeekdayParser.js.map +1 -1
- package/dist/locales/pt/parsers/PTWeekdayParser.js +4 -10
- package/dist/locales/pt/parsers/PTWeekdayParser.js.map +1 -1
- package/dist/locales/ru/constants.js +4 -5
- package/dist/locales/ru/constants.js.map +1 -1
- package/dist/locales/ru/parsers/RUWeekdayParser.js +3 -9
- package/dist/locales/ru/parsers/RUWeekdayParser.js.map +1 -1
- package/dist/locales/ru/refiners/RUMergeDateRangeRefiner.d.ts +1 -1
- package/dist/locales/ru/refiners/RUMergeDateRangeRefiner.js +2 -2
- package/dist/locales/ru/refiners/RUMergeDateRangeRefiner.js.map +1 -1
- package/dist/results.d.ts +2 -1
- package/dist/results.js +14 -10
- package/dist/results.js.map +1 -1
- package/package.json +1 -1
- package/src/chrono.ts +3 -1
- package/src/common/calculation/weekdays.ts +89 -0
- package/src/index.ts +10 -0
- package/src/locales/de/parsers/DEWeekdayParser.ts +2 -8
- package/src/locales/en/constants.ts +2 -1
- package/src/locales/en/parsers/ENWeekdayParser.ts +3 -9
- package/src/locales/fr/parsers/FRWeekdayParser.ts +4 -10
- package/src/locales/nl/parsers/NLWeekdayParser.ts +3 -9
- package/src/locales/pt/parsers/PTWeekdayParser.ts +4 -10
- package/src/locales/ru/constants.ts +4 -6
- package/src/locales/ru/parsers/RUWeekdayParser.ts +3 -9
- package/src/locales/ru/refiners/RUMergeDateRangeRefiner.ts +1 -1
- package/src/results.ts +27 -15
- package/test/calculation.test.ts +116 -0
- package/test/en/en.test.ts +10 -0
- package/test/en/en_weekday.test.ts +116 -1
- package/src/calculation/weeks.ts +0 -38
package/dist/chrono.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chrono.js","sourceRoot":"","sources":["../src/chrono.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"chrono.js","sourceRoot":"","sources":["../src/chrono.ts"],"names":[],"mappings":";;;AAAA,uCAAoF;AAGpF,qCAAyD;AA2CzD,MAAa,MAAM;IAIf,YAAY,aAA6B;QACrC,aAAa,GAAG,aAAa,IAAI,8BAAyB,EAAE,CAAC;QAC7D,IAAI,CAAC,OAAO,GAAG,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ,GAAG,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC;IAKD,KAAK;QACD,OAAO,IAAI,MAAM,CAAC;YACd,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;YAC1B,QAAQ,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;SAC/B,CAAC,CAAC;IACP,CAAC;IAMD,SAAS,CAAC,IAAY,EAAE,aAAuC,EAAE,MAAsB;QACnF,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QACxD,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,IAAY,EAAE,aAAuC,EAAE,MAAsB;QAC/E,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QAEhE,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC5B,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC5D,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAClB,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,OAAO;YACnC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACnB,CAAC;IAEO,MAAM,CAAC,aAAa,CAAC,OAAuB,EAAE,MAAc;QAChE,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAExC,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;QAClC,IAAI,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;QACjC,IAAI,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAExC,OAAO,KAAK,EAAE;YAEV,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,GAAG,YAAY,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC;YACvE,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;YAEpB,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC9C,IAAI,CAAC,MAAM,EAAE;gBAET,aAAa,GAAG,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;gBACxD,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBACpC,SAAS;aACZ;YAED,IAAI,YAAY,GAAkB,IAAI,CAAC;YACvC,IAAI,MAAM,YAAY,uBAAa,EAAE;gBACjC,YAAY,GAAG,MAAM,CAAC;aACzB;iBAAM,IAAI,MAAM,YAAY,2BAAiB,EAAE;gBAC5C,YAAY,GAAG,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBAClE,YAAY,CAAC,KAAK,GAAG,MAAM,CAAC;aAC/B;iBAAM;gBACH,YAAY,GAAG,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;aAC7E;YAED,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,qBAAqB,YAAY,EAAE,CAAC,CAAC,CAAC;YAEhG,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC3B,aAAa,GAAG,YAAY,CAAC,SAAS,CAAC,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SACvC;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;CACJ;AAzFD,wBAyFC;AAED,MAAa,cAAc;IAUvB,YAAY,IAAY,EAAE,OAAiC,EAAE,MAAsB;QAC/E,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,SAAS,GAAG,IAAI,+BAAqB,CAAC,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QAE3B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;IAC1C,CAAC;IAED,uBAAuB,CAAC,UAA8D;QAClF,IAAI,UAAU,YAAY,2BAAiB,EAAE;YACzC,OAAO,UAAU,CAAC;SACrB;QAED,OAAO,IAAI,2BAAiB,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC7D,CAAC;IAED,mBAAmB,CACf,KAAa,EACb,cAA+B,EAC/B,eAAmE,EACnE,aAAiE;QAEjE,MAAM,IAAI,GAAG,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAE9G,MAAM,KAAK,GAAG,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACrF,MAAM,GAAG,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAE/E,OAAO,IAAI,uBAAa,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,KAAsB;QACxB,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YACnB,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,YAAY,QAAQ,EAAE;gBACvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aAC5B;iBAAM;gBACH,MAAM,OAAO,GAA+B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;gBAC9D,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aACxB;SACJ;IACL,CAAC;CACJ;AAlDD,wCAkDC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { Weekday } from "../../index";
|
|
2
|
+
import { ParsingComponents, ReferenceWithTimezone } from "../../results";
|
|
3
|
+
export declare function createParsingComponentsAtWeekday(reference: ReferenceWithTimezone, weekday: Weekday, modifier?: "this" | "next" | "last"): ParsingComponents;
|
|
4
|
+
export declare function getDaysToWeekday(refDate: Date, weekday: Weekday, modifier?: "this" | "next" | "last"): number;
|
|
5
|
+
export declare function getDaysToWeekdayClosest(refDate: Date, weekday: Weekday): number;
|
|
6
|
+
export declare function getDaysForwardToWeekday(refDate: Date, weekday: Weekday): number;
|
|
7
|
+
export declare function getBackwardDaysToWeekday(refDate: Date, weekday: Weekday): number;
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getBackwardDaysToWeekday = exports.getDaysForwardToWeekday = exports.getDaysToWeekdayClosest = exports.getDaysToWeekday = exports.createParsingComponentsAtWeekday = void 0;
|
|
4
|
+
const index_1 = require("../../index");
|
|
5
|
+
const results_1 = require("../../results");
|
|
6
|
+
const timeunits_1 = require("../../utils/timeunits");
|
|
7
|
+
function createParsingComponentsAtWeekday(reference, weekday, modifier) {
|
|
8
|
+
const refDate = reference.getDateWithAdjustedTimezone();
|
|
9
|
+
const daysToWeekday = getDaysToWeekday(refDate, weekday, modifier);
|
|
10
|
+
let components = new results_1.ParsingComponents(reference);
|
|
11
|
+
components = timeunits_1.addImpliedTimeUnits(components, { "day": daysToWeekday });
|
|
12
|
+
components.assign("weekday", weekday);
|
|
13
|
+
return components;
|
|
14
|
+
}
|
|
15
|
+
exports.createParsingComponentsAtWeekday = createParsingComponentsAtWeekday;
|
|
16
|
+
function getDaysToWeekday(refDate, weekday, modifier) {
|
|
17
|
+
const refWeekday = refDate.getDay();
|
|
18
|
+
switch (modifier) {
|
|
19
|
+
case "this":
|
|
20
|
+
return getDaysForwardToWeekday(refDate, weekday);
|
|
21
|
+
case "last":
|
|
22
|
+
return getBackwardDaysToWeekday(refDate, weekday);
|
|
23
|
+
case "next":
|
|
24
|
+
if (refWeekday == index_1.Weekday.SUNDAY) {
|
|
25
|
+
return weekday == index_1.Weekday.SUNDAY ? 7 : weekday;
|
|
26
|
+
}
|
|
27
|
+
if (refWeekday == index_1.Weekday.SATURDAY) {
|
|
28
|
+
if (weekday == index_1.Weekday.SATURDAY)
|
|
29
|
+
return 7;
|
|
30
|
+
if (weekday == index_1.Weekday.SUNDAY)
|
|
31
|
+
return 8;
|
|
32
|
+
return 1 + weekday;
|
|
33
|
+
}
|
|
34
|
+
if (weekday < refWeekday && weekday != index_1.Weekday.SUNDAY) {
|
|
35
|
+
return getDaysForwardToWeekday(refDate, weekday);
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
return getDaysForwardToWeekday(refDate, weekday) + 7;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
return getDaysToWeekdayClosest(refDate, weekday);
|
|
42
|
+
}
|
|
43
|
+
exports.getDaysToWeekday = getDaysToWeekday;
|
|
44
|
+
function getDaysToWeekdayClosest(refDate, weekday) {
|
|
45
|
+
const backward = getBackwardDaysToWeekday(refDate, weekday);
|
|
46
|
+
const forward = getDaysForwardToWeekday(refDate, weekday);
|
|
47
|
+
return forward < -backward ? forward : backward;
|
|
48
|
+
}
|
|
49
|
+
exports.getDaysToWeekdayClosest = getDaysToWeekdayClosest;
|
|
50
|
+
function getDaysForwardToWeekday(refDate, weekday) {
|
|
51
|
+
const refWeekday = refDate.getDay();
|
|
52
|
+
let forwardCount = weekday - refWeekday;
|
|
53
|
+
if (forwardCount < 0) {
|
|
54
|
+
forwardCount += 7;
|
|
55
|
+
}
|
|
56
|
+
return forwardCount;
|
|
57
|
+
}
|
|
58
|
+
exports.getDaysForwardToWeekday = getDaysForwardToWeekday;
|
|
59
|
+
function getBackwardDaysToWeekday(refDate, weekday) {
|
|
60
|
+
const refWeekday = refDate.getDay();
|
|
61
|
+
let backwardCount = weekday - refWeekday;
|
|
62
|
+
if (backwardCount >= 0) {
|
|
63
|
+
backwardCount -= 7;
|
|
64
|
+
}
|
|
65
|
+
return backwardCount;
|
|
66
|
+
}
|
|
67
|
+
exports.getBackwardDaysToWeekday = getBackwardDaysToWeekday;
|
|
68
|
+
//# sourceMappingURL=weekdays.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"weekdays.js","sourceRoot":"","sources":["../../../src/common/calculation/weekdays.ts"],"names":[],"mappings":";;;AAAA,uCAAsC;AACtC,2CAAyE;AACzE,qDAA4D;AAS5D,SAAgB,gCAAgC,CAC5C,SAAgC,EAChC,OAAgB,EAChB,QAAmC;IAEnC,MAAM,OAAO,GAAG,SAAS,CAAC,2BAA2B,EAAE,CAAC;IACxD,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAEnE,IAAI,UAAU,GAAG,IAAI,2BAAiB,CAAC,SAAS,CAAC,CAAC;IAClD,UAAU,GAAG,+BAAmB,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC;IACvE,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAEtC,OAAO,UAAU,CAAC;AACtB,CAAC;AAbD,4EAaC;AAQD,SAAgB,gBAAgB,CAAC,OAAa,EAAE,OAAgB,EAAE,QAAmC;IACjG,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,EAAa,CAAC;IAC/C,QAAQ,QAAQ,EAAE;QACd,KAAK,MAAM;YACP,OAAO,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACrD,KAAK,MAAM;YACP,OAAO,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACtD,KAAK,MAAM;YAGP,IAAI,UAAU,IAAI,eAAO,CAAC,MAAM,EAAE;gBAC9B,OAAO,OAAO,IAAI,eAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;aAClD;YAID,IAAI,UAAU,IAAI,eAAO,CAAC,QAAQ,EAAE;gBAChC,IAAI,OAAO,IAAI,eAAO,CAAC,QAAQ;oBAAE,OAAO,CAAC,CAAC;gBAC1C,IAAI,OAAO,IAAI,eAAO,CAAC,MAAM;oBAAE,OAAO,CAAC,CAAC;gBACxC,OAAO,CAAC,GAAG,OAAO,CAAC;aACtB;YAID,IAAI,OAAO,GAAG,UAAU,IAAI,OAAO,IAAI,eAAO,CAAC,MAAM,EAAE;gBACnD,OAAO,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;aACpD;iBAAM;gBACH,OAAO,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;aACxD;KACR;IACD,OAAO,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACrD,CAAC;AA/BD,4CA+BC;AAED,SAAgB,uBAAuB,CAAC,OAAa,EAAE,OAAgB;IACnE,MAAM,QAAQ,GAAG,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5D,MAAM,OAAO,GAAG,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE1D,OAAO,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;AACpD,CAAC;AALD,0DAKC;AAED,SAAgB,uBAAuB,CAAC,OAAa,EAAE,OAAgB;IACnE,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IACpC,IAAI,YAAY,GAAG,OAAO,GAAG,UAAU,CAAC;IACxC,IAAI,YAAY,GAAG,CAAC,EAAE;QAClB,YAAY,IAAI,CAAC,CAAC;KACrB;IACD,OAAO,YAAY,CAAC;AACxB,CAAC;AAPD,0DAOC;AAED,SAAgB,wBAAwB,CAAC,OAAa,EAAE,OAAgB;IACpE,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IACpC,IAAI,aAAa,GAAG,OAAO,GAAG,UAAU,CAAC;IACzC,IAAI,aAAa,IAAI,CAAC,EAAE;QACpB,aAAa,IAAI,CAAC,CAAC;KACtB;IACD,OAAO,aAAa,CAAC;AACzB,CAAC;AAPD,4DAOC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -29,6 +29,15 @@ export declare enum Meridiem {
|
|
|
29
29
|
AM = 0,
|
|
30
30
|
PM = 1
|
|
31
31
|
}
|
|
32
|
+
export declare enum Weekday {
|
|
33
|
+
SUNDAY = 0,
|
|
34
|
+
MONDAY = 1,
|
|
35
|
+
TUESDAY = 2,
|
|
36
|
+
WEDNESDAY = 3,
|
|
37
|
+
THURSDAY = 4,
|
|
38
|
+
FRIDAY = 5,
|
|
39
|
+
SATURDAY = 6
|
|
40
|
+
}
|
|
32
41
|
import * as de from "./locales/de";
|
|
33
42
|
import * as fr from "./locales/fr";
|
|
34
43
|
import * as ja from "./locales/ja";
|
package/dist/index.js
CHANGED
|
@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
19
19
|
return result;
|
|
20
20
|
};
|
|
21
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
-
exports.parseDate = exports.parse = exports.casual = exports.strict = exports.ru = exports.zh = exports.nl = exports.pt = exports.ja = exports.fr = exports.de = exports.Meridiem = exports.Chrono = exports.en = void 0;
|
|
22
|
+
exports.parseDate = exports.parse = exports.casual = exports.strict = exports.ru = exports.zh = exports.nl = exports.pt = exports.ja = exports.fr = exports.de = exports.Weekday = exports.Meridiem = exports.Chrono = exports.en = void 0;
|
|
23
23
|
const en = __importStar(require("./locales/en"));
|
|
24
24
|
exports.en = en;
|
|
25
25
|
const chrono_1 = require("./chrono");
|
|
@@ -29,6 +29,16 @@ var Meridiem;
|
|
|
29
29
|
Meridiem[Meridiem["AM"] = 0] = "AM";
|
|
30
30
|
Meridiem[Meridiem["PM"] = 1] = "PM";
|
|
31
31
|
})(Meridiem = exports.Meridiem || (exports.Meridiem = {}));
|
|
32
|
+
var Weekday;
|
|
33
|
+
(function (Weekday) {
|
|
34
|
+
Weekday[Weekday["SUNDAY"] = 0] = "SUNDAY";
|
|
35
|
+
Weekday[Weekday["MONDAY"] = 1] = "MONDAY";
|
|
36
|
+
Weekday[Weekday["TUESDAY"] = 2] = "TUESDAY";
|
|
37
|
+
Weekday[Weekday["WEDNESDAY"] = 3] = "WEDNESDAY";
|
|
38
|
+
Weekday[Weekday["THURSDAY"] = 4] = "THURSDAY";
|
|
39
|
+
Weekday[Weekday["FRIDAY"] = 5] = "FRIDAY";
|
|
40
|
+
Weekday[Weekday["SATURDAY"] = 6] = "SATURDAY";
|
|
41
|
+
})(Weekday = exports.Weekday || (exports.Weekday = {}));
|
|
32
42
|
const de = __importStar(require("./locales/de"));
|
|
33
43
|
exports.de = de;
|
|
34
44
|
const fr = __importStar(require("./locales/fr"));
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AACA,iDAAmC;AAG1B,gBAAE;AAFX,qCAAmD;AAEtC,uFAFJ,eAAM,OAEI;AA4FnB,IAAY,QAGX;AAHD,WAAY,QAAQ;IAChB,mCAAM,CAAA;IACN,mCAAM,CAAA;AACV,CAAC,EAHW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAGnB;AAGD,iDAAmC;AAO1B,gBAAE;AANX,iDAAmC;AAMtB,gBAAE;AALf,iDAAmC;AAKlB,gBAAE;AAJnB,iDAAmC;AAId,gBAAE;AAHvB,iDAAmC;AAGV,gBAAE;AAF3B,iDAAmC;AAEN,gBAAE;AAD/B,iDAAmC;AACF,gBAAE;AAKtB,QAAA,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;AAKnB,QAAA,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;AAKhC,SAAgB,KAAK,CAAC,IAAY,EAAE,GAA6B,EAAE,MAAsB;IACrF,OAAO,cAAM,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC3C,CAAC;AAFD,sBAEC;AAKD,SAAgB,SAAS,CAAC,IAAY,EAAE,GAA6B,EAAE,MAAsB;IACzF,OAAO,cAAM,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC/C,CAAC;AAFD,8BAEC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AACA,iDAAmC;AAG1B,gBAAE;AAFX,qCAAmD;AAEtC,uFAFJ,eAAM,OAEI;AA4FnB,IAAY,QAGX;AAHD,WAAY,QAAQ;IAChB,mCAAM,CAAA;IACN,mCAAM,CAAA;AACV,CAAC,EAHW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAGnB;AAED,IAAY,OAQX;AARD,WAAY,OAAO;IACf,yCAAU,CAAA;IACV,yCAAU,CAAA;IACV,2CAAW,CAAA;IACX,+CAAa,CAAA;IACb,6CAAY,CAAA;IACZ,yCAAU,CAAA;IACV,6CAAY,CAAA;AAChB,CAAC,EARW,OAAO,GAAP,eAAO,KAAP,eAAO,QAQlB;AAGD,iDAAmC;AAO1B,gBAAE;AANX,iDAAmC;AAMtB,gBAAE;AALf,iDAAmC;AAKlB,gBAAE;AAJnB,iDAAmC;AAId,gBAAE;AAHvB,iDAAmC;AAGV,gBAAE;AAF3B,iDAAmC;AAEN,gBAAE;AAD/B,iDAAmC;AACF,gBAAE;AAKtB,QAAA,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;AAKnB,QAAA,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;AAKhC,SAAgB,KAAK,CAAC,IAAY,EAAE,GAA6B,EAAE,MAAsB;IACrF,OAAO,cAAM,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC3C,CAAC;AAFD,sBAEC;AAKD,SAAgB,SAAS,CAAC,IAAY,EAAE,GAA6B,EAAE,MAAsB;IACzF,OAAO,cAAM,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC/C,CAAC;AAFD,8BAEC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const constants_1 = require("../constants");
|
|
4
4
|
const pattern_1 = require("../../../utils/pattern");
|
|
5
5
|
const AbstractParserWithWordBoundary_1 = require("../../../common/parsers/AbstractParserWithWordBoundary");
|
|
6
|
-
const
|
|
6
|
+
const weekdays_1 = require("../../../common/calculation/weekdays");
|
|
7
7
|
const PATTERN = new RegExp("(?:(?:\\,|\\(|\\()\\s*)?" +
|
|
8
8
|
"(?:a[mn]\\s*?)?" +
|
|
9
9
|
"(?:(diese[mn]|letzte[mn]|n(?:ä|ae)chste[mn])\\s*)?" +
|
|
@@ -36,13 +36,7 @@ class DEWeekdayParser extends AbstractParserWithWordBoundary_1.AbstractParserWit
|
|
|
36
36
|
else if (modifierWord.match(/diese/)) {
|
|
37
37
|
modifier = "this";
|
|
38
38
|
}
|
|
39
|
-
|
|
40
|
-
return context
|
|
41
|
-
.createParsingComponents()
|
|
42
|
-
.assign("weekday", offset)
|
|
43
|
-
.imply("day", date.date())
|
|
44
|
-
.imply("month", date.month() + 1)
|
|
45
|
-
.imply("year", date.year());
|
|
39
|
+
return weekdays_1.createParsingComponentsAtWeekday(context.reference, offset, modifier);
|
|
46
40
|
}
|
|
47
41
|
}
|
|
48
42
|
exports.default = DEWeekdayParser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DEWeekdayParser.js","sourceRoot":"","sources":["../../../../src/locales/de/parsers/DEWeekdayParser.ts"],"names":[],"mappings":";;AAEA,4CAAkD;AAClD,oDAAyD;AACzD,2GAAgH;AAChH,
|
|
1
|
+
{"version":3,"file":"DEWeekdayParser.js","sourceRoot":"","sources":["../../../../src/locales/de/parsers/DEWeekdayParser.ts"],"names":[],"mappings":";;AAEA,4CAAkD;AAClD,oDAAyD;AACzD,2GAAgH;AAChH,mEAAwF;AAExF,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,0BAA0B;IACtB,iBAAiB;IACjB,oDAAoD;IACpD,IAAI,yBAAe,CAAC,8BAAkB,CAAC,GAAG;IAC1C,0BAA0B;IAC1B,iDAAiD;IACjD,WAAW,EACf,GAAG,CACN,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,aAAa,GAAG,CAAC,CAAC;AAExB,MAAqB,eAAgB,SAAQ,uEAAsC;IAC/E,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAC;QACrD,MAAM,MAAM,GAAG,8BAAkB,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;QAEpC,IAAI,YAAY,GAAG,MAAM,IAAI,OAAO,CAAC;QACrC,YAAY,GAAG,YAAY,IAAI,EAAE,CAAC;QAClC,YAAY,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;QAE1C,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,IAAI,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YAC9B,QAAQ,GAAG,MAAM,CAAC;SACrB;aAAM,IAAI,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;YACpC,QAAQ,GAAG,MAAM,CAAC;SACrB;aAAM,IAAI,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;YACpC,QAAQ,GAAG,MAAM,CAAC;SACrB;QAED,OAAO,2CAAgC,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACjF,CAAC;CACJ;AA1BD,kCA0BC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { OpUnitType, QUnitType } from "dayjs";
|
|
2
2
|
import { TimeUnits } from "../../utils/timeunits";
|
|
3
|
+
import { Weekday } from "../../index";
|
|
3
4
|
export declare const WEEKDAY_DICTIONARY: {
|
|
4
|
-
[word: string]:
|
|
5
|
+
[word: string]: Weekday;
|
|
5
6
|
};
|
|
6
7
|
export declare const FULL_MONTH_NAME_DICTIONARY: {
|
|
7
8
|
[word: string]: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/locales/en/constants.ts"],"names":[],"mappings":";;;AACA,iDAA+E;AAC/E,mDAA+D;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/locales/en/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const constants_1 = require("../constants");
|
|
4
4
|
const pattern_1 = require("../../../utils/pattern");
|
|
5
5
|
const AbstractParserWithWordBoundary_1 = require("../../../common/parsers/AbstractParserWithWordBoundary");
|
|
6
|
-
const
|
|
6
|
+
const weekdays_1 = require("../../../common/calculation/weekdays");
|
|
7
7
|
const PATTERN = new RegExp("(?:(?:\\,|\\(|\\()\\s*)?" +
|
|
8
8
|
"(?:on\\s*?)?" +
|
|
9
9
|
"(?:(this|last|past|next)\\s*)?" +
|
|
@@ -20,7 +20,7 @@ class ENWeekdayParser extends AbstractParserWithWordBoundary_1.AbstractParserWit
|
|
|
20
20
|
}
|
|
21
21
|
innerExtract(context, match) {
|
|
22
22
|
const dayOfWeek = match[WEEKDAY_GROUP].toLowerCase();
|
|
23
|
-
const
|
|
23
|
+
const weekday = constants_1.WEEKDAY_DICTIONARY[dayOfWeek];
|
|
24
24
|
const prefix = match[PREFIX_GROUP];
|
|
25
25
|
const postfix = match[POSTFIX_GROUP];
|
|
26
26
|
let modifierWord = prefix || postfix;
|
|
@@ -36,13 +36,7 @@ class ENWeekdayParser extends AbstractParserWithWordBoundary_1.AbstractParserWit
|
|
|
36
36
|
else if (modifierWord == "this") {
|
|
37
37
|
modifier = "this";
|
|
38
38
|
}
|
|
39
|
-
|
|
40
|
-
return context
|
|
41
|
-
.createParsingComponents()
|
|
42
|
-
.assign("weekday", offset)
|
|
43
|
-
.imply("day", date.date())
|
|
44
|
-
.imply("month", date.month() + 1)
|
|
45
|
-
.imply("year", date.year());
|
|
39
|
+
return weekdays_1.createParsingComponentsAtWeekday(context.reference, weekday, modifier);
|
|
46
40
|
}
|
|
47
41
|
}
|
|
48
42
|
exports.default = ENWeekdayParser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ENWeekdayParser.js","sourceRoot":"","sources":["../../../../src/locales/en/parsers/ENWeekdayParser.ts"],"names":[],"mappings":";;AAEA,4CAAkD;AAClD,oDAAyD;AACzD,2GAAgH;AAChH,
|
|
1
|
+
{"version":3,"file":"ENWeekdayParser.js","sourceRoot":"","sources":["../../../../src/locales/en/parsers/ENWeekdayParser.ts"],"names":[],"mappings":";;AAEA,4CAAkD;AAClD,oDAAyD;AACzD,2GAAgH;AAChH,mEAAwF;AAExF,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,0BAA0B;IACtB,cAAc;IACd,gCAAgC;IAChC,IAAI,yBAAe,CAAC,8BAAkB,CAAC,GAAG;IAC1C,0BAA0B;IAC1B,wCAAwC;IACxC,WAAW,EACf,GAAG,CACN,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,aAAa,GAAG,CAAC,CAAC;AACxB,MAAM,aAAa,GAAG,CAAC,CAAC;AAExB,MAAqB,eAAgB,SAAQ,uEAAsC;IAC/E,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAC;QACrD,MAAM,OAAO,GAAG,8BAAkB,CAAC,SAAS,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC;QACrC,IAAI,YAAY,GAAG,MAAM,IAAI,OAAO,CAAC;QACrC,YAAY,GAAG,YAAY,IAAI,EAAE,CAAC;QAClC,YAAY,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;QAE1C,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,IAAI,YAAY,IAAI,MAAM,IAAI,YAAY,IAAI,MAAM,EAAE;YAClD,QAAQ,GAAG,MAAM,CAAC;SACrB;aAAM,IAAI,YAAY,IAAI,MAAM,EAAE;YAC/B,QAAQ,GAAG,MAAM,CAAC;SACrB;aAAM,IAAI,YAAY,IAAI,MAAM,EAAE;YAC/B,QAAQ,GAAG,MAAM,CAAC;SACrB;QAED,OAAO,2CAAgC,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAClF,CAAC;CACJ;AAzBD,kCAyBC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const constants_1 = require("../constants");
|
|
4
4
|
const pattern_1 = require("../../../utils/pattern");
|
|
5
5
|
const AbstractParserWithWordBoundary_1 = require("../../../common/parsers/AbstractParserWithWordBoundary");
|
|
6
|
-
const
|
|
6
|
+
const weekdays_1 = require("../../../common/calculation/weekdays");
|
|
7
7
|
const PATTERN = new RegExp("(?:(?:\\,|\\(|\\()\\s*)?" +
|
|
8
8
|
"(?:(?:ce)\\s*)?" +
|
|
9
9
|
`(${pattern_1.matchAnyPattern(constants_1.WEEKDAY_DICTIONARY)})` +
|
|
@@ -18,8 +18,8 @@ class FRWeekdayParser extends AbstractParserWithWordBoundary_1.AbstractParserWit
|
|
|
18
18
|
}
|
|
19
19
|
innerExtract(context, match) {
|
|
20
20
|
const dayOfWeek = match[WEEKDAY_GROUP].toLowerCase();
|
|
21
|
-
const
|
|
22
|
-
if (
|
|
21
|
+
const weekday = constants_1.WEEKDAY_DICTIONARY[dayOfWeek];
|
|
22
|
+
if (weekday === undefined) {
|
|
23
23
|
return null;
|
|
24
24
|
}
|
|
25
25
|
let suffix = match[POSTFIX_GROUP];
|
|
@@ -32,13 +32,7 @@ class FRWeekdayParser extends AbstractParserWithWordBoundary_1.AbstractParserWit
|
|
|
32
32
|
else if (suffix == "prochain") {
|
|
33
33
|
modifier = "next";
|
|
34
34
|
}
|
|
35
|
-
|
|
36
|
-
return context
|
|
37
|
-
.createParsingComponents()
|
|
38
|
-
.assign("weekday", offset)
|
|
39
|
-
.imply("day", date.date())
|
|
40
|
-
.imply("month", date.month() + 1)
|
|
41
|
-
.imply("year", date.year());
|
|
35
|
+
return weekdays_1.createParsingComponentsAtWeekday(context.reference, weekday, modifier);
|
|
42
36
|
}
|
|
43
37
|
}
|
|
44
38
|
exports.default = FRWeekdayParser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FRWeekdayParser.js","sourceRoot":"","sources":["../../../../src/locales/fr/parsers/FRWeekdayParser.ts"],"names":[],"mappings":";;AAEA,4CAAkD;AAClD,oDAAyD;AACzD,2GAAgH;AAChH,
|
|
1
|
+
{"version":3,"file":"FRWeekdayParser.js","sourceRoot":"","sources":["../../../../src/locales/fr/parsers/FRWeekdayParser.ts"],"names":[],"mappings":";;AAEA,4CAAkD;AAClD,oDAAyD;AACzD,2GAAgH;AAChH,mEAAwF;AAExF,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,0BAA0B;IACtB,iBAAiB;IACjB,IAAI,yBAAe,CAAC,8BAAkB,CAAC,GAAG;IAC1C,0BAA0B;IAC1B,iCAAiC;IACjC,eAAe,EACnB,GAAG,CACN,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,CAAC;AACxB,MAAM,aAAa,GAAG,CAAC,CAAC;AAExB,MAAqB,eAAgB,SAAQ,uEAAsC;IAC/E,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAC;QACrD,MAAM,OAAO,GAAG,8BAAkB,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,OAAO,KAAK,SAAS,EAAE;YACvB,OAAO,IAAI,CAAC;SACf;QAED,IAAI,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC;QAClC,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QACtB,MAAM,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;QAE9B,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,IAAI,MAAM,IAAI,SAAS,EAAE;YACrB,QAAQ,GAAG,MAAM,CAAC;SACrB;aAAM,IAAI,MAAM,IAAI,UAAU,EAAE;YAC7B,QAAQ,GAAG,MAAM,CAAC;SACrB;QAED,OAAO,2CAAgC,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAClF,CAAC;CACJ;AAzBD,kCAyBC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const constants_1 = require("../../nl/constants");
|
|
4
4
|
const pattern_1 = require("../../../utils/pattern");
|
|
5
5
|
const AbstractParserWithWordBoundary_1 = require("../../../common/parsers/AbstractParserWithWordBoundary");
|
|
6
|
-
const
|
|
6
|
+
const weekdays_1 = require("../../../common/calculation/weekdays");
|
|
7
7
|
const PATTERN = new RegExp("(?:(?:\\,|\\(|\\()\\s*)?" +
|
|
8
8
|
"(?:op\\s*?)?" +
|
|
9
9
|
"(?:(deze|vorige|volgende)\\s*(?:week\\s*)?)?" +
|
|
@@ -18,7 +18,7 @@ class NLWeekdayParser extends AbstractParserWithWordBoundary_1.AbstractParserWit
|
|
|
18
18
|
}
|
|
19
19
|
innerExtract(context, match) {
|
|
20
20
|
const dayOfWeek = match[WEEKDAY_GROUP].toLowerCase();
|
|
21
|
-
const
|
|
21
|
+
const weekday = constants_1.WEEKDAY_DICTIONARY[dayOfWeek];
|
|
22
22
|
const prefix = match[PREFIX_GROUP];
|
|
23
23
|
const postfix = match[POSTFIX_GROUP];
|
|
24
24
|
let modifierWord = prefix || postfix;
|
|
@@ -34,13 +34,7 @@ class NLWeekdayParser extends AbstractParserWithWordBoundary_1.AbstractParserWit
|
|
|
34
34
|
else if (modifierWord == "deze") {
|
|
35
35
|
modifier = "this";
|
|
36
36
|
}
|
|
37
|
-
|
|
38
|
-
return context
|
|
39
|
-
.createParsingComponents()
|
|
40
|
-
.assign("weekday", offset)
|
|
41
|
-
.imply("day", date.date())
|
|
42
|
-
.imply("month", date.month() + 1)
|
|
43
|
-
.imply("year", date.year());
|
|
37
|
+
return weekdays_1.createParsingComponentsAtWeekday(context.reference, weekday, modifier);
|
|
44
38
|
}
|
|
45
39
|
}
|
|
46
40
|
exports.default = NLWeekdayParser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NLWeekdayParser.js","sourceRoot":"","sources":["../../../../src/locales/nl/parsers/NLWeekdayParser.ts"],"names":[],"mappings":";;AAEA,kDAAwD;AACxD,oDAAyD;AACzD,2GAAgH;AAChH,
|
|
1
|
+
{"version":3,"file":"NLWeekdayParser.js","sourceRoot":"","sources":["../../../../src/locales/nl/parsers/NLWeekdayParser.ts"],"names":[],"mappings":";;AAEA,kDAAwD;AACxD,oDAAyD;AACzD,2GAAgH;AAChH,mEAAwF;AAExF,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,0BAA0B;IACtB,cAAc;IACd,8CAA8C;IAC9C,IAAI,yBAAe,CAAC,8BAAkB,CAAC,GAAG;IAC1C,WAAW,EACf,GAAG,CACN,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,aAAa,GAAG,CAAC,CAAC;AACxB,MAAM,aAAa,GAAG,CAAC,CAAC;AAExB,MAAqB,eAAgB,SAAQ,uEAAsC;IAC/E,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAC;QACrD,MAAM,OAAO,GAAG,8BAAkB,CAAC,SAAS,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC;QACrC,IAAI,YAAY,GAAG,MAAM,IAAI,OAAO,CAAC;QACrC,YAAY,GAAG,YAAY,IAAI,EAAE,CAAC;QAClC,YAAY,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;QAE1C,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,IAAI,YAAY,IAAI,QAAQ,EAAE;YAC1B,QAAQ,GAAG,MAAM,CAAC;SACrB;aAAM,IAAI,YAAY,IAAI,UAAU,EAAE;YACnC,QAAQ,GAAG,MAAM,CAAC;SACrB;aAAM,IAAI,YAAY,IAAI,MAAM,EAAE;YAC/B,QAAQ,GAAG,MAAM,CAAC;SACrB;QAED,OAAO,2CAAgC,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAClF,CAAC;CACJ;AAzBD,kCAyBC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const constants_1 = require("../constants");
|
|
4
4
|
const pattern_1 = require("../../../utils/pattern");
|
|
5
5
|
const AbstractParserWithWordBoundary_1 = require("../../../common/parsers/AbstractParserWithWordBoundary");
|
|
6
|
-
const
|
|
6
|
+
const weekdays_1 = require("../../../common/calculation/weekdays");
|
|
7
7
|
const PATTERN = new RegExp("(?:(?:\\,|\\(|\\()\\s*)?" +
|
|
8
8
|
"(?:(este|esta|passado|pr[oó]ximo)\\s*)?" +
|
|
9
9
|
`(${pattern_1.matchAnyPattern(constants_1.WEEKDAY_DICTIONARY)})` +
|
|
@@ -19,8 +19,8 @@ class PTWeekdayParser extends AbstractParserWithWordBoundary_1.AbstractParserWit
|
|
|
19
19
|
}
|
|
20
20
|
innerExtract(context, match) {
|
|
21
21
|
const dayOfWeek = match[WEEKDAY_GROUP].toLowerCase();
|
|
22
|
-
const
|
|
23
|
-
if (
|
|
22
|
+
const weekday = constants_1.WEEKDAY_DICTIONARY[dayOfWeek];
|
|
23
|
+
if (weekday === undefined) {
|
|
24
24
|
return null;
|
|
25
25
|
}
|
|
26
26
|
const prefix = match[PREFIX_GROUP];
|
|
@@ -37,13 +37,7 @@ class PTWeekdayParser extends AbstractParserWithWordBoundary_1.AbstractParserWit
|
|
|
37
37
|
else if (norm == "este") {
|
|
38
38
|
modifier = "this";
|
|
39
39
|
}
|
|
40
|
-
|
|
41
|
-
return context
|
|
42
|
-
.createParsingComponents()
|
|
43
|
-
.assign("weekday", offset)
|
|
44
|
-
.imply("day", date.date())
|
|
45
|
-
.imply("month", date.month() + 1)
|
|
46
|
-
.imply("year", date.year());
|
|
40
|
+
return weekdays_1.createParsingComponentsAtWeekday(context.reference, weekday, modifier);
|
|
47
41
|
}
|
|
48
42
|
}
|
|
49
43
|
exports.default = PTWeekdayParser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PTWeekdayParser.js","sourceRoot":"","sources":["../../../../src/locales/pt/parsers/PTWeekdayParser.ts"],"names":[],"mappings":";;AAEA,4CAAkD;AAClD,oDAAyD;AACzD,2GAAgH;AAChH,
|
|
1
|
+
{"version":3,"file":"PTWeekdayParser.js","sourceRoot":"","sources":["../../../../src/locales/pt/parsers/PTWeekdayParser.ts"],"names":[],"mappings":";;AAEA,4CAAkD;AAClD,oDAAyD;AACzD,2GAAgH;AAChH,mEAAwF;AAExF,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,0BAA0B;IACtB,yCAAyC;IACzC,IAAI,yBAAe,CAAC,8BAAkB,CAAC,GAAG;IAC1C,0BAA0B;IAC1B,mDAAmD;IACnD,eAAe,EACnB,GAAG,CACN,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,aAAa,GAAG,CAAC,CAAC;AACxB,MAAM,aAAa,GAAG,CAAC,CAAC;AAExB,MAAqB,eAAgB,SAAQ,uEAAsC;IAC/E,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAC;QACrD,MAAM,OAAO,GAAG,8BAAkB,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,OAAO,KAAK,SAAS,EAAE;YACvB,OAAO,IAAI,CAAC;SACf;QAED,MAAM,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC;QACrC,IAAI,IAAI,GAAG,MAAM,IAAI,OAAO,IAAI,EAAE,CAAC;QACnC,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAE1B,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,IAAI,IAAI,IAAI,SAAS,EAAE;YACnB,QAAQ,GAAG,MAAM,CAAC;SACrB;aAAM,IAAI,IAAI,IAAI,SAAS,IAAI,IAAI,IAAI,SAAS,EAAE;YAC/C,QAAQ,GAAG,MAAM,CAAC;SACrB;aAAM,IAAI,IAAI,IAAI,MAAM,EAAE;YACvB,QAAQ,GAAG,MAAM,CAAC;SACrB;QAED,OAAO,2CAAgC,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAClF,CAAC;CACJ;AA5BD,kCA4BC"}
|
|
@@ -45,9 +45,9 @@ exports.FULL_MONTH_NAME_DICTIONARY = {
|
|
|
45
45
|
январь: 1,
|
|
46
46
|
января: 1,
|
|
47
47
|
январе: 1,
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
48
|
+
февраль: 2,
|
|
49
|
+
февраля: 2,
|
|
50
|
+
феврале: 2,
|
|
51
51
|
март: 3,
|
|
52
52
|
марта: 3,
|
|
53
53
|
марте: 3,
|
|
@@ -101,7 +101,7 @@ exports.INTEGER_WORD_DICTIONARY = {
|
|
|
101
101
|
семь: 7,
|
|
102
102
|
семи: 7,
|
|
103
103
|
восемь: 8,
|
|
104
|
-
|
|
104
|
+
восьми: 8,
|
|
105
105
|
девять: 9,
|
|
106
106
|
девяти: 9,
|
|
107
107
|
десять: 10,
|
|
@@ -257,7 +257,6 @@ function parseOrdinalNumberPattern(match) {
|
|
|
257
257
|
if (exports.ORDINAL_WORD_DICTIONARY[num] !== undefined) {
|
|
258
258
|
return exports.ORDINAL_WORD_DICTIONARY[num];
|
|
259
259
|
}
|
|
260
|
-
num = num.replace(/(?:st|nd|rd|th)$/i, "");
|
|
261
260
|
return parseInt(num);
|
|
262
261
|
}
|
|
263
262
|
exports.parseOrdinalNumberPattern = parseOrdinalNumberPattern;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/locales/ru/constants.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/locales/ru/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const constants_1 = require("../constants");
|
|
4
4
|
const pattern_1 = require("../../../utils/pattern");
|
|
5
5
|
const AbstractParserWithWordBoundary_1 = require("../../../common/parsers/AbstractParserWithWordBoundary");
|
|
6
|
-
const
|
|
6
|
+
const weekdays_1 = require("../../../common/calculation/weekdays");
|
|
7
7
|
const PATTERN = new RegExp(`(?:(?:,|\\(|()\\s*)?` +
|
|
8
8
|
`(?:в\\s*?)?` +
|
|
9
9
|
`(?:(эту|этот|прошлый|прошлую|следующий|следующую|следующего)\\s*)?` +
|
|
@@ -23,7 +23,7 @@ class RUWeekdayParser extends AbstractParserWithWordBoundary_1.AbstractParserWit
|
|
|
23
23
|
}
|
|
24
24
|
innerExtract(context, match) {
|
|
25
25
|
const dayOfWeek = match[WEEKDAY_GROUP].toLowerCase();
|
|
26
|
-
const
|
|
26
|
+
const weekday = constants_1.WEEKDAY_DICTIONARY[dayOfWeek];
|
|
27
27
|
const prefix = match[PREFIX_GROUP];
|
|
28
28
|
const postfix = match[POSTFIX_GROUP];
|
|
29
29
|
let modifierWord = prefix || postfix;
|
|
@@ -42,13 +42,7 @@ class RUWeekdayParser extends AbstractParserWithWordBoundary_1.AbstractParserWit
|
|
|
42
42
|
else if (modifierWord == "этот" || modifierWord == "эту" || modifierWord == "этой") {
|
|
43
43
|
modifier = "this";
|
|
44
44
|
}
|
|
45
|
-
|
|
46
|
-
return context
|
|
47
|
-
.createParsingComponents()
|
|
48
|
-
.assign("weekday", offset)
|
|
49
|
-
.imply("day", date.date())
|
|
50
|
-
.imply("month", date.month() + 1)
|
|
51
|
-
.imply("year", date.year());
|
|
45
|
+
return weekdays_1.createParsingComponentsAtWeekday(context.reference, weekday, modifier);
|
|
52
46
|
}
|
|
53
47
|
}
|
|
54
48
|
exports.default = RUWeekdayParser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RUWeekdayParser.js","sourceRoot":"","sources":["../../../../src/locales/ru/parsers/RUWeekdayParser.ts"],"names":[],"mappings":";;AAEA,4CAA+D;AAC/D,oDAAyD;AACzD,2GAAgH;AAChH,
|
|
1
|
+
{"version":3,"file":"RUWeekdayParser.js","sourceRoot":"","sources":["../../../../src/locales/ru/parsers/RUWeekdayParser.ts"],"names":[],"mappings":";;AAEA,4CAA+D;AAC/D,oDAAyD;AACzD,2GAAgH;AAChH,mEAAwF;AAExF,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,sBAAsB;IAClB,aAAa;IACb,oEAAoE;IACpE,IAAI,yBAAe,CAAC,8BAAkB,CAAC,GAAG;IAC1C,sBAAsB;IACtB,mDAAmD;IACnD,GAAG,uBAAW,CAAC,aAAa,EAAE,EAClC,uBAAW,CAAC,KAAK,CACpB,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,aAAa,GAAG,CAAC,CAAC;AACxB,MAAM,aAAa,GAAG,CAAC,CAAC;AAExB,MAAqB,eAAgB,SAAQ,uEAAsC;IAC/E,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,mBAAmB;QACf,OAAO,uBAAW,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,SAAS,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAC;QACrD,MAAM,OAAO,GAAG,8BAAkB,CAAC,SAAS,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC;QACrC,IAAI,YAAY,GAAG,MAAM,IAAI,OAAO,CAAC;QACrC,YAAY,GAAG,YAAY,IAAI,EAAE,CAAC;QAClC,YAAY,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;QAE1C,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,IAAI,YAAY,IAAI,SAAS,IAAI,YAAY,IAAI,SAAS,IAAI,YAAY,IAAI,SAAS,EAAE;YACrF,QAAQ,GAAG,MAAM,CAAC;SACrB;aAAM,IACH,YAAY,IAAI,WAAW;YAC3B,YAAY,IAAI,WAAW;YAC3B,YAAY,IAAI,WAAW;YAC3B,YAAY,IAAI,YAAY,EAC9B;YACE,QAAQ,GAAG,MAAM,CAAC;SACrB;aAAM,IAAI,YAAY,IAAI,MAAM,IAAI,YAAY,IAAI,KAAK,IAAI,YAAY,IAAI,MAAM,EAAE;YAClF,QAAQ,GAAG,MAAM,CAAC;SACrB;QAED,OAAO,2CAAgC,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAClF,CAAC;CACJ;AAlCD,kCAkCC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import AbstractMergeDateRangeRefiner from "../../../common/refiners/AbstractMergeDateRangeRefiner";
|
|
2
|
-
export default class
|
|
2
|
+
export default class RUMergeDateRangeRefiner extends AbstractMergeDateRangeRefiner {
|
|
3
3
|
patternBetween(): RegExp;
|
|
4
4
|
}
|
|
@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const AbstractMergeDateRangeRefiner_1 = __importDefault(require("../../../common/refiners/AbstractMergeDateRangeRefiner"));
|
|
7
|
-
class
|
|
7
|
+
class RUMergeDateRangeRefiner extends AbstractMergeDateRangeRefiner_1.default {
|
|
8
8
|
patternBetween() {
|
|
9
9
|
return /^\s*(и до|и по|до|по|-)\s*$/i;
|
|
10
10
|
}
|
|
11
11
|
}
|
|
12
|
-
exports.default =
|
|
12
|
+
exports.default = RUMergeDateRangeRefiner;
|
|
13
13
|
//# sourceMappingURL=RUMergeDateRangeRefiner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RUMergeDateRangeRefiner.js","sourceRoot":"","sources":["../../../../src/locales/ru/refiners/RUMergeDateRangeRefiner.ts"],"names":[],"mappings":";;;;;AAAA,2HAAmG;AAQnG,MAAqB,
|
|
1
|
+
{"version":3,"file":"RUMergeDateRangeRefiner.js","sourceRoot":"","sources":["../../../../src/locales/ru/refiners/RUMergeDateRangeRefiner.ts"],"names":[],"mappings":";;;;;AAAA,2HAAmG;AAQnG,MAAqB,uBAAwB,SAAQ,uCAA6B;IAC9E,cAAc;QACV,OAAO,8BAA8B,CAAC;IAC1C,CAAC;CACJ;AAJD,0CAIC"}
|
package/dist/results.d.ts
CHANGED
|
@@ -4,6 +4,8 @@ export declare class ReferenceWithTimezone {
|
|
|
4
4
|
readonly instant: Date;
|
|
5
5
|
readonly timezoneOffset?: number | null;
|
|
6
6
|
constructor(input?: ParsingReference | Date);
|
|
7
|
+
getDateWithAdjustedTimezone(): Date;
|
|
8
|
+
getSystemTimezoneAdjustmentMinute(date?: Date, overrideTimezoneOffset?: number): number;
|
|
7
9
|
}
|
|
8
10
|
export declare class ParsingComponents implements ParsedComponents {
|
|
9
11
|
private knownValues;
|
|
@@ -28,7 +30,6 @@ export declare class ParsingComponents implements ParsedComponents {
|
|
|
28
30
|
dayjs(): dayjs.Dayjs;
|
|
29
31
|
date(): Date;
|
|
30
32
|
private dateWithoutTimezoneAdjustment;
|
|
31
|
-
private getSystemTimezoneAdjustmentMinute;
|
|
32
33
|
static createRelativeFromReference(reference: ReferenceWithTimezone, fragments: {
|
|
33
34
|
[c in QUnitType]?: number;
|
|
34
35
|
}): ParsingComponents;
|
package/dist/results.js
CHANGED
|
@@ -21,6 +21,18 @@ class ReferenceWithTimezone {
|
|
|
21
21
|
this.timezoneOffset = timezone_1.toTimezoneOffset(input.timezone);
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
|
+
getDateWithAdjustedTimezone() {
|
|
25
|
+
return new Date(this.instant.getTime() + this.getSystemTimezoneAdjustmentMinute(this.instant) * 60000);
|
|
26
|
+
}
|
|
27
|
+
getSystemTimezoneAdjustmentMinute(date, overrideTimezoneOffset) {
|
|
28
|
+
var _a;
|
|
29
|
+
if (!date || date.getTime() < 0) {
|
|
30
|
+
date = new Date();
|
|
31
|
+
}
|
|
32
|
+
const currentTimezoneOffset = -date.getTimezoneOffset();
|
|
33
|
+
const targetTimezoneOffset = (_a = overrideTimezoneOffset !== null && overrideTimezoneOffset !== void 0 ? overrideTimezoneOffset : this.timezoneOffset) !== null && _a !== void 0 ? _a : currentTimezoneOffset;
|
|
34
|
+
return currentTimezoneOffset - targetTimezoneOffset;
|
|
35
|
+
}
|
|
24
36
|
}
|
|
25
37
|
exports.ReferenceWithTimezone = ReferenceWithTimezone;
|
|
26
38
|
class ParsingComponents {
|
|
@@ -119,22 +131,14 @@ class ParsingComponents {
|
|
|
119
131
|
}
|
|
120
132
|
date() {
|
|
121
133
|
const date = this.dateWithoutTimezoneAdjustment();
|
|
122
|
-
|
|
134
|
+
const timezoneAdjustment = this.reference.getSystemTimezoneAdjustmentMinute(date, this.get("timezoneOffset"));
|
|
135
|
+
return new Date(date.getTime() + timezoneAdjustment * 60000);
|
|
123
136
|
}
|
|
124
137
|
dateWithoutTimezoneAdjustment() {
|
|
125
138
|
const date = new Date(this.get("year"), this.get("month") - 1, this.get("day"), this.get("hour"), this.get("minute"), this.get("second"), this.get("millisecond"));
|
|
126
139
|
date.setFullYear(this.get("year"));
|
|
127
140
|
return date;
|
|
128
141
|
}
|
|
129
|
-
getSystemTimezoneAdjustmentMinute(date) {
|
|
130
|
-
var _a, _b;
|
|
131
|
-
if (!date || date.getTime() < 0) {
|
|
132
|
-
date = new Date();
|
|
133
|
-
}
|
|
134
|
-
const currentTimezoneOffset = -date.getTimezoneOffset();
|
|
135
|
-
const targetTimezoneOffset = (_b = (_a = this.get("timezoneOffset")) !== null && _a !== void 0 ? _a : this.reference.timezoneOffset) !== null && _b !== void 0 ? _b : currentTimezoneOffset;
|
|
136
|
-
return currentTimezoneOffset - targetTimezoneOffset;
|
|
137
|
-
}
|
|
138
142
|
static createRelativeFromReference(reference, fragments) {
|
|
139
143
|
let date = dayjs_1.default(reference.instant);
|
|
140
144
|
for (const key in fragments) {
|