@useparagon/core 1.0.8-canary.2 → 1.0.8-canary.3
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/integration/custom.integration.interface.d.ts +5 -20
- package/dist/resolvers/resolver.utils.js +14 -5
- package/dist/resolvers/resolver.utils.js.map +1 -1
- package/dist/triggers/cron/cron.interface.d.ts +2 -7
- package/dist/triggers/cron/cron.interface.js +0 -1
- package/dist/triggers/cron/cron.interface.js.map +1 -1
- package/dist/triggers/cron/cron.utils.d.ts +2 -2
- package/dist/triggers/cron/cron.utils.js +28 -58
- package/dist/triggers/cron/cron.utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -14,8 +14,6 @@ export type ICustomIntegrationConfig = {
|
|
|
14
14
|
workflowDisplayOrder: Constructable<IWorkflow>[];
|
|
15
15
|
theme?: ConnectPortalThemeValues;
|
|
16
16
|
overviewText?: string;
|
|
17
|
-
} & ({
|
|
18
|
-
authenticationType: 'basic';
|
|
19
17
|
apiBaseUrl: string;
|
|
20
18
|
testEndpointPath: string;
|
|
21
19
|
authorization: {
|
|
@@ -33,7 +31,11 @@ export type ICustomIntegrationConfig = {
|
|
|
33
31
|
headers: Record<string, string>;
|
|
34
32
|
} | {
|
|
35
33
|
type: 'oauth-client-credential';
|
|
34
|
+
} | {
|
|
35
|
+
type: 'oauth-refresh-token';
|
|
36
36
|
};
|
|
37
|
+
} & ({
|
|
38
|
+
authenticationType: 'basic';
|
|
37
39
|
} | {
|
|
38
40
|
authenticationType: 'oauth';
|
|
39
41
|
authorizationUrl: string;
|
|
@@ -41,27 +43,10 @@ export type ICustomIntegrationConfig = {
|
|
|
41
43
|
scopes: string;
|
|
42
44
|
includeClientIdAndSecrets?: boolean;
|
|
43
45
|
usePKCEInCodeExchange: boolean;
|
|
44
|
-
apiBaseUrl: string;
|
|
45
|
-
testEndpointPath: string;
|
|
46
|
-
authorization: {
|
|
47
|
-
type: 'bearer';
|
|
48
|
-
token: string;
|
|
49
|
-
} | {
|
|
50
|
-
type: 'basic';
|
|
51
|
-
userName: string;
|
|
52
|
-
password: string;
|
|
53
|
-
} | {
|
|
54
|
-
type: 'query_params';
|
|
55
|
-
params: Record<string, string>;
|
|
56
|
-
} | {
|
|
57
|
-
type: 'auth_header';
|
|
58
|
-
headers: Record<string, string>;
|
|
59
|
-
} | {
|
|
60
|
-
type: 'oauth-client-credential';
|
|
61
|
-
};
|
|
62
46
|
} | {
|
|
63
47
|
authenticationType: 'oauth_client_credential';
|
|
64
48
|
accessTokenUrl: string;
|
|
49
|
+
audience?: string;
|
|
65
50
|
});
|
|
66
51
|
export interface ICustomIntegration {
|
|
67
52
|
name: string;
|
|
@@ -54,11 +54,19 @@ const resolveToSource = (value, dataType, dependencies) => {
|
|
|
54
54
|
}
|
|
55
55
|
else if (typeof value === 'string' &&
|
|
56
56
|
(value.includes(context_constants_1.TokenizedIdentifiers.START) ||
|
|
57
|
-
value.includes('{{settings.oauthAccessToken}}')
|
|
57
|
+
value.includes('{{settings.oauthAccessToken}}') ||
|
|
58
|
+
value.includes('{{settings.ClientID}}') ||
|
|
59
|
+
value.includes('{{settings.ClientSecret}}'))) {
|
|
58
60
|
let sanitizedValue = value;
|
|
59
61
|
if (sanitizedValue.includes('{{settings.oauthAccessToken}}')) {
|
|
60
62
|
sanitizedValue = sanitizedValue.replaceAll('{{settings.oauthAccessToken}}', `${context_constants_1.TokenizedIdentifiers.START}${context_interface_1.ProxyVariableSourceType.OAUTH_ACCESS_TOKEN}::${context_constants_1.TokenizedIdentifiers.END}`);
|
|
61
63
|
}
|
|
64
|
+
if (sanitizedValue.includes('{{settings.ClientID}}')) {
|
|
65
|
+
sanitizedValue = sanitizedValue.replaceAll('{{settings.ClientID}}', `${context_constants_1.TokenizedIdentifiers.START}${context_interface_1.ProxyVariableSourceType.WORKFLOW_INPUT_REFERENCE}:clientId:${context_constants_1.TokenizedIdentifiers.END}`);
|
|
66
|
+
}
|
|
67
|
+
if (sanitizedValue.includes('{{settings.ClientSecret}}')) {
|
|
68
|
+
sanitizedValue = sanitizedValue.replaceAll('{{settings.ClientSecret}}', `${context_constants_1.TokenizedIdentifiers.START}${context_interface_1.ProxyVariableSourceType.WORKFLOW_INPUT_REFERENCE}:clientSecret:${context_constants_1.TokenizedIdentifiers.END}`);
|
|
69
|
+
}
|
|
62
70
|
const parts = tokenizedStringToParts(sanitizedValue);
|
|
63
71
|
return {
|
|
64
72
|
dataType,
|
|
@@ -69,13 +77,14 @@ const resolveToSource = (value, dataType, dependencies) => {
|
|
|
69
77
|
.replace(context_constants_1.TokenizedIdentifiers.START, '')
|
|
70
78
|
.replace(context_constants_1.TokenizedIdentifiers.END, '');
|
|
71
79
|
const [type, typeId, paths] = sanitizedPart.split(':');
|
|
80
|
+
const path = paths.trim() ? paths.split('.') : [];
|
|
72
81
|
switch (type) {
|
|
73
82
|
case context_interface_1.ProxyVariableSourceType.STEP_REFERENCE:
|
|
74
83
|
return {
|
|
75
84
|
dataType,
|
|
76
85
|
type: 'VARIABLE',
|
|
77
86
|
stepId: (0, step_utils_1.extractCorrectStepId)(typeId, dependencies),
|
|
78
|
-
path
|
|
87
|
+
path,
|
|
79
88
|
};
|
|
80
89
|
case context_interface_1.ProxyVariableSourceType.SAME_STEP_REFERENCE:
|
|
81
90
|
return {
|
|
@@ -83,12 +92,12 @@ const resolveToSource = (value, dataType, dependencies) => {
|
|
|
83
92
|
type: 'SAME_STEP_REFERENCE',
|
|
84
93
|
name: 'pageToken',
|
|
85
94
|
stepId: (0, step_utils_1.extractCorrectStepId)(typeId, dependencies),
|
|
86
|
-
path
|
|
95
|
+
path,
|
|
87
96
|
};
|
|
88
97
|
case context_interface_1.ProxyVariableSourceType.PERSONA_META_REFERENCE:
|
|
89
98
|
return {
|
|
90
99
|
type: 'PERSONA_METADATA',
|
|
91
|
-
path
|
|
100
|
+
path,
|
|
92
101
|
};
|
|
93
102
|
case context_interface_1.ProxyVariableSourceType.PERSONA_ENDUSERID_REFERENCE:
|
|
94
103
|
return {
|
|
@@ -115,7 +124,7 @@ const resolveToSource = (value, dataType, dependencies) => {
|
|
|
115
124
|
return (0, inputs_1.fixDataSourceReferencesInInputSource)({
|
|
116
125
|
type: 'CONNECT_CREDENTIAL_FIELD',
|
|
117
126
|
fieldType: 'WORKFLOW_SETTING',
|
|
118
|
-
path
|
|
127
|
+
path,
|
|
119
128
|
inputId: typeId,
|
|
120
129
|
}, dependencies);
|
|
121
130
|
case context_interface_1.ProxyVariableSourceType.SECRET_REFERENCE:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.utils.js","sourceRoot":"","sources":["../../src/resolvers/resolver.utils.ts"],"names":[],"mappings":";;;AAAA,sEAAsE;AACtE,sEAAyE;AACzE,8DAAoE;AACpE,sCAAiE;AACjE,sCAA8C;AAC9C,sFAGwD;AAExD,oDAA2D;AAC3D,+DAO+B;AAO/B,MAAM,sBAAsB,GAAG,CAAC,KAAa,EAAY,EAAE;IACzD,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,KAAK,GAAW,CAAC,CAAC;IACtB,KAAK;SACF,KAAK,CAAC,yCAAyC,CAAC;SAChD,OAAO,CAAC,CAAC,IAAY,EAAE,EAAE,CACxB,IAAI,KAAK,wCAAoB,CAAC,KAAK;QACjC,CAAC,CAAC,KAAK,EAAE;QACT,CAAC,CAAC,IAAI,KAAK,wCAAoB,CAAC,GAAG,IAAI,KAAK,GAAG,CAAC;YAC9C,CAAC,CAAC,KAAK,EAAE;YACT,CAAC,CAAC,KAAK,GAAG,CAAC;gBACT,CAAC,CAAC,KAAK,CAAC,IAAI,CACR,GAAG,wCAAoB,CAAC,KAAK,GAAG,IAAI,GAAG,wCAAoB,CAAC,GAAG,EAAE,CAClE;gBACH,CAAC,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CACjC,CAAC;IACJ,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAOF,MAAM,WAAW,GAAG,CAAC,SAAkB,EAAW,EAAE;IAClD,IACE,CAAC,SAAS;QACV,CAAC,CAAC,OAAO,SAAS,KAAK,QAAQ,IAAI,OAAO,SAAS,KAAK,QAAQ,CAAC,EACjE,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;SAAM,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;QACzC,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACzC,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;gBACxB,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAQK,MAAM,eAAe,GAAG,CAC7B,KAAc,EACd,QAAW,EACX,YAA+B,EACpB,EAAE;IACb,IAAI,IAAA,uBAAO,EAAC,KAAK,CAAC,EAAE,CAAC;QACnB,OAAO,IAAA,6BAAa,EAAC,KAAK,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;IACtD,CAAC;SAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE,CAAC;QACnE,OAAO;YACL,QAAQ;YACR,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,KAAK;SACQ,CAAC;IACzB,CAAC;SAAM,IACL,OAAO,KAAK,KAAK,QAAQ;QACzB,CAAC,KAAK,CAAC,QAAQ,CAAC,wCAAoB,CAAC,KAAK,CAAC;YACzC,KAAK,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"resolver.utils.js","sourceRoot":"","sources":["../../src/resolvers/resolver.utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,7 @@ export declare enum Unit {
|
|
|
6
6
|
MINUTES = "MINUTES",
|
|
7
7
|
HOURLY = "HOURLY",
|
|
8
8
|
DAILY = "DAILY",
|
|
9
|
-
WEEKLY = "WEEKLY"
|
|
10
|
-
CUSTOM = "CUSTOM"
|
|
9
|
+
WEEKLY = "WEEKLY"
|
|
11
10
|
}
|
|
12
11
|
export declare enum Weekday {
|
|
13
12
|
MONDAY = "MONDAY",
|
|
@@ -45,11 +44,7 @@ export type WeeklySchedule<T = Time> = {
|
|
|
45
44
|
weekday: Weekday;
|
|
46
45
|
time: T;
|
|
47
46
|
};
|
|
48
|
-
export type
|
|
49
|
-
unit: Unit.CUSTOM;
|
|
50
|
-
expression: string;
|
|
51
|
-
};
|
|
52
|
-
export type Schedule = SecondsSchedule | MinutesSchedule | HourlySchedule | DailySchedule | WeeklySchedule | CustomSchedule;
|
|
47
|
+
export type Schedule = SecondsSchedule | MinutesSchedule | HourlySchedule | DailySchedule | WeeklySchedule;
|
|
53
48
|
export type Timezone = {
|
|
54
49
|
offset: string;
|
|
55
50
|
label: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron.interface.js","sourceRoot":"","sources":["../../../src/triggers/cron/cron.interface.ts"],"names":[],"mappings":";;;AAIA,IAAY,
|
|
1
|
+
{"version":3,"file":"cron.interface.js","sourceRoot":"","sources":["../../../src/triggers/cron/cron.interface.ts"],"names":[],"mappings":";;;AAIA,IAAY,IAMX;AAND,WAAY,IAAI;IACd,2BAAmB,CAAA;IACnB,2BAAmB,CAAA;IACnB,yBAAiB,CAAA;IACjB,uBAAe,CAAA;IACf,yBAAiB,CAAA;AACnB,CAAC,EANW,IAAI,oBAAJ,IAAI,QAMf;AAED,IAAY,OAQX;AARD,WAAY,OAAO;IACjB,4BAAiB,CAAA;IACjB,8BAAmB,CAAA;IACnB,kCAAuB,CAAA;IACvB,gCAAqB,CAAA;IACrB,4BAAiB,CAAA;IACjB,gCAAqB,CAAA;IACrB,4BAAiB,CAAA;AACnB,CAAC,EARW,OAAO,uBAAP,OAAO,QAQlB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Schedule } from './cron.interface';
|
|
2
|
-
export declare const getCronOptions: (schedule: Schedule
|
|
2
|
+
export declare const getCronOptions: (schedule: Schedule) => {
|
|
3
3
|
cron: string;
|
|
4
|
-
|
|
4
|
+
timeZone?: string;
|
|
5
5
|
};
|
|
6
6
|
export declare const getSchedule: (cron: string, timezone?: string) => Schedule;
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getSchedule = exports.getCronOptions = void 0;
|
|
4
4
|
const cron_parser_1 = require("cron-parser");
|
|
5
5
|
const cron_interface_1 = require("./cron.interface");
|
|
6
|
-
const getCronOptions = (schedule
|
|
6
|
+
const getCronOptions = (schedule) => {
|
|
7
7
|
switch (schedule.unit) {
|
|
8
8
|
case cron_interface_1.Unit.SECONDS:
|
|
9
9
|
return { cron: `*/${schedule.seconds} * * * * *` };
|
|
@@ -20,7 +20,7 @@ const getCronOptions = (schedule, timezone = 'America/Los_Angeles') => {
|
|
|
20
20
|
const dailyHours = Math.floor(schedule.time.minutes / 60);
|
|
21
21
|
return {
|
|
22
22
|
cron: `0 ${dailyMinutes} ${dailyHours} */${schedule.days} * *`,
|
|
23
|
-
|
|
23
|
+
timeZone: 'America/Los_Angeles',
|
|
24
24
|
};
|
|
25
25
|
case cron_interface_1.Unit.WEEKLY:
|
|
26
26
|
const weeklyMinutes = schedule.time.minutes % 60;
|
|
@@ -28,26 +28,11 @@ const getCronOptions = (schedule, timezone = 'America/Los_Angeles') => {
|
|
|
28
28
|
const weeklyWeekday = Object.keys(cron_interface_1.Weekday).indexOf(schedule.weekday) + 1;
|
|
29
29
|
return {
|
|
30
30
|
cron: `0 ${weeklyMinutes} ${weeklyHours} * * ${weeklyWeekday}`,
|
|
31
|
-
|
|
32
|
-
};
|
|
33
|
-
case cron_interface_1.Unit.CUSTOM:
|
|
34
|
-
return {
|
|
35
|
-
cron: schedule.expression,
|
|
31
|
+
timeZone: 'America/Los_Angeles',
|
|
36
32
|
};
|
|
37
33
|
}
|
|
38
34
|
};
|
|
39
35
|
exports.getCronOptions = getCronOptions;
|
|
40
|
-
const extractMinutes = (cronExpression) => {
|
|
41
|
-
const expressionParts = cronExpression.split(' ');
|
|
42
|
-
const minutePart = expressionParts.length === 5 ? expressionParts[0] : expressionParts[1];
|
|
43
|
-
return minutePart.replace('*/', '');
|
|
44
|
-
};
|
|
45
|
-
const sanitizeExpression = (cronExpression) => {
|
|
46
|
-
const parts = cronExpression.split(' ');
|
|
47
|
-
return parts.length > 5
|
|
48
|
-
? parts.slice(parts.length - 5, parts.length).join(' ')
|
|
49
|
-
: parts.join(' ');
|
|
50
|
-
};
|
|
51
36
|
const getSchedule = (cron, timezone = 'America/Los_Angeles') => {
|
|
52
37
|
const parser = (0, cron_parser_1.parseExpression)(cron);
|
|
53
38
|
const firstIteration = parser.next().toDate();
|
|
@@ -61,59 +46,44 @@ const getSchedule = (cron, timezone = 'America/Los_Angeles') => {
|
|
|
61
46
|
}
|
|
62
47
|
const diffMinutes = Math.floor(diffSeconds / 60);
|
|
63
48
|
if (diffMinutes < 60) {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
}
|
|
69
|
-
else {
|
|
70
|
-
return {
|
|
71
|
-
unit: cron_interface_1.Unit.MINUTES,
|
|
72
|
-
minutes: minutesFromExpression,
|
|
73
|
-
};
|
|
74
|
-
}
|
|
49
|
+
return {
|
|
50
|
+
unit: cron_interface_1.Unit.MINUTES,
|
|
51
|
+
minutes: diffMinutes,
|
|
52
|
+
};
|
|
75
53
|
}
|
|
76
54
|
const diffHours = Math.floor(diffMinutes / 60);
|
|
77
55
|
if (diffHours < 24) {
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
hours: diffHours,
|
|
84
|
-
offset,
|
|
85
|
-
}
|
|
86
|
-
: { unit: cron_interface_1.Unit.CUSTOM, expression: sanitizeExpression(cron) };
|
|
56
|
+
return {
|
|
57
|
+
unit: cron_interface_1.Unit.HOURLY,
|
|
58
|
+
hours: diffHours,
|
|
59
|
+
offset: (diffMinutes / 60) % 60,
|
|
60
|
+
};
|
|
87
61
|
}
|
|
88
62
|
const diffDays = Math.floor(diffHours / 24);
|
|
89
63
|
const minutes = firstIteration.getHours() * 60 + firstIteration.getMinutes();
|
|
90
64
|
if (diffDays !== 7) {
|
|
91
|
-
return
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
}
|
|
100
|
-
: { unit: cron_interface_1.Unit.CUSTOM, expression: sanitizeExpression(cron) };
|
|
65
|
+
return {
|
|
66
|
+
unit: cron_interface_1.Unit.DAILY,
|
|
67
|
+
days: diffDays,
|
|
68
|
+
time: {
|
|
69
|
+
minutes,
|
|
70
|
+
timezone,
|
|
71
|
+
},
|
|
72
|
+
};
|
|
101
73
|
}
|
|
102
74
|
const weekday = new Intl.DateTimeFormat('en-US', {
|
|
103
75
|
weekday: 'long',
|
|
104
76
|
})
|
|
105
77
|
.format(firstIteration)
|
|
106
78
|
.toUpperCase();
|
|
107
|
-
return
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
}
|
|
116
|
-
: { unit: cron_interface_1.Unit.CUSTOM, expression: sanitizeExpression(cron) };
|
|
79
|
+
return {
|
|
80
|
+
unit: cron_interface_1.Unit.WEEKLY,
|
|
81
|
+
weekday,
|
|
82
|
+
time: {
|
|
83
|
+
minutes,
|
|
84
|
+
timezone: timezone,
|
|
85
|
+
},
|
|
86
|
+
};
|
|
117
87
|
};
|
|
118
88
|
exports.getSchedule = getSchedule;
|
|
119
89
|
//# sourceMappingURL=cron.utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron.utils.js","sourceRoot":"","sources":["../../../src/triggers/cron/cron.utils.ts"],"names":[],"mappings":";;;AAAA,6CAA8C;AAE9C,qDAA2D;AAOpD,MAAM,cAAc,GAAG,CAC5B,QAAkB,
|
|
1
|
+
{"version":3,"file":"cron.utils.js","sourceRoot":"","sources":["../../../src/triggers/cron/cron.utils.ts"],"names":[],"mappings":";;;AAAA,6CAA8C;AAE9C,qDAA2D;AAOpD,MAAM,cAAc,GAAG,CAC5B,QAAkB,EACmB,EAAE;IACvC,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtB,KAAK,qBAAI,CAAC,OAAO;YACf,OAAO,EAAE,IAAI,EAAE,KAAK,QAAQ,CAAC,OAAO,YAAY,EAAE,CAAC;QACrD,KAAK,qBAAI,CAAC,OAAO;YACf,OAAO;gBACL,IAAI,EAAE,OAAO,QAAQ,CAAC,OAAO,UAAU;aACxC,CAAC;QACJ,KAAK,qBAAI,CAAC,MAAM;YACd,OAAO;gBACL,IAAI,EAAE,KAAK,QAAQ,CAAC,MAAM,MAAM,QAAQ,CAAC,KAAK,QAAQ;aACvD,CAAC;QACJ,KAAK,qBAAI,CAAC,KAAK;YACb,MAAM,YAAY,GAAW,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;YACxD,MAAM,UAAU,GAAW,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;YAClE,OAAO;gBACL,IAAI,EAAE,KAAK,YAAY,IAAI,UAAU,MAAM,QAAQ,CAAC,IAAI,MAAM;gBAC9D,QAAQ,EAAE,qBAAqB;aAChC,CAAC;QACJ,KAAK,qBAAI,CAAC,MAAM;YACd,MAAM,aAAa,GAAW,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;YACzD,MAAM,WAAW,GAAW,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;YACnE,MAAM,aAAa,GACjB,MAAM,CAAC,IAAI,CAAC,wBAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACrD,OAAO;gBACL,IAAI,EAAE,KAAK,aAAa,IAAI,WAAW,QAAQ,aAAa,EAAE;gBAC9D,QAAQ,EAAE,qBAAqB;aAChC,CAAC;IACN,CAAC;AACH,CAAC,CAAC;AA/BW,QAAA,cAAc,kBA+BzB;AAMK,MAAM,WAAW,GAAG,CACzB,IAAY,EACZ,WAAmB,qBAAqB,EAC9B,EAAE;IACZ,MAAM,MAAM,GAAG,IAAA,6BAAe,EAAC,IAAI,CAAC,CAAC;IACrC,MAAM,cAAc,GAAS,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;IACpD,MAAM,eAAe,GAAS,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;IAErD,MAAM,WAAW,GAAW,IAAI,CAAC,KAAK,CACpC,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,cAAc,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAC9D,CAAC;IACF,IAAI,WAAW,GAAG,EAAE,EAAE,CAAC;QACrB,OAAO;YACL,IAAI,EAAE,qBAAI,CAAC,OAAO;YAClB,OAAO,EAAE,WAAW;SACrB,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAW,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;IACzD,IAAI,WAAW,GAAG,EAAE,EAAE,CAAC;QACrB,OAAO;YACL,IAAI,EAAE,qBAAI,CAAC,OAAO;YAClB,OAAO,EAAE,WAAW;SACrB,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GAAW,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;IACvD,IAAI,SAAS,GAAG,EAAE,EAAE,CAAC;QACnB,OAAO;YACL,IAAI,EAAE,qBAAI,CAAC,MAAM;YACjB,KAAK,EAAE,SAAS;YAChB,MAAM,EAAE,CAAC,WAAW,GAAG,EAAE,CAAC,GAAG,EAAE;SAChC,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAW,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,EAAE,CAAC,CAAC;IACpD,MAAM,OAAO,GACX,cAAc,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC,UAAU,EAAE,CAAC;IAE/D,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;QACnB,OAAO;YACL,IAAI,EAAE,qBAAI,CAAC,KAAK;YAChB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE;gBACJ,OAAO;gBACP,QAAQ;aACT;SACF,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAY,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE;QACxD,OAAO,EAAE,MAAM;KAChB,CAAC;SACC,MAAM,CAAC,cAAc,CAAC;SACtB,WAAW,EAAa,CAAC;IAE5B,OAAO;QACL,IAAI,EAAE,qBAAI,CAAC,MAAM;QACjB,OAAO;QACP,IAAI,EAAE;YACJ,OAAO;YACP,QAAQ,EAAE,QAAQ;SACnB;KACF,CAAC;AACJ,CAAC,CAAC;AAhEW,QAAA,WAAW,eAgEtB"}
|