@dereekb/date 1.2.0 → 2.0.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 +13 -4
- package/README.md +1 -1
- package/package.json +3 -2
- package/src/lib/date/date.time.d.ts +4 -3
- package/src/lib/date/date.time.js +80 -66
- package/src/lib/date/date.time.js.map +1 -1
- package/src/lib/rrule/date.rrule.extension.js +1 -1
- package/src/lib/rrule/date.rrule.extension.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,11 +2,20 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
-
# [
|
|
5
|
+
# [2.0.0](https://github.com/dereekb/dbx-components/compare/v1.2.0...v2.0.0) (2022-03-13)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
* added now to dbxDateTimeFieldComponent ([812e704](https://github.com/dereekb/dbx-components/commit/812e704b9bf44daa7441f236d6fe1e2c499ec7dd))
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
# [1.2.0](https://github.com/dereekb/dbx-components/compare/v1.1.0...v1.2.0) (2022-03-04)
|
|
6
15
|
|
|
7
16
|
|
|
8
17
|
|
|
9
|
-
# [1.1.0](https://github.com/dereekb/
|
|
18
|
+
# [1.1.0](https://github.com/dereekb/dbx-components/compare/v1.0.0...v1.1.0) (2022-03-02)
|
|
10
19
|
|
|
11
20
|
|
|
12
21
|
|
|
@@ -15,8 +24,8 @@ This file was generated using [@jscutlery/semver](https://github.com/jscutlery/s
|
|
|
15
24
|
|
|
16
25
|
### Features
|
|
17
26
|
|
|
18
|
-
* added dbxSearchableTextFieldComponent ([42ae14c](https://github.com/dereekb/
|
|
19
|
-
* added dbxTextEditorFieldComponent ([9146403](https://github.com/dereekb/
|
|
27
|
+
* added dbxSearchableTextFieldComponent ([42ae14c](https://github.com/dereekb/dbx-components/commit/42ae14c7709f6603db676c94f1df2017fdad59ca))
|
|
28
|
+
* added dbxTextEditorFieldComponent ([9146403](https://github.com/dereekb/dbx-components/commit/9146403e26e7647181f66435db3597f0f64853ec))
|
|
20
29
|
|
|
21
30
|
|
|
22
31
|
|
package/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
@dereekb/date
|
|
2
2
|
=======
|
|
3
3
|
|
|
4
|
-
The sources for this package are in the main [@dereekb/
|
|
4
|
+
The sources for this package are in the main [@dereekb/dbx-components](https://github.com/dereekb/dbx-components) repo. Please file issues and pull requests against that repo.
|
|
5
5
|
|
|
6
6
|
License: MIT
|
package/package.json
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dereekb/date",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.0",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"main": "./src/index.js",
|
|
6
6
|
"typings": "./src/index.d.ts",
|
|
7
7
|
"dependencies": {
|
|
8
|
-
"@dereekb/util": "
|
|
8
|
+
"@dereekb/util": "2.0.0",
|
|
9
9
|
"extra-set": "^2.2.11",
|
|
10
|
+
"make-error": "^1.3.0",
|
|
10
11
|
"class-transformer": "^0.5.1",
|
|
11
12
|
"date-fns": "^2.28.0",
|
|
12
13
|
"class-validator": "^0.13.2",
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Maybe, ReadableTimeString, TimeAM, TimezoneString } from '@dereekb/util';
|
|
1
|
+
import { LogicalDateStringCode, Maybe, ReadableTimeString, TimeAM, TimezoneString } from '@dereekb/util';
|
|
2
2
|
import { LimitDateTimeConfig, LimitDateTimeInstance } from './date.time.limit';
|
|
3
3
|
import { DateTimezoneConversionConfig, DateTimezoneUtcNormalInstance } from './date.timezone';
|
|
4
4
|
export interface ParsedTimeString {
|
|
@@ -69,13 +69,14 @@ export declare class DateTimeUtilityInstance {
|
|
|
69
69
|
* @param config
|
|
70
70
|
* @returns
|
|
71
71
|
*/
|
|
72
|
-
timeStringToDate(input: ReadableTimeString, config?: ParseTimeString): Maybe<Date>;
|
|
73
|
-
_timeStringToDate(input: ReadableTimeString, config?: ParseTimeString): DateFromTimestringResult | ValidDateFromTimestringResult;
|
|
72
|
+
timeStringToDate(input: ReadableTimeString | LogicalDateStringCode, config?: ParseTimeString): Maybe<Date>;
|
|
73
|
+
_timeStringToDate(input: ReadableTimeString | LogicalDateStringCode, config?: ParseTimeString): DateFromTimestringResult | ValidDateFromTimestringResult;
|
|
74
74
|
private _normalizeInstanceForConfig;
|
|
75
75
|
}
|
|
76
76
|
export declare function dateTimeInstanceUtc(): DateTimeUtilityInstance;
|
|
77
77
|
export declare function dateTimeInstance(timezone?: Maybe<TimezoneString>): DateTimeUtilityInstance;
|
|
78
78
|
export declare function getTimeAM(date?: Date, timezone?: Maybe<TimezoneString>): TimeAM;
|
|
79
|
+
export declare function toLocalReadableTimeString(date: Date): ReadableTimeString;
|
|
79
80
|
export declare function toReadableTimeString(date: Date, timezone?: Maybe<TimezoneString>): ReadableTimeString;
|
|
80
81
|
/**
|
|
81
82
|
* Parses the input string relative to the timezone in the configuration.
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.limitDateTime = exports.readableTimeStringToDate = exports.parseReadableTimeString = exports.toReadableTimeString = exports.getTimeAM = exports.dateTimeInstance = exports.dateTimeInstanceUtc = exports.DateTimeUtilityInstance = exports.isValidDateFromTimestringResult = void 0;
|
|
3
|
+
exports.limitDateTime = exports.readableTimeStringToDate = exports.parseReadableTimeString = exports.toReadableTimeString = exports.toLocalReadableTimeString = exports.getTimeAM = exports.dateTimeInstance = exports.dateTimeInstanceUtc = exports.DateTimeUtilityInstance = exports.isValidDateFromTimestringResult = void 0;
|
|
4
|
+
const date_1 = require("@dereekb/date");
|
|
4
5
|
const date_fns_1 = require("date-fns");
|
|
5
6
|
const date_fns_tz_1 = require("date-fns-tz");
|
|
6
7
|
const util_1 = require("@dereekb/util");
|
|
@@ -74,6 +75,75 @@ class DateTimeUtilityInstance {
|
|
|
74
75
|
else {
|
|
75
76
|
input = input.trim();
|
|
76
77
|
}
|
|
78
|
+
let systemParsedDateTime;
|
|
79
|
+
let valid = false;
|
|
80
|
+
function parseTimeString() {
|
|
81
|
+
const formats = [
|
|
82
|
+
'h:mma',
|
|
83
|
+
'h:mm a',
|
|
84
|
+
'h a',
|
|
85
|
+
'ha',
|
|
86
|
+
'h:mm' // 1:20
|
|
87
|
+
];
|
|
88
|
+
// tslint:disable-next-line: prefer-for-of
|
|
89
|
+
for (let i = 0; i < formats.length; i += 1) {
|
|
90
|
+
systemParsedDateTime = (0, date_fns_1.parse)(input, formats[i], relativeDate);
|
|
91
|
+
if ((0, date_fns_1.isValid)(systemParsedDateTime)) {
|
|
92
|
+
valid = true;
|
|
93
|
+
break; // Use time.
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
if (!valid) {
|
|
97
|
+
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
|
+
switch (input.length) {
|
|
114
|
+
case 1:
|
|
115
|
+
case 2:
|
|
116
|
+
// 1
|
|
117
|
+
systemParsedDateTime = (0, date_fns_1.parse)(input, 'H', relativeDate);
|
|
118
|
+
break;
|
|
119
|
+
case 5:
|
|
120
|
+
// 120AM
|
|
121
|
+
input = removeAmPm(input);
|
|
122
|
+
systemParsedDateTime = parseDateTimeFromNumber(input);
|
|
123
|
+
break;
|
|
124
|
+
case 3:
|
|
125
|
+
// 120
|
|
126
|
+
systemParsedDateTime = parseDateTimeFromNumber(input);
|
|
127
|
+
break;
|
|
128
|
+
case 6:
|
|
129
|
+
// 1212AM
|
|
130
|
+
removeAmPm(input);
|
|
131
|
+
if (removedPm) {
|
|
132
|
+
removedPm = input[0] !== '2'; // If 2, ignore the PM part.
|
|
133
|
+
}
|
|
134
|
+
systemParsedDateTime = parseDateTimeAsHmm(input);
|
|
135
|
+
break;
|
|
136
|
+
default:
|
|
137
|
+
// 2200
|
|
138
|
+
systemParsedDateTime = parseDateTimeAsHmm(input);
|
|
139
|
+
break;
|
|
140
|
+
}
|
|
141
|
+
if (removedPm) {
|
|
142
|
+
systemParsedDateTime = (0, date_fns_1.addHours)(systemParsedDateTime, 12);
|
|
143
|
+
}
|
|
144
|
+
valid = (0, date_fns_1.isValid)(systemParsedDateTime);
|
|
145
|
+
}
|
|
146
|
+
}
|
|
77
147
|
/*
|
|
78
148
|
The input date needs to capture the right Day we want to parse on, since parse uses the system's information for hours/date information.
|
|
79
149
|
We do this by adding the offset of the system with the offset of the target timezone.
|
|
@@ -81,73 +151,13 @@ class DateTimeUtilityInstance {
|
|
|
81
151
|
const relativeDateNormal = new date_timezone_1.DateTimezoneUtcNormalInstance(config);
|
|
82
152
|
const relativeDate = relativeDateNormal.systemDateToTargetDate(inputDate);
|
|
83
153
|
// console.log('Relative Date: ', relativeDate, calculateAllConversions(inputDate, relativeDateNormal, (x) => millisecondsToHours(x)));
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
'h:mm a',
|
|
87
|
-
'h a',
|
|
88
|
-
'ha',
|
|
89
|
-
'h:mm' // 1:20
|
|
90
|
-
];
|
|
91
|
-
let systemParsedDateTime;
|
|
92
|
-
let valid = false;
|
|
93
|
-
// tslint:disable-next-line: prefer-for-of
|
|
94
|
-
for (let i = 0; i < formats.length; i += 1) {
|
|
95
|
-
systemParsedDateTime = (0, date_fns_1.parse)(input, formats[i], relativeDate);
|
|
96
|
-
if ((0, date_fns_1.isValid)(systemParsedDateTime)) {
|
|
97
|
-
valid = true;
|
|
98
|
-
break; // Use time.
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
if (!valid) {
|
|
102
|
-
input = input.trim().replace(/\s+/g, '');
|
|
103
|
-
let removedPm = false;
|
|
104
|
-
function removeAmPm(inputString) {
|
|
105
|
-
inputString = inputString.toLowerCase();
|
|
106
|
-
removedPm = inputString.indexOf('pm') !== -1;
|
|
107
|
-
inputString = inputString.replace(/\am|pm/g, '');
|
|
108
|
-
return inputString;
|
|
109
|
-
}
|
|
110
|
-
function parseDateTimeFromNumber(inputString) {
|
|
111
|
-
const hour = inputString[0];
|
|
112
|
-
const minute = inputString[1] + inputString[2];
|
|
113
|
-
return (0, date_fns_1.parse)(`${hour}:${minute}AM`, 'h:mma', relativeDate);
|
|
114
|
-
}
|
|
115
|
-
function parseDateTimeAsHmm(inputString) {
|
|
116
|
-
return (0, date_fns_1.parse)(inputString, 'Hmm', relativeDate);
|
|
117
|
-
}
|
|
118
|
-
switch (input.length) {
|
|
119
|
-
case 1:
|
|
120
|
-
case 2:
|
|
121
|
-
// 1
|
|
122
|
-
systemParsedDateTime = (0, date_fns_1.parse)(input, 'H', relativeDate);
|
|
123
|
-
break;
|
|
124
|
-
case 5:
|
|
125
|
-
// 120AM
|
|
126
|
-
input = removeAmPm(input);
|
|
127
|
-
systemParsedDateTime = parseDateTimeFromNumber(input);
|
|
128
|
-
break;
|
|
129
|
-
case 3:
|
|
130
|
-
// 120
|
|
131
|
-
systemParsedDateTime = parseDateTimeFromNumber(input);
|
|
132
|
-
break;
|
|
133
|
-
case 6:
|
|
134
|
-
// 1212AM
|
|
135
|
-
removeAmPm(input);
|
|
136
|
-
if (removedPm) {
|
|
137
|
-
removedPm = input[0] !== '2'; // If 2, ignore the PM part.
|
|
138
|
-
}
|
|
139
|
-
systemParsedDateTime = parseDateTimeAsHmm(input);
|
|
140
|
-
break;
|
|
141
|
-
default:
|
|
142
|
-
// 2200
|
|
143
|
-
systemParsedDateTime = parseDateTimeAsHmm(input);
|
|
144
|
-
break;
|
|
145
|
-
}
|
|
146
|
-
if (removedPm) {
|
|
147
|
-
systemParsedDateTime = (0, date_fns_1.addHours)(systemParsedDateTime, 12);
|
|
148
|
-
}
|
|
154
|
+
if ((0, util_1.isLogicalDateStringCode)(input)) {
|
|
155
|
+
systemParsedDateTime = (0, util_1.dateFromLogicalDate)(input);
|
|
149
156
|
valid = (0, date_fns_1.isValid)(systemParsedDateTime);
|
|
150
157
|
}
|
|
158
|
+
else {
|
|
159
|
+
parseTimeString();
|
|
160
|
+
}
|
|
151
161
|
// console.log('Parsed: ', systemParsedDateTime, relativeDate, input, inputDate, relativeDateNormal);
|
|
152
162
|
// Raw parse result is always UTC for that date.
|
|
153
163
|
// For example, 1AM will return 1AM UTC in a Date object.
|
|
@@ -190,6 +200,10 @@ function getTimeAM(date = new Date(), timezone) {
|
|
|
190
200
|
return dateTimeInstance(timezone).getTimeAM(date);
|
|
191
201
|
}
|
|
192
202
|
exports.getTimeAM = getTimeAM;
|
|
203
|
+
function toLocalReadableTimeString(date) {
|
|
204
|
+
return toReadableTimeString(date, (0, date_1.guessCurrentTimezone)());
|
|
205
|
+
}
|
|
206
|
+
exports.toLocalReadableTimeString = toLocalReadableTimeString;
|
|
193
207
|
function toReadableTimeString(date, timezone) {
|
|
194
208
|
return dateTimeInstance(timezone).toTimeString(date);
|
|
195
209
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.time.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.time.ts"],"names":[],"mappings":";;;AAAA,uCAA6H;AAC7H,6CAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"date.time.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.time.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AnyIterResult = exports.NextIterResult = exports.LastIterResult = exports.DateRRule = exports.DEFAULT_LAST_ITER_RESULT_MAX_ITERATIONS_ALLOWED = void 0;
|
|
4
|
-
const date_1 = require("
|
|
4
|
+
const date_1 = require("../date/date");
|
|
5
5
|
const rrule_1 = require("rrule");
|
|
6
6
|
// TODO: Fix typings in RRule, or better yet, add the given types up to RRule.
|
|
7
7
|
exports.DEFAULT_LAST_ITER_RESULT_MAX_ITERATIONS_ALLOWED = 10000;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.rrule.extension.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/rrule/date.rrule.extension.ts"],"names":[],"mappings":";;;
|
|
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;AAE9B,8EAA8E;AAEjE,QAAA,+CAA+C,GAAG,KAAK,CAAC;AAErE,MAAa,SAAU,SAAQ,aAAK;IAElC;;;;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;CAEF;AA/BD,8BA+BC;AAED;;GAEG;AACH,MAAe,aAAa;IAA5B;QACW,WAAM,GAAG,QAAQ,CAAC;QAKpB,UAAK,GAAW,CAAC,CAAC;QACf,WAAM,GAAgB,IAAI,CAAC;IAMvC,CAAC;IAJC,QAAQ;QACN,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;CAEF;AAED;;GAEG;AACH,MAAa,cAAe,SAAQ,aAAa;IAI/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;CAEF;AA/BD,wCA+BC;AAED,MAAa,cAAe,SAAQ,aAAa;IAI/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;CAEF;AA9BD,wCA8BC;AAED,MAAa,aAAc,SAAQ,aAAa;IAK9C,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,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;QAE/D,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,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;YAE9D,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;CAEF;AAzCD,sCAyCC"}
|