@zajno/common 2.2.7 → 2.2.8
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/dates/convert.d.ts +3 -2
- package/dates/convert.d.ts.map +1 -1
- package/dates/convert.js +13 -11
- package/dates/convert.js.map +1 -1
- package/dates/datex.d.ts +1 -0
- package/dates/datex.d.ts.map +1 -1
- package/dates/datex.js +20 -3
- package/dates/datex.js.map +1 -1
- package/dates/period.js +2 -2
- package/dates/period.js.map +1 -1
- package/dates/shift.d.ts +3 -1
- package/dates/shift.d.ts.map +1 -1
- package/dates/shift.js +8 -6
- package/dates/shift.js.map +1 -1
- package/math/calc.d.ts +4 -4
- package/math/calc.d.ts.map +1 -1
- package/math/calc.js +6 -6
- package/math/calc.js.map +1 -1
- package/package.json +1 -1
package/dates/convert.d.ts
CHANGED
|
@@ -9,8 +9,9 @@ export declare function convert(amount: number, g: ConstantGranularity, to: Cons
|
|
|
9
9
|
export declare function unix(d: Date | number): number;
|
|
10
10
|
export declare function unixDayIndex(d: Date | number): number;
|
|
11
11
|
export declare function dateFromUnixDayIndex(d: number): Date;
|
|
12
|
-
export declare function decompose(date: number | Date, local: boolean, ...grans: Granularity[]): Partial<Record<
|
|
13
|
-
|
|
12
|
+
export declare function decompose(date: number | Date, local: boolean, ...grans: (Granularity & DecomposeGranularity)[]): Partial<Record<DecomposeGranularity, number>>;
|
|
13
|
+
type DecomposeGranularity = 'week' | 'day' | 'hour' | 'minute' | 'second';
|
|
14
|
+
export declare function decomposeMs<K extends Granularity & DecomposeGranularity>(ms: number, ...grans: K[]): Record<K, number>;
|
|
14
15
|
export declare function decomposeDate<K extends Granularity>(d: Date, local: boolean, ...grans: K[]): Record<K, number>;
|
|
15
16
|
export declare function splitDatesByDay(dates: number[]): number[][];
|
|
16
17
|
export declare function getDiscreteDiff(d1: number | Date, d2: number | Date, granularity: Granularity, local?: boolean, absolute?: boolean): number;
|
package/dates/convert.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../src/dates/convert.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3D,KAAK,UAAU,CAAC,CAAC,IAAI;KAChB,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,GAAG,CAAC,GAAG,KAAK;CAChD,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX,wBAAgB,WAAW,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,QAShE;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,WAA8B;AACpE,wBAAgB,aAAa,CAAC,CAAC,EAAE,IAAI,WAAyC;AAE9E,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,mBAAmB,EAAE,EAAE,EAAE,mBAAmB,UAItF;AAED,wBAAgB,IAAI,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM,UAEpC;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM,UAE5C;AAED,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,MAAM,QAE7C;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../src/dates/convert.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3D,KAAK,UAAU,CAAC,CAAC,IAAI;KAChB,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,GAAG,CAAC,GAAG,KAAK;CAChD,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX,wBAAgB,WAAW,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,QAShE;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,WAA8B;AACpE,wBAAgB,aAAa,CAAC,CAAC,EAAE,IAAI,WAAyC;AAE9E,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,mBAAmB,EAAE,EAAE,EAAE,mBAAmB,UAItF;AAED,wBAAgB,IAAI,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM,UAEpC;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM,UAE5C;AAED,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,MAAM,QAE7C;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,CAAC,WAAW,GAAG,oBAAoB,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAM9J;AAED,KAAK,oBAAoB,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE1E,wBAAgB,WAAW,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAmCtH;AAED,wBAAgB,aAAa,CAAC,CAAC,SAAS,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAO9G;AAGD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,EAAE,CAiC3D;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,UAAQ,EAAE,QAAQ,UAAO,UAkC7H;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,OAAO,GAAG,MAAM,CA2B5E"}
|
package/dates/convert.js
CHANGED
|
@@ -48,22 +48,26 @@ exports.decompose = decompose;
|
|
|
48
48
|
function decomposeMs(ms, ...grans) {
|
|
49
49
|
const res = {};
|
|
50
50
|
// absolute values
|
|
51
|
-
let secs = Math.round(ms
|
|
52
|
-
let mins =
|
|
53
|
-
let hrs =
|
|
54
|
-
|
|
51
|
+
let secs = Math.round(convert(ms, 'millisecond', 'second'));
|
|
52
|
+
let mins = convert(secs, 'second', 'minute');
|
|
53
|
+
let hrs = convert(mins, 'minute', 'hour');
|
|
54
|
+
let days = convert(hrs, 'hour', 'day');
|
|
55
55
|
// apply only selected granularity
|
|
56
|
+
if (grans.includes('week')) {
|
|
57
|
+
res.week = Math.ceil(days / 7);
|
|
58
|
+
days = days % 7;
|
|
59
|
+
}
|
|
56
60
|
if (grans.includes('day')) {
|
|
61
|
+
res.day = Math.trunc(days);
|
|
57
62
|
hrs = hrs % 24;
|
|
58
|
-
res.day = days;
|
|
59
63
|
}
|
|
60
64
|
if (grans.includes('hour')) {
|
|
65
|
+
res.hour = Math.trunc(hrs);
|
|
61
66
|
mins = mins % 60;
|
|
62
|
-
res.hour = hrs;
|
|
63
67
|
}
|
|
64
68
|
if (grans.includes('minute')) {
|
|
69
|
+
res.minute = Math.trunc(mins);
|
|
65
70
|
secs = secs % 60;
|
|
66
|
-
res.minute = mins;
|
|
67
71
|
}
|
|
68
72
|
if (grans.includes('second')) {
|
|
69
73
|
res.second = secs;
|
|
@@ -74,10 +78,8 @@ exports.decomposeMs = decomposeMs;
|
|
|
74
78
|
function decomposeDate(d, local, ...grans) {
|
|
75
79
|
const res = {};
|
|
76
80
|
grans.forEach(g => {
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
res[g] = datex_1.DateX.get(d, g, local) + diff;
|
|
80
|
-
}
|
|
81
|
+
const diff = g === 'month' ? 1 : 0;
|
|
82
|
+
res[g] = datex_1.DateX.get(d, g, local) + diff;
|
|
81
83
|
});
|
|
82
84
|
return res;
|
|
83
85
|
}
|
package/dates/convert.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../src/dates/convert.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAChC,mCAA2C;AAC3C,mCAA0C;AAC1C,mCAA2D;AAM3D,SAAgB,WAAW,CAAI,GAAM,EAAE,GAAG,MAAuB;IAC7D,IAAI,GAAG,EAAE,CAAC;QACN,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACf,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAA2B,CAAC;YAC3C,IAAI,CAAC,EAAE,CAAC;gBACJ,GAAG,CAAC,CAAC,CAAC,GAAG,IAAA,eAAO,EAAC,CAAC,CAAkC,CAAC;YACzD,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;AACL,CAAC;AATD,kCASC;AAED,SAAgB,YAAY,CAAC,CAAS,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAApE,oCAAoE;AACpE,SAAgB,aAAa,CAAC,CAAO,IAAI,OAAO,YAAY,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;AAA9E,sCAA8E;AAE9E,SAAgB,OAAO,CAAC,MAAc,EAAE,CAAsB,EAAE,EAAuB;IACnF,MAAM,EAAE,GAAG,MAAM,GAAG,2BAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,2BAAmB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1C,OAAO,EAAE,GAAG,IAAI,CAAC;AACrB,CAAC;AAJD,0BAIC;AAED,SAAgB,IAAI,CAAC,CAAgB;IACjC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAA,eAAO,EAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;AACzC,CAAC;AAFD,oBAEC;AAED,SAAgB,YAAY,CAAC,CAAgB;IACzC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAA,eAAO,EAAC,CAAC,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC;AACvD,CAAC;AAFD,oCAEC;AAED,SAAgB,oBAAoB,CAAC,CAAS;IAC1C,OAAO,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC,CAAC;AAC1C,CAAC;AAFD,oDAEC;AAED,SAAgB,SAAS,CAAC,IAAmB,EAAE,KAAc,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../src/dates/convert.ts"],"names":[],"mappings":"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"}
|
package/dates/datex.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ export declare namespace DateX {
|
|
|
3
3
|
function get(d: Date, g: Granularity, local: boolean): number;
|
|
4
4
|
function set(d: Date, g: 'year', local: boolean, year: number, month?: number, date?: number): number;
|
|
5
5
|
function set(d: Date, g: 'month', local: boolean, month: number, date?: number): number;
|
|
6
|
+
function set(d: Date, g: 'week', local: boolean, week: number): number;
|
|
6
7
|
function set(d: Date, g: 'day', local: boolean, date: number): number;
|
|
7
8
|
function set(d: Date, g: 'hour', local: boolean, hours: number, min?: number, sec?: number, ms?: number): number;
|
|
8
9
|
function set(d: Date, g: 'minute', local: boolean, min: number, sec?: number, ms?: number): number;
|
package/dates/datex.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datex.d.ts","sourceRoot":"","sources":["../../src/dates/datex.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"datex.d.ts","sourceRoot":"","sources":["../../src/dates/datex.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,yBAAiB,KAAK,CAAC;IACnB,SAAgB,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,UAY1D;IAED,SAAgB,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7G,SAAgB,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/F,SAAgB,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9E,SAAgB,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7E,SAAgB,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxH,SAAgB,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1G,SAAgB,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5F,SAAgB,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;CA+CtF"}
|
package/dates/datex.js
CHANGED
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DateX = void 0;
|
|
4
|
+
const convert_1 = require("./convert");
|
|
5
|
+
const shift_1 = require("./shift");
|
|
4
6
|
var DateX;
|
|
5
7
|
(function (DateX) {
|
|
6
8
|
function get(d, g, local) {
|
|
7
9
|
switch (g) {
|
|
8
10
|
case 'year': return local ? d.getFullYear() : d.getUTCFullYear();
|
|
9
11
|
case 'month': return local ? d.getMonth() : d.getUTCMonth();
|
|
10
|
-
case 'week':
|
|
12
|
+
case 'week': return getWeek(d, local);
|
|
11
13
|
case 'day': return local ? d.getDate() : d.getUTCDate();
|
|
12
14
|
case 'hour': return local ? d.getHours() : d.getUTCHours();
|
|
13
15
|
case 'minute': return local ? d.getMinutes() : d.getUTCMinutes();
|
|
@@ -18,13 +20,14 @@ var DateX;
|
|
|
18
20
|
}
|
|
19
21
|
DateX.get = get;
|
|
20
22
|
function set(d, g, local, ...v) {
|
|
21
|
-
|
|
23
|
+
if (g === 'week') {
|
|
24
|
+
return setWeek(d, local, v[0]);
|
|
25
|
+
}
|
|
22
26
|
/* eslint-disable @typescript-eslint/unbound-method -- it's clearly defined as a function with `this: Date` */
|
|
23
27
|
const fn = (() => {
|
|
24
28
|
switch (g) {
|
|
25
29
|
case 'year': return local ? d.setFullYear : d.setUTCFullYear;
|
|
26
30
|
case 'month': return local ? d.setMonth : d.setUTCMonth;
|
|
27
|
-
case 'week': throw new Error('Not supported');
|
|
28
31
|
case 'day': return local ? d.setDate : d.setUTCDate;
|
|
29
32
|
case 'hour': return local ? d.setHours : d.setUTCHours;
|
|
30
33
|
case 'minute': return local ? d.setMinutes : d.setUTCMinutes;
|
|
@@ -37,5 +40,19 @@ var DateX;
|
|
|
37
40
|
return fn ? fn.call(d, ...v) : d.getTime();
|
|
38
41
|
}
|
|
39
42
|
DateX.set = set;
|
|
43
|
+
function getWeek(d, local) {
|
|
44
|
+
const year = get(d, 'year', local);
|
|
45
|
+
const firstDay = new Date();
|
|
46
|
+
set(firstDay, 'year', local, year, 0, 1);
|
|
47
|
+
set(firstDay, 'hour', local, 0, 0, 0, 1);
|
|
48
|
+
const diff = (d.getTime() - firstDay.getTime());
|
|
49
|
+
return (0, convert_1.decomposeMs)(diff, 'week').week;
|
|
50
|
+
}
|
|
51
|
+
function setWeek(d, local, week) {
|
|
52
|
+
const current = getWeek(d, local);
|
|
53
|
+
const res = (0, shift_1.shiftDate)(d, (week - current), 'week', local).getTime();
|
|
54
|
+
d.setTime(res);
|
|
55
|
+
return res;
|
|
56
|
+
}
|
|
40
57
|
})(DateX || (exports.DateX = DateX = {}));
|
|
41
58
|
//# sourceMappingURL=datex.js.map
|
package/dates/datex.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datex.js","sourceRoot":"","sources":["../../src/dates/datex.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"datex.js","sourceRoot":"","sources":["../../src/dates/datex.ts"],"names":[],"mappings":"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"}
|
package/dates/period.js
CHANGED
|
@@ -5,11 +5,11 @@ const shift_1 = require("./shift");
|
|
|
5
5
|
var Period;
|
|
6
6
|
(function (Period) {
|
|
7
7
|
function forward(period, base = new Date()) {
|
|
8
|
-
return (0, shift_1.
|
|
8
|
+
return (0, shift_1.shiftDate)(base, period.amount, period.granularity);
|
|
9
9
|
}
|
|
10
10
|
Period.forward = forward;
|
|
11
11
|
function backward(period, base = new Date()) {
|
|
12
|
-
return (0, shift_1.
|
|
12
|
+
return (0, shift_1.shiftDate)(base, -period.amount, period.granularity);
|
|
13
13
|
}
|
|
14
14
|
Period.backward = backward;
|
|
15
15
|
function toMs(period, now = new Date()) {
|
package/dates/period.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"period.js","sourceRoot":"","sources":["../../src/dates/period.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"period.js","sourceRoot":"","sources":["../../src/dates/period.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AAIpC,IAAiB,MAAM,CAiBtB;AAjBD,WAAiB,MAAM;IACnB,SAAgB,OAAO,CAAC,MAAc,EAAE,OAAsB,IAAI,IAAI,EAAE;QACpE,OAAO,IAAA,iBAAS,EAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAC9D,CAAC;IAFe,cAAO,UAEtB,CAAA;IAED,SAAgB,QAAQ,CAAC,MAAc,EAAE,OAAsB,IAAI,IAAI,EAAE;QACrE,OAAO,IAAA,iBAAS,EAAC,IAAI,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAC/D,CAAC;IAFe,eAAQ,WAEvB,CAAA;IAED,SAAgB,IAAI,CAAC,MAAc,EAAE,GAAG,GAAG,IAAI,IAAI,EAAE;QACjD,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACnC,OAAO,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAC1C,CAAC;IAHe,WAAI,OAGnB,CAAA;IAED,SAAgB,MAAM,CAAC,CAAS;QAC5B,OAAO,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IACpE,CAAC;IAFe,aAAM,SAErB,CAAA;AACL,CAAC,EAjBgB,MAAM,sBAAN,MAAM,QAiBtB"}
|
package/dates/shift.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { Granularity } from './types';
|
|
2
2
|
export declare function addDays(start: Date, amount: number, condition: (d: Date) => boolean, maxShift?: number): Date;
|
|
3
|
-
export declare function
|
|
3
|
+
export declare function shiftDate(date: Date | number, amount: number, granularity: Granularity, local?: boolean): Date;
|
|
4
|
+
/** @deprecated User {@link shiftDate} instead */
|
|
5
|
+
export declare const add: typeof shiftDate;
|
|
4
6
|
export declare function startOf(d: Date | number, g: Granularity, local?: boolean): Date;
|
|
5
7
|
export declare function endOf(d: Date | number, g: Granularity, local?: boolean): Date;
|
|
6
8
|
export declare function isSame(d1: Date | number, d2: Date | number, g: Granularity, local?: boolean): boolean;
|
package/dates/shift.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shift.d.ts","sourceRoot":"","sources":["../../src/dates/shift.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3D,wBAAgB,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,IAAI,KAAK,OAAO,EAAE,QAAQ,SAAM,QAcnG;AAGD,wBAAgB,
|
|
1
|
+
{"version":3,"file":"shift.d.ts","sourceRoot":"","sources":["../../src/dates/shift.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3D,wBAAgB,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,IAAI,KAAK,OAAO,EAAE,QAAQ,SAAM,QAcnG;AAGD,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,UAAQ,GAAG,IAAI,CAe5G;AAED,iDAAiD;AACjD,eAAO,MAAM,GAAG,kBAAY,CAAC;AAE7B,wBAAgB,OAAO,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM,EAAE,CAAC,EAAE,WAAW,EAAE,KAAK,UAAQ,GAAG,IAAI,CAkC7E;AAED,wBAAgB,KAAK,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM,EAAE,CAAC,EAAE,WAAW,EAAE,KAAK,UAAQ,GAAG,IAAI,CAS3E;AAED,wBAAgB,MAAM,CAAC,EAAE,EAAE,IAAI,GAAG,MAAM,EAAE,EAAE,EAAE,IAAI,GAAG,MAAM,EAAE,CAAC,EAAE,WAAW,EAAE,KAAK,UAAQ,WAIzF;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,GAAG,IAAW,EAAE,KAAK,UAAQ,QAc7G"}
|
package/dates/shift.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.setDayOfWeek = exports.isSame = exports.endOf = exports.startOf = exports.add = exports.addDays = void 0;
|
|
3
|
+
exports.setDayOfWeek = exports.isSame = exports.endOf = exports.startOf = exports.add = exports.shiftDate = exports.addDays = void 0;
|
|
4
4
|
const parse_1 = require("./parse");
|
|
5
5
|
const datex_1 = require("./datex");
|
|
6
6
|
const types_1 = require("./types");
|
|
@@ -11,7 +11,7 @@ function addDays(start, amount, condition, maxShift = 365) {
|
|
|
11
11
|
let shift = 0;
|
|
12
12
|
while (left > 0 && shift < maxShift) {
|
|
13
13
|
++shift;
|
|
14
|
-
current =
|
|
14
|
+
current = shiftDate(current, dir, 'day', false);
|
|
15
15
|
if (condition(current)) {
|
|
16
16
|
--left;
|
|
17
17
|
}
|
|
@@ -19,7 +19,7 @@ function addDays(start, amount, condition, maxShift = 365) {
|
|
|
19
19
|
return current;
|
|
20
20
|
}
|
|
21
21
|
exports.addDays = addDays;
|
|
22
|
-
function
|
|
22
|
+
function shiftDate(date, amount, granularity, local = false) {
|
|
23
23
|
const res = (0, parse_1.getDate)(date);
|
|
24
24
|
switch (granularity) {
|
|
25
25
|
case 'month': {
|
|
@@ -35,7 +35,9 @@ function add(date, amount, granularity, local = false) {
|
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
|
-
exports.
|
|
38
|
+
exports.shiftDate = shiftDate;
|
|
39
|
+
/** @deprecated User {@link shiftDate} instead */
|
|
40
|
+
exports.add = shiftDate;
|
|
39
41
|
function startOf(d, g, local = false) {
|
|
40
42
|
const ms = (0, parse_1.getTime)(d);
|
|
41
43
|
switch (g) {
|
|
@@ -76,7 +78,7 @@ function endOf(d, g, local = false) {
|
|
|
76
78
|
if (g === 'millisecond') {
|
|
77
79
|
return (0, parse_1.getDate)(d);
|
|
78
80
|
}
|
|
79
|
-
const nextD =
|
|
81
|
+
const nextD = shiftDate(d, 1, g, local);
|
|
80
82
|
const nextDStart = startOf(nextD, g, local);
|
|
81
83
|
const nextDStartMs = nextDStart.getTime();
|
|
82
84
|
return new Date(nextDStartMs - 1);
|
|
@@ -108,7 +110,7 @@ function setDayOfWeek(d, dayOfWeek, future = null, local = false) {
|
|
|
108
110
|
diff -= 7;
|
|
109
111
|
}
|
|
110
112
|
}
|
|
111
|
-
return
|
|
113
|
+
return shiftDate(res, diff, 'day', local);
|
|
112
114
|
}
|
|
113
115
|
exports.setDayOfWeek = setDayOfWeek;
|
|
114
116
|
//# sourceMappingURL=shift.js.map
|
package/dates/shift.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shift.js","sourceRoot":"","sources":["../../src/dates/shift.ts"],"names":[],"mappings":";;;AAAA,mCAA2C;AAC3C,mCAAgC;AAChC,mCAA2D;AAE3D,SAAgB,OAAO,CAAC,KAAW,EAAE,MAAc,EAAE,SAA+B,EAAE,QAAQ,GAAG,GAAG;IAChG,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,IAAI,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5B,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,OAAO,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,QAAQ,EAAE,CAAC;QAClC,EAAE,KAAK,CAAC;QAER,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"shift.js","sourceRoot":"","sources":["../../src/dates/shift.ts"],"names":[],"mappings":"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"}
|
package/math/calc.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
export declare function clamp(val: number, min?: number | undefined | null, max?: number | undefined | null, cycle?: boolean): number;
|
|
2
2
|
export declare function clamp01(val: number): number;
|
|
3
3
|
export declare function contains(val: number, from: number, to: number): boolean;
|
|
4
|
-
export declare function getIntersection(
|
|
4
|
+
export declare function getIntersection(start1: number, end1: number, start2: number, end2: number): false | {
|
|
5
5
|
ranges: number[][];
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
intersection: {
|
|
7
|
+
start: number;
|
|
8
|
+
end: number;
|
|
9
9
|
};
|
|
10
10
|
};
|
|
11
11
|
export declare function roundNumber(val: number, signs?: number, mode?: 'floor' | 'ceil'): number;
|
package/math/calc.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calc.d.ts","sourceRoot":"","sources":["../../src/math/calc.ts"],"names":[],"mappings":"AACA,wBAAgB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,GAAG,SAAS,GAAG,IAAgB,EAAE,GAAG,GAAE,MAAM,GAAG,SAAS,GAAG,IAAgB,EAAE,KAAK,UAAQ,UAUvI;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,UAElC;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,WAI7D;AAED,wBAAgB,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"calc.d.ts","sourceRoot":"","sources":["../../src/math/calc.ts"],"names":[],"mappings":"AACA,wBAAgB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,GAAG,SAAS,GAAG,IAAgB,EAAE,GAAG,GAAE,MAAM,GAAG,SAAS,GAAG,IAAgB,EAAE,KAAK,UAAQ,UAUvI;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,UAElC;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,WAI7D;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG;IAAE,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IAAC,YAAY,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAC,CAAA;CAAE,CAoBvK;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,SAAI,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,UAS1E;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,MAAM,CAAC,GAAG,GAAE,MAAU,EAAE,GAAG,GAAE,MAAU,EAAE,KAAK,UAAO,UAIpE;AAED,wBAAgB,eAAe,CAAC,MAAM,SAAK,UAU1C"}
|
package/math/calc.js
CHANGED
|
@@ -21,9 +21,9 @@ function contains(val, from, to) {
|
|
|
21
21
|
return val >= s && val <= e;
|
|
22
22
|
}
|
|
23
23
|
exports.contains = contains;
|
|
24
|
-
function getIntersection(
|
|
25
|
-
const v = [
|
|
26
|
-
const r = [
|
|
24
|
+
function getIntersection(start1, end1, start2, end2) {
|
|
25
|
+
const v = [start1, end1].sort();
|
|
26
|
+
const r = [start2, end2].sort();
|
|
27
27
|
const res = (v[0] >= r[0] && v[0] <= r[1])
|
|
28
28
|
|| (v[1] >= r[0] && v[1] <= r[1])
|
|
29
29
|
|| (r[0] >= v[0] && r[0] <= v[1])
|
|
@@ -33,9 +33,9 @@ function getIntersection(v1, v2, r1, r2) {
|
|
|
33
33
|
}
|
|
34
34
|
return {
|
|
35
35
|
ranges: [v, r],
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
36
|
+
intersection: {
|
|
37
|
+
start: Math.min(v[0], r[0]),
|
|
38
|
+
end: Math.max(v[1], r[1]),
|
|
39
39
|
},
|
|
40
40
|
};
|
|
41
41
|
}
|
package/math/calc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calc.js","sourceRoot":"","sources":["../../src/math/calc.ts"],"names":[],"mappings":";;;AACA,SAAgB,KAAK,CAAC,GAAW,EAAE,MAAiC,SAAS,EAAE,MAAiC,SAAS,EAAE,KAAK,GAAG,KAAK;IACpI,IAAI,GAAG,IAAI,IAAI,IAAI,GAAG,GAAG,GAAG,EAAE,CAAC;QAC3B,OAAO,CAAC,GAAG,IAAI,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAC9C,CAAC;IAED,IAAI,GAAG,IAAI,IAAI,IAAI,GAAG,GAAG,GAAG,EAAE,CAAC;QAC3B,OAAO,CAAC,GAAG,IAAI,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAC9C,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAVD,sBAUC;AAED,SAAgB,OAAO,CAAC,GAAW;IAC/B,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;AACnC,CAAC;AAFD,0BAEC;AAED,SAAgB,QAAQ,CAAC,GAAW,EAAE,IAAY,EAAE,EAAU;IAC1D,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC7B,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC7B,OAAO,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;AAChC,CAAC;AAJD,4BAIC;AAED,SAAgB,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"calc.js","sourceRoot":"","sources":["../../src/math/calc.ts"],"names":[],"mappings":";;;AACA,SAAgB,KAAK,CAAC,GAAW,EAAE,MAAiC,SAAS,EAAE,MAAiC,SAAS,EAAE,KAAK,GAAG,KAAK;IACpI,IAAI,GAAG,IAAI,IAAI,IAAI,GAAG,GAAG,GAAG,EAAE,CAAC;QAC3B,OAAO,CAAC,GAAG,IAAI,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAC9C,CAAC;IAED,IAAI,GAAG,IAAI,IAAI,IAAI,GAAG,GAAG,GAAG,EAAE,CAAC;QAC3B,OAAO,CAAC,GAAG,IAAI,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAC9C,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAVD,sBAUC;AAED,SAAgB,OAAO,CAAC,GAAW;IAC/B,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;AACnC,CAAC;AAFD,0BAEC;AAED,SAAgB,QAAQ,CAAC,GAAW,EAAE,IAAY,EAAE,EAAU;IAC1D,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC7B,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC7B,OAAO,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;AAChC,CAAC;AAJD,4BAIC;AAED,SAAgB,eAAe,CAAC,MAAc,EAAE,IAAY,EAAE,MAAc,EAAE,IAAY;IACtF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;IAChC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;IAEhC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;WACnC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;WAC9B,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;WAC9B,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEtC,IAAI,CAAC,GAAG,EAAE,CAAC;QACP,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,OAAO;QACH,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACd,YAAY,EAAE;YACV,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3B,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SAC5B;KACJ,CAAC;AACN,CAAC;AApBD,0CAoBC;AAED,SAAgB,WAAW,CAAC,GAAW,EAAE,KAAK,GAAG,CAAC,EAAE,IAAuB;IACvE,MAAM,CAAC,GAAG,EAAE,IAAI,KAAK,CAAC;IACtB,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACnC,QAAQ,IAAI,EAAE,CAAC;QACX,KAAK,OAAO;YAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAAC,MAAM;QACvC,KAAK,MAAM;YAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAAC,MAAM;QACrC;YAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAAC,MAAM;IACtC,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,CAAC;AACjB,CAAC;AATD,kCASC;AAED,SAAgB,SAAS,CAAC,GAAW;IACjC,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;AACnC,CAAC;AAFD,8BAEC;AAED,SAAgB,MAAM,CAAC,MAAc,CAAC,EAAE,MAAc,CAAC,EAAE,KAAK,GAAG,IAAI;IACjE,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;IACxB,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;IAClC,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACzC,CAAC;AAJD,wBAIC;AAED,SAAgB,eAAe,CAAC,MAAM,GAAG,EAAE;IACvC,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,CAAC;IAEtE,6DAA6D;IAC7D,IAAI,MAAM,CAAC,MAAM,GAAG,aAAa,EAAE,CAAC;QAChC,OAAO,MAAM,GAAG,IAAI,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAChF,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAVD,0CAUC"}
|