@zajno/common 2.2.7 → 2.2.9
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/README.md +6 -6
- package/dates/convert.d.ts +3 -2
- package/dates/convert.d.ts.map +1 -1
- package/dates/convert.js +14 -11
- package/dates/convert.js.map +1 -1
- package/dates/datex.d.ts +4 -1
- package/dates/datex.d.ts.map +1 -1
- package/dates/datex.js +41 -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 +5 -3
- package/dates/shift.d.ts.map +1 -1
- package/dates/shift.js +13 -8
- package/dates/shift.js.map +1 -1
- package/dates/types.d.ts.map +1 -1
- package/dates/types.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 +5 -4
- package/structures/promiseCache.d.ts.map +1 -1
- package/structures/promiseCache.js +0 -1
- package/structures/promiseCache.js.map +1 -1
package/README.md
CHANGED
|
@@ -25,10 +25,10 @@ The source code is written in TypeScript, and intended to be used in TS project,
|
|
|
25
25
|
|
|
26
26
|
It can be used a git submodule if you're brave enough, but it's possible to use it as npm package (kinda) as well. In your project:
|
|
27
27
|
|
|
28
|
-
1. Install from NPM
|
|
28
|
+
1. Install from NPM:
|
|
29
29
|
|
|
30
30
|
```
|
|
31
|
-
|
|
31
|
+
npm i @zajno/common
|
|
32
32
|
```
|
|
33
33
|
|
|
34
34
|
[`tslib`](https://www.npmjs.com/package/tslib) is the only peer dependency.
|
|
@@ -52,12 +52,12 @@ If you plan to update the sources while using it in your project, we'd recommend
|
|
|
52
52
|
The flow will look like the following. [1] – operations made on this project, [2] – operations made on dependant project.
|
|
53
53
|
|
|
54
54
|
1. install `yalc` globally
|
|
55
|
-
2. `[1]` fork (if you're outside Zajno) and clone this project, do `
|
|
55
|
+
2. `[1]` fork (if you're outside Zajno) and clone this project, do `npm i`
|
|
56
56
|
3. `[1]` run `yalc publish --private`
|
|
57
|
-
4. `[2]` run `yalc add @zajno/common &&
|
|
57
|
+
4. `[2]` run `yalc add @zajno/common && npm i`
|
|
58
58
|
5. `[1]` make changes in local copy, run tests etc.
|
|
59
|
-
6. `[1]` run some magic: `
|
|
59
|
+
6. `[1]` run some magic: `npm run push:local` – this should deliver your updated copy to local project(s) [2]
|
|
60
60
|
7. `[2]` notice the changes in your project, repeat 5-7 until you're done
|
|
61
61
|
8. `[2]` to cleanup, run `yalc remove @zajno/common` or just `yalc remove --all`
|
|
62
62
|
9. `[1]` push your changes after making sure it's OK, we'd say thank you for a PR!
|
|
63
|
-
9. `[2]` re-add the package into your project or specify tag/commit (e.g. `
|
|
63
|
+
9. `[2]` re-add the package into your project or specify tag/commit (e.g. `npm upgrade @zajno/common`)
|
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,CAoCtH;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,27 @@ 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
|
+
// week is 1-based!
|
|
58
|
+
res.week = Math.floor(days / 7) + 1;
|
|
59
|
+
days = days % 7;
|
|
60
|
+
}
|
|
56
61
|
if (grans.includes('day')) {
|
|
62
|
+
res.day = Math.trunc(days);
|
|
57
63
|
hrs = hrs % 24;
|
|
58
|
-
res.day = days;
|
|
59
64
|
}
|
|
60
65
|
if (grans.includes('hour')) {
|
|
66
|
+
res.hour = Math.trunc(hrs);
|
|
61
67
|
mins = mins % 60;
|
|
62
|
-
res.hour = hrs;
|
|
63
68
|
}
|
|
64
69
|
if (grans.includes('minute')) {
|
|
70
|
+
res.minute = Math.trunc(mins);
|
|
65
71
|
secs = secs % 60;
|
|
66
|
-
res.minute = mins;
|
|
67
72
|
}
|
|
68
73
|
if (grans.includes('second')) {
|
|
69
74
|
res.second = secs;
|
|
@@ -74,10 +79,8 @@ exports.decomposeMs = decomposeMs;
|
|
|
74
79
|
function decomposeDate(d, local, ...grans) {
|
|
75
80
|
const res = {};
|
|
76
81
|
grans.forEach(g => {
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
res[g] = datex_1.DateX.get(d, g, local) + diff;
|
|
80
|
-
}
|
|
82
|
+
const diff = g === 'month' ? 1 : 0;
|
|
83
|
+
res[g] = datex_1.DateX.get(d, g, local) + diff;
|
|
81
84
|
});
|
|
82
85
|
return res;
|
|
83
86
|
}
|
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
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import { Granularity } from './types';
|
|
2
2
|
export declare namespace DateX {
|
|
3
|
-
|
|
3
|
+
type DateGranularity = Granularity | 'weekDay';
|
|
4
|
+
function get(d: Date, g: DateGranularity, local: boolean): any;
|
|
4
5
|
function set(d: Date, g: 'year', local: boolean, year: number, month?: number, date?: number): number;
|
|
5
6
|
function set(d: Date, g: 'month', local: boolean, month: number, date?: number): number;
|
|
7
|
+
function set(d: Date, g: 'week', local: boolean, week: number): number;
|
|
6
8
|
function set(d: Date, g: 'day', local: boolean, date: number): number;
|
|
9
|
+
function set(d: Date, g: 'weekDay', local: boolean, weekDay: number): number;
|
|
7
10
|
function set(d: Date, g: 'hour', local: boolean, hours: number, min?: number, sec?: number, ms?: number): number;
|
|
8
11
|
function set(d: Date, g: 'minute', local: boolean, min: number, sec?: number, ms?: number): number;
|
|
9
12
|
function set(d: Date, g: 'second', local: boolean, 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;IAEnB,KAAY,eAAe,GAAG,WAAW,GAAG,SAAS,CAAC;IAEtD,SAAgB,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,OAa9D;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,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACpF,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;CA2EtF"}
|
package/dates/datex.js
CHANGED
|
@@ -1,14 +1,17 @@
|
|
|
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();
|
|
14
|
+
case 'weekDay': return local ? d.getDay() : d.getUTCDay();
|
|
12
15
|
case 'hour': return local ? d.getHours() : d.getUTCHours();
|
|
13
16
|
case 'minute': return local ? d.getMinutes() : d.getUTCMinutes();
|
|
14
17
|
case 'second': return local ? d.getSeconds() : d.getUTCSeconds();
|
|
@@ -18,13 +21,17 @@ var DateX;
|
|
|
18
21
|
}
|
|
19
22
|
DateX.get = get;
|
|
20
23
|
function set(d, g, local, ...v) {
|
|
21
|
-
|
|
24
|
+
if (g === 'week') {
|
|
25
|
+
return setWeek(d, local, v[0]);
|
|
26
|
+
}
|
|
27
|
+
if (g === 'weekDay') {
|
|
28
|
+
return (0, shift_1.setDayOfWeek)(d, v[0], null, local);
|
|
29
|
+
}
|
|
22
30
|
/* eslint-disable @typescript-eslint/unbound-method -- it's clearly defined as a function with `this: Date` */
|
|
23
31
|
const fn = (() => {
|
|
24
32
|
switch (g) {
|
|
25
33
|
case 'year': return local ? d.setFullYear : d.setUTCFullYear;
|
|
26
34
|
case 'month': return local ? d.setMonth : d.setUTCMonth;
|
|
27
|
-
case 'week': throw new Error('Not supported');
|
|
28
35
|
case 'day': return local ? d.setDate : d.setUTCDate;
|
|
29
36
|
case 'hour': return local ? d.setHours : d.setUTCHours;
|
|
30
37
|
case 'minute': return local ? d.setMinutes : d.setUTCMinutes;
|
|
@@ -37,5 +44,36 @@ var DateX;
|
|
|
37
44
|
return fn ? fn.call(d, ...v) : d.getTime();
|
|
38
45
|
}
|
|
39
46
|
DateX.set = set;
|
|
47
|
+
function getWeek(d, local) {
|
|
48
|
+
const year = get(d, 'year', local);
|
|
49
|
+
const firstDay = new Date(d);
|
|
50
|
+
set(firstDay, 'year', local, year, 0, 1);
|
|
51
|
+
set(firstDay, 'hour', local, 0, 0, 0, 0);
|
|
52
|
+
// we need to find diff between the target date and the first Sunday in the year
|
|
53
|
+
// next closest Sunday in the future, is considered as the start of the second week
|
|
54
|
+
const secondWeekSunday = (0, shift_1.setDayOfWeek)(firstDay, 0, true, local);
|
|
55
|
+
let offset = 1;
|
|
56
|
+
const secondWeekSundayT = secondWeekSunday.getTime();
|
|
57
|
+
if (firstDay.getTime() === secondWeekSundayT) {
|
|
58
|
+
// the target date is the first Sunday (first day in week) in the year
|
|
59
|
+
offset = 0;
|
|
60
|
+
}
|
|
61
|
+
const t = d.getTime();
|
|
62
|
+
if (t < secondWeekSundayT) {
|
|
63
|
+
// the target date is in the first week
|
|
64
|
+
return 1;
|
|
65
|
+
}
|
|
66
|
+
const diff = t - secondWeekSundayT;
|
|
67
|
+
// the returned value is 1-based
|
|
68
|
+
const { week } = (0, convert_1.decomposeMs)(diff, 'week');
|
|
69
|
+
// adding offset since counting from 2nd week
|
|
70
|
+
return week + offset;
|
|
71
|
+
}
|
|
72
|
+
function setWeek(d, local, week) {
|
|
73
|
+
const current = getWeek(d, local);
|
|
74
|
+
const res = (0, shift_1.shiftDate)(d, (week - current), 'week', local).getTime();
|
|
75
|
+
d.setTime(res);
|
|
76
|
+
return res;
|
|
77
|
+
}
|
|
40
78
|
})(DateX || (exports.DateX = DateX = {}));
|
|
41
79
|
//# 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 Use {@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;
|
|
@@ -8,9 +10,9 @@ export declare function isSame(d1: Date | number, d2: Date | number, g: Granular
|
|
|
8
10
|
* Allows to set day of week, symmetric to Date.getDay()
|
|
9
11
|
* @param d Date representation
|
|
10
12
|
* @param dayOfWeek 0..6 Sunday..Saturday
|
|
11
|
-
* @param future true - only forward, false - only backward, null - closest
|
|
13
|
+
* @param future true - only forward or present, false - only backward or present, null - closest
|
|
12
14
|
* @param local whether to use local time
|
|
13
15
|
* @returns Date with the same time as d, but with the updated day of week
|
|
14
16
|
*/
|
|
15
|
-
export declare function setDayOfWeek(d: Date | number, dayOfWeek: number, future?: boolean | null, local?: boolean):
|
|
17
|
+
export declare function setDayOfWeek(d: Date | number, dayOfWeek: number, future?: boolean | null, local?: boolean): any;
|
|
16
18
|
//# sourceMappingURL=shift.d.ts.map
|
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,CAmB5G;AAED,gDAAgD;AAChD,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,OAc7G"}
|
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,8 +19,11 @@ 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
|
+
if (amount === 0) {
|
|
25
|
+
return res;
|
|
26
|
+
}
|
|
24
27
|
switch (granularity) {
|
|
25
28
|
case 'month': {
|
|
26
29
|
datex_1.DateX.set(res, 'month', local, datex_1.DateX.get(res, 'month', local) + amount);
|
|
@@ -35,7 +38,9 @@ function add(date, amount, granularity, local = false) {
|
|
|
35
38
|
}
|
|
36
39
|
}
|
|
37
40
|
}
|
|
38
|
-
exports.
|
|
41
|
+
exports.shiftDate = shiftDate;
|
|
42
|
+
/** @deprecated Use {@link shiftDate} instead */
|
|
43
|
+
exports.add = shiftDate;
|
|
39
44
|
function startOf(d, g, local = false) {
|
|
40
45
|
const ms = (0, parse_1.getTime)(d);
|
|
41
46
|
switch (g) {
|
|
@@ -76,7 +81,7 @@ function endOf(d, g, local = false) {
|
|
|
76
81
|
if (g === 'millisecond') {
|
|
77
82
|
return (0, parse_1.getDate)(d);
|
|
78
83
|
}
|
|
79
|
-
const nextD =
|
|
84
|
+
const nextD = shiftDate(d, 1, g, local);
|
|
80
85
|
const nextDStart = startOf(nextD, g, local);
|
|
81
86
|
const nextDStartMs = nextDStart.getTime();
|
|
82
87
|
return new Date(nextDStartMs - 1);
|
|
@@ -92,13 +97,13 @@ exports.isSame = isSame;
|
|
|
92
97
|
* Allows to set day of week, symmetric to Date.getDay()
|
|
93
98
|
* @param d Date representation
|
|
94
99
|
* @param dayOfWeek 0..6 Sunday..Saturday
|
|
95
|
-
* @param future true - only forward, false - only backward, null - closest
|
|
100
|
+
* @param future true - only forward or present, false - only backward or present, null - closest
|
|
96
101
|
* @param local whether to use local time
|
|
97
102
|
* @returns Date with the same time as d, but with the updated day of week
|
|
98
103
|
*/
|
|
99
104
|
function setDayOfWeek(d, dayOfWeek, future = null, local = false) {
|
|
100
105
|
const res = (0, parse_1.getDate)(d);
|
|
101
|
-
const currentDayOfWeek =
|
|
106
|
+
const currentDayOfWeek = datex_1.DateX.get(res, 'weekDay', local);
|
|
102
107
|
let diff = dayOfWeek - currentDayOfWeek;
|
|
103
108
|
if (future != null) {
|
|
104
109
|
if (future && diff < 0) {
|
|
@@ -108,7 +113,7 @@ function setDayOfWeek(d, dayOfWeek, future = null, local = false) {
|
|
|
108
113
|
diff -= 7;
|
|
109
114
|
}
|
|
110
115
|
}
|
|
111
|
-
return
|
|
116
|
+
return shiftDate(res, diff, 'day', local);
|
|
112
117
|
}
|
|
113
118
|
exports.setDayOfWeek = setDayOfWeek;
|
|
114
119
|
//# 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/dates/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/dates/types.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,mBAAmB,GAAG,aAAa,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/dates/types.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,mBAAmB,GAAG,aAAa,GACzC,QAAQ,GACR,QAAQ,GACR,MAAM,GACN,KAAK,GACL,MAAM,CACX;AACD,MAAM,MAAM,WAAW,GAAG,mBAAmB,GACvC,OAAO,GACP,MAAM,CACX;AAED,yBAAiB,mBAAmB,CAAC;IACjC,SAAgB,IAAI,CAAC,CAAC,EAAE,mBAAmB,GAAG,MAAM,CAwBnD;CACJ"}
|
package/dates/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/dates/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/dates/types.ts"],"names":[],"mappings":";;;AAaA,IAAiB,mBAAmB,CA0BnC;AA1BD,WAAiB,mBAAmB;IAChC,SAAgB,IAAI,CAAC,CAAsB;QACvC,QAAQ,CAAC,EAAE,CAAC;YACR,KAAK,aAAa,CAAC,CAAC,CAAC;gBACjB,OAAO,CAAC,CAAC;YACb,CAAC;YACD,KAAK,QAAQ,CAAC,CAAC,CAAC;gBACZ,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,KAAK,QAAQ,CAAC,CAAC,CAAC;gBACZ,OAAO,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC/B,CAAC;YACD,KAAK,MAAM,CAAC,CAAC,CAAC;gBACV,OAAO,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC/B,CAAC;YACD,KAAK,KAAK,CAAC,CAAC,CAAC;gBACT,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;YAC7B,CAAC;YACD,KAAK,MAAM,CAAC,CAAC,CAAC;gBACV,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3B,CAAC;YACD,OAAO,CAAC,CAAC,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;YAC/C,CAAC;QACL,CAAC;IACL,CAAC;IAxBe,wBAAI,OAwBnB,CAAA;AACL,CAAC,EA1BgB,mBAAmB,mCAAnB,mBAAmB,QA0BnC"}
|
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":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zajno/common",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.9",
|
|
4
4
|
"description": "Zajno's re-usable utilities for JS/TS projects",
|
|
5
5
|
"private": false,
|
|
6
6
|
"repository": {
|
|
@@ -31,20 +31,21 @@
|
|
|
31
31
|
"path": "../scripts"
|
|
32
32
|
}
|
|
33
33
|
},
|
|
34
|
-
"dependencies": {},
|
|
35
34
|
"devDependencies": {
|
|
36
35
|
"@faker-js/faker": "^8.3.1",
|
|
37
|
-
"@types/node": "^
|
|
36
|
+
"@types/node": "^20.10.5",
|
|
37
|
+
"@vitest/coverage-istanbul": "^1.1.0",
|
|
38
38
|
"@zajno/eslint-config": "^3.0.1",
|
|
39
39
|
"cpy-cli": "^5.0.0",
|
|
40
40
|
"eslint": "^8.56.0",
|
|
41
41
|
"fast-check": "^3.15.0",
|
|
42
42
|
"jest-extended": "^4.0.2",
|
|
43
43
|
"rimraf": "^5.0.5",
|
|
44
|
+
"scripty": "^2.1.1",
|
|
44
45
|
"ts-node": "^10.9.2",
|
|
45
46
|
"tslib": "^2.6.2",
|
|
46
47
|
"typescript": "^5.3.3",
|
|
47
|
-
"vitest": "^1.0
|
|
48
|
+
"vitest": "^1.1.0"
|
|
48
49
|
},
|
|
49
50
|
"peerDependencies": {
|
|
50
51
|
"tslib": "^2.6.2"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promiseCache.d.ts","sourceRoot":"","sources":["../../src/structures/promiseCache.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,OAAO,EAAE,MAAM,WAAW,CAAC;AAElD,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;IAC5B,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,yBAAiB,cAAc,CAAC;IAGrB,MAAM,KAAK;;;;
|
|
1
|
+
{"version":3,"file":"promiseCache.d.ts","sourceRoot":"","sources":["../../src/structures/promiseCache.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,OAAO,EAAE,MAAM,WAAW,CAAC;AAElD,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;IAC5B,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,yBAAiB,cAAc,CAAC;IAGrB,MAAM,KAAK;;;;KAIc,CAAC;CACpC;AAED,qBAAa,YAAY,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM;IAa/B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;IAb/B,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC,CAAO;IAC3E,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAO;IAE/D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0C;IAEtE,OAAO,CAAC,MAAM,CAA0C;IAExD,OAAO,CAAC,OAAO,CAAwB;IACvC,SAAS,CAAC,UAAU,SAAK;gBAGJ,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EAC9B,UAAU,CAAC,iCAAgC,CAAC,KAAK,MAAM,aAAA,EACvD,SAAS,CAAC,kCAAiC,MAAM,KAAK,CAAC,aAAA;IAK5E,IAAW,SAAS,WAA8B;IAElD,OAAO,CAAC,GAAG;IAgBX,SAAS,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IASrD,WAAW,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC;IAK/C,WAAW,CAAC,GAAG,EAAE,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC;IAUtC,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO;IAKzB,UAAU,CAAC,EAAE,EAAE,CAAC,EAAE,aAAa,UAAO,GAAG,CAAC,GAAG,IAAI,GAAG,SAAS;IAU7D,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAuB7B,SAAS,CAAC,aAAa,OAAc,CAAC,OAAO,MAAM,uBAajD;IAEF,UAAU,CAAC,EAAE,EAAE,CAAC;IAKhB,mBAAmB,CAAC,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI;IAK1C,MAAM,CAAC,EAAE,EAAE,CAAC;IAKZ,IAAI;IAIJ,UAAU;IAQV,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,IAAI,EAAE,OAAO,GAAG,SAAS;IAMlH,gBAAgB;IAChB,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO;IAIhD,gBAAgB;IAChB,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAI5D,gBAAgB;IAChB,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM;IAIpC,gBAAgB;IAChB,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI;IAIrC,gBAAgB;IAChB,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI;IAIhD,gBAAgB;IAChB,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM;cAMrB,eAAe,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;CAsB5D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promiseCache.js","sourceRoot":"","sources":["../../src/structures/promiseCache.ts"],"names":[],"mappings":";;;AAAA,oDAA0D;AAC1D,sCAAkD;AAQlD,IAAiB,cAAc,
|
|
1
|
+
{"version":3,"file":"promiseCache.js","sourceRoot":"","sources":["../../src/structures/promiseCache.ts"],"names":[],"mappings":"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"}
|