@smoothbricks/nx-plugin 0.4.26 → 0.4.27
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 +962 -148
- 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
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { expect, it } from 'bun:test';
|
|
2
|
-
import { execFileSync } from 'node:child_process';
|
|
2
|
+
import { execFile, execFileSync } from 'node:child_process';
|
|
3
3
|
import { appendFile, mkdir, mkdtemp, readFile, realpath, rm, stat, symlink, utimes, writeFile } from 'node:fs/promises';
|
|
4
4
|
import { tmpdir } from 'node:os';
|
|
5
5
|
import { dirname, join } from 'node:path';
|
|
6
|
+
import { promisify } from 'node:util';
|
|
6
7
|
|
|
7
8
|
import type { CreateNodesResultV2 } from 'nx/src/devkit-exports.js';
|
|
8
|
-
import { Watcher } from 'nx/src/native/index.js';
|
|
9
|
-
import { resetWorkspaceContext } from 'nx/src/utils/workspace-context.js';
|
|
9
|
+
import { Watcher, WorkspaceContext } from 'nx/src/native/index.js';
|
|
10
|
+
import { globWithWorkspaceContextSync, resetWorkspaceContext } from 'nx/src/utils/workspace-context.js';
|
|
10
11
|
import {
|
|
11
12
|
aggregateOf,
|
|
12
13
|
type CountedCargo,
|
|
@@ -18,8 +19,9 @@ import {
|
|
|
18
19
|
withEnvironment,
|
|
19
20
|
} from './__tests__/counted-cargo.js';
|
|
20
21
|
import { useFixtureCargoHome } from './__tests__/fixture-cargo-home.js';
|
|
21
|
-
import {
|
|
22
|
+
import { runtimeInputValue } from './__tests__/runtime-input.js';
|
|
22
23
|
import { CARGO_CLOSURE_INPUT, indexedCargoManifests } from './cargo-closure-input.js';
|
|
24
|
+
import { hashCargoPathInputs } from './cargo-source-hash.js';
|
|
23
25
|
import { createNodesV2 } from './index.js';
|
|
24
26
|
|
|
25
27
|
const repositoryRoot = join(import.meta.dir, '../../..');
|
|
@@ -29,8 +31,8 @@ useFixtureCargoHome();
|
|
|
29
31
|
/**
|
|
30
32
|
* An Nx workspace that is also the Cargo workspace. `app` reaches `leaf`
|
|
31
33
|
* through `bridge`, and `external` — outside the Nx workspace — through
|
|
32
|
-
* `bridge` too. `unrelated` is a member nothing depends on. `app`
|
|
33
|
-
*
|
|
34
|
+
* `bridge` too. `unrelated` is a member nothing depends on. `app` declares a
|
|
35
|
+
* custom cached target keyed on its closure.
|
|
34
36
|
* `extraFiles` (paths relative to `root`) are written with the rest, last.
|
|
35
37
|
*/
|
|
36
38
|
async function closureFixture(
|
|
@@ -39,8 +41,6 @@ async function closureFixture(
|
|
|
39
41
|
extraFiles: Record<string, string> = {},
|
|
40
42
|
) {
|
|
41
43
|
const workspace = join(root, 'workspace');
|
|
42
|
-
const executions = join(root, 'executions.log');
|
|
43
|
-
const output = join(workspace, 'packages/app/dist/result.txt');
|
|
44
44
|
const files: Record<string, string> = {
|
|
45
45
|
'workspace/.gitignore': gitignore,
|
|
46
46
|
'workspace/package.json':
|
|
@@ -49,9 +49,6 @@ async function closureFixture(
|
|
|
49
49
|
plugins: ['@smoothbricks/nx-plugin'],
|
|
50
50
|
namedInputs: { externalRustCrates: [] },
|
|
51
51
|
}),
|
|
52
|
-
// Exercise the real linked-source path: Node's strip-only loader must
|
|
53
|
-
// import the plugin when the workspace selects development exports.
|
|
54
|
-
'workspace/tsconfig.base.json': JSON.stringify({ compilerOptions: { customConditions: ['development'] } }),
|
|
55
52
|
'workspace/Cargo.toml':
|
|
56
53
|
'[workspace]\nmembers=["packages/app","crates/bridge","crates/leaf","crates/unrelated"]\nresolver="2"\n',
|
|
57
54
|
'workspace/packages/app/package.json': JSON.stringify({
|
|
@@ -62,20 +59,12 @@ async function closureFixture(
|
|
|
62
59
|
compile: {
|
|
63
60
|
executor: 'nx:run-commands',
|
|
64
61
|
cache: true,
|
|
65
|
-
inputs: [
|
|
66
|
-
|
|
67
|
-
options: { command: 'bun packages/app/compile.ts' },
|
|
62
|
+
inputs: [CARGO_CLOSURE_INPUT],
|
|
63
|
+
options: { command: 'cargo build --quiet --locked --offline --manifest-path packages/app/Cargo.toml' },
|
|
68
64
|
},
|
|
69
65
|
},
|
|
70
66
|
},
|
|
71
67
|
}),
|
|
72
|
-
'workspace/packages/app/compile.ts': `import { execFileSync } from 'node:child_process';
|
|
73
|
-
import { appendFile, mkdir, writeFile } from 'node:fs/promises';
|
|
74
|
-
const result = execFileSync('cargo', ['run', '--quiet', '--locked', '--offline', '--manifest-path', 'packages/app/Cargo.toml'], { encoding: 'utf8' });
|
|
75
|
-
await mkdir(${JSON.stringify(dirname(output))}, { recursive: true });
|
|
76
|
-
await writeFile(${JSON.stringify(output)}, result);
|
|
77
|
-
await appendFile(${JSON.stringify(executions)}, result);
|
|
78
|
-
`,
|
|
79
68
|
'workspace/packages/app/Cargo.toml':
|
|
80
69
|
'[package]\nname="app"\nversion="0.1.0"\nedition="2021"\n[dependencies]\nbridge={path="../../crates/bridge"}\n',
|
|
81
70
|
'workspace/packages/app/src/main.rs': 'fn main() { println!("{}", bridge::answer()); }\n',
|
|
@@ -101,21 +90,6 @@ await appendFile(${JSON.stringify(executions)}, result);
|
|
|
101
90
|
stdio: 'pipe',
|
|
102
91
|
});
|
|
103
92
|
|
|
104
|
-
/** A fresh Node CLI and normal daemon, loading the linked plugin through development exports. */
|
|
105
|
-
async function compile(): Promise<void> {
|
|
106
|
-
const child = Bun.spawn(['node', join(repositoryRoot, 'node_modules/.bin/nx'), 'run', 'app:compile'], {
|
|
107
|
-
cwd: workspace,
|
|
108
|
-
env: fixtureNxEnv(workspace),
|
|
109
|
-
stdout: 'pipe',
|
|
110
|
-
stderr: 'pipe',
|
|
111
|
-
});
|
|
112
|
-
const [exitCode, stdout, stderr] = await Promise.all([
|
|
113
|
-
child.exited,
|
|
114
|
-
new Response(child.stdout).text(),
|
|
115
|
-
new Response(child.stderr).text(),
|
|
116
|
-
]);
|
|
117
|
-
expect(exitCode, stdout + stderr).toBe(0);
|
|
118
|
-
}
|
|
119
93
|
/**
|
|
120
94
|
* Rewrite a fixture file as an edit Nx can see. Nx keeps each file's hash
|
|
121
95
|
* beside its mtime in whole seconds and reuses the hash until that second
|
|
@@ -130,44 +104,109 @@ await appendFile(${JSON.stringify(executions)}, result);
|
|
|
130
104
|
const edited = new Date(Math.max(Date.now(), mtimeMs + 1000));
|
|
131
105
|
await utimes(file, edited, edited);
|
|
132
106
|
}
|
|
133
|
-
|
|
134
|
-
return { workspace, compile, edit, log };
|
|
107
|
+
return { workspace, edit };
|
|
135
108
|
}
|
|
136
109
|
|
|
137
|
-
|
|
138
|
-
|
|
110
|
+
it('keys a custom target on exactly its Cargo closure, inside the workspace and out', async () => {
|
|
111
|
+
const root = await realpath(await mkdtemp(join(tmpdir(), 'cargo-closure-')));
|
|
139
112
|
try {
|
|
140
|
-
await
|
|
113
|
+
const { workspace, edit } = await closureFixture(root);
|
|
114
|
+
resetWorkspaceContext();
|
|
115
|
+
const closure = closureOf(byFile(await graphComputation(workspace)()), 'packages/app');
|
|
116
|
+
const filesets = closure.flatMap((input) => (typeof input === 'string' ? [input] : []));
|
|
117
|
+
const runtime = closure.flatMap((input) =>
|
|
118
|
+
typeof input === 'object' && 'runtime' in input ? [input.runtime] : [],
|
|
119
|
+
);
|
|
120
|
+
// What the closure's filesets reach, as Nx's own file index matches them: `!` entries exclude. In
|
|
121
|
+
// process, as the plugin reads a root no daemon serves (`indexedCargoManifests`).
|
|
122
|
+
const anchored = (inputs: string[]) =>
|
|
123
|
+
inputs.map((input) => {
|
|
124
|
+
expect(input).toStartWith('{workspaceRoot}/');
|
|
125
|
+
return input.slice('{workspaceRoot}/'.length);
|
|
126
|
+
});
|
|
127
|
+
const keyed = globWithWorkspaceContextSync(
|
|
128
|
+
workspace,
|
|
129
|
+
anchored(filesets.filter((input) => !input.startsWith('!'))),
|
|
130
|
+
anchored(filesets.flatMap((input) => (input.startsWith('!') ? [input.slice(1)] : []))),
|
|
131
|
+
);
|
|
132
|
+
// The one runtime entry, which Nx keys on by its stdout.
|
|
133
|
+
expect(runtime).toHaveLength(1);
|
|
134
|
+
const outside = () => runtimeInputValue(runtime.join(), workspace);
|
|
135
|
+
const before = await outside();
|
|
136
|
+
|
|
137
|
+
// Reached only through bridge: no path of app's own names it. A workspace member outside the
|
|
138
|
+
// closure is not an input.
|
|
139
|
+
expect(keyed.filter((path) => path.endsWith('.rs')).sort()).toEqual([
|
|
140
|
+
'crates/bridge/src/lib.rs',
|
|
141
|
+
'crates/leaf/src/lib.rs',
|
|
142
|
+
'packages/app/src/main.rs',
|
|
143
|
+
]);
|
|
144
|
+
await edit('workspace/crates/unrelated/src/lib.rs', 'pub fn unrelated() -> u8 { 4 }\n');
|
|
145
|
+
expect(await outside()).toBe(before);
|
|
146
|
+
|
|
147
|
+
// Outside the Nx workspace, where no fileset reaches: the runtime entry does.
|
|
148
|
+
await edit('external/src/lib.rs', 'pub fn answer() -> u8 { 20 }\n');
|
|
149
|
+
expect(await outside()).not.toBe(before);
|
|
141
150
|
} finally {
|
|
142
151
|
await rm(root, { recursive: true, force: true });
|
|
143
152
|
}
|
|
144
|
-
}
|
|
153
|
+
}, 120_000);
|
|
145
154
|
|
|
146
|
-
it('keys
|
|
147
|
-
const root = await realpath(await mkdtemp(join(tmpdir(), 'cargo-
|
|
155
|
+
it('keys literal compiled-in data inside and outside crate directories without keying comments or unrelated crates', async () => {
|
|
156
|
+
const root = await realpath(await mkdtemp(join(tmpdir(), 'cargo-compiled-data-')));
|
|
148
157
|
try {
|
|
149
|
-
const {
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
158
|
+
const { workspace, edit } = await closureFixture(root, undefined, {
|
|
159
|
+
'workspace/packages/app/src/main.rs':
|
|
160
|
+
'const LOCAL: &str = include_str!("data/local.txt");\nfn main() { println!("{}", bridge::answer()); }\n',
|
|
161
|
+
'workspace/packages/app/src/data/local.txt': 'local-one',
|
|
162
|
+
'workspace/crates/bridge/src/lib.rs':
|
|
163
|
+
'pub fn answer() -> u8 { leaf::answer() + external::answer() }\npub const DATA: &[u8] = include_bytes!("../../shared/config.json");\n',
|
|
164
|
+
'workspace/crates/shared/config.json': '{"value":1}',
|
|
165
|
+
'workspace/crates/leaf/src/lib.rs': [
|
|
166
|
+
'pub fn answer() -> u8 { 1 }',
|
|
167
|
+
'pub const SKILL: &str = include_str!(r#"../../../skills/SKILL.md"#,);',
|
|
168
|
+
'// include_str!("../../../comment-only.txt")',
|
|
169
|
+
'/* nested /* include_bytes!("../../../comment-only.txt") */ comment */',
|
|
170
|
+
'const EXAMPLE: &str = r#"include_str!("../../../example-only.txt")"#;',
|
|
171
|
+
].join('\n'),
|
|
172
|
+
'workspace/skills/SKILL.md': 'skill-one',
|
|
173
|
+
'workspace/comment-only.txt': 'comment-one',
|
|
174
|
+
'workspace/example-only.txt': 'example-one',
|
|
175
|
+
'external/src/lib.rs': 'pub fn answer() -> u8 { 10 }\nconst DATA: &str = include_str!("../data.txt");\n',
|
|
176
|
+
'external/data.txt': 'external-one',
|
|
177
|
+
});
|
|
178
|
+
resetWorkspaceContext();
|
|
179
|
+
const inputs = closureOf(byFile(await graphComputation(workspace)()), 'packages/app');
|
|
180
|
+
const positive = inputs.flatMap((input) =>
|
|
181
|
+
typeof input === 'string' && !input.startsWith('!') ? [input.slice('{workspaceRoot}/'.length)] : [],
|
|
182
|
+
);
|
|
183
|
+
const negative = inputs.flatMap((input) =>
|
|
184
|
+
typeof input === 'string' && input.startsWith('!') ? [input.slice('!{workspaceRoot}/'.length)] : [],
|
|
185
|
+
);
|
|
186
|
+
const context = new WorkspaceContext(workspace, join(workspace, '.nx/compiled-data-context'));
|
|
187
|
+
const keyed = context.glob(positive, negative);
|
|
188
|
+
for (const path of ['packages/app/src/data/local.txt', 'crates/shared/config.json', 'skills/SKILL.md'])
|
|
189
|
+
expect(keyed).toContain(path);
|
|
190
|
+
for (const path of ['comment-only.txt', 'example-only.txt', 'crates/unrelated/src/lib.rs'])
|
|
191
|
+
expect(keyed).not.toContain(path);
|
|
192
|
+
const before = context.hashFilesMatchingGlob(positive, negative);
|
|
193
|
+
await edit('workspace/packages/app/src/data/local.txt', 'local-two');
|
|
194
|
+
context.incrementalUpdate(['packages/app/src/data/local.txt'], []);
|
|
195
|
+
const changed = context.hashFilesMatchingGlob(positive, negative);
|
|
196
|
+
expect(changed).not.toBe(before);
|
|
197
|
+
await edit('workspace/comment-only.txt', 'comment-two');
|
|
161
198
|
await edit('workspace/crates/unrelated/src/lib.rs', 'pub fn unrelated() -> u8 { 4 }\n');
|
|
162
|
-
|
|
163
|
-
expect(
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
await
|
|
168
|
-
expect(
|
|
199
|
+
context.incrementalUpdate(['comment-only.txt', 'crates/unrelated/src/lib.rs'], []);
|
|
200
|
+
expect(context.hashFilesMatchingGlob(positive, negative)).toBe(changed);
|
|
201
|
+
const outside = await hashCargoPathInputs(join(workspace, 'Cargo.toml'), workspace, {
|
|
202
|
+
closure: join(workspace, 'packages/app'),
|
|
203
|
+
});
|
|
204
|
+
await edit('external/data.txt', 'external-two');
|
|
205
|
+
expect(
|
|
206
|
+
await hashCargoPathInputs(join(workspace, 'Cargo.toml'), workspace, { closure: join(workspace, 'packages/app') }),
|
|
207
|
+
).not.toBe(outside);
|
|
169
208
|
} finally {
|
|
170
|
-
await
|
|
209
|
+
await rm(root, { recursive: true, force: true });
|
|
171
210
|
}
|
|
172
211
|
}, 120_000);
|
|
173
212
|
|
|
@@ -185,7 +224,7 @@ it('refuses a closure member in an ignored directory, which no fileset can see,
|
|
|
185
224
|
// No runtime hash of the whole workspace stands in for it.
|
|
186
225
|
expect(JSON.stringify(failure.partialResults)).not.toContain('--include-workspace');
|
|
187
226
|
} finally {
|
|
188
|
-
await
|
|
227
|
+
await rm(root, { recursive: true, force: true });
|
|
189
228
|
}
|
|
190
229
|
}, 120_000);
|
|
191
230
|
|
|
@@ -213,7 +252,7 @@ it('leaves a closure inside the workspace to Nx: no process runs when its tasks
|
|
|
213
252
|
// app reaches `external`, the one member only a process can hash, and
|
|
214
253
|
// only it: the in-workspace members stay filesets.
|
|
215
254
|
expect(runtimeCommands('packages/app')).toEqual([
|
|
216
|
-
'node node_modules/@smoothbricks/nx-plugin/dist/bin/smoo-nx-cargo-hash.js --closure packages/app Cargo.toml',
|
|
255
|
+
'sh node_modules/@smoothbricks/nx-plugin/runtime-input.sh node node_modules/@smoothbricks/nx-plugin/dist/bin/smoo-nx-cargo-hash.js --closure packages/app Cargo.toml',
|
|
217
256
|
]);
|
|
218
257
|
} finally {
|
|
219
258
|
await rm(root, { recursive: true, force: true });
|
|
@@ -263,6 +302,39 @@ function leafControls(workspace: string, edit: (path: string, text: string) => P
|
|
|
263
302
|
};
|
|
264
303
|
}
|
|
265
304
|
|
|
305
|
+
it('delegates counted Cargo through the caller launcher without re-entering its broker', async () => {
|
|
306
|
+
const root = await realpath(await mkdtemp(join(tmpdir(), 'cargo-counted-delegate-')));
|
|
307
|
+
let fixtureCargo: CountedCargo | undefined;
|
|
308
|
+
try {
|
|
309
|
+
const { workspace } = await closureFixture(root);
|
|
310
|
+
const manifest = join(workspace, 'Cargo.toml');
|
|
311
|
+
const args = ['metadata', '--format-version', '1', '--locked', '--offline', '--manifest-path', manifest];
|
|
312
|
+
const expected = execFileSync('cargo', args, { encoding: 'utf8' });
|
|
313
|
+
const cargo = await countedCargo(root);
|
|
314
|
+
fixtureCargo = cargo;
|
|
315
|
+
await withEnvironment(cargo.environment, async () => {
|
|
316
|
+
const answer = promisify(execFile)('cargo', args);
|
|
317
|
+
await cargo.waitForRuns((runs) => runs.read === 1, 'the delegated real Cargo answer');
|
|
318
|
+
expect((await answer).stdout).toBe(expected);
|
|
319
|
+
expect(await cargo.runs()).toMatchObject({ spawned: 1, read: 1, peak: 1 });
|
|
320
|
+
// Forwarded subcommands must use the same original delegate path, not loop through the shim.
|
|
321
|
+
const located = await promisify(execFile)('cargo', [
|
|
322
|
+
'locate-project',
|
|
323
|
+
'--workspace',
|
|
324
|
+
'--manifest-path',
|
|
325
|
+
manifest,
|
|
326
|
+
'--message-format',
|
|
327
|
+
'plain',
|
|
328
|
+
]);
|
|
329
|
+
expect(located.stdout.trim()).toBe(manifest);
|
|
330
|
+
expect((await cargo.runs()).spawned).toBe(1);
|
|
331
|
+
});
|
|
332
|
+
} finally {
|
|
333
|
+
await fixtureCargo?.release();
|
|
334
|
+
await rm(root, { recursive: true, force: true });
|
|
335
|
+
}
|
|
336
|
+
}, 30_000);
|
|
337
|
+
|
|
266
338
|
it('shares one Cargo child among overlapping graph computations, and an unchanged workspace never asks Cargo again', async () => {
|
|
267
339
|
const root = await realpath(await mkdtemp(join(tmpdir(), 'cargo-closure-overlap-')));
|
|
268
340
|
let fixtureCargo: CountedCargo | undefined;
|
|
@@ -2,16 +2,18 @@ import { realpath } from 'node:fs/promises';
|
|
|
2
2
|
import { isAbsolute, join, posix, relative, sep } from 'node:path';
|
|
3
3
|
|
|
4
4
|
import type { TargetConfiguration } from 'nx/src/devkit-exports.js';
|
|
5
|
-
import { globWithWorkspaceContext, globWithWorkspaceContextSync } from 'nx/src/utils/workspace-context.js';
|
|
6
|
-
import { workspaceRoot as daemonWorkspaceRoot } from 'nx/src/utils/workspace-root.js';
|
|
7
5
|
|
|
8
6
|
import {
|
|
9
7
|
CARGO_ANCESTOR_INPUTS,
|
|
10
8
|
type CargoResolve,
|
|
9
|
+
type CompiledCargoInput,
|
|
10
|
+
compiledInFiles,
|
|
11
11
|
dependencyClosure,
|
|
12
12
|
HASH_SKIPPED_DIRECTORIES,
|
|
13
13
|
readCargoResolve,
|
|
14
14
|
} from './cargo-source-hash.js';
|
|
15
|
+
import { runtimeInput, shellWord } from './runtime-input.js';
|
|
16
|
+
import { globIndexedFiles } from './workspace-index.js';
|
|
15
17
|
|
|
16
18
|
/**
|
|
17
19
|
* The named input the plugin infers for every project with crates of a Cargo
|
|
@@ -63,6 +65,7 @@ export interface CargoClosureSource {
|
|
|
63
65
|
readonly cargo: CargoResolve;
|
|
64
66
|
/** Every `Cargo.toml` in Nx's file index, relative to the workspace root. */
|
|
65
67
|
readonly indexed: ReadonlySet<string>;
|
|
68
|
+
readonly compiledFilesCache: Map<string, CompiledCargoInput[]>;
|
|
66
69
|
}
|
|
67
70
|
|
|
68
71
|
/**
|
|
@@ -71,11 +74,7 @@ export interface CargoClosureSource {
|
|
|
71
74
|
* here has no files a fileset input can hash.
|
|
72
75
|
*/
|
|
73
76
|
export async function indexedCargoManifests(workspaceRoot: string): Promise<ReadonlySet<string>> {
|
|
74
|
-
|
|
75
|
-
workspaceRoot === daemonWorkspaceRoot
|
|
76
|
-
? await globWithWorkspaceContext(workspaceRoot, ['**/Cargo.toml'])
|
|
77
|
-
: globWithWorkspaceContextSync(workspaceRoot, ['**/Cargo.toml']);
|
|
78
|
-
return new Set(manifests);
|
|
77
|
+
return new Set(await globIndexedFiles(workspaceRoot, ['**/Cargo.toml']));
|
|
79
78
|
}
|
|
80
79
|
|
|
81
80
|
/**
|
|
@@ -87,10 +86,11 @@ export async function resolveCargoClosureSource(
|
|
|
87
86
|
manifest: string,
|
|
88
87
|
workspaceRoot: string,
|
|
89
88
|
indexed: Promise<ReadonlySet<string>>,
|
|
89
|
+
compiledFilesCache: Map<string, CompiledCargoInput[]>,
|
|
90
90
|
): Promise<CargoClosureSource> {
|
|
91
91
|
const [root, index] = await Promise.all([realpath(workspaceRoot), indexed]);
|
|
92
92
|
const cargo = await readCargoResolve(join(root, manifest), root, index);
|
|
93
|
-
return { manifest, root, cargo, indexed: index };
|
|
93
|
+
return { manifest, root, cargo, indexed: index, compiledFilesCache };
|
|
94
94
|
}
|
|
95
95
|
|
|
96
96
|
/**
|
|
@@ -140,6 +140,7 @@ async function workspaceClosureInputs(projectRoot: string, source: CargoClosureS
|
|
|
140
140
|
const { root, cargo, indexed } = source;
|
|
141
141
|
const packageDirectories: string[] = [];
|
|
142
142
|
const files: string[] = [];
|
|
143
|
+
const compiledFiles = new Set<string>();
|
|
143
144
|
let external = false;
|
|
144
145
|
try {
|
|
145
146
|
const members = await dependencyClosure(cargo, join(root, projectRoot));
|
|
@@ -153,6 +154,11 @@ async function workspaceClosureInputs(projectRoot: string, source: CargoClosureS
|
|
|
153
154
|
if (!indexed.has(posix.join(directory, 'Cargo.toml'))) {
|
|
154
155
|
throw new Error(`the Cargo package ${directory} is not in Nx's file index (an ignored directory)`);
|
|
155
156
|
}
|
|
157
|
+
for (const { file } of compiledInFiles(pkg.directory, source.compiledFilesCache)) {
|
|
158
|
+
const path = indexablePath(root, file);
|
|
159
|
+
if (path === null) throw new Error(`${directory} compiles ${file}, which Nx's file index cannot hold`);
|
|
160
|
+
compiledFiles.add(path);
|
|
161
|
+
}
|
|
156
162
|
packageDirectories.push(directory);
|
|
157
163
|
for (const file of [...pkg.sources, pkg.governingManifest]) {
|
|
158
164
|
const path = indexablePath(root, file);
|
|
@@ -160,7 +166,7 @@ async function workspaceClosureInputs(projectRoot: string, source: CargoClosureS
|
|
|
160
166
|
files.push(path);
|
|
161
167
|
}
|
|
162
168
|
}
|
|
163
|
-
const unglobbable = [...packageDirectories, ...files].find((path) => GLOB_SYNTAX.test(path));
|
|
169
|
+
const unglobbable = [...packageDirectories, ...files, ...compiledFiles].find((path) => GLOB_SYNTAX.test(path));
|
|
164
170
|
if (unglobbable !== undefined) throw new Error(`${unglobbable} contains glob syntax, so no fileset can name it`);
|
|
165
171
|
} catch (error) {
|
|
166
172
|
throw new CargoClosureInputError(projectRoot, error);
|
|
@@ -205,8 +211,9 @@ async function workspaceClosureInputs(projectRoot: string, source: CargoClosureS
|
|
|
205
211
|
...packageGlobs.map((glob) => anchored(glob, PACKAGE_FILES)),
|
|
206
212
|
...packageGlobs.map((glob) => `!${anchored(glob, SKIPPED_TREES)}`),
|
|
207
213
|
...[...ancestors].sort().map((ancestor) => anchored(ancestor, ANCESTOR_FILES)),
|
|
214
|
+
...[...compiledFiles].sort().map((file) => anchored(file)),
|
|
208
215
|
...[...loose].sort().map((file) => anchored(file)),
|
|
209
|
-
...(external ? [
|
|
216
|
+
...(external ? [runtimeInput(`${CARGO_HASH_COMMAND} ${closureArguments}`)] : []),
|
|
210
217
|
];
|
|
211
218
|
}
|
|
212
219
|
|
|
@@ -232,8 +239,3 @@ function parent(path: string): string | null {
|
|
|
232
239
|
function contains(directory: string, path: string): boolean {
|
|
233
240
|
return directory === '' || path === directory || path.startsWith(`${directory}/`);
|
|
234
241
|
}
|
|
235
|
-
|
|
236
|
-
/** One shell word: bare when nothing in it is special to `sh`, single-quoted otherwise. */
|
|
237
|
-
function shellWord(word: string): string {
|
|
238
|
-
return /^[\w@%+=:,./-]+$/.test(word) ? word : `'${word.replaceAll("'", `'"'"'`)}'`;
|
|
239
|
-
}
|
|
@@ -0,0 +1,137 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The two local profiles every Cargo workspace root declares, shared by the
|
|
3
|
+
* two things that must agree about them: the package generator, which writes
|
|
4
|
+
* them into a new workspace, and the monorepo policy, which refuses a root
|
|
5
|
+
* that lacks one. Both render from {@link CARGO_DEV_PROFILE_REQUIREMENTS}, so
|
|
6
|
+
* the TOML a failure tells you to add is the TOML a new workspace starts with.
|
|
7
|
+
*
|
|
8
|
+
* `dev` is the edit-compile-test loop: workspace crates get file:line and stay
|
|
9
|
+
* incremental, dependencies carry no debuginfo. `debugging` is the same build
|
|
10
|
+
* with full DWARF everywhere, in its own `target/debugging` directory, so
|
|
11
|
+
* attaching a debugger never invalidates a dev unit or its cache.
|
|
12
|
+
*/
|
|
13
|
+
|
|
14
|
+
/** A profile this policy owns. */
|
|
15
|
+
export type CargoLocalProfile = 'dev' | 'debugging';
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* Where in a profile a key lives: the profile's own table (workspace members),
|
|
19
|
+
* `package."*"` (every non-member dependency), or `build-override` (build
|
|
20
|
+
* scripts, proc macros, and their dependencies).
|
|
21
|
+
*/
|
|
22
|
+
export type CargoProfileScope = 'members' | 'dependencies' | 'build-override';
|
|
23
|
+
|
|
24
|
+
export type CargoProfileKey = 'inherits' | 'debug' | 'split-debuginfo';
|
|
25
|
+
|
|
26
|
+
export interface CargoProfileRequirement {
|
|
27
|
+
readonly profile: CargoLocalProfile;
|
|
28
|
+
readonly scope: CargoProfileScope;
|
|
29
|
+
readonly key: CargoProfileKey;
|
|
30
|
+
/** The canonical TOML value; `debug` compares by level, so `0`, `false` and `"none"` agree. */
|
|
31
|
+
readonly value: string | number;
|
|
32
|
+
readonly why: string;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
const SAME_UNIT =
|
|
36
|
+
'A crate that both build scripts or proc macros and ordinary code use is one unit only while both see the same ' +
|
|
37
|
+
'debug level; otherwise Cargo compiles it, and everything above it, twice.';
|
|
38
|
+
|
|
39
|
+
export const CARGO_DEV_PROFILE_REQUIREMENTS: readonly CargoProfileRequirement[] = [
|
|
40
|
+
{
|
|
41
|
+
profile: 'dev',
|
|
42
|
+
scope: 'members',
|
|
43
|
+
key: 'debug',
|
|
44
|
+
value: 'line-tables-only',
|
|
45
|
+
why: 'Workspace crates keep file:line in backtraces and profiles without paying for full DWARF.',
|
|
46
|
+
},
|
|
47
|
+
{
|
|
48
|
+
profile: 'dev',
|
|
49
|
+
scope: 'members',
|
|
50
|
+
key: 'split-debuginfo',
|
|
51
|
+
value: 'unpacked',
|
|
52
|
+
why: 'Debuginfo stays in the object files instead of being relinked into every binary, so links stay fast.',
|
|
53
|
+
},
|
|
54
|
+
{
|
|
55
|
+
profile: 'dev',
|
|
56
|
+
scope: 'dependencies',
|
|
57
|
+
key: 'debug',
|
|
58
|
+
value: 0,
|
|
59
|
+
why: 'Dependencies carry no debuginfo: measured -57% target bytes at flat CPU.',
|
|
60
|
+
},
|
|
61
|
+
{
|
|
62
|
+
profile: 'dev',
|
|
63
|
+
scope: 'build-override',
|
|
64
|
+
key: 'debug',
|
|
65
|
+
value: 0,
|
|
66
|
+
why: `It must equal [profile.dev.package."*"] debug. ${SAME_UNIT}`,
|
|
67
|
+
},
|
|
68
|
+
{
|
|
69
|
+
profile: 'debugging',
|
|
70
|
+
scope: 'members',
|
|
71
|
+
key: 'inherits',
|
|
72
|
+
value: 'dev',
|
|
73
|
+
why:
|
|
74
|
+
'Debug with `cargo build --profile debugging` or `cargo test --profile debugging`: it is the dev profile with ' +
|
|
75
|
+
'full debuginfo, built into target/debugging, so it never invalidates the dev units or their cache.',
|
|
76
|
+
},
|
|
77
|
+
{
|
|
78
|
+
profile: 'debugging',
|
|
79
|
+
scope: 'members',
|
|
80
|
+
key: 'debug',
|
|
81
|
+
value: 2,
|
|
82
|
+
why: 'Workspace crates carry full DWARF for the debugger.',
|
|
83
|
+
},
|
|
84
|
+
{
|
|
85
|
+
profile: 'debugging',
|
|
86
|
+
scope: 'dependencies',
|
|
87
|
+
key: 'debug',
|
|
88
|
+
value: 2,
|
|
89
|
+
why: 'A custom profile inherits dev\'s [profile.dev.package."*"] debug = 0, which leaves dependencies opaque to the debugger.',
|
|
90
|
+
},
|
|
91
|
+
{
|
|
92
|
+
profile: 'debugging',
|
|
93
|
+
scope: 'build-override',
|
|
94
|
+
key: 'debug',
|
|
95
|
+
value: 2,
|
|
96
|
+
why: `It must equal [profile.debugging.package."*"] debug. ${SAME_UNIT}`,
|
|
97
|
+
},
|
|
98
|
+
];
|
|
99
|
+
|
|
100
|
+
/** The TOML table header a requirement lives under, without brackets. */
|
|
101
|
+
export function cargoProfileTable(profile: CargoLocalProfile, scope: CargoProfileScope): string {
|
|
102
|
+
switch (scope) {
|
|
103
|
+
case 'members':
|
|
104
|
+
return `profile.${profile}`;
|
|
105
|
+
case 'dependencies':
|
|
106
|
+
return `profile.${profile}.package."*"`;
|
|
107
|
+
case 'build-override':
|
|
108
|
+
return `profile.${profile}.build-override`;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
/** One TOML key line, `debug = 0` or `inherits = "dev"`. */
|
|
113
|
+
export function cargoProfileAssignment(requirement: CargoProfileRequirement): string {
|
|
114
|
+
return `${requirement.key} = ${JSON.stringify(requirement.value)}`;
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
/** Every required table, each key commented with its reason, as a new workspace root carries them. */
|
|
118
|
+
export function renderCargoDevProfiles(): string {
|
|
119
|
+
const tables = new Map<string, CargoProfileRequirement[]>();
|
|
120
|
+
for (const requirement of CARGO_DEV_PROFILE_REQUIREMENTS) {
|
|
121
|
+
const table = cargoProfileTable(requirement.profile, requirement.scope);
|
|
122
|
+
const requirements = tables.get(table);
|
|
123
|
+
if (requirements === undefined) {
|
|
124
|
+
tables.set(table, [requirement]);
|
|
125
|
+
} else {
|
|
126
|
+
requirements.push(requirement);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
return [...tables]
|
|
130
|
+
.map(([table, requirements]) =>
|
|
131
|
+
[
|
|
132
|
+
`[${table}]`,
|
|
133
|
+
...requirements.flatMap((requirement) => [`# ${requirement.why}`, cargoProfileAssignment(requirement)]),
|
|
134
|
+
].join('\n'),
|
|
135
|
+
)
|
|
136
|
+
.join('\n\n');
|
|
137
|
+
}
|
|
@@ -5,6 +5,7 @@ import { tmpdir } from 'node:os';
|
|
|
5
5
|
import { delimiter, dirname, join } from 'node:path';
|
|
6
6
|
|
|
7
7
|
import type { CreateNodesResultV2 } from 'nx/src/devkit-exports.js';
|
|
8
|
+
import { FileLock } from 'nx/src/native/index.js';
|
|
8
9
|
import { resetWorkspaceContext } from 'nx/src/utils/workspace-context.js';
|
|
9
10
|
import {
|
|
10
11
|
type CannedCargo,
|
|
@@ -20,7 +21,12 @@ import {
|
|
|
20
21
|
} from './__tests__/counted-cargo.js';
|
|
21
22
|
import { useFixtureCargoHome } from './__tests__/fixture-cargo-home.js';
|
|
22
23
|
import { CARGO_CLOSURE_INPUT } from './cargo-closure-input.js';
|
|
23
|
-
import {
|
|
24
|
+
import {
|
|
25
|
+
acquireCargoResolveLock,
|
|
26
|
+
type CargoResolve,
|
|
27
|
+
CargoResolveLockError,
|
|
28
|
+
readCargoResolve,
|
|
29
|
+
} from './cargo-source-hash.js';
|
|
24
30
|
import { createNodesV2 } from './index.js';
|
|
25
31
|
|
|
26
32
|
useFixtureCargoHome();
|
|
@@ -193,12 +199,16 @@ function metadataNamed(root: string, name: string) {
|
|
|
193
199
|
packages: [
|
|
194
200
|
{
|
|
195
201
|
id: name,
|
|
202
|
+
name,
|
|
203
|
+
version: '0.1.0',
|
|
196
204
|
source: null,
|
|
197
205
|
manifest_path: join(workspace, 'crates/leaf/Cargo.toml'),
|
|
198
206
|
targets: [{ src_path: join(workspace, 'crates/leaf/src/lib.rs') }],
|
|
199
207
|
},
|
|
200
208
|
{
|
|
201
209
|
id: 'external',
|
|
210
|
+
name: 'external',
|
|
211
|
+
version: '0.1.0',
|
|
202
212
|
source: null,
|
|
203
213
|
manifest_path: join(root, 'external/Cargo.toml'),
|
|
204
214
|
targets: [{ src_path: join(root, 'external/src/lib.rs') }],
|
|
@@ -973,3 +983,62 @@ it('fresh smoo-nx-cargo-hash processes over an unchanged Cargo workspace run Car
|
|
|
973
983
|
expect(await spawned(cargo)).toBe(2);
|
|
974
984
|
});
|
|
975
985
|
}, 120_000);
|
|
986
|
+
|
|
987
|
+
it('a Cargo child that never answers is killed and named at the resolve bound', async () => {
|
|
988
|
+
await withCannedWorkspace(async ({ cargo, answer, workspace, manifest }) => {
|
|
989
|
+
await answer('before');
|
|
990
|
+
await cargo.beforeAnswer.close();
|
|
991
|
+
try {
|
|
992
|
+
const refused = await rejectionOf(readCargoResolve(manifest, workspace, undefined, 100));
|
|
993
|
+
expect(String(refused)).toContain('did not finish within 100ms');
|
|
994
|
+
} finally {
|
|
995
|
+
await cargo.beforeAnswer.open();
|
|
996
|
+
}
|
|
997
|
+
});
|
|
998
|
+
}, 20_000);
|
|
999
|
+
|
|
1000
|
+
it('a held resolve lock times out with its name and elapsed wait and leaves no lock child', async () => {
|
|
1001
|
+
const root = await realpath(await mkdtemp(join(tmpdir(), 'cargo-resolve-lock-')));
|
|
1002
|
+
try {
|
|
1003
|
+
const lockFile = join(root, 'resolve.lock');
|
|
1004
|
+
const holder = new FileLock(lockFile);
|
|
1005
|
+
holder.lock();
|
|
1006
|
+
try {
|
|
1007
|
+
const started = performance.now();
|
|
1008
|
+
const refused = await rejectionOf(acquireCargoResolveLock(lockFile, 100));
|
|
1009
|
+
if (!(refused instanceof CargoResolveLockError)) throw new Error(`unexpected lock refusal: ${refused}`);
|
|
1010
|
+
expect(refused.name).toBe('CargoResolveLockError');
|
|
1011
|
+
expect(refused.message).toContain(lockFile);
|
|
1012
|
+
expect(refused.message).toContain(`waited ${refused.waitedMs}ms`);
|
|
1013
|
+
expect(refused.message).toContain('bound 100ms');
|
|
1014
|
+
expect(refused.waitedMs).toBeGreaterThanOrEqual(100);
|
|
1015
|
+
expect(performance.now() - started).toBeLessThan(1_100);
|
|
1016
|
+
if (refused.waiterPid === undefined) throw new Error('the lock refusal named no spawned waiter');
|
|
1017
|
+
expect(refused.message).toContain(`reaped lock waiter pid ${refused.waiterPid}`);
|
|
1018
|
+
expect(alive(refused.waiterPid)).toBe(false);
|
|
1019
|
+
expect(new FileLock(lockFile).check()).toBe(true);
|
|
1020
|
+
} finally {
|
|
1021
|
+
holder.unlock();
|
|
1022
|
+
}
|
|
1023
|
+
} finally {
|
|
1024
|
+
await rm(root, { recursive: true, force: true });
|
|
1025
|
+
}
|
|
1026
|
+
}, 20_000);
|
|
1027
|
+
|
|
1028
|
+
it('a successful resolve lock lease holds the kernel lock until its child is released and reaped', async () => {
|
|
1029
|
+
const root = await realpath(await mkdtemp(join(tmpdir(), 'cargo-resolve-lease-')));
|
|
1030
|
+
try {
|
|
1031
|
+
const lockFile = join(root, 'resolve.lock');
|
|
1032
|
+
const lease = await acquireCargoResolveLock(lockFile, 5_000);
|
|
1033
|
+
try {
|
|
1034
|
+
expect(alive(lease.pid)).toBe(true);
|
|
1035
|
+
expect(new FileLock(lockFile).check()).toBe(true);
|
|
1036
|
+
} finally {
|
|
1037
|
+
await lease.release();
|
|
1038
|
+
}
|
|
1039
|
+
expect(alive(lease.pid)).toBe(false);
|
|
1040
|
+
expect(new FileLock(lockFile).check()).toBe(false);
|
|
1041
|
+
} finally {
|
|
1042
|
+
await rm(root, { recursive: true, force: true });
|
|
1043
|
+
}
|
|
1044
|
+
}, 20_000);
|