@thymian/plugin-http-tester 0.1.10 → 0.1.11-canary.20260625-39589d8
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/http-test-api-context.d.ts +21 -25
- package/dist/http-test-api-context.d.ts.map +1 -1
- package/dist/http-test-api-context.js +121 -151
- package/dist/http-test-api-context.js.map +1 -1
- package/dist/index.d.ts +4 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +176 -16
- package/dist/index.js.map +1 -1
- package/dist/visitors/http-filter-to-transaction-validation-fn.d.ts +3 -2
- package/dist/visitors/http-filter-to-transaction-validation-fn.d.ts.map +1 -1
- package/dist/visitors/http-filter-to-transaction-validation-fn.js +2 -2
- package/dist/visitors/http-filter-to-transaction-validation-fn.js.map +1 -1
- package/package.json +3 -3
- package/dist/create-diagnostics-report.d.ts +0 -4
- package/dist/create-diagnostics-report.d.ts.map +0 -1
- package/dist/create-diagnostics-report.js +0 -31
- package/dist/create-diagnostics-report.js.map +0 -1
|
@@ -1,41 +1,37 @@
|
|
|
1
|
-
import { type CommonHttpRequest, type CommonHttpResponse, type HttpFilterExpression, type HttpRequest, type HttpResponse, type RuleFnResult, type
|
|
1
|
+
import { type CommonHttpRequest, type CommonHttpResponse, type HttpFilterExpression, type HttpRequest, type HttpResponse, type RuleFnResult, type RuleViolationLocation, type TestContext, ThymianFormat, type ValidationFn } from '@thymian/core';
|
|
2
2
|
import { type HttpTestContext, type HttpTestContextLocals, type HttpTestPipeline, type HttpTestResult } from '@thymian/core';
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
3
|
+
/**
|
|
4
|
+
* Links a single RuleFnResult back to its position in the HTTP test run.
|
|
5
|
+
* stepIndex is absent for test-case-level results (e.g. from httpTest()).
|
|
6
|
+
*/
|
|
7
|
+
export type RuleFnResultPlacement = {
|
|
8
|
+
result: RuleFnResult;
|
|
9
|
+
testCaseIndex: number;
|
|
10
|
+
stepIndex?: number;
|
|
11
|
+
};
|
|
12
|
+
/** Per-call association of test result with placement metadata. */
|
|
13
|
+
export type HttpTesterRuleDiagnostics = Array<{
|
|
14
|
+
testResult: HttpTestResult;
|
|
15
|
+
placements: RuleFnResultPlacement[];
|
|
16
|
+
}>;
|
|
13
17
|
export declare class HttpTestApiContext<Locals extends HttpTestContextLocals = HttpTestContextLocals> implements TestContext<HttpTesterRuleDiagnostics> {
|
|
14
18
|
private readonly name;
|
|
15
19
|
private readonly skippedOrigins;
|
|
16
20
|
readonly format: ThymianFormat;
|
|
17
|
-
readonly report: () => undefined;
|
|
18
|
-
private readonly violations;
|
|
19
21
|
private readonly ctx;
|
|
20
|
-
private
|
|
22
|
+
private readonly diagnosticEntries;
|
|
21
23
|
constructor(name: string, ctx: HttpTestContext<Locals>, skippedOrigins?: string[]);
|
|
22
|
-
reportViolation(violation: RuleViolation): void;
|
|
23
24
|
getRuleExecutionDiagnostics(): HttpTesterRuleDiagnostics | undefined;
|
|
24
25
|
validateGroupedCommonHttpTransactions(filterExpr: HttpFilterExpression, groupByExpression: HttpFilterExpression, validationFn: ValidationFn<[
|
|
25
26
|
string,
|
|
26
|
-
[
|
|
27
|
-
|
|
28
|
-
CommonHttpResponse,
|
|
29
|
-
RuleViolationLocation
|
|
30
|
-
][]
|
|
31
|
-
], RuleViolation | undefined>): Promise<RuleFnResult>;
|
|
27
|
+
[CommonHttpRequest, CommonHttpResponse, RuleViolationLocation][]
|
|
28
|
+
]>): Promise<RuleFnResult[]>;
|
|
32
29
|
validateCommonHttpTransactions(filterExpr: HttpFilterExpression, validate?: ValidationFn<[
|
|
33
30
|
CommonHttpRequest,
|
|
34
31
|
CommonHttpResponse,
|
|
35
32
|
RuleViolationLocation
|
|
36
|
-
]> | HttpFilterExpression): Promise<RuleFnResult>;
|
|
37
|
-
|
|
38
|
-
httpTest(pipeline: HttpTestPipeline<Locals>): Promise<RuleFnResult>;
|
|
33
|
+
]> | HttpFilterExpression): Promise<RuleFnResult[]>;
|
|
34
|
+
httpTest(pipeline: HttpTestPipeline<Locals>): Promise<RuleFnResult[]>;
|
|
39
35
|
runHttpTest(pipeline: HttpTestPipeline<Locals>): Promise<HttpTestResult>;
|
|
40
36
|
validateHttpTransactions(filterExpr: HttpFilterExpression, validation?: ValidationFn<[
|
|
41
37
|
HttpRequest,
|
|
@@ -45,6 +41,6 @@ export declare class HttpTestApiContext<Locals extends HttpTestContextLocals = H
|
|
|
45
41
|
elementId: string;
|
|
46
42
|
pointer?: string;
|
|
47
43
|
}
|
|
48
|
-
]> | HttpFilterExpression): Promise<RuleFnResult>;
|
|
44
|
+
]> | HttpFilterExpression): Promise<RuleFnResult[]>;
|
|
49
45
|
}
|
|
50
46
|
//# sourceMappingURL=http-test-api-context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-test-api-context.d.ts","sourceRoot":"","sources":["../src/http-test-api-context.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"http-test-api-context.d.ts","sourceRoot":"","sources":["../src/http-test-api-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAEvB,KAAK,oBAAoB,EACzB,KAAK,WAAW,EAEhB,KAAK,YAAY,EAGjB,KAAK,YAAY,EACjB,KAAK,qBAAqB,EAC1B,KAAK,WAAW,EAEhB,aAAa,EAGb,KAAK,YAAY,EAClB,MAAM,eAAe,CAAC;AACvB,OAAO,EAML,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EACrB,KAAK,cAAc,EAIpB,MAAM,eAAe,CAAC;AAyBvB;;;GAGG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,YAAY,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,mEAAmE;AACnE,MAAM,MAAM,yBAAyB,GAAG,KAAK,CAAC;IAC5C,UAAU,EAAE,cAAc,CAAC;IAC3B,UAAU,EAAE,qBAAqB,EAAE,CAAC;CACrC,CAAC,CAAC;AAEH,qBAAa,kBAAkB,CAC7B,MAAM,SAAS,qBAAqB,GAAG,qBAAqB,CAC5D,YAAW,WAAW,CAAC,yBAAyB,CAAC;IAM/C,OAAO,CAAC,QAAQ,CAAC,IAAI;IAErB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAPjC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA0B;IAC9C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAiC;gBAGhD,IAAI,EAAE,MAAM,EAC7B,GAAG,EAAE,eAAe,CAAC,MAAM,CAAC,EACX,cAAc,GAAE,MAAM,EAAO;IAqBhD,2BAA2B,IAAI,yBAAyB,GAAG,SAAS;IAM9D,qCAAqC,CACzC,UAAU,EAAE,oBAAoB,EAChC,iBAAiB,EAAE,oBAAoB,EACvC,YAAY,EAAE,YAAY,CACxB;QAAC,MAAM;QAAE,CAAC,iBAAiB,EAAE,kBAAkB,EAAE,qBAAqB,CAAC,EAAE;KAAC,CAC3E,GACA,OAAO,CAAC,YAAY,EAAE,CAAC;IA2DpB,8BAA8B,CAClC,UAAU,EAAE,oBAAoB,EAChC,QAAQ,GACJ,YAAY,CACV;QAAC,iBAAiB;QAAE,kBAAkB;QAAE,qBAAqB;KAAC,CAC/D,GACD,oBAAiC,GACpC,OAAO,CAAC,YAAY,EAAE,CAAC;IAiEpB,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IA0CrE,WAAW,CACf,QAAQ,EAAE,gBAAgB,CAAC,MAAM,CAAC,GACjC,OAAO,CAAC,cAAc,CAAC;IAUpB,wBAAwB,CAC5B,UAAU,EAAE,oBAAoB,EAChC,UAAU,GACN,YAAY,CACV;QACE,WAAW;QACX,YAAY;QACZ;YACE,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;YAC7B,SAAS,EAAE,MAAM,CAAC;YAClB,OAAO,CAAC,EAAE,MAAM,CAAC;SAClB;KACF,CACF,GACD,oBAAiC,GACpC,OAAO,CAAC,YAAY,EAAE,CAAC;CAyD3B"}
|
|
@@ -7,15 +7,18 @@ import { httpFilterToTransactionValidationFn } from './visitors/http-filter-to-t
|
|
|
7
7
|
function hasSource(transaction) {
|
|
8
8
|
return 'source' in transaction;
|
|
9
9
|
}
|
|
10
|
-
|
|
10
|
+
function isSameLocation(a, b) {
|
|
11
|
+
if (typeof a === 'string' || typeof b === 'string') {
|
|
12
|
+
return a === b;
|
|
13
|
+
}
|
|
14
|
+
return a.elementType === b.elementType && a.elementId === b.elementId;
|
|
15
|
+
}
|
|
11
16
|
export class HttpTestApiContext {
|
|
12
17
|
name;
|
|
13
18
|
skippedOrigins;
|
|
14
19
|
format;
|
|
15
|
-
report = noopReport;
|
|
16
|
-
violations = [];
|
|
17
20
|
ctx;
|
|
18
|
-
|
|
21
|
+
diagnosticEntries = [];
|
|
19
22
|
constructor(name, ctx, skippedOrigins = []) {
|
|
20
23
|
this.name = name;
|
|
21
24
|
this.skippedOrigins = skippedOrigins;
|
|
@@ -31,21 +34,22 @@ export class HttpTestApiContext {
|
|
|
31
34
|
format: this.format,
|
|
32
35
|
};
|
|
33
36
|
}
|
|
34
|
-
reportViolation(violation) {
|
|
35
|
-
this.violations.push(violation);
|
|
36
|
-
}
|
|
37
37
|
getRuleExecutionDiagnostics() {
|
|
38
|
-
return this.
|
|
38
|
+
return this.diagnosticEntries.length > 0
|
|
39
|
+
? this.diagnosticEntries
|
|
40
|
+
: undefined;
|
|
39
41
|
}
|
|
40
42
|
async validateGroupedCommonHttpTransactions(filterExpr, groupByExpression, validationFn) {
|
|
41
43
|
const filterFn = httpFilterExpressionToFilter(filterExpr);
|
|
42
44
|
const groupByFn = httpFilterToGroupByFn(groupByExpression);
|
|
43
45
|
const test = httpTest(this.name, (test) => test.pipe(filter(({ current, ctx }) => filterFn(current, ctx.format)), groupBy(({ current, ctx }) => groupByFn(current, ctx.format)), mapToGroupedTestCase(), generateRequests(), runRequests()));
|
|
44
46
|
const testResult = await test(this.ctx);
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
.
|
|
47
|
+
const callViolations = [];
|
|
48
|
+
const placements = [];
|
|
49
|
+
testResult.cases.forEach((value, testCaseIndex) => {
|
|
50
|
+
if (value.status !== 'passed') {
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
49
53
|
const testCase = value;
|
|
50
54
|
const { source, transactions } = testCase.steps[0];
|
|
51
55
|
const transactionsToValidate = transactions
|
|
@@ -62,174 +66,140 @@ export class HttpTestApiContext {
|
|
|
62
66
|
elementType: 'edge',
|
|
63
67
|
},
|
|
64
68
|
]);
|
|
65
|
-
const
|
|
66
|
-
|
|
67
|
-
|
|
69
|
+
const results = validationFn(source.key, transactionsToValidate);
|
|
70
|
+
callViolations.push(...results);
|
|
71
|
+
for (const result of results) {
|
|
72
|
+
placements.push({ result, testCaseIndex, stepIndex: 0 });
|
|
68
73
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
74
|
+
});
|
|
75
|
+
this.diagnosticEntries.push({ testResult, placements });
|
|
76
|
+
return callViolations;
|
|
72
77
|
}
|
|
73
78
|
async validateCommonHttpTransactions(filterExpr, validate = filterExpr) {
|
|
74
79
|
const test = httpTest(this.name, singleTestCase().forTransactionsWith(filterExpr).run().done());
|
|
75
80
|
const testResult = await test(this.ctx);
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
81
|
+
const callViolations = [];
|
|
82
|
+
const placements = [];
|
|
83
|
+
testResult.cases.forEach((testCase, testCaseIndex) => {
|
|
84
|
+
if (testCase.status !== 'passed') {
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
testCase.steps.forEach((step, stepIndex) => {
|
|
88
|
+
for (const transaction of step.transactions) {
|
|
89
|
+
const { request, response, source } = transaction;
|
|
90
|
+
if (!request || !response || !source) {
|
|
91
|
+
throw new Error('Invalid HTTP test case transaction.');
|
|
92
|
+
}
|
|
93
|
+
const location = {
|
|
88
94
|
elementType: 'edge',
|
|
89
95
|
elementId: source.transactionId,
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
elementType: 'edge',
|
|
95
|
-
elementId: source.transactionId,
|
|
96
|
-
pointer: '',
|
|
97
|
-
},
|
|
98
|
-
});
|
|
96
|
+
};
|
|
97
|
+
const results = [];
|
|
98
|
+
if (typeof validate === 'function') {
|
|
99
|
+
results.push(...validate(httpRequestToCommonHttpRequest(request, source.thymianReqId), httpResponseToCommonHttpResponse(response, source.thymianResId), location));
|
|
99
100
|
}
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
}
|
|
101
|
+
else {
|
|
102
|
+
const filterFn = httpFilterToTransactionValidationFn(validate);
|
|
103
|
+
if (filterFn(request, response)) {
|
|
104
|
+
results.push({
|
|
105
|
+
location: { ...location, pointer: '' },
|
|
106
|
+
violation: {},
|
|
107
|
+
findings: [],
|
|
108
|
+
});
|
|
109
|
+
}
|
|
109
110
|
}
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
location: {
|
|
117
|
-
elementType: 'edge',
|
|
118
|
-
elementId: source.transactionId,
|
|
119
|
-
pointer: '',
|
|
120
|
-
},
|
|
121
|
-
});
|
|
111
|
+
callViolations.push(...results);
|
|
112
|
+
for (const result of results) {
|
|
113
|
+
if (typeof validate !== 'function' ||
|
|
114
|
+
isSameLocation(result.location, location)) {
|
|
115
|
+
placements.push({ result, testCaseIndex, stepIndex });
|
|
116
|
+
}
|
|
122
117
|
}
|
|
123
118
|
}
|
|
124
|
-
}
|
|
125
|
-
|
|
126
|
-
})
|
|
127
|
-
|
|
119
|
+
});
|
|
120
|
+
});
|
|
121
|
+
this.diagnosticEntries.push({ testResult, placements });
|
|
122
|
+
return callViolations;
|
|
128
123
|
}
|
|
129
|
-
|
|
130
|
-
const
|
|
131
|
-
const
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
name: testCase.name,
|
|
137
|
-
reason: testCase.reason ??
|
|
138
|
-
testCase.results
|
|
139
|
-
.filter((tc) => tc.type !== 'info' && tc.type !== 'assertion-success')
|
|
140
|
-
.map((tc) => tc.message)
|
|
141
|
-
.join('\n'),
|
|
142
|
-
});
|
|
143
|
-
}
|
|
144
|
-
else if (testCase.status === 'failed') {
|
|
145
|
-
this.ctx.logger.debug(`HTTP test case "${testCase.name}" from test "${this.name}" failed.`);
|
|
124
|
+
async httpTest(pipeline) {
|
|
125
|
+
const testFn = httpTest(this.name, pipeline);
|
|
126
|
+
const testResult = await testFn(this.ctx);
|
|
127
|
+
const ruleFnResult = [];
|
|
128
|
+
const placements = [];
|
|
129
|
+
testResult.cases.forEach((testCase, testCaseIndex) => {
|
|
130
|
+
if (testCase.status === 'failed') {
|
|
146
131
|
const assertionFailure = testCase.results.find((r) => r.type === 'assertion-failure' && !!r.transaction);
|
|
147
132
|
if (assertionFailure && assertionFailure.transaction) {
|
|
148
|
-
|
|
133
|
+
const result = {
|
|
149
134
|
location: {
|
|
150
|
-
elementType: 'edge',
|
|
151
135
|
elementId: assertionFailure.transaction.transactionId,
|
|
136
|
+
elementType: 'edge',
|
|
152
137
|
},
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
138
|
+
violation: {},
|
|
139
|
+
findings: [],
|
|
140
|
+
};
|
|
141
|
+
ruleFnResult.push(result);
|
|
142
|
+
// stepIndex is undefined when the assertion failure has no step location,
|
|
143
|
+
// making this a test-case-level placement (intentional — see createRuns).
|
|
144
|
+
placements.push({
|
|
145
|
+
result,
|
|
146
|
+
testCaseIndex,
|
|
147
|
+
stepIndex: assertionFailure.location?.stepIdx,
|
|
163
148
|
});
|
|
164
149
|
}
|
|
165
150
|
}
|
|
166
151
|
});
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
failedItems.length === 0) {
|
|
170
|
-
return;
|
|
171
|
-
}
|
|
172
|
-
this.diagnostics = {
|
|
173
|
-
skippedCases: [
|
|
174
|
-
...(this.diagnostics?.skippedCases ?? []),
|
|
175
|
-
...skippedItems,
|
|
176
|
-
],
|
|
177
|
-
failedCases: [...(this.diagnostics?.failedCases ?? []), ...failedItems],
|
|
178
|
-
};
|
|
179
|
-
}
|
|
180
|
-
async httpTest(pipeline) {
|
|
181
|
-
const testFn = httpTest(this.name, pipeline);
|
|
182
|
-
const testResult = await testFn(this.ctx);
|
|
183
|
-
this.collectSkippedAndFailedTestCases(testResult);
|
|
184
|
-
return this.violations;
|
|
152
|
+
this.diagnosticEntries.push({ testResult, placements });
|
|
153
|
+
return ruleFnResult;
|
|
185
154
|
}
|
|
186
155
|
async runHttpTest(pipeline) {
|
|
187
156
|
const testFn = httpTest(this.name, pipeline);
|
|
188
|
-
|
|
157
|
+
const testResult = await testFn(this.ctx);
|
|
158
|
+
this.diagnosticEntries.push({ testResult, placements: [] });
|
|
159
|
+
return testResult;
|
|
189
160
|
}
|
|
190
161
|
async validateHttpTransactions(filterExpr, validation = filterExpr) {
|
|
191
|
-
const validationFn = typeof validation === 'function'
|
|
192
|
-
? validation
|
|
193
|
-
: httpFilterToTransactionValidationFn(validation);
|
|
194
162
|
const test = httpTest(this.name, singleTestCase().forTransactionsWith(filterExpr).run().done());
|
|
195
163
|
const testResult = await test(this.ctx);
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
for (const transaction of step.transactions) {
|
|
202
|
-
const { request, response, source } = transaction;
|
|
203
|
-
if (!request || !response || !source) {
|
|
204
|
-
throw new ThymianBaseError('Invalid HTTP test case transaction: missing request, response, or source.');
|
|
205
|
-
}
|
|
206
|
-
const validationResult = validationFn(request, response, {
|
|
207
|
-
elementType: 'edge',
|
|
208
|
-
elementId: source.transactionId,
|
|
209
|
-
});
|
|
210
|
-
if (typeof validationResult === 'boolean' && validationResult) {
|
|
211
|
-
violations.push({
|
|
212
|
-
location: {
|
|
213
|
-
elementType: 'edge',
|
|
214
|
-
elementId: source.transactionId,
|
|
215
|
-
pointer: '',
|
|
216
|
-
},
|
|
217
|
-
});
|
|
218
|
-
}
|
|
219
|
-
if (validationResult && typeof validationResult === 'object') {
|
|
220
|
-
violations.push({
|
|
221
|
-
location: {
|
|
222
|
-
elementType: 'edge',
|
|
223
|
-
elementId: source.transactionId,
|
|
224
|
-
pointer: '',
|
|
225
|
-
},
|
|
226
|
-
...validationResult,
|
|
227
|
-
});
|
|
228
|
-
}
|
|
164
|
+
const callViolations = [];
|
|
165
|
+
const placements = [];
|
|
166
|
+
testResult.cases.forEach((testCase, testCaseIndex) => {
|
|
167
|
+
if (testCase.status !== 'passed') {
|
|
168
|
+
return;
|
|
229
169
|
}
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
170
|
+
testCase.steps.forEach((step, stepIndex) => {
|
|
171
|
+
for (const transaction of step.transactions) {
|
|
172
|
+
const { request, response, source } = transaction;
|
|
173
|
+
if (!request || !response || !source) {
|
|
174
|
+
throw new ThymianBaseError('Invalid HTTP test case transaction: missing request, response, or source.');
|
|
175
|
+
}
|
|
176
|
+
const location = {
|
|
177
|
+
elementType: 'edge',
|
|
178
|
+
elementId: source.transactionId,
|
|
179
|
+
pointer: '',
|
|
180
|
+
};
|
|
181
|
+
const results = [];
|
|
182
|
+
if (typeof validation === 'function') {
|
|
183
|
+
results.push(...validation(request, response, location));
|
|
184
|
+
}
|
|
185
|
+
else {
|
|
186
|
+
const filterFn = httpFilterToTransactionValidationFn(validation);
|
|
187
|
+
if (filterFn(request, response)) {
|
|
188
|
+
results.push({ location, violation: {}, findings: [] });
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
callViolations.push(...results);
|
|
192
|
+
for (const result of results) {
|
|
193
|
+
if (typeof validation !== 'function' ||
|
|
194
|
+
isSameLocation(result.location, location)) {
|
|
195
|
+
placements.push({ result, testCaseIndex, stepIndex });
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
});
|
|
200
|
+
});
|
|
201
|
+
this.diagnosticEntries.push({ testResult, placements });
|
|
202
|
+
return callViolations;
|
|
233
203
|
}
|
|
234
204
|
}
|
|
235
205
|
//# sourceMappingURL=http-test-api-context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-test-api-context.js","sourceRoot":"","sources":["../src/http-test-api-context.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"http-test-api-context.js","sourceRoot":"","sources":["../src/http-test-api-context.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import { type ThymianPlugin } from '@thymian/core';
|
|
2
|
-
|
|
1
|
+
import { type Rule, type RunRulesResult, ThymianFormat, type ThymianPlugin, type ToolRun } from '@thymian/core';
|
|
2
|
+
import { type HttpTesterRuleDiagnostics } from './http-test-api-context.js';
|
|
3
|
+
export { HttpTestApiContext, type HttpTesterRuleDiagnostics, type RuleFnResultPlacement, } from './http-test-api-context.js';
|
|
4
|
+
export declare function createRuns(pluginName: string, ruleResults: RunRulesResult<HttpTesterRuleDiagnostics>, rules: Rule[] | undefined, thymianFormat: ThymianFormat): ToolRun[];
|
|
3
5
|
export declare function createHttpTesterPlugin(pluginName?: string): ThymianPlugin;
|
|
4
6
|
export declare const httpTesterPlugin: ThymianPlugin;
|
|
5
7
|
export default httpTesterPlugin;
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAaL,KAAK,IAAI,EAMT,KAAK,cAAc,EAGnB,aAAa,EACb,KAAK,aAAa,EAClB,KAAK,OAAO,EACb,MAAM,eAAe,CAAC;AAEvB,OAAO,EAEL,KAAK,yBAAyB,EAE/B,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,kBAAkB,EAClB,KAAK,yBAAyB,EAC9B,KAAK,qBAAqB,GAC3B,MAAM,4BAA4B,CAAC;AAiIpC,wBAAgB,UAAU,CACxB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,cAAc,CAAC,yBAAyB,CAAC,EACtD,KAAK,EAAE,IAAI,EAAE,YAAK,EAClB,aAAa,EAAE,aAAa,GAC3B,OAAO,EAAE,CAgHX;AAED,wBAAgB,sBAAsB,CACpC,UAAU,SAAgC,GACzC,aAAa,CAoEf;AAED,eAAO,MAAM,gBAAgB,eAA2B,CAAC;AAEzD,eAAe,gBAAgB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,179 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { createContextFromEmitter, createExecution, createToolRun, isCustomHttpTestCaseStep, isGroupedHttpTestCaseStep, isSingleHttpTestCaseStep, resolveViolationLocation, ruleFindingToFindingRecord, rulesToRuleDescriptors, runRules, ThymianBaseError, ThymianFormat, } from '@thymian/core';
|
|
3
3
|
import { HttpTestApiContext, } from './http-test-api-context.js';
|
|
4
4
|
export { HttpTestApiContext, } from './http-test-api-context.js';
|
|
5
|
+
function ruleViolationToFindingRecord(violation, rule) {
|
|
6
|
+
const message = violation.message;
|
|
7
|
+
return {
|
|
8
|
+
id: randomUUID(),
|
|
9
|
+
kind: 'rule-violation',
|
|
10
|
+
ruleId: rule.meta.name,
|
|
11
|
+
title: message || (rule.meta.summary ?? rule.meta.description ?? rule.meta.name),
|
|
12
|
+
severity: rule.meta.severity,
|
|
13
|
+
...(message
|
|
14
|
+
? { message: { text: message } }
|
|
15
|
+
: rule.meta.explanation
|
|
16
|
+
? { message: { text: rule.meta.explanation } }
|
|
17
|
+
: {}),
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
// stepPlacements must be pre-filtered to this step (testCaseIndex + stepIndex match).
|
|
21
|
+
function buildStepExecution(step, stepIndex, stepPlacements, rule, location) {
|
|
22
|
+
const findings = [];
|
|
23
|
+
for (const { result } of stepPlacements) {
|
|
24
|
+
if (result.violation !== undefined) {
|
|
25
|
+
findings.push(ruleViolationToFindingRecord(result.violation, rule));
|
|
26
|
+
}
|
|
27
|
+
for (const finding of result.findings) {
|
|
28
|
+
findings.push(ruleFindingToFindingRecord(finding));
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
const httpTransactions = step.transactions
|
|
32
|
+
.filter((t) => t.request !== undefined && t.response !== undefined)
|
|
33
|
+
.map((t) => ({
|
|
34
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
35
|
+
request: t.request,
|
|
36
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
37
|
+
response: t.response,
|
|
38
|
+
}));
|
|
39
|
+
return createExecution({
|
|
40
|
+
name: `Step ${stepIndex + 1}`,
|
|
41
|
+
location,
|
|
42
|
+
findings,
|
|
43
|
+
httpTransactions: httpTransactions.length > 0 ? httpTransactions : undefined,
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
function stepToLocation(step) {
|
|
47
|
+
if (isSingleHttpTestCaseStep(step)) {
|
|
48
|
+
return {
|
|
49
|
+
type: 'thymianFormat',
|
|
50
|
+
elementType: 'edge',
|
|
51
|
+
elementId: step.source.transactionId,
|
|
52
|
+
pointer: '',
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
if (isGroupedHttpTestCaseStep(step)) {
|
|
56
|
+
return { type: 'custom', value: step.source.key };
|
|
57
|
+
}
|
|
58
|
+
if (isCustomHttpTestCaseStep(step)) {
|
|
59
|
+
const src = step.source;
|
|
60
|
+
const value = src === null || typeof src !== 'object'
|
|
61
|
+
? String(src)
|
|
62
|
+
: JSON.stringify(src);
|
|
63
|
+
return { type: 'custom', value };
|
|
64
|
+
}
|
|
65
|
+
return { type: 'custom', value: 'unknown' };
|
|
66
|
+
}
|
|
67
|
+
function buildTestCaseExecution(testCase, extraFindings, children) {
|
|
68
|
+
const durationMilliseconds = testCase.end !== undefined ? testCase.end - testCase.start : undefined;
|
|
69
|
+
let testCaseFinding;
|
|
70
|
+
if (testCase.status === 'skipped') {
|
|
71
|
+
testCaseFinding = {
|
|
72
|
+
id: randomUUID(),
|
|
73
|
+
kind: 'test-case-skip',
|
|
74
|
+
title: testCase.name,
|
|
75
|
+
severity: 'info',
|
|
76
|
+
reason: testCase.reason ?? '',
|
|
77
|
+
...(testCase.reason ? { message: { text: testCase.reason } } : {}),
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
else if (testCase.status === 'failed') {
|
|
81
|
+
testCaseFinding = {
|
|
82
|
+
id: randomUUID(),
|
|
83
|
+
kind: 'test-case-fail',
|
|
84
|
+
title: testCase.name,
|
|
85
|
+
severity: 'error',
|
|
86
|
+
...(testCase.reason ? { message: { text: testCase.reason } } : {}),
|
|
87
|
+
...(durationMilliseconds !== undefined ? { durationMilliseconds } : {}),
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
testCaseFinding = {
|
|
92
|
+
id: randomUUID(),
|
|
93
|
+
kind: 'test-case-pass',
|
|
94
|
+
title: testCase.name,
|
|
95
|
+
severity: 'info',
|
|
96
|
+
...(durationMilliseconds !== undefined ? { durationMilliseconds } : {}),
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
return createExecution({
|
|
100
|
+
name: testCase.name,
|
|
101
|
+
location: { type: 'custom', value: testCase.name },
|
|
102
|
+
findings: [testCaseFinding, ...extraFindings],
|
|
103
|
+
children,
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
// exported for testing
|
|
107
|
+
export function createRuns(pluginName, ruleResults, rules = [], thymianFormat) {
|
|
108
|
+
const ruleMap = new Map(rules.map((r) => [r.meta.name, r]));
|
|
109
|
+
const ruleExecutions = [];
|
|
110
|
+
for (const [ruleName, { ruleFnResult, diagnostics }] of Object.entries(ruleResults)) {
|
|
111
|
+
const rule = ruleMap.get(ruleName);
|
|
112
|
+
if (!rule) {
|
|
113
|
+
continue;
|
|
114
|
+
}
|
|
115
|
+
const consumedResults = new Set();
|
|
116
|
+
const ruleChildren = [];
|
|
117
|
+
if (diagnostics) {
|
|
118
|
+
for (const { testResult, placements } of diagnostics) {
|
|
119
|
+
testResult.cases.forEach((testCase, testCaseIndex) => {
|
|
120
|
+
const testCasePlacements = placements.filter((p) => p.testCaseIndex === testCaseIndex && p.stepIndex === undefined);
|
|
121
|
+
const testCaseFindings = [];
|
|
122
|
+
for (const { result } of testCasePlacements) {
|
|
123
|
+
consumedResults.add(result);
|
|
124
|
+
if (result.violation !== undefined) {
|
|
125
|
+
testCaseFindings.push(ruleViolationToFindingRecord(result.violation, rule));
|
|
126
|
+
}
|
|
127
|
+
for (const finding of result.findings) {
|
|
128
|
+
testCaseFindings.push(ruleFindingToFindingRecord(finding));
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
const stepExecutions = testCase.steps.map((step, stepIndex) => {
|
|
132
|
+
const stepPlacements = placements.filter((p) => p.testCaseIndex === testCaseIndex && p.stepIndex === stepIndex);
|
|
133
|
+
for (const { result } of stepPlacements) {
|
|
134
|
+
consumedResults.add(result);
|
|
135
|
+
}
|
|
136
|
+
return buildStepExecution(step, stepIndex, stepPlacements, rule, stepToLocation(step));
|
|
137
|
+
});
|
|
138
|
+
ruleChildren.push(buildTestCaseExecution(testCase, testCaseFindings, stepExecutions));
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
// Fallback: render results not placed by diagnostics using location-based layout
|
|
143
|
+
for (const result of ruleFnResult) {
|
|
144
|
+
if (consumedResults.has(result)) {
|
|
145
|
+
continue;
|
|
146
|
+
}
|
|
147
|
+
const resolvedLocation = resolveViolationLocation(result.location, thymianFormat, ruleName);
|
|
148
|
+
const fallbackFindings = [];
|
|
149
|
+
if (result.violation) {
|
|
150
|
+
fallbackFindings.push(ruleViolationToFindingRecord(result.violation, rule));
|
|
151
|
+
}
|
|
152
|
+
for (const finding of result.findings) {
|
|
153
|
+
fallbackFindings.push(ruleFindingToFindingRecord(finding));
|
|
154
|
+
}
|
|
155
|
+
ruleChildren.push(createExecution({
|
|
156
|
+
location: resolvedLocation.location,
|
|
157
|
+
findings: fallbackFindings,
|
|
158
|
+
name: resolvedLocation.heading,
|
|
159
|
+
}));
|
|
160
|
+
}
|
|
161
|
+
ruleExecutions.push(createExecution({
|
|
162
|
+
location: { type: 'custom', value: ruleName },
|
|
163
|
+
findings: [],
|
|
164
|
+
children: ruleChildren,
|
|
165
|
+
}));
|
|
166
|
+
}
|
|
167
|
+
const ruleDescriptors = rulesToRuleDescriptors(rules, (r) => r.testRule);
|
|
168
|
+
return [
|
|
169
|
+
createToolRun({
|
|
170
|
+
tool: { name: pluginName },
|
|
171
|
+
runType: 'test',
|
|
172
|
+
executions: ruleExecutions,
|
|
173
|
+
rules: ruleDescriptors.length > 0 ? ruleDescriptors : undefined,
|
|
174
|
+
}),
|
|
175
|
+
];
|
|
176
|
+
}
|
|
5
177
|
export function createHttpTesterPlugin(pluginName = '@thymian/plugin-http-tester') {
|
|
6
178
|
return {
|
|
7
179
|
name: pluginName,
|
|
@@ -33,20 +205,8 @@ export function createHttpTesterPlugin(pluginName = '@thymian/plugin-http-tester
|
|
|
33
205
|
getRuleFn: (rule) => rule.testRule,
|
|
34
206
|
createContext: (rule, options) => new HttpTestApiContext(rule.meta.name, context, (options ?? {}).skipOrigins),
|
|
35
207
|
};
|
|
36
|
-
const
|
|
37
|
-
|
|
38
|
-
if (report) {
|
|
39
|
-
emitter.emit('core.report', report);
|
|
40
|
-
}
|
|
41
|
-
ctx.reply({
|
|
42
|
-
source: pluginName,
|
|
43
|
-
status: violations.length === 0 ? 'success' : 'failed',
|
|
44
|
-
violations,
|
|
45
|
-
statistics,
|
|
46
|
-
metadata: {
|
|
47
|
-
diagnosticsByRule,
|
|
48
|
-
},
|
|
49
|
-
});
|
|
208
|
+
const ruleResults = await runRules(logger, rules, thymianFormat, rulesConfig, adapter);
|
|
209
|
+
ctx.reply(createRuns(pluginName, ruleResults, rules, thymianFormat));
|
|
50
210
|
});
|
|
51
211
|
},
|
|
52
212
|
};
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { ValidationFn } from '@thymian/core';
|
|
2
1
|
import { type HttpFilterExpression, type HttpRequest, type HttpResponse } from '@thymian/core';
|
|
3
|
-
|
|
2
|
+
type TransactionFilterFn = (req: HttpRequest, res: HttpResponse) => boolean;
|
|
3
|
+
export declare function httpFilterToTransactionValidationFn(filterExpression: HttpFilterExpression): TransactionFilterFn;
|
|
4
|
+
export {};
|
|
4
5
|
//# sourceMappingURL=http-filter-to-transaction-validation-fn.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-filter-to-transaction-validation-fn.d.ts","sourceRoot":"","sources":["../../src/visitors/http-filter-to-transaction-validation-fn.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"http-filter-to-transaction-validation-fn.d.ts","sourceRoot":"","sources":["../../src/visitors/http-filter-to-transaction-validation-fn.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,oBAAoB,EAEzB,KAAK,WAAW,EAChB,KAAK,YAAY,EAGlB,MAAM,eAAe,CAAC;AAEvB,KAAK,mBAAmB,GAAG,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,YAAY,KAAK,OAAO,CAAC;AAE5E,wBAAgB,mCAAmC,CACjD,gBAAgB,EAAE,oBAAoB,GACrC,mBAAmB,CAKrB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { createFilterVisitor, createRegExpFromOriginWildcard, equalsIgnoreCase, getContentType, queryParamsFromRequest,
|
|
1
|
+
import { createFilterVisitor, createRegExpFromOriginWildcard, equalsIgnoreCase, getContentType, queryParamsFromRequest, visitHttpFilter, } from '@thymian/core';
|
|
2
2
|
export function httpFilterToTransactionValidationFn(filterExpression) {
|
|
3
3
|
return visitHttpFilter(filterExpression, createTransactionValidationVisitor());
|
|
4
4
|
}
|
|
@@ -119,7 +119,7 @@ function createTransactionValidationVisitor() {
|
|
|
119
119
|
return () => false;
|
|
120
120
|
}
|
|
121
121
|
const regExp = createRegExpFromOriginWildcard(origin);
|
|
122
|
-
return (
|
|
122
|
+
return (req) => regExp.test(req.origin ?? '');
|
|
123
123
|
},
|
|
124
124
|
});
|
|
125
125
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-filter-to-transaction-validation-fn.js","sourceRoot":"","sources":["../../src/visitors/http-filter-to-transaction-validation-fn.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"http-filter-to-transaction-validation-fn.js","sourceRoot":"","sources":["../../src/visitors/http-filter-to-transaction-validation-fn.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thymian/plugin-http-tester",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.11-canary.20260625-39589d8",
|
|
4
4
|
"description": "Thymian plugin for runtime HTTP conformance testing against live API endpoints",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"bugs": {
|
|
@@ -41,11 +41,11 @@
|
|
|
41
41
|
"!**/*.tsbuildinfo"
|
|
42
42
|
],
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@thymian/core": "0.1.
|
|
44
|
+
"@thymian/core": "0.1.11-canary.20260625-39589d8",
|
|
45
45
|
"rxjs": "^7.8.2",
|
|
46
46
|
"tslib": "^2.3.0"
|
|
47
47
|
},
|
|
48
48
|
"devDependencies": {
|
|
49
|
-
"@thymian/core-testing": "0.1.
|
|
49
|
+
"@thymian/core-testing": "0.1.11-canary.20260625-39589d8"
|
|
50
50
|
}
|
|
51
51
|
}
|
|
@@ -1,4 +0,0 @@
|
|
|
1
|
-
import type { ThymianReport } from '@thymian/core';
|
|
2
|
-
import type { HttpTesterRuleDiagnostics } from './http-test-api-context.js';
|
|
3
|
-
export declare function createHttpTestDiagnosticsReport(pluginName: string, diagnosticsByRule?: Partial<Record<string, HttpTesterRuleDiagnostics>>): ThymianReport | undefined;
|
|
4
|
-
//# sourceMappingURL=create-diagnostics-report.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"create-diagnostics-report.d.ts","sourceRoot":"","sources":["../src/create-diagnostics-report.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAwB,MAAM,eAAe,CAAC;AAEzE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AAE5E,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,MAAM,EAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC,GACrE,aAAa,GAAG,SAAS,CAmC3B"}
|
|
@@ -1,31 +0,0 @@
|
|
|
1
|
-
export function createHttpTestDiagnosticsReport(pluginName, diagnosticsByRule) {
|
|
2
|
-
const entries = Object.entries(diagnosticsByRule ?? {});
|
|
3
|
-
if (entries.length === 0) {
|
|
4
|
-
return undefined;
|
|
5
|
-
}
|
|
6
|
-
const sections = entries.map(([ruleName, diagnostics]) => {
|
|
7
|
-
const skipped = diagnostics?.skippedCases ?? [];
|
|
8
|
-
const failed = diagnostics?.failedCases ?? [];
|
|
9
|
-
return {
|
|
10
|
-
heading: `${ruleName} (${skipped.length} skipped, ${failed.length} failed)`,
|
|
11
|
-
items: [
|
|
12
|
-
...skipped.map(({ name, reason }) => ({
|
|
13
|
-
message: `Skipped "${name}"`,
|
|
14
|
-
details: reason,
|
|
15
|
-
severity: 'info',
|
|
16
|
-
})),
|
|
17
|
-
...failed.map(({ name, reason }) => ({
|
|
18
|
-
message: `Failed "${name}"`,
|
|
19
|
-
details: reason,
|
|
20
|
-
severity: 'info',
|
|
21
|
-
})),
|
|
22
|
-
],
|
|
23
|
-
};
|
|
24
|
-
});
|
|
25
|
-
return {
|
|
26
|
-
source: `${pluginName}: skipped and failed test cases`,
|
|
27
|
-
message: `${entries.length} rule${entries.length > 1 ? 's' : ''} could not be checked completely because of skipped and failed transactions.`,
|
|
28
|
-
sections,
|
|
29
|
-
};
|
|
30
|
-
}
|
|
31
|
-
//# sourceMappingURL=create-diagnostics-report.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"create-diagnostics-report.js","sourceRoot":"","sources":["../src/create-diagnostics-report.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,+BAA+B,CAC7C,UAAkB,EAClB,iBAAsE;IAEtE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC;IAExD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAC1B,CAAC,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,EAAE;QAC1B,MAAM,OAAO,GAAG,WAAW,EAAE,YAAY,IAAI,EAAE,CAAC;QAChD,MAAM,MAAM,GAAG,WAAW,EAAE,WAAW,IAAI,EAAE,CAAC;QAE9C,OAAO;YACL,OAAO,EAAE,GAAG,QAAQ,KAAK,OAAO,CAAC,MAAM,aAAa,MAAM,CAAC,MAAM,UAAU;YAC3E,KAAK,EAAE;gBACL,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;oBACpC,OAAO,EAAE,YAAY,IAAI,GAAG;oBAC5B,OAAO,EAAE,MAAM;oBACf,QAAQ,EAAE,MAAe;iBAC1B,CAAC,CAAC;gBACH,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;oBACnC,OAAO,EAAE,WAAW,IAAI,GAAG;oBAC3B,OAAO,EAAE,MAAM;oBACf,QAAQ,EAAE,MAAe;iBAC1B,CAAC,CAAC;aACJ;SACF,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,OAAO;QACL,MAAM,EAAE,GAAG,UAAU,iCAAiC;QACtD,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,QAAQ,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,8EAA8E;QAC7I,QAAQ;KACT,CAAC;AACJ,CAAC"}
|