@testmuai/playwright-bindings 0.1.40 → 0.1.41-beta.1
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/capability.d.ts.map +1 -1
- package/dist/capability.js +9 -1
- package/dist/capability.js.map +1 -1
- package/dist/helpers/a11yFlatten.d.ts +37 -0
- package/dist/helpers/a11yFlatten.d.ts.map +1 -0
- package/dist/helpers/a11yFlatten.js +569 -0
- package/dist/helpers/a11yFlatten.js.map +1 -0
- package/dist/helpers/assertion.d.ts +1 -0
- package/dist/helpers/assertion.d.ts.map +1 -1
- package/dist/helpers/assertion.js +42 -6
- package/dist/helpers/assertion.js.map +1 -1
- package/dist/helpers/condition.d.ts +16 -0
- package/dist/helpers/condition.d.ts.map +1 -1
- package/dist/helpers/condition.js +67 -2
- package/dist/helpers/condition.js.map +1 -1
- package/dist/helpers/credits.d.ts +19 -0
- package/dist/helpers/credits.d.ts.map +1 -0
- package/dist/helpers/credits.js +52 -0
- package/dist/helpers/credits.js.map +1 -0
- package/dist/helpers/executeApi.d.ts +9 -1
- package/dist/helpers/executeApi.d.ts.map +1 -1
- package/dist/helpers/executeApi.js +86 -6
- package/dist/helpers/executeApi.js.map +1 -1
- package/dist/helpers/healCascade.d.ts +0 -18
- package/dist/helpers/healCascade.d.ts.map +1 -1
- package/dist/helpers/healCascade.js +90 -38
- package/dist/helpers/healCascade.js.map +1 -1
- package/dist/helpers/iframeA11y.d.ts +30 -0
- package/dist/helpers/iframeA11y.d.ts.map +1 -0
- package/dist/helpers/iframeA11y.js +128 -0
- package/dist/helpers/iframeA11y.js.map +1 -0
- package/dist/helpers/math.d.ts +14 -1
- package/dist/helpers/math.d.ts.map +1 -1
- package/dist/helpers/math.js +84 -4
- package/dist/helpers/math.js.map +1 -1
- package/dist/helpers/pageReady.d.ts +36 -0
- package/dist/helpers/pageReady.d.ts.map +1 -0
- package/dist/helpers/pageReady.js +85 -0
- package/dist/helpers/pageReady.js.map +1 -0
- package/dist/helpers/runtimeSnapshot.d.ts +59 -0
- package/dist/helpers/runtimeSnapshot.d.ts.map +1 -0
- package/dist/helpers/runtimeSnapshot.js +204 -0
- package/dist/helpers/runtimeSnapshot.js.map +1 -0
- package/dist/helpers/visionFence.d.ts +35 -0
- package/dist/helpers/visionFence.d.ts.map +1 -0
- package/dist/helpers/visionFence.js +58 -0
- package/dist/helpers/visionFence.js.map +1 -0
- package/dist/helpers/visionV3.d.ts +14 -0
- package/dist/helpers/visionV3.d.ts.map +1 -1
- package/dist/helpers/visionV3.js +92 -18
- package/dist/helpers/visionV3.js.map +1 -1
- package/dist/reporters/index.d.ts +3 -0
- package/dist/reporters/index.d.ts.map +1 -1
- package/dist/reporters/index.js.map +1 -1
- package/dist/reporters/lt.d.ts.map +1 -1
- package/dist/reporters/lt.js +23 -0
- package/dist/reporters/lt.js.map +1 -1
- package/dist/step.d.ts +8 -0
- package/dist/step.d.ts.map +1 -1
- package/dist/step.js +19 -0
- package/dist/step.js.map +1 -1
- package/dist/stepVariables.d.ts +15 -0
- package/dist/stepVariables.d.ts.map +1 -0
- package/dist/stepVariables.js +61 -0
- package/dist/stepVariables.js.map +1 -0
- package/dist/vars.d.ts +12 -0
- package/dist/vars.d.ts.map +1 -1
- package/dist/vars.js +117 -17
- package/dist/vars.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,3 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Heal cascade for V3 Playwright — port of PY _heal_cascade.py, itself the
|
|
3
|
+
* Selenium cascade simplified for Playwright:
|
|
4
|
+
*
|
|
5
|
+
* - No LIST_XPATHS tier (Playwright's selector engine subsumes it).
|
|
6
|
+
* - DESKTOP_LOCATE (POST {AUTOMIND_URL}/v2/locate/desktop) is the primary
|
|
7
|
+
* default tier — NOT the V4 vision sidecar (/api/v1/vision/coordinates),
|
|
8
|
+
* which is the named anti-reuse from the contract (Top-15 #6).
|
|
9
|
+
* - VISION_QUERY (POST {automind}/v1/heal/vision) survives via per-verb tier
|
|
10
|
+
* overrides (e.g. scroll_into_view) or alongside DESKTOP_LOCATE in a verb's
|
|
11
|
+
* tiers tuple.
|
|
12
|
+
*
|
|
13
|
+
* Contract points ported verbatim: fresh screenshot per attempt, PNG
|
|
14
|
+
* validated BEFORE the POST, image→CSS-px scaling, clamping, retry≤3 with
|
|
15
|
+
* 1s sleeps (4xx never retried), 200+[0,0] is a MISS (not 404), and
|
|
16
|
+
* markAutoHeal() fires on cascade ENTRY — an exhausted heal still reports
|
|
17
|
+
* autoHeal on the failed step.
|
|
18
|
+
*/
|
|
19
|
+
import { captureA11yFlatten } from './a11yFlatten.js';
|
|
1
20
|
import { AutohealExhausted } from '../errors.js';
|
|
2
21
|
import { markAutoHeal } from '../step.js';
|
|
3
22
|
import { log } from '../log.js';
|
|
@@ -6,6 +25,8 @@ import { pngDimensions } from './png.js';
|
|
|
6
25
|
import { resolveCoordinate } from './coordinateResolver.js';
|
|
7
26
|
import { captureScreenshotB64, captureFullPageScreenshotB64 } from './screenshot.js';
|
|
8
27
|
import { attributionHeaders } from '../http.js';
|
|
28
|
+
import { PAGE_NOT_READY_STATUS, isPageNotReadyBody, newRequestId, retryOnPageNotReady, } from './pageReady.js';
|
|
29
|
+
import { creditsBody, raiseIfInsufficientCredits } from './credits.js';
|
|
9
30
|
// Locate is on AUTOMIND_URL (NOT the TESTMU_AI_API_HOST vision stack).
|
|
10
31
|
const AUTOMIND_FALLBACK = 'https://kaneai-api.lambdatest.com';
|
|
11
32
|
const LOCATE_TIMEOUT_MS = 120_000;
|
|
@@ -50,6 +71,11 @@ async function postLocate(payload, label, description, attempt) {
|
|
|
50
71
|
body: JSON.stringify(payload),
|
|
51
72
|
signal: AbortSignal.timeout(LOCATE_TIMEOUT_MS),
|
|
52
73
|
});
|
|
74
|
+
// Terminal before the 4xx branch: once credits are exhausted every subsequent call is
|
|
75
|
+
// Refused, so the run must stop rather than silently degrade to a tier miss.
|
|
76
|
+
if (resp.status === 403) {
|
|
77
|
+
raiseIfInsufficientCredits(resp.status, await creditsBody(resp));
|
|
78
|
+
}
|
|
53
79
|
if (resp.status >= 400 && resp.status < 500) {
|
|
54
80
|
log.helper(`[heal ${label}] 4xx status=${resp.status} for '${description.slice(0, 80)}' — not retrying`);
|
|
55
81
|
return 'fatal';
|
|
@@ -113,7 +139,11 @@ export async function getV3DesktopLocateTarget(page, description, _methodName =
|
|
|
113
139
|
screen_height: viewportHeight,
|
|
114
140
|
drop_aware: opts.dropAware ?? false,
|
|
115
141
|
request_id: requestId(),
|
|
116
|
-
|
|
142
|
+
// V2 parity (get_flat_a11y_tree): locate grounds on
|
|
143
|
+
// screenshot + a11y tree; this was hardcoded [] on every browser.
|
|
144
|
+
// Captured per attempt, like the screenshot above, so the tree always
|
|
145
|
+
// describes the image it ships with. Never throws — [] on failure.
|
|
146
|
+
a11y_flatten: await captureA11yFlatten(page, true),
|
|
117
147
|
}, 'desktop_locate', description, attempt);
|
|
118
148
|
if (result === 'fatal')
|
|
119
149
|
return null;
|
|
@@ -179,6 +209,10 @@ export async function getV3DesktopLocateFullPageTarget(page, description) {
|
|
|
179
209
|
return null;
|
|
180
210
|
}
|
|
181
211
|
const imageB64 = await captureFullPageScreenshotB64(page);
|
|
212
|
+
// Captured once beside the screenshot, for the same two reasons: it is an
|
|
213
|
+
// expensive whole-document walk, and it describes THIS image — recapturing
|
|
214
|
+
// per retry would let tree and image disagree.
|
|
215
|
+
const a11yFlatten = await captureA11yFlatten(page, false);
|
|
182
216
|
const bytes = Buffer.from(imageB64, 'base64');
|
|
183
217
|
let imageWidth, imageHeight;
|
|
184
218
|
try {
|
|
@@ -202,7 +236,7 @@ export async function getV3DesktopLocateFullPageTarget(page, description) {
|
|
|
202
236
|
screen_height: 0,
|
|
203
237
|
drop_aware: false,
|
|
204
238
|
request_id: requestId(),
|
|
205
|
-
a11y_flatten:
|
|
239
|
+
a11y_flatten: a11yFlatten,
|
|
206
240
|
}, 'desktop_locate_full_page', description, attempt);
|
|
207
241
|
if (result === 'fatal')
|
|
208
242
|
return null;
|
|
@@ -271,45 +305,63 @@ async function runVisionQueryTier(page, description, verbName) {
|
|
|
271
305
|
return null;
|
|
272
306
|
}
|
|
273
307
|
try {
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
const
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
308
|
+
// Each attempt re-captures the screenshot: a loader-blocked heal retries
|
|
309
|
+
// against a fresher page instead of counting as an immediate tier miss.
|
|
310
|
+
const attempt = async () => {
|
|
311
|
+
const snapshotB64 = await captureScreenshotB64(page);
|
|
312
|
+
const cfg = (k) => String(configGet(k) ?? '');
|
|
313
|
+
const payload = {
|
|
314
|
+
code_export_id: cfg('codeExportId'),
|
|
315
|
+
// Fresh per attempt so each page_not_ready retry saves to its own
|
|
316
|
+
// automind VQE folder ({org_id}/vqe/{request_id}).
|
|
317
|
+
request_id: newRequestId(),
|
|
318
|
+
current_action: {
|
|
319
|
+
operation_type: verbName,
|
|
320
|
+
operation_intent: description,
|
|
321
|
+
instruction_id: '',
|
|
322
|
+
operation_id: '',
|
|
323
|
+
use_query_v2: true,
|
|
324
|
+
version: 'v3',
|
|
325
|
+
selector: [],
|
|
326
|
+
frame_info: [],
|
|
327
|
+
sub_instruction_obj: { operation_dict: { queried_value: description } },
|
|
328
|
+
},
|
|
329
|
+
commit_id: cfg('commitId'),
|
|
330
|
+
test_id: cfg('testId'),
|
|
331
|
+
billing_run_id: billingRunId(),
|
|
332
|
+
username: cfg('username') || (process.env['LT_USERNAME'] ?? ''),
|
|
333
|
+
accesskey: cfg('accesskey') || (process.env['LT_ACCESS_KEY'] ?? ''),
|
|
284
334
|
version: 'v3',
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
}
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
335
|
+
org_id: cfg('orgId'),
|
|
336
|
+
session_id: cfg('sessionId'),
|
|
337
|
+
untagged_image_base64: snapshotB64,
|
|
338
|
+
};
|
|
339
|
+
const user = payload.username;
|
|
340
|
+
const key = payload.accesskey;
|
|
341
|
+
const resp = await fetch(`${baseUrl}/v1/heal/vision`, {
|
|
342
|
+
method: 'POST',
|
|
343
|
+
headers: {
|
|
344
|
+
'content-type': 'application/json',
|
|
345
|
+
authorization: `Basic ${Buffer.from(`${user}:${key}`).toString('base64')}`,
|
|
346
|
+
},
|
|
347
|
+
body: JSON.stringify(payload),
|
|
348
|
+
signal: AbortSignal.timeout(LOCATE_TIMEOUT_MS),
|
|
349
|
+
});
|
|
350
|
+
// A 409 loader answer is parsed (not treated as !resp.ok) so the budget
|
|
351
|
+
// can see it; every other non-2xx stays an immediate miss.
|
|
352
|
+
if (resp.status === PAGE_NOT_READY_STATUS) {
|
|
353
|
+
const parsed = await resp.json().catch(() => null);
|
|
354
|
+
if (isPageNotReadyBody(parsed))
|
|
355
|
+
return parsed;
|
|
356
|
+
return null;
|
|
357
|
+
}
|
|
358
|
+
if (!resp.ok)
|
|
359
|
+
return null;
|
|
360
|
+
return (await resp.json());
|
|
298
361
|
};
|
|
299
|
-
const
|
|
300
|
-
|
|
301
|
-
const resp = await fetch(`${baseUrl}/v1/heal/vision`, {
|
|
302
|
-
method: 'POST',
|
|
303
|
-
headers: {
|
|
304
|
-
'content-type': 'application/json',
|
|
305
|
-
authorization: `Basic ${Buffer.from(`${user}:${key}`).toString('base64')}`,
|
|
306
|
-
},
|
|
307
|
-
body: JSON.stringify(payload),
|
|
308
|
-
signal: AbortSignal.timeout(LOCATE_TIMEOUT_MS),
|
|
309
|
-
});
|
|
310
|
-
if (!resp.ok)
|
|
362
|
+
const body = await retryOnPageNotReady(attempt, '[v3 vision]');
|
|
363
|
+
if (body === null)
|
|
311
364
|
return null;
|
|
312
|
-
const body = (await resp.json());
|
|
313
365
|
if (body['error'])
|
|
314
366
|
return null;
|
|
315
367
|
const raw = body['value'] ?? body['xpath'];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"healCascade.js","sourceRoot":"","sources":["../../src/helpers/healCascade.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,GAAG,IAAI,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD,uEAAuE;AACvE,MAAM,iBAAiB,GAAG,mCAAmC,CAAC;AAC9D,MAAM,iBAAiB,GAAG,OAAO,CAAC;AAClC,wEAAwE;AACxE,0EAA0E;AAC1E,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;AAClE,MAAM,kBAAkB,GAAsB,CAAC,gBAAgB,CAAC,CAAC;AACjE,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,sBAAsB,GAAG,IAAI,CAAC;AAEpC,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AAapE,SAAS,kBAAkB;IACzB,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,iBAAiB,CAAC;AAC1D,CAAC;AAED,yDAAyD;AACzD,SAAS,gBAAgB;IACvB,MAAM,OAAO,GAA2B;QACtC,cAAc,EAAE,kBAAkB;QAClC,iBAAiB,EAAE,eAAe;KACnC,CAAC;IACF,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IAC9C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;IAC/C,IAAI,IAAI,IAAI,GAAG,EAAE,CAAC;QAChB,OAAO,CAAC,eAAe,CAAC,GAAG,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;IACzF,CAAC;IACD,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC;IAC3D,IAAI,SAAS;QAAE,OAAO,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IACnD,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAC7C,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,SAAS;IAChB,sDAAsD;IACtD,OAAO,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACxF,CAAC;AAOD;qEACqE;AACrE,KAAK,UAAU,UAAU,CACvB,OAAgC,EAChC,KAAa,EACb,WAAmB,EACnB,OAAe;IAEf,MAAM,QAAQ,GAAG,GAAG,kBAAkB,EAAE,oBAAoB,CAAC;IAC7D,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;QACjC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,gBAAgB,EAAE;QAC3B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;QAC7B,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,iBAAiB,CAAC;KAC/C,CAAC,CAAC;IACH,IAAI,IAAI,CAAC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;QAC5C,GAAG,CAAC,MAAM,CAAC,SAAS,KAAK,gBAAgB,IAAI,CAAC,MAAM,SAAS,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC;QACzG,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,IAAI,IAAI,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QACxB,GAAG,CAAC,MAAM,CAAC,SAAS,KAAK,oBAAoB,IAAI,CAAC,MAAM,SAAS,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,OAAO,GAAG,CAAC,IAAI,mBAAmB,GAAG,CAAC,CAAC;QAC9I,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAmB,CAAC;AAC/C,CAAC;AAED;oEACoE;AACpE,SAAS,iBAAiB,CAAC,MAAsB;IAC/C,MAAM,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC;IAC5B,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAClE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACtC,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,IAAU,EACV,WAAmB,EACnB,WAAW,GAAG,OAAO,EACrB,OAAgC,EAAE;IAElC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,GAAG,CAAC,MAAM,CAAC,gEAAgE,CAAC,CAAC;QAC7E,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,mBAAmB,EAAE,OAAO,EAAE,EAAE,CAAC;QAC/D,IAAI,CAAC;YACH,wEAAwE;YACxE,mEAAmE;YACnE,8CAA8C;YAC9C,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAC;YAClD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAE9C,IAAI,UAAkB,EAAE,WAAmB,CAAC;YAC5C,IAAI,CAAC;gBACH,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;YACnD,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,8DAA8D;gBAC9D,GAAG,CAAC,MAAM,CAAC,qDAAqD,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC3G,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAqB,CAAC;YACpE,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAE3C,IAAI,aAAa,GAAG,CAAC,IAAI,cAAc,GAAG,CAAC,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;gBAC/D,MAAM,QAAQ,GAAG,UAAU,GAAG,WAAW,CAAC;gBAC1C,MAAM,OAAO,GAAG,aAAa,GAAG,cAAc,CAAC;gBAC/C,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,OAAO,GAAG,sBAAsB,EAAE,CAAC;oBACpE,GAAG,CAAC,MAAM,CAAC,oDAAoD,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC3J,CAAC;YACH,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC;gBAC9B,MAAM,EAAE,WAAW;gBACnB,KAAK,EAAE,QAAQ;gBACf,EAAE,EAAE,SAAS;gBACb,QAAQ,EAAE,KAAK;gBACf,YAAY,EAAE,aAAa;gBAC3B,aAAa,EAAE,cAAc;gBAC7B,UAAU,EAAE,IAAI,CAAC,SAAS,IAAI,KAAK;gBACnC,UAAU,EAAE,SAAS,EAAE;gBACvB,YAAY,EAAE,EAAE;aACjB,EAAE,gBAAgB,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;YAE3C,IAAI,MAAM,KAAK,OAAO;gBAAE,OAAO,IAAI,CAAC;YACpC,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACpB,IAAI,OAAO,GAAG,mBAAmB,GAAG,CAAC;oBAAE,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;gBACzD,SAAS;YACX,CAAC;YAED,MAAM,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACxC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACnB,GAAG,CAAC,MAAM,CAAC,mCAAmC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;gBAC3E,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,KAAK,CAAC;YAE3B,uDAAuD;YACvD,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,GAAG,aAAa,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;YACxE,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,GAAG,cAAc,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;YAC1E,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC;YACtD,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC;YAEvD,GAAG,CAAC,MAAM,CAAC,oCAAoC,IAAI,IAAI,IAAI,iBAAiB,UAAU,IAAI,WAAW,eAAe,aAAa,IAAI,cAAc,UAAU,IAAI,IAAI,IAAI,gBAAgB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAC9N,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACtB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,GAAI,CAAW,EAAE,IAAI,IAAI,EAAE,CAAC;YACtC,oEAAoE;YACpE,4BAA4B;YAC5B,IAAI,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,YAAY,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;gBAC7E,GAAG,CAAC,MAAM,CAAC,8CAA8C,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,OAAO,GAAG,CAAC,IAAI,mBAAmB,MAAM,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACpJ,IAAI,OAAO,GAAG,mBAAmB,GAAG,CAAC;oBAAE,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;YAC3D,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,MAAM,CAAC,+CAA+C,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACrG,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IACD,GAAG,CAAC,MAAM,CAAC,6BAA6B,mBAAmB,4BAA4B,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;IACpH,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,oBAAoB,CACjC,IAAU,EAAE,WAAmB,EAAE,QAAgB;IAEjD,MAAM,MAAM,GAAG,MAAM,wBAAwB,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC3E,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACjC,4EAA4E;IAC5E,oEAAoE;IACpE,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACrE,GAAG,CAAC,MAAM,CAAC,2CAA2C,QAAQ,EAAE,KAAK,IAAI,MAAM,EAAE,CAAC,CAAC;IACnF,OAAO;QACL,QAAQ,EAAE,gBAAgB;QAC1B,aAAa,EAAE,QAAQ,EAAE,KAAK,IAAI,IAAI;QACtC,WAAW,EAAE,MAAM;KACpB,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,gCAAgC,CACpD,IAAU,EACV,WAAmB;IAEnB,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,GAAG,CAAC,MAAM,CAAC,8DAA8D,CAAC,CAAC;QAC3E,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,4BAA4B,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC9C,IAAI,UAAkB,EAAE,WAAmB,CAAC;IAC5C,IAAI,CAAC;QACH,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,MAAM,CAAC,+DAA+D,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACrH,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,QAAQ,CAC/B,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,WAAW,EAAE,QAAQ,CAAC,eAAe,CAAC,YAAY,CAAC,CACpF,CAAqB,CAAC;IACvB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAEvC,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,mBAAmB,EAAE,OAAO,EAAE,EAAE,CAAC;QAC/D,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC;gBAC9B,MAAM,EAAE,WAAW;gBACnB,KAAK,EAAE,QAAQ;gBACf,EAAE,EAAE,SAAS;gBACb,QAAQ,EAAE,KAAK;gBACf,YAAY,EAAE,CAAC;gBACf,aAAa,EAAE,CAAC;gBAChB,UAAU,EAAE,KAAK;gBACjB,UAAU,EAAE,SAAS,EAAE;gBACvB,YAAY,EAAE,EAAE;aACjB,EAAE,0BAA0B,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;YAErD,IAAI,MAAM,KAAK,OAAO;gBAAE,OAAO,IAAI,CAAC;YACpC,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACpB,IAAI,OAAO,GAAG,mBAAmB,GAAG,CAAC;oBAAE,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;gBACzD,SAAS;YACX,CAAC;YACD,MAAM,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACxC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACnB,GAAG,CAAC,MAAM,CAAC,6CAA6C,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;gBACrF,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,KAAK,CAAC;YAC3B,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;YACrE,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,GAAG,UAAU,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;YACvE,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC;YACpD,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC;YACrD,GAAG,CAAC,MAAM,CAAC,8CAA8C,IAAI,IAAI,IAAI,iBAAiB,UAAU,IAAI,WAAW,gBAAgB,SAAS,IAAI,UAAU,eAAe,KAAK,IAAI,KAAK,GAAG,CAAC,CAAC;YACxL,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACxB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,GAAI,CAAW,EAAE,IAAI,IAAI,EAAE,CAAC;YACtC,IAAI,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,YAAY,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;gBAC7E,GAAG,CAAC,MAAM,CAAC,wDAAwD,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,OAAO,GAAG,CAAC,IAAI,mBAAmB,MAAM,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC9J,IAAI,OAAO,GAAG,mBAAmB,GAAG,CAAC;oBAAE,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;YAC3D,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,MAAM,CAAC,yDAAyD,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC/G,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IACD,GAAG,CAAC,MAAM,CAAC,uCAAuC,mBAAmB,4BAA4B,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;IAC9H,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,4BAA4B,CACzC,IAAU,EAAE,WAAmB,EAAE,SAAiB;IAElD,MAAM,MAAM,GAAG,MAAM,gCAAgC,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IACzE,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACjC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC;IAE9B,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAqB,CAAC;IAClE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7B,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAE7B,0DAA0D;IAC1D,MAAM,IAAI,CAAC,QAAQ,CACjB,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAW,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAC3C,IAAI,CAAC,GAAG,CAAC,CAAC,EAAG,EAAa,GAAG,IAAI,CAAC,KAAK,CAAE,CAAY,GAAG,CAAC,CAAC,CAAC,EAC3D,IAAI,CAAC,GAAG,CAAC,CAAC,EAAG,EAAa,GAAG,IAAI,CAAC,KAAK,CAAE,CAAY,GAAG,CAAC,CAAC,CAAC,CAC5D,EACD,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,CACvB,CAAC;IACF,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;IACjB,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAqB,CAAC;IACjG,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IACxE,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAExE,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACvD,GAAG,CAAC,MAAM,CAAC,6CAA6C,KAAK,IAAI,KAAK,eAAe,EAAE,IAAI,EAAE,mBAAmB,QAAQ,EAAE,KAAK,IAAI,MAAM,EAAE,CAAC,CAAC;IAC7I,OAAO;QACL,QAAQ,EAAE,0BAA0B;QACpC,aAAa,EAAE,QAAQ,EAAE,KAAK,IAAI,IAAI;QACtC,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;KACtB,CAAC;AACJ,CAAC;AAED;gFACgF;AAChF,KAAK,UAAU,kBAAkB,CAC/B,IAAU,EAAE,WAAmB,EAAE,QAAgB;IAEjD,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,IAAI,kBAAkB,EAAE,CAAC;IAC/E,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,GAAG,CAAC,MAAM,CAAC,wCAAwC,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAU,CAAC,IAAI,EAAE,CAAC,CAAC;QAC/D,MAAM,OAAO,GAAG;YACd,cAAc,EAAE,GAAG,CAAC,cAAc,CAAC;YACnC,cAAc,EAAE;gBACd,cAAc,EAAE,QAAQ;gBACxB,gBAAgB,EAAE,WAAW;gBAC7B,cAAc,EAAE,EAAE;gBAClB,YAAY,EAAE,EAAE;gBAChB,YAAY,EAAE,IAAI;gBAClB,OAAO,EAAE,IAAI;gBACb,QAAQ,EAAE,EAAE;gBACZ,UAAU,EAAE,EAAE;gBACd,mBAAmB,EAAE,EAAE,cAAc,EAAE,EAAE,aAAa,EAAE,WAAW,EAAE,EAAE;aACxE;YACD,SAAS,EAAE,GAAG,CAAC,UAAU,CAAC;YAC1B,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC;YACtB,cAAc,EAAE,YAAY,EAAE;YAC9B,QAAQ,EAAE,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;YAC/D,SAAS,EAAE,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;YACnE,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC;YACpB,UAAU,EAAE,GAAG,CAAC,WAAW,CAAC;YAC5B,qBAAqB,EAAE,WAAW;SACnC,CAAC;QACF,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC;QAC9B,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC;QAC9B,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,iBAAiB,EAAE;YACpD,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;aAC3E;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YAC7B,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,iBAAiB,CAAC;SAC/C,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QAC1B,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAA4B,CAAC;QAC5D,IAAI,IAAI,CAAC,OAAO,CAAC;YAAE,OAAO,IAAI,CAAC;QAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;YAAE,OAAO,IAAI,CAAC;QACxD,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;IACjE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,MAAM,CAAC,gBAAgB,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACtE,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAID,MAAM,gBAAgB,GAAmC;IACvD,cAAc,EAAE,oBAAoB;IACpC,wBAAwB,EAAE,4BAA4B;IACtD,YAAY,EAAE,kBAAkB;CACjC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,IAOjC;IACC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,kBAAkB,CAAC;IAE/C,4EAA4E;IAC5E,iEAAiE;IACjE,YAAY,EAAE,CAAC;IAEf,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,GAAG,CAAC,MAAM,CAAC,wBAAwB,IAAI,cAAc,CAAC,CAAC;YACvD,SAAS;QACX,CAAC;QACD,GAAG,CAAC,MAAM,CAAC,eAAe,IAAI,SAAS,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;QACpE,IAAI,MAAM,GAAsB,IAAI,CAAC;QACrC,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QACzD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,GAAG,CAAC,MAAM,CAAC,eAAe,IAAI,YAAY,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACvD,MAAM,GAAG,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,GAAG,CAAC,MAAM,CAAC,eAAe,IAAI,kBAAkB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACvI,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,GAAG,CAAC,MAAM,CAAC,eAAe,IAAI,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,iBAAiB,CAC/B,+BAA+B,WAAW,MAAM,QAAQ,GAAG,CAC5D,CAAC;IACD,GAAmC,CAAC,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC;IAChE,MAAM,GAAG,CAAC;AACZ,CAAC"}
|
|
1
|
+
{"version":3,"file":"healCascade.js","sourceRoot":"","sources":["../../src/helpers/healCascade.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Merge each iframe's a11y tree into the main-frame a11y snapshot.
|
|
3
|
+
*
|
|
4
|
+
* `Accessibility.getFullAXTree` without a `frameId` covers the main frame only,
|
|
5
|
+
* so iframe-resident controls and their runtime values never reached the
|
|
6
|
+
* textual-query endpoint. Port of V2 `_merge_iframe_a11y_into_main`, split like
|
|
7
|
+
* the Python bindings: a pure merge over pre-fetched CDP results, fed by
|
|
8
|
+
* `mergeIframeA11y` below.
|
|
9
|
+
*/
|
|
10
|
+
import type { CDPSession } from 'playwright';
|
|
11
|
+
type AxNode = Record<string, unknown> & {
|
|
12
|
+
nodeId?: unknown;
|
|
13
|
+
parentId?: unknown;
|
|
14
|
+
childIds?: unknown[];
|
|
15
|
+
backendDOMNodeId?: number;
|
|
16
|
+
frameId?: string;
|
|
17
|
+
};
|
|
18
|
+
type AxTree = {
|
|
19
|
+
nodes?: AxNode[];
|
|
20
|
+
};
|
|
21
|
+
type Frames = Array<[string, string | null]>;
|
|
22
|
+
export declare function frameIdsWithParents(resp: unknown): Frames;
|
|
23
|
+
/** Host <iframe> backend ids read off each parent frame's AX tree. */
|
|
24
|
+
export declare function ownersFromParentAx(frames: Frames, frameAx: Record<string, AxTree>): Record<string, number>;
|
|
25
|
+
/** Graft every iframe's AX nodes into `a11y.nodes` in place; returns the count merged. */
|
|
26
|
+
export declare function mergeIframeA11yPure(a11y: AxTree, dom: any, frames: Frames, frameAx: Record<string, AxTree>, owners: Record<string, number>): number;
|
|
27
|
+
/** Fetch every frame's AX tree over `cdp` and merge it into `a11y`. CDP failures are skipped. */
|
|
28
|
+
export declare function mergeIframeA11y(cdp: CDPSession, a11y: AxTree, dom: any): Promise<void>;
|
|
29
|
+
export {};
|
|
30
|
+
//# sourceMappingURL=iframeA11y.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"iframeA11y.d.ts","sourceRoot":"","sources":["../../src/helpers/iframeA11y.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,KAAK,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IACtC,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;IAC3D,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC7C,CAAC;AACF,KAAK,MAAM,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AACnC,KAAK,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;AAE7C,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CASzD;AAED,sEAAsE;AACtE,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAO1G;AAKD,0FAA0F;AAC1F,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtG,MAAM,CA2DR;AAED,iGAAiG;AACjG,wBAAsB,eAAe,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB5F"}
|
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
import { log } from '../log.js';
|
|
2
|
+
export function frameIdsWithParents(resp) {
|
|
3
|
+
const out = [];
|
|
4
|
+
const walk = (node, parent) => {
|
|
5
|
+
const fid = node?.frame?.id;
|
|
6
|
+
if (fid)
|
|
7
|
+
out.push([fid, parent]);
|
|
8
|
+
for (const c of node?.childFrames ?? [])
|
|
9
|
+
walk(c, fid ?? null);
|
|
10
|
+
};
|
|
11
|
+
walk(resp?.frameTree, null);
|
|
12
|
+
return out;
|
|
13
|
+
}
|
|
14
|
+
/** Host <iframe> backend ids read off each parent frame's AX tree. */
|
|
15
|
+
export function ownersFromParentAx(frames, frameAx) {
|
|
16
|
+
const owners = {};
|
|
17
|
+
for (const [fid, parent] of frames.slice(1)) {
|
|
18
|
+
const hit = (frameAx[parent ?? '']?.nodes ?? []).find(n => n.frameId === fid && n.backendDOMNodeId != null);
|
|
19
|
+
if (hit)
|
|
20
|
+
owners[fid] = hit.backendDOMNodeId;
|
|
21
|
+
}
|
|
22
|
+
return owners;
|
|
23
|
+
}
|
|
24
|
+
const maxNodeId = (nodes) => nodes.reduce((m, n) => { const v = Number(n.nodeId ?? 0); return Number.isFinite(v) ? Math.max(m, v) : m; }, 0);
|
|
25
|
+
/** Graft every iframe's AX nodes into `a11y.nodes` in place; returns the count merged. */
|
|
26
|
+
export function mergeIframeA11yPure(a11y, dom, frames, frameAx, owners) {
|
|
27
|
+
const documents = dom?.documents ?? [];
|
|
28
|
+
const main = a11y?.nodes;
|
|
29
|
+
if (documents.length < 2 || !main?.length)
|
|
30
|
+
return 0;
|
|
31
|
+
// doc index -> host <iframe> backend id; every doc scanned so nested iframes map too.
|
|
32
|
+
const docToHost = new Map();
|
|
33
|
+
for (const pd of documents) {
|
|
34
|
+
const bids = pd?.nodes?.backendNodeId ?? [];
|
|
35
|
+
const cdi = pd?.nodes?.contentDocumentIndex;
|
|
36
|
+
if (!cdi || typeof cdi !== 'object')
|
|
37
|
+
continue;
|
|
38
|
+
const idx = cdi.index ?? [];
|
|
39
|
+
const val = cdi.value ?? [];
|
|
40
|
+
for (let i = 0; i < Math.min(idx.length, val.length); i++) {
|
|
41
|
+
if (idx[i] >= 0 && idx[i] < bids.length)
|
|
42
|
+
docToHost.set(val[i], bids[idx[i]]);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
const hostToDoc = new Map([...docToHost].map(([d, b]) => [b, d]));
|
|
46
|
+
const docToFid = new Map();
|
|
47
|
+
for (const [fid] of frames.slice(1)) {
|
|
48
|
+
const d = hostToDoc.get(owners[fid]);
|
|
49
|
+
if (d !== undefined)
|
|
50
|
+
docToFid.set(d, fid);
|
|
51
|
+
}
|
|
52
|
+
const bidToAxid = new Map();
|
|
53
|
+
for (const n of main)
|
|
54
|
+
if (n.backendDOMNodeId != null)
|
|
55
|
+
bidToAxid.set(n.backendDOMNodeId, n.nodeId);
|
|
56
|
+
let offset = maxNodeId(main) + 1;
|
|
57
|
+
let merged = 0;
|
|
58
|
+
for (let d = 1; d < documents.length; d++) {
|
|
59
|
+
const fid = docToFid.get(d);
|
|
60
|
+
const nodes = (fid ? frameAx[fid]?.nodes : undefined) ?? [];
|
|
61
|
+
if (!nodes.length)
|
|
62
|
+
continue;
|
|
63
|
+
const off = offset;
|
|
64
|
+
const shift = (id) => {
|
|
65
|
+
if (id == null)
|
|
66
|
+
return null;
|
|
67
|
+
const v = Number(id);
|
|
68
|
+
return Number.isInteger(v) ? String(v + off) : id;
|
|
69
|
+
};
|
|
70
|
+
const rootOld = nodes.find(n => n.parentId == null)?.nodeId;
|
|
71
|
+
const localMax = maxNodeId(nodes);
|
|
72
|
+
for (const n of nodes) {
|
|
73
|
+
n.nodeId = shift(n.nodeId);
|
|
74
|
+
if ('parentId' in n)
|
|
75
|
+
n.parentId = shift(n.parentId);
|
|
76
|
+
if ('childIds' in n)
|
|
77
|
+
n.childIds = (n.childIds ?? []).map(shift);
|
|
78
|
+
}
|
|
79
|
+
const rootNew = shift(rootOld);
|
|
80
|
+
const hostAxid = bidToAxid.get(docToHost.get(d));
|
|
81
|
+
if (hostAxid != null && rootNew != null) {
|
|
82
|
+
const host = main.find(n => n.nodeId === hostAxid);
|
|
83
|
+
if (host)
|
|
84
|
+
(host.childIds ??= []).push(rootNew);
|
|
85
|
+
const root = nodes.find(n => n.nodeId === rootNew);
|
|
86
|
+
if (root)
|
|
87
|
+
root.parentId = hostAxid;
|
|
88
|
+
}
|
|
89
|
+
main.push(...nodes);
|
|
90
|
+
for (const n of nodes)
|
|
91
|
+
if (n.backendDOMNodeId != null && !bidToAxid.has(n.backendDOMNodeId))
|
|
92
|
+
bidToAxid.set(n.backendDOMNodeId, n.nodeId);
|
|
93
|
+
offset += localMax + 1;
|
|
94
|
+
merged += nodes.length;
|
|
95
|
+
}
|
|
96
|
+
log.helper(`[iframe-a11y] merged ${merged} node(s) from ${documents.length - 1} iframe doc(s)`);
|
|
97
|
+
return merged;
|
|
98
|
+
}
|
|
99
|
+
/** Fetch every frame's AX tree over `cdp` and merge it into `a11y`. CDP failures are skipped. */
|
|
100
|
+
export async function mergeIframeA11y(cdp, a11y, dom) {
|
|
101
|
+
if ((dom?.documents ?? []).length < 2)
|
|
102
|
+
return;
|
|
103
|
+
const send = async (cmd, params = {}) => {
|
|
104
|
+
try {
|
|
105
|
+
return await cdp.send(cmd, params);
|
|
106
|
+
}
|
|
107
|
+
catch (e) {
|
|
108
|
+
log.helper(`[iframe-a11y] ${cmd} failed: ${String(e)}`);
|
|
109
|
+
return {};
|
|
110
|
+
}
|
|
111
|
+
};
|
|
112
|
+
const frames = frameIdsWithParents(await send('Page.getFrameTree'));
|
|
113
|
+
if (frames.length < 2)
|
|
114
|
+
return;
|
|
115
|
+
const frameAx = { [frames[0][0]]: a11y };
|
|
116
|
+
for (const [fid] of frames.slice(1))
|
|
117
|
+
frameAx[fid] = await send('Accessibility.getFullAXTree', { frameId: fid });
|
|
118
|
+
const owners = ownersFromParentAx(frames, frameAx);
|
|
119
|
+
for (const [fid] of frames.slice(1)) {
|
|
120
|
+
if (fid in owners)
|
|
121
|
+
continue;
|
|
122
|
+
const bid = (await send('DOM.getFrameOwner', { frameId: fid }))?.backendNodeId;
|
|
123
|
+
if (bid != null)
|
|
124
|
+
owners[fid] = bid;
|
|
125
|
+
}
|
|
126
|
+
mergeIframeA11yPure(a11y, dom, frames, frameAx, owners);
|
|
127
|
+
}
|
|
128
|
+
//# sourceMappingURL=iframeA11y.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"iframeA11y.js","sourceRoot":"","sources":["../../src/helpers/iframeA11y.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAShC,MAAM,UAAU,mBAAmB,CAAC,IAAa;IAC/C,MAAM,GAAG,GAAW,EAAE,CAAC;IACvB,MAAM,IAAI,GAAG,CAAC,IAAS,EAAE,MAAqB,EAAQ,EAAE;QACtD,MAAM,GAAG,GAAG,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC5B,IAAI,GAAG;YAAE,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;QACjC,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,WAAW,IAAI,EAAE;YAAE,IAAI,CAAC,CAAC,EAAE,GAAG,IAAI,IAAI,CAAC,CAAC;IAChE,CAAC,CAAC;IACF,IAAI,CAAE,IAAY,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IACrC,OAAO,GAAG,CAAC;AACb,CAAC;AAED,sEAAsE;AACtE,MAAM,UAAU,kBAAkB,CAAC,MAAc,EAAE,OAA+B;IAChF,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,KAAK,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5C,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,GAAG,IAAI,CAAC,CAAC,gBAAgB,IAAI,IAAI,CAAC,CAAC;QAC5G,IAAI,GAAG;YAAE,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,gBAA0B,CAAC;IACxD,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,SAAS,GAAG,CAAC,KAAe,EAAU,EAAE,CAC5C,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAElH,0FAA0F;AAC1F,MAAM,UAAU,mBAAmB,CACjC,IAAY,EAAE,GAAQ,EAAE,MAAc,EAAE,OAA+B,EAAE,MAA8B;IAEvG,MAAM,SAAS,GAAU,GAAG,EAAE,SAAS,IAAI,EAAE,CAAC;IAC9C,MAAM,IAAI,GAAG,IAAI,EAAE,KAAK,CAAC;IACzB,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM;QAAE,OAAO,CAAC,CAAC;IAEpD,sFAAsF;IACtF,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC5C,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAa,EAAE,EAAE,KAAK,EAAE,aAAa,IAAI,EAAE,CAAC;QACtD,MAAM,GAAG,GAAG,EAAE,EAAE,KAAK,EAAE,oBAAoB,CAAC;QAC5C,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,SAAS;QAC9C,MAAM,GAAG,GAAa,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;QAAC,MAAM,GAAG,GAAa,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;QAC7E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC1D,IAAI,GAAG,CAAC,CAAC,CAAE,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAE,GAAG,IAAI,CAAC,MAAM;gBAAE,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAE,CAAE,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;IACD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAClE,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC3C,KAAK,MAAM,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QACpC,MAAM,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAW,CAAC,CAAC;QAC/C,IAAI,CAAC,KAAK,SAAS;YAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC5C,CAAC;IACD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAmB,CAAC;IAC7C,KAAK,MAAM,CAAC,IAAI,IAAI;QAAE,IAAI,CAAC,CAAC,gBAAgB,IAAI,IAAI;YAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;IAElG,IAAI,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1C,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC5B,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC5D,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,SAAS;QAC5B,MAAM,GAAG,GAAG,MAAM,CAAC;QACnB,MAAM,KAAK,GAAG,CAAC,EAAW,EAAW,EAAE;YACrC,IAAI,EAAE,IAAI,IAAI;gBAAE,OAAO,IAAI,CAAC;YAC5B,MAAM,CAAC,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;YACrB,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,CAAC,CAAC;QACF,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,IAAI,CAAC,EAAE,MAAM,CAAC;QAC5D,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QAClC,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACtB,CAAC,CAAC,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YAC3B,IAAI,UAAU,IAAI,CAAC;gBAAE,CAAC,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YACpD,IAAI,UAAU,IAAI,CAAC;gBAAE,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/B,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAW,CAAC,CAAC;QAC3D,IAAI,QAAQ,IAAI,IAAI,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;YACxC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC;YACnD,IAAI,IAAI;gBAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC/C,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC;YACnD,IAAI,IAAI;gBAAE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACrC,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;QACpB,KAAK,MAAM,CAAC,IAAI,KAAK;YAAE,IAAI,CAAC,CAAC,gBAAgB,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,gBAAgB,CAAC;gBAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;QACzI,MAAM,IAAI,QAAQ,GAAG,CAAC,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC;IACzB,CAAC;IACD,GAAG,CAAC,MAAM,CAAC,wBAAwB,MAAM,iBAAiB,SAAS,CAAC,MAAM,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAChG,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,iGAAiG;AACjG,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,GAAe,EAAE,IAAY,EAAE,GAAQ;IAC3E,IAAI,CAAC,GAAG,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO;IAC9C,MAAM,IAAI,GAAG,KAAK,EAAE,GAAW,EAAE,SAAkC,EAAE,EAAgB,EAAE;QACrF,IAAI,CAAC;YAAC,OAAO,MAAM,GAAG,CAAC,IAAI,CAAC,GAAY,EAAE,MAAe,CAAC,CAAC;QAAC,CAAC;QAC7D,OAAO,CAAC,EAAE,CAAC;YAAC,GAAG,CAAC,MAAM,CAAC,iBAAiB,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAAC,OAAO,EAAE,CAAC;QAAC,CAAC;IACnF,CAAC,CAAC;IACF,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC;IACpE,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO;IAC9B,MAAM,OAAO,GAA2B,EAAE,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;IAClE,KAAK,MAAM,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAAE,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,IAAI,CAAC,6BAA6B,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;IAChH,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnD,KAAK,MAAM,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QACpC,IAAI,GAAG,IAAI,MAAM;YAAE,SAAS;QAC5B,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,mBAAmB,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,aAAa,CAAC;QAC/E,IAAI,GAAG,IAAI,IAAI;YAAE,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;IACrC,CAAC;IACD,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAC1D,CAAC"}
|
package/dist/helpers/math.d.ts
CHANGED
|
@@ -1,6 +1,19 @@
|
|
|
1
1
|
export interface MathNode {
|
|
2
2
|
operator: string;
|
|
3
|
-
operands: Array<MathNode | number | string>;
|
|
3
|
+
operands: Array<MathNode | number | string | unknown[]>;
|
|
4
4
|
}
|
|
5
|
+
export declare function safeNumber(value: unknown): number;
|
|
6
|
+
/**
|
|
7
|
+
* Strip IEEE-754 floating-point noise (2.9000000000000004 -> 2.9).
|
|
8
|
+
*
|
|
9
|
+
* Binary floats cannot represent most decimal fractions exactly, so 1.1 + 1.8
|
|
10
|
+
* evaluates to 2.9000000000000004. An assertion comparing that against the
|
|
11
|
+
* authored "2.9" then fails on a value the user considers correct.
|
|
12
|
+
*
|
|
13
|
+
* 12 decimals is well below a double's ~15-16 significant digits, so genuine
|
|
14
|
+
* precision (percentages, prices, counts) is untouched; only magnitudes under
|
|
15
|
+
* 1e-12 would be lost, which do not occur in test data.
|
|
16
|
+
*/
|
|
17
|
+
export declare function cleanFloat(value: number): number;
|
|
5
18
|
export declare function evaluateMath(node: MathNode): Promise<number>;
|
|
6
19
|
//# sourceMappingURL=math.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"math.d.ts","sourceRoot":"","sources":["../../src/helpers/math.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"math.d.ts","sourceRoot":"","sources":["../../src/helpers/math.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,KAAK,CAAC,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,CAAC,CAAC;CACzD;AA4BD,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAOjD;AAgCD;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIhD;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAElE"}
|
package/dist/helpers/math.js
CHANGED
|
@@ -1,34 +1,114 @@
|
|
|
1
1
|
import { resolveVar } from '../vars.js';
|
|
2
2
|
import { log } from '../log.js';
|
|
3
|
+
import { get as configGet } from '../configure.js';
|
|
3
4
|
// Matches Python's _OPERATORS frozenset
|
|
4
5
|
const OPERATORS = new Set([
|
|
5
6
|
'add', 'subtract', 'multiply', 'divide', 'mod', 'pow', 'negate', 'abs',
|
|
6
7
|
// symbolic aliases
|
|
7
8
|
'+', '-', '*', '/',
|
|
8
9
|
]);
|
|
10
|
+
/**
|
|
11
|
+
* Number() that tolerates thousands-separator commas ("3,000" -> 3000).
|
|
12
|
+
*
|
|
13
|
+
* Captured page text routinely carries grouping separators, and a bare
|
|
14
|
+
* Number("3,000") is NaN — which surfaced as a hard math-step failure
|
|
15
|
+
*. Returns NaN like Number() on genuinely non-numeric input; the
|
|
16
|
+
* caller turns that into the operand error.
|
|
17
|
+
*
|
|
18
|
+
* Ambiguity note (V2 parity): this strips ALL commas, so a
|
|
19
|
+
* decimal-comma locale string ("3,5") reads as 35 rather than 3.5. That is the
|
|
20
|
+
* V2 behaviour being matched here, not an oversight — diverging would make
|
|
21
|
+
* exported runs disagree with the live runtime on the same captured value.
|
|
22
|
+
*/
|
|
23
|
+
/**
|
|
24
|
+
* True when the V2-parity number semantics apply — V3 runs only.
|
|
25
|
+
*
|
|
26
|
+
* Three behaviours hang off this: comma-tolerant parsing, array-operand
|
|
27
|
+
* expansion, and 12-decimal noise rounding. They exist to keep V3 exported
|
|
28
|
+
* runs consistent with the V2 live runtime; a V4 run has no V2 counterpart to
|
|
29
|
+
* agree with, so it keeps the plain semantics — a comma or an array operand is
|
|
30
|
+
* a loud operand error, results are raw.
|
|
31
|
+
*/
|
|
32
|
+
function v2ParityNumbers() {
|
|
33
|
+
return configGet('kaneVersion') === 'v3';
|
|
34
|
+
}
|
|
35
|
+
export function safeNumber(value) {
|
|
36
|
+
if (typeof value === 'number')
|
|
37
|
+
return value;
|
|
38
|
+
if (typeof value !== 'string')
|
|
39
|
+
return Number(value);
|
|
40
|
+
if (!v2ParityNumbers())
|
|
41
|
+
return Number(value.trim());
|
|
42
|
+
// Number('') is 0; keep that quirk out of the comma path by leaving the
|
|
43
|
+
// empty string to Number() unchanged.
|
|
44
|
+
return Number(value.trim().replace(/,/g, ''));
|
|
45
|
+
}
|
|
9
46
|
async function toNum(val) {
|
|
10
47
|
if (typeof val === 'number')
|
|
11
48
|
return val;
|
|
12
49
|
if (typeof val === 'string') {
|
|
13
50
|
// Resolve {{var}} / ${var} placeholders via the variable store
|
|
14
51
|
const resolved = await resolveVar(val);
|
|
15
|
-
const n =
|
|
52
|
+
const n = safeNumber(resolved);
|
|
16
53
|
if (Number.isNaN(n))
|
|
17
54
|
throw new Error(`Non-numeric operand encountered: ${JSON.stringify(val)}`);
|
|
18
55
|
return n;
|
|
19
56
|
}
|
|
20
57
|
throw new Error(`Unsupported operand type: ${typeof val}`);
|
|
21
58
|
}
|
|
59
|
+
/**
|
|
60
|
+
* Flatten a list operand into numbers, recursively.
|
|
61
|
+
*
|
|
62
|
+
* A captured variable can hold an array (e.g. a table column scraped into
|
|
63
|
+
* {{prices}}), and the arithmetic is meant to run over its members — "sum the
|
|
64
|
+
* captured list". `toNum` rejects an array outright with "Unsupported operand
|
|
65
|
+
* Type: object", so the whole math step failed. Expanding first lets
|
|
66
|
+
* `add` sum the members, and keeps the arity checks honest: a 3-element array in
|
|
67
|
+
* a subtract tree now reports a real operand-count error instead of a type error.
|
|
68
|
+
*/
|
|
69
|
+
async function expandOperandToNumbers(value) {
|
|
70
|
+
if (!Array.isArray(value))
|
|
71
|
+
return [await toNum(value)];
|
|
72
|
+
// V4: no expansion — surface the pre-parity operand-type error from toNum.
|
|
73
|
+
if (!v2ParityNumbers())
|
|
74
|
+
return [await toNum(value)];
|
|
75
|
+
const parts = await Promise.all(value.map((item) => expandOperandToNumbers(item)));
|
|
76
|
+
return parts.flat();
|
|
77
|
+
}
|
|
78
|
+
/**
|
|
79
|
+
* Strip IEEE-754 floating-point noise (2.9000000000000004 -> 2.9).
|
|
80
|
+
*
|
|
81
|
+
* Binary floats cannot represent most decimal fractions exactly, so 1.1 + 1.8
|
|
82
|
+
* evaluates to 2.9000000000000004. An assertion comparing that against the
|
|
83
|
+
* authored "2.9" then fails on a value the user considers correct.
|
|
84
|
+
*
|
|
85
|
+
* 12 decimals is well below a double's ~15-16 significant digits, so genuine
|
|
86
|
+
* precision (percentages, prices, counts) is untouched; only magnitudes under
|
|
87
|
+
* 1e-12 would be lost, which do not occur in test data.
|
|
88
|
+
*/
|
|
89
|
+
export function cleanFloat(value) {
|
|
90
|
+
if (!Number.isFinite(value))
|
|
91
|
+
return value;
|
|
92
|
+
if (!v2ParityNumbers())
|
|
93
|
+
return value;
|
|
94
|
+
return Number(value.toFixed(12));
|
|
95
|
+
}
|
|
22
96
|
export async function evaluateMath(node) {
|
|
97
|
+
return cleanFloat(await evaluateMathRaw(node));
|
|
98
|
+
}
|
|
99
|
+
async function evaluateMathRaw(node) {
|
|
23
100
|
const op = node.operator ?? 'add';
|
|
24
101
|
log.helper(`[math] operator=${op}`);
|
|
25
102
|
if (!OPERATORS.has(op))
|
|
26
103
|
throw new Error(`Unsupported math operator: ${JSON.stringify(op)}`);
|
|
27
|
-
const
|
|
104
|
+
const nested = await Promise.all(node.operands.map(async (operand) => {
|
|
105
|
+
if (Array.isArray(operand))
|
|
106
|
+
return expandOperandToNumbers(operand);
|
|
28
107
|
if (typeof operand === 'object' && operand !== null)
|
|
29
|
-
return evaluateMath(operand);
|
|
30
|
-
return toNum(operand);
|
|
108
|
+
return [await evaluateMath(operand)];
|
|
109
|
+
return [await toNum(operand)];
|
|
31
110
|
}));
|
|
111
|
+
const resolved = nested.flat();
|
|
32
112
|
// Validate arity — matches Python's checks
|
|
33
113
|
if ((op === 'subtract' || op === '-' || op === 'divide' || op === '/' || op === 'mod') && resolved.length !== 2) {
|
|
34
114
|
throw new Error(`${op} requires exactly 2 operands, got ${resolved.length}`);
|
package/dist/helpers/math.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"math.js","sourceRoot":"","sources":["../../src/helpers/math.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"math.js","sourceRoot":"","sources":["../../src/helpers/math.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
/** Body discriminator automind sets when the VQE saw an active loader. */
|
|
2
|
+
export declare const PAGE_NOT_READY_ERROR = "page_not_ready";
|
|
3
|
+
/** Status automind pairs with it (picked to sit outside the transport retry set). */
|
|
4
|
+
export declare const PAGE_NOT_READY_STATUS = 409;
|
|
5
|
+
/** Total POSTs per vision call (V2 parity). */
|
|
6
|
+
export declare const MAX_ATTEMPTS = 3;
|
|
7
|
+
/** Delay between attempts. The final attempt is not followed by a sleep. */
|
|
8
|
+
export declare const SLEEP_MS = 3000;
|
|
9
|
+
/**
|
|
10
|
+
* Fresh per-attempt id so every retry lands in its own automind VQE debug
|
|
11
|
+
* folder (`{org_id}/vqe/{request_id}`) instead of overwriting the last one.
|
|
12
|
+
*/
|
|
13
|
+
export declare function newRequestId(): string;
|
|
14
|
+
/** True when a parsed heal response carries the loader signal. */
|
|
15
|
+
export declare function isPageNotReadyBody(body: unknown): boolean;
|
|
16
|
+
/**
|
|
17
|
+
* Terminal message for an exhausted budget, preserving loader diagnostics.
|
|
18
|
+
*
|
|
19
|
+
* Keeps the literal `page_not_ready` substring: auteur's
|
|
20
|
+
* `selenium_test_agent/llm/code_generation.py` routes on
|
|
21
|
+
* `"page_not_ready" in str(e)` to surface PAGE_NOT_READY_AFTER_RETRIES rather
|
|
22
|
+
* than a generic action failure.
|
|
23
|
+
*/
|
|
24
|
+
export declare function pageNotReadyMessage(prefix: string, body: unknown): string;
|
|
25
|
+
/**
|
|
26
|
+
* Run `attemptFn()` until it stops answering `page_not_ready`.
|
|
27
|
+
*
|
|
28
|
+
* `attemptFn` MUST re-capture the screenshot on every call — retrying above the
|
|
29
|
+
* transport layer is only useful because attempt N+1 observes a fresh page.
|
|
30
|
+
*
|
|
31
|
+
* Returns the last parsed body, which may still carry the loader error when the
|
|
32
|
+
* budget is exhausted; the caller raises from it so `loader_reason` survives
|
|
33
|
+
* into the step error.
|
|
34
|
+
*/
|
|
35
|
+
export declare function retryOnPageNotReady<T>(attemptFn: () => Promise<T>, label?: string): Promise<T>;
|
|
36
|
+
//# sourceMappingURL=pageReady.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pageReady.d.ts","sourceRoot":"","sources":["../../src/helpers/pageReady.ts"],"names":[],"mappings":"AAsBA,0EAA0E;AAC1E,eAAO,MAAM,oBAAoB,mBAAmB,CAAC;AACrD,qFAAqF;AACrF,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,+CAA+C;AAC/C,eAAO,MAAM,YAAY,IAAI,CAAC;AAC9B,4EAA4E;AAC5E,eAAO,MAAM,QAAQ,OAAO,CAAC;AAE7B;;;GAGG;AACH,wBAAgB,YAAY,IAAI,MAAM,CAErC;AAED,kEAAkE;AAClE,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAMzD;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,MAAM,CASzE;AAID;;;;;;;;;GASG;AACH,wBAAsB,mBAAmB,CAAC,CAAC,EACzC,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC3B,KAAK,SAAW,GACf,OAAO,CAAC,CAAC,CAAC,CAeZ"}
|