@aryam/fixmap-core 0.8.7 → 0.8.9
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/README.md +5 -1
- package/dist/browser.d.ts +5 -1
- package/dist/browser.js +3 -1
- package/dist/browser.js.map +1 -1
- package/dist/cli-quote.d.ts +3 -0
- package/dist/cli-quote.js +9 -0
- package/dist/cli-quote.js.map +1 -0
- package/dist/compare.js +45 -12
- package/dist/compare.js.map +1 -1
- package/dist/exclude.d.ts +2 -0
- package/dist/exclude.js +8 -3
- package/dist/exclude.js.map +1 -1
- package/dist/explain.js +24 -17
- package/dist/explain.js.map +1 -1
- package/dist/grounding.d.ts +3 -1
- package/dist/grounding.js +24 -19
- package/dist/grounding.js.map +1 -1
- package/dist/import-graph.d.ts +2 -0
- package/dist/import-graph.js +84 -10
- package/dist/import-graph.js.map +1 -1
- package/dist/index.d.ts +6 -1
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/dist/languages.d.ts +1 -1
- package/dist/languages.js +60 -12
- package/dist/languages.js.map +1 -1
- package/dist/markdown.d.ts +2 -0
- package/dist/markdown.js +8 -0
- package/dist/markdown.js.map +1 -0
- package/dist/paths.d.ts +8 -0
- package/dist/paths.js +38 -8
- package/dist/paths.js.map +1 -1
- package/dist/plan.d.ts +3 -1
- package/dist/plan.js +58 -15
- package/dist/plan.js.map +1 -1
- package/dist/rank.d.ts +9 -0
- package/dist/rank.js +171 -90
- package/dist/rank.js.map +1 -1
- package/dist/repo-scan.d.ts +3 -1
- package/dist/repo-scan.js +615 -116
- package/dist/repo-scan.js.map +1 -1
- package/dist/report.d.ts +6 -0
- package/dist/report.js +92 -55
- package/dist/report.js.map +1 -1
- package/dist/signals.d.ts +7 -0
- package/dist/signals.js +150 -44
- package/dist/signals.js.map +1 -1
- package/dist/test-gates.js +15 -3
- package/dist/test-gates.js.map +1 -1
- package/dist/text.d.ts +2 -0
- package/dist/text.js +4 -0
- package/dist/text.js.map +1 -1
- package/dist/types.d.ts +8 -2
- package/dist/validate.d.ts +10 -0
- package/dist/validate.js +188 -0
- package/dist/validate.js.map +1 -0
- package/dist/verify.js +48 -6
- package/dist/verify.js.map +1 -1
- package/package.json +1 -1
package/dist/validate.js
ADDED
|
@@ -0,0 +1,188 @@
|
|
|
1
|
+
/** Validate the documented report structure without rejecting additive fields. */
|
|
2
|
+
export function validateFixMapReport(candidate, label) {
|
|
3
|
+
if (typeof candidate !== "object" ||
|
|
4
|
+
candidate === null ||
|
|
5
|
+
Array.isArray(candidate) ||
|
|
6
|
+
!Array.isArray(candidate.contextFiles)) {
|
|
7
|
+
return {
|
|
8
|
+
success: false,
|
|
9
|
+
message: `${label} is not a FixMap JSON report: no contextFiles array.`
|
|
10
|
+
};
|
|
11
|
+
}
|
|
12
|
+
const record = candidate;
|
|
13
|
+
if (record.reportVersion !== undefined && record.reportVersion !== 1) {
|
|
14
|
+
return {
|
|
15
|
+
success: false,
|
|
16
|
+
message: `${label} uses unsupported reportVersion ${JSON.stringify(record.reportVersion)}; this FixMap release supports reportVersion 1.`
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
const invalidEnvelopeFields = [
|
|
20
|
+
typeof record.summary === "string" ? undefined : "summary (string)",
|
|
21
|
+
Array.isArray(record.testRoutes) ? undefined : "testRoutes (array)",
|
|
22
|
+
Array.isArray(record.risks) ? undefined : "risks (array)",
|
|
23
|
+
Array.isArray(record.changedFiles) ? undefined : "changedFiles (array)",
|
|
24
|
+
Array.isArray(record.diagnostics) ? undefined : "diagnostics (array)"
|
|
25
|
+
].filter((field) => field !== undefined);
|
|
26
|
+
if (invalidEnvelopeFields.length > 0) {
|
|
27
|
+
return {
|
|
28
|
+
success: false,
|
|
29
|
+
message: `${label} is missing or has invalid fields in the complete FixMap report envelope: ` +
|
|
30
|
+
`${invalidEnvelopeFields.join(", ")}.`
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
const versioned = record.reportVersion === 1;
|
|
34
|
+
const contextFiles = candidate.contextFiles;
|
|
35
|
+
const invalid = contextFiles.findIndex((file) => {
|
|
36
|
+
if (!isRecord(file))
|
|
37
|
+
return true;
|
|
38
|
+
const ranked = file;
|
|
39
|
+
if (!isRepositoryRelativePath(ranked.path))
|
|
40
|
+
return true;
|
|
41
|
+
if ((versioned || ranked.rank !== undefined) && (!Number.isSafeInteger(ranked.rank) || ranked.rank < 1))
|
|
42
|
+
return true;
|
|
43
|
+
if ((versioned || ranked.score !== undefined) && (typeof ranked.score !== "number" || !Number.isFinite(ranked.score)))
|
|
44
|
+
return true;
|
|
45
|
+
if ((versioned || ranked.confidence !== undefined) &&
|
|
46
|
+
ranked.confidence !== "high" && ranked.confidence !== "medium" && ranked.confidence !== "low")
|
|
47
|
+
return true;
|
|
48
|
+
if ((versioned || ranked.reasons !== undefined) && !isStringArray(ranked.reasons))
|
|
49
|
+
return true;
|
|
50
|
+
return false;
|
|
51
|
+
});
|
|
52
|
+
if (invalid !== -1) {
|
|
53
|
+
return {
|
|
54
|
+
success: false,
|
|
55
|
+
message: `${label} has an invalid contextFiles entry at index ${invalid}; each entry needs a non-empty string "path", ` +
|
|
56
|
+
`${versioned ? "and version 1 requires" : "and optional"} rank, score, confidence, and reasons fields with their documented types.`
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
const duplicatePath = contextFiles.findIndex((file, index) => contextFiles.findIndex((candidate) => candidate.path === file.path) !== index);
|
|
60
|
+
if (duplicatePath !== -1) {
|
|
61
|
+
return {
|
|
62
|
+
success: false,
|
|
63
|
+
message: `${label} has a duplicate contextFiles path at index ${duplicatePath}; each ranked path must appear once.`
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
if (versioned) {
|
|
67
|
+
const outOfOrderRank = contextFiles.findIndex((file, index) => file.rank !== index + 1);
|
|
68
|
+
if (outOfOrderRank !== -1) {
|
|
69
|
+
return {
|
|
70
|
+
success: false,
|
|
71
|
+
message: `${label} has an out-of-order contextFiles rank at index ${outOfOrderRank}; version 1 ranks must be sequential and match array order.`
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
const testRoutes = record.testRoutes;
|
|
76
|
+
const invalidRoute = testRoutes.findIndex((route) => {
|
|
77
|
+
if (!isRecord(route))
|
|
78
|
+
return true;
|
|
79
|
+
return typeof route.command !== "string" || !route.command.trim() ||
|
|
80
|
+
!isRepositoryRelativePathArray(route.relatedFiles) ||
|
|
81
|
+
((versioned || route.kind !== undefined) && route.kind !== "test" && route.kind !== "validation") ||
|
|
82
|
+
((versioned || route.reason !== undefined) && typeof route.reason !== "string");
|
|
83
|
+
});
|
|
84
|
+
if (invalidRoute !== -1) {
|
|
85
|
+
return {
|
|
86
|
+
success: false,
|
|
87
|
+
message: `${label} has an invalid testRoutes entry at index ${invalidRoute}; each route needs a string "command" ` +
|
|
88
|
+
"and an array of non-empty string paths named relatedFiles; optional kind and reason fields must use their documented types."
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
const risks = record.risks;
|
|
92
|
+
const invalidRisk = risks.findIndex((risk) => {
|
|
93
|
+
if (!isRecord(risk))
|
|
94
|
+
return true;
|
|
95
|
+
return typeof risk.area !== "string" || !risk.area.trim() ||
|
|
96
|
+
((versioned || risk.reason !== undefined) && typeof risk.reason !== "string") ||
|
|
97
|
+
((versioned || risk.severity !== undefined) && risk.severity !== "low" && risk.severity !== "medium" && risk.severity !== "high");
|
|
98
|
+
});
|
|
99
|
+
if (invalidRisk !== -1) {
|
|
100
|
+
return {
|
|
101
|
+
success: false,
|
|
102
|
+
message: `${label} has an invalid risks entry at index ${invalidRisk}; each risk needs a non-empty string "area", and optional reason and severity fields must use their documented types.`
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
if (!isRepositoryRelativePathArray(record.changedFiles)) {
|
|
106
|
+
return { success: false, message: `${label} has invalid changedFiles; every entry must be a safe repository-relative path.` };
|
|
107
|
+
}
|
|
108
|
+
const diagnostics = record.diagnostics;
|
|
109
|
+
const invalidDiagnostic = diagnostics.findIndex((diagnostic) => {
|
|
110
|
+
if (!isRecord(diagnostic))
|
|
111
|
+
return true;
|
|
112
|
+
return typeof diagnostic.code !== "string" || !diagnostic.code.trim() ||
|
|
113
|
+
typeof diagnostic.message !== "string" ||
|
|
114
|
+
(diagnostic.severity !== "info" && diagnostic.severity !== "warning" && diagnostic.severity !== "error") ||
|
|
115
|
+
(diagnostic.paths !== undefined && !isRepositoryRelativePathArray(diagnostic.paths));
|
|
116
|
+
});
|
|
117
|
+
if (invalidDiagnostic !== -1) {
|
|
118
|
+
return {
|
|
119
|
+
success: false,
|
|
120
|
+
message: `${label} has an invalid diagnostics entry at index ${invalidDiagnostic}; each diagnostic needs string code and message fields, ` +
|
|
121
|
+
"an info, warning, or error severity, and optional non-empty string paths."
|
|
122
|
+
};
|
|
123
|
+
}
|
|
124
|
+
if (record.analysis !== undefined) {
|
|
125
|
+
const analysis = record.analysis;
|
|
126
|
+
const grounding = isRecord(analysis) ? analysis.grounding : undefined;
|
|
127
|
+
const specificity = isRecord(grounding) ? grounding.specificity : undefined;
|
|
128
|
+
if (specificity !== "anchored" && specificity !== "descriptive" && specificity !== "vague") {
|
|
129
|
+
return {
|
|
130
|
+
success: false,
|
|
131
|
+
message: `${label} has invalid analysis.grounding.specificity; expected anchored, descriptive, or vague.`
|
|
132
|
+
};
|
|
133
|
+
}
|
|
134
|
+
if (!isRecord(analysis) || !isRecord(grounding) ||
|
|
135
|
+
!Array.isArray(grounding.identifiers) ||
|
|
136
|
+
!isStringArray(grounding.unresolvedIdentifiers) ||
|
|
137
|
+
!isStringArray(grounding.partiallyResolvedIdentifiers) ||
|
|
138
|
+
!isStringArray(grounding.unverifiedIdentifiers) ||
|
|
139
|
+
typeof grounding.scanComplete !== "boolean" ||
|
|
140
|
+
!isRecord(analysis.ranking) ||
|
|
141
|
+
!isNullableFiniteNumber(analysis.ranking.topScore) ||
|
|
142
|
+
!isNullableFiniteNumber(analysis.ranking.runnerUpScore) ||
|
|
143
|
+
!isNullableFiniteNumber(analysis.ranking.topGap) ||
|
|
144
|
+
typeof analysis.ranking.clustered !== "boolean" ||
|
|
145
|
+
typeof analysis.nextAction !== "string") {
|
|
146
|
+
return {
|
|
147
|
+
success: false,
|
|
148
|
+
message: `${label} has incomplete or invalid analysis grounding, ranking, or nextAction fields.`
|
|
149
|
+
};
|
|
150
|
+
}
|
|
151
|
+
const invalidIdentifier = grounding.identifiers.findIndex((identifier) => !isRecord(identifier) ||
|
|
152
|
+
typeof identifier.identifier !== "string" || !identifier.identifier.trim() ||
|
|
153
|
+
!isIdentifierStatus(identifier.status) ||
|
|
154
|
+
!isRepositoryRelativePathArray(identifier.matchedFiles));
|
|
155
|
+
if (invalidIdentifier !== -1) {
|
|
156
|
+
return {
|
|
157
|
+
success: false,
|
|
158
|
+
message: `${label} has an invalid analysis.grounding.identifiers entry at index ${invalidIdentifier}.`
|
|
159
|
+
};
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
return { success: true, report: candidate };
|
|
163
|
+
}
|
|
164
|
+
function isRecord(candidate) {
|
|
165
|
+
return typeof candidate === "object" && candidate !== null && !Array.isArray(candidate);
|
|
166
|
+
}
|
|
167
|
+
function isStringArray(candidate) {
|
|
168
|
+
return Array.isArray(candidate) && candidate.every((entry) => typeof entry === "string");
|
|
169
|
+
}
|
|
170
|
+
function isRepositoryRelativePathArray(candidate) {
|
|
171
|
+
return Array.isArray(candidate) && candidate.every(isRepositoryRelativePath);
|
|
172
|
+
}
|
|
173
|
+
function isRepositoryRelativePath(candidate) {
|
|
174
|
+
if (typeof candidate !== "string" || !candidate.trim() || candidate.includes("\0") ||
|
|
175
|
+
/^[\\/]/.test(candidate) || /^[A-Za-z]:/.test(candidate)) {
|
|
176
|
+
return false;
|
|
177
|
+
}
|
|
178
|
+
const segments = candidate.replace(/\\/g, "/").split("/");
|
|
179
|
+
return segments.every((segment) => segment.length > 0 && segment !== "." && segment !== "..");
|
|
180
|
+
}
|
|
181
|
+
function isNullableFiniteNumber(candidate) {
|
|
182
|
+
return candidate === null || (typeof candidate === "number" && Number.isFinite(candidate));
|
|
183
|
+
}
|
|
184
|
+
function isIdentifierStatus(candidate) {
|
|
185
|
+
return candidate === "exact-definition" || candidate === "exact-text" ||
|
|
186
|
+
candidate === "partial-definition" || candidate === "not-found" || candidate === "unverified";
|
|
187
|
+
}
|
|
188
|
+
//# sourceMappingURL=validate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":"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"}
|
package/dist/verify.js
CHANGED
|
@@ -8,9 +8,48 @@
|
|
|
8
8
|
// say which. The output says what differs and leaves that judgement alone.
|
|
9
9
|
import { isBackupPath, isGeneratedPath, moduleStem } from "./paths.js";
|
|
10
10
|
import { buildRiskNotes, pathsForRiskArea } from "./report.js";
|
|
11
|
+
import { markdownCode } from "./markdown.js";
|
|
11
12
|
export function verifyPlan(report, repo) {
|
|
12
13
|
const changed = repo.changedFiles;
|
|
13
14
|
const findings = [];
|
|
15
|
+
const fileByPath = new Map(repo.files.map((file) => [file.path, file]));
|
|
16
|
+
const plannedPaths = report.contextFiles.map((file) => file.path);
|
|
17
|
+
const missingPlanned = plannedPaths.filter((path) => !fileByPath.has(path));
|
|
18
|
+
const changedMissingPlanned = missingPlanned.filter((path) => changed.includes(path));
|
|
19
|
+
const unexplainedMissingPlanned = missingPlanned.filter((path) => !changed.includes(path));
|
|
20
|
+
if (plannedPaths.length > 0 && unexplainedMissingPlanned.length === plannedPaths.length) {
|
|
21
|
+
const mismatch = {
|
|
22
|
+
code: "plan-repository-mismatch",
|
|
23
|
+
severity: "error",
|
|
24
|
+
paths: plannedPaths.slice(0, 8),
|
|
25
|
+
message: `Verification was not attempted: none of the ${plannedPaths.length} planned files exist in ${repo.root}. ` +
|
|
26
|
+
"This plan appears to be for a different repository or revision; check --repo or regenerate the plan against this checkout."
|
|
27
|
+
};
|
|
28
|
+
return {
|
|
29
|
+
summary: `None of the ${plannedPaths.length} planned files exist in ${repo.root}; the plan and repository do not match.`,
|
|
30
|
+
changedFiles: changed,
|
|
31
|
+
findings: [mismatch],
|
|
32
|
+
diagnostics: repo.diagnostics
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
if (unexplainedMissingPlanned.length > 0) {
|
|
36
|
+
findings.push({
|
|
37
|
+
code: "plan-partially-stale",
|
|
38
|
+
severity: "warning",
|
|
39
|
+
paths: unexplainedMissingPlanned.slice(0, 8),
|
|
40
|
+
message: `${unexplainedMissingPlanned.length} of ${plannedPaths.length} planned paths no longer exist and are not explained by this diff. ` +
|
|
41
|
+
"The plan may predate a rebase or rename; regenerate it before relying on the missing entries."
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
if (changedMissingPlanned.length > 0) {
|
|
45
|
+
findings.push({
|
|
46
|
+
code: "planned-file-deleted",
|
|
47
|
+
severity: "info",
|
|
48
|
+
paths: changedMissingPlanned.slice(0, 8),
|
|
49
|
+
message: `${changedMissingPlanned.length === 1 ? "A planned file was" : `${changedMissingPlanned.length} planned files were`} removed by this diff. ` +
|
|
50
|
+
"The deletion accounts for the missing path, so verification continued."
|
|
51
|
+
});
|
|
52
|
+
}
|
|
14
53
|
if (changed.length === 0) {
|
|
15
54
|
return {
|
|
16
55
|
summary: "No changes to verify: the diff resolved to zero files.",
|
|
@@ -19,8 +58,7 @@ export function verifyPlan(report, repo) {
|
|
|
19
58
|
diagnostics: repo.diagnostics
|
|
20
59
|
};
|
|
21
60
|
}
|
|
22
|
-
const planned = new Set(
|
|
23
|
-
const fileByPath = new Map(repo.files.map((file) => [file.path, file]));
|
|
61
|
+
const planned = new Set(plannedPaths);
|
|
24
62
|
const isTest = (path) => fileByPath.get(path)?.isTest === true;
|
|
25
63
|
// 1. Edits somewhere the next build discards. This is the only finding that is
|
|
26
64
|
// wrong regardless of what the task was.
|
|
@@ -54,6 +92,7 @@ export function verifyPlan(report, repo) {
|
|
|
54
92
|
const unmapped = changed.filter((path) => !planned.has(path) &&
|
|
55
93
|
!isTest(path) &&
|
|
56
94
|
!discardedEdits.includes(path) &&
|
|
95
|
+
!trackedGeneratedEdits.includes(path) &&
|
|
57
96
|
fileByPath.get(path)?.isSource !== false);
|
|
58
97
|
if (unmapped.length > 0) {
|
|
59
98
|
findings.push({
|
|
@@ -77,7 +116,10 @@ export function verifyPlan(report, repo) {
|
|
|
77
116
|
});
|
|
78
117
|
}
|
|
79
118
|
// 4. Source moved without any test moving. Test routes name what would exercise it.
|
|
80
|
-
const changedSource = changed.filter((path) => !isTest(path) &&
|
|
119
|
+
const changedSource = changed.filter((path) => !isTest(path) &&
|
|
120
|
+
!trackedGeneratedEdits.includes(path) &&
|
|
121
|
+
!discardedEdits.includes(path) &&
|
|
122
|
+
fileByPath.get(path)?.kind === "code");
|
|
81
123
|
const changedTests = changed.filter(isTest);
|
|
82
124
|
if (changedSource.length > 0 && changedTests.length === 0) {
|
|
83
125
|
const suggested = [...new Set(report.testRoutes.flatMap((route) => route.relatedFiles))].filter(isTest);
|
|
@@ -102,7 +144,7 @@ export function verifyPlan(report, repo) {
|
|
|
102
144
|
for (const risk of newRisks) {
|
|
103
145
|
findings.push({
|
|
104
146
|
code: "new-risk-area",
|
|
105
|
-
severity:
|
|
147
|
+
severity: "warning",
|
|
106
148
|
paths: pathsForRiskArea(risk.area, changed),
|
|
107
149
|
message: `The change touches ${risk.area}, which the original plan did not flag: ${risk.reason}.`
|
|
108
150
|
});
|
|
@@ -151,12 +193,12 @@ export function renderVerifyMarkdown(result) {
|
|
|
151
193
|
for (const finding of result.findings) {
|
|
152
194
|
lines.push(`- **${finding.severity}** ${finding.message}`);
|
|
153
195
|
for (const path of finding.paths.slice(0, 8)) {
|
|
154
|
-
lines.push(` -
|
|
196
|
+
lines.push(` - ${markdownCode(path)}`);
|
|
155
197
|
}
|
|
156
198
|
}
|
|
157
199
|
}
|
|
158
200
|
lines.push("", "## Changed Files", "");
|
|
159
|
-
lines.push(...(result.changedFiles.length > 0 ? result.changedFiles.map((path) => `-
|
|
201
|
+
lines.push(...(result.changedFiles.length > 0 ? result.changedFiles.map((path) => `- ${markdownCode(path)}`) : ["- None found"]));
|
|
160
202
|
return `${lines.join("\n")}\n`;
|
|
161
203
|
}
|
|
162
204
|
//# sourceMappingURL=verify.js.map
|
package/dist/verify.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verify.js","sourceRoot":"","sources":["../src/verify.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,iFAAiF;AACjF,EAAE;AACF,wFAAwF;AACxF,wFAAwF;AACxF,0FAA0F;AAC1F,yFAAyF;AACzF,2EAA2E;AAE3E,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"verify.js","sourceRoot":"","sources":["../src/verify.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,iFAAiF;AACjF,EAAE;AACF,wFAAwF;AACxF,wFAAwF;AACxF,0FAA0F;AAC1F,yFAAyF;AACzF,2EAA2E;AAE3E,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,UAAU,UAAU,CAAC,MAAoB,EAAE,IAAa;IAC5D,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC;IAClC,MAAM,QAAQ,GAAoB,EAAE,CAAC;IACrC,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IACxE,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAElE,MAAM,cAAc,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5E,MAAM,qBAAqB,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACtF,MAAM,yBAAyB,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAE3F,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,yBAAyB,CAAC,MAAM,KAAK,YAAY,CAAC,MAAM,EAAE,CAAC;QACxF,MAAM,QAAQ,GAAkB;YAC9B,IAAI,EAAE,0BAA0B;YAChC,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;YAC/B,OAAO,EACL,+CAA+C,YAAY,CAAC,MAAM,2BAA2B,IAAI,CAAC,IAAI,IAAI;gBAC1G,4HAA4H;SAC/H,CAAC;QACF,OAAO;YACL,OAAO,EAAE,eAAe,YAAY,CAAC,MAAM,2BAA2B,IAAI,CAAC,IAAI,yCAAyC;YACxH,YAAY,EAAE,OAAO;YACrB,QAAQ,EAAE,CAAC,QAAQ,CAAC;YACpB,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC;IACJ,CAAC;IAED,IAAI,yBAAyB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzC,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,sBAAsB;YAC5B,QAAQ,EAAE,SAAS;YACnB,KAAK,EAAE,yBAAyB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;YAC5C,OAAO,EACL,GAAG,yBAAyB,CAAC,MAAM,OAAO,YAAY,CAAC,MAAM,qEAAqE;gBAClI,+FAA+F;SAClG,CAAC,CAAC;IACL,CAAC;IACD,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrC,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,sBAAsB;YAC5B,QAAQ,EAAE,MAAM;YAChB,KAAK,EAAE,qBAAqB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;YACxC,OAAO,EACL,GAAG,qBAAqB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,MAAM,qBAAqB,yBAAyB;gBAC5I,wEAAwE;SAC3E,CAAC,CAAC;IACL,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO;YACL,OAAO,EAAE,wDAAwD;YACjE,YAAY,EAAE,EAAE;YAChB,QAAQ;YACR,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAEvE,+EAA+E;IAC/E,4CAA4C;IAC5C,MAAM,eAAe,GAAG,IAAI,GAAG,CAC7B,IAAI,CAAC,KAAK;SACP,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1F,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CACxC,CAAC;IACF,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IACjD,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAC7C,YAAY,CAAC,IAAI,CAAC;QAClB,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CACvF,CAAC;IACF,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,4BAA4B;YAClC,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,cAAc;YACrB,OAAO,EACL,GAAG,cAAc,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,MAAM,aAAa,8CAA8C;gBACnI,gGAAgG;SACnG,CAAC,CAAC;IACL,CAAC;IAED,MAAM,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CACpD,eAAe,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CACpF,CAAC;IACF,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrC,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,wBAAwB;YAC9B,QAAQ,EAAE,SAAS;YACnB,KAAK,EAAE,qBAAqB;YAC5B,OAAO,EACL,GAAG,qBAAqB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,oCAAoC,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,MAAM,qCAAqC,WAAW;gBAC9J,uIAAuI;SAC1I,CAAC,CAAC;IACL,CAAC;IAED,oFAAoF;IACpF,8EAA8E;IAC9E,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CACvC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;QAClB,CAAC,MAAM,CAAC,IAAI,CAAC;QACb,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC9B,CAAC,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC;QACrC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,QAAQ,KAAK,KAAK,CACzC,CAAC;IACF,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,iBAAiB;YACvB,QAAQ,EAAE,SAAS;YACnB,KAAK,EAAE,QAAQ;YACf,OAAO,EACL,GAAG,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,QAAQ,uCAAuC;gBACzG,0GAA0G;SAC7G,CAAC,CAAC;IACL,CAAC;IAED,kFAAkF;IAClF,6EAA6E;IAC7E,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACvC,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/C,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,wBAAwB;YAC9B,QAAQ,EAAE,OAAO,CAAC,UAAU,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;YAC5D,KAAK,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;YACrB,OAAO,EACL,4CAA4C,OAAO,CAAC,UAAU,gBAAgB;gBAC9E,wGAAwG;SAC3G,CAAC,CAAC;IACL,CAAC;IAED,oFAAoF;IACpF,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAC5C,CAAC,MAAM,CAAC,IAAI,CAAC;QACb,CAAC,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC;QACrC,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC9B,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,KAAK,MAAM,CACtC,CAAC;IACF,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1D,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACxG,qFAAqF;QACrF,qFAAqF;QACrF,sDAAsD;QACtD,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC;QACjE,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,iBAAiB;YACvB,QAAQ,EAAE,SAAS;YACnB,KAAK,EAAE,OAAO;YACd,OAAO,EACL,SAAS,CAAC,MAAM,GAAG,CAAC;gBAClB,CAAC,CAAC,iDAAiD,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,mBAAmB;gBAC1H,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;oBAC5B,CAAC,CAAC,gDAAgD,MAAM,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,KAAK,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;oBAC3K,CAAC,CAAC,+EAA+E;SACxF,CAAC,CAAC;IACL,CAAC;IAED,yFAAyF;IACzF,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACjG,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC5B,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,eAAe;YACrB,QAAQ,EAAE,SAAS;YACnB,KAAK,EAAE,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC;YAC3C,OAAO,EAAE,sBAAsB,IAAI,CAAC,IAAI,2CAA2C,IAAI,CAAC,MAAM,GAAG;SAClG,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,OAAO,EAAE,kBAAkB,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC;QACrD,YAAY,EAAE,OAAO;QACrB,QAAQ;QACR,WAAW,EAAE,IAAI,CAAC,WAAW;KAC9B,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,YAAoB,EAAE,QAAyB;IACzE,MAAM,KAAK,GAAG,GAAG,YAAY,YAAY,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IACjF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,mBAAmB,KAAK,8CAA8C,CAAC;IAChF,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,MAAM,CAAC;IACjF,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,MAAM,CAAC;IACrF,MAAM,MAAM,GAAG;QACb,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE;QAClE,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,IAAI,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE;KAC7E,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAClB,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,QAAQ,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;IACrH,OAAO,mBAAmB,KAAK,gCAAgC,IAAI,GAAG,CAAC;AACzE,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,MAAoB;IACvD,oFAAoF;IACpF,uFAAuF;IACvF,oEAAoE;IACpE,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrC,OAAO;YACL,uBAAuB;YACvB,EAAE;YACF,MAAM,CAAC,OAAO;YACd,EAAE;YACF,wFAAwF;gBACxF,iCAAiC;YACjC,EAAE;SACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;IAED,MAAM,KAAK,GAAG,CAAC,uBAAuB,EAAE,EAAE,EAAE,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;IACnF,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC7B,CAAC;SAAM,CAAC;QACN,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACtC,KAAK,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC,QAAQ,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YAC3D,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;gBAC7C,KAAK,CAAC,IAAI,CAAC,OAAO,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;IACH,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,kBAAkB,EAAE,EAAE,CAAC,CAAC;IACvC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAClI,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AACjC,CAAC"}
|