zedbee 0.1.0-beta.20 → 0.1.0-beta.21
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/cache/key.d.ts.map +1 -1
- package/dist/cache/key.js +2 -19
- package/dist/cache/key.js.map +1 -1
- package/dist/checks/applicability.d.ts.map +1 -1
- package/dist/checks/applicability.js +45 -40
- package/dist/checks/applicability.js.map +1 -1
- package/dist/checks/compiler-change-inputs.d.ts +1 -4
- package/dist/checks/compiler-change-inputs.d.ts.map +1 -1
- package/dist/checks/compiler-change-inputs.js +5 -40
- package/dist/checks/compiler-change-inputs.js.map +1 -1
- package/dist/checks/compiler-decision-cache.d.ts +3 -0
- package/dist/checks/compiler-decision-cache.d.ts.map +1 -0
- package/dist/checks/compiler-decision-cache.js +29 -0
- package/dist/checks/compiler-decision-cache.js.map +1 -0
- package/dist/checks/compiler-inputs.d.ts.map +1 -1
- package/dist/checks/compiler-inputs.js +11 -52
- package/dist/checks/compiler-inputs.js.map +1 -1
- package/dist/checks/compiler-paths.d.ts +7 -0
- package/dist/checks/compiler-paths.d.ts.map +1 -0
- package/dist/checks/compiler-paths.js +14 -0
- package/dist/checks/compiler-paths.js.map +1 -0
- package/dist/checks/complexity/adapter.d.ts.map +1 -1
- package/dist/checks/complexity/adapter.js +2 -4
- package/dist/checks/complexity/adapter.js.map +1 -1
- package/dist/checks/dead-code/adapter.d.ts.map +1 -1
- package/dist/checks/dead-code/adapter.js +2 -4
- package/dist/checks/dead-code/adapter.js.map +1 -1
- package/dist/checks/dead-code/import-boundary.d.ts.map +1 -1
- package/dist/checks/dead-code/import-boundary.js +4 -15
- package/dist/checks/dead-code/import-boundary.js.map +1 -1
- package/dist/checks/dead-code/package-metadata.d.ts +1 -1
- package/dist/checks/dead-code/package-metadata.d.ts.map +1 -1
- package/dist/checks/dead-code/package-metadata.js.map +1 -1
- package/dist/checks/dependency-architecture/adapter.d.ts.map +1 -1
- package/dist/checks/dependency-architecture/adapter.js +5 -20
- package/dist/checks/dependency-architecture/adapter.js.map +1 -1
- package/dist/checks/diagnostic-details.d.ts.map +1 -1
- package/dist/checks/diagnostic-details.js +8 -35
- package/dist/checks/diagnostic-details.js.map +1 -1
- package/dist/checks/diagnostic-secret-review.d.ts +3 -0
- package/dist/checks/diagnostic-secret-review.d.ts.map +1 -0
- package/dist/checks/diagnostic-secret-review.js +17 -0
- package/dist/checks/diagnostic-secret-review.js.map +1 -0
- package/dist/checks/dispatch-context.d.ts +1 -1
- package/dist/checks/dispatch-context.d.ts.map +1 -1
- package/dist/checks/dispatch-context.js +4 -11
- package/dist/checks/dispatch-context.js.map +1 -1
- package/dist/checks/dispatch-target.d.ts.map +1 -1
- package/dist/checks/dispatch-target.js +3 -24
- package/dist/checks/dispatch-target.js.map +1 -1
- package/dist/checks/dispatcher.d.ts.map +1 -1
- package/dist/checks/dispatcher.js +2 -21
- package/dist/checks/dispatcher.js.map +1 -1
- package/dist/checks/duplication/adapter.d.ts.map +1 -1
- package/dist/checks/duplication/adapter.js +2 -4
- package/dist/checks/duplication/adapter.js.map +1 -1
- package/dist/checks/eslint/lint-adapter.d.ts.map +1 -1
- package/dist/checks/eslint/lint-adapter.js +3 -5
- package/dist/checks/eslint/lint-adapter.js.map +1 -1
- package/dist/checks/eslint/project/adapter.d.ts.map +1 -1
- package/dist/checks/eslint/project/adapter.js +3 -2
- package/dist/checks/eslint/project/adapter.js.map +1 -1
- package/dist/checks/eslint/project/installation.d.ts.map +1 -1
- package/dist/checks/eslint/project/installation.js +3 -2
- package/dist/checks/eslint/project/installation.js.map +1 -1
- package/dist/checks/eslint/project/protocol.d.ts.map +1 -1
- package/dist/checks/eslint/project/protocol.js +3 -2
- package/dist/checks/eslint/project/protocol.js.map +1 -1
- package/dist/checks/eslint/project/supported-version.d.ts +2 -0
- package/dist/checks/eslint/project/supported-version.d.ts.map +1 -0
- package/dist/checks/eslint/project/supported-version.js +2 -0
- package/dist/checks/eslint/project/supported-version.js.map +1 -0
- package/dist/checks/eslint/project/trust.js +1 -1
- package/dist/checks/eslint/project/trust.js.map +1 -1
- package/dist/checks/eslint/project/types.d.ts +2 -1
- package/dist/checks/eslint/project/types.d.ts.map +1 -1
- package/dist/checks/eslint/project/types.js +2 -1
- package/dist/checks/eslint/project/types.js.map +1 -1
- package/dist/checks/eslint/project/worker.js +8 -2
- package/dist/checks/eslint/project/worker.js.map +1 -1
- package/dist/checks/eslint/rule-settings.d.ts.map +1 -1
- package/dist/checks/eslint/rule-settings.js +3 -73
- package/dist/checks/eslint/rule-settings.js.map +1 -1
- package/dist/checks/events.d.ts +9 -1
- package/dist/checks/events.d.ts.map +1 -1
- package/dist/checks/incomplete-error.d.ts +2 -0
- package/dist/checks/incomplete-error.d.ts.map +1 -1
- package/dist/checks/incomplete-error.js +16 -0
- package/dist/checks/incomplete-error.js.map +1 -1
- package/dist/checks/installation-diagnostic.d.ts.map +1 -1
- package/dist/checks/installation-diagnostic.js +9 -28
- package/dist/checks/installation-diagnostic.js.map +1 -1
- package/dist/checks/prettier/project-installation.d.ts.map +1 -1
- package/dist/checks/prettier/project-installation.js +3 -33
- package/dist/checks/prettier/project-installation.js.map +1 -1
- package/dist/checks/prettier/project-trust.d.ts +0 -2
- package/dist/checks/prettier/project-trust.d.ts.map +1 -1
- package/dist/checks/prettier/project-trust.js +1 -9
- package/dist/checks/prettier/project-trust.js.map +1 -1
- package/dist/checks/prettier/project-version.d.ts +16 -0
- package/dist/checks/prettier/project-version.d.ts.map +1 -0
- package/dist/checks/prettier/project-version.js +49 -0
- package/dist/checks/prettier/project-version.js.map +1 -0
- package/dist/checks/prettier/settings.d.ts +1 -1
- package/dist/checks/project/import-specifier.d.ts +4 -0
- package/dist/checks/project/import-specifier.d.ts.map +1 -0
- package/dist/checks/project/import-specifier.js +17 -0
- package/dist/checks/project/import-specifier.js.map +1 -0
- package/dist/checks/react/adapter.d.ts.map +1 -1
- package/dist/checks/react/adapter.js +2 -4
- package/dist/checks/react/adapter.js.map +1 -1
- package/dist/checks/runner/context.d.ts.map +1 -1
- package/dist/checks/runner/context.js +2 -9
- package/dist/checks/runner/context.js.map +1 -1
- package/dist/checks/runner/protocol.d.ts +1 -1
- package/dist/checks/runner/protocol.d.ts.map +1 -1
- package/dist/checks/runner/protocol.js +12 -7
- package/dist/checks/runner/protocol.js.map +1 -1
- package/dist/checks/runner/worker.js +4 -30
- package/dist/checks/runner/worker.js.map +1 -1
- package/dist/checks/sanitize-result.d.ts.map +1 -1
- package/dist/checks/sanitize-result.js +22 -6
- package/dist/checks/sanitize-result.js.map +1 -1
- package/dist/checks/structural-security/adapter.d.ts.map +1 -1
- package/dist/checks/structural-security/adapter.js +2 -4
- package/dist/checks/structural-security/adapter.js.map +1 -1
- package/dist/checks/typescript/adapter.d.ts.map +1 -1
- package/dist/checks/typescript/adapter.js +3 -5
- package/dist/checks/typescript/adapter.js.map +1 -1
- package/dist/checks/typescript/captured-directory.d.ts +2 -0
- package/dist/checks/typescript/captured-directory.d.ts.map +1 -0
- package/dist/checks/typescript/captured-directory.js +22 -0
- package/dist/checks/typescript/captured-directory.js.map +1 -0
- package/dist/checks/typescript/compiler-host.d.ts.map +1 -1
- package/dist/checks/typescript/compiler-host.js +5 -21
- package/dist/checks/typescript/compiler-host.js.map +1 -1
- package/dist/checks/typescript/compiler-scope-graph.d.ts +1 -3
- package/dist/checks/typescript/compiler-scope-graph.d.ts.map +1 -1
- package/dist/checks/typescript/compiler-scope-graph.js +520 -642
- package/dist/checks/typescript/compiler-scope-graph.js.map +1 -1
- package/dist/checks/typescript/compiler-scope-witnesses.d.ts +30 -0
- package/dist/checks/typescript/compiler-scope-witnesses.d.ts.map +1 -0
- package/dist/checks/typescript/compiler-scope-witnesses.js +151 -0
- package/dist/checks/typescript/compiler-scope-witnesses.js.map +1 -0
- package/dist/checks/typescript/config.d.ts.map +1 -1
- package/dist/checks/typescript/config.js +2 -21
- package/dist/checks/typescript/config.js.map +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +12 -16
- package/dist/cli.js.map +1 -1
- package/dist/commands/checks.d.ts.map +1 -1
- package/dist/commands/checks.js +62 -48
- package/dist/commands/checks.js.map +1 -1
- package/dist/commands/doctor.d.ts.map +1 -1
- package/dist/commands/doctor.js +2 -6
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/scan.d.ts.map +1 -1
- package/dist/commands/scan.js +17 -10
- package/dist/commands/scan.js.map +1 -1
- package/dist/config/file-policy.d.ts.map +1 -1
- package/dist/config/file-policy.js +1 -18
- package/dist/config/file-policy.js.map +1 -1
- package/dist/config/immutable-configuration.d.ts.map +1 -1
- package/dist/config/immutable-configuration.js +2 -75
- package/dist/config/immutable-configuration.js.map +1 -1
- package/dist/config/json-schema.d.ts.map +1 -1
- package/dist/config/json-schema.js +2 -6
- package/dist/config/json-schema.js.map +1 -1
- package/dist/config/load-config.d.ts.map +1 -1
- package/dist/config/load-config.js +33 -36
- package/dist/config/load-config.js.map +1 -1
- package/dist/config/schema.d.ts +5 -6
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/config/schema.js +2 -15
- package/dist/config/schema.js.map +1 -1
- package/dist/config/settings-registry.d.ts +1 -1
- package/dist/config/settings-registry.d.ts.map +1 -1
- package/dist/config/settings-registry.js.map +1 -1
- package/dist/config/strict-json.d.ts +3 -0
- package/dist/config/strict-json.d.ts.map +1 -0
- package/dist/config/strict-json.js +81 -0
- package/dist/config/strict-json.js.map +1 -0
- package/dist/core/check-ids.d.ts +3 -0
- package/dist/core/check-ids.d.ts.map +1 -0
- package/dist/core/check-ids.js +16 -0
- package/dist/core/check-ids.js.map +1 -0
- package/dist/core/types.d.ts +2 -1
- package/dist/core/types.d.ts.map +1 -1
- package/dist/core/types.js +1 -1
- package/dist/core/types.js.map +1 -1
- package/dist/diagnostics/local-scan-diagnostics.d.ts.map +1 -1
- package/dist/diagnostics/local-scan-diagnostics.js +3 -3
- package/dist/diagnostics/local-scan-diagnostics.js.map +1 -1
- package/dist/diagnostics/scan-performance.d.ts +2 -2
- package/dist/diagnostics/scan-performance.d.ts.map +1 -1
- package/dist/diagnostics/scan-performance.js +2 -2
- package/dist/diagnostics/scan-performance.js.map +1 -1
- package/dist/doctor/project-eslint.d.ts.map +1 -1
- package/dist/doctor/project-eslint.js +2 -1
- package/dist/doctor/project-eslint.js.map +1 -1
- package/dist/fixes/build-plan.d.ts +1 -1
- package/dist/fixes/build-plan.d.ts.map +1 -1
- package/dist/fixes/build-plan.js +0 -1
- package/dist/fixes/build-plan.js.map +1 -1
- package/dist/fixes/public-plan.d.ts +1 -0
- package/dist/fixes/public-plan.d.ts.map +1 -1
- package/dist/fixes/public-plan.js +9 -5
- package/dist/fixes/public-plan.js.map +1 -1
- package/dist/git/baseline-renames.d.ts +3 -0
- package/dist/git/baseline-renames.d.ts.map +1 -0
- package/dist/git/baseline-renames.js +20 -0
- package/dist/git/baseline-renames.js.map +1 -0
- package/dist/git/change-set.d.ts +1 -0
- package/dist/git/change-set.d.ts.map +1 -1
- package/dist/git/change-set.js +25 -35
- package/dist/git/change-set.js.map +1 -1
- package/dist/git/common-directory.d.ts +3 -0
- package/dist/git/common-directory.d.ts.map +1 -0
- package/dist/git/common-directory.js +12 -0
- package/dist/git/common-directory.js.map +1 -0
- package/dist/git/snapshot-work.d.ts +2 -0
- package/dist/git/snapshot-work.d.ts.map +1 -1
- package/dist/git/snapshot-work.js +9 -0
- package/dist/git/snapshot-work.js.map +1 -1
- package/dist/git/snapshot.d.ts +2 -0
- package/dist/git/snapshot.d.ts.map +1 -1
- package/dist/git/snapshot.js +22 -0
- package/dist/git/snapshot.js.map +1 -1
- package/dist/hooks/detect.d.ts.map +1 -1
- package/dist/hooks/detect.js +4 -26
- package/dist/hooks/detect.js.map +1 -1
- package/dist/hooks/raw-hook-path.d.ts +3 -0
- package/dist/hooks/raw-hook-path.d.ts.map +1 -0
- package/dist/hooks/raw-hook-path.js +38 -0
- package/dist/hooks/raw-hook-path.js.map +1 -0
- package/dist/init/generated-formatting-overrides.d.ts +3 -0
- package/dist/init/generated-formatting-overrides.d.ts.map +1 -0
- package/dist/init/generated-formatting-overrides.js +67 -0
- package/dist/init/generated-formatting-overrides.js.map +1 -0
- package/dist/init/presentation.d.ts +1 -1
- package/dist/init/presentation.d.ts.map +1 -1
- package/dist/init/presentation.js +37 -1
- package/dist/init/presentation.js.map +1 -1
- package/dist/init/prettier-discovery.d.ts +0 -10
- package/dist/init/prettier-discovery.d.ts.map +1 -1
- package/dist/init/prettier-discovery.js +2 -48
- package/dist/init/prettier-discovery.js.map +1 -1
- package/dist/init/recommend.d.ts.map +1 -1
- package/dist/init/recommend.js +15 -34
- package/dist/init/recommend.js.map +1 -1
- package/dist/init/write-config.d.ts.map +1 -1
- package/dist/init/write-config.js +9 -26
- package/dist/init/write-config.js.map +1 -1
- package/dist/inspection/workspaces.d.ts +2 -0
- package/dist/inspection/workspaces.d.ts.map +1 -1
- package/dist/inspection/workspaces.js +3 -0
- package/dist/inspection/workspaces.js.map +1 -1
- package/dist/policy/evaluate.d.ts +1 -0
- package/dist/policy/evaluate.d.ts.map +1 -1
- package/dist/policy/evaluate.js +14 -8
- package/dist/policy/evaluate.js.map +1 -1
- package/dist/renderers/json.d.ts +3 -1
- package/dist/renderers/json.d.ts.map +1 -1
- package/dist/renderers/json.js +11 -16
- package/dist/renderers/json.js.map +1 -1
- package/dist/renderers/text.d.ts.map +1 -1
- package/dist/renderers/text.js +24 -77
- package/dist/renderers/text.js.map +1 -1
- package/dist/reporting/check-coverage.d.ts +2 -0
- package/dist/reporting/check-coverage.d.ts.map +1 -1
- package/dist/reporting/check-coverage.js +11 -0
- package/dist/reporting/check-coverage.js.map +1 -1
- package/dist/reporting/fix-presentation.d.ts +7 -43
- package/dist/reporting/fix-presentation.d.ts.map +1 -1
- package/dist/reporting/fix-presentation.js +3 -57
- package/dist/reporting/fix-presentation.js.map +1 -1
- package/dist/reporting/presentation.d.ts.map +1 -1
- package/dist/reporting/presentation.js +3 -2
- package/dist/reporting/presentation.js.map +1 -1
- package/dist/reporting/scan-phase-labels.d.ts +3 -0
- package/dist/reporting/scan-phase-labels.d.ts.map +1 -0
- package/dist/reporting/scan-phase-labels.js +14 -0
- package/dist/reporting/scan-phase-labels.js.map +1 -0
- package/dist/reporting/static-dashboard.d.ts +6 -0
- package/dist/reporting/static-dashboard.d.ts.map +1 -0
- package/dist/reporting/static-dashboard.js +8 -0
- package/dist/reporting/static-dashboard.js.map +1 -0
- package/dist/reporting/text-scan-progress.d.ts +7 -0
- package/dist/reporting/text-scan-progress.d.ts.map +1 -0
- package/dist/reporting/text-scan-progress.js +57 -0
- package/dist/reporting/text-scan-progress.js.map +1 -0
- package/dist/runtime/background-node.d.ts +2 -0
- package/dist/runtime/background-node.d.ts.map +1 -0
- package/dist/runtime/background-node.js +13 -0
- package/dist/runtime/background-node.js.map +1 -0
- package/dist/scan/analysis-session.d.ts +5 -2
- package/dist/scan/analysis-session.d.ts.map +1 -1
- package/dist/scan/analysis-session.js +16 -8
- package/dist/scan/analysis-session.js.map +1 -1
- package/dist/scan/merge-scan.d.ts.map +1 -1
- package/dist/scan/merge-scan.js +84 -37
- package/dist/scan/merge-scan.js.map +1 -1
- package/dist/scan/run-scan.d.ts.map +1 -1
- package/dist/scan/run-scan.js +9 -6
- package/dist/scan/run-scan.js.map +1 -1
- package/dist/scan/source-excerpts.d.ts +0 -2
- package/dist/scan/source-excerpts.d.ts.map +1 -1
- package/dist/scan/source-excerpts.js +13 -42
- package/dist/scan/source-excerpts.js.map +1 -1
- package/dist/service/server-connection.d.ts.map +1 -1
- package/dist/service/server-connection.js +3 -19
- package/dist/service/server-connection.js.map +1 -1
- package/dist/telemetry/client.d.ts.map +1 -1
- package/dist/telemetry/client.js +2 -10
- package/dist/telemetry/client.js.map +1 -1
- package/dist/telemetry/performance-summary.d.ts.map +1 -1
- package/dist/telemetry/performance-summary.js +1 -1
- package/dist/telemetry/performance-summary.js.map +1 -1
- package/dist/telemetry/schema.d.ts +129 -129
- package/dist/telemetry/state.d.ts +10 -10
- package/dist/ui/action-button-face.d.ts +7 -0
- package/dist/ui/action-button-face.d.ts.map +1 -0
- package/dist/ui/action-button-face.js +18 -0
- package/dist/ui/action-button-face.js.map +1 -0
- package/dist/ui/doctor-dashboard.d.ts.map +1 -1
- package/dist/ui/doctor-dashboard.js +3 -11
- package/dist/ui/doctor-dashboard.js.map +1 -1
- package/dist/ui/fix-app.d.ts.map +1 -1
- package/dist/ui/fix-app.js +2 -12
- package/dist/ui/fix-app.js.map +1 -1
- package/dist/ui/init-view.d.ts.map +1 -1
- package/dist/ui/init-view.js +2 -12
- package/dist/ui/init-view.js.map +1 -1
- package/dist/ui/live-dashboard.d.ts.map +1 -1
- package/dist/ui/live-dashboard.js +16 -16
- package/dist/ui/live-dashboard.js.map +1 -1
- package/dist/ui/outcome-strip.d.ts.map +1 -1
- package/dist/ui/outcome-strip.js +6 -8
- package/dist/ui/outcome-strip.js.map +1 -1
- package/dist/updates/notification.d.ts.map +1 -1
- package/dist/updates/notification.js +2 -10
- package/dist/updates/notification.js.map +1 -1
- package/docs/cli-reference.md +2 -0
- package/package.json +1 -1
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { applyEdits, createScanner, findNodeAtLocation, modify, parse, parseTree, } from "jsonc-parser";
|
|
2
|
+
import { isDeepStrictEqual } from "node:util";
|
|
3
|
+
function removeGeneratedOverride(source, index) {
|
|
4
|
+
const root = parseTree(source);
|
|
5
|
+
if (root === undefined)
|
|
6
|
+
return source;
|
|
7
|
+
const entries = findNodeAtLocation(root, ["overrides"])?.children;
|
|
8
|
+
const entry = entries?.[index];
|
|
9
|
+
if (entry === undefined)
|
|
10
|
+
return source;
|
|
11
|
+
// Remove only the entry and its separator. Trivia between entries can
|
|
12
|
+
// belong to a neighboring handwritten rule.
|
|
13
|
+
const edits = [{ offset: entry.offset, length: entry.length, content: "" }];
|
|
14
|
+
const scanner = createScanner(source, true);
|
|
15
|
+
scanner.setPosition(entry.offset + entry.length);
|
|
16
|
+
scanner.scan();
|
|
17
|
+
if (source[scanner.getTokenOffset()] === ",") {
|
|
18
|
+
edits.push({ offset: scanner.getTokenOffset(), length: 1, content: "" });
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
const previous = entries?.[index - 1];
|
|
22
|
+
if (previous !== undefined) {
|
|
23
|
+
scanner.setPosition(previous.offset + previous.length);
|
|
24
|
+
scanner.scan();
|
|
25
|
+
if (source[scanner.getTokenOffset()] === ",") {
|
|
26
|
+
edits.push({
|
|
27
|
+
offset: scanner.getTokenOffset(),
|
|
28
|
+
length: 1,
|
|
29
|
+
content: "",
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
return applyEdits(source, edits);
|
|
35
|
+
}
|
|
36
|
+
export function reconcileGeneratedOverrides(source, owns, desired, options) {
|
|
37
|
+
const overrides = parse(source)
|
|
38
|
+
.overrides;
|
|
39
|
+
const existing = Array.isArray(overrides) ? overrides : [];
|
|
40
|
+
const remaining = [...desired];
|
|
41
|
+
const edits = new Map();
|
|
42
|
+
for (const [index, entry] of existing.entries()) {
|
|
43
|
+
if (!owns(entry))
|
|
44
|
+
continue;
|
|
45
|
+
const previous = entry;
|
|
46
|
+
const match = remaining.findIndex((candidate) => candidate.generated === previous.generated &&
|
|
47
|
+
// Imported overrides follow the incoming Prettier order inside the
|
|
48
|
+
// generated slots. Engine overrides keep their existing workspace slots.
|
|
49
|
+
(candidate.generated !== "prettier-engine" ||
|
|
50
|
+
(isDeepStrictEqual(candidate.files, previous.files) &&
|
|
51
|
+
isDeepStrictEqual(candidate.excludeFiles, previous.excludeFiles))));
|
|
52
|
+
const replacement = match === -1 ? undefined : remaining.splice(match, 1)[0];
|
|
53
|
+
if (!isDeepStrictEqual(previous, replacement))
|
|
54
|
+
edits.set(index, replacement);
|
|
55
|
+
}
|
|
56
|
+
for (const [index, replacement] of [...edits].reverse()) {
|
|
57
|
+
source =
|
|
58
|
+
replacement === undefined
|
|
59
|
+
? removeGeneratedOverride(source, index)
|
|
60
|
+
: applyEdits(source, modify(source, ["overrides", index], replacement, options));
|
|
61
|
+
}
|
|
62
|
+
for (const entry of remaining) {
|
|
63
|
+
source = applyEdits(source, modify(source, ["overrides", -1], entry, options));
|
|
64
|
+
}
|
|
65
|
+
return source;
|
|
66
|
+
}
|
|
67
|
+
//# sourceMappingURL=generated-formatting-overrides.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generated-formatting-overrides.js","sourceRoot":"","sources":["../../src/init/generated-formatting-overrides.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ export declare function publicProposal(proposal: InitProposal): {
|
|
|
25
25
|
bracketSameLine: boolean;
|
|
26
26
|
arrowParens: "always" | "avoid";
|
|
27
27
|
proseWrap: "never" | "preserve" | "always";
|
|
28
|
-
endOfLine: "
|
|
28
|
+
endOfLine: "lf" | "crlf" | "cr" | "auto";
|
|
29
29
|
singleAttributePerLine: boolean;
|
|
30
30
|
}>;
|
|
31
31
|
overrides: readonly import("../checks/prettier/project-types.js").ImportedFormattingOverride[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"presentation.d.ts","sourceRoot":"","sources":["../../src/init/presentation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"presentation.d.ts","sourceRoot":"","sources":["../../src/init/presentation.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,wBAAgB,cAAc,CAAC,QAAQ,EAAE,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoDpD;AAsCD,wBAAgB,UAAU,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,CAkE3E;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAiDxD;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,YAAY,GACrB,MAAM,CAYR"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { parse } from "jsonc-parser";
|
|
2
|
+
import { isDeepStrictEqual } from "node:util";
|
|
1
3
|
import { ProjectEslintSetupError, PROJECT_ESLINT_DISCLOSURE, } from "./eslint-setup.js";
|
|
2
4
|
import { ImportCaptureError } from "../checks/prettier/project-import-capture.js";
|
|
3
5
|
import { ProjectWorkspaceLayoutError } from "../checks/prettier/project-workspace.js";
|
|
@@ -57,6 +59,34 @@ export function publicProposal(proposal) {
|
|
|
57
59
|
})),
|
|
58
60
|
};
|
|
59
61
|
}
|
|
62
|
+
function configChangeMessage(proposal, applied) {
|
|
63
|
+
const config = proposal.files.find(({ relativePath }) => relativePath === ".zedbeerc.jsonc");
|
|
64
|
+
if (config === undefined || config.before === config.after)
|
|
65
|
+
return undefined;
|
|
66
|
+
function generated(source) {
|
|
67
|
+
const parsed = source === null ? undefined : parse(source);
|
|
68
|
+
const isManagedFormatting = (entry) => ["prettier-copy", "prettier-engine", "prettier-scope"].includes(entry?.generated ?? "");
|
|
69
|
+
return {
|
|
70
|
+
overrides: Array.isArray(parsed?.overrides)
|
|
71
|
+
? parsed.overrides.filter(isManagedFormatting)
|
|
72
|
+
: [],
|
|
73
|
+
exclusions: Array.isArray(parsed?.pathExclusions)
|
|
74
|
+
? parsed.pathExclusions.filter(isManagedFormatting)
|
|
75
|
+
: [],
|
|
76
|
+
settings: isManagedFormatting(parsed?.checks?.formatting)
|
|
77
|
+
? parsed.checks.formatting
|
|
78
|
+
: undefined,
|
|
79
|
+
};
|
|
80
|
+
}
|
|
81
|
+
if (config.before === null)
|
|
82
|
+
return applied
|
|
83
|
+
? "Created .zedbeerc.jsonc."
|
|
84
|
+
: "Will create .zedbeerc.jsonc.";
|
|
85
|
+
const verb = applied ? "Updated" : "Will update";
|
|
86
|
+
return isDeepStrictEqual(generated(config.before), generated(config.after))
|
|
87
|
+
? `${verb} .zedbeerc.jsonc.`
|
|
88
|
+
: `${verb} generated formatting settings in .zedbeerc.jsonc.`;
|
|
89
|
+
}
|
|
60
90
|
export function renderText(proposal, applied) {
|
|
61
91
|
const lines = [
|
|
62
92
|
applied
|
|
@@ -97,8 +127,12 @@ export function renderText(proposal, applied) {
|
|
|
97
127
|
if (proposal.hookActivation.remediation !== undefined) {
|
|
98
128
|
lines.push(`Hook activation required: ${proposal.hookActivation.remediation}`);
|
|
99
129
|
}
|
|
130
|
+
const configUpdate = configChangeMessage(proposal, applied);
|
|
131
|
+
if (configUpdate !== undefined)
|
|
132
|
+
lines.push(configUpdate);
|
|
100
133
|
for (const file of proposal.files)
|
|
101
|
-
|
|
134
|
+
if (file.before !== file.after)
|
|
135
|
+
lines.push("", file.diff);
|
|
102
136
|
if (proposal.hooksPathChange !== undefined)
|
|
103
137
|
lines.push(`Git configuration: core.hooksPath → ${proposal.hooksPathChange.after}`);
|
|
104
138
|
if (applied)
|
|
@@ -147,8 +181,10 @@ export function renderInitFailure(error) {
|
|
|
147
181
|
export function renderInteractiveResult(confirmed, proposal) {
|
|
148
182
|
if (!confirmed)
|
|
149
183
|
return "Zedbee initialization cancelled\n";
|
|
184
|
+
const configUpdate = configChangeMessage(proposal, true);
|
|
150
185
|
const lines = [
|
|
151
186
|
"Zedbee initialized successfully",
|
|
187
|
+
...(configUpdate === undefined ? [] : [configUpdate]),
|
|
152
188
|
"Stage .zedbeerc.jsonc and the other setup files before checking or committing; commit checks use staged configuration.",
|
|
153
189
|
];
|
|
154
190
|
if (proposal.hookActivation.remediation !== undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"presentation.js","sourceRoot":"","sources":["../../src/init/presentation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"presentation.js","sourceRoot":"","sources":["../../src/init/presentation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
export declare const SUPPORTED_PROJECT_PRETTIER_RANGE = ">=3.0.0 <4.0.0";
|
|
2
1
|
export interface ProjectPrettierDiscovery {
|
|
3
2
|
/** Normalized repository-relative project root; "." for the repository root. */
|
|
4
3
|
readonly projectRoot: string;
|
|
@@ -11,15 +10,6 @@ export interface ProjectPrettierDiscovery {
|
|
|
11
10
|
readonly status: "available" | "missing" | "unsupported";
|
|
12
11
|
}
|
|
13
12
|
export declare const DATA_CONFIG_FILE_NAMES: readonly [".prettierrc", ".prettierrc.json", ".prettierrc.json5", ".prettierrc.yaml", ".prettierrc.yml", ".prettierrc.toml", ".prettierrc.js", ".prettierrc.cjs", ".prettierrc.mjs", ".prettierrc.ts", ".prettierrc.cts", ".prettierrc.mts", "prettier.config.js", "prettier.config.mjs", "prettier.config.cjs", "prettier.config.ts", "prettier.config.cts", "prettier.config.mts"];
|
|
14
|
-
export declare function isSupportedProjectPrettierVersion(version: string): boolean;
|
|
15
|
-
/**
|
|
16
|
-
* An installed version is accepted only when it satisfies the supported
|
|
17
|
-
* engine range and, when the project declares a semver range, that exact
|
|
18
|
-
* declaration. Non-semver declarations (URLs, tags, `workspace:*`) do not
|
|
19
|
-
* restrict the installed version here; the engine revalidates against the
|
|
20
|
-
* selected snapshot before executing anything.
|
|
21
|
-
*/
|
|
22
|
-
export declare function isProjectPrettierVersionAccepted(version: string, declaredRange: string | undefined): boolean;
|
|
23
13
|
export declare function discoverProjectPrettier(repositoryRoot: string): Promise<readonly ProjectPrettierDiscovery[]>;
|
|
24
14
|
/** Internal helper for tests and Task 4; never exported through the CLI surface. */
|
|
25
15
|
export declare function repositoryRelativePath(canonicalRoot: string, path: string): string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prettier-discovery.d.ts","sourceRoot":"","sources":["../../src/init/prettier-discovery.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prettier-discovery.d.ts","sourceRoot":"","sources":["../../src/init/prettier-discovery.ts"],"names":[],"mappings":"AAwBA,MAAM,WAAW,wBAAwB;IACvC,gFAAgF;IAChF,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,qFAAqF;IACrF,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,GAAG,aAAa,CAAC;CAC1D;AAED,eAAO,MAAM,sBAAsB,sXAmBzB,CAAC;AA4OX,wBAAsB,uBAAuB,CAC3C,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,SAAS,wBAAwB,EAAE,CAAC,CA2B9C;AAED,oFAAoF;AACpF,wBAAgB,sBAAsB,CACpC,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GACX,MAAM,GAAG,SAAS,CAWpB"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
|
+
import { isProjectPrettierVersionAccepted, manifestPrettierDeclaration, } from "../checks/prettier/project-version.js";
|
|
1
2
|
import { lstat, readFile, realpath } from "node:fs/promises";
|
|
2
3
|
import { dirname, isAbsolute, posix, relative, resolve, sep } from "node:path";
|
|
3
|
-
import semver from "semver";
|
|
4
4
|
import { parse as parseYaml } from "yaml";
|
|
5
5
|
import { compareCodeUnits } from "../core/compare.js";
|
|
6
6
|
import { canonicalizeSnapshotRoot, isContainedPath, readContainedFile, readJsonData, } from "../inspection/read-json.js";
|
|
7
7
|
import { captureWorkingTreeRegistry } from "../inspection/working-tree-registry.js";
|
|
8
8
|
import { discoverWorkspaces } from "../inspection/workspaces.js";
|
|
9
|
-
export const SUPPORTED_PROJECT_PRETTIER_RANGE = ">=3.0.0 <4.0.0";
|
|
10
9
|
const PRETTIER_PACKAGE_NAME = "prettier";
|
|
11
10
|
const NODE_MODULES = "node_modules";
|
|
12
11
|
const MANIFEST_MAX_BYTES = 1024 * 1024;
|
|
@@ -41,33 +40,6 @@ const EXECUTABLE_CONFIG_EXTENSIONS = new Set([
|
|
|
41
40
|
".cts",
|
|
42
41
|
".mts",
|
|
43
42
|
]);
|
|
44
|
-
export function isSupportedProjectPrettierVersion(version) {
|
|
45
|
-
const normalized = semver.valid(version);
|
|
46
|
-
return (normalized !== null &&
|
|
47
|
-
semver.satisfies(normalized, SUPPORTED_PROJECT_PRETTIER_RANGE));
|
|
48
|
-
}
|
|
49
|
-
/**
|
|
50
|
-
* An installed version is accepted only when it satisfies the supported
|
|
51
|
-
* engine range and, when the project declares a semver range, that exact
|
|
52
|
-
* declaration. Non-semver declarations (URLs, tags, `workspace:*`) do not
|
|
53
|
-
* restrict the installed version here; the engine revalidates against the
|
|
54
|
-
* selected snapshot before executing anything.
|
|
55
|
-
*/
|
|
56
|
-
export function isProjectPrettierVersionAccepted(version, declaredRange) {
|
|
57
|
-
if (!isSupportedProjectPrettierVersion(version))
|
|
58
|
-
return false;
|
|
59
|
-
if (declaredRange === undefined)
|
|
60
|
-
return true;
|
|
61
|
-
const normalizedRange = semver.validRange(declaredRange);
|
|
62
|
-
if (normalizedRange === null)
|
|
63
|
-
return true;
|
|
64
|
-
try {
|
|
65
|
-
return semver.satisfies(semver.valid(version), normalizedRange);
|
|
66
|
-
}
|
|
67
|
-
catch {
|
|
68
|
-
return false;
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
43
|
function executableConfigPath(path) {
|
|
72
44
|
const extension = path.slice(path.lastIndexOf("."));
|
|
73
45
|
return EXECUTABLE_CONFIG_EXTENSIONS.has(extension);
|
|
@@ -120,24 +92,6 @@ async function findInstalledPrettier(projectRootAbsolute, canonicalRoot) {
|
|
|
120
92
|
}
|
|
121
93
|
return undefined;
|
|
122
94
|
}
|
|
123
|
-
function manifestPrettierRange(value) {
|
|
124
|
-
if (typeof value !== "object" || value === null)
|
|
125
|
-
return undefined;
|
|
126
|
-
for (const section of [
|
|
127
|
-
"dependencies",
|
|
128
|
-
"devDependencies",
|
|
129
|
-
"optionalDependencies",
|
|
130
|
-
"peerDependencies",
|
|
131
|
-
]) {
|
|
132
|
-
const dependencies = value[section];
|
|
133
|
-
if (typeof dependencies !== "object" || dependencies === null)
|
|
134
|
-
continue;
|
|
135
|
-
const specifier = dependencies.prettier;
|
|
136
|
-
if (typeof specifier === "string")
|
|
137
|
-
return specifier;
|
|
138
|
-
}
|
|
139
|
-
return undefined;
|
|
140
|
-
}
|
|
141
95
|
async function declaredPrettierRangeForProject(registry, projectRoot, projectManifest) {
|
|
142
96
|
let current = projectRoot;
|
|
143
97
|
while (true) {
|
|
@@ -156,7 +110,7 @@ async function declaredPrettierRangeForProject(registry, projectRoot, projectMan
|
|
|
156
110
|
value = undefined;
|
|
157
111
|
}
|
|
158
112
|
}
|
|
159
|
-
const declaredRange =
|
|
113
|
+
const declaredRange = manifestPrettierDeclaration(value)?.range;
|
|
160
114
|
if (declaredRange !== undefined)
|
|
161
115
|
return declaredRange;
|
|
162
116
|
if (current === ".")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prettier-discovery.js","sourceRoot":"","sources":["../../src/init/prettier-discovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAC/E,OAAO,
|
|
1
|
+
{"version":3,"file":"prettier-discovery.js","sourceRoot":"","sources":["../../src/init/prettier-discovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recommend.d.ts","sourceRoot":"","sources":["../../src/init/recommend.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"recommend.d.ts","sourceRoot":"","sources":["../../src/init/recommend.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAe,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAGhF,OAAO,KAAK,EACV,yBAAyB,EACzB,cAAc,EAKd,YAAY,EAEb,MAAM,YAAY,CAAC;AAwLpB,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,KAAK,EAAE,MAAM,GACZ,MAAM,CAWR;AAED,wBAAgB,cAAc,CAC5B,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,YAAY,CAAC,EAAE,MAAM,GACpB,cAAc,CAWhB;AAuWD,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,oBAAoB,EAChC,OAAO,EAAE,yBAAyB,GACjC,YAAY,CAgPd"}
|
package/dist/init/recommend.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { reconcileGeneratedOverrides } from "./generated-formatting-overrides.js";
|
|
1
2
|
import { configureInitEslint, PROJECT_ESLINT_DISCLOSURE, } from "./eslint-setup.js";
|
|
2
3
|
import { createHash } from "node:crypto";
|
|
3
4
|
import { applyEdits, modify, parse } from "jsonc-parser";
|
|
@@ -357,9 +358,6 @@ function applyFormattingChoice(updated, parsed, formatting, options) {
|
|
|
357
358
|
}
|
|
358
359
|
// Repeat setup replaces exactly the entries Zedbee generated and preserves
|
|
359
360
|
// every unmarked, hand-authored override.
|
|
360
|
-
const existingOverrides = Array.isArray(root.overrides)
|
|
361
|
-
? root.overrides
|
|
362
|
-
: [];
|
|
363
361
|
const existingExclusions = Array.isArray(root.pathExclusions)
|
|
364
362
|
? root.pathExclusions
|
|
365
363
|
: [];
|
|
@@ -373,15 +371,7 @@ function applyFormattingChoice(updated, parsed, formatting, options) {
|
|
|
373
371
|
if (existingExclusions.length > 0 || finalExclusions.length > 0) {
|
|
374
372
|
next = applyEdits(next, modify(next, ["pathExclusions"], finalExclusions, options));
|
|
375
373
|
}
|
|
376
|
-
|
|
377
|
-
if (isGeneratedOverrideEntry(existingOverrides[index])) {
|
|
378
|
-
next = applyEdits(next, modify(next, ["overrides", index], undefined, options));
|
|
379
|
-
}
|
|
380
|
-
}
|
|
381
|
-
for (const entry of generatedEntries) {
|
|
382
|
-
next = applyEdits(next, modify(next, ["overrides", -1], entry, options));
|
|
383
|
-
}
|
|
384
|
-
return next;
|
|
374
|
+
return reconcileGeneratedOverrides(next, isGeneratedOverrideEntry, generatedEntries, options);
|
|
385
375
|
}
|
|
386
376
|
function existingVulnerabilitySeverity(before) {
|
|
387
377
|
if (before === null)
|
|
@@ -467,30 +457,21 @@ export function createInitProposal(inspection, options) {
|
|
|
467
457
|
};
|
|
468
458
|
let config = initFileChange(".zedbeerc.jsonc", before, configContents(options.profile, before, options.checks, vulnerabilitiesEnabled, osvUnavailable, formattingConfig, options.schemaReference), 0o644);
|
|
469
459
|
if (options.formattingScope !== undefined) {
|
|
470
|
-
const source = parse(config.after);
|
|
471
|
-
const existing = Array.isArray(source.overrides) ? source.overrides : [];
|
|
472
|
-
const editOptions = {
|
|
473
|
-
formattingOptions: { insertSpaces: true, tabSize: 2, eol: "\n" },
|
|
474
|
-
};
|
|
475
|
-
let after = config.after;
|
|
476
|
-
// Scope owns only its marked entries. Removing individual array elements
|
|
477
|
-
// preserves comments and bytes inside every handwritten override.
|
|
478
|
-
for (let index = existing.length - 1; index >= 0; index--) {
|
|
479
|
-
if (existing[index]?.generated === "prettier-scope") {
|
|
480
|
-
after = applyEdits(after, modify(after, ["overrides", index], undefined, editOptions));
|
|
481
|
-
}
|
|
482
|
-
}
|
|
483
460
|
const roots = options.formattingScopeRoots ?? [];
|
|
484
|
-
|
|
461
|
+
const after = reconcileGeneratedOverrides(config.after, (entry) => typeof entry === "object" &&
|
|
462
|
+
entry !== null &&
|
|
463
|
+
entry.generated === "prettier-scope", options.formattingScope === "projects" &&
|
|
485
464
|
roots.length > 0 &&
|
|
486
|
-
!roots.includes(".")
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
465
|
+
!roots.includes(".")
|
|
466
|
+
? [
|
|
467
|
+
{
|
|
468
|
+
files: ["**"],
|
|
469
|
+
excludeFiles: roots.map((root) => `${root}/**`),
|
|
470
|
+
checks: { formatting: "off" },
|
|
471
|
+
generated: "prettier-scope",
|
|
472
|
+
},
|
|
473
|
+
]
|
|
474
|
+
: [], { formattingOptions: { insertSpaces: true, tabSize: 2, eol: "\n" } });
|
|
494
475
|
if (after !== config.after) {
|
|
495
476
|
config = initFileChange(config.relativePath, config.before, after, config.mode);
|
|
496
477
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recommend.js","sourceRoot":"","sources":["../../src/init/recommend.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,yBAAyB,GAC1B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAmB,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAgB,MAAM,qBAAqB,CAAC;AAE9D,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAYpD,SAAS,qBAAqB,CAC5B,MAA4B,EAC5B,QAA0C,EAC1C,WAAoB,EACpB,QAAyB;IAEzB,IAAI,MAAM,KAAK,KAAK;QAAE,OAAO,KAAK,CAAC;IACnC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO;YACL,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;YAC3C,QAAQ,EAAE,OAAO;SAClB,CAAC;IACJ,CAAC;IACD,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACtB,OAAO;YACL,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE,QAAQ,EAAE,QAAQ,IAAI,EAAE;YAClC,SAAS,EAAE,eAAe;SAC3B,CAAC;IACJ,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,uBAAuB,CAC9B,QAA0C;IAE1C,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IACtC,OAAO,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC3C,KAAK,EAAE,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC;QAC1B,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC;YACpC,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,GAAG,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QACjD,MAAM,EAAE,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,EAAE;QACvD,SAAS,EAAE,eAAe;KAC3B,CAAC,CAAC,CAAC;AACN,CAAC;AAED,SAAS,qBAAqB,CAC5B,YAA+B;IAE/B,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACxC,KAAK,EAAE,CAAC,GAAG,WAAW,KAAK,CAAC;QAC5B,MAAM,EAAE,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE;QAC7C,SAAS,EAAE,iBAAiB;KAC7B,CAAC,CAAC,CAAC;AACN,CAAC;AAED;;;GAGG;AACH,SAAS,wBAAwB,CAAC,KAAc;IAC9C,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,CAAE,KAAiC,CAAC,SAAS,KAAK,eAAe;YAC9D,KAAiC,CAAC,SAAS,KAAK,iBAAiB,CAAC,CACtE,CAAC;AACJ,CAAC;AAED,gFAAgF;AAChF,SAAS,wBAAwB,CAAC,MAAqB;IACrD,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IACtC,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,MAAM,MAAM,GAAY,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5E,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QACvE,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,MAAM,GAAI,MAAkC,CAAC,MAAM,CAAC;IAC1D,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IACpE,MAAM,UAAU,GAAI,MAAkC,CAAC,UAAU,CAAC;IAClE,IAAI,UAAU,KAAK,KAAK;QAAE,OAAO,KAAK,CAAC;IACvC,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;QAC1D,MAAM,MAAM,GAAG,UAAqC,CAAC;QACrD,IAAI,MAAM,CAAC,QAAQ,KAAK,KAAK;YAAE,OAAO,KAAK,CAAC;QAC5C,IAAI,MAAM,CAAC,SAAS,KAAK,eAAe;YAAE,OAAO,MAAM,CAAC;QACxD,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;IACpD,CAAC;IACD,MAAM,SAAS,GAAI,MAAkC,CAAC,SAAS,CAAC;IAChE,IACE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;QACxB,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;YACvB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;gBAAE,OAAO,KAAK,CAAC;YAC9D,MAAM,MAAM,GAAG,KAAgC,CAAC;YAChD,IAAI,MAAM,CAAC,SAAS,KAAK,iBAAiB;gBAAE,OAAO,KAAK,CAAC;YACzD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC;YACrC,IAAI,OAAO,cAAc,KAAK,QAAQ,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;gBAClE,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,kBAAkB,GAAI,cAA0C;iBACnE,UAAU,CAAC;YACd,OAAO,CACL,OAAO,kBAAkB,KAAK,QAAQ;gBACtC,kBAAkB,KAAK,IAAI;gBAC1B,kBAA8C,CAAC,MAAM,KAAK,SAAS,CACrE,CAAC;QACJ,CAAC,CAAC,EACF,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAwB;IACrD,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,OAAO,MAAM,CAAC,MAAM,CAAC;YACnB,MAAM,EAAE,eAAe;YACvB,OAAO,EAAE,2CAA2C;SACrD,CAAC,CAAC;IACL,CAAC;IACD,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACxB,OAAO,MAAM,CAAC,MAAM,CAAC;YACnB,MAAM,EAAE,SAAS;YACjB,OAAO,EACL,mGAAmG;YACrG,WAAW,EACT,8FAA8F;SACjG,CAAC,CAAC;IACL,CAAC;IACD,IAAI,IAAI,KAAK,kBAAkB,EAAE,CAAC;QAChC,OAAO,MAAM,CAAC,MAAM,CAAC;YACnB,MAAM,EAAE,SAAS;YACjB,OAAO,EACL,2GAA2G;YAC7G,WAAW,EACT,+GAA+G;SAClH,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,MAAM,EAAE,QAAQ;QAChB,OAAO,EAAE,gBAAgB,IAAI,uDAAuD;KACrF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,aAAa,GAAG,IAAI,GAAG,CAAU;IACrC,YAAY;IACZ,MAAM;IACN,sBAAsB;IACtB,uBAAuB;IACvB,oBAAoB;IACpB,SAAS;IACT,aAAa;IACb,UAAU;CACX,CAAC,CAAC;AACH,MAAM,cAAc,GAEhB;IACF,IAAI,EAAE,IAAI,GAAG,CAAC;QACZ,YAAY;QACZ,MAAM;QACN,sBAAsB;QACtB,uBAAuB;QACvB,oBAAoB;QACpB,kBAAkB;QAClB,oBAAoB;KACrB,CAAC;IACF,WAAW,EAAE,IAAI,GAAG,CAAC;QACnB,YAAY;QACZ,MAAM;QACN,OAAO;QACP,sBAAsB;QACtB,uBAAuB;QACvB,oBAAoB;QACpB,SAAS;QACT,kBAAkB;QAClB,oBAAoB;KACrB,CAAC;IACF,QAAQ,EAAE,IAAI,GAAG,CAAC,SAAS,CAAC;CAC7B,CAAC;AACF,MAAM,iBAAiB,GAA2B;IAChD,YAAY;IACZ,YAAY;IACZ,OAAO;IACP,WAAW;IACX,KAAK;IACL,MAAM;IACN,OAAO;IACP,QAAQ;IACR,MAAM;IACN,iBAAiB;CAClB,CAAC;AAEF,MAAM,UAAU,eAAe,CAAC,QAAgB;IAC9C,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACrE,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,YAAoB,EACpB,MAAqB,EACrB,KAAa;IAEb,MAAM,QAAQ,GAAG,MAAM,IAAI,EAAE,CAAC;IAC9B,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtE,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/D,OAAO;QACL,OAAO,YAAY,EAAE;QACrB,OAAO,YAAY,EAAE;QACrB,4BAA4B;QAC5B,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC;QACxC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC;KACxC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,YAAoB,EACpB,MAAqB,EACrB,KAAa,EACb,IAAY,EACZ,YAAqB;IAErB,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,YAAY;QACZ,GAAG,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC;QACvD,MAAM;QACN,KAAK;QACL,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC;QAC5D,SAAS,EAAE,eAAe,CAAC,KAAK,CAAC;QACjC,IAAI,EAAE,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC;QACnD,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAWD,SAAS,cAAc,CACrB,OAA6C,EAC7C,MAAqB,EACrB,MAAsC,EACtC,sBAA+B,EAC/B,cAAkC,EAClC,UAA6C,EAC7C,eAAe,GAAG,iDAAiD;IAEnE,MAAM,gBAAgB,GACpB,MAAM,KAAK,SAAS;QAClB,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,MAAM,CAAC,WAAW,CAChB,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;YACvB,KAAK;YACL,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;gBACpB,CAAC,CAAC,KAAK,KAAK,iBAAiB;oBAC3B,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE;oBACtD,CAAC,CAAC,OAAO;gBACX,CAAC,CAAC,KAAK;SACV,CAAC,CACH,CAAC;IACR,MAAM,aAAa,GACjB,gBAAgB;QAChB,CAAC,sBAAsB;YACrB,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,aAAa,EAAE,cAAc,EAAE,EAAE;YACxD,CAAC,CAAC,SAAS,CAAC,CAAC;IACjB,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QACpB,MAAM,WAAW,GACf,UAAU,KAAK,SAAS;YACtB,CAAC,CAAC,aAAa;YACf,CAAC,CAAC;gBACE,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC;gBACxB,UAAU,EAAE,qBAAqB,CAC/B,UAAU,CAAC,MAAM,EACjB,UAAU,CAAC,QAAQ,EACnB,UAAU,CAAC,WAAW,IAAI,IAAI,EAC9B,OAAO,CACR;aACF,CAAC;QACR,MAAM,cAAc,GAAG;YACrB,GAAG,uBAAuB,CAAC,UAAU,EAAE,QAAQ,CAAC;YAChD,GAAG,qBAAqB,CACtB,UAAU,EAAE,MAAM,KAAK,SAAS;gBAC9B,CAAC,CAAC,CAAC,UAAU,EAAE,YAAY,IAAI,EAAE,CAAC;gBAClC,CAAC,CAAC,EAAE,CACP;SACF,CAAC;QACF,OAAO,GAAG,IAAI,CAAC,SAAS,CACtB;YACE,OAAO,EAAE,eAAe;YACxB,aAAa,EAAE,CAAC;YAChB,OAAO;YACP,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;YAC7D,GAAG,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC;YACrE,SAAS,EAAE;gBACT,aAAa,EAAE,0BAA0B;aAC1C;SACF,EACD,IAAI,EACJ,CAAC,CACF,IAAI,CAAC;IACR,CAAC;IACD,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,MAAM,MAAM,GAAY,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5E,IACE,MAAM,CAAC,MAAM,GAAG,CAAC;QACjB,OAAO,MAAM,KAAK,QAAQ;QAC1B,MAAM,KAAK,IAAI;QACf,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EACrB,CAAC;QACD,MAAM,IAAI,KAAK,CACb,4DAA4D,CAC7D,CAAC;IACJ,CAAC;IACD,MAAM,OAAO,GAAG;QACd,iBAAiB,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE;KACjE,CAAC;IACF,IAAI,OAAO,GAAG,MAAM,CAAC;IACrB,OAAO,GAAG,UAAU,CAClB,OAAO,EACP,MAAM,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,EAAE,eAAe,EAAE,OAAO,CAAC,CACvD,CAAC;IACF,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAC9E,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAC9E,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACnC,OAAO,GAAG,UAAU,CAClB,OAAO,EACP,MAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,CACvD,CAAC;IACJ,CAAC;SAAM,IAAI,sBAAsB,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,MAAiC,CAAC;QAC/C,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC;QAChC,MAAM,qBAAqB,GACzB,OAAO,WAAW,KAAK,QAAQ;YAC/B,WAAW,KAAK,IAAI;YACpB,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC;YACzB,CAAC,CAAE,WAAuC,CAAC,eAAe;YAC1D,CAAC,CAAC,SAAS,CAAC;QAChB,IAAI,qBAAqB,KAAK,KAAK,EAAE,CAAC;YACpC,MAAM,KAAK,GACT,qBAAqB,KAAK,OAAO,IAAI,qBAAqB,KAAK,MAAM;gBACnE,CAAC,CAAC;oBACE,QAAQ,EAAE,qBAAqB;oBAC/B,aAAa,EAAE,cAAc;iBAC9B;gBACH,CAAC,CAAC,cAAc,CAAC;YACrB,MAAM,IAAI,GACR,OAAO,KAAK,KAAK,QAAQ;gBACvB,CAAC,CAAC,CAAC,QAAQ,EAAE,iBAAiB,EAAE,eAAe,CAAC;gBAChD,CAAC,CAAC,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;YACpC,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;IACD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,GAAG,qBAAqB,CAC7B,OAAO,EACP,MAAM,EACN;YACE,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,GAAG,CAAC,UAAU,CAAC,QAAQ,KAAK,SAAS;gBACnC,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC;YACtC,YAAY,EAAE,UAAU,CAAC,YAAY,IAAI,EAAE;YAC3C,WAAW,EAAE,UAAU,CAAC,WAAW,IAAI,IAAI;SAC5C,EACD,OAAO,CACR,CAAC;IACJ,CAAC;IACD,OAAO,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,IAAI,CAAC;AAC3D,CAAC;AAUD,SAAS,qBAAqB,CAC5B,OAAe,EACf,MAAe,EACf,UAGC,EACD,OAA2B;IAE3B,MAAM,IAAI,GAAG,MAAiC,CAAC;IAC/C,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC;IAChC,MAAM,YAAY,GAChB,OAAO,WAAW,KAAK,QAAQ;QAC/B,WAAW,KAAK,IAAI;QACpB,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC;QACzB,CAAC,CAAE,WAAuC;QAC1C,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,QAAQ,GAAG,YAAY,CAAC,UAAU,CAAC;IACzC,MAAM,cAAc,GAClB,OAAO,QAAQ,KAAK,QAAQ;QAC5B,QAAQ,KAAK,IAAI;QACjB,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;QACtB,CAAC,CAAE,QAAoC;QACvC,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,gBAAgB,GACpB,QAAQ,KAAK,KAAK,IAAI,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,OAAO;QAC/D,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,cAAc,EAAE,QAAQ,KAAK,KAAK;YAChC,cAAc,EAAE,QAAQ,KAAK,MAAM;YACnC,cAAc,EAAE,QAAQ,KAAK,OAAO;YACtC,CAAC,CAAC,cAAc,CAAC,QAAQ;YACzB,CAAC,CAAC,OAAO,CAAC;IAChB,MAAM,YAAY,GAChB,cAAc,EAAE,IAAI,KAAK,QAAQ,IAAI,cAAc,EAAE,IAAI,KAAK,UAAU;QACtE,CAAC,CAAC,cAAc,CAAC,IAAI;QACrB,CAAC,CAAC,SAAS,CAAC;IAChB,0EAA0E;IAC1E,qEAAqE;IACrE,MAAM,oBAAoB,GAAG,cAAc,EAAE,SAAS,KAAK,eAAe,CAAC;IAE3E,IAAI,IAAI,GAAG,OAAO,CAAC;IACnB,IAAI,gBAAoD,CAAC;IACzD,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACpC,sEAAsE;QACtE,sEAAsE;QACtE,MAAM,KAAK,GACT,oBAAoB,IAAI,cAAc,KAAK,SAAS;YAClD,CAAC,CAAC;gBACE,QAAQ,EAAE,gBAAgB;gBAC1B,MAAM,EAAE,SAAS;gBACjB,GAAG,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;aAC9D;YACH,CAAC,CAAC,EAAE,GAAG,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QAC/C,IAAI,GAAG,UAAU,CACf,IAAI,EACJ,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CACvD,CAAC;QACF,gBAAgB,GAAG,EAAE,CAAC;IACxB,CAAC;SAAM,IAAI,UAAU,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;QACvC,MAAM,KAAK,GACT,oBAAoB,IAAI,cAAc,KAAK,SAAS;YAClD,CAAC,CAAC,YAAY,KAAK,SAAS;gBAC1B,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE;YAC3C,CAAC,CAAC,EAAE,GAAG,cAAc,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QAC7C,IAAI,GAAG,UAAU,CACf,IAAI,EACJ,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CACvD,CAAC;QACF,gBAAgB,GAAG,EAAE,CAAC;IACxB,CAAC;SAAM,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC3C,uEAAuE;QACvE,iEAAiE;QACjE,IAAI,GAAG,UAAU,CACf,IAAI,EACJ,MAAM,CACJ,IAAI,EACJ,CAAC,QAAQ,EAAE,YAAY,CAAC,EACxB;YACE,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;YACtD,QAAQ,EAAE,gBAAgB;YAC1B,GAAG,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;SAC9D,EACD,OAAO,CACR,CACF,CAAC;QACF,gBAAgB,GAAG,qBAAqB,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IACpE,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,UAAU,CACf,IAAI,EACJ,MAAM,CACJ,IAAI,EACJ,CAAC,QAAQ,EAAE,YAAY,CAAC,EACxB;YACE,QAAQ,EAAE,gBAAgB;YAC1B,GAAG,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;YAC7D,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,QAAQ,IAAI,EAAE;YAC7C,SAAS,EAAE,eAAe;SAC3B,EACD,OAAO,CACR,CACF,CAAC;QACF,gBAAgB,GAAG,uBAAuB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAClE,CAAC;IAED,2EAA2E;IAC3E,0CAA0C;IAC1C,MAAM,iBAAiB,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC;QACrD,CAAC,CAAE,IAAI,CAAC,SAAgC;QACxC,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,kBAAkB,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC;QAC3D,CAAC,CAAC,IAAI,CAAC,cAAc;QACrB,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,cAAc,GAAG,kBAAkB,CAAC,MAAM,CAC9C,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAC5C,CAAC;IACF,MAAM,eAAe,GAAG;QACtB,GAAG,cAAc;QACjB,GAAG,CAAC,UAAU,CAAC,MAAM,KAAK,MAAM;YAC9B,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,cAAc,IAAI,EAAE,CAAC;YAC7C,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;IACF,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChE,IAAI,GAAG,UAAU,CACf,IAAI,EACJ,MAAM,CAAC,IAAI,EAAE,CAAC,gBAAgB,CAAC,EAAE,eAAe,EAAE,OAAO,CAAC,CAC3D,CAAC;IACJ,CAAC;IACD,KAAK,IAAI,KAAK,GAAG,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;QACnE,IAAI,wBAAwB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YACvD,IAAI,GAAG,UAAU,CACf,IAAI,EACJ,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,CACvD,CAAC;QACJ,CAAC;IACH,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,gBAAgB,EAAE,CAAC;QACrC,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3E,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,6BAA6B,CACpC,MAAqB;IAErB,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IACtC,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,MAAM,IAAI,GAAY,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1E,IACE,MAAM,CAAC,MAAM,GAAG,CAAC;QACjB,OAAO,IAAI,KAAK,QAAQ;QACxB,IAAI,KAAK,IAAI;QACb,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EACnB,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,MAAM,GAAI,IAAgC,CAAC,MAAM,CAAC;IACxD,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3E,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,aAAa,GAAI,MAAkC,CAAC,eAAe,CAAC;IAC1E,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,aAAuB,CAAC,EAAE,CAAC;QAC/D,OAAO,aAAyC,CAAC;IACnD,CAAC;IACD,IACE,OAAO,aAAa,KAAK,QAAQ;QACjC,aAAa,KAAK,IAAI;QACtB,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAC7B,CAAC;QACD,MAAM,QAAQ,GAAI,aAAyC,CAAC,QAAQ,CAAC;QACrE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,QAAkB,CAAC,EAAE,CAAC;YAC1D,OAAO,QAAoC,CAAC;QAC9C,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,YAAY,CACnB,UAAgC;IAEhC,MAAM,QAAQ,GAAG,IAAI,GAAG,CACtB,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,CACrE,CAAC;IACF,OAAO,MAAM,CAAC,MAAM,CAClB,iBAAiB,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CACrE,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CACxB,UAAgC,EAChC,QAAgC,EAChC,OAA6C;IAE7C,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,CAAC;IACtC,IAAI,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC;QAAE,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACzD,IACE,QAAQ,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAC5B,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CACrE,EACD,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACjC,CAAC;IACD,IACE,QAAQ,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAC5B,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CACrD,EACD,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACnC,CAAC;IACD,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAC3E,IAAI,UAAU,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACnE,MAAM,aAAa,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IAC9C,OAAO,MAAM,CAAC,MAAM,CAClB,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAC3E,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,UAAgC,EAChC,OAAkC;IAElC,MAAM,QAAQ,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,IAAI,IAAI,CAAC;IAC5C,MAAM,cAAc,GAClB,OAAO,CAAC,MAAM,KAAK,SAAS;QAC1B,CAAC,CAAC,iBAAiB,CAAC,UAAU,EAAE,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC;QAC1D,CAAC,CAAC,MAAM,CAAC,MAAM,CACX,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAC7D,CAAC;IACR,MAAM,8BAA8B,GAAG,UAAU,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;IACvE,MAAM,+BAA+B,GAAG,6BAA6B,CAAC,MAAM,CAAC,CAAC;IAC9E,MAAM,sBAAsB,GAC1B,8BAA8B;QAC9B,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS;YAC3B,CAAC,CAAC,+BAA+B,KAAK,SAAS;gBAC7C,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,iBAAiB,CAAC;gBAC5C,CAAC,CAAC,+BAA+B,KAAK,KAAK;YAC7C,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAClD,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC;IACzD,2EAA2E;IAC3E,0EAA0E;IAC1E,MAAM,gBAAgB,GACpB,OAAO,CAAC,UAAU,IAAI,wBAAwB,CAAC,MAAM,CAAC,CAAC;IACzD,MAAM,gBAAgB,GACpB,OAAO,CAAC,UAAU,KAAK,SAAS;QAC9B,CAAC,CAAC,SAAS;QACX,CAAC,CAAC;YACE,MAAM,EAAE,OAAO,CAAC,UAAU;YAC1B,GAAG,CAAC,OAAO,CAAC,gBAAgB,KAAK,SAAS;gBACxC,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAC3C,GAAG,CAAC,OAAO,CAAC,UAAU,KAAK,SAAS;gBAClC,CAAC,CAAC;oBACE,YAAY,EAAE,OAAO,CAAC,sBAAsB,IAAI,EAAE;oBAClD,WAAW,EAAE,OAAO,CAAC,qBAAqB,IAAI,IAAI;iBACnD;gBACH,CAAC,CAAC,EAAE,CAAC;SACR,CAAC;IACR,IAAI,MAAM,GAAG,cAAc,CACzB,iBAAiB,EACjB,MAAM,EACN,cAAc,CACZ,OAAO,CAAC,OAAO,EACf,MAAM,EACN,OAAO,CAAC,MAAM,EACd,sBAAsB,EACtB,cAAc,EACd,gBAAgB,EAChB,OAAO,CAAC,eAAe,CACxB,EACD,KAAK,CACN,CAAC;IACF,IAAI,OAAO,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;QAC1C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAA4B,CAAC;QAC9D,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,MAAM,WAAW,GAAG;YAClB,iBAAiB,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE;SACjE,CAAC;QACF,IAAI,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QACzB,yEAAyE;QACzE,kEAAkE;QAClE,KAAK,IAAI,KAAK,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;YAC1D,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,KAAK,gBAAgB,EAAE,CAAC;gBACpD,KAAK,GAAG,UAAU,CAChB,KAAK,EACL,MAAM,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,CAC5D,CAAC;YACJ,CAAC;QACH,CAAC;QACD,MAAM,KAAK,GAAG,OAAO,CAAC,oBAAoB,IAAI,EAAE,CAAC;QACjD,IACE,OAAO,CAAC,eAAe,KAAK,UAAU;YACtC,KAAK,CAAC,MAAM,GAAG,CAAC;YAChB,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EACpB,CAAC;YACD,KAAK,GAAG,UAAU,CAChB,KAAK,EACL,MAAM,CACJ,KAAK,EACL,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EACjB;gBACE,KAAK,EAAE,CAAC,IAAI,CAAC;gBACb,YAAY,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,KAAK,CAAC;gBAC/C,MAAM,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE;gBAC7B,SAAS,EAAE,gBAAgB;aAC5B,EACD,WAAW,CACZ,CACF,CAAC;QACJ,CAAC;QACD,IAAI,KAAK,KAAK,MAAM,CAAC,KAAK,EAAE,CAAC;YAC3B,MAAM,GAAG,cAAc,CACrB,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,MAAM,EACb,KAAK,EACL,MAAM,CAAC,IAAI,CACZ,CAAC;QACJ,CAAC;IACH,CAAC;IACD,MAAM,WAAW,GAAG,mBAAmB,CACrC,MAAM,CAAC,KAAK,EACZ,MAAM,EACN,UAAU,EACV,OAAO,CACR,CAAC;IACF,IAAI,WAAW,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,EAAE,CAAC;QACvC,MAAM,GAAG,cAAc,CACrB,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,MAAM,EACb,WAAW,CAAC,KAAK,EACjB,MAAM,CAAC,IAAI,CACZ,CAAC;IACJ,CAAC;IACD,IAAI,OAAO,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;QAC7C,IAAI,KAAK,GAAG,UAAU,CACpB,MAAM,CAAC,KAAK,EACZ,MAAM,CACJ,MAAM,CAAC,KAAK,EACZ,CAAC,WAAW,EAAE,oBAAoB,CAAC,EACnC,OAAO,CAAC,kBAAkB,EAC1B,EAAE,iBAAiB,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,CACrE,CACF,CAAC;QACF,IAAI,OAAO,CAAC,kBAAkB,KAAK,aAAa;YAC9C,KAAK,GAAG,UAAU,CAChB,KAAK,EACL,MAAM,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,gBAAgB,CAAC,EAAE,OAAO,EAAE;gBACtD,iBAAiB,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE;aACjE,CAAC,CACH,CAAC;QACJ,MAAM,GAAG,cAAc,CACrB,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,MAAM,EACb,KAAK,EACL,MAAM,CAAC,IAAI,CACZ,CAAC;IACJ,CAAC;IACD,MAAM,kBAAkB,GAEpB,KAAK,CAAC,MAAM,CAAC,KAAK,CAGnB,CAAC,SAAS,EAAE,kBAAkB,IAAI,YAAY,CAAC;IAClD,MAAM,IAAI,GACR,OAAO,CAAC,IAAI,KAAK,MAAM;QACrB,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS;YAC1B,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;IACrB,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAC7E,MAAM,KAAK,GAAG;QACZ,MAAM;QACN,GAAG,CAAC,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACjE,GAAG,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC;QAC9B,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAK,QAAQ,IAAI,OAAO,CAAC,cAAc,KAAK,SAAS;YACvE,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC;YAC1B,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;IACF,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC;QACzE,GAAG,CAAC,OAAO,CAAC,iBAAiB,KAAK,SAAS;YACzC,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,EAAE,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,EAAE,CAAC;QACrD,GAAG,CAAC,OAAO,CAAC,eAAe,KAAK,SAAS;YACvC,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC;QACjD,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI;QACJ,cAAc;QACd,GAAG,CAAC,OAAO,CAAC,eAAe,KAAK,SAAS;YACvC,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC;QACjD,oBAAoB,EAAE,QAAQ;QAC9B,iBAAiB,EAAE,cAAc;QACjC,8BAA8B;QAC9B,cAAc;QACd,aAAa,EAAE,CAAC,sBAAsB;YACpC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YACnB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;gBACZ,MAAM,CAAC,MAAM,CAAC;oBACZ,EAAE,EAAE,iBAA0B;oBAC9B,WAAW,EAAE,IAAI;oBACjB,aAAa,EAAE,cAAc;oBAC7B,UAAU,EAAE,sBAAsB;iBACnC,CAAC;aACH,CAAC;QACN,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC;YACzB,+IAA+I;YAC/I,wHAAwH;YACxH,iJAAiJ;YACjJ,wMAAwM;YACxM,GAAG,CAAC,cAAc,CAAC,MAAM,KAAK,SAAS;gBACvC,cAAc,CAAC,WAAW,KAAK,SAAS;gBACtC,CAAC,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC;gBAC9B,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,OAAO,CAAC,gBAAgB,EAAE,WAAW,IAAI,EAAE,CAAC;YAChD,GAAG,CAAC,WAAW,CAAC,MAAM,KAAK,SAAS;gBAClC,CAAC,CAAC,CAAC,yBAAyB,EAAE,GAAG,WAAW,CAAC,SAAS,CAAC;gBACvD,CAAC,CAAC,EAAE,CAAC;SACR,CAAC;QACF,kBAAkB;QAClB,YAAY,EAAE,WAAW,CAAC,MAAM;QAChC,eAAe,EAAE,WAAW,CAAC,SAAS;QACtC,qBAAqB,EAAE,WAAW,CAAC,QAAQ;QAC3C,uBAAuB,EAAE,WAAW,CAAC,KAAK;QAC1C,GAAG,CAAC,OAAO,CAAC,2BAA2B,KAAK,IAAI;YAC9C,CAAC,CAAC,EAAE,2BAA2B,EAAE,IAAI,EAAE;YACvC,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,OAAO,CAAC,8BAA8B,KAAK,IAAI;YACjD,CAAC,CAAC,EAAE,8BAA8B,EAAE,IAAI,EAAE;YAC1C,CAAC,CAAC,EAAE,CAAC;QACP,UAAU,EAAE,gBAAgB;QAC5B,GAAG,CAAC,OAAO,CAAC,eAAe,KAAK,SAAS;YACvC,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC;gBACE,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,oBAAoB,EAAE,OAAO,CAAC,oBAAoB,IAAI,EAAE;aACzD,CAAC;QACN,GAAG,CAAC,OAAO,CAAC,gBAAgB,KAAK,SAAS;YACxC,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,EAAE,CAAC;QACnD,GAAG,CAAC,OAAO,CAAC,mBAAmB,KAAK,SAAS;YAC3C,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC;gBACE,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAChC,OAAO,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACxC,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,CAC5B,CACF;aACF,CAAC;QACN,GAAG,CAAC,gBAAgB,KAAK,SAAS;YAClC,OAAO,CAAC,yBAAyB,KAAK,SAAS;YAC/C,OAAO,CAAC,yBAAyB,CAAC,MAAM,GAAG,CAAC;YAC1C,CAAC,CAAC,EAAE,yBAAyB,EAAE,OAAO,CAAC,yBAAyB,EAAE;YAClE,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,gBAAgB,KAAK,SAAS;YAClC,OAAO,CAAC,yBAAyB,KAAK,SAAS;YAC/C,OAAO,CAAC,yBAAyB,CAAC,MAAM,GAAG,CAAC;YAC5C,OAAO,CAAC,6BAA6B,KAAK,IAAI;YAC5C,CAAC,CAAC,EAAE,6BAA6B,EAAE,IAAI,EAAE;YACzC,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,CAAC,gBAAgB,KAAK,SAAS,IAAI,gBAAgB,KAAK,KAAK,CAAC;YAClE,OAAO,CAAC,0BAA0B,KAAK,SAAS;YAChD,OAAO,CAAC,0BAA0B,CAAC,MAAM,GAAG,CAAC;YAC3C,CAAC,CAAC,EAAE,0BAA0B,EAAE,OAAO,CAAC,0BAA0B,EAAE;YACpE,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,OAAO,CAAC,0BAA0B,KAAK,SAAS;YAClD,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC;gBACE,0BAA0B,EAAE,MAAM,CAAC,MAAM,CAAC;oBACxC,GAAG,OAAO,CAAC,0BAA0B;iBACtC,CAAC;aACH,CAAC;QACN,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;KAC5B,CAAC,CAAC;AACL,CAAC"}
|
|
1
|
+
{"version":3,"file":"recommend.js","sourceRoot":"","sources":["../../src/init/recommend.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"write-config.d.ts","sourceRoot":"","sources":["../../src/init/write-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"write-config.d.ts","sourceRoot":"","sources":["../../src/init/write-config.ts"],"names":[],"mappings":"AAsCA,OAAO,KAAK,EACV,qBAAqB,EACrB,WAAW,EAEX,YAAY,EACb,MAAM,YAAY,CAAC;AA0MpB,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,YAAY,EACtB,YAAY,GAAE,qBAA0B,GACvC,OAAO,CAAC,WAAW,CAAC,CAgKtB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { resolveRawGitHookPath } from "../hooks/raw-hook-path.js";
|
|
1
2
|
import { hasProjectEslintTrust, persistProjectEslintTrust, revokeProjectEslintCapability, } from "../checks/eslint/project/trust.js";
|
|
2
3
|
import { ProjectEslintSetupError } from "./eslint-setup.js";
|
|
3
4
|
import { randomUUID } from "node:crypto";
|
|
@@ -94,32 +95,9 @@ async function validatedRawGitPath(root, change) {
|
|
|
94
95
|
!isAbsolute(change.absolutePath)) {
|
|
95
96
|
throw unsafeTarget();
|
|
96
97
|
}
|
|
97
|
-
const
|
|
98
|
-
|
|
99
|
-
git.run(["rev-parse", "--git-path", `hooks/${hookName}`]),
|
|
100
|
-
git.run(["rev-parse", "--git-common-dir"]),
|
|
101
|
-
]);
|
|
102
|
-
const hook = isAbsolute(hookOutput.stdout)
|
|
103
|
-
? resolve(hookOutput.stdout)
|
|
104
|
-
: resolve(root, hookOutput.stdout);
|
|
105
|
-
const common = isAbsolute(commonOutput.stdout)
|
|
106
|
-
? resolve(commonOutput.stdout)
|
|
107
|
-
: resolve(root, commonOutput.stdout);
|
|
108
|
-
const commonState = await lstat(common);
|
|
109
|
-
if (commonState.isSymbolicLink() || !commonState.isDirectory()) {
|
|
110
|
-
throw unsafeTarget();
|
|
111
|
-
}
|
|
112
|
-
const canonicalCommon = await realpath(common);
|
|
113
|
-
const hooksDirectory = resolve(canonicalCommon, "hooks");
|
|
114
|
-
const hooksState = await lstat(hooksDirectory);
|
|
115
|
-
if (hooksState.isSymbolicLink() || !hooksState.isDirectory()) {
|
|
98
|
+
const canonicalHook = await resolveRawGitHookPath(root, hookName, true);
|
|
99
|
+
if (canonicalHook !== change.absolutePath)
|
|
116
100
|
throw unsafeTarget();
|
|
117
|
-
}
|
|
118
|
-
const canonicalHook = resolve(await realpath(dirname(hook)), basename(hook));
|
|
119
|
-
if (canonicalHook !== resolve(hooksDirectory, hookName) ||
|
|
120
|
-
canonicalHook !== change.absolutePath) {
|
|
121
|
-
throw unsafeTarget();
|
|
122
|
-
}
|
|
123
101
|
return canonicalHook;
|
|
124
102
|
}
|
|
125
103
|
async function validateChange(root, change) {
|
|
@@ -240,6 +218,7 @@ export async function applyInitProposal(proposal, dependencies = {}) {
|
|
|
240
218
|
paths.add(state.path);
|
|
241
219
|
validated.push({ change, ...state });
|
|
242
220
|
}
|
|
221
|
+
const updatedFiles = [];
|
|
243
222
|
const applied = [];
|
|
244
223
|
const eslintGrants = [];
|
|
245
224
|
const trustSnapshots = [];
|
|
@@ -254,7 +233,11 @@ export async function applyInitProposal(proposal, dependencies = {}) {
|
|
|
254
233
|
const mode = item.change.relativePath.startsWith(".husky/_/")
|
|
255
234
|
? item.change.mode
|
|
256
235
|
: refreshed.mode;
|
|
236
|
+
if (item.change.relativePath === ".zedbeerc.jsonc" &&
|
|
237
|
+
refreshed.before === item.change.after)
|
|
238
|
+
continue;
|
|
257
239
|
await atomicReplace(item.path, item.change.after, mode);
|
|
240
|
+
updatedFiles.push(item.change.relativePath);
|
|
258
241
|
applied.push({ path: item.path, before: item.before, mode: item.mode });
|
|
259
242
|
}
|
|
260
243
|
if (proposal.hooksPathChange !== undefined) {
|
|
@@ -317,7 +300,7 @@ export async function applyInitProposal(proposal, dependencies = {}) {
|
|
|
317
300
|
}
|
|
318
301
|
return Object.freeze({
|
|
319
302
|
applied: true,
|
|
320
|
-
files: Object.freeze(
|
|
303
|
+
files: Object.freeze(updatedFiles),
|
|
321
304
|
rolledBack: false,
|
|
322
305
|
});
|
|
323
306
|
}
|