@smoothbricks/nx-plugin 0.4.26 → 0.4.28
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 +994 -117
- package/dist/bin/smoo-nx-bound-failures.d.ts +3 -0
- package/dist/bin/smoo-nx-bound-failures.d.ts.map +1 -0
- package/dist/bin/smoo-nx-bound-failures.js +31 -0
- package/dist/bin/smoo-nx-cargo-hash.js +28 -3
- package/dist/bin/smoo-nx-exec.js +15 -73
- package/dist/bin/smoo-nx-failures.d.ts +3 -0
- package/dist/bin/smoo-nx-failures.d.ts.map +1 -0
- package/dist/bin/smoo-nx-failures.js +3 -0
- package/dist/bin/smoo-nx-nextest-extract.js +3 -2
- package/dist/bin/smoo-nx-test-walks.d.ts +3 -0
- package/dist/bin/smoo-nx-test-walks.d.ts.map +1 -0
- package/dist/bin/smoo-nx-test-walks.js +34 -0
- package/dist/bounded-test-policy.d.ts +7 -1
- package/dist/bounded-test-policy.d.ts.map +1 -1
- package/dist/bounded-test-policy.js +101 -40
- package/dist/build-state-output-policy.d.ts +25 -0
- package/dist/build-state-output-policy.d.ts.map +1 -0
- package/dist/build-state-output-policy.js +64 -0
- package/dist/cargo-closure-input.d.ts +3 -2
- package/dist/cargo-closure-input.d.ts.map +1 -1
- package/dist/cargo-closure-input.js +16 -15
- package/dist/cargo-dev-profile.d.ts +37 -0
- package/dist/cargo-dev-profile.d.ts.map +1 -0
- package/dist/cargo-dev-profile.js +108 -0
- package/dist/cargo-source-hash.d.ts +43 -6
- package/dist/cargo-source-hash.d.ts.map +1 -1
- package/dist/cargo-source-hash.js +309 -73
- package/dist/cargo-toolchain-policy.d.ts +4 -0
- package/dist/cargo-toolchain-policy.d.ts.map +1 -1
- package/dist/cargo-toolchain-policy.js +5 -0
- package/dist/cargo-workspace.d.ts +101 -5
- package/dist/cargo-workspace.d.ts.map +1 -1
- package/dist/cargo-workspace.js +291 -10
- package/dist/cross-check-policy.d.ts +21 -3
- package/dist/cross-check-policy.d.ts.map +1 -1
- package/dist/cross-check-policy.js +24 -6
- package/dist/disk-command-policy.d.ts +7 -0
- package/dist/disk-command-policy.d.ts.map +1 -0
- package/dist/disk-command-policy.js +98 -0
- package/dist/ensure-built-receipt.d.ts +25 -0
- package/dist/ensure-built-receipt.d.ts.map +1 -0
- package/dist/ensure-built-receipt.js +261 -0
- package/dist/ensure-built-witness.d.ts +57 -0
- package/dist/ensure-built-witness.d.ts.map +1 -0
- package/dist/ensure-built-witness.js +412 -0
- package/dist/ensure-built.d.ts +207 -12
- package/dist/ensure-built.d.ts.map +1 -1
- package/dist/ensure-built.js +576 -202
- package/dist/eslint-file-set.d.ts +7 -0
- package/dist/eslint-file-set.d.ts.map +1 -0
- package/dist/eslint-file-set.js +12 -0
- package/dist/executors/bounded-exec/cpu-pool.d.ts +63 -0
- package/dist/executors/bounded-exec/cpu-pool.d.ts.map +1 -0
- package/dist/executors/bounded-exec/cpu-pool.js +379 -0
- package/dist/executors/bounded-exec/cpu-tokens.d.ts +82 -0
- package/dist/executors/bounded-exec/cpu-tokens.d.ts.map +1 -0
- package/dist/executors/bounded-exec/cpu-tokens.js +114 -0
- package/dist/executors/bounded-exec/disk-lease.d.ts +61 -0
- package/dist/executors/bounded-exec/disk-lease.d.ts.map +1 -0
- package/dist/executors/bounded-exec/disk-lease.js +91 -0
- package/dist/executors/bounded-exec/executor.d.ts +45 -2
- package/dist/executors/bounded-exec/executor.d.ts.map +1 -1
- package/dist/executors/bounded-exec/executor.js +447 -52
- package/dist/executors/bounded-exec/gateway-lease.d.ts +52 -0
- package/dist/executors/bounded-exec/gateway-lease.d.ts.map +1 -0
- package/dist/executors/bounded-exec/gateway-lease.js +143 -0
- package/dist/executors/bounded-exec/hang-diagnostics.d.ts +35 -0
- package/dist/executors/bounded-exec/hang-diagnostics.d.ts.map +1 -0
- package/dist/executors/bounded-exec/hang-diagnostics.js +231 -0
- package/dist/executors/bounded-exec/progress.d.ts +35 -0
- package/dist/executors/bounded-exec/progress.d.ts.map +1 -0
- package/dist/executors/bounded-exec/progress.js +79 -0
- package/dist/executors/bounded-exec/ram-temp-fixtures.d.ts +3 -0
- package/dist/executors/bounded-exec/ram-temp-fixtures.d.ts.map +1 -0
- package/dist/executors/bounded-exec/ram-temp-fixtures.js +12 -0
- package/dist/executors/bounded-exec/ram-temp-held.d.ts +91 -0
- package/dist/executors/bounded-exec/ram-temp-held.d.ts.map +1 -0
- package/dist/executors/bounded-exec/ram-temp-held.js +152 -0
- package/dist/executors/bounded-exec/ram-temp.d.ts +223 -0
- package/dist/executors/bounded-exec/ram-temp.d.ts.map +1 -0
- package/dist/executors/bounded-exec/ram-temp.js +1528 -0
- package/dist/executors/bounded-exec/schema.d.ts +29 -11
- package/dist/executors/bounded-exec/schema.d.ts.map +1 -1
- package/dist/executors/bounded-exec/verdict.d.ts +162 -0
- package/dist/executors/bounded-exec/verdict.d.ts.map +1 -0
- package/dist/executors/bounded-exec/verdict.js +318 -0
- package/dist/executors/shard-timings/executor.d.ts +14 -0
- package/dist/executors/shard-timings/executor.d.ts.map +1 -0
- package/dist/executors/shard-timings/executor.js +25 -0
- package/dist/executors/shard-timings/schema.d.ts +4 -0
- package/dist/executors/shard-timings/schema.d.ts.map +1 -0
- package/dist/executors/shard-timings/schema.js +1 -0
- package/dist/failure-summary.d.ts +5 -0
- package/dist/failure-summary.d.ts.map +1 -0
- package/dist/failure-summary.js +118 -0
- package/dist/generators/create-package/generator.d.ts.map +1 -1
- package/dist/generators/create-package/generator.js +6 -2
- package/dist/index.d.ts +14 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +370 -138
- package/dist/managed-files/ci-workflow.d.ts +13 -0
- package/dist/managed-files/ci-workflow.d.ts.map +1 -1
- package/dist/managed-files/ci-workflow.js +44 -13
- package/dist/managed-files/files.d.ts +7 -1
- package/dist/managed-files/files.d.ts.map +1 -1
- package/dist/managed-files/files.js +62 -8
- package/dist/managed-files/json-edit.d.ts +21 -0
- package/dist/managed-files/json-edit.d.ts.map +1 -0
- package/dist/managed-files/json-edit.js +295 -0
- package/dist/managed-files/managed-format.d.ts +33 -1
- package/dist/managed-files/managed-format.d.ts.map +1 -1
- package/dist/managed-files/managed-format.js +82 -2
- package/dist/managed-files/pr-preview-cleanup-workflow.d.ts +7 -0
- package/dist/managed-files/pr-preview-cleanup-workflow.d.ts.map +1 -1
- package/dist/managed-files/pr-preview-cleanup-workflow.js +68 -4
- package/dist/managed-files/publish-workflow.d.ts.map +1 -1
- package/dist/managed-files/publish-workflow.js +231 -48
- package/dist/managed-files/tree.d.ts +5 -0
- package/dist/managed-files/tree.d.ts.map +1 -1
- package/dist/managed-files/tree.js +5 -3
- package/dist/manifest-hash.d.ts.map +1 -1
- package/dist/manifest-hash.js +2 -5
- package/dist/nextest-code-bound.d.ts +62 -0
- package/dist/nextest-code-bound.d.ts.map +1 -0
- package/dist/nextest-code-bound.js +154 -0
- package/dist/nextest-extraction.d.ts +24 -8
- package/dist/nextest-extraction.d.ts.map +1 -1
- package/dist/nextest-extraction.js +42 -7
- package/dist/package-target-policy.d.ts.map +1 -1
- package/dist/package-target-policy.js +3 -5
- package/dist/release-config-policy.d.ts.map +1 -1
- package/dist/release-config-policy.js +3 -5
- package/dist/runtime-input.d.ts +14 -0
- package/dist/runtime-input.d.ts.map +1 -0
- package/dist/runtime-input.js +15 -0
- package/dist/rust-tokens.d.ts +11 -0
- package/dist/rust-tokens.d.ts.map +1 -0
- package/dist/rust-tokens.js +81 -0
- package/dist/task-results.d.ts +6 -0
- package/dist/task-results.d.ts.map +1 -0
- package/dist/task-results.js +61 -0
- package/dist/test-program.d.ts +54 -0
- package/dist/test-program.d.ts.map +1 -0
- package/dist/test-program.js +292 -0
- package/dist/test-timings.d.ts +71 -0
- package/dist/test-timings.d.ts.map +1 -0
- package/dist/test-timings.js +393 -0
- package/dist/test-walk-policy.d.ts +103 -0
- package/dist/test-walk-policy.d.ts.map +1 -0
- package/dist/test-walk-policy.js +657 -0
- package/dist/testing.d.ts +177 -0
- package/dist/testing.d.ts.map +1 -0
- package/dist/testing.js +824 -0
- package/dist/type-guards.d.ts +3 -0
- package/dist/type-guards.d.ts.map +1 -0
- package/dist/type-guards.js +4 -0
- package/dist/typecheck-test-policy.d.ts +8 -5
- package/dist/typecheck-test-policy.d.ts.map +1 -1
- package/dist/typecheck-test-policy.js +113 -100
- package/dist/workspace-config-policy.d.ts +8 -0
- package/dist/workspace-config-policy.d.ts.map +1 -1
- package/dist/workspace-config-policy.js +175 -63
- package/dist/workspace-index.d.ts +12 -0
- package/dist/workspace-index.d.ts.map +1 -0
- package/dist/workspace-index.js +17 -0
- package/dist/workspace-manifest.d.ts +37 -0
- package/dist/workspace-manifest.d.ts.map +1 -1
- package/executors.json +5 -0
- package/loader.js +13 -11
- package/managed/raw/envrc +33 -67
- package/managed/raw/git-format-staged.yml +30 -35
- package/managed/raw/patches/nx@23.2.1.patch +3484 -0
- package/managed/raw/tooling/direnv/apple-developer.sh +83 -0
- package/managed/raw/tooling/direnv/developer-links.ts +569 -11
- package/managed/raw/tooling/direnv/devenv.smoo.nix +314 -93
- package/managed/raw/tooling/direnv/github-actions-bootstrap.sh +20 -11
- package/managed/raw/tooling/direnv/linked-snapshots.ts +845 -0
- package/managed/raw/tooling/direnv/nx-socket-dir.sh +82 -0
- package/managed/raw/tooling/direnv/repo-path +14 -2
- package/managed/raw/tooling/direnv/setup-environment.ts +1146 -159
- package/managed/raw/tooling/direnv/toolchain-stamp.ts +45 -3
- package/managed/raw/tooling/direnv/ttsc-env.sh +39 -0
- package/managed/raw/tooling/git-hooks/commit-msg.sh +5 -6
- package/managed/raw/tooling/git-hooks/pre-commit.sh +7 -6
- package/managed/raw/tooling/git-hooks/pre-push.sh +20 -15
- package/managed/templates/github/actions/cache-nix-devenv/action.yml +6 -6
- package/managed/templates/github/actions/cache-node-modules/action.yml +6 -4
- package/managed/templates/github/actions/cache-nx/action.yml +1 -1
- package/managed/templates/github/actions/cache-ttsc-plugins/action.yml +1 -1
- package/managed/templates/github/actions/forgejo-artifact.cjs +99 -0
- package/managed/templates/github/actions/forgejo-download-artifact/action.yml +49 -0
- package/managed/templates/github/actions/forgejo-download-artifact/index.cjs +7 -0
- package/managed/templates/github/actions/forgejo-upload-artifact/action.yml +65 -0
- package/managed/templates/github/actions/forgejo-upload-artifact/index.cjs +7 -0
- package/managed/templates/github/actions/setup-devenv/action.yml +21 -3
- package/managed/templates/github/workflows/managed-files.yml +1 -2
- package/nextest.toml +8 -41
- package/package.json +74 -12
- package/runtime-input.sh +81 -0
- package/src/__tests__/counted-cargo.ts +33 -14
- package/src/__tests__/fixture-nx-env.ts +111 -46
- package/src/__tests__/progress-clock.ts +43 -0
- package/src/__tests__/runtime-input.ts +23 -0
- package/src/bin/smoo-nx-bound-failures.test.ts +127 -0
- package/src/bin/smoo-nx-bound-failures.ts +33 -0
- package/src/bin/smoo-nx-cargo-hash.ts +28 -3
- package/src/bin/smoo-nx-exec.ts +16 -74
- package/src/bin/smoo-nx-failures.ts +4 -0
- package/src/bin/smoo-nx-nextest-extract.ts +3 -2
- package/src/bin/smoo-nx-test-walks.ts +42 -0
- package/src/bounded-test-policy.test.ts +268 -21
- package/src/bounded-test-policy.ts +114 -42
- package/src/build-state-output-policy.test.ts +115 -0
- package/src/build-state-output-policy.ts +90 -0
- package/src/bun-bootstrap.test.ts +57 -3
- package/src/bun-file-packages.test.ts +47 -0
- package/src/cargo-closure-input.test.ts +138 -66
- package/src/cargo-closure-input.ts +17 -15
- package/src/cargo-dev-profile.ts +137 -0
- package/src/cargo-resolve-cache.test.ts +70 -1
- package/src/cargo-source-hash.test.ts +193 -97
- package/src/cargo-source-hash.ts +345 -68
- package/src/cargo-toolchain-policy.ts +6 -0
- package/src/cargo-workspace.test.ts +320 -0
- package/src/cargo-workspace.ts +336 -10
- package/src/cross-check-policy.test.ts +59 -1
- package/src/cross-check-policy.ts +25 -6
- package/src/disk-command-policy.test.ts +61 -0
- package/src/disk-command-policy.ts +107 -0
- package/src/ensure-built-receipt.test.ts +184 -0
- package/src/ensure-built-receipt.ts +263 -0
- package/src/ensure-built-witness.test.ts +344 -0
- package/src/ensure-built-witness.ts +252 -0
- package/src/ensure-built.test.ts +1036 -578
- package/src/ensure-built.ts +820 -224
- package/src/eslint-file-set.ts +9 -0
- package/src/executors/bounded-exec/cpu-pool.test.ts +454 -0
- package/src/executors/bounded-exec/cpu-pool.ts +417 -0
- package/src/executors/bounded-exec/cpu-tokens.test.ts +269 -0
- package/src/executors/bounded-exec/cpu-tokens.ts +177 -0
- package/src/executors/bounded-exec/disk-lease.test.ts +185 -0
- package/src/executors/bounded-exec/disk-lease.ts +139 -0
- package/src/executors/bounded-exec/executor-host.test.ts +778 -0
- package/src/executors/bounded-exec/executor.test.ts +1116 -63
- package/src/executors/bounded-exec/executor.ts +565 -67
- package/src/executors/bounded-exec/gateway-lease.ts +176 -0
- package/src/executors/bounded-exec/hang-diagnostics.test.ts +285 -0
- package/src/executors/bounded-exec/hang-diagnostics.ts +283 -0
- package/src/executors/bounded-exec/progress.test.ts +79 -0
- package/src/executors/bounded-exec/progress.ts +118 -0
- package/src/executors/bounded-exec/ram-temp-fixtures.ts +12 -0
- package/src/executors/bounded-exec/ram-temp-held.test.ts +264 -0
- package/src/executors/bounded-exec/ram-temp-held.ts +242 -0
- package/src/executors/bounded-exec/ram-temp-host.test.ts +605 -0
- package/src/executors/bounded-exec/ram-temp.test.ts +674 -0
- package/src/executors/bounded-exec/ram-temp.ts +1918 -0
- package/src/executors/bounded-exec/schema.json +11 -5
- package/src/executors/bounded-exec/schema.ts +27 -11
- package/src/executors/bounded-exec/verdict.test.ts +440 -0
- package/src/executors/bounded-exec/verdict.ts +433 -0
- package/src/executors/shard-timings/executor.ts +36 -0
- package/src/executors/shard-timings/schema.json +21 -0
- package/src/executors/shard-timings/schema.ts +4 -0
- package/src/failure-summary.ts +119 -0
- package/src/generators/bounded-test-targets/generator.test.ts +4 -4
- package/src/generators/bun-test-tracing/generator.test.ts +2 -2
- package/src/generators/create-package/generator.test.ts +6 -0
- package/src/generators/create-package/generator.ts +6 -2
- package/src/host-controller-wiring.test.ts +31 -0
- package/src/index.test.ts +909 -295
- package/src/index.ts +441 -143
- package/src/linked-snapshots.nx.test.ts +172 -0
- package/src/managed-files/ci-workflow.ts +54 -13
- package/src/managed-files/files.ts +65 -9
- package/src/managed-files/forgejo-artifact.test.ts +395 -0
- package/src/managed-files/generator.test.ts +60 -1
- package/src/managed-files/json-edit.test.ts +216 -0
- package/src/managed-files/json-edit.ts +290 -0
- package/src/managed-files/managed-format-json.test.ts +308 -0
- package/src/managed-files/managed-format.ts +90 -2
- package/src/managed-files/pr-preview-cleanup-workflow.ts +69 -3
- package/src/managed-files/publish-workflow.ts +285 -67
- package/src/managed-files/repo-path.test.ts +129 -0
- package/src/managed-files/trace-db-artifact.test.ts +7 -0
- package/src/managed-files/tree.ts +11 -3
- package/src/manifest-hash.ts +2 -6
- package/src/nextest-code-bound.test.ts +155 -0
- package/src/nextest-code-bound.ts +195 -0
- package/src/nextest-extraction.test.ts +37 -5
- package/src/nextest-extraction.ts +51 -9
- package/src/nextest-partitions.test.ts +427 -82
- package/src/nx-cache-bound.test.ts +5 -10
- package/src/nx-cache-restore-mtime.test.ts +170 -0
- package/src/nx-daemon-claim.test.ts +277 -0
- package/src/nx-daemon-idle-cpu.test.ts +81 -0
- package/src/nx-daemon-idle-policy.test.ts +51 -0
- package/src/nx-daemon-ignore-files.test.ts +210 -0
- package/src/nx-daemon-root-normalization.test.ts +105 -0
- package/src/nx-daemon-validity.test.ts +925 -0
- package/src/nx-dot-input-policy.test.ts +353 -0
- package/src/nx-failure-life-cycles.test.ts +207 -0
- package/src/nx-files-archive-racy.test.ts +97 -0
- package/src/nx-foreign-workspace-env.test.ts +329 -0
- package/src/nx-incomplete-run-summary.test.ts +70 -0
- package/src/nx-plugin-load-errors.test.ts +120 -0
- package/src/nx-project-resolution-cache.test.ts +176 -0
- package/src/nx-raw-inputs.test.ts +166 -0
- package/src/nx-resident-graph-workers.test.ts +7 -16
- package/src/nx-run-information.test.ts +118 -0
- package/src/nx-skipped-task-exit.test.ts +180 -0
- package/src/nx-state-location.test.ts +63 -0
- package/src/nx-store-resolution.test.ts +26 -25
- package/src/nx-task-graph-cycles.test.ts +148 -0
- package/src/nx-task-output-lease.test.ts +414 -0
- package/src/nx-use-local.test.ts +103 -0
- package/src/package-target-policy.ts +3 -6
- package/src/release-config-policy.ts +3 -6
- package/src/runtime-input.test.ts +215 -0
- package/src/runtime-input.ts +17 -0
- package/src/rust-tokens.ts +78 -0
- package/src/serial-group-wiring.test.ts +326 -0
- package/src/task-history-namespace.test.ts +87 -89
- package/src/task-results.test.ts +226 -0
- package/src/task-results.ts +75 -0
- package/src/test-program.test.ts +303 -0
- package/src/test-program.ts +341 -0
- package/src/test-timings.test.ts +240 -0
- package/src/test-timings.ts +311 -0
- package/src/test-walk-policy.test.ts +585 -0
- package/src/test-walk-policy.ts +731 -0
- package/src/testing.test.ts +509 -0
- package/src/testing.ts +922 -0
- package/src/type-guards.ts +4 -0
- package/src/typecheck-test-policy.test.ts +496 -11
- package/src/typecheck-test-policy.ts +137 -103
- package/src/workspace-config-policy.test.ts +212 -13
- package/src/workspace-config-policy.ts +101 -73
- package/src/workspace-index.ts +18 -0
- package/src/workspace-manifest.ts +41 -0
- package/test-timings.json +85 -30
- package/managed/raw/tooling/direnv/inherited-devenv.ts +0 -665
- package/managed/raw/tooling/direnv/shared-caches.sh +0 -53
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
import { GATEWAY_SOCKET, holdLease } from './gateway-lease.js';
|
|
2
|
+
import { BUN_TEST, NEXTEST_RUN } from './verdict.js';
|
|
3
|
+
/** Every budgeted command learns its grant here, so a script that starts a runner can size it. */
|
|
4
|
+
export const CPU_TOKENS_ENV = 'BOUNDED_EXEC_CPU_TOKENS';
|
|
5
|
+
const CARGO_BUILD = /(?<=^|[\s;&|()])(?:cargo(?:\s+-\S+)*\s+(?:build|test|check|clippy|rustc|doc|run|nextest\s+archive)|napi\s+build)(?=\s|$)/;
|
|
6
|
+
const TEST_THREADS = /--test-threads(?:=|\s+)(\d+)/g;
|
|
7
|
+
const BUN_PARALLEL = /--parallel(?:=(\d+))?(?=\s|$)/g;
|
|
8
|
+
const INHERITED_COUNT = /^[1-9]\d*$/;
|
|
9
|
+
/**
|
|
10
|
+
* What `command` asks for: its kind by invocation, and `declared` (the target's `parallelism`)
|
|
11
|
+
* when it says, else the count the command names (`--test-threads=N`, `--parallel=N`), else the
|
|
12
|
+
* runner's own default — one thread per core for nextest, a bare `--parallel` and cargo, one
|
|
13
|
+
* process for anything else. Positive inherited runner counts are ceilings; configured counts may only lower them.
|
|
14
|
+
*/
|
|
15
|
+
export function runnerDemand(command, declared, cores, inherited, configured) {
|
|
16
|
+
const kind = command.search(NEXTEST_RUN) !== -1
|
|
17
|
+
? 'nextest'
|
|
18
|
+
: command.search(BUN_TEST) !== -1 && command.search(BUN_PARALLEL) !== -1
|
|
19
|
+
? 'bun-parallel'
|
|
20
|
+
: command.search(CARGO_BUILD) !== -1
|
|
21
|
+
? 'cargo'
|
|
22
|
+
: 'process';
|
|
23
|
+
const counted = kind === 'nextest' ? TEST_THREADS : kind === 'bun-parallel' ? BUN_PARALLEL : null;
|
|
24
|
+
const named = counted === null
|
|
25
|
+
? []
|
|
26
|
+
: [...command.matchAll(counted)].flatMap((match) => (match[1] === undefined ? [] : [Number(match[1])]));
|
|
27
|
+
const requested = declared ?? (named.length > 0 ? Math.max(...named) : kind === 'process' ? 1 : cores);
|
|
28
|
+
const ceiling = kind === 'nextest'
|
|
29
|
+
? inheritedCeiling(inherited.NEXTEST_TEST_THREADS, configured?.NEXTEST_TEST_THREADS)
|
|
30
|
+
: kind === 'cargo'
|
|
31
|
+
? inheritedCeiling(inherited.CARGO_BUILD_JOBS, configured?.CARGO_BUILD_JOBS)
|
|
32
|
+
: null;
|
|
33
|
+
const want = Math.max(1, Math.min(requested, ceiling ?? requested));
|
|
34
|
+
return kind === 'cargo'
|
|
35
|
+
? { kind, want, testThreads: inheritedCeiling(inherited.RUST_TEST_THREADS, configured?.RUST_TEST_THREADS) }
|
|
36
|
+
: { kind, want };
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Size the runner to the lesser of its bounded demand and grant, retaining Cargo's test-thread ceiling.
|
|
40
|
+
* Rewrite named flags so they cannot outrank that ceiling. `CPU_TOKENS_ENV` still reports the actual held grant.
|
|
41
|
+
*/
|
|
42
|
+
export function sizeRunner(demand, command, tokens) {
|
|
43
|
+
const runnerCount = Math.min(tokens, demand.want);
|
|
44
|
+
const count = String(runnerCount);
|
|
45
|
+
const held = String(tokens);
|
|
46
|
+
switch (demand.kind) {
|
|
47
|
+
case 'nextest':
|
|
48
|
+
return {
|
|
49
|
+
command: command.replace(TEST_THREADS, `--test-threads=${count}`),
|
|
50
|
+
env: { [CPU_TOKENS_ENV]: held, NEXTEST_TEST_THREADS: count },
|
|
51
|
+
};
|
|
52
|
+
case 'bun-parallel':
|
|
53
|
+
return { command: command.replace(BUN_PARALLEL, `--parallel=${count}`), env: { [CPU_TOKENS_ENV]: held } };
|
|
54
|
+
case 'cargo':
|
|
55
|
+
return {
|
|
56
|
+
command,
|
|
57
|
+
env: {
|
|
58
|
+
[CPU_TOKENS_ENV]: held,
|
|
59
|
+
CARGO_BUILD_JOBS: count,
|
|
60
|
+
RUST_TEST_THREADS: String(Math.min(runnerCount, demand.testThreads ?? runnerCount)),
|
|
61
|
+
},
|
|
62
|
+
};
|
|
63
|
+
case 'process':
|
|
64
|
+
return { command, env: { [CPU_TOKENS_ENV]: held } };
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
/** A configured value may lower an inherited ceiling, never raise it. */
|
|
68
|
+
function inheritedCeiling(inherited, configured) {
|
|
69
|
+
const left = parseInheritedTokens(inherited);
|
|
70
|
+
const right = parseInheritedTokens(configured);
|
|
71
|
+
return left === null ? right : right === null ? left : Math.min(left, right);
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* The count `CPU_TOKENS_ENV` names, as a positive safe integer, or `null` when absent or malformed. It is
|
|
75
|
+
* descriptor input only: a count proves nothing about a live pool and grants nothing. A missing or malformed
|
|
76
|
+
* descriptor follows normal host admission; a valid one still needs a grant from its endpoint. Connection
|
|
77
|
+
* absence follows the host path, while a connected parent's refusal fails admission to avoid hold-and-wait.
|
|
78
|
+
*/
|
|
79
|
+
export function parseInheritedTokens(value) {
|
|
80
|
+
if (value === undefined || !INHERITED_COUNT.test(value)) {
|
|
81
|
+
return null;
|
|
82
|
+
}
|
|
83
|
+
const tokens = Number(value);
|
|
84
|
+
return Number.isSafeInteger(tokens) ? tokens : null;
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* The gateway at `socket`'s budget. A grant has no deadline: the wait is how the budget works, and
|
|
88
|
+
* the gateway answers `queued` at once, so a client knows it is alive. `checkout` is the Nx
|
|
89
|
+
* workspace root: the gateway shares tokens fairly between checkouts.
|
|
90
|
+
*/
|
|
91
|
+
export function gatewayCpuBudget(socket = GATEWAY_SOCKET) {
|
|
92
|
+
return {
|
|
93
|
+
async take(want, checkout, command) {
|
|
94
|
+
const lease = await holdLease(socket, { op: 'cpu-tokens', want, checkout, command }, 'the CPU budget', {
|
|
95
|
+
ackMs: 2_000,
|
|
96
|
+
afterCloseMs: 5_000,
|
|
97
|
+
grantMs: null,
|
|
98
|
+
});
|
|
99
|
+
if (!lease.granted) {
|
|
100
|
+
return lease;
|
|
101
|
+
}
|
|
102
|
+
const tokens = lease.answer.tokens;
|
|
103
|
+
if (typeof tokens !== 'number' || !Number.isInteger(tokens) || tokens < 1 || tokens > want) {
|
|
104
|
+
lease.release();
|
|
105
|
+
return {
|
|
106
|
+
granted: false,
|
|
107
|
+
cause: 'other',
|
|
108
|
+
reason: `the gateway granted ${JSON.stringify(tokens)} tokens for ${want}`,
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
return { granted: true, tokens, release: lease.release, closed: lease.closed };
|
|
112
|
+
},
|
|
113
|
+
};
|
|
114
|
+
}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { type LeaseBounds, type UnleasedCause } from './gateway-lease.js';
|
|
2
|
+
/**
|
|
3
|
+
* The client half of cowshed's host disk-lifecycle lease (specs/cowshed/05_gateway.md,
|
|
4
|
+
* "Disk-lifecycle lease"), for the RAM temp volume's disk commands.
|
|
5
|
+
*
|
|
6
|
+
* An attach spends most of its time in StorageKit's `syncAllDisks`, which does not finish while
|
|
7
|
+
* the mount table keeps changing, so the cowshed gateway schedules every disk tool on the host in
|
|
8
|
+
* two classes that never overlap. This module's `hdiutil` and `diskutil` calls take the same
|
|
9
|
+
* lease cowshed's own do, when the gateway is there to ask. The lease spaces commands out; it
|
|
10
|
+
* never decides whether one runs: without a grant, the command runs unleased.
|
|
11
|
+
*/
|
|
12
|
+
export type DiskClass = 'storage' | 'namespace';
|
|
13
|
+
export declare function diskClassOf(file: string): DiskClass | null;
|
|
14
|
+
/**
|
|
15
|
+
* How much of its class's running phase a lease takes: one place beside the phase's other members, or the whole
|
|
16
|
+
* phase, so its command queues in `storagekitd` behind nobody (specs/cowshed/05_gateway.md, "Disk-lifecycle lease").
|
|
17
|
+
*/
|
|
18
|
+
export type PhaseShare = 'shared' | 'alone';
|
|
19
|
+
/** A granted lease, held until released, or why the command runs without one. */
|
|
20
|
+
export type LeaseOutcome = {
|
|
21
|
+
granted: true;
|
|
22
|
+
release: () => void;
|
|
23
|
+
} | {
|
|
24
|
+
granted: false;
|
|
25
|
+
cause: UnleasedCause;
|
|
26
|
+
reason: string;
|
|
27
|
+
};
|
|
28
|
+
/**
|
|
29
|
+
* Names the file every lease wait of a test's process tree is appended to; unset outside the real-APFS lane. The
|
|
30
|
+
* record exists so the real-APFS lane's wrapper can judge a test's code time without its lease waits
|
|
31
|
+
* (specs/cowshed/08_testing.md, "Integration tests (real substrate)").
|
|
32
|
+
*/
|
|
33
|
+
export declare const LEASE_WAIT_RECORD_ENV = "COWSHED_LEASE_WAIT_RECORD";
|
|
34
|
+
/**
|
|
35
|
+
* A process's lease-wait record. `begin` appends the wait's `start` line and returns the function that appends its
|
|
36
|
+
* `end` line once the wait is over.
|
|
37
|
+
*/
|
|
38
|
+
export interface WaitRecord {
|
|
39
|
+
begin(diskClass: DiskClass): () => void;
|
|
40
|
+
}
|
|
41
|
+
/** Wall-clock microseconds since the Unix epoch: the clock every lease-wait stamp is read from. */
|
|
42
|
+
export declare function unixMicros(): number;
|
|
43
|
+
/**
|
|
44
|
+
* The lease-wait record at `path`. A wait is two lines: `start <pid> <seq> <unix-µs> <class>` before the client asks,
|
|
45
|
+
* and `end <pid> <seq> <unix-µs>` once it is over, granted or not. `seq` counts this record's waits from 0. Each line is
|
|
46
|
+
* one append, so concurrent processes' lines never interleave. A record that cannot be written is said once per process
|
|
47
|
+
* and never fails a wait: its waits then count as the test's code time, which can only fail the bound.
|
|
48
|
+
*/
|
|
49
|
+
export declare function waitRecord(path: string): WaitRecord;
|
|
50
|
+
/**
|
|
51
|
+
* The share this process asks for: `alone` when its waits are recorded, so its test's code time holds no other
|
|
52
|
+
* process's disk work, and `shared` otherwise (specs/cowshed/08_testing.md, "Integration tests (real substrate)").
|
|
53
|
+
*/
|
|
54
|
+
export declare function recordedShare(): PhaseShare;
|
|
55
|
+
/**
|
|
56
|
+
* Ask the gateway at `socket` for `share` of a `diskClass` phase for `command` (`holdLease`). A shared request names no
|
|
57
|
+
* `share`, so every lease-scheduling gateway reads it. The wait is appended to this process's lease-wait record when
|
|
58
|
+
* the environment names one, and its end is appended however the ask ends.
|
|
59
|
+
*/
|
|
60
|
+
export declare function takeDiskLease(socket: string, diskClass: DiskClass, command: string, bounds: LeaseBounds, share: PhaseShare): Promise<LeaseOutcome>;
|
|
61
|
+
//# sourceMappingURL=disk-lease.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"disk-lease.d.ts","sourceRoot":"","sources":["../../../src/executors/bounded-exec/disk-lease.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,KAAK,WAAW,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAErF;;;;;;;;;GASG;AAEH,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,WAAW,CAAC;AAehD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAE1D;AAED;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE5C,iFAAiF;AACjF,MAAM,MAAM,YAAY,GACpB;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,GACtC;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7D;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,8BAA8B,CAAC;AAEjE;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,SAAS,EAAE,SAAS,GAAG,MAAM,IAAI,CAAC;CACzC;AAED,mGAAmG;AACnG,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAwBnD;AAaD;;;GAGG;AACH,wBAAgB,aAAa,IAAI,UAAU,CAE1C;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,YAAY,CAAC,CAYvB"}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import { appendFileSync } from 'node:fs';
|
|
2
|
+
import { holdLease } from './gateway-lease.js';
|
|
3
|
+
/**
|
|
4
|
+
* The class each disk tool draws on, by absolute path. `hdiutil`, `newfs_apfs`, and `diskutil`
|
|
5
|
+
* change the set of disks through `storagekitd`. `mount_apfs` and `umount` change the mount
|
|
6
|
+
* table. Every other program takes no lease (specs/cowshed/05_gateway.md, "Disk-lifecycle lease").
|
|
7
|
+
*/
|
|
8
|
+
const CLASS_BY_PROGRAM = {
|
|
9
|
+
'/usr/sbin/diskutil': 'storage',
|
|
10
|
+
'/usr/bin/hdiutil': 'storage',
|
|
11
|
+
'/System/Library/Filesystems/apfs.fs/Contents/Resources/newfs_apfs': 'storage',
|
|
12
|
+
'/sbin/mount_apfs': 'namespace',
|
|
13
|
+
'/sbin/umount': 'namespace',
|
|
14
|
+
};
|
|
15
|
+
export function diskClassOf(file) {
|
|
16
|
+
return Object.hasOwn(CLASS_BY_PROGRAM, file) ? CLASS_BY_PROGRAM[file] : null;
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Names the file every lease wait of a test's process tree is appended to; unset outside the real-APFS lane. The
|
|
20
|
+
* record exists so the real-APFS lane's wrapper can judge a test's code time without its lease waits
|
|
21
|
+
* (specs/cowshed/08_testing.md, "Integration tests (real substrate)").
|
|
22
|
+
*/
|
|
23
|
+
export const LEASE_WAIT_RECORD_ENV = 'COWSHED_LEASE_WAIT_RECORD';
|
|
24
|
+
/** Wall-clock microseconds since the Unix epoch: the clock every lease-wait stamp is read from. */
|
|
25
|
+
export function unixMicros() {
|
|
26
|
+
return Math.round((performance.timeOrigin + performance.now()) * 1000);
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* The lease-wait record at `path`. A wait is two lines: `start <pid> <seq> <unix-µs> <class>` before the client asks,
|
|
30
|
+
* and `end <pid> <seq> <unix-µs>` once it is over, granted or not. `seq` counts this record's waits from 0. Each line is
|
|
31
|
+
* one append, so concurrent processes' lines never interleave. A record that cannot be written is said once per process
|
|
32
|
+
* and never fails a wait: its waits then count as the test's code time, which can only fail the bound.
|
|
33
|
+
*/
|
|
34
|
+
export function waitRecord(path) {
|
|
35
|
+
let next = 0;
|
|
36
|
+
let said = false;
|
|
37
|
+
const append = (line) => {
|
|
38
|
+
try {
|
|
39
|
+
appendFileSync(path, line, { mode: 0o600 });
|
|
40
|
+
}
|
|
41
|
+
catch (error) {
|
|
42
|
+
if (!said) {
|
|
43
|
+
said = true;
|
|
44
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
45
|
+
process.stderr.write(`cowshed: disk-lease wait record ${path} is unwritable (${message}); this process's lease waits count as its test's code time\n`);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
return {
|
|
50
|
+
begin(diskClass) {
|
|
51
|
+
const seq = next;
|
|
52
|
+
next += 1;
|
|
53
|
+
append(`start ${process.pid} ${seq} ${unixMicros()} ${diskClass}\n`);
|
|
54
|
+
return () => append(`end ${process.pid} ${seq} ${unixMicros()}\n`);
|
|
55
|
+
},
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
/** This process's record, read from the environment on first use: `undefined` until then, `null` when unset. */
|
|
59
|
+
let environmentRecord;
|
|
60
|
+
function leaseWaitRecord() {
|
|
61
|
+
if (environmentRecord === undefined) {
|
|
62
|
+
const path = process.env[LEASE_WAIT_RECORD_ENV];
|
|
63
|
+
environmentRecord = path === undefined ? null : waitRecord(path);
|
|
64
|
+
}
|
|
65
|
+
return environmentRecord;
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* The share this process asks for: `alone` when its waits are recorded, so its test's code time holds no other
|
|
69
|
+
* process's disk work, and `shared` otherwise (specs/cowshed/08_testing.md, "Integration tests (real substrate)").
|
|
70
|
+
*/
|
|
71
|
+
export function recordedShare() {
|
|
72
|
+
return leaseWaitRecord() === null ? 'shared' : 'alone';
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* Ask the gateway at `socket` for `share` of a `diskClass` phase for `command` (`holdLease`). A shared request names no
|
|
76
|
+
* `share`, so every lease-scheduling gateway reads it. The wait is appended to this process's lease-wait record when
|
|
77
|
+
* the environment names one, and its end is appended however the ask ends.
|
|
78
|
+
*/
|
|
79
|
+
export async function takeDiskLease(socket, diskClass, command, bounds, share) {
|
|
80
|
+
const endWait = leaseWaitRecord()?.begin(diskClass);
|
|
81
|
+
const request = share === 'alone'
|
|
82
|
+
? { op: 'disk-lease', class: diskClass, share, command }
|
|
83
|
+
: { op: 'disk-lease', class: diskClass, command };
|
|
84
|
+
try {
|
|
85
|
+
const lease = await holdLease(socket, request, 'disk leases', bounds);
|
|
86
|
+
return lease.granted ? { granted: true, release: lease.release } : lease;
|
|
87
|
+
}
|
|
88
|
+
finally {
|
|
89
|
+
endWait?.();
|
|
90
|
+
}
|
|
91
|
+
}
|
|
@@ -1,6 +1,30 @@
|
|
|
1
|
+
import { type InheritedCpuPool } from './cpu-pool.js';
|
|
2
|
+
import { type CpuBudget } from './cpu-tokens.js';
|
|
3
|
+
import { captureHangDiagnostics } from './hang-diagnostics.js';
|
|
4
|
+
import { RamTempVolume } from './ram-temp.js';
|
|
1
5
|
import type { BoundedExecOptions } from './schema.js';
|
|
6
|
+
import { type BoundedExecTask } from './verdict.js';
|
|
2
7
|
export interface BoundedExecContext {
|
|
3
8
|
root: string;
|
|
9
|
+
/** The Nx task this run executes as, and the directory its verdict and report go to. */
|
|
10
|
+
record?: {
|
|
11
|
+
task: BoundedExecTask;
|
|
12
|
+
directory: string;
|
|
13
|
+
};
|
|
14
|
+
/** Owns child stdout when present; otherwise it is retained and forwarded normally. */
|
|
15
|
+
stdout?: (chunk: string) => void;
|
|
16
|
+
}
|
|
17
|
+
/** The part of Nx's executor context that names the running task. */
|
|
18
|
+
export interface NxTaskContext {
|
|
19
|
+
root: string;
|
|
20
|
+
projectName?: string;
|
|
21
|
+
targetName?: string;
|
|
22
|
+
configurationName?: string;
|
|
23
|
+
taskGraph?: {
|
|
24
|
+
tasks: Record<string, {
|
|
25
|
+
hash?: string;
|
|
26
|
+
}>;
|
|
27
|
+
};
|
|
4
28
|
}
|
|
5
29
|
export interface BoundedExecResult {
|
|
6
30
|
success: boolean;
|
|
@@ -9,7 +33,26 @@ export interface BoundedExecResult {
|
|
|
9
33
|
export interface ProcessTreeKiller {
|
|
10
34
|
kill(pid: number, signal: NodeJS.Signals): Promise<void>;
|
|
11
35
|
}
|
|
12
|
-
|
|
13
|
-
export
|
|
36
|
+
/** Where the command's TMPDIR comes from; `null` leaves the inherited one. */
|
|
37
|
+
export type TempVolume = Pick<RamTempVolume, 'acquire' | 'release' | 'fullness' | 'reap'>;
|
|
38
|
+
export default function boundedExecExecutor(options: BoundedExecOptions, context: NxTaskContext): Promise<BoundedExecResult>;
|
|
39
|
+
/** Runs with the normal process, RAM lease and CPU-budget owners, with an optional stdout sink. */
|
|
40
|
+
export declare function runDefaultBoundedExec(options: BoundedExecOptions, context: BoundedExecContext): Promise<BoundedExecResult>;
|
|
41
|
+
/**
|
|
42
|
+
* Nx gives an executor the task's project, target and configuration, not its id; the id is the
|
|
43
|
+
* key of the task graph entry they name. Outside a task graph the run records nothing.
|
|
44
|
+
*/
|
|
45
|
+
export declare function recordContext(context: NxTaskContext): BoundedExecContext;
|
|
46
|
+
/**
|
|
47
|
+
* Run the command once its runner holds CPU tokens from `budget` (`cpu-tokens.ts`), sized to the
|
|
48
|
+
* grant; `null`, or a budget nobody serves, runs it as asked. Both bounds start once it is
|
|
49
|
+
* granted: a wait for the host is not the command's time.
|
|
50
|
+
*
|
|
51
|
+
* `inherited` is the parent's CPU pool (`cpu-pool.ts`) that lends this run its tokens. The run asks that pool first
|
|
52
|
+
* and the host budget only when the pool refuses. Whatever it is granted, the run serves its own sub-pool to its
|
|
53
|
+
* descendants, closed before the grant returns. A borrowed grant that closes while the command runs stops the command
|
|
54
|
+
* as a lost grant, which is a failure.
|
|
55
|
+
*/
|
|
56
|
+
export declare function runBoundedExec(options: BoundedExecOptions, context: BoundedExecContext, killer: ProcessTreeKiller, tempVolume: TempVolume | null, budget: CpuBudget | null, inherited?: InheritedCpuPool | null, captureDiagnostics?: typeof captureHangDiagnostics): Promise<BoundedExecResult>;
|
|
14
57
|
export declare function createProcessTreeKiller(): ProcessTreeKiller;
|
|
15
58
|
//# sourceMappingURL=executor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/executors/bounded-exec/executor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/executors/bounded-exec/executor.ts"],"names":[],"mappings":"AAKA,OAAO,EAIL,KAAK,gBAAgB,EAGtB,MAAM,eAAe,CAAC;AACvB,OAAO,EAEL,KAAK,SAAS,EAKf,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,sBAAsB,EAAmB,MAAM,uBAAuB,CAAC;AAEhF,OAAO,EAML,aAAa,EAEd,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAEL,KAAK,eAAe,EAWrB,MAAM,cAAc,CAAC;AAiBtB,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,wFAAwF;IACxF,MAAM,CAAC,EAAE;QAAE,IAAI,EAAE,eAAe,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IACtD,uFAAuF;IACvF,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAClC;AAED,qEAAqE;AACrE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,CAAC;CAC1D;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;CACxB;AAcD,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1D;AAED,8EAA8E;AAC9E,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,SAAS,GAAG,SAAS,GAAG,UAAU,GAAG,MAAM,CAAC,CAAC;AAE1F,MAAM,CAAC,OAAO,UAAU,mBAAmB,CACzC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,iBAAiB,CAAC,CAE5B;AAED,mGAAmG;AACnG,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC,CAqB5B;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,kBAAkB,CAiBxE;AAED;;;;;;;;;GASG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,kBAAkB,EAC3B,MAAM,EAAE,iBAAiB,EACzB,UAAU,EAAE,UAAU,GAAG,IAAI,EAC7B,MAAM,EAAE,SAAS,GAAG,IAAI,EACxB,SAAS,GAAE,gBAAgB,GAAG,IAAW,EACzC,kBAAkB,GAAE,OAAO,sBAA+C,GACzE,OAAO,CAAC,iBAAiB,CAAC,CA+d5B;AAED,wBAAgB,uBAAuB,IAAI,iBAAiB,CAM3D"}
|