@dcupl/common 1.10.2 → 1.11.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/dist/browser/common.umd.js +1 -1
- package/dist/browser/common.umd.js.map +1 -1
- package/dist/esm/changeDetection.d.ts +9 -5
- package/dist/esm/changeDetection.js +45 -16
- package/dist/esm/changeDetection.js.map +1 -1
- package/dist/esm/helper.d.ts +15 -0
- package/dist/esm/helper.js +39 -0
- package/dist/esm/helper.js.map +1 -1
- package/dist/esm/performance.js +1 -1
- package/dist/esm/performance.js.map +1 -1
- package/dist/esm/query-builder.d.ts +5 -0
- package/dist/esm/query-builder.js +51 -1
- package/dist/esm/query-builder.js.map +1 -1
- package/dist/esm/types/app-loader.types.d.ts +1 -0
- package/dist/node/index.cjs.js +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -2,21 +2,25 @@ import { CallbackFunction, DcuplInitOptions } from './types';
|
|
|
2
2
|
import { AnalyticsController } from './analytics.controller';
|
|
3
3
|
export type DcuplUpdateScope = 'all' | 'global' | 'list' | 'list$';
|
|
4
4
|
export type DcuplUpdateTrigger = 'user' | 'loader';
|
|
5
|
-
export type DcuplUpdateType = '
|
|
5
|
+
export type DcuplUpdateType = 'data_change' | 'dcupl_destroyed' | 'dcupl_handle_datacontainer' | 'dcupl_initialized' | 'dcupl_updated_manually' | 'filter_many' | 'filter_one' | 'fn_aggregate' | 'fn_facets' | 'fn_groupBy' | 'fn_metadata' | 'fn_pivot' | 'fn_suggest' | 'list_created' | 'list_destroyed' | 'list_updated' | 'loader_added' | 'loader_config_fetched' | 'loader_data_fetched' | 'loader_models_fetched' | 'loader_scripts_fetched' | 'loader_processed' | 'loader_removed' | 'model_add' | 'query_apply_options' | 'query_apply' | 'query_execute' | 'query_get' | 'query_has' | 'query_many' | 'query_one' | 'query_remove' | 'query_reset' | 'result_updated' | 'view_add';
|
|
6
6
|
export type DcuplUpdateAction = 'update';
|
|
7
7
|
export type DcuplUpdateMessage = {
|
|
8
8
|
scope: DcuplUpdateScope;
|
|
9
|
+
type: DcuplUpdateType;
|
|
9
10
|
method?: string;
|
|
10
11
|
args?: any;
|
|
11
12
|
action?: DcuplUpdateAction;
|
|
12
|
-
type?: DcuplUpdateType;
|
|
13
|
-
name?: string;
|
|
14
13
|
origin?: DcuplUpdateTrigger;
|
|
14
|
+
start?: number;
|
|
15
|
+
end?: number;
|
|
15
16
|
duration?: number;
|
|
16
17
|
originCdRefKey?: string;
|
|
17
18
|
modelKey?: string;
|
|
19
|
+
listKey?: string;
|
|
20
|
+
result?: any;
|
|
18
21
|
cloneResult?: boolean;
|
|
19
|
-
|
|
22
|
+
connectMessage?: boolean;
|
|
23
|
+
connectMessageResult?: boolean;
|
|
20
24
|
};
|
|
21
25
|
export declare class ChangeDetector {
|
|
22
26
|
key: string;
|
|
@@ -37,4 +41,4 @@ export declare class ChangeDetector {
|
|
|
37
41
|
on(cb: CallbackFunction): () => void;
|
|
38
42
|
}
|
|
39
43
|
export declare const clone: (obj: any, shouldClone: boolean) => any;
|
|
40
|
-
export declare const trigger: (
|
|
44
|
+
export declare const trigger: (_msg: DcuplUpdateMessage) => any;
|
|
@@ -17,6 +17,8 @@ export class ChangeDetector {
|
|
|
17
17
|
if (this.parentCd) {
|
|
18
18
|
this.off = this.parentCd.on((msg) => {
|
|
19
19
|
if (msg.action === 'update' && msg.originCdRefKey === this.parentCd?.key) {
|
|
20
|
+
// prevent connect message relay if the message is coming from the parent
|
|
21
|
+
msg.connectMessage = false;
|
|
20
22
|
this.trigger(msg);
|
|
21
23
|
}
|
|
22
24
|
});
|
|
@@ -31,6 +33,11 @@ export class ChangeDetector {
|
|
|
31
33
|
if (!msg.originCdRefKey) {
|
|
32
34
|
msg.originCdRefKey = this.key;
|
|
33
35
|
}
|
|
36
|
+
if (!msg.start) {
|
|
37
|
+
msg.start = perf.now();
|
|
38
|
+
msg.end = msg.start;
|
|
39
|
+
msg.duration = 0;
|
|
40
|
+
}
|
|
34
41
|
this.updateListener.forEach((cb) => {
|
|
35
42
|
cb(msg);
|
|
36
43
|
});
|
|
@@ -53,30 +60,56 @@ export const clone = (obj, shouldClone) => {
|
|
|
53
60
|
return cloneDeep(obj);
|
|
54
61
|
}
|
|
55
62
|
};
|
|
56
|
-
const finish = (cdRef, msg, start, context, result) => {
|
|
63
|
+
const finish = (targetClass, cdRef, msg, start, context, result) => {
|
|
57
64
|
try {
|
|
58
65
|
const shouldClone = !!cdRef.dcuplInitOptions.performance?.clone?.enabled && !!msg.cloneResult;
|
|
59
66
|
const valueToReturn = clone(result, shouldClone);
|
|
67
|
+
if (msg.scope === 'list') {
|
|
68
|
+
if (targetClass.constructor.name === 'DcuplList') {
|
|
69
|
+
msg.listKey = targetClass.key;
|
|
70
|
+
msg.modelKey = targetClass.modelKey;
|
|
71
|
+
}
|
|
72
|
+
else if (targetClass.constructor.name === 'Catalog') {
|
|
73
|
+
msg.listKey = targetClass.cdRef?.key;
|
|
74
|
+
msg.modelKey = targetClass.model?.key;
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
if (msg.type === 'list_created') {
|
|
78
|
+
const listKey = msg.args[0].listKey;
|
|
79
|
+
if (listKey.startsWith('__global_list__')) {
|
|
80
|
+
return valueToReturn;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
if (msg.listKey?.startsWith('__global_list__')) {
|
|
84
|
+
return valueToReturn;
|
|
85
|
+
}
|
|
60
86
|
const end = perf.now();
|
|
61
|
-
|
|
62
|
-
|
|
87
|
+
const duration = end - start;
|
|
88
|
+
const roundedDuration = Math.round(duration * 1000) / 1000;
|
|
89
|
+
msg.duration = roundedDuration;
|
|
90
|
+
msg.start = start;
|
|
91
|
+
msg.end = end;
|
|
63
92
|
const value = {
|
|
64
93
|
duration: msg.duration,
|
|
65
94
|
};
|
|
66
95
|
if (msg.modelKey) {
|
|
67
96
|
value.model = msg.modelKey;
|
|
68
97
|
}
|
|
98
|
+
if (msg.connectMessageResult) {
|
|
99
|
+
msg.result = valueToReturn;
|
|
100
|
+
}
|
|
69
101
|
if (msg.args) {
|
|
70
102
|
value.args = msg.args;
|
|
71
103
|
}
|
|
104
|
+
cdRef?.trigger(msg);
|
|
72
105
|
cdRef.analyticsController.mark({
|
|
73
|
-
name: `${msg.
|
|
106
|
+
name: `${msg.type}:end`,
|
|
74
107
|
context: context,
|
|
75
108
|
});
|
|
76
109
|
cdRef.analyticsController.measure({
|
|
77
|
-
name: `${msg.
|
|
78
|
-
start: `${msg.
|
|
79
|
-
end: `${msg.
|
|
110
|
+
name: `${msg.type}`,
|
|
111
|
+
start: `${msg.type}:start`,
|
|
112
|
+
end: `${msg.type}:end`,
|
|
80
113
|
context: context,
|
|
81
114
|
detail: value,
|
|
82
115
|
});
|
|
@@ -86,18 +119,14 @@ const finish = (cdRef, msg, start, context, result) => {
|
|
|
86
119
|
return result;
|
|
87
120
|
}
|
|
88
121
|
};
|
|
89
|
-
export const trigger = (
|
|
122
|
+
export const trigger = (_msg) => {
|
|
90
123
|
const log = (_target, _propertyKey, descriptor) => {
|
|
91
124
|
const originalMethod = descriptor.value;
|
|
92
125
|
descriptor.value = function (...args) {
|
|
93
126
|
const cdRef = this.cdRef;
|
|
127
|
+
const msg = clone(_msg, true);
|
|
94
128
|
const start = perf.now();
|
|
95
|
-
|
|
96
|
-
if (msg.mergeAnalytics) {
|
|
97
|
-
}
|
|
98
|
-
else {
|
|
99
|
-
context = generateKey();
|
|
100
|
-
}
|
|
129
|
+
const context = generateKey();
|
|
101
130
|
cdRef.analyticsController.mark({
|
|
102
131
|
name: `${msg.name}:start`,
|
|
103
132
|
context,
|
|
@@ -115,11 +144,11 @@ export const trigger = (msg) => {
|
|
|
115
144
|
msg.args = args;
|
|
116
145
|
if (result && 'then' in result) {
|
|
117
146
|
return result.then((result) => {
|
|
118
|
-
return finish(cdRef, msg, start, context, result);
|
|
147
|
+
return finish(this, cdRef, msg, start, context, result);
|
|
119
148
|
});
|
|
120
149
|
}
|
|
121
150
|
else {
|
|
122
|
-
return finish(cdRef, msg, start, context, result);
|
|
151
|
+
return finish(this, cdRef, msg, start, context, result);
|
|
123
152
|
}
|
|
124
153
|
}
|
|
125
154
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changeDetection.js","sourceRoot":"","sources":["../../src/changeDetection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAGrC,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"changeDetection.js","sourceRoot":"","sources":["../../src/changeDetection.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/helper.d.ts
CHANGED
|
@@ -8,3 +8,18 @@ export declare function generateKey(length?: number): string;
|
|
|
8
8
|
export declare const removeTrailingSlash: (str: string) => string;
|
|
9
9
|
export declare const escapeRegExp: (text: string) => string;
|
|
10
10
|
export declare const unescapeRegExp: (escapedText: string) => string;
|
|
11
|
+
export declare const hasMinimumVersion: (version: string, minVersion: string) => boolean;
|
|
12
|
+
/**
|
|
13
|
+
* Compares two semantic version strings.
|
|
14
|
+
* @param v1 - First version string (e.g., "1.10.2").
|
|
15
|
+
* @param v2 - Second version string (e.g., "1.9.0").
|
|
16
|
+
* @returns A number: -1 if v1 < v2, 1 if v1 > v2, 0 if equal.
|
|
17
|
+
* @throws Error if the input is not a valid semantic version.
|
|
18
|
+
*/
|
|
19
|
+
export declare const compareVersions: (v1: string, v2: string) => number;
|
|
20
|
+
/**
|
|
21
|
+
* Validates if a string follows semantic versioning (x.y.z).
|
|
22
|
+
* @param version - Version string to validate.
|
|
23
|
+
* @returns True if valid, otherwise false.
|
|
24
|
+
*/
|
|
25
|
+
export declare const isValidVersion: (version: string) => boolean;
|
package/dist/esm/helper.js
CHANGED
|
@@ -60,4 +60,43 @@ export const unescapeRegExp = (escapedText) => {
|
|
|
60
60
|
return '';
|
|
61
61
|
return escapedText.replace(/\\([[\]{}()*+?.,\\^$|#])/g, '$1');
|
|
62
62
|
};
|
|
63
|
+
export const hasMinimumVersion = (version, minVersion) => {
|
|
64
|
+
try {
|
|
65
|
+
return compareVersions(version, minVersion) >= 0;
|
|
66
|
+
}
|
|
67
|
+
catch (err) {
|
|
68
|
+
return false;
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
/**
|
|
72
|
+
* Compares two semantic version strings.
|
|
73
|
+
* @param v1 - First version string (e.g., "1.10.2").
|
|
74
|
+
* @param v2 - Second version string (e.g., "1.9.0").
|
|
75
|
+
* @returns A number: -1 if v1 < v2, 1 if v1 > v2, 0 if equal.
|
|
76
|
+
* @throws Error if the input is not a valid semantic version.
|
|
77
|
+
*/
|
|
78
|
+
export const compareVersions = (v1, v2) => {
|
|
79
|
+
if (!isValidVersion(v1) || !isValidVersion(v2)) {
|
|
80
|
+
throw new Error(`Invalid version format: v1="${v1}", v2="${v2}". Expected format: "x.y.z"`);
|
|
81
|
+
}
|
|
82
|
+
const v1Parts = v1.split('.').map(Number);
|
|
83
|
+
const v2Parts = v2.split('.').map(Number);
|
|
84
|
+
for (let i = 0; i < 3; i++) {
|
|
85
|
+
const num1 = v1Parts[i] || 0; // Default to 0 if undefined (e.g., "1.2" treated as "1.2.0")
|
|
86
|
+
const num2 = v2Parts[i] || 0;
|
|
87
|
+
if (num1 > num2)
|
|
88
|
+
return 1;
|
|
89
|
+
if (num1 < num2)
|
|
90
|
+
return -1;
|
|
91
|
+
}
|
|
92
|
+
return 0;
|
|
93
|
+
};
|
|
94
|
+
/**
|
|
95
|
+
* Validates if a string follows semantic versioning (x.y.z).
|
|
96
|
+
* @param version - Version string to validate.
|
|
97
|
+
* @returns True if valid, otherwise false.
|
|
98
|
+
*/
|
|
99
|
+
export const isValidVersion = (version) => {
|
|
100
|
+
return /^\d+(\.\d+){0,2}$/.test(version);
|
|
101
|
+
};
|
|
63
102
|
//# sourceMappingURL=helper.js.map
|
package/dist/esm/helper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/helper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/helper.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/performance.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"performance.js","sourceRoot":"","sources":["../../src/performance.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,IAAI,GAAG;IAClB,GAAG,EAAE,GAAW,EAAE;QAChB,IAAI,OAAO,WAAW,KAAK,WAAW,IAAI,WAAW,CAAC,GAAG,EAAE,CAAC;YAC1D,OAAO,WAAW,CAAC,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"performance.js","sourceRoot":"","sources":["../../src/performance.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,IAAI,GAAG;IAClB,GAAG,EAAE,GAAW,EAAE;QAChB,IAAI,OAAO,WAAW,KAAK,WAAW,IAAI,WAAW,CAAC,GAAG,EAAE,CAAC;YAC1D,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;QACrD,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,IAAI,EAAE,CAAC,IAAY,EAAQ,EAAE;QAC3B,IAAI,OAAO,WAAW,KAAK,WAAW,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;YAC3D,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAC,IAAY,EAAE,KAAa,EAAE,GAAW,EAAQ,EAAE;QAC1D,IAAI,OAAO,WAAW,KAAK,WAAW,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YAC9D,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IACD,gBAAgB,CAAC,GAAW;QAC1B,IAAI,OAAO,WAAW,KAAK,WAAW,IAAI,WAAW,CAAC,gBAAgB,EAAE,CAAC;YACvE,OAAO,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,gBAAgB,CAAC,IAAY;QAC3B,IAAI,OAAO,WAAW,KAAK,WAAW,IAAI,WAAW,CAAC,gBAAgB,EAAE,CAAC;YACvE,OAAO,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF,CAAC"}
|
|
@@ -18,10 +18,15 @@ export declare class DcuplQueryBuilder {
|
|
|
18
18
|
groupKey: string;
|
|
19
19
|
queryKey?: string;
|
|
20
20
|
}): boolean;
|
|
21
|
+
validate(query: DcuplGlobalQueryOptions<any>): {
|
|
22
|
+
valid: boolean;
|
|
23
|
+
errors?: Error[];
|
|
24
|
+
};
|
|
21
25
|
applyOptions(options: DcuplItemsOptions<any>, mode?: 'set' | 'update'): DcuplGlobalQueryOptions<any>;
|
|
22
26
|
applyQuery(queryToApply: DcuplGlobalQueryOptions<any> | DcuplQueryGroup | DcuplQuery | DcuplQuery[] | DcuplQueryGroup[], options?: {
|
|
23
27
|
mode?: 'set' | 'add';
|
|
24
28
|
}, relevantQuery?: DcuplGlobalQueryOptions<any>): DcuplGlobalQueryOptions<any>;
|
|
25
29
|
removeAllQueries(): DcuplGlobalQueryOptions<any>;
|
|
26
30
|
removeQuery(queryToRemove: Partial<DcuplQueryGroup | DcuplQuery>, relevantQuery?: DcuplGlobalQueryOptions<any>): DcuplGlobalQueryOptions<any>;
|
|
31
|
+
private validateQuery;
|
|
27
32
|
}
|
|
@@ -1,4 +1,13 @@
|
|
|
1
|
-
import { cloneDeep, findIndex } from 'lodash-es';
|
|
1
|
+
import { cloneDeep, every, findIndex } from 'lodash-es';
|
|
2
|
+
class DcuplQueryError extends Error {
|
|
3
|
+
query;
|
|
4
|
+
constructor(message, query) {
|
|
5
|
+
const msg = `Query Error: ${message} in ${JSON.stringify(query, null, 2)}`;
|
|
6
|
+
super(msg);
|
|
7
|
+
this.query = query;
|
|
8
|
+
this.name = 'DcuplQueryError';
|
|
9
|
+
}
|
|
10
|
+
}
|
|
2
11
|
export class DcuplQueryBuilder {
|
|
3
12
|
_defaultQueryOptions = {
|
|
4
13
|
modelKey: '',
|
|
@@ -48,6 +57,11 @@ export class DcuplQueryBuilder {
|
|
|
48
57
|
}
|
|
49
58
|
return false;
|
|
50
59
|
}
|
|
60
|
+
validate(query) {
|
|
61
|
+
const errors = query.queries.map((q) => this.validateQuery(q));
|
|
62
|
+
const valid = every(errors, (e) => e.valid);
|
|
63
|
+
return { valid, errors: errors.map((e) => e.errors).flat() };
|
|
64
|
+
}
|
|
51
65
|
applyOptions(options, mode = 'update') {
|
|
52
66
|
if (mode === 'set') {
|
|
53
67
|
this.currentQuery.count = options.count;
|
|
@@ -179,5 +193,41 @@ export class DcuplQueryBuilder {
|
|
|
179
193
|
}
|
|
180
194
|
return relevantQuery;
|
|
181
195
|
}
|
|
196
|
+
validateQuery(query) {
|
|
197
|
+
const errors = [];
|
|
198
|
+
if (this.isQuery(query)) {
|
|
199
|
+
if (!query.attribute) {
|
|
200
|
+
errors.push(new DcuplQueryError('Missing attribute', query));
|
|
201
|
+
}
|
|
202
|
+
if (!query.operator) {
|
|
203
|
+
errors.push(new DcuplQueryError('Missing operator', query));
|
|
204
|
+
}
|
|
205
|
+
if (typeof query.value === 'undefined') {
|
|
206
|
+
errors.push(new DcuplQueryError('Missing value', query));
|
|
207
|
+
}
|
|
208
|
+
if (query.operator === 'find' && Array.isArray(query.value)) {
|
|
209
|
+
errors.push(new DcuplQueryError('find operator cannot have array value', query));
|
|
210
|
+
}
|
|
211
|
+
if (errors.length > 0) {
|
|
212
|
+
return { valid: false, errors: errors };
|
|
213
|
+
}
|
|
214
|
+
else {
|
|
215
|
+
return { valid: true };
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
else if (this.isQueryGroup(query)) {
|
|
219
|
+
const queryErrors = query.queries.map((q) => this.validateQuery(q));
|
|
220
|
+
const invalidQueries = queryErrors.filter((q) => !q.valid);
|
|
221
|
+
const errors = invalidQueries.map((q) => q.errors).flat();
|
|
222
|
+
if (errors.length > 0) {
|
|
223
|
+
return { valid: false, errors: errors };
|
|
224
|
+
}
|
|
225
|
+
else {
|
|
226
|
+
return { valid: true };
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
errors.push(new DcuplQueryError('Invalid query definition', query));
|
|
230
|
+
return { valid: false, errors: errors };
|
|
231
|
+
}
|
|
182
232
|
}
|
|
183
233
|
//# sourceMappingURL=query-builder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-builder.js","sourceRoot":"","sources":["../../src/query-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"query-builder.js","sourceRoot":"","sources":["../../src/query-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAGxD,MAAM,eAAgB,SAAQ,KAAK;IAC1B,KAAK,CAA+B;IAE3C,YAAY,OAAe,EAAE,KAAmC;QAC9D,MAAM,GAAG,GAAG,gBAAgB,OAAO,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;QAC3E,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;IAChC,CAAC;CACF;AAED,MAAM,OAAO,iBAAiB;IACpB,oBAAoB,GAAiC;QAC3D,QAAQ,EAAE,EAAE;QACZ,QAAQ,EAAE,MAAM;QAChB,SAAS,EAAE,KAAK;QAChB,OAAO,EAAE,EAAE;KACZ,CAAC;IACM,YAAY,CAAO;IACnB,YAAY,GAAiC,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAE1F,gBAAe,CAAC;IAET,IAAI,CAAC,OAA6B;QACvC,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;QACvC,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACzD,IAAI,CAAC,YAAY,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAChD,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IACzB,CAAC;IAEM,OAAO,CAAC,KAAqD;QAClE,OAAO,WAAW,IAAI,KAAK,CAAC;IAC9B,CAAC;IACM,YAAY,CAAC,KAAqD;QACvE,OAAO,UAAU,IAAI,KAAK,CAAC;IAC7B,CAAC;IAEM,gBAAgB,CACrB,YAAoG;QAEpG,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,YAAY,CAAC,QAAQ,KAAK,MAAM,CAAC;IAC7E,CAAC;IAEM,aAAa,CAAC,QAAiB;QACpC,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAE/E,CAAC;IAChB,CAAC;IAEM,QAAQ;QACb,OAAO,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACtC,CAAC;IAEM,aAAa,CAAC,QAAgB;QACnC,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;IAC5G,CAAC;IAEM,GAAG,CAAC,OAAgD;QACzD,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACzC,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAEnD,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;YACvF,CAAC;QACH,CAAC;aAAM,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,QAAQ,CAAC,KAAmC;QACjD,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAa,EAAE,CAAC;IAC1E,CAAC;IAEM,YAAY,CACjB,OAA+B,EAC/B,OAAyB,QAAQ;QAEjC,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YACnB,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;YACxC,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;YACxC,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YACtC,IAAI,CAAC,YAAY,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,IAAI,OAAO,OAAO,EAAE,IAAI,KAAK,WAAW,EAAE,CAAC;gBACzC,IAAI,CAAC,YAAa,CAAC,IAAI,GAAG,OAAO,CAAC,IAA8B,CAAC;YACnE,CAAC;YACD,IAAI,OAAO,OAAO,EAAE,KAAK,KAAK,WAAW,EAAE,CAAC;gBAC1C,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;YAC1C,CAAC;YACD,IAAI,OAAO,OAAO,EAAE,KAAK,KAAK,WAAW,EAAE,CAAC;gBAC1C,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,OAAO,EAAE,KAAK,CAAC;YAC3C,CAAC;YACD,IAAI,OAAO,OAAO,EAAE,UAAU,KAAK,WAAW,EAAE,CAAC;gBAC/C,IAAI,CAAC,YAAY,CAAC,UAAU,GAAG,OAAO,EAAE,UAAU,CAAC;YACrD,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IACzB,CAAC;IAEM,UAAU,CACf,YAA4G,EAC5G,OAAkC,EAClC,aAA4C;QAE5C,IAAI,CAAC,aAAa;YAAE,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;QAEtD,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YAChC,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;gBACjC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE,CAAC;YAC/C,IAAI,YAAY,CAAC,SAAS;gBAAE,aAAa,CAAC,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC;YAC7E,0EAA0E;YAE1E,IAAI,OAAO,EAAE,IAAI,KAAK,KAAK,EAAE,CAAC;gBAC5B,aAAa,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACN,aAAa,CAAC,OAAO,GAAG,CAAC,GAAG,aAAa,CAAC,OAAO,EAAE,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;YAC9E,CAAC;YAED,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QACzC,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACtC,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAC,SAAS,CACzC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,KAAK,YAAY,CAAC,SAAS,CACjF,CAAC;YAEF,IAAI,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC;gBACb,MAAM,UAAU,GAAoB,aAAa,CAAC,OAAO,CAAC,GAAG,CAAoB,CAAC;gBAElF,IAAI,OAAO,EAAE,IAAI,KAAK,KAAK,EAAE,CAAC;oBAC5B,UAAU,CAAC,OAAO,GAAG,CAAC,YAAY,CAAC,CAAC;gBACtC,CAAC;qBAAM,CAAC;oBACN,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACxC,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC;oBACzB,QAAQ,EAAE,YAAY,CAAC,SAAS;oBAChC,SAAS,EAAE,IAAI;oBACf,OAAO,EAAE,CAAC,YAAY,CAAC;iBACxB,CAAC,CAAC;YACL,CAAC;YACD,qBAAqB;QACvB,CAAC;aAAM,IAAI,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC;YAC3C,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAC,SAAS,CACzC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,KAAK,YAAY,CAAC,QAAQ,CAChF,CAAC;YACF,IAAI,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC;gBACb,MAAM,UAAU,GAAoB,aAAa,CAAC,OAAO,CAAC,GAAG,CAAoB,CAAC;gBAClF,IAAI,YAAY,CAAC,SAAS;oBAAE,UAAU,CAAC,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC;gBAC1E,uEAAuE;gBACvE,IAAI,OAAO,EAAE,IAAI,KAAK,KAAK,EAAE,CAAC;oBAC5B,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC;gBAC5C,CAAC;qBAAM,CAAC;oBACN,UAAU,CAAC,OAAO,GAAG,CAAC,GAAG,UAAU,CAAC,OAAO,EAAE,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;gBACxE,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC;oBACzB,QAAQ,EAAE,YAAY,CAAC,QAAQ;oBAC/B,SAAS,EAAE,YAAY,CAAC,SAAS,IAAI,IAAI;oBACzC,OAAO,EAAE,YAAY,CAAC,OAAO;oBAC7B,iCAAiC;iBAClC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IAEM,gBAAgB;QACrB,IAAI,CAAC,YAAY,CAAC,OAAO,GAAG,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IACzB,CAAC;IAEM,WAAW,CAChB,aAAoD,EACpD,aAA4C;QAE5C,uBAAuB;QAEvB,IAAI,CAAC,aAAa;YAAE,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;QAEtD,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;YAChC,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAC,SAAS,CACzC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,KAAK,aAAa,CAAC,SAAS,CAClF,CAAC;YAEF,IAAI,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC;gBACb,MAAM,UAAU,GAAoB,aAAa,CAAC,OAAO,CAAC,GAAG,CAAoB,CAAC;gBAElF,MAAM,kBAAkB,GAAG,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;gBACxE,IAAI,kBAAkB,GAAG,CAAC,CAAC,EAAE,CAAC;oBAC5B,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;gBACnD,CAAC;gBAED,IAAI,UAAU,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACpC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;gBACvC,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC;YAC5C,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAC,SAAS,CACzC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,KAAK,aAAa,CAAC,QAAQ,CACjF,CAAC;YACF,IAAI,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC;gBACb,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;oBAC3B,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;gBACvC,CAAC;qBAAM,CAAC;oBACN,MAAM,UAAU,GAAoB,aAAa,CAAC,OAAO,CAAC,GAAG,CAAoB,CAAC;oBAClF,KAAK,MAAM,CAAC,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC;wBACtC,MAAM,kBAAkB,GAAG,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;wBAC5D,IAAI,kBAAkB,GAAG,CAAC,CAAC,EAAE,CAAC;4BAC5B,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;wBACnD,CAAC;oBACH,CAAC;oBACD,IAAI,UAAU,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBACpC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;oBACvC,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IAEO,aAAa,CAAC,KAAmC;QACvD,MAAM,MAAM,GAAsB,EAAE,CAAC;QACrC,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;gBACrB,MAAM,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC,CAAC;YAC/D,CAAC;YAED,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACpB,MAAM,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC,CAAC;YAC9D,CAAC;YAED,IAAI,OAAO,KAAK,CAAC,KAAK,KAAK,WAAW,EAAE,CAAC;gBACvC,MAAM,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC,CAAC;YAC3D,CAAC;YAED,IAAI,KAAK,CAAC,QAAQ,KAAK,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC5D,MAAM,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,uCAAuC,EAAE,KAAK,CAAC,CAAC,CAAC;YACnF,CAAC;YAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;YAC1C,CAAC;iBAAM,CAAC;gBACN,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;YACzB,CAAC;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YACpC,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;YACpE,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAC3D,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAuB,CAAC;YAC/E,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;YAC1C,CAAC;iBAAM,CAAC;gBACN,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;YACzB,CAAC;QACH,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAC,CAAC;QACpE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAC1C,CAAC;CACF"}
|