@dereekb/date 4.1.0 → 5.1.0
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/CHANGELOG.md +22 -0
- package/LICENSE +21 -0
- package/package.json +2 -3
- package/src/lib/date/date.calendar.js.map +1 -1
- package/src/lib/date/date.d.ts +6 -0
- package/src/lib/date/date.duration.d.ts +2 -2
- package/src/lib/date/date.duration.js.map +1 -1
- package/src/lib/date/date.format.d.ts +2 -2
- package/src/lib/date/date.format.js +1 -1
- package/src/lib/date/date.format.js.map +1 -1
- package/src/lib/date/date.hashset.js.map +1 -1
- package/src/lib/date/date.js +24 -11
- package/src/lib/date/date.js.map +1 -1
- package/src/lib/date/date.range.js +2 -2
- package/src/lib/date/date.range.js.map +1 -1
- package/src/lib/date/date.round.js +2 -1
- package/src/lib/date/date.round.js.map +1 -1
- package/src/lib/date/date.sort.d.ts +1 -1
- package/src/lib/date/date.sort.js +1 -1
- package/src/lib/date/date.sort.js.map +1 -1
- package/src/lib/date/date.time.js +16 -16
- package/src/lib/date/date.time.js.map +1 -1
- package/src/lib/date/date.time.limit.d.ts +1 -1
- package/src/lib/date/date.time.limit.js.map +1 -1
- package/src/lib/date/date.time.minute.js.map +1 -1
- package/src/lib/date/date.timezone.d.ts +4 -1
- package/src/lib/date/date.timezone.js +11 -9
- package/src/lib/date/date.timezone.js.map +1 -1
- package/src/lib/date/date.unix.d.ts +3 -2
- package/src/lib/date/date.unix.js +2 -2
- package/src/lib/date/date.unix.js.map +1 -1
- package/src/lib/expires/expires.rxjs.d.ts +5 -5
- package/src/lib/expires/expires.rxjs.js +6 -6
- package/src/lib/expires/expires.rxjs.js.map +1 -1
- package/src/lib/query/query.builder.d.ts +2 -2
- package/src/lib/query/query.builder.js +4 -4
- package/src/lib/query/query.builder.js.map +1 -1
- package/src/lib/query/query.builder.mongo.js +5 -5
- package/src/lib/query/query.builder.mongo.js.map +1 -1
- package/src/lib/query/query.filter.d.ts +2 -2
- package/src/lib/rrule/date.recurrence.js.map +1 -1
- package/src/lib/rrule/date.rrule.extension.d.ts +5 -4
- package/src/lib/rrule/date.rrule.extension.js +6 -2
- package/src/lib/rrule/date.rrule.extension.js.map +1 -1
- package/src/lib/rrule/date.rrule.js +5 -5
- package/src/lib/rrule/date.rrule.js.map +1 -1
- package/src/lib/rrule/date.rrule.parse.js +6 -6
- package/src/lib/rrule/date.rrule.parse.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,28 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
# [5.1.0](https://github.com/dereekb/dbx-components/compare/v5.0.1-dev...v5.1.0) (2022-05-27)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
## [5.0.1](https://github.com/dereekb/dbx-components/compare/v5.0.0-dev...v5.0.1) (2022-05-26)
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
# [5.0.0](https://github.com/dereekb/dbx-components/compare/v4.1.0-dev...v5.0.0) (2022-05-25)
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
### Code Refactoring
|
|
17
|
+
|
|
18
|
+
* refactored @dereekb/firebase snapshot field ([c88d278](https://github.com/dereekb/dbx-components/commit/c88d2780d66f965a41ae299e013109f6860e9496))
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
### BREAKING CHANGES
|
|
22
|
+
|
|
23
|
+
* refactored @dereekb/firebase SnapshotConverterFunction and related components and @dereekb/util model conversion components to have better type safety and inference
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
5
27
|
# [4.1.0](https://github.com/dereekb/dbx-components/compare/v4.0.1-dev...v4.1.0) (2022-05-17)
|
|
6
28
|
|
|
7
29
|
|
package/LICENSE
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2022 Hapier Creative LLC.
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
package/package.json
CHANGED
|
@@ -1,15 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dereekb/date",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "5.1.0",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"main": "./src/index.js",
|
|
6
6
|
"typings": "./src/index.d.ts",
|
|
7
7
|
"dependencies": {},
|
|
8
8
|
"peerDependencies": {
|
|
9
|
-
"@dereekb/util": "
|
|
9
|
+
"@dereekb/util": "5.1.0",
|
|
10
10
|
"make-error": "^1.3.0",
|
|
11
11
|
"extra-set": "^2.2.11",
|
|
12
|
-
"change-case": "^4.1.2",
|
|
13
12
|
"class-transformer": "^0.5.1",
|
|
14
13
|
"date-fns": "^2.28.0",
|
|
15
14
|
"class-validator": "^0.13.2",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.calendar.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.calendar.ts"],"names":[],"mappings":";;;;AACA,yDAA2C;AAC3C,iCAAuC;AACvC,mDAAmD;AACnD,+CAAiD;AAEjD;;GAEG;AACH,IAAY,gBASX;AATD,WAAY,gBAAgB;IAC1B;;OAEG;IACH,iCAAa,CAAA;IACb;;OAEG;IACH,iCAAa,CAAA;AACf,CAAC,EATW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAS3B;AAED;;GAEG;AACH,MAAa,YAAa,SAAQ,gCAAgB;
|
|
1
|
+
{"version":3,"file":"date.calendar.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.calendar.ts"],"names":[],"mappings":";;;;AACA,yDAA2C;AAC3C,iCAAuC;AACvC,mDAAmD;AACnD,+CAAiD;AAEjD;;GAEG;AACH,IAAY,gBASX;AATD,WAAY,gBAAgB;IAC1B;;OAEG;IACH,iCAAa,CAAA;IACb;;OAEG;IACH,iCAAa,CAAA;AACf,CAAC,EATW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAS3B;AAED;;GAEG;AACH,MAAa,YAAa,SAAQ,gCAAgB;IAOhD,YAAY,QAAsB;QAChC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAPlB;;WAEG;QAEH,SAAI,GAAqB,gBAAgB,CAAC,IAAI,CAAC;QAI7C,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC5B,CAAC;CACF;AANC;IADC,IAAA,0BAAM,GAAE;;0CACsC;AALjD,oCAWC;AAED,MAAa,mBAAmB;IAC9B,MAAM,CAAC,kBAAkB,CAAC,GAAqB,EAAE,IAAa;QAC5D,OAAO;YACL,IAAI,EAAE,gBAAgB,CAAC,IAAI;YAC3B,QAAQ,EAAE,IAAA,8BAAgB,EAAC,GAAG,CAAC;YAC/B,QAAQ,EAAE,IAAA,oBAAa,EAAC,IAAI,CAAC;SAC9B,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,+BAA+B,CAAC,gBAAkC;QACvE,uBACE,IAAI,EAAE,gBAAgB,CAAC,IAAI,IACxB,gBAAgB,EACnB;IACJ,CAAC;CACF;AAfD,kDAeC"}
|
package/src/lib/date/date.d.ts
CHANGED
|
@@ -8,6 +8,12 @@ export declare function daysToMinutes(days?: number): Minutes;
|
|
|
8
8
|
export declare function maxFutureDate(): Date;
|
|
9
9
|
export declare function isMaxFutureDate(date: Date): boolean;
|
|
10
10
|
export declare function latestMinute(time?: Date): Date;
|
|
11
|
+
/**
|
|
12
|
+
* Returns an ISO8601DateString for now.
|
|
13
|
+
*
|
|
14
|
+
* @returns
|
|
15
|
+
*/
|
|
16
|
+
export declare function nowISODateString(): ISO8601DateString;
|
|
11
17
|
export declare function toISODateString(input: DateOrDateString): ISO8601DateString;
|
|
12
18
|
export declare function guessCurrentTimezone(): string;
|
|
13
19
|
/**
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Minutes } from
|
|
2
|
-
import { DateRange, DateRangeState } from
|
|
1
|
+
import { Minutes } from '@dereekb/util';
|
|
2
|
+
import { DateRange, DateRangeState } from './date.range';
|
|
3
3
|
export declare class DateDurationSpan {
|
|
4
4
|
startsAt: Date;
|
|
5
5
|
duration: Minutes;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.duration.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.duration.ts"],"names":[],"mappings":";;;;AACA,yDAAiD;AACjD,uCAAsC;AACtC,6CAAyE;AAEzE,MAAa,gBAAgB;
|
|
1
|
+
{"version":3,"file":"date.duration.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.duration.ts"],"names":[],"mappings":";;;;AACA,yDAAiD;AACjD,uCAAsC;AACtC,6CAAyE;AAEzE,MAAa,gBAAgB;IAQ3B,YAAY,QAA0B;QACpC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;IACpC,CAAC;CACF;AATC;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC;sCACP,IAAI;kDAAC;AAGf;IADC,IAAA,0BAAM,GAAE;;kDACS;AANpB,4CAYC;AAED,SAAgB,uBAAuB,CAAC,IAAsB;IAC5D,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,QAAQ;QACpB,GAAG,EAAE,IAAA,qBAAU,EAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC;KAC9C,CAAC;AACJ,CAAC;AALD,0DAKC;AAED,SAAgB,0BAA0B,CAAC,IAAsB;IAC/D,OAAO,IAAA,2BAAc,EAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC;AACvD,CAAC;AAFD,gEAEC"}
|
|
@@ -25,7 +25,7 @@ function formatToTimeAndDurationString(start, end) {
|
|
|
25
25
|
subtitle = `(${(0, date_fns_1.formatDistance)(end, start, { includeSeconds: false })})`;
|
|
26
26
|
}
|
|
27
27
|
else {
|
|
28
|
-
subtitle = `${
|
|
28
|
+
subtitle = `${minutes ? `(${minutes} Minutes)` : ''}`;
|
|
29
29
|
}
|
|
30
30
|
return `${formatToTimeString(start)} ${subtitle}`;
|
|
31
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.format.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.format.ts"],"names":[],"mappings":";;;AACA,uCAA+G;AAC/G,6CAAyE;AAEzE;;GAEG;
|
|
1
|
+
{"version":3,"file":"date.format.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.format.ts"],"names":[],"mappings":";;;AACA,uCAA+G;AAC/G,6CAAyE;AAEzE;;GAEG;AACH,SAAgB,uBAAuB,CAAC,KAAW,EAAE,GAAS;IAC5D,OAAO,GAAG,kBAAkB,CAAC,KAAK,CAAC,MAAM,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;AACrE,CAAC;AAFD,0DAEC;AAED,SAAgB,kBAAkB,CAAC,IAAU;IAC3C,OAAO,IAAA,iBAAM,EAAC,IAAI,EAAE,aAAa,CAAC,CAAC;AACrC,CAAC;AAFD,gDAEC;AAED,SAAgB,kBAAkB,CAAC,IAAU;IAC3C,OAAO,IAAA,iBAAM,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAChC,CAAC;AAFD,gDAEC;AAED,SAAgB,6BAA6B,CAAC,KAAW,EAAE,GAAS;IAClE,MAAM,OAAO,GAAG,IAAA,8BAAmB,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAChD,IAAI,QAAQ,CAAC;IAEb,IAAI,OAAO,GAAG,GAAG,EAAE;QACjB,QAAQ,GAAG,IAAI,IAAA,yBAAc,EAAC,GAAG,EAAE,KAAK,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC;KACzE;SAAM;QACL,QAAQ,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;KACvD;IAED,OAAO,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,QAAQ,EAAE,CAAC;AACpD,CAAC;AAXD,sEAWC;AAED,SAAgB,gCAAgC,CAAC,EAAE,KAAK,EAAE,GAAG,EAAa;IACxE,MAAM,KAAK,GAAG,IAAA,2BAAc,EAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;IAC7C,IAAI,YAAY,CAAC;IAEjB,QAAQ,KAAK,EAAE;QACb,KAAK,2BAAc,CAAC,IAAI;YACtB,YAAY,GAAG,SAAS,IAAA,8BAAmB,EAAC,GAAG,EAAE;gBAC/C,SAAS,EAAE,IAAI;aAChB,CAAC,EAAE,CAAC;YACL,MAAM;QACR,KAAK,2BAAc,CAAC,OAAO;YACzB,YAAY,GAAG,WAAW,IAAA,8BAAmB,EAAC,KAAK,EAAE;gBACnD,SAAS,EAAE,IAAI;aAChB,CAAC,EAAE,CAAC;YACL,MAAM;QACR,KAAK,2BAAc,CAAC,MAAM;YACxB,YAAY,GAAG,YAAY,IAAA,8BAAmB,EAAC,KAAK,EAAE;gBACpD,SAAS,EAAE,IAAI;aAChB,CAAC,EAAE,CAAC;YACL,MAAM;KACT;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAvBD,4EAuBC;AAED,SAAgB,gBAAgB,CAAC,UAA4B;IAC3D,OAAO,IAAA,qBAAU,EAAC,IAAA,gBAAK,EAAC,UAAU,EAAE,YAAY,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;AACjE,CAAC;AAFD,4CAEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.hashset.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.hashset.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AAExC,MAAa,OAAQ,SAAQ,cAAqB;
|
|
1
|
+
{"version":3,"file":"date.hashset.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.hashset.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AAExC,MAAa,OAAQ,SAAQ,cAAqB;IAChD,YAAY,MAAe;QACzB,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC;CACF;AAJD,0BAIC"}
|
package/src/lib/date/date.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.roundDownToMinute = exports.copyHoursAndMinutesToToday = exports.copyHoursAndMinutesFromDateToToday = exports.takeNextUpcomingTime = exports.utcDayForDate = exports.isAfter = exports.latestDate = exports.toJsDate = exports.guessCurrentTimezone = exports.toISODateString = exports.latestMinute = exports.isMaxFutureDate = exports.maxFutureDate = exports.daysToMinutes = exports.minutesToMs = exports.hoursToMs = exports.msToSeconds = exports.msToMinutes = exports.MAX_FUTURE_DATE = void 0;
|
|
3
|
+
exports.roundDownToMinute = exports.copyHoursAndMinutesToToday = exports.copyHoursAndMinutesFromDateToToday = exports.takeNextUpcomingTime = exports.utcDayForDate = exports.isAfter = exports.latestDate = exports.toJsDate = exports.guessCurrentTimezone = exports.toISODateString = exports.nowISODateString = exports.latestMinute = exports.isMaxFutureDate = exports.maxFutureDate = exports.daysToMinutes = exports.minutesToMs = exports.hoursToMs = exports.msToSeconds = exports.msToMinutes = exports.MAX_FUTURE_DATE = void 0;
|
|
4
4
|
const date_fns_1 = require("date-fns");
|
|
5
5
|
const util_1 = require("@dereekb/util");
|
|
6
6
|
exports.MAX_FUTURE_DATE = new Date(Date.UTC(9999, 0));
|
|
@@ -32,10 +32,19 @@ function isMaxFutureDate(date) {
|
|
|
32
32
|
return exports.MAX_FUTURE_DATE.getTime() === date.getTime();
|
|
33
33
|
}
|
|
34
34
|
exports.isMaxFutureDate = isMaxFutureDate;
|
|
35
|
-
function latestMinute(time = new Date) {
|
|
35
|
+
function latestMinute(time = new Date()) {
|
|
36
36
|
return (0, date_fns_1.startOfMinute)(time);
|
|
37
37
|
}
|
|
38
38
|
exports.latestMinute = latestMinute;
|
|
39
|
+
/**
|
|
40
|
+
* Returns an ISO8601DateString for now.
|
|
41
|
+
*
|
|
42
|
+
* @returns
|
|
43
|
+
*/
|
|
44
|
+
function nowISODateString() {
|
|
45
|
+
return toISODateString(new Date());
|
|
46
|
+
}
|
|
47
|
+
exports.nowISODateString = nowISODateString;
|
|
39
48
|
function toISODateString(input) {
|
|
40
49
|
const date = toJsDate(input);
|
|
41
50
|
if (!(0, date_fns_1.isValid)(date)) {
|
|
@@ -56,16 +65,16 @@ exports.guessCurrentTimezone = guessCurrentTimezone;
|
|
|
56
65
|
* @returns
|
|
57
66
|
*/
|
|
58
67
|
function toJsDate(input) {
|
|
59
|
-
return (
|
|
68
|
+
return (0, date_fns_1.isDate)(input) ? input : (0, date_fns_1.parseISO)(input);
|
|
60
69
|
}
|
|
61
70
|
exports.toJsDate = toJsDate;
|
|
62
71
|
function latestDate(dates, defaultDate = undefined) {
|
|
63
72
|
const filtered = (0, util_1.filterMaybeValues)(dates);
|
|
64
|
-
return
|
|
73
|
+
return filtered.length > 0 ? (0, date_fns_1.max)(filtered) : defaultDate;
|
|
65
74
|
}
|
|
66
75
|
exports.latestDate = latestDate;
|
|
67
76
|
function isAfter(a, b, defaultValue = undefined) {
|
|
68
|
-
return
|
|
77
|
+
return a && b ? (0, date_fns_1.isAfter)(a, b) : defaultValue;
|
|
69
78
|
}
|
|
70
79
|
exports.isAfter = isAfter;
|
|
71
80
|
// MARK: Unix Date/Time
|
|
@@ -110,12 +119,16 @@ exports.copyHoursAndMinutesFromDateToToday = copyHoursAndMinutesFromDateToToday;
|
|
|
110
119
|
* Also rounds the seconds and milliseconds.
|
|
111
120
|
*/
|
|
112
121
|
function copyHoursAndMinutesToToday({ hours, minutes, removeSeconds = true }) {
|
|
113
|
-
return (0, date_fns_1.set)(new Date(), Object.assign(Object.assign({ hours }, (minutes != null
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
122
|
+
return (0, date_fns_1.set)(new Date(), Object.assign(Object.assign({ hours }, (minutes != null
|
|
123
|
+
? {
|
|
124
|
+
minutes
|
|
125
|
+
}
|
|
126
|
+
: undefined)), (removeSeconds
|
|
127
|
+
? {
|
|
128
|
+
seconds: 0,
|
|
129
|
+
milliseconds: 0
|
|
130
|
+
}
|
|
131
|
+
: undefined)));
|
|
119
132
|
}
|
|
120
133
|
exports.copyHoursAndMinutesToToday = copyHoursAndMinutesToToday;
|
|
121
134
|
/**
|
package/src/lib/date/date.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"date.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,7 +62,6 @@ var DateRangeType;
|
|
|
62
62
|
*/
|
|
63
63
|
DateRangeType["WITHIN_MONTH"] = "within_month";
|
|
64
64
|
})(DateRangeType = exports.DateRangeType || (exports.DateRangeType = {}));
|
|
65
|
-
;
|
|
66
65
|
var DateRangeState;
|
|
67
66
|
(function (DateRangeState) {
|
|
68
67
|
/**
|
|
@@ -201,7 +200,8 @@ function makeDateRange({ type, date = new Date(), distance }, roundToMinute = fa
|
|
|
201
200
|
break;
|
|
202
201
|
}
|
|
203
202
|
return {
|
|
204
|
-
start,
|
|
203
|
+
start,
|
|
204
|
+
end
|
|
205
205
|
};
|
|
206
206
|
}
|
|
207
207
|
exports.makeDateRange = makeDateRange;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.range.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.range.ts"],"names":[],"mappings":";;;;AAAA,yDAAyC;AACzC,qDAAuE;AACvE,uCAA4I;AAU5I,IAAY,aAuDX;AAvDD,WAAY,aAAa;IACvB;;OAEG;IACH,4BAAW,CAAA;IACX;;OAEG;IACH,8BAAa,CAAA;IACb;;OAEG;IACH,gCAAe,CAAA;IACf;;OAEG;IACH,4CAA2B,CAAA;IAC3B;;OAEG;IACH,0CAAyB,CAAA;IACzB;;OAEG;IACH,4CAA2B,CAAA;IAC3B;;OAEG;IACH,8CAA6B,CAAA;IAC7B;;OAEG;IACH,4CAA2B,CAAA;IAC3B;;OAEG;IACH,8CAA6B,CAAA;IAC7B;;;;OAIG;IACH,0CAAyB,CAAA;IACzB;;;;OAIG;IACH,4CAA2B,CAAA;IAC3B;;;;OAIG;IACH,8CAA6B,CAAA;AAC/B,CAAC,EAvDW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAuDxB;
|
|
1
|
+
{"version":3,"file":"date.range.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.range.ts"],"names":[],"mappings":";;;;AAAA,yDAAyC;AACzC,qDAAuE;AACvE,uCAA4I;AAU5I,IAAY,aAuDX;AAvDD,WAAY,aAAa;IACvB;;OAEG;IACH,4BAAW,CAAA;IACX;;OAEG;IACH,8BAAa,CAAA;IACb;;OAEG;IACH,gCAAe,CAAA;IACf;;OAEG;IACH,4CAA2B,CAAA;IAC3B;;OAEG;IACH,0CAAyB,CAAA;IACzB;;OAEG;IACH,4CAA2B,CAAA;IAC3B;;OAEG;IACH,8CAA6B,CAAA;IAC7B;;OAEG;IACH,4CAA2B,CAAA;IAC3B;;OAEG;IACH,8CAA6B,CAAA;IAC7B;;;;OAIG;IACH,0CAAyB,CAAA;IACzB;;;;OAIG;IACH,4CAA2B,CAAA;IAC3B;;;;OAIG;IACH,8CAA6B,CAAA;AAC/B,CAAC,EAvDW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAuDxB;AAED,IAAY,cAaX;AAbD,WAAY,cAAc;IACxB;;OAEG;IACH,mCAAiB,CAAA;IACjB;;OAEG;IACH,qCAAmB,CAAA;IACnB;;OAEG;IACH,+BAAa,CAAA;AACf,CAAC,EAbW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAazB;AAED;;GAEG;AACH,MAAa,eAAe;IAmB1B,YAAY,QAAyB;QAlBrC;;WAEG;QAEH,SAAI,GAAkB,aAAa,CAAC,GAAG,CAAC;QAExC;;WAEG;QAIH,SAAI,GAAS,IAAI,IAAI,EAAE,CAAC;QAOtB,IAAI,QAAQ,EAAE;YACZ,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YAC1B,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;SACnC;IACH,CAAC;CACF;AArBC;IADC,IAAA,wBAAM,EAAC,aAAa,CAAC;;6CACkB;AAQxC;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC;sCACX,IAAI;6CAAc;AAIxB;IAFC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;iDACK;AAjBpB,0CA0BC;AAED;;;;;;GAMG;AACH,SAAgB,aAAa,CAAC,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,IAAI,EAAE,EAAE,QAAQ,EAAmB,EAAE,aAAa,GAAG,KAAK;IACzG,IAAI,KAAW,CAAC;IAChB,IAAI,GAAS,CAAC;IAEd,IAAI,aAAa,EAAE;QACjB,IAAI,GAAG,IAAA,wBAAa,EAAC,IAAI,CAAC,CAAC,CAAC,2BAA2B;KACxD;IAED,QAAQ,GAAG,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,CAAC,CAAC;IAEzB,MAAM,mBAAmB,GAAG,QAAQ,GAAG,CAAC,CAAC;IAEzC,QAAQ,IAAI,EAAE;QACZ,KAAK,aAAa,CAAC,GAAG;YACpB,KAAK,GAAG,IAAA,qBAAU,EAAC,IAAI,CAAC,CAAC;YACzB,GAAG,GAAG,IAAA,mBAAQ,EAAC,IAAI,CAAC,CAAC;YACrB,MAAM;QACR,KAAK,aAAa,CAAC,IAAI;YACrB,KAAK,GAAG,IAAA,sBAAW,EAAC,IAAI,CAAC,CAAC;YAC1B,GAAG,GAAG,IAAA,oBAAS,EAAC,IAAI,CAAC,CAAC;YACtB,MAAM;QACR,KAAK,aAAa,CAAC,KAAK;YACtB,KAAK,GAAG,IAAA,uBAAY,EAAC,IAAI,CAAC,CAAC;YAC3B,GAAG,GAAG,IAAA,qBAAU,EAAC,IAAI,CAAC,CAAC;YACvB,MAAM;QACR,KAAK,aAAa,CAAC,WAAW;YAC5B,IAAI,mBAAmB,EAAE;gBACvB,KAAK,GAAG,IAAA,mBAAQ,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;gBACjC,GAAG,GAAG,IAAI,CAAC;aACZ;iBAAM;gBACL,KAAK,GAAG,IAAI,CAAC;gBACb,GAAG,GAAG,IAAA,mBAAQ,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;aAChC;YACD,MAAM;QACR,KAAK,aAAa,CAAC,UAAU;YAC3B,IAAI,mBAAmB,EAAE;gBACvB,KAAK,GAAG,IAAA,kBAAO,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;gBAChC,GAAG,GAAG,IAAI,CAAC;aACZ;iBAAM;gBACL,KAAK,GAAG,IAAI,CAAC;gBACb,GAAG,GAAG,IAAA,kBAAO,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;aAC/B;YACD,MAAM;QACR,KAAK,aAAa,CAAC,WAAW;YAC5B,IAAI,mBAAmB,EAAE;gBACvB,KAAK,GAAG,IAAA,kBAAO,EAAC,IAAI,EAAE,QAAQ,GAAG,CAAC,CAAC,CAAC;gBACpC,GAAG,GAAG,IAAI,CAAC;aACZ;iBAAM;gBACL,KAAK,GAAG,IAAI,CAAC;gBACb,GAAG,GAAG,IAAA,kBAAO,EAAC,IAAI,EAAE,QAAQ,GAAG,CAAC,CAAC,CAAC;aACnC;YACD,MAAM;QACR,KAAK,aAAa,CAAC,YAAY;YAC7B,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC9B,KAAK,GAAG,IAAA,mBAAQ,EAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC;YAClC,GAAG,GAAG,IAAA,mBAAQ,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC/B,MAAM;QACR,KAAK,aAAa,CAAC,WAAW;YAC5B,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC9B,KAAK,GAAG,IAAA,kBAAO,EAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC;YACjC,GAAG,GAAG,IAAA,kBAAO,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC9B,MAAM;QACR,KAAK,aAAa,CAAC,YAAY;YAC7B,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC9B,KAAK,GAAG,IAAA,kBAAO,EAAC,IAAI,EAAE,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;YACrC,GAAG,GAAG,IAAA,kBAAO,EAAC,IAAI,EAAE,QAAQ,GAAG,CAAC,CAAC,CAAC;YAClC,MAAM;QACR,KAAK,aAAa,CAAC,UAAU;YAC3B,KAAK,GAAG,IAAA,mBAAQ,EAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;YAC5B,GAAG,GAAG,IAAA,mBAAQ,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACzB,MAAM;QACR,KAAK,aAAa,CAAC,WAAW;YAC5B,KAAK,GAAG,IAAA,qBAAU,EAAC,IAAA,kBAAO,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YACtC,GAAG,GAAG,IAAA,mBAAQ,EAAC,IAAA,kBAAO,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACjC,MAAM;QACR,KAAK,aAAa,CAAC,YAAY;YAC7B,KAAK,GAAG,IAAA,qBAAU,EAAC,IAAA,kBAAO,EAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YACvC,GAAG,GAAG,IAAA,mBAAQ,EAAC,IAAA,kBAAO,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;YAClC,MAAM;KACT;IAED,OAAO;QACL,KAAK;QACL,GAAG;KACJ,CAAC;AACJ,CAAC;AArFD,sCAqFC;AAED;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,EAAE,KAAK,EAAE,GAAG,EAAa;IACtD,IAAI,IAAA,iBAAM,EAAC,GAAG,CAAC,EAAE;QACf,OAAO,cAAc,CAAC,IAAI,CAAC;KAC5B;SAAM,IAAI,IAAA,iBAAM,EAAC,KAAK,CAAC,EAAE;QACxB,OAAO,cAAc,CAAC,OAAO,CAAC;KAC/B;SAAM;QACL,OAAO,cAAc,CAAC,MAAM,CAAC;KAC9B;AACH,CAAC;AARD,wCAQC"}
|
|
@@ -35,7 +35,8 @@ function roundToMinuteSteps(date, step) {
|
|
|
35
35
|
const minute = (0, date_fns_1.getMinutes)(date);
|
|
36
36
|
const roundedValue = (0, util_1.roundNumberUpToStep)(minute, step);
|
|
37
37
|
if (roundedValue !== minute) {
|
|
38
|
-
if (roundedValue === 60) {
|
|
38
|
+
if (roundedValue === 60) {
|
|
39
|
+
// Round the hour up.
|
|
39
40
|
date = (0, date_fns_1.addHours)((0, date_fns_1.set)(date, { minutes: 0 }), 1);
|
|
40
41
|
}
|
|
41
42
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.round.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.round.ts"],"names":[],"mappings":";;;AAAA,wCAAoD;AACpD,uCAAqD;AAYrD,iBAAiB;AACjB,SAAgB,wBAAwB,CAAC,IAAU,EAAE,KAA4B;IAC/E,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;IAE5C,IAAI,YAAY,EAAE;QAChB,IAAI,GAAG,kBAAkB,CAAC,IAAI,EAAE,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,CAAC,CAAC,CAAC;KAC5C;IAED,OAAO,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACxC,CAAC;AARD,4DAQC;AAED,SAAgB,iBAAiB,CAAC,IAAU,EAAE,KAAoB;IAChE,MAAM,EAAE,cAAc,GAAG,KAAK,EAAE,iBAAiB,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;IAEnE,IAAI,QAAQ,GAAG,EAAE,CAAC;IAElB,IAAI,iBAAiB,EAAE;QACrB,QAAQ,mCACH,QAAQ,KACX,OAAO,EAAE,CAAC,EACV,YAAY,EAAE,CAAC,GAChB,CAAC;KACH;IAED,IAAI,cAAc,EAAE;QAClB,QAAQ,mCACH,QAAQ,KACX,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,CAAC,GACX,CAAC;KACH;IAED,OAAO,IAAA,cAAG,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAC7B,CAAC;AAtBD,8CAsBC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAAC,IAAU,EAAE,IAAY;
|
|
1
|
+
{"version":3,"file":"date.round.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.round.ts"],"names":[],"mappings":";;;AAAA,wCAAoD;AACpD,uCAAqD;AAYrD,iBAAiB;AACjB,SAAgB,wBAAwB,CAAC,IAAU,EAAE,KAA4B;IAC/E,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;IAE5C,IAAI,YAAY,EAAE;QAChB,IAAI,GAAG,kBAAkB,CAAC,IAAI,EAAE,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,CAAC,CAAC,CAAC;KAC5C;IAED,OAAO,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACxC,CAAC;AARD,4DAQC;AAED,SAAgB,iBAAiB,CAAC,IAAU,EAAE,KAAoB;IAChE,MAAM,EAAE,cAAc,GAAG,KAAK,EAAE,iBAAiB,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;IAEnE,IAAI,QAAQ,GAAG,EAAE,CAAC;IAElB,IAAI,iBAAiB,EAAE;QACrB,QAAQ,mCACH,QAAQ,KACX,OAAO,EAAE,CAAC,EACV,YAAY,EAAE,CAAC,GAChB,CAAC;KACH;IAED,IAAI,cAAc,EAAE;QAClB,QAAQ,mCACH,QAAQ,KACX,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,CAAC,GACX,CAAC;KACH;IAED,OAAO,IAAA,cAAG,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAC7B,CAAC;AAtBD,8CAsBC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAAC,IAAU,EAAE,IAAY;IACzD,uCAAuC;IACvC,IAAI,IAAI,IAAI,CAAC,EAAE;QACb,OAAO,IAAI,CAAC;KACb;IAED,MAAM,MAAM,GAAG,IAAA,qBAAU,EAAC,IAAI,CAAC,CAAC;IAChC,MAAM,YAAY,GAAG,IAAA,0BAAmB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAEvD,IAAI,YAAY,KAAK,MAAM,EAAE;QAC3B,IAAI,YAAY,KAAK,EAAE,EAAE;YACvB,qBAAqB;YACrB,IAAI,GAAG,IAAA,mBAAQ,EAAC,IAAA,cAAG,EAAC,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SAC/C;aAAM;YACL,IAAI,GAAG,IAAA,cAAG,EAAC,IAAI,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC;SAC7C;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAnBD,gDAmBC"}
|
|
@@ -16,7 +16,7 @@ function sortByISO8601DateStrings(values, readDate, order) {
|
|
|
16
16
|
const aDate = readDate(a);
|
|
17
17
|
const bDate = readDate(b);
|
|
18
18
|
// Lexiographical comparison of the ISO8601 Date strings.
|
|
19
|
-
return
|
|
19
|
+
return aDate < bDate ? util_1.SORT_VALUE_LESS_THAN : aDate > bDate ? util_1.SORT_VALUE_GREATER_THAN : util_1.SORT_VALUE_EQUAL;
|
|
20
20
|
};
|
|
21
21
|
valuesToSort.sort((0, util_1.compareFnOrder)(sortAscendingFn, order));
|
|
22
22
|
return valuesToSort;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.sort.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.sort.ts"],"names":[],"mappings":";;;AAAA,wCAAwJ;AAExJ;;;;;;;GAOG;AACH,SAAgB,wBAAwB,CAAI,MAAW,EAAE,QAAgD,EAAE,KAAoB;IAC7H,MAAM,YAAY,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;IAEjC,MAAM,eAAe,GAAG,UAAU,CAAI,EAAE,CAAI;QAC1C,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC1B,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAE1B,yDAAyD;QACzD,OAAO,
|
|
1
|
+
{"version":3,"file":"date.sort.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.sort.ts"],"names":[],"mappings":";;;AAAA,wCAAwJ;AAExJ;;;;;;;GAOG;AACH,SAAgB,wBAAwB,CAAI,MAAW,EAAE,QAAgD,EAAE,KAAoB;IAC7H,MAAM,YAAY,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;IAEjC,MAAM,eAAe,GAAG,UAAU,CAAI,EAAE,CAAI;QAC1C,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC1B,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAE1B,yDAAyD;QACzD,OAAO,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,2BAAoB,CAAC,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,8BAAuB,CAAC,CAAC,CAAC,uBAAgB,CAAC;IAC3G,CAAC,CAAC;IAEF,YAAY,CAAC,IAAI,CAAC,IAAA,qBAAc,EAAC,eAAe,EAAE,KAAK,CAAC,CAAC,CAAC;IAE1D,OAAO,YAAY,CAAC;AACtB,CAAC;AAdD,4DAcC"}
|
|
@@ -36,7 +36,7 @@ class DateTimeUtilityInstance {
|
|
|
36
36
|
parseTimeString(input, config) {
|
|
37
37
|
const timestringResult = this._timeStringToDate(input, config);
|
|
38
38
|
if (isValidDateFromTimestringResult(timestringResult)) {
|
|
39
|
-
const { result, raw
|
|
39
|
+
const { result, raw } = timestringResult;
|
|
40
40
|
// Use minutes since start of day. Since differenceInMinutes uses system time, we convert the raw to system time first.
|
|
41
41
|
const inSystemTime = (0, date_timezone_1.systemNormalDateToBaseDate)(raw);
|
|
42
42
|
const minutesSinceStartOfDay = (0, date_fns_1.differenceInMinutes)(inSystemTime, (0, date_fns_1.startOfDay)(inSystemTime));
|
|
@@ -93,23 +93,23 @@ class DateTimeUtilityInstance {
|
|
|
93
93
|
break; // Use time.
|
|
94
94
|
}
|
|
95
95
|
}
|
|
96
|
+
let removedPm = false;
|
|
97
|
+
function removeAmPm(inputString) {
|
|
98
|
+
inputString = inputString.toLowerCase();
|
|
99
|
+
removedPm = inputString.indexOf('pm') !== -1;
|
|
100
|
+
inputString = inputString.replace(/am|pm/g, '');
|
|
101
|
+
return inputString;
|
|
102
|
+
}
|
|
103
|
+
function parseDateTimeFromNumber(inputString) {
|
|
104
|
+
const hour = inputString[0];
|
|
105
|
+
const minute = inputString[1] + inputString[2];
|
|
106
|
+
return (0, date_fns_1.parse)(`${hour}:${minute}AM`, 'h:mma', relativeDate);
|
|
107
|
+
}
|
|
108
|
+
function parseDateTimeAsHmm(inputString) {
|
|
109
|
+
return (0, date_fns_1.parse)(inputString, 'Hmm', relativeDate);
|
|
110
|
+
}
|
|
96
111
|
if (!valid) {
|
|
97
112
|
input = input.trim().replace(/\s+/g, '');
|
|
98
|
-
let removedPm = false;
|
|
99
|
-
function removeAmPm(inputString) {
|
|
100
|
-
inputString = inputString.toLowerCase();
|
|
101
|
-
removedPm = inputString.indexOf('pm') !== -1;
|
|
102
|
-
inputString = inputString.replace(/\am|pm/g, '');
|
|
103
|
-
return inputString;
|
|
104
|
-
}
|
|
105
|
-
function parseDateTimeFromNumber(inputString) {
|
|
106
|
-
const hour = inputString[0];
|
|
107
|
-
const minute = inputString[1] + inputString[2];
|
|
108
|
-
return (0, date_fns_1.parse)(`${hour}:${minute}AM`, 'h:mma', relativeDate);
|
|
109
|
-
}
|
|
110
|
-
function parseDateTimeAsHmm(inputString) {
|
|
111
|
-
return (0, date_fns_1.parse)(inputString, 'Hmm', relativeDate);
|
|
112
|
-
}
|
|
113
113
|
switch (input.length) {
|
|
114
114
|
case 1:
|
|
115
115
|
case 2:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.time.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.time.ts"],"names":[],"mappings":";;;AAAA,wCAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"date.time.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.time.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.time.limit.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.time.limit.ts"],"names":[],"mappings":";;;AAAA,wCAAyF;AACzF,uCAAgF;AAChF,iCAAyF;
|
|
1
|
+
{"version":3,"file":"date.time.limit.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.time.limit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.time.minute.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.time.minute.ts"],"names":[],"mappings":";;;AAAA,wCAA6D;AAC7D,uCAA8D;AAC9D,6CAA+E;AAC/E,uDAA+E;
|
|
1
|
+
{"version":3,"file":"date.time.minute.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.time.minute.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,7 +84,10 @@ export interface DateTimezoneBaseDateConverter {
|
|
|
84
84
|
systemDateToTargetDate(date: Date): Date;
|
|
85
85
|
systemDateToBaseDate(date: Date): Date;
|
|
86
86
|
}
|
|
87
|
-
export declare
|
|
87
|
+
export declare type DateTimezoneConversionMap = {
|
|
88
|
+
[key: string]: number;
|
|
89
|
+
};
|
|
90
|
+
export declare function calculateAllConversions(date: Date, converter: DateTimezoneBaseDateConverter, map?: (time: Milliseconds) => number): DateTimezoneConversionMap;
|
|
88
91
|
/**
|
|
89
92
|
* Used for converting Dates to/from a UTC "base date" to a "normal date".
|
|
90
93
|
*
|
|
@@ -78,16 +78,16 @@ class DateTimezoneUtcNormalInstance {
|
|
|
78
78
|
getOffsetInMsFn = (date) => (0, date_fns_tz_1.getTimezoneOffset)(this.config.timezone, date);
|
|
79
79
|
}
|
|
80
80
|
const hasConversion = Boolean(getOffsetInMsFn);
|
|
81
|
+
function calculateOffset(date, fn = getOffsetInMsFn) {
|
|
82
|
+
const offset = fn(date);
|
|
83
|
+
return offset;
|
|
84
|
+
}
|
|
85
|
+
function calculateSystemNormalDifference(date) {
|
|
86
|
+
const normalOffset = calculateOffset(date);
|
|
87
|
+
const systemOffset = getCurrentSystemOffsetInMs(date);
|
|
88
|
+
return -normalOffset + systemOffset;
|
|
89
|
+
}
|
|
81
90
|
if (hasConversion) {
|
|
82
|
-
function calculateOffset(date, fn = getOffsetInMsFn) {
|
|
83
|
-
const offset = fn(date);
|
|
84
|
-
return offset;
|
|
85
|
-
}
|
|
86
|
-
function calculateSystemNormalDifference(date) {
|
|
87
|
-
const normalOffset = calculateOffset(date);
|
|
88
|
-
const systemOffset = getCurrentSystemOffsetInMs(date);
|
|
89
|
-
return -normalOffset + systemOffset;
|
|
90
|
-
}
|
|
91
91
|
this._getOffset = function getCurrentOffset(x, from, to) {
|
|
92
92
|
if (from === to) {
|
|
93
93
|
return 0;
|
|
@@ -114,6 +114,8 @@ class DateTimezoneUtcNormalInstance {
|
|
|
114
114
|
case 'system-base':
|
|
115
115
|
offset = -getCurrentSystemOffsetInMs(x);
|
|
116
116
|
break;
|
|
117
|
+
default:
|
|
118
|
+
throw new Error(`unexpected offset target "${target}"`);
|
|
117
119
|
}
|
|
118
120
|
return offset;
|
|
119
121
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.timezone.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.timezone.ts"],"names":[],"mappings":";;;AAAA,uCAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"date.timezone.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.timezone.ts"],"names":[],"mappings":";;;AAAA,uCAA2C;AAC3C,wCAAyJ;AACzJ,6CAAgD;AAChD,iCAAqC;AAoCrC;;;;;;GAMG;AACH,SAAgB,kCAAkC,CAAC,CAA+B,EAAE,CAA+B;IACjH,IAAI,MAAM,GAAG,KAAK,CAAC;IAEnB,IAAI,CAAC,CAAC,iBAAiB,IAAI,CAAC,CAAC,iBAAiB,IAAI,CAAC,CAAC,cAAc,IAAI,CAAC,CAAC,cAAc,EAAE;QACtF,MAAM,GAAG,IAAA,yBAAkB,EAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC,CAAC,iBAAiB,CAAC,IAAI,IAAA,yBAAkB,EAAC,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC;KACjI;SAAM;QACL,MAAM,GAAG,CAAC,IAAA,oCAA6B,EAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,IAAA,oCAA6B,EAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;KAC7H;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAVD,gFAUC;AAED;;;;;;;GAOG;AACH,SAAgB,0BAA0B,CAAC,IAAU;IACnD,OAAO,CAAC,IAAA,kBAAW,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;AAChD,CAAC;AAFD,gEAEC;AA+CD,SAAgB,uBAAuB,CAAC,IAAU,EAAE,SAAwC,EAAE,MAAsC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC1I,MAAM,OAAO,GAAmC,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC7E,MAAM,WAAW,GAA8B,EAAE,CAAC;IAElD,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACvB,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YACrB,IAAI,IAAI,KAAK,EAAE,EAAE;gBACf,WAAW,CAAC,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;aAChF;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACrB,CAAC;AAbD,0DAaC;AAID;;;;GAIG;AACH,MAAa,6BAA6B;IAMxC,YAAY,MAA4D;;QACtE,IAAI,MAAM,IAAI,IAAI,EAAE;YAClB,MAAM,GAAG,0BAAmB,CAAC;SAC9B;QAED,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YAC9B,MAAM,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;SAC/B;QAED,IAAI,MAAM,CAAC,iBAAiB,KAAK,IAAI,IAAI,MAAM,CAAC,cAAc,IAAI,IAAI,EAAE;YACtE,MAAM,CAAC,QAAQ,GAAG,MAAA,MAAM,CAAC,QAAQ,mCAAI,0BAAmB,CAAC;SAC1D;QAED,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI,eAAgD,CAAC;QAErD,IAAI,MAAM,CAAC,iBAAiB,KAAK,IAAI,EAAE;YACrC,kBAAkB;YAClB,eAAe,GAAG,0BAA0B,CAAC;SAC9C;aAAM,IAAI,MAAM,CAAC,cAAc,IAAI,IAAI,EAAE;YACxC,eAAe,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,cAAwB,CAAC;SAC9D;aAAM,IAAI,MAAM,CAAC,QAAQ,EAAE;YAC1B,eAAe,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,+BAAiB,EAAC,IAAI,CAAC,MAAM,CAAC,QAAkB,EAAE,IAAI,CAAC,CAAC;SACrF;QAED,MAAM,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;QAE/C,SAAS,eAAe,CAAC,IAAU,EAAE,KAAK,eAA2C;YACnF,MAAM,MAAM,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;YACxB,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,SAAS,+BAA+B,CAAC,IAAU;YACjD,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;YAC3C,MAAM,YAAY,GAAG,0BAA0B,CAAC,IAAI,CAAC,CAAC;YACtD,OAAO,CAAC,YAAY,GAAG,YAAY,CAAC;QACtC,CAAC;QAED,IAAI,aAAa,EAAE;YACjB,IAAI,CAAC,UAAU,GAAG,SAAS,gBAAgB,CAAC,CAAO,EAAE,IAAkC,EAAE,EAAgC;gBACvH,IAAI,IAAI,KAAK,EAAE,EAAE;oBACf,OAAO,CAAC,CAAC;iBACV;qBAAM;oBACL,MAAM,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;oBAC/B,IAAI,MAAc,CAAC;oBAEnB,QAAQ,MAAM,EAAE;wBACd,KAAK,aAAa;4BAChB,MAAM,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;4BAC7B,MAAM;wBACR,KAAK,aAAa;4BAChB,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;4BAC5B,MAAM;wBACR,KAAK,eAAe;4BAClB,MAAM,GAAG,+BAA+B,CAAC,CAAC,CAAC,CAAC;4BAC5C,MAAM;wBACR,KAAK,eAAe;4BAClB,MAAM,GAAG,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC;4BAC7C,MAAM;wBACR,KAAK,aAAa;4BAChB,MAAM,GAAG,0BAA0B,CAAC,CAAC,CAAC,CAAC;4BACvC,MAAM;wBACR,KAAK,aAAa;4BAChB,MAAM,GAAG,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC;4BACxC,MAAM;wBACR;4BACE,MAAM,IAAI,KAAK,CAAC,6BAA6B,MAAM,GAAG,CAAC,CAAC;qBAC3D;oBAED,OAAO,MAAM,CAAC;iBACf;YACH,CAAC,CAAC;SACH;aAAM;YACL,IAAI,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;SAC3B;QAED,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAEO,kBAAkB,CAAC,IAAU,EAAE,IAAkC,EAAE,EAAgC;QACzG,OAAO,IAAA,0BAAe,EAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,sCAAsC;IACtC,gBAAgB,CAAC,IAAU,EAAE,IAAkC,EAAE,EAAgC;QAC/F,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,oBAAoB,CAAC,IAAU;QAC7B,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IACzD,CAAC;IAED,oBAAoB,CAAC,IAAU;QAC7B,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACzD,CAAC;IAED,oBAAoB,CAAC,IAAU;QAC7B,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACzD,CAAC;IAED,oBAAoB,CAAC,IAAU;QAC7B,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IACzD,CAAC;IAED,sBAAsB,CAAC,IAAU;QAC/B,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAED,sBAAsB,CAAC,IAAU;QAC/B,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC3D,CAAC;CACF;AAtHD,sEAsHC;AAED,SAAgB,oBAAoB,CAAC,IAAU,EAAE,QAA+B;IAC9E,MAAM,QAAQ,GAAG,IAAI,6BAA6B,CAAC,QAAQ,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;IACnD,OAAO,MAAM,CAAC;AAChB,CAAC;AAJD,oDAIC;AAED,SAAgB,oBAAoB,CAAC,IAAU,EAAE,QAA+B;IAC9E,OAAO,IAAI,6BAA6B,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;AAChF,CAAC;AAFD,oDAEC;AAED,SAAgB,0BAA0B,CAAC,IAAU;IACnD,OAAO,IAAI,6BAA6B,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;AACnG,CAAC;AAFD,gEAEC;AAED,SAAgB,0BAA0B,CAAC,IAAU;IACnD,OAAO,IAAI,6BAA6B,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;AACnG,CAAC;AAFD,gEAEC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { Maybe, DateOrUnixDateTimeNumber, UnixDateTimeNumber } from
|
|
1
|
+
import { MaybeNot, Maybe, DateOrUnixDateTimeNumber, UnixDateTimeNumber } from '@dereekb/util';
|
|
2
2
|
export declare function unixTimeNumberFromDateOrTimeNumber(input: Maybe<DateOrUnixDateTimeNumber>): Maybe<UnixDateTimeNumber>;
|
|
3
3
|
export declare function dateFromDateOrTimeNumber(input: Maybe<DateOrUnixDateTimeNumber>): Maybe<Date>;
|
|
4
4
|
export declare function unixTimeNumberToDate(dateTimeNumber: Maybe<UnixDateTimeNumber>): Maybe<Date>;
|
|
5
5
|
export declare function unixTimeNumberForNow(): UnixDateTimeNumber;
|
|
6
|
-
export declare function unixTimeNumberFromDate(date:
|
|
6
|
+
export declare function unixTimeNumberFromDate(date: Date): UnixDateTimeNumber;
|
|
7
|
+
export declare function unixTimeNumberFromDate(date: MaybeNot): MaybeNot;
|
|
@@ -27,7 +27,7 @@ function dateFromDateOrTimeNumber(input) {
|
|
|
27
27
|
}
|
|
28
28
|
exports.dateFromDateOrTimeNumber = dateFromDateOrTimeNumber;
|
|
29
29
|
function unixTimeNumberToDate(dateTimeNumber) {
|
|
30
|
-
return
|
|
30
|
+
return dateTimeNumber != null ? new Date(dateTimeNumber * 1000) : dateTimeNumber;
|
|
31
31
|
}
|
|
32
32
|
exports.unixTimeNumberToDate = unixTimeNumberToDate;
|
|
33
33
|
function unixTimeNumberForNow() {
|
|
@@ -35,7 +35,7 @@ function unixTimeNumberForNow() {
|
|
|
35
35
|
}
|
|
36
36
|
exports.unixTimeNumberForNow = unixTimeNumberForNow;
|
|
37
37
|
function unixTimeNumberFromDate(date) {
|
|
38
|
-
return
|
|
38
|
+
return date != null ? Math.ceil(date.getTime() / 1000) : date;
|
|
39
39
|
}
|
|
40
40
|
exports.unixTimeNumberFromDate = unixTimeNumberFromDate;
|
|
41
41
|
//# sourceMappingURL=date.unix.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.unix.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.unix.ts"],"names":[],"mappings":";;;AACA,uCAAkC;AAElC,SAAgB,kCAAkC,CAAC,KAAsC;IACvF,IAAI,KAAK,IAAI,IAAI,EAAE;QACjB,OAAO,KAAyB,CAAC;KAClC;SAAM,IAAI,IAAA,iBAAM,EAAC,KAAK,CAAC,EAAE;QACxB,OAAO,sBAAsB,CAAC,KAAa,CAAC,CAAC;KAC9C;SAAM;QACL,OAAO,KAA2B,CAAC;KACpC;AACH,CAAC;AARD,gFAQC;AAED,SAAgB,wBAAwB,CAAC,KAAsC;IAC7E,IAAI,KAAK,IAAI,IAAI,EAAE;QACjB,OAAO,KAAyB,CAAC;KAClC;SAAM,IAAI,IAAA,iBAAM,EAAC,KAAK,CAAC,EAAE;QACxB,OAAO,KAAa,CAAC;KACtB;SAAM;QACL,OAAO,oBAAoB,CAAC,KAA2B,CAAC,CAAC;KAC1D;AACH,CAAC;AARD,4DAQC;AAED,SAAgB,oBAAoB,CAAC,cAAyC;IAC5E,OAAO,
|
|
1
|
+
{"version":3,"file":"date.unix.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.unix.ts"],"names":[],"mappings":";;;AACA,uCAAkC;AAElC,SAAgB,kCAAkC,CAAC,KAAsC;IACvF,IAAI,KAAK,IAAI,IAAI,EAAE;QACjB,OAAO,KAAyB,CAAC;KAClC;SAAM,IAAI,IAAA,iBAAM,EAAC,KAAK,CAAC,EAAE;QACxB,OAAO,sBAAsB,CAAC,KAAa,CAAC,CAAC;KAC9C;SAAM;QACL,OAAO,KAA2B,CAAC;KACpC;AACH,CAAC;AARD,gFAQC;AAED,SAAgB,wBAAwB,CAAC,KAAsC;IAC7E,IAAI,KAAK,IAAI,IAAI,EAAE;QACjB,OAAO,KAAyB,CAAC;KAClC;SAAM,IAAI,IAAA,iBAAM,EAAC,KAAK,CAAC,EAAE;QACxB,OAAO,KAAa,CAAC;KACtB;SAAM;QACL,OAAO,oBAAoB,CAAC,KAA2B,CAAC,CAAC;KAC1D;AACH,CAAC;AARD,4DAQC;AAED,SAAgB,oBAAoB,CAAC,cAAyC;IAC5E,OAAO,cAAc,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC,CAAC,CAAE,cAAmC,CAAC;AACzG,CAAC;AAFD,oDAEC;AAED,SAAgB,oBAAoB;IAClC,OAAO,sBAAsB,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;AAC5C,CAAC;AAFD,oDAEC;AAID,SAAgB,sBAAsB,CAAC,IAAiB;IACtD,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAE,IAAyB,CAAC;AACtF,CAAC;AAFD,wDAEC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Milliseconds, DateOrUnixDateTimeNumber } from
|
|
2
|
-
import { MonoTypeOperatorFunction, Observable, OperatorFunction } from
|
|
3
|
-
import { Expires } from
|
|
1
|
+
import { Milliseconds, DateOrUnixDateTimeNumber } from '@dereekb/util';
|
|
2
|
+
import { MonoTypeOperatorFunction, Observable, OperatorFunction } from 'rxjs';
|
|
3
|
+
import { Expires } from './expires';
|
|
4
4
|
/**
|
|
5
5
|
* Creates a new Expires object at the current time on emission that will expire in the set amount of time.
|
|
6
6
|
*
|
|
@@ -23,8 +23,8 @@ export declare function skipAfterExpiration(expiresIn?: number): MonoTypeOperato
|
|
|
23
23
|
/**
|
|
24
24
|
* Skips emissions until time since the last emission from the watch observable has elapsed.
|
|
25
25
|
*/
|
|
26
|
-
export declare function skipUntilTimeElapsedAfterLastEmission<T>(watch: Observable<
|
|
26
|
+
export declare function skipUntilTimeElapsedAfterLastEmission<T>(watch: Observable<unknown>, takeFor: Milliseconds): MonoTypeOperatorFunction<T>;
|
|
27
27
|
/**
|
|
28
28
|
* Takes emissions until time since the last emission from the watch observable has elapsed.
|
|
29
29
|
*/
|
|
30
|
-
export declare function takeAfterTimeElapsedSinceLastEmission<T>(watch: Observable<
|
|
30
|
+
export declare function takeAfterTimeElapsedSinceLastEmission<T>(watch: Observable<unknown>, skipFor: Milliseconds): MonoTypeOperatorFunction<T>;
|
|
@@ -11,28 +11,28 @@ const expires_1 = require("./expires");
|
|
|
11
11
|
* @returns
|
|
12
12
|
*/
|
|
13
13
|
function toExpiration(expiresIn) {
|
|
14
|
-
return (0, rxjs_1.map)(
|
|
14
|
+
return (0, rxjs_1.map)(() => (0, expires_1.toExpires)(new Date(), expiresIn));
|
|
15
15
|
}
|
|
16
16
|
exports.toExpiration = toExpiration;
|
|
17
17
|
/**
|
|
18
18
|
* Filters further emissions once the input is expired.
|
|
19
19
|
*/
|
|
20
20
|
function skipExpired() {
|
|
21
|
-
return (0, rxjs_1.filter)(expires => !(0, expires_1.hasExpired)(expires));
|
|
21
|
+
return (0, rxjs_1.filter)((expires) => !(0, expires_1.hasExpired)(expires));
|
|
22
22
|
}
|
|
23
23
|
exports.skipExpired = skipExpired;
|
|
24
24
|
/**
|
|
25
25
|
* Skips the input date or timenumber until expiration occurs.
|
|
26
26
|
*/
|
|
27
27
|
function skipUntilExpiration(expiresIn) {
|
|
28
|
-
return (0, rxjs_1.filter)(x => (0, date_1.timeHasExpired)(x, expiresIn));
|
|
28
|
+
return (0, rxjs_1.filter)((x) => (0, date_1.timeHasExpired)(x, expiresIn));
|
|
29
29
|
}
|
|
30
30
|
exports.skipUntilExpiration = skipUntilExpiration;
|
|
31
31
|
/**
|
|
32
32
|
* Skips the input date or timenumber after expiration occurs.
|
|
33
33
|
*/
|
|
34
34
|
function skipAfterExpiration(expiresIn) {
|
|
35
|
-
return (0, rxjs_1.filter)(x => !(0, date_1.timeHasExpired)(x, expiresIn));
|
|
35
|
+
return (0, rxjs_1.filter)((x) => !(0, date_1.timeHasExpired)(x, expiresIn));
|
|
36
36
|
}
|
|
37
37
|
exports.skipAfterExpiration = skipAfterExpiration;
|
|
38
38
|
/**
|
|
@@ -42,7 +42,7 @@ function skipUntilTimeElapsedAfterLastEmission(watch, takeFor) {
|
|
|
42
42
|
return (observable) => {
|
|
43
43
|
return watch.pipe((0, rxjs_1.switchMap)(() => {
|
|
44
44
|
const expires = (0, expires_1.toExpires)(new Date(), takeFor);
|
|
45
|
-
return observable.pipe((0, rxjs_1.takeWhile)(
|
|
45
|
+
return observable.pipe((0, rxjs_1.takeWhile)(() => !(0, expires_1.hasExpired)(expires)));
|
|
46
46
|
}));
|
|
47
47
|
};
|
|
48
48
|
}
|
|
@@ -54,7 +54,7 @@ function takeAfterTimeElapsedSinceLastEmission(watch, skipFor) {
|
|
|
54
54
|
return (observable) => {
|
|
55
55
|
return watch.pipe((0, rxjs_1.switchMap)(() => {
|
|
56
56
|
const expires = (0, expires_1.toExpires)(new Date(), skipFor);
|
|
57
|
-
return observable.pipe((0, rxjs_1.skipWhile)(
|
|
57
|
+
return observable.pipe((0, rxjs_1.skipWhile)(() => !(0, expires_1.hasExpired)(expires)));
|
|
58
58
|
}));
|
|
59
59
|
};
|
|
60
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expires.rxjs.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/expires/expires.rxjs.ts"],"names":[],"mappings":";;;AAAA,wCAA+C;AAE/C,+
|
|
1
|
+
{"version":3,"file":"expires.rxjs.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/expires/expires.rxjs.ts"],"names":[],"mappings":";;;AAAA,wCAA+C;AAE/C,+BAA4H;AAC5H,uCAA2D;AAE3D;;;;;GAKG;AACH,SAAgB,YAAY,CAAI,SAAiB;IAC/C,OAAO,IAAA,UAAG,EAAC,GAAG,EAAE,CAAC,IAAA,mBAAS,EAAC,IAAI,IAAI,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC;AACrD,CAAC;AAFD,oCAEC;AAED;;GAEG;AACH,SAAgB,WAAW;IACzB,OAAO,IAAA,aAAM,EAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAA,oBAAU,EAAC,OAAO,CAAC,CAAC,CAAC;AACnD,CAAC;AAFD,kCAEC;AAED;;GAEG;AACH,SAAgB,mBAAmB,CAAC,SAAkB;IACpD,OAAO,IAAA,aAAM,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,qBAAc,EAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;AACrD,CAAC;AAFD,kDAEC;AAED;;GAEG;AACH,SAAgB,mBAAmB,CAAC,SAAkB;IACpD,OAAO,IAAA,aAAM,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAA,qBAAc,EAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;AACtD,CAAC;AAFD,kDAEC;AAED;;GAEG;AACH,SAAgB,qCAAqC,CAAI,KAA0B,EAAE,OAAqB;IACxG,OAAO,CAAC,UAAyB,EAAE,EAAE;QACnC,OAAO,KAAK,CAAC,IAAI,CACf,IAAA,gBAAS,EAAC,GAAG,EAAE;YACb,MAAM,OAAO,GAAG,IAAA,mBAAS,EAAC,IAAI,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;YAC/C,OAAO,UAAU,CAAC,IAAI,CAAC,IAAA,gBAAS,EAAC,GAAG,EAAE,CAAC,CAAC,IAAA,oBAAU,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAChE,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AATD,sFASC;AAED;;GAEG;AACH,SAAgB,qCAAqC,CAAI,KAA0B,EAAE,OAAqB;IACxG,OAAO,CAAC,UAAyB,EAAE,EAAE;QACnC,OAAO,KAAK,CAAC,IAAI,CACf,IAAA,gBAAS,EAAC,GAAG,EAAE;YACb,MAAM,OAAO,GAAG,IAAA,mBAAS,EAAC,IAAI,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;YAC/C,OAAO,UAAU,CAAC,IAAI,CAAC,IAAA,gBAAS,EAAC,GAAG,EAAE,CAAC,CAAC,IAAA,oBAAU,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAChE,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AATD,sFASC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Maybe, TimezoneString } from
|
|
2
|
-
import { DateDayTimezoneHintFilter, DateItemOccuringFilter, DateItemQueryStartsEndsFilter, DateItemRangeFilter } from
|
|
1
|
+
import { Maybe, TimezoneString } from '@dereekb/util';
|
|
2
|
+
import { DateDayTimezoneHintFilter, DateItemOccuringFilter, DateItemQueryStartsEndsFilter, DateItemRangeFilter } from './query.filter';
|
|
3
3
|
export interface DaysAndTimeFilter<F> {
|
|
4
4
|
/**
|
|
5
5
|
* The time filter is the primary filter.
|
|
@@ -17,7 +17,7 @@ function makeDateQueryForDateItemRangeFilter(find) {
|
|
|
17
17
|
const result = {};
|
|
18
18
|
result.timezone = find.timezone;
|
|
19
19
|
// Apply the timezone to the date range if provided.
|
|
20
|
-
const range =
|
|
20
|
+
const range = find.timezone ? Object.assign(Object.assign({}, find.range), { date: (0, date_fns_tz_1.utcToZonedTime)(find.range.date, find.timezone) }) : find.range;
|
|
21
21
|
const dateRange = (0, date_range_1.makeDateRange)(range);
|
|
22
22
|
switch (range.type) {
|
|
23
23
|
case date_range_1.DateRangeType.DAY:
|
|
@@ -67,10 +67,10 @@ function makeDaysAndTimeFiltersFunction(builder) {
|
|
|
67
67
|
const endsAt = builder.makeRangeFilter(endsGte, endsLte);
|
|
68
68
|
const timeFilter = builder.makeFieldFilter({ startsAt: startsAt, endsAt: endsAt });
|
|
69
69
|
let daysFilter;
|
|
70
|
+
function tzDate(date) {
|
|
71
|
+
return date ? (0, date_fns_tz_1.utcToZonedTime)(date, timezone) : undefined;
|
|
72
|
+
}
|
|
70
73
|
if (timezone) {
|
|
71
|
-
function tzDate(date) {
|
|
72
|
-
return (date) ? (0, date_fns_tz_1.utcToZonedTime)(date, timezone) : undefined;
|
|
73
|
-
}
|
|
74
74
|
const tzDayStartsAtFilter = builder.makeRangeFilter(tzDate(startsGte), tzDate(startsLte));
|
|
75
75
|
const tzDayEndsAtFilter = builder.makeRangeFilter(tzDate(endsGte), tzDate(endsLte));
|
|
76
76
|
daysFilter = builder.makeFieldFilter({ startsAt: tzDayStartsAtFilter, endsAt: tzDayEndsAtFilter });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.builder.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/query/query.builder.ts"],"names":[],"mappings":";;;AACA,uCAAsC;AACtC,6CAA6C;AAC7C,mDAAkE;
|
|
1
|
+
{"version":3,"file":"query.builder.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/query/query.builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ function makeMongoDBLikeDateQueryBuilder(config) {
|
|
|
15
15
|
makeRangeFilter(gte, lte) {
|
|
16
16
|
let result;
|
|
17
17
|
if (gte || lte) {
|
|
18
|
-
result = Object.assign(Object.assign({}, (gte
|
|
18
|
+
result = Object.assign(Object.assign({}, (gte ? { $gte: gte } : undefined)), (lte ? { $lte: lte } : undefined));
|
|
19
19
|
}
|
|
20
20
|
return result;
|
|
21
21
|
},
|
|
@@ -23,14 +23,14 @@ function makeMongoDBLikeDateQueryBuilder(config) {
|
|
|
23
23
|
let startsAtFilter;
|
|
24
24
|
let endsAtFilter;
|
|
25
25
|
if (fields.singleFieldForStartAndEnd) {
|
|
26
|
-
// A single field that manages start/end will start and end at the same instant (end = start)
|
|
26
|
+
// A single field that manages start/end will start and end at the same instant (end = start)
|
|
27
27
|
// so we merge the gte/lte values.
|
|
28
28
|
const merged = mergeMongoDBLikeRangeFilters(startsAt, endsAt);
|
|
29
|
-
startsAtFilter =
|
|
29
|
+
startsAtFilter = merged ? { [fields.start]: merged } : undefined;
|
|
30
30
|
}
|
|
31
31
|
else {
|
|
32
|
-
startsAtFilter =
|
|
33
|
-
endsAtFilter =
|
|
32
|
+
startsAtFilter = startsAt ? { [fields.start]: startsAt } : undefined;
|
|
33
|
+
endsAtFilter = endsAt && fields.end ? { [fields.end]: endsAt } : undefined;
|
|
34
34
|
}
|
|
35
35
|
const filter = Object.assign(Object.assign({}, startsAtFilter), endsAtFilter);
|
|
36
36
|
return filter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.builder.mongo.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/query/query.builder.mongo.ts"],"names":[],"mappings":";;;AAgBA,SAAgB,4BAA4B,CAAC,QAA2C,EAAE,MAAyC;;IACjI,OAAO;QACL,IAAI,EAAE,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,mCAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI;QACpC,IAAI,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,mCAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI;KACrC,CAAC;AACJ,CAAC;AALD,oEAKC;AAMD,SAAgB,+BAA+B,CAAC,MAA6C;IAC3F,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAE1B,OAAO;QACL,eAAe,CAAC,GAAgB,EAAE,GAAgB;YAChD,IAAI,MAAyC,CAAC;YAE9C,IAAI,GAAG,IAAI,GAAG,EAAE;gBACd,MAAM,mCACD,CAAC,GAAG,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"query.builder.mongo.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/query/query.builder.mongo.ts"],"names":[],"mappings":";;;AAgBA,SAAgB,4BAA4B,CAAC,QAA2C,EAAE,MAAyC;;IACjI,OAAO;QACL,IAAI,EAAE,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,mCAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI;QACpC,IAAI,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,mCAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI;KACrC,CAAC;AACJ,CAAC;AALD,oEAKC;AAMD,SAAgB,+BAA+B,CAAC,MAA6C;IAC3F,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAE1B,OAAO;QACL,eAAe,CAAC,GAAgB,EAAE,GAAgB;YAChD,IAAI,MAAyC,CAAC;YAE9C,IAAI,GAAG,IAAI,GAAG,EAAE;gBACd,MAAM,mCACD,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,GACjC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CACrC,CAAC;aACH;YAED,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,eAAe,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAoD;YACpF,IAAI,cAAc,CAAC;YACnB,IAAI,YAAY,CAAC;YAEjB,IAAI,MAAM,CAAC,yBAAyB,EAAE;gBACpC,6FAA6F;gBAC7F,kCAAkC;gBAClC,MAAM,MAAM,GAA+B,4BAA4B,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBAC1F,cAAc,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;aAClE;iBAAM;gBACL,cAAc,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;gBACrE,YAAY,GAAG,MAAM,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;aAC5E;YAED,MAAM,MAAM,mCACP,cAAc,GACd,YAAY,CAChB,CAAC;YAEF,OAAO,MAAM,CAAC;QAChB,CAAC;KACF,CAAC;AACJ,CAAC;AAtCD,0EAsCC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Maybe, TimezoneString } from
|
|
2
|
-
import { DateRangeParams } from
|
|
1
|
+
import { Maybe, TimezoneString } from '@dereekb/util';
|
|
2
|
+
import { DateRangeParams } from '../date/date.range';
|
|
3
3
|
export interface FindEqualsDateParam {
|
|
4
4
|
/**
|
|
5
5
|
* Date exactly equals this.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.recurrence.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/rrule/date.recurrence.ts"],"names":[],"mappings":";;;;AAAA,yDAAoD;AAEpD,6CAAmE;AACnE,yDAA2F;AAQ3F;;GAEG;AAEH,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;
|
|
1
|
+
{"version":3,"file":"date.recurrence.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/rrule/date.recurrence.ts"],"names":[],"mappings":";;;;AAAA,yDAAoD;AAEpD,6CAAmE;AACnE,yDAA2F;AAQ3F;;GAEG;AAEH,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;IAiC9B,YAAY,QAA6B;QACvC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;QAClC,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;QAC5B,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;QAC5B,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IAClC,CAAC;CACF,CAAA;AAjCC;IADC,IAAA,0BAAM,GAAE;;qDACiB;AAM1B;IADC,IAAA,0BAAM,GAAE;;kDACS;AAMlB;IADC,IAAA,0BAAM,GAAE;sCACF,IAAI;kDAAC;AAMZ;IADC,IAAA,0BAAM,GAAE;sCACJ,IAAI;gDAAC;AAMV;IADC,IAAA,0BAAM,GAAE;;oDACS;AA/BP,mBAAmB;IAD/B,IAAA,2BAAO,GAAE;6CAkCc,mBAAmB;GAjC9B,mBAAmB,CAwC/B;AAxCY,kDAAmB;AA2DhC;;GAEG;AACH,MAAa,0BAA0B;IACrC;;OAEG;IACH,MAAM,CAAC,+CAA+C,CAAC,MAA4B;;QACjF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAEzC,MAAM,SAAS,GAAG,6BAAgB,CAAC,YAAY,CAAC;YAC9C,kBAAkB,EAAE,KAAK;YACzB,OAAO,EAAE;gBACP,IAAI;aACL;SACF,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,SAAS,CAAC,sBAAsB,EAAE,CAAC;QACrD,MAAM,cAAc,GAAe,wCAAqB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAE7E,MAAM,cAAc,GAAG;YACrB,QAAQ;YACR,KAAK,EAAE,cAAc;YACrB,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,GAAG,EAAE,MAAA,SAAS,CAAC,qBAAqB,mCAAI,SAAS,CAAC,GAAG;YACrD,OAAO,EAAE,SAAS,CAAC,OAAO;SAC3B,CAAC;QAEF,OAAO,IAAI,mBAAmB,CAAC,cAAc,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,CAAC,qBAAqB,CAAC,IAAyB,EAAE,IAAkB;QACxE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAEjC,OAAO,6BAAgB,CAAC,YAAY,CAAC;YACnC,UAAU,EAAE,KAAK;YACjB,OAAO,EAAE;gBACP,IAAI;gBACJ,QAAQ;aACT;SACF,CAAC,CAAC;IACL,CAAC;CACF;AAvCD,gEAuCC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Maybe } from '@dereekb/util';
|
|
2
2
|
import { RRule } from 'rrule';
|
|
3
|
+
import { IterArgs } from 'rrule/dist/esm/src/iterresult';
|
|
3
4
|
export declare const DEFAULT_LAST_ITER_RESULT_MAX_ITERATIONS_ALLOWED = 10000;
|
|
4
5
|
export declare class DateRRule extends RRule {
|
|
5
6
|
/**
|
|
@@ -31,10 +32,10 @@ export declare class DateRRule extends RRule {
|
|
|
31
32
|
*/
|
|
32
33
|
declare abstract class BaseRRuleIter {
|
|
33
34
|
readonly method = "before";
|
|
34
|
-
readonly minDate:
|
|
35
|
-
readonly maxDate:
|
|
36
|
-
readonly _result:
|
|
37
|
-
readonly args:
|
|
35
|
+
readonly minDate: Date | null;
|
|
36
|
+
readonly maxDate: Date | null;
|
|
37
|
+
readonly _result: Date[];
|
|
38
|
+
readonly args: Partial<IterArgs>;
|
|
38
39
|
total: number;
|
|
39
40
|
protected _value: Date | null;
|
|
40
41
|
getValue(): Date | null;
|
|
@@ -40,6 +40,10 @@ exports.DateRRule = DateRRule;
|
|
|
40
40
|
class BaseRRuleIter {
|
|
41
41
|
constructor() {
|
|
42
42
|
this.method = 'before';
|
|
43
|
+
this.minDate = undefined;
|
|
44
|
+
this.maxDate = undefined;
|
|
45
|
+
this._result = undefined;
|
|
46
|
+
this.args = undefined;
|
|
43
47
|
this.total = 0;
|
|
44
48
|
this._value = null;
|
|
45
49
|
}
|
|
@@ -119,13 +123,13 @@ class AnyIterResult extends BaseRRuleIter {
|
|
|
119
123
|
}
|
|
120
124
|
accept(date) {
|
|
121
125
|
++this.total;
|
|
122
|
-
const tooEarly = this.minDate != null &&
|
|
126
|
+
const tooEarly = this.minDate != null && this.minDate > date;
|
|
123
127
|
if (tooEarly) {
|
|
124
128
|
const maxIterationReached = this.total >= this.maxIterationsAllowed;
|
|
125
129
|
return !maxIterationReached;
|
|
126
130
|
}
|
|
127
131
|
else {
|
|
128
|
-
const tooLate = this.maxDate != null &&
|
|
132
|
+
const tooLate = this.maxDate != null && this.maxDate < date;
|
|
129
133
|
if (tooLate) {
|
|
130
134
|
return true;
|
|
131
135
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.rrule.extension.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/rrule/date.rrule.extension.ts"],"names":[],"mappings":";;;AACA,uCAA6C;AAC7C,iCAA8B;
|
|
1
|
+
{"version":3,"file":"date.rrule.extension.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/rrule/date.rrule.extension.ts"],"names":[],"mappings":";;;AACA,uCAA6C;AAC7C,iCAA8B;AAG9B,8EAA8E;AAEjE,QAAA,+CAA+C,GAAG,KAAK,CAAC;AAErE,MAAa,SAAU,SAAQ,aAAK;IAClC;;;;OAIG;IACH,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED;;;;OAIG;IACH,IAAI,CAAC,OAAa;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACjD,CAAC;IAED;;;;;;OAMG;IACH,GAAG,CAAC,SAA2D,EAAE;QAC/D,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,IAAI,CAAC;IACvD,CAAC;CACF;AA7BD,8BA6BC;AAED;;GAEG;AACH,MAAe,aAAa;IAA5B;QACW,WAAM,GAAG,QAAQ,CAAC;QAClB,YAAO,GAAgB,SAA4B,CAAC;QACpD,YAAO,GAAgB,SAA4B,CAAC;QACpD,YAAO,GAAW,SAA8B,CAAC;QACjD,SAAI,GAAsB,SAAyC,CAAC;QACtE,UAAK,GAAW,CAAC,CAAC;QACf,WAAM,GAAgB,IAAI,CAAC;IAKvC,CAAC;IAHC,QAAQ;QACN,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;CACF;AAED;;GAEG;AACH,MAAa,cAAe,SAAQ,aAAa;IAG/C,YAAqB,uBAA+B,uDAA+C;QACjG,KAAK,EAAE,CAAC;QADW,yBAAoB,GAApB,oBAAoB,CAA0D;QAFjF,YAAO,GAAG,IAAA,oBAAa,GAAE,CAAC;IAI5C,CAAC;IAED,MAAM,CAAC,IAAU;QACf,EAAE,IAAI,CAAC,KAAK,CAAC;QAEb,MAAM,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC;QAEpC,IAAI,OAAO,EAAE;YACX,OAAO,KAAK,CAAC;SACd;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACf,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,oBAAoB,CAAC;YACpE,OAAO,CAAC,mBAAmB,CAAC;SAC7B;IACH,CAAC;IAED,GAAG,CAAC,IAAU;QACZ,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK;QACH,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACvD,CAAC;CACF;AA7BD,wCA6BC;AAED,MAAa,cAAe,SAAQ,aAAa;IAG/C,YAA8B,OAAa,EAAW,uBAA+B,uDAA+C;QAClI,KAAK,EAAE,CAAC;QADoB,YAAO,GAAP,OAAO,CAAM;QAAW,yBAAoB,GAApB,oBAAoB,CAA0D;QAFlH,YAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAIzC,CAAC;IAED,MAAM,CAAC,IAAU;QACf,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QAChB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAErC,IAAI,QAAQ,EAAE;YACZ,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,oBAAoB,CAAC;YACpE,OAAO,CAAC,mBAAmB,CAAC;SAC7B;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACf,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAED,GAAG,CAAC,IAAU;QACZ,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK;QACH,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACrE,CAAC;CACF;AA5BD,wCA4BC;AAED,MAAa,aAAc,SAAQ,aAAa;IAI9C,YAAY,MAAyD,EAAW,uBAA+B,uDAA+C;;QAC5J,KAAK,EAAE,CAAC;QADsE,yBAAoB,GAApB,oBAAoB,CAA0D;QAH5I,YAAO,GAAgB,IAAI,CAAC;QAC5B,YAAO,GAAgB,IAAI,CAAC;QAI5C,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,OAAO,GAAG,MAAA,MAAM,CAAC,OAAO,mCAAI,IAAI,CAAC;YACtC,IAAI,CAAC,OAAO,GAAG,MAAA,MAAM,CAAC,OAAO,mCAAI,IAAI,CAAC;SACvC;IACH,CAAC;IAED,MAAM,CAAC,IAAU;QACf,EAAE,IAAI,CAAC,KAAK,CAAC;QACb,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAE7D,IAAI,QAAQ,EAAE;YACZ,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,oBAAoB,CAAC;YACpE,OAAO,CAAC,mBAAmB,CAAC;SAC7B;aAAM;YACL,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YAE5D,IAAI,OAAO,EAAE;gBACX,OAAO,IAAI,CAAC;aACb;iBAAM;gBACL,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACf,OAAO,KAAK,CAAC;aACd;SACF;IACH,CAAC;IAED,GAAG,CAAC,IAAU;QACZ,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK;QACH,OAAO,IAAI,aAAa,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IAC7E,CAAC;CACF;AAvCD,sCAuCC"}
|
|
@@ -61,7 +61,7 @@ class DateRRuleInstance {
|
|
|
61
61
|
nextRecurrenceDate(from = new Date()) {
|
|
62
62
|
const baseFrom = this.normalInstance.baseDateToTargetDate(from);
|
|
63
63
|
const rawNext = this.rrule.next(baseFrom);
|
|
64
|
-
const next =
|
|
64
|
+
const next = rawNext ? this.normalInstance.targetDateToBaseDate(rawNext) : undefined;
|
|
65
65
|
return next;
|
|
66
66
|
}
|
|
67
67
|
/**
|
|
@@ -80,7 +80,7 @@ class DateRRuleInstance {
|
|
|
80
80
|
}
|
|
81
81
|
let startsAtDates;
|
|
82
82
|
if (between) {
|
|
83
|
-
// This finds all
|
|
83
|
+
// This finds all
|
|
84
84
|
startsAtDates = this.rrule.between(between.start, between.end, true);
|
|
85
85
|
}
|
|
86
86
|
else if (this.hasForeverRange()) {
|
|
@@ -90,7 +90,7 @@ class DateRRuleInstance {
|
|
|
90
90
|
startsAtDates = this.rrule.all();
|
|
91
91
|
}
|
|
92
92
|
const referenceDate = this.options.date;
|
|
93
|
-
const allDates = startsAtDates.map(startsAt => (Object.assign(Object.assign({}, referenceDate), { startsAt }))); // Inherit calendar time, etc.
|
|
93
|
+
const allDates = startsAtDates.map((startsAt) => (Object.assign(Object.assign({}, referenceDate), { startsAt }))); // Inherit calendar time, etc.
|
|
94
94
|
let dates = allDates;
|
|
95
95
|
// Fix Dates w/ Timezones
|
|
96
96
|
if (this.normalInstance.hasConversion) {
|
|
@@ -99,7 +99,7 @@ class DateRRuleInstance {
|
|
|
99
99
|
// Exclude dates
|
|
100
100
|
const exclude = this.options.exclude;
|
|
101
101
|
if (exclude) {
|
|
102
|
-
dates = dates.filter(x => !exclude.has(x.startsAt));
|
|
102
|
+
dates = dates.filter((x) => !exclude.has(x.startsAt));
|
|
103
103
|
}
|
|
104
104
|
return {
|
|
105
105
|
between,
|
|
@@ -140,7 +140,7 @@ class DateRRuleInstance {
|
|
|
140
140
|
}
|
|
141
141
|
// Fix Dates w/ timezone.
|
|
142
142
|
if (this.normalInstance.hasConversion) {
|
|
143
|
-
const [startF, endF] = [start, end].filter(x => Boolean(x)).map(x => this.normalInstance.baseDateToTargetDate(x));
|
|
143
|
+
const [startF, endF] = [start, end].filter((x) => Boolean(x)).map((x) => this.normalInstance.baseDateToTargetDate(x));
|
|
144
144
|
start = startF;
|
|
145
145
|
end = endF;
|
|
146
146
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.rrule.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/rrule/date.rrule.ts"],"names":[],"mappings":";;;AACA,iCAAuC;AACvC,kCAAmI;AACnI,
|
|
1
|
+
{"version":3,"file":"date.rrule.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/rrule/date.rrule.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,10 +38,10 @@ class DateRRuleParseUtility {
|
|
|
38
38
|
}
|
|
39
39
|
static parseExdateAttributeFromProperty(property) {
|
|
40
40
|
var _a;
|
|
41
|
-
const timezone = (_a = property.params.find(x => x.key === 'TZID')) === null || _a === void 0 ? void 0 : _a.value;
|
|
41
|
+
const timezone = (_a = property.params.find((x) => x.key === 'TZID')) === null || _a === void 0 ? void 0 : _a.value;
|
|
42
42
|
const rawDates = property.values.split(',');
|
|
43
43
|
const conversion = new date_timezone_1.DateTimezoneUtcNormalInstance({ timezone });
|
|
44
|
-
const dates = rawDates.map(x => DateRRuleParseUtility.parseDateTimeString(x, conversion));
|
|
44
|
+
const dates = rawDates.map((x) => DateRRuleParseUtility.parseDateTimeString(x, conversion));
|
|
45
45
|
return {
|
|
46
46
|
timezone,
|
|
47
47
|
dates
|
|
@@ -57,15 +57,15 @@ class DateRRuleParseUtility {
|
|
|
57
57
|
*/
|
|
58
58
|
static parseDateTimeString(rfcDateString, converter) {
|
|
59
59
|
const RFC5545_DATE_TIME_FORMAT = /^((\d{4})(\d{2})(\d{2}))(T(\d{2})(\d{2})(\d{2})Z?)?$/;
|
|
60
|
-
const isDateString =
|
|
60
|
+
const isDateString = rfcDateString.length === 6;
|
|
61
61
|
const isUTCDate = isDateString || rfcDateString.endsWith('Z');
|
|
62
62
|
const parsed = RFC5545_DATE_TIME_FORMAT.exec(rfcDateString);
|
|
63
63
|
if (parsed == null) {
|
|
64
64
|
throw new Error(`Failed parsing input rfcDateString "${rfcDateString}"`);
|
|
65
65
|
}
|
|
66
|
-
const [
|
|
67
|
-
const [year, month, day, hour, minute, second] = [yearS, monthS, dayS, hourS, minuteS, secondS].map(x => (x
|
|
68
|
-
const utcDate = new Date(Date.UTC(year,
|
|
66
|
+
const [, , /*full*/ /*yearDate*/ yearS, monthS, dayS /*time*/, , hourS, minuteS, secondS] = parsed;
|
|
67
|
+
const [year, month, day, hour, minute, second] = [yearS, monthS, dayS, hourS, minuteS, secondS].map((x) => (x ? Number.parseInt(x, 10) : 0));
|
|
68
|
+
const utcDate = new Date(Date.UTC(year, month - 1, day, hour, minute, second));
|
|
69
69
|
let date = utcDate;
|
|
70
70
|
if (!isUTCDate) {
|
|
71
71
|
// Date was parsed as a base/UTC value by rrule, so convert it to the real date.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.rrule.parse.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/rrule/date.rrule.parse.ts"],"names":[],"mappings":";;;AAAA,wCAA0F;AAC1F,6CAAqC;AACrC,kCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"date.rrule.parse.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/rrule/date.rrule.parse.ts"],"names":[],"mappings":";;;AAAA,wCAA0F;AAC1F,6CAAqC;AACrC,kCAAkC;AAClC,yDAAqG;AA+GxF,QAAA,mBAAmB,GAAG,GAAG,CAAC;AAEvC,MAAa,qBAAqB;IAChC,MAAM,CAAC,4BAA4B,CAAC,KAAyB;QAC3D,MAAM,KAAK,GAAuB,EAAE,CAAC;QACrC,MAAM,WAAW,GAAuB,EAAE,CAAC;QAE3C,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;gBAC7B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACxB;iBAAM;gBACL,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAClB;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,OAAO,GAAG,IAAI,cAAO,EAAE,CAAC;QAE5B,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,OAAO,GAAG,IAAI,cAAO,CACnB,IAAA,mBAAY,EACV,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACvB,OAAO,qBAAqB,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC;YACxE,CAAC,CAAC,CACH,CACF,CAAC;SACH;QAED,OAAO;YACL,KAAK;YACL,OAAO;YACP,KAAK;SACN,CAAC;IACJ,CAAC;IAED,sBAAsB;IACtB,MAAM,CAAC,4BAA4B,CAAC,IAAqB;QACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC1C,qBAAqB,CAAC,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC7D,OAAO,qBAAqB,CAAC,gCAAgC,CAAC,QAAQ,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,CAAC,gCAAgC,CAAC,QAAuB;;QAC7D,MAAM,QAAQ,GAA0B,MAAA,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,MAAM,CAAC,0CAAE,KAAK,CAAC;QAC7F,MAAM,QAAQ,GAAkD,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE3F,MAAM,UAAU,GAAG,IAAI,6CAA6B,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,mBAAmB,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;QAC5F,OAAO;YACL,QAAQ;YACR,KAAK;SACN,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,+BAA+B,CAAC,aAAwD,EAAE,QAAuB;QACtH,OAAO,qBAAqB,CAAC,mBAAmB,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,6CAA6B,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC1I,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,mBAAmB,CAAC,aAAwD,EAAE,SAA+C;QAClI,MAAM,wBAAwB,GAAG,sDAAsD,CAAC;QACxF,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,KAAK,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,YAAY,IAAI,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAE9D,MAAM,MAAM,GAAG,wBAAwB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAE5D,IAAI,MAAM,IAAI,IAAI,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,uCAAuC,aAAa,GAAG,CAAC,CAAC;SAC1E;QAED,MAAM,CAAC,EAAE,AAAD,EAAG,QAAQ,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,AAAD,EAAG,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;QACnG,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE7I,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QAC/E,IAAI,IAAI,GAAS,OAAO,CAAC;QAEzB,IAAI,CAAC,SAAS,EAAE;YACd,gFAAgF;YAChF,IAAI,SAAS,EAAE;gBACb,IAAI,GAAG,SAAS,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;aAC7C;iBAAM;gBACL,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;aAC3E;SACF;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,oBAAoB,CAAC,IAAU;QACpC,OAAO,IAAA,oBAAM,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,IAAqB;QACxC,MAAM,OAAO,GAAiB,qBAAqB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACvE,OAAO,qBAAqB,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,CAAC,mBAAmB,CAAC,OAAqB;QAC9C,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QAC5C,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC;QAE/E,OAAO;YACL,IAAI;YACJ,MAAM;YACN,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,KAA0B;QAC7C,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACzC,OAAO;YACL,GAAG;YACH,KAAK;SACN,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,IAAqB;QACvC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,2BAAmB,EAAE,CAAC,CAAC,CAAC;QAE5D,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,OAAO;gBACL,MAAM,EAAE,OAAO;gBACf,MAAM,EAAE,MAAM;aACf,CAAC;SACH;aAAM;YACL,OAAO;gBACL,MAAM;gBACN,MAAM;aACP,CAAC;SACH;IACH,CAAC;IAED,eAAe;IACf,MAAM,CAAC,gBAAgB,CAAC,KAAiB;QACvC,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,cAAkC;QACpD,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,eAAe;IACf,MAAM,CAAC,kBAAkB,CAAC,IAAuB,EAAE,QAAuB;QACxE,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,iBAAiB,IAAI,YAAY,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;SACnE;IACH,CAAC;CACF;AArJD,sDAqJC"}
|