@smoothbricks/nx-plugin 0.4.29 → 0.4.30
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 +83 -15
- package/dist/bin/smoo-nx-test-clocks.d.ts +3 -0
- package/dist/bin/smoo-nx-test-clocks.d.ts.map +1 -0
- package/dist/bin/smoo-nx-test-clocks.js +28 -0
- package/dist/bounded-test-policy.d.ts +1 -8
- package/dist/bounded-test-policy.d.ts.map +1 -1
- package/dist/bounded-test-policy.js +2 -8
- package/dist/cargo-closure-input.d.ts +11 -0
- package/dist/cargo-closure-input.d.ts.map +1 -1
- package/dist/cargo-closure-input.js +16 -6
- package/dist/ensure-built-receipt.d.ts +8 -2
- package/dist/ensure-built-receipt.d.ts.map +1 -1
- package/dist/ensure-built-receipt.js +45 -13
- package/dist/ensure-built-witness.d.ts +40 -4
- package/dist/ensure-built-witness.d.ts.map +1 -1
- package/dist/ensure-built-witness.js +68 -15
- package/dist/ensure-built.d.ts.map +1 -1
- package/dist/ensure-built.js +11 -3
- package/dist/executors/bounded-exec/cpu-pool.d.ts +7 -3
- package/dist/executors/bounded-exec/cpu-pool.d.ts.map +1 -1
- package/dist/executors/bounded-exec/cpu-pool.js +9 -4
- package/dist/executors/bounded-exec/executor.d.ts +1 -1
- package/dist/executors/bounded-exec/executor.d.ts.map +1 -1
- package/dist/executors/bounded-exec/executor.js +35 -12
- package/dist/executors/bounded-exec/no-space.d.ts +8 -0
- package/dist/executors/bounded-exec/no-space.d.ts.map +1 -0
- package/dist/executors/bounded-exec/no-space.js +31 -0
- package/dist/executors/bounded-exec/ram-temp.d.ts +3 -0
- package/dist/executors/bounded-exec/ram-temp.d.ts.map +1 -1
- package/dist/executors/bounded-exec/ram-temp.js +15 -4
- package/dist/executors/bounded-exec/verdict.d.ts +34 -4
- package/dist/executors/bounded-exec/verdict.d.ts.map +1 -1
- package/dist/executors/bounded-exec/verdict.js +54 -3
- package/dist/graph-input-contract.d.ts +4 -0
- package/dist/graph-input-contract.d.ts.map +1 -1
- package/dist/graph-input-contract.js +17 -4
- package/dist/owned-installation.d.ts +14 -0
- package/dist/owned-installation.d.ts.map +1 -0
- package/dist/owned-installation.js +324 -0
- package/dist/producer-receipts.d.ts.map +1 -1
- package/dist/producer-receipts.js +15 -10
- package/dist/test-backstop.d.ts +9 -0
- package/dist/test-backstop.d.ts.map +1 -0
- package/dist/test-backstop.js +10 -0
- package/dist/test-clock-policy.d.ts +30 -0
- package/dist/test-clock-policy.d.ts.map +1 -0
- package/dist/test-clock-policy.js +686 -0
- package/dist/testing.d.ts.map +1 -1
- package/dist/testing.js +8 -1
- package/managed/raw/tooling/direnv/developer-links.ts +1 -8
- package/managed/raw/tooling/direnv/setup-environment.ts +0 -1
- package/package.json +15 -4
- package/src/__tests__/cargo-closure-fixture.ts +113 -0
- package/src/__tests__/counted-cargo.ts +8 -25
- package/src/__tests__/directory-change.ts +27 -0
- package/src/__tests__/owned-installation.ts +4 -164
- package/src/__tests__/past-tick.ts +12 -0
- package/src/bin/smoo-nx-test-clocks.ts +29 -0
- package/src/bounded-test-policy.ts +2 -8
- package/src/cargo-closure-input.property.test.ts +50 -0
- package/src/cargo-closure-input.test.ts +15 -112
- package/src/cargo-closure-input.ts +23 -6
- package/src/cargo-closure-key.test.ts +239 -0
- package/src/cargo-resolve-cache.test.ts +29 -7
- package/src/ensure-built-receipt.ts +56 -13
- package/src/ensure-built-witness.test.ts +113 -4
- package/src/ensure-built-witness.ts +75 -16
- package/src/ensure-built.test.ts +74 -2
- package/src/ensure-built.ts +13 -2
- package/src/executors/bounded-exec/cpu-pool.test.ts +18 -0
- package/src/executors/bounded-exec/cpu-pool.ts +10 -4
- package/src/executors/bounded-exec/disk-lease.test.ts +47 -13
- package/src/executors/bounded-exec/executor-host.test.ts +23 -11
- package/src/executors/bounded-exec/executor.test.ts +189 -63
- package/src/executors/bounded-exec/executor.ts +36 -11
- package/src/executors/bounded-exec/hang-diagnostics.test.ts +14 -8
- package/src/executors/bounded-exec/no-space.ts +40 -0
- package/src/executors/bounded-exec/ram-temp-host.test.ts +9 -8
- package/src/executors/bounded-exec/ram-temp.test.ts +32 -18
- package/src/executors/bounded-exec/ram-temp.ts +17 -4
- package/src/executors/bounded-exec/verdict.test.ts +125 -25
- package/src/executors/bounded-exec/verdict.ts +78 -3
- package/src/graph-input-contract.test.ts +8 -0
- package/src/graph-input-contract.ts +26 -4
- package/src/nextest-extraction.test.ts +114 -4
- package/src/nx-daemon-claim.test.ts +5 -3
- package/src/nx-daemon-idle-policy.test.ts +22 -18
- package/src/nx-daemon-validity.test.ts +5 -13
- package/src/owned-installation.ts +174 -0
- package/src/producer-receipts.ts +15 -10
- package/src/test-backstop.ts +11 -0
- package/src/test-clock-policy.test.ts +338 -0
- package/src/test-clock-policy.ts +708 -0
- package/src/testing.ts +8 -1
- package/test-timings.json +3 -0
package/README.md
CHANGED
|
@@ -604,6 +604,35 @@ reviewer, who decide whether the variants share one walk:
|
|
|
604
604
|
A separate case stays only for a distinct boundary or edge: its setup or path diverges, or it needs a state the walk's
|
|
605
605
|
earlier steps destroy. Each diagnostic names the file, both cases, the shared statement count and that remedy.
|
|
606
606
|
|
|
607
|
+
## Test Clock Policy
|
|
608
|
+
|
|
609
|
+
A test's duration is a property of its work, not of the host ("Bounded Test Targets"). Consuming repositories enforce
|
|
610
|
+
this in their root Nx lint with the `smoo-nx-test-clocks` bin, which refuses four kinds of site in test code with
|
|
611
|
+
`error[TEST-CLOCK-ORACLE]`:
|
|
612
|
+
|
|
613
|
+
- **runner-deadline:** a deadline handed to the test runner: a number or `{ timeout }` after a `test`/`it`/`test.each`
|
|
614
|
+
body, or `setDefaultTimeout`. Delete it and put nothing in its place.
|
|
615
|
+
- **test-deadline:** a Rust test's own deadline: `recv_timeout`, `park_timeout` or `timeout` bounded by a literal
|
|
616
|
+
`Duration` below the no-progress backstop, whose expiry fails the case (`.expect`, `.unwrap`). A quiet window
|
|
617
|
+
(`timeout(d, f).await.is_err()`) is not a deadline.
|
|
618
|
+
- **clock-delta:** an assertion that elapsed host time stays under a bound, such as
|
|
619
|
+
`expect(Date.now() - started).toBeLessThan(5_000)` or `assert!(started.elapsed() < d)`. Lower bounds, ordering against
|
|
620
|
+
a product timestamp, epoch stamps, CPU time and injected clocks pass.
|
|
621
|
+
- **clocked-bound:** a literal product bound below the backstop in a case whose stand-in a timer or sleep ends
|
|
622
|
+
(`{ command: 'node -e "setTimeout(() => {}, 5000)"', timeoutMs: 50 }`). The bound races the stand-in's clock. A bound
|
|
623
|
+
that is the case's subject, with the event that would beat it held off by construction (a child that never answers),
|
|
624
|
+
passes. So does one that cannot decide: `0` (disabled) or at `BOUNDED_TEST_IDLE_TIMEOUT_MS`.
|
|
625
|
+
|
|
626
|
+
A Rust fn on paused tokio time (`tokio::time::pause()`, `start_paused = true`) runs on virtual time and is not examined.
|
|
627
|
+
Like `smoo-nx-test-walks`, the bin judges only what changed since `upstreamBase`, the same base the lint target's
|
|
628
|
+
runtime input already prints. A site in a case that overlaps a change is judged; the whole case is read, so an edit
|
|
629
|
+
cannot keep an old site. A site outside any case is judged when its own line changed. The check stops new sites and
|
|
630
|
+
removes none, so existing sites need no allowance table. It cannot see: a bound passed positionally or held outside the
|
|
631
|
+
case; a stand-in in another file; a bound below the backstop beside untimed real work; a clock read through a helper;
|
|
632
|
+
`if (…) throw` and `while` deadline guards; Rust socket-option deadlines; timer waits themselves.
|
|
633
|
+
`findClockOracles(root, files, changes)` and `formatClockOracle` are exported from
|
|
634
|
+
`@smoothbricks/nx-plugin/test-clock-policy`.
|
|
635
|
+
|
|
607
636
|
## Nx Target Naming
|
|
608
637
|
|
|
609
638
|
Target names are `{tool}-{output}` names. Use names like `tsc-js`, `tsdown-js`, and `cargo-wasm`; `build` and `lint` are
|
|
@@ -643,8 +672,12 @@ Concrete targets come from concrete files:
|
|
|
643
672
|
`cargo metadata` reports for the runner's Cargo workspace, so a `build.target-dir` setting moves the extractions with
|
|
644
673
|
the build tree. An extraction is per-checkout tool state like the rest of that tree, never an Nx output: it lives in
|
|
645
674
|
Cargo's build tree, which a checkout with a build volume keeps off its source tree, and it never sits under a declared
|
|
646
|
-
output such as `.cache/nextest`. `cargo clean` removes it.
|
|
647
|
-
|
|
675
|
+
output such as `.cache/nextest`. `cargo clean` removes it. A repository's own target that runs tests from the
|
|
676
|
+
workspace archive calls the same helper and passes the same reuse flags: `nextest run --archive-file` unpacks the
|
|
677
|
+
whole archive into a fresh directory under its `TMPDIR`, which for a `bounded-exec` task on macOS is a lease on the
|
|
678
|
+
shared RAM volume (measured: a 548 MB archive unpacks to 1.97 GiB, and four such tasks filled the 8 GiB volume). The
|
|
679
|
+
RAM lease holds what tests write, never the binaries they run. `--workspace-remap` is required — an archive records
|
|
680
|
+
the producing tree's absolute paths, and without it a restored archive hands tests another checkout's
|
|
648
681
|
`CARGO_MANIFEST_DIR`. With it the archive is relocatable, so one cache entry serves every checkout of the same commit;
|
|
649
682
|
nextest re-points `CARGO_BIN_EXE_<name>`/`NEXTEST_BIN_EXE_<name>` at the extracted binaries at runtime, but a test
|
|
650
683
|
that reads them through the compile-time `env!` macro keeps the producing tree's path. Per-crate runners accept an
|
|
@@ -837,6 +870,20 @@ without a file declaration it conservatively retains the whole package tree.
|
|
|
837
870
|
Ancestor directories bind device/inode/type/mode path identity; files and symlinks retain their full stamps, and a
|
|
838
871
|
directory is upgraded to a full nanosecond node/namespace stamp when its membership is actually read.
|
|
839
872
|
|
|
873
|
+
**A stamp read in the tick its node changed in is unproven, not unchanged.** A filesystem dates a change by the kernel's
|
|
874
|
+
clock. On Linux, on a filesystem without fine-grained timestamps such as ZFS, that clock moves once a jiffy: 1 ms at
|
|
875
|
+
`CONFIG_HZ=1000`, as on CI's runner, and 10 ms at `CONFIG_HZ=100`, the slowest. A same-size rewrite in the tick a stamp
|
|
876
|
+
was read in leaves every field of that stamp as it was. So a census reads the clock before its first stat, and records a
|
|
877
|
+
node whose later of ctime and mtime is within 10 ms of that time with its ctime `unproven`, which no later read equals.
|
|
878
|
+
This is git's racily clean rule (`Documentation/technical/racy-git.txt`), and the Nx archive repair below applies it to
|
|
879
|
+
Nx's own file hashes. Node can read neither the jiffy nor a filesystem's granularity, and a shorter window reopens the
|
|
880
|
+
gap on a slower kernel, so the window is the slowest tick and is not an option. A reader that meets an unproven stamp
|
|
881
|
+
re-reads the node against its recorded bytes, link text or membership, as it does a node whose ctime alone moved; one
|
|
882
|
+
that holds nothing to re-read it against counts it moved. A census whose stamps stand in for no bytes of their own (the
|
|
883
|
+
installed-package census and the local plugin modules, which hash every byte on every read) records them as read. So
|
|
884
|
+
does a workspace capture's own stability check, which compares the stamps it read: only the capture after it distrusts
|
|
885
|
+
them.
|
|
886
|
+
|
|
840
887
|
A physically missing required factory after the clean cutover is an invalid installation and fails loudly; it is not a
|
|
841
888
|
proof miss that can fall back to the graph RPC. Consumers adopt the normal static import only after the public producer
|
|
842
889
|
is available.
|
|
@@ -852,9 +899,10 @@ error, or a write observed during the comparison is a miss.
|
|
|
852
899
|
A successful byte comparison may retain a cache-bound node inventory in that same Nx workspace-data directory. It binds
|
|
853
900
|
the exact task hashes, declared outputs and artifact paths to every compared working-tree/cache node and both sets of
|
|
854
901
|
real parent directories. Reuse requires the same device, inode, type/permission mode, length and nanosecond mtime/ctime
|
|
855
|
-
for all those nodes
|
|
856
|
-
|
|
857
|
-
|
|
902
|
+
for all those nodes, and a node the comparison read in the tick it changed in is recorded unproven, so the next
|
|
903
|
+
comparison is a full one. It is evidence of the same previously compared bytes, never source identity or an mtime
|
|
904
|
+
freshness rule. Missing/unreadable evidence or moved nodes require a full comparison; mutations to either the cache or
|
|
905
|
+
working tree, parent symlink replacement, and directory membership changes cannot borrow an old equality verdict.
|
|
858
906
|
|
|
859
907
|
`probeBuilt({ target, cwd })` is the distinct typed read-only product operation. Its `hit` is an actual published
|
|
860
908
|
`EnsureBuiltReceipt`, not a cache hit re-probed under the consumer's environment. The producer opts into publication in
|
|
@@ -878,21 +926,24 @@ stable through publication, and every refusal that one moved names the first nod
|
|
|
878
926
|
node whose device, inode, mode, size and mtime are unchanged and only its ctime moved is re-read and compared with its
|
|
879
927
|
recorded bytes, link text and membership, as any moved stamp requires a full comparison: under `globalStore` the closure
|
|
880
928
|
lives in Bun's install cache, which every checkout on the machine shares, and linking a package's bin on any of their
|
|
881
|
-
installs re-chmods the store file to the mode it already has.
|
|
882
|
-
|
|
883
|
-
|
|
884
|
-
|
|
885
|
-
|
|
886
|
-
|
|
929
|
+
installs re-chmods the store file to the mode it already has. A source, tool or output node the census read in the tick
|
|
930
|
+
it changed in, as a task's last writes are, is recorded unproven and re-read the same way. The command's stdout/stderr
|
|
931
|
+
digest is not a product digest. The bound tool/module inputs are the installed closures of Nx, this plugin, TypeScript
|
|
932
|
+
and local graph plugins, and the producer executables. A task's npm external inputs (`AllExternalDependencies` and the
|
|
933
|
+
npm nodes of its project's dependency closure) are Nx's lockfile identities: the task's hash details and the committed
|
|
934
|
+
`bun.lock` bind them, and no installed closure is resolved for them, since under Bun's isolated linker most of them do
|
|
935
|
+
not resolve from the task's project.
|
|
887
936
|
|
|
888
937
|
Validity compares the committed tree, not the current HEAD spelling. An empty commit with an identical tree keeps the
|
|
889
938
|
receipt valid and its original basis SHA unchanged; the consumer never rewrites that provenance. A genuinely changed
|
|
890
939
|
tree invalidates the receipt. Multi-target consumers require one tree and retain each producer's actual basis.
|
|
891
940
|
|
|
892
941
|
The consumer validates this stored receipt against its declared target, committed-tree/configuration identity, declared
|
|
893
|
-
environment/tool inputs and actual output census. It never re-hashes the provider's task graph in its own environment.
|
|
894
|
-
|
|
895
|
-
|
|
942
|
+
environment/tool inputs and actual output census. It never re-hashes the provider's task graph in its own environment.
|
|
943
|
+
Its read of the recorded tools must stay stable through that census on the same terms as the producer's: a tool node
|
|
944
|
+
whose ctime alone moved is re-read and compared with the receipt, and a refusal names the nodes that moved. A valid
|
|
945
|
+
receipt is the hit. A missing, mismatched, stale or unbound receipt requires the authoritative graph RPC, then a loud
|
|
946
|
+
miss/refusal without running a target or writing provider outputs. A managed consumer requires the installed
|
|
896
947
|
`probeBuilt` operation and the complete producer-receipt contract; an old receipt lacking it refuses, never falls back
|
|
897
948
|
to `ensureBuilt` or a producer writer. `ensureBuilt` remains the normal build/stream operation with its existing
|
|
898
949
|
hit/built/failed results and Nx's current source/cache/artifact verdict.
|
|
@@ -1256,7 +1307,10 @@ started with lies in the lease. Most leftovers write there only through `TMPDIR`
|
|
|
1256
1307
|
sources, a Bun or Node compile cache written at exit), and a working-directory census alone let them write into a lease
|
|
1257
1308
|
while it was removed, failing the next task's lease with `ENOTEMPTY`. A target's own `env.TMPDIR` wins over the lease.
|
|
1258
1309
|
Inside a cowshed sandbox, which cannot write the lock in `/private/tmp`, the task keeps its inherited `TMPDIR` and says
|
|
1259
|
-
so once. A failed task
|
|
1310
|
+
so once. A failed task whose output said ENOSPC (`ENOSPC`, or `strerror`'s `No space left on device`) names it, the
|
|
1311
|
+
writer's task and lease, and the volume's free space read when that line arrived, and records the `no-space` verdict:
|
|
1312
|
+
the writer usually removes what it half-wrote before it exits, so the volume no longer looks full by then. A failed task
|
|
1313
|
+
that printed no such line but left the volume nearly full names the volume.
|
|
1260
1314
|
|
|
1261
1315
|
Outside macOS, the executor never provisions an APFS RAM disk: it keeps the inherited `TMPDIR`, or uses the target's
|
|
1262
1316
|
`env.TMPDIR` override, without reclaiming either directory. The host temp-directory proof runs the real default executor
|
|
@@ -1432,6 +1486,10 @@ task id and the hash it ran at:
|
|
|
1432
1486
|
this is a hang, never load. Its `tests` name the tests still running: those the runner said were running (nextest's
|
|
1433
1487
|
`SLOW`, libtest's `has been running for over`) and never said finished, and those the JUnit report says it aborted
|
|
1434
1488
|
when the bound stopped it.
|
|
1489
|
+
- `no-space`: the command failed after its output said a write found no space (`ENOSPC` or `No space left on device`).
|
|
1490
|
+
Its tests failed on the disk, not on their own, whatever bound or hang followed: it records that line and, when the
|
|
1491
|
+
task held a RAM lease, the lease, the volume and its free bytes when the line arrived. A passing run that printed such
|
|
1492
|
+
a line passed.
|
|
1435
1493
|
- `failed`: a test failed on its own, or the command exited non-zero with no report naming a timeout.
|
|
1436
1494
|
- `passed`.
|
|
1437
1495
|
|
|
@@ -1542,6 +1600,16 @@ tests) owns those roots:
|
|
|
1542
1600
|
A fixture retires on every exit path, a throwing body included: stop its daemon, unlink its socket alias, then delete
|
|
1543
1601
|
its root. A daemon that outlives the stop keeps the alias and the root, so the next run's sweep still finds both.
|
|
1544
1602
|
|
|
1603
|
+
A fixture workspace that runs real Nx with this plugin links an installation it owns, never the host's.
|
|
1604
|
+
`@smoothbricks/nx-plugin/owned-installation`'s `ownedInstallation(censusRoot, makeRoot)` copies the closure the graph
|
|
1605
|
+
witness's installation census resolves from `censusRoot` (Nx, this plugin and TypeScript, each package with its
|
|
1606
|
+
dependency edges relinked beside it and the top-level bins in `.bin`) into the empty directory `makeRoot` creates, on
|
|
1607
|
+
the first `nodeModules()`, and proves the copy. `retire()` fails, naming the changed nodes, if a fixture wrote into it,
|
|
1608
|
+
then deletes it. The host's closure moves under a fixture that reads it: a shared Bun store relinked by another install,
|
|
1609
|
+
or, in a workspace that developer-links this plugin, the checkout its author is editing and rebuilding. Either fails the
|
|
1610
|
+
producer receipt's installation proof for work that is not the test's. This package's tests bind `censusRoot` to this
|
|
1611
|
+
repository; a consumer binds it to its own workspace root.
|
|
1612
|
+
|
|
1545
1613
|
## Managed workspace files
|
|
1546
1614
|
|
|
1547
1615
|
`nx generate @smoothbricks/nx-plugin:managed-files` stages the same managed files as `smoo monorepo update`, without
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"smoo-nx-test-clocks.d.ts","sourceRoot":"","sources":["../../src/bin/smoo-nx-test-clocks.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
import { findClockOracles, formatClockOracle, TEST_CLOCK_ORACLE } from '../test-clock-policy.js';
|
|
3
|
+
import { diffScope, upstreamBase } from '../test-walk-policy.js';
|
|
4
|
+
// TEST-CLOCK-ORACLE over the current directory's repository, judged on the cases changed since the upstream merge base
|
|
5
|
+
// (`upstreamBase`, the base `smoo-nx-test-walks --base` prints for the lint target's runtime input). Every finding
|
|
6
|
+
// prints `error[…]` and exits 1. Exit 2 when git cannot answer.
|
|
7
|
+
if (process.argv.length > 2) {
|
|
8
|
+
process.stderr.write('usage: smoo-nx-test-clocks\n');
|
|
9
|
+
process.exit(2);
|
|
10
|
+
}
|
|
11
|
+
const root = process.cwd();
|
|
12
|
+
const base = upstreamBase(root);
|
|
13
|
+
if (!base.ok) {
|
|
14
|
+
process.stderr.write(`${TEST_CLOCK_ORACLE.id} cannot find the upstream base: ${base.reason}\n`);
|
|
15
|
+
process.exit(2);
|
|
16
|
+
}
|
|
17
|
+
const scope = diffScope(root, base.value);
|
|
18
|
+
if (!scope.ok) {
|
|
19
|
+
process.stderr.write(`${TEST_CLOCK_ORACLE.id} cannot read the changes since ${base.value}: ${scope.reason}\n`);
|
|
20
|
+
process.exit(2);
|
|
21
|
+
}
|
|
22
|
+
const oracles = findClockOracles(root, scope.value.files, scope.value.changes);
|
|
23
|
+
for (const oracle of oracles)
|
|
24
|
+
process.stderr.write(`${formatClockOracle(oracle)}\n`);
|
|
25
|
+
if (oracles.length > 0)
|
|
26
|
+
process.exit(1);
|
|
27
|
+
process.stdout.write(`${TEST_CLOCK_ORACLE.id} passed: no changed test case carries a runner deadline, bounds elapsed host time or races ` +
|
|
28
|
+
`a configured bound against a timer (base ${base.value}).\n`);
|
|
@@ -1,13 +1,6 @@
|
|
|
1
1
|
import type { PackageTargetPolicyOptions, ResolvedProjectTargets } from './package-target-policy.js';
|
|
2
|
+
export { BOUNDED_TEST_IDLE_TIMEOUT_MS, BOUNDED_TEST_KILL_AFTER_MS } from './test-backstop.js';
|
|
2
3
|
export declare const BOUNDED_TEST_EXECUTOR = "@smoothbricks/nx-plugin:bounded-exec";
|
|
3
|
-
/**
|
|
4
|
-
* A test target's one bound: the `idleTimeoutMs` with which no test may go unfinished, the hang backstop of
|
|
5
|
-
* specs/cowshed/08_testing.md. It is no wall-clock ceiling: a suite that keeps finishing tests runs as long as it
|
|
6
|
-
* needs. It is the longest any single test may run, so it stays above every slow-timeout class in the plugin's
|
|
7
|
-
* nextest.toml; a bun leg has no per-test deadline of its own (`BUN_TEST_TIMEOUT_FLAG`).
|
|
8
|
-
*/
|
|
9
|
-
export declare const BOUNDED_TEST_IDLE_TIMEOUT_MS = 180000;
|
|
10
|
-
export declare const BOUNDED_TEST_KILL_AFTER_MS = 10000;
|
|
11
4
|
/**
|
|
12
5
|
* Deletes Bun's per-test deadline: 5000 ms unless the command sets one, and Bun ignores a bunfig `[test] timeout`, so
|
|
13
6
|
* the flag is the one place to set it. `0` means no deadline (measured on the pinned Bun 1.4.2: a test blocked 12 s in
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bounded-test-policy.d.ts","sourceRoot":"","sources":["../src/bounded-test-policy.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,0BAA0B,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"bounded-test-policy.d.ts","sourceRoot":"","sources":["../src/bounded-test-policy.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,0BAA0B,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAIrG,OAAO,EAAE,4BAA4B,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAC9F,eAAO,MAAM,qBAAqB,yCAAyC,CAAC;AAC5E;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AAEnD,MAAM,WAAW,4BAA4B;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,EAAE,CAAC,EAAE;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;KACnD,CAAC;CACH;AAED,MAAM,WAAW,4BAA4B;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CACnD;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,mCAAmC;IAClD,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,4BAA4B,CAAC;IAC3C,eAAe,CAAC,EAAE,sBAAsB,CAAC;CAC1C;AAED,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,4BAA4B,EACzC,OAAO,EAAE,mCAAmC,GAC3C,IAAI,CAuBN;AAED,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,0BAA+B,GAAG,OAAO,CAiCrH;AAED,wBAAgB,qCAAqC,CACnD,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,0BAA+B,GACvC,sBAAsB,EAAE,CA4B1B;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,yCAAyC,CACvD,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,0BAA+B,GACvC,sBAAsB,EAAE,CAwC1B;AAiID,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,4BAA4B,EACzC,OAAO,EAAE,mCAAmC,GAC3C,OAAO,CAqBT;AA8KD,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAElE;AAED,wBAAgB,kBAAkB,CAChC,WAAW,EAAE,4BAA4B,EACzC,cAAc,SAAa,EAC3B,WAAW,CAAC,EAAE,4BAA4B,GACzC,MAAM,CAER;AA4CD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAYhE"}
|
|
@@ -3,16 +3,10 @@ import { dirname, join } from 'node:path';
|
|
|
3
3
|
import { expandWildcardTargetConfiguration } from 'nx/src/tasks-runner/utils.js';
|
|
4
4
|
import { CARGO_TEST_ARCHIVE_TARGET, CARGO_TEST_COMPILE_TARGET, CARGO_TEST_TARGET, listCargoWorkspacePackages, packageNameFromCargoTestTarget, } from './cargo-workspace.js';
|
|
5
5
|
import { writeJsonFile } from './managed-files/managed-format.js';
|
|
6
|
+
import { BOUNDED_TEST_IDLE_TIMEOUT_MS, BOUNDED_TEST_KILL_AFTER_MS } from './test-backstop.js';
|
|
6
7
|
import { isTestRunnerTargetName } from './workspace-config-policy.js';
|
|
8
|
+
export { BOUNDED_TEST_IDLE_TIMEOUT_MS, BOUNDED_TEST_KILL_AFTER_MS } from './test-backstop.js';
|
|
7
9
|
export const BOUNDED_TEST_EXECUTOR = '@smoothbricks/nx-plugin:bounded-exec';
|
|
8
|
-
/**
|
|
9
|
-
* A test target's one bound: the `idleTimeoutMs` with which no test may go unfinished, the hang backstop of
|
|
10
|
-
* specs/cowshed/08_testing.md. It is no wall-clock ceiling: a suite that keeps finishing tests runs as long as it
|
|
11
|
-
* needs. It is the longest any single test may run, so it stays above every slow-timeout class in the plugin's
|
|
12
|
-
* nextest.toml; a bun leg has no per-test deadline of its own (`BUN_TEST_TIMEOUT_FLAG`).
|
|
13
|
-
*/
|
|
14
|
-
export const BOUNDED_TEST_IDLE_TIMEOUT_MS = 180_000;
|
|
15
|
-
export const BOUNDED_TEST_KILL_AFTER_MS = 10_000;
|
|
16
10
|
/**
|
|
17
11
|
* Deletes Bun's per-test deadline: 5000 ms unless the command sets one, and Bun ignores a bunfig `[test] timeout`, so
|
|
18
12
|
* the flag is the one place to set it. `0` means no deadline (measured on the pinned Bun 1.4.2: a test blocked 12 s in
|
|
@@ -70,5 +70,16 @@ export declare function resolveCargoClosureSource(manifest: string, workspaceRoo
|
|
|
70
70
|
* under a key no later run of the same tree computes.
|
|
71
71
|
*/
|
|
72
72
|
export declare function cargoClosureInputs(projectRoot: string, sources: readonly CargoClosureSource[]): Promise<Input[]>;
|
|
73
|
+
/** A compiled-in file and the source whose `include_str!`/`include_bytes!` names it, relative to the workspace root. */
|
|
74
|
+
export interface CompiledInclusion {
|
|
75
|
+
readonly declaring: string;
|
|
76
|
+
readonly file: string;
|
|
77
|
+
}
|
|
78
|
+
/**
|
|
79
|
+
* The compiled-in files a `cargoClosure` names, sorted: each one Nx's file index holds together with the source that
|
|
80
|
+
* includes it. `held` is the index's answer for exactly those paths. A file it does not hold is a build output or
|
|
81
|
+
* ignored, and naming it would key the graph on whatever last wrote it rather than on the tree.
|
|
82
|
+
*/
|
|
83
|
+
export declare function indexedCompiledFiles(compiledIn: readonly CompiledInclusion[], held: ReadonlySet<string>): string[];
|
|
73
84
|
export {};
|
|
74
85
|
//# sourceMappingURL=cargo-closure-input.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cargo-closure-input.d.ts","sourceRoot":"","sources":["../src/cargo-closure-input.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,kBAAkB,EAKxB,MAAM,wBAAwB,CAAC;AAIhC;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,iBAAiB,CAAC;AAElD,KAAK,KAAK,GAAG,WAAW,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAEhE,mFAAmF;AACnF,qBAAa,sBAAuB,SAAQ,KAAK;IAC/C,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAE7B,YAAY,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAS9C;CACF;AAgBD;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,4FAA4F;IAC5F,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,uCAAuC;IACvC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,6EAA6E;IAC7E,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACtC,QAAQ,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC;CAChE;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAE/F;AAED;;;;GAIG;AACH,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EACrC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,GACpD,OAAO,CAAC,kBAAkB,CAAC,CAI7B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,SAAS,kBAAkB,EAAE,GACrC,OAAO,CAAC,KAAK,EAAE,CAAC,CAelB"}
|
|
1
|
+
{"version":3,"file":"cargo-closure-input.d.ts","sourceRoot":"","sources":["../src/cargo-closure-input.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,kBAAkB,EAKxB,MAAM,wBAAwB,CAAC;AAIhC;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,iBAAiB,CAAC;AAElD,KAAK,KAAK,GAAG,WAAW,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAEhE,mFAAmF;AACnF,qBAAa,sBAAuB,SAAQ,KAAK;IAC/C,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAE7B,YAAY,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAS9C;CACF;AAgBD;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,4FAA4F;IAC5F,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,uCAAuC;IACvC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,6EAA6E;IAC7E,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACtC,QAAQ,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC;CAChE;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAE/F;AAED;;;;GAIG;AACH,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EACrC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,GACpD,OAAO,CAAC,kBAAkB,CAAC,CAI7B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,SAAS,kBAAkB,EAAE,GACrC,OAAO,CAAC,KAAK,EAAE,CAAC,CAelB;AA8FD,wHAAwH;AACxH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,SAAS,iBAAiB,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,CAMlH"}
|
|
@@ -102,7 +102,7 @@ async function workspaceClosureInputs(projectRoot, source) {
|
|
|
102
102
|
const packageDirectories = [];
|
|
103
103
|
const files = [];
|
|
104
104
|
const compiledIn = [];
|
|
105
|
-
|
|
105
|
+
let compiledFiles = [];
|
|
106
106
|
let external = false;
|
|
107
107
|
try {
|
|
108
108
|
const members = await dependencyClosure(cargo, join(root, projectRoot));
|
|
@@ -141,10 +141,7 @@ async function workspaceClosureInputs(projectRoot, source) {
|
|
|
141
141
|
throw new Error(`${unglobbable} contains glob syntax, so no fileset can name it`);
|
|
142
142
|
// Literal paths, so each matches exactly itself in the index.
|
|
143
143
|
const held = new Set(compiledPaths.length === 0 ? [] : await globIndexedFiles(source.workspaceRoot, compiledPaths));
|
|
144
|
-
|
|
145
|
-
if (held.has(declaring) && held.has(file))
|
|
146
|
-
compiledFiles.add(file);
|
|
147
|
-
}
|
|
144
|
+
compiledFiles = indexedCompiledFiles(compiledIn, held);
|
|
148
145
|
}
|
|
149
146
|
catch (error) {
|
|
150
147
|
throw new CargoClosureInputError(projectRoot, error);
|
|
@@ -183,11 +180,24 @@ async function workspaceClosureInputs(projectRoot, source) {
|
|
|
183
180
|
...packageGlobs.map((glob) => anchored(glob, PACKAGE_FILES)),
|
|
184
181
|
...packageGlobs.map((glob) => `!${anchored(glob, SKIPPED_TREES)}`),
|
|
185
182
|
...[...ancestors].sort().map((ancestor) => anchored(ancestor, ANCESTOR_FILES)),
|
|
186
|
-
...
|
|
183
|
+
...compiledFiles.map((file) => anchored(file)),
|
|
187
184
|
...[...loose].sort().map((file) => anchored(file)),
|
|
188
185
|
...(external ? [runtimeInput(`${CARGO_HASH_COMMAND} ${closureArguments}`)] : []),
|
|
189
186
|
];
|
|
190
187
|
}
|
|
188
|
+
/**
|
|
189
|
+
* The compiled-in files a `cargoClosure` names, sorted: each one Nx's file index holds together with the source that
|
|
190
|
+
* includes it. `held` is the index's answer for exactly those paths. A file it does not hold is a build output or
|
|
191
|
+
* ignored, and naming it would key the graph on whatever last wrote it rather than on the tree.
|
|
192
|
+
*/
|
|
193
|
+
export function indexedCompiledFiles(compiledIn, held) {
|
|
194
|
+
const named = new Set();
|
|
195
|
+
for (const { declaring, file } of compiledIn) {
|
|
196
|
+
if (held.has(declaring) && held.has(file))
|
|
197
|
+
named.add(file);
|
|
198
|
+
}
|
|
199
|
+
return [...named].sort();
|
|
200
|
+
}
|
|
191
201
|
/**
|
|
192
202
|
* `path` relative to the workspace root, `/`-separated, when it is somewhere
|
|
193
203
|
* Nx's file index can hold: inside the workspace and not under `node_modules`.
|
|
@@ -37,8 +37,14 @@ export interface ProducerSourceWitness {
|
|
|
37
37
|
export declare function receiptGit(root: string, args: string[]): ReceiptEvidence<string>;
|
|
38
38
|
/** NUL-delimited paths preserve whitespace, rename sources and index-only changes. */
|
|
39
39
|
export declare function dirtyProviderPaths(status: string): string[];
|
|
40
|
-
/**
|
|
41
|
-
|
|
40
|
+
/**
|
|
41
|
+
* One independently read node; absolute paths also serve tool/package closures. A census records the node's stamp as
|
|
42
|
+
* of its `start` (recordedStamp); a re-read against a record records none.
|
|
43
|
+
*/
|
|
44
|
+
export declare function receiptNode(path: string, name: string, census?: {
|
|
45
|
+
readonly start: bigint;
|
|
46
|
+
readonly observed: NodeWitness[];
|
|
47
|
+
}): EnsureBuiltOutputReceipt;
|
|
42
48
|
/** Capture every tracked source byte at pre. Unrelated untracked files are not source basis. */
|
|
43
49
|
export declare function captureProducerSource(root: string, outputs: readonly string[]): ReceiptEvidence<ProducerSourceWitness>;
|
|
44
50
|
export declare function producerSourceUnchanged(root: string, before: ProducerSourceWitness): ReceiptEvidence<true>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-built-receipt.d.ts","sourceRoot":"","sources":["../src/ensure-built-receipt.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ensure-built-receipt.d.ts","sourceRoot":"","sources":["../src/ensure-built-receipt.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { spawnSync } from 'node:child_process';
|
|
2
2
|
import { createHash } from 'node:crypto';
|
|
3
|
-
import { closeSync, lstatSync, openSync, readdirSync, readlinkSync, readSync, realpathSync } from 'node:fs';
|
|
4
|
-
import { isAbsolute, join } from 'node:path';
|
|
3
|
+
import { closeSync, lstatSync, openSync, readdirSync, readFileSync, readlinkSync, readSync, realpathSync, } from 'node:fs';
|
|
4
|
+
import { isAbsolute, join, relative } from 'node:path';
|
|
5
5
|
import { CARGO_TOOLCHAIN_PIN_INPUTS, cargoRuntimeInput } from './cargo-toolchain-policy.js';
|
|
6
|
-
import {
|
|
6
|
+
import { censusStart, movedNodes, recordedStamp } from './ensure-built-witness.js';
|
|
7
7
|
/**
|
|
8
8
|
* Git as receipts read it: the checkout and nothing of the operator's home. The producer hooks run in whichever process
|
|
9
9
|
* Nx runs plugins in, a workspace's sandboxed daemon included, which adopts a host client's HOME; git with that HOME
|
|
@@ -108,10 +108,13 @@ function sourceFileDigests(path, size, algorithm) {
|
|
|
108
108
|
}
|
|
109
109
|
return { gitBlob: blob.digest('hex'), sha256: raw.digest('hex') };
|
|
110
110
|
}
|
|
111
|
-
/**
|
|
112
|
-
|
|
111
|
+
/**
|
|
112
|
+
* One independently read node; absolute paths also serve tool/package closures. A census records the node's stamp as
|
|
113
|
+
* of its `start` (recordedStamp); a re-read against a record records none.
|
|
114
|
+
*/
|
|
115
|
+
export function receiptNode(path, name, census) {
|
|
113
116
|
const stats = lstatSync(path, { bigint: true });
|
|
114
|
-
observed.push({ path, stamp:
|
|
117
|
+
census?.observed.push({ path, stamp: recordedStamp(stats, census.start) });
|
|
115
118
|
const mode = Number(stats.mode & 4095n);
|
|
116
119
|
if (stats.isFile())
|
|
117
120
|
return { path: name, type: 'file', mode, sha256: hashFile(path, Number(stats.size), ['sha256'], false)[0] };
|
|
@@ -129,6 +132,17 @@ export function receiptNode(path, name, observed) {
|
|
|
129
132
|
}
|
|
130
133
|
throw new Error(`Unsupported receipt node ${path}`);
|
|
131
134
|
}
|
|
135
|
+
/**
|
|
136
|
+
* Whether a tracked source node whose stamp does not prove it (its ctime alone moved, or it was read in the tick it
|
|
137
|
+
* changed in) still holds the bytes or link text `files` recorded for it.
|
|
138
|
+
*/
|
|
139
|
+
function recordedSource(root, files) {
|
|
140
|
+
const recorded = new Map(files.map((file) => [join(root, file.path), file.sha256]));
|
|
141
|
+
return (path) => recorded.get(path) ===
|
|
142
|
+
createHash('sha256')
|
|
143
|
+
.update(lstatSync(path).isSymbolicLink() ? readlinkSync(path) : readFileSync(path))
|
|
144
|
+
.digest('hex');
|
|
145
|
+
}
|
|
132
146
|
/** Capture every tracked source byte at pre. Unrelated untracked files are not source basis. */
|
|
133
147
|
export function captureProducerSource(root, outputs) {
|
|
134
148
|
try {
|
|
@@ -151,6 +165,7 @@ export function captureProducerSource(root, outputs) {
|
|
|
151
165
|
const excluded = new Set(outputs.filter((path) => !graphConfiguration(path)));
|
|
152
166
|
const nodes = [];
|
|
153
167
|
const files = [];
|
|
168
|
+
const start = censusStart();
|
|
154
169
|
for (const entry of listed.value.split('\0')) {
|
|
155
170
|
if (entry === '')
|
|
156
171
|
continue;
|
|
@@ -165,7 +180,7 @@ export function captureProducerSource(root, outputs) {
|
|
|
165
180
|
continue;
|
|
166
181
|
const path = join(root, file);
|
|
167
182
|
const stats = lstatSync(path, { bigint: true });
|
|
168
|
-
nodes.push({ path, stamp:
|
|
183
|
+
nodes.push({ path, stamp: recordedStamp(stats, start) });
|
|
169
184
|
const actualMode = stats.isSymbolicLink() ? '120000' : (stats.mode & 73n) !== 0n ? '100755' : '100644';
|
|
170
185
|
if (actualMode !== mode)
|
|
171
186
|
return { ok: false, detail: `Tracked source mode differs from HEAD: ${file}` };
|
|
@@ -196,7 +211,7 @@ export function captureProducerSource(root, outputs) {
|
|
|
196
211
|
const dirty = dirtyProviderPaths(status.value).filter((path) => !excluded.has(path));
|
|
197
212
|
if (dirty.length !== 0)
|
|
198
213
|
return { ok: false, detail: `Tracked source/index differs from ${head}: ${dirty.join(', ')}` };
|
|
199
|
-
const moved = movedNodes(nodes);
|
|
214
|
+
const moved = movedNodes(nodes, recordedSource(root, files));
|
|
200
215
|
if (moved !== null)
|
|
201
216
|
return { ok: false, detail: `Tracked source moved during producer pre capture: ${moved}` };
|
|
202
217
|
return { ok: true, value: { head, headTree: tree.value.trim(), files, nodes, outputs } };
|
|
@@ -224,7 +239,7 @@ export function producerSourceUnchanged(root, before) {
|
|
|
224
239
|
const dirty = dirtyProviderPaths(status.value).filter((path) => !outputs.has(path));
|
|
225
240
|
if (dirty.length !== 0)
|
|
226
241
|
return { ok: false, detail: `${changed}: ${dirty.join(', ')} differ from HEAD` };
|
|
227
|
-
const moved = movedNodes(before.nodes);
|
|
242
|
+
const moved = movedNodes(before.nodes, recordedSource(root, before.files));
|
|
228
243
|
if (moved !== null)
|
|
229
244
|
return { ok: false, detail: `${changed}: ${moved}` };
|
|
230
245
|
return { ok: true, value: true };
|
|
@@ -277,12 +292,14 @@ export function providerReceipt(root, taskId, tasks, proof, expand, source, prod
|
|
|
277
292
|
return failed(`Unbound linked/non-file Nx source: ${file}`);
|
|
278
293
|
}
|
|
279
294
|
const observed = [];
|
|
295
|
+
const census = { start: censusStart(), observed };
|
|
296
|
+
const parents = new Set();
|
|
280
297
|
const outputs = new Map();
|
|
281
298
|
function visit(path) {
|
|
282
299
|
if (outputs.has(path))
|
|
283
300
|
return;
|
|
284
301
|
const absolute = join(root, path);
|
|
285
|
-
let node = receiptNode(absolute, path,
|
|
302
|
+
let node = receiptNode(absolute, path, census);
|
|
286
303
|
if (node.type === 'directory') {
|
|
287
304
|
for (const entry of node.entries)
|
|
288
305
|
visit(join(path, entry));
|
|
@@ -306,7 +323,8 @@ export function providerReceipt(root, taskId, tasks, proof, expand, source, prod
|
|
|
306
323
|
for (const segment of entry.split('/').slice(0, -1)) {
|
|
307
324
|
parent = join(parent, segment);
|
|
308
325
|
const stats = lstatSync(parent, { bigint: true });
|
|
309
|
-
observed.push({ path: parent, stamp:
|
|
326
|
+
observed.push({ path: parent, stamp: recordedStamp(stats, census.start) });
|
|
327
|
+
parents.add(parent);
|
|
310
328
|
if (!stats.isDirectory())
|
|
311
329
|
return failed(`Symlinked public output parent ${parent}`);
|
|
312
330
|
}
|
|
@@ -322,8 +340,22 @@ export function providerReceipt(root, taskId, tasks, proof, expand, source, prod
|
|
|
322
340
|
});
|
|
323
341
|
}
|
|
324
342
|
const final = producerSourceUnchanged(root, source);
|
|
325
|
-
if (!final.ok
|
|
326
|
-
return failed(final.
|
|
343
|
+
if (!final.ok)
|
|
344
|
+
return failed(final.detail);
|
|
345
|
+
// An output whose stamp does not prove it (its ctime alone moved, or it was read in the tick it changed in, as a
|
|
346
|
+
// task's last writes are) is re-read against its record. A parent directory binds only the real directory the path
|
|
347
|
+
// runs through, which the device, inode and mode its kept stamp still show.
|
|
348
|
+
const moved = movedNodes(observed, (path) => {
|
|
349
|
+
const record = outputs.get(relative(root, path));
|
|
350
|
+
if (record === undefined)
|
|
351
|
+
return parents.has(path);
|
|
352
|
+
const now = receiptNode(path, record.path);
|
|
353
|
+
return record.type === 'directory' && now.type === 'directory'
|
|
354
|
+
? record.mode === now.mode && JSON.stringify(record.entries) === JSON.stringify(now.entries)
|
|
355
|
+
: JSON.stringify(record) === JSON.stringify(now);
|
|
356
|
+
});
|
|
357
|
+
if (moved !== null)
|
|
358
|
+
return failed(`Public outputs changed during independent census: ${moved}`);
|
|
327
359
|
const outputSha256 = createHash('sha256').update(JSON.stringify(receipts)).digest('hex');
|
|
328
360
|
return {
|
|
329
361
|
disposition: 'hit',
|
|
@@ -4,8 +4,42 @@ import type { ProjectGraph } from 'nx/src/config/project-graph';
|
|
|
4
4
|
import type { expandOutputs, FileData, WorkspaceContext } from 'nx/src/native';
|
|
5
5
|
import type { readModulePackageJsonWithoutFallbacks } from 'nx/src/utils/package-json';
|
|
6
6
|
import type { GraphInputContractProof } from './graph-input-contract.js';
|
|
7
|
-
/**
|
|
8
|
-
export
|
|
7
|
+
/** The stat fields a node's identity is read from. */
|
|
8
|
+
export type StampFields = Pick<BigIntStats, 'dev' | 'ino' | 'mode' | 'size' | 'mtimeNs' | 'ctimeNs'>;
|
|
9
|
+
/** The stamp a node reads as now: device, inode, mode, size, mtime and ctime. What a recorded stamp is compared with. */
|
|
10
|
+
export declare function nodeStamp(stats: StampFields): string;
|
|
11
|
+
/**
|
|
12
|
+
* How an observed stamp compares with the recorded one: `same`; `ctime` when device, inode, mode, size and mtime are
|
|
13
|
+
* kept and only the ctime moved (a same-mode chmod, which Bun's bin linking does to a shared store file on any
|
|
14
|
+
* checkout's install) or was recorded `unproven` ({@link recordedStamp}); otherwise `moved`. A function of the two
|
|
15
|
+
* stamps alone, so no filesystem or clock decides it.
|
|
16
|
+
*/
|
|
17
|
+
export declare function stampMove(recorded: string, observed: string): 'same' | 'ctime' | 'moved';
|
|
18
|
+
/**
|
|
19
|
+
* How long after a node's last change a stamp read of it proves nothing about the next change: git's racily clean
|
|
20
|
+
* rule (git's Documentation/technical/racy-git.txt), which the Nx archive repair already applies to Nx's own file
|
|
21
|
+
* hashes (patches/README.md). A filesystem dates a change by the kernel's clock. On Linux, on a filesystem without
|
|
22
|
+
* fine-grained timestamps such as ZFS, that is the coarse clock, which moves once a jiffy: 1 ms at CONFIG_HZ=1000, as
|
|
23
|
+
* on CI's runner, and 10 ms at CONFIG_HZ=100, the slowest. A same-size rewrite in the tick a stamp was read in leaves
|
|
24
|
+
* every field of it as it was. Node can read neither the jiffy nor a filesystem's granularity, and a shorter window
|
|
25
|
+
* reopens the gap on a slower kernel, so this is the slowest tick, and no option.
|
|
26
|
+
*/
|
|
27
|
+
export declare const SAME_TICK_NS = 10000000n;
|
|
28
|
+
/** The time a census starts, read before its first stat: what {@link unproven} judges each node's change by. */
|
|
29
|
+
export declare function censusStart(): bigint;
|
|
30
|
+
/**
|
|
31
|
+
* Whether a census that started at `start` read a node within {@link SAME_TICK_NS} of its last change (the later of
|
|
32
|
+
* its ctime and mtime, so a node dated ahead counts). Its stamp is then unproven, not unchanged: a rewrite in the same
|
|
33
|
+
* tick could leave it as it is.
|
|
34
|
+
*/
|
|
35
|
+
export declare function unproven(stats: StampFields, start: bigint): boolean;
|
|
36
|
+
/**
|
|
37
|
+
* The stamp a census that started at `start` records for a later reader: its {@link nodeStamp}, or, when that is
|
|
38
|
+
* {@link unproven}, the same with its ctime recorded as `unproven`. No stamp read later equals that, so the reader
|
|
39
|
+
* re-reads the node rather than trust the stamp, as it does a node whose ctime alone moved ({@link stampMove}), or
|
|
40
|
+
* counts it moved when it holds nothing to re-read it against. Only such a node costs a re-read.
|
|
41
|
+
*/
|
|
42
|
+
export declare function recordedStamp(stats: StampFields, start: bigint): string;
|
|
9
43
|
export interface NodeWitness {
|
|
10
44
|
readonly path: string;
|
|
11
45
|
readonly stamp: string;
|
|
@@ -30,6 +64,8 @@ export declare function writeWitness(path: string, value: GraphWitness | Artifac
|
|
|
30
64
|
* Nx's Unix archive uses whole-second mtimes, so allFileData alone cannot
|
|
31
65
|
* prove an immediate same-second rewrite. An unbound archive hash is never
|
|
32
66
|
* admitted: on the first capture every file is rehashed through Nx itself.
|
|
67
|
+
* The nodes are recorded for later captures and readers (recordedStamp), so a
|
|
68
|
+
* node this capture read in the tick it changed in is rehashed by the next.
|
|
33
69
|
*/
|
|
34
70
|
export declare function workspaceSnapshot(workspaceRoot: string, context: WorkspaceContext, previous: WorkspaceSnapshot | undefined): WorkspaceSnapshot;
|
|
35
71
|
export declare function nodesUnchanged(nodes: readonly NodeWitness[]): boolean;
|
|
@@ -37,8 +73,8 @@ export declare function nodesUnchanged(nodes: readonly NodeWitness[]): boolean;
|
|
|
37
73
|
* The witnessed nodes whose stamp is no longer the one read, named for a refusal (the first eight in witness order, a
|
|
38
74
|
* gone one with its error code, and how many more), or null when none moved. A node whose device, inode, mode, size
|
|
39
75
|
* and mtime are unchanged and only its ctime moved (a same-mode chmod, which Bun's bin linking does to a shared store
|
|
40
|
-
* file on any checkout's install)
|
|
41
|
-
* recorded has not changed. Without `same` every move counts.
|
|
76
|
+
* file on any checkout's install), or whose ctime was recorded unproven ({@link recordedStamp}), asks for a comparison,
|
|
77
|
+
* not a verdict: `same` re-reads it, and one it finds as recorded has not changed. Without `same` every move counts.
|
|
42
78
|
*/
|
|
43
79
|
export declare function movedNodes(nodes: readonly NodeWitness[], same?: (path: string) => boolean): string | null;
|
|
44
80
|
/** Membership and content are exact. Outputs do not exempt manifests or
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-built-witness.d.ts","sourceRoot":"","sources":["../src/ensure-built-witness.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAe3C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC/E,OAAO,KAAK,EAAe,qCAAqC,EAAE,MAAM,2BAA2B,CAAC;AAEpG,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAOzE
|
|
1
|
+
{"version":3,"file":"ensure-built-witness.d.ts","sourceRoot":"","sources":["../src/ensure-built-witness.ts"],"names":[],"mappings":"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"}
|