@alanszp/relative-date 16.2.0 → 16.4.3
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.
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.relativeDateRangeToFixed = exports.relativeDateRangeToFixedArray = exports.relativeDateToFixed = exports.INPUT_DATE_FORMAT = void 0;
|
|
3
|
+
exports.relativeDateRangeToFixed = exports.relativeDateRangeToFixedArray = exports.relativeDateToFixed = exports.INPUT_DATE_FORMAT = exports.modifyDate = void 0;
|
|
4
4
|
const date_fns_1 = require("date-fns");
|
|
5
5
|
const lodash_1 = require("lodash");
|
|
6
6
|
// date format compliant with ISO
|
|
@@ -12,20 +12,20 @@ const RelativeDateUnit = {
|
|
|
12
12
|
NOW: "now",
|
|
13
13
|
};
|
|
14
14
|
const PLUS = "+";
|
|
15
|
-
const RELATIVE_DATE_REGEX = /^\s*(([+-])\s*(\d+)\s*(d|day|days|w|week|weeks|m|month|months|q|quarter|quarters|y|year|years)|now)(?:\s*:\s*([es])o([
|
|
16
|
-
function
|
|
15
|
+
const RELATIVE_DATE_REGEX = /^\s*(([+-])\s*(\d+)\s*(d|day|days|w|week|weeks|m|month|months|q|quarter|quarters|y|year|years)|now)(?:\s*:\s*([es])o([bmqstwy]))?\s*$/;
|
|
16
|
+
function defaultRelativeDateConverter(unit) {
|
|
17
17
|
return (quantity) => ({ unit, quantity });
|
|
18
18
|
}
|
|
19
19
|
const RELATIVE_DATE_MAP = {
|
|
20
|
-
d:
|
|
21
|
-
day:
|
|
22
|
-
days:
|
|
23
|
-
w:
|
|
24
|
-
week:
|
|
25
|
-
weeks:
|
|
26
|
-
m:
|
|
27
|
-
month:
|
|
28
|
-
months:
|
|
20
|
+
d: defaultRelativeDateConverter(RelativeDateUnit.DAYS),
|
|
21
|
+
day: defaultRelativeDateConverter(RelativeDateUnit.DAYS),
|
|
22
|
+
days: defaultRelativeDateConverter(RelativeDateUnit.DAYS),
|
|
23
|
+
w: defaultRelativeDateConverter(RelativeDateUnit.WEEKS),
|
|
24
|
+
week: defaultRelativeDateConverter(RelativeDateUnit.WEEKS),
|
|
25
|
+
weeks: defaultRelativeDateConverter(RelativeDateUnit.WEEKS),
|
|
26
|
+
m: defaultRelativeDateConverter(RelativeDateUnit.MONTHS),
|
|
27
|
+
month: defaultRelativeDateConverter(RelativeDateUnit.MONTHS),
|
|
28
|
+
months: defaultRelativeDateConverter(RelativeDateUnit.MONTHS),
|
|
29
29
|
q: (q) => ({ unit: RelativeDateUnit.MONTHS, quantity: q * 3 }),
|
|
30
30
|
quarter: (q) => ({
|
|
31
31
|
unit: RelativeDateUnit.MONTHS,
|
|
@@ -35,9 +35,9 @@ const RELATIVE_DATE_MAP = {
|
|
|
35
35
|
unit: RelativeDateUnit.MONTHS,
|
|
36
36
|
quantity: q * 3,
|
|
37
37
|
}),
|
|
38
|
-
y:
|
|
39
|
-
year:
|
|
40
|
-
years:
|
|
38
|
+
y: defaultRelativeDateConverter(RelativeDateUnit.YEARS),
|
|
39
|
+
year: defaultRelativeDateConverter(RelativeDateUnit.YEARS),
|
|
40
|
+
years: defaultRelativeDateConverter(RelativeDateUnit.YEARS),
|
|
41
41
|
};
|
|
42
42
|
function parseRelativeDate(fullRelative, operator, rawQuantity, rawTimeUnit) {
|
|
43
43
|
if (fullRelative === RelativeDateUnit.NOW) {
|
|
@@ -47,24 +47,47 @@ function parseRelativeDate(fullRelative, operator, rawQuantity, rawTimeUnit) {
|
|
|
47
47
|
const { unit, quantity } = RELATIVE_DATE_MAP[rawTimeUnit](Number.parseInt(rawQuantity, 10));
|
|
48
48
|
return op(new Date(), { [unit]: quantity });
|
|
49
49
|
}
|
|
50
|
+
function startOfNs(n) {
|
|
51
|
+
return (date) => {
|
|
52
|
+
const month = date.getMonth();
|
|
53
|
+
const year = date.getFullYear();
|
|
54
|
+
const periodStartMonth = month - (month % n);
|
|
55
|
+
return new Date(year, periodStartMonth, 1);
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
function endOfNs(n) {
|
|
59
|
+
return (date) => {
|
|
60
|
+
const month = date.getMonth();
|
|
61
|
+
const year = date.getFullYear();
|
|
62
|
+
const periodStartMonthEndMonth = month + (n - (month % n));
|
|
63
|
+
return new Date(year, periodStartMonthEndMonth, 0);
|
|
64
|
+
};
|
|
65
|
+
}
|
|
50
66
|
const MODIFIER_FN_MAP = {
|
|
51
67
|
e: {
|
|
52
68
|
w: date_fns_1.endOfWeek,
|
|
53
69
|
m: date_fns_1.endOfMonth,
|
|
54
70
|
q: date_fns_1.endOfQuarter,
|
|
55
71
|
y: date_fns_1.endOfYear,
|
|
72
|
+
s: endOfNs(6),
|
|
73
|
+
b: endOfNs(2),
|
|
74
|
+
t: endOfNs(4),
|
|
56
75
|
},
|
|
57
76
|
s: {
|
|
58
77
|
w: date_fns_1.startOfWeek,
|
|
59
78
|
m: date_fns_1.startOfMonth,
|
|
60
79
|
q: date_fns_1.startOfQuarter,
|
|
61
80
|
y: date_fns_1.startOfYear,
|
|
81
|
+
s: startOfNs(6),
|
|
82
|
+
b: startOfNs(2),
|
|
83
|
+
t: startOfNs(4),
|
|
62
84
|
},
|
|
63
85
|
};
|
|
64
86
|
function modifyDate(date, extreme, timeUnit) {
|
|
65
87
|
var _a, _b, _c;
|
|
66
88
|
return ((_c = (_b = (_a = MODIFIER_FN_MAP[extreme]) === null || _a === void 0 ? void 0 : _a[timeUnit]) === null || _b === void 0 ? void 0 : _b.call(_a, date)) !== null && _c !== void 0 ? _c : date);
|
|
67
89
|
}
|
|
90
|
+
exports.modifyDate = modifyDate;
|
|
68
91
|
function isRelativeDate(raw) {
|
|
69
92
|
return RELATIVE_DATE_REGEX.test(raw);
|
|
70
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relativeDateToFixed.js","sourceRoot":"","sources":["../src/relativeDateToFixed.ts"],"names":[],"mappings":";;;AAAA,uCAYkB;AAClB,mCAAkC;AAmClC,iCAAiC;AACjC,MAAM,gBAAgB,GAAU;IAC9B,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;IACd,GAAG,EAAE,KAAK;CACX,CAAC;AAEF,MAAM,IAAI,GAAG,GAAG,CAAC;AAEjB,MAAM,mBAAmB,GACvB,
|
|
1
|
+
{"version":3,"file":"relativeDateToFixed.js","sourceRoot":"","sources":["../src/relativeDateToFixed.ts"],"names":[],"mappings":";;;AAAA,uCAYkB;AAClB,mCAAkC;AAmClC,iCAAiC;AACjC,MAAM,gBAAgB,GAAU;IAC9B,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;IACd,GAAG,EAAE,KAAK;CACX,CAAC;AAEF,MAAM,IAAI,GAAG,GAAG,CAAC;AAEjB,MAAM,mBAAmB,GACvB,uIAAuI,CAAC;AAE1I,SAAS,4BAA4B,CACnC,IAAc;IAEd,OAAO,CAAC,QAAgB,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;AACpD,CAAC;AACD,MAAM,iBAAiB,GACrB;IACE,CAAC,EAAE,4BAA4B,CAAC,gBAAgB,CAAC,IAAI,CAAC;IACtD,GAAG,EAAE,4BAA4B,CAAC,gBAAgB,CAAC,IAAI,CAAC;IACxD,IAAI,EAAE,4BAA4B,CAAC,gBAAgB,CAAC,IAAI,CAAC;IACzD,CAAC,EAAE,4BAA4B,CAAC,gBAAgB,CAAC,KAAK,CAAC;IACvD,IAAI,EAAE,4BAA4B,CAAC,gBAAgB,CAAC,KAAK,CAAC;IAC1D,KAAK,EAAE,4BAA4B,CAAC,gBAAgB,CAAC,KAAK,CAAC;IAC3D,CAAC,EAAE,4BAA4B,CAAC,gBAAgB,CAAC,MAAM,CAAC;IACxD,KAAK,EAAE,4BAA4B,CAAC,gBAAgB,CAAC,MAAM,CAAC;IAC5D,MAAM,EAAE,4BAA4B,CAAC,gBAAgB,CAAC,MAAM,CAAC;IAC7D,CAAC,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,gBAAgB,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;IACtE,OAAO,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC;QACvB,IAAI,EAAE,gBAAgB,CAAC,MAAM;QAC7B,QAAQ,EAAE,CAAC,GAAG,CAAC;KAChB,CAAC;IACF,QAAQ,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC;QACxB,IAAI,EAAE,gBAAgB,CAAC,MAAM;QAC7B,QAAQ,EAAE,CAAC,GAAG,CAAC;KAChB,CAAC;IACF,CAAC,EAAE,4BAA4B,CAAC,gBAAgB,CAAC,KAAK,CAAC;IACvD,IAAI,EAAE,4BAA4B,CAAC,gBAAgB,CAAC,KAAK,CAAC;IAC1D,KAAK,EAAE,4BAA4B,CAAC,gBAAgB,CAAC,KAAK,CAAC;CAC5D,CAAC;AAEJ,SAAS,iBAAiB,CACxB,YAAoB,EACpB,QAAgB,EAChB,WAAqB,EACrB,WAAmB;IAEnB,IAAI,YAAY,KAAK,gBAAgB,CAAC,GAAG,EAAE;QACzC,OAAO,IAAI,IAAI,EAAE,CAAC;KACnB;IAED,MAAM,EAAE,GAAG,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,cAAG,CAAC,CAAC,CAAC,cAAG,CAAC;IACzC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,iBAAiB,CAAC,WAAuB,CAAC,CACnE,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,CACjC,CAAC;IACF,OAAO,EAAE,CAAC,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,SAAS,CAAC,CAAS;IAC1B,OAAO,CAAC,IAAU,EAAQ,EAAE;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAChC,MAAM,gBAAgB,GAAG,KAAK,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QAC7C,OAAO,IAAI,IAAI,CAAC,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,OAAO,CAAC,CAAS;IACxB,OAAO,CAAC,IAAU,EAAQ,EAAE;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAChC,MAAM,wBAAwB,GAAG,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;QAC3D,OAAO,IAAI,IAAI,CAAC,IAAI,EAAE,wBAAwB,EAAE,CAAC,CAAC,CAAC;IACrD,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,eAAe,GAGjB;IACF,CAAC,EAAE;QACD,CAAC,EAAE,oBAAS;QACZ,CAAC,EAAE,qBAAU;QACb,CAAC,EAAE,uBAAY;QACf,CAAC,EAAE,oBAAS;QACZ,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QACb,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QACb,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;KACd;IACD,CAAC,EAAE;QACD,CAAC,EAAE,sBAAW;QACd,CAAC,EAAE,uBAAY;QACf,CAAC,EAAE,yBAAc;QACjB,CAAC,EAAE,sBAAW;QACd,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;QACf,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;QACf,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;KAChB;CACF,CAAC;AAEF,SAAgB,UAAU,CACxB,IAAU,EACV,OAAe,EACf,QAAgB;;IAEhB,OAAO,CACL,MAAA,MAAA,MAAA,eAAe,CAAC,OAAgC,CAAC,0CAC/C,QAAkC,CACnC,mDAAG,IAAI,CAAC,mCAAI,IAAI,CAClB,CAAC;AACJ,CAAC;AAVD,gCAUC;AAED,SAAS,cAAc,CAAC,GAAW;IACjC,OAAO,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACvC,CAAC;AAED,iCAAiC;AACpB,QAAA,iBAAiB,GAAU,YAAY,CAAC;AAErD,SAAS,UAAU,CAAC,IAAU;IAC5B,OAAO,IAAA,iBAAM,EAAC,IAAI,EAAE,yBAAiB,CAAC,CAAC;AACzC,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,mBAAmB,CAAC,IAAY;IAC9C,IAAI,CAAC,IAAA,iBAAQ,EAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IAE/B,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IACnC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE;QAC/B,OAAO,UAAU,CAAC;KACnB;IAED,MAAM,MAAM,GAAG,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpD,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;KAChD;IAED,MAAM,CACJ,AADK,EAEL,YAAY,EACZ,QAAQ,EACR,WAAW,EACX,WAAW,EACX,eAAe,EACf,gBAAgB,EACjB,GAAG,MAAM,CAAC;IAEX,MAAM,YAAY,GAAG,iBAAiB,CACpC,YAAY,EACZ,QAAQ,EACR,WAAuB,EACvB,WAAW,CACZ,CAAC;IAEF,IAAI,CAAC,eAAe,IAAI,CAAC,gBAAgB,EAAE;QACzC,OAAO,UAAU,CAAC,YAAY,CAAC,CAAC;KACjC;IAED,OAAO,UAAU,CACf,UAAU,CAAC,YAAY,EAAE,eAAe,EAAE,gBAAgB,CAAC,CAC5D,CAAC;AACJ,CAAC;AArCD,kDAqCC;AAED,SAAgB,6BAA6B,CAC3C,KAAa;;IAEb,IAAI,CAAC,IAAA,iBAAQ,EAAC,KAAK,CAAC;QAAE,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC1C,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;IACrC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC5C,OAAO;QACL,MAAA,mBAAmB,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,mCAAI,IAAI;QACzC,MAAA,mBAAmB,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,mCAAI,IAAI;KACxC,CAAC;AACJ,CAAC;AAVD,sEAUC;AAED,SAAgB,wBAAwB,CAAC,KAAa;IACpD,IAAI,CAAC,IAAA,iBAAQ,EAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAClC,MAAM,WAAW,GAAG,6BAA6B,CAAC,KAAK,CAAC,CAAC;IACzD,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE;QAC7C,OAAO,IAAI,CAAC;KACb;IACD,OAAO,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/B,CAAC;AAPD,4DAOC"}
|
|
@@ -68,4 +68,262 @@ describe("relativeDateToFixed", () => {
|
|
|
68
68
|
expect((0, relativeDateToFixed_1.relativeDateToFixed)(dateInput)).toEqual(toExpected);
|
|
69
69
|
});
|
|
70
70
|
});
|
|
71
|
+
describe("modifyDate", () => {
|
|
72
|
+
describe("bimester", () => {
|
|
73
|
+
it.each([
|
|
74
|
+
{
|
|
75
|
+
date: "2023-01-01",
|
|
76
|
+
start: "2023-01-01",
|
|
77
|
+
end: "2023-02-28",
|
|
78
|
+
},
|
|
79
|
+
{
|
|
80
|
+
date: "2023-01-31",
|
|
81
|
+
start: "2023-01-01",
|
|
82
|
+
end: "2023-02-28",
|
|
83
|
+
},
|
|
84
|
+
{
|
|
85
|
+
date: "2023-02-01",
|
|
86
|
+
start: "2023-01-01",
|
|
87
|
+
end: "2023-02-28",
|
|
88
|
+
},
|
|
89
|
+
{
|
|
90
|
+
date: "2023-02-28",
|
|
91
|
+
start: "2023-01-01",
|
|
92
|
+
end: "2023-02-28",
|
|
93
|
+
},
|
|
94
|
+
{
|
|
95
|
+
date: "2023-03-01",
|
|
96
|
+
start: "2023-03-01",
|
|
97
|
+
end: "2023-04-30",
|
|
98
|
+
},
|
|
99
|
+
{
|
|
100
|
+
date: "2023-04-20",
|
|
101
|
+
start: "2023-03-01",
|
|
102
|
+
end: "2023-04-30",
|
|
103
|
+
},
|
|
104
|
+
{
|
|
105
|
+
date: "2023-05-01",
|
|
106
|
+
start: "2023-05-01",
|
|
107
|
+
end: "2023-06-30",
|
|
108
|
+
},
|
|
109
|
+
{
|
|
110
|
+
date: "2023-06-30",
|
|
111
|
+
start: "2023-05-01",
|
|
112
|
+
end: "2023-06-30",
|
|
113
|
+
},
|
|
114
|
+
{
|
|
115
|
+
date: "2023-07-01",
|
|
116
|
+
start: "2023-07-01",
|
|
117
|
+
end: "2023-08-31",
|
|
118
|
+
},
|
|
119
|
+
{
|
|
120
|
+
date: "2023-08-31",
|
|
121
|
+
start: "2023-07-01",
|
|
122
|
+
end: "2023-08-31",
|
|
123
|
+
},
|
|
124
|
+
{
|
|
125
|
+
date: "2023-09-01",
|
|
126
|
+
start: "2023-09-01",
|
|
127
|
+
end: "2023-10-31",
|
|
128
|
+
},
|
|
129
|
+
{
|
|
130
|
+
date: "2023-10-31",
|
|
131
|
+
start: "2023-09-01",
|
|
132
|
+
end: "2023-10-31",
|
|
133
|
+
},
|
|
134
|
+
{
|
|
135
|
+
date: "2023-11-01",
|
|
136
|
+
start: "2023-11-01",
|
|
137
|
+
end: "2023-12-31",
|
|
138
|
+
},
|
|
139
|
+
{
|
|
140
|
+
date: "2023-12-31",
|
|
141
|
+
start: "2023-11-01",
|
|
142
|
+
end: "2023-12-31",
|
|
143
|
+
},
|
|
144
|
+
])("for date $date the beginning of a bimester should be $start and the end $end", ({ date, start, end }) => {
|
|
145
|
+
expect({
|
|
146
|
+
start: (0, relativeDateToFixed_1.modifyDate)(new Date(date), "s", "b"),
|
|
147
|
+
end: (0, relativeDateToFixed_1.modifyDate)(new Date(date), "e", "b"),
|
|
148
|
+
}).toEqual({
|
|
149
|
+
start: new Date(start),
|
|
150
|
+
end: new Date(end),
|
|
151
|
+
});
|
|
152
|
+
});
|
|
153
|
+
});
|
|
154
|
+
describe("third", () => {
|
|
155
|
+
it.each([
|
|
156
|
+
{
|
|
157
|
+
date: "2023-01-01",
|
|
158
|
+
start: "2023-01-01",
|
|
159
|
+
end: "2023-04-30",
|
|
160
|
+
},
|
|
161
|
+
{
|
|
162
|
+
date: "2023-01-31",
|
|
163
|
+
start: "2023-01-01",
|
|
164
|
+
end: "2023-04-30",
|
|
165
|
+
},
|
|
166
|
+
{
|
|
167
|
+
date: "2023-02-01",
|
|
168
|
+
start: "2023-01-01",
|
|
169
|
+
end: "2023-04-30",
|
|
170
|
+
},
|
|
171
|
+
{
|
|
172
|
+
date: "2023-02-28",
|
|
173
|
+
start: "2023-01-01",
|
|
174
|
+
end: "2023-04-30",
|
|
175
|
+
},
|
|
176
|
+
{
|
|
177
|
+
date: "2023-03-01",
|
|
178
|
+
start: "2023-01-01",
|
|
179
|
+
end: "2023-04-30",
|
|
180
|
+
},
|
|
181
|
+
{
|
|
182
|
+
date: "2023-03-31",
|
|
183
|
+
start: "2023-01-01",
|
|
184
|
+
end: "2023-04-30",
|
|
185
|
+
},
|
|
186
|
+
{
|
|
187
|
+
date: "2023-04-01",
|
|
188
|
+
start: "2023-01-01",
|
|
189
|
+
end: "2023-04-30",
|
|
190
|
+
},
|
|
191
|
+
{
|
|
192
|
+
date: "2023-05-20",
|
|
193
|
+
start: "2023-05-01",
|
|
194
|
+
end: "2023-08-31",
|
|
195
|
+
},
|
|
196
|
+
{
|
|
197
|
+
date: "2023-06-30",
|
|
198
|
+
start: "2023-05-01",
|
|
199
|
+
end: "2023-08-31",
|
|
200
|
+
},
|
|
201
|
+
{
|
|
202
|
+
date: "2023-07-01",
|
|
203
|
+
start: "2023-05-01",
|
|
204
|
+
end: "2023-08-31",
|
|
205
|
+
},
|
|
206
|
+
{
|
|
207
|
+
date: "2023-08-15",
|
|
208
|
+
start: "2023-05-01",
|
|
209
|
+
end: "2023-08-31",
|
|
210
|
+
},
|
|
211
|
+
{
|
|
212
|
+
date: "2023-09-30",
|
|
213
|
+
start: "2023-09-01",
|
|
214
|
+
end: "2023-12-31",
|
|
215
|
+
},
|
|
216
|
+
{
|
|
217
|
+
date: "2023-10-01",
|
|
218
|
+
start: "2023-09-01",
|
|
219
|
+
end: "2023-12-31",
|
|
220
|
+
},
|
|
221
|
+
{
|
|
222
|
+
date: "2023-11-10",
|
|
223
|
+
start: "2023-09-01",
|
|
224
|
+
end: "2023-12-31",
|
|
225
|
+
},
|
|
226
|
+
{
|
|
227
|
+
date: "2023-12-31",
|
|
228
|
+
start: "2023-09-01",
|
|
229
|
+
end: "2023-12-31",
|
|
230
|
+
},
|
|
231
|
+
])("for date $date the beginning of a third should be $start and the end $end", ({ date, start, end }) => {
|
|
232
|
+
expect({
|
|
233
|
+
start: (0, relativeDateToFixed_1.modifyDate)(new Date(date), "s", "t"),
|
|
234
|
+
end: (0, relativeDateToFixed_1.modifyDate)(new Date(date), "e", "t"),
|
|
235
|
+
}).toEqual({
|
|
236
|
+
start: new Date(start),
|
|
237
|
+
end: new Date(end),
|
|
238
|
+
});
|
|
239
|
+
});
|
|
240
|
+
});
|
|
241
|
+
describe("semester", () => {
|
|
242
|
+
it.each([
|
|
243
|
+
{
|
|
244
|
+
date: "2023-01-01",
|
|
245
|
+
start: "2023-01-01",
|
|
246
|
+
end: "2023-06-30",
|
|
247
|
+
},
|
|
248
|
+
{
|
|
249
|
+
date: "2023-01-31",
|
|
250
|
+
start: "2023-01-01",
|
|
251
|
+
end: "2023-06-30",
|
|
252
|
+
},
|
|
253
|
+
{
|
|
254
|
+
date: "2023-02-01",
|
|
255
|
+
start: "2023-01-01",
|
|
256
|
+
end: "2023-06-30",
|
|
257
|
+
},
|
|
258
|
+
{
|
|
259
|
+
date: "2023-02-28",
|
|
260
|
+
start: "2023-01-01",
|
|
261
|
+
end: "2023-06-30",
|
|
262
|
+
},
|
|
263
|
+
{
|
|
264
|
+
date: "2023-03-01",
|
|
265
|
+
start: "2023-01-01",
|
|
266
|
+
end: "2023-06-30",
|
|
267
|
+
},
|
|
268
|
+
{
|
|
269
|
+
date: "2023-03-31",
|
|
270
|
+
start: "2023-01-01",
|
|
271
|
+
end: "2023-06-30",
|
|
272
|
+
},
|
|
273
|
+
{
|
|
274
|
+
date: "2023-04-01",
|
|
275
|
+
start: "2023-01-01",
|
|
276
|
+
end: "2023-06-30",
|
|
277
|
+
},
|
|
278
|
+
{
|
|
279
|
+
date: "2023-05-20",
|
|
280
|
+
start: "2023-01-01",
|
|
281
|
+
end: "2023-06-30",
|
|
282
|
+
},
|
|
283
|
+
{
|
|
284
|
+
date: "2023-06-30",
|
|
285
|
+
start: "2023-01-01",
|
|
286
|
+
end: "2023-06-30",
|
|
287
|
+
},
|
|
288
|
+
{
|
|
289
|
+
date: "2023-07-01",
|
|
290
|
+
start: "2023-07-01",
|
|
291
|
+
end: "2023-12-31",
|
|
292
|
+
},
|
|
293
|
+
{
|
|
294
|
+
date: "2023-08-15",
|
|
295
|
+
start: "2023-07-01",
|
|
296
|
+
end: "2023-12-31",
|
|
297
|
+
},
|
|
298
|
+
{
|
|
299
|
+
date: "2023-09-30",
|
|
300
|
+
start: "2023-07-01",
|
|
301
|
+
end: "2023-12-31",
|
|
302
|
+
},
|
|
303
|
+
{
|
|
304
|
+
date: "2023-10-01",
|
|
305
|
+
start: "2023-07-01",
|
|
306
|
+
end: "2023-12-31",
|
|
307
|
+
},
|
|
308
|
+
{
|
|
309
|
+
date: "2023-11-10",
|
|
310
|
+
start: "2023-07-01",
|
|
311
|
+
end: "2023-12-31",
|
|
312
|
+
},
|
|
313
|
+
{
|
|
314
|
+
date: "2023-12-31",
|
|
315
|
+
start: "2023-07-01",
|
|
316
|
+
end: "2023-12-31",
|
|
317
|
+
},
|
|
318
|
+
])("for date $date the beginning of a semester should be $start and the end $end", ({ date, start, end }) => {
|
|
319
|
+
expect({
|
|
320
|
+
start: (0, relativeDateToFixed_1.modifyDate)(new Date(date), "s", "s"),
|
|
321
|
+
end: (0, relativeDateToFixed_1.modifyDate)(new Date(date), "e", "s"),
|
|
322
|
+
}).toEqual({
|
|
323
|
+
start: new Date(start),
|
|
324
|
+
end: new Date(end),
|
|
325
|
+
});
|
|
326
|
+
});
|
|
327
|
+
});
|
|
328
|
+
});
|
|
71
329
|
//# sourceMappingURL=relativeDateToFixed.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relativeDateToFixed.test.js","sourceRoot":"","sources":["../src/relativeDateToFixed.test.ts"],"names":[],"mappings":";;AAAA,4BAA0B;AAC1B,uCASkB;AAClB,+
|
|
1
|
+
{"version":3,"file":"relativeDateToFixed.test.js","sourceRoot":"","sources":["../src/relativeDateToFixed.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@alanszp/relative-date",
|
|
3
|
-
"version": "16.
|
|
3
|
+
"version": "16.4.3",
|
|
4
4
|
"description": "Relative date utils.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
@@ -31,5 +31,5 @@
|
|
|
31
31
|
"date-fns": "^2.28.0",
|
|
32
32
|
"jest": "^29.7.0"
|
|
33
33
|
},
|
|
34
|
-
"gitHead": "
|
|
34
|
+
"gitHead": "66427c07482387f39c1707e8dabcad07afca977c"
|
|
35
35
|
}
|