@smoothbricks/nx-plugin 0.6.2 → 0.7.0
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 +417 -171
- package/dist/.build-inputs.json +39 -28
- package/dist/bin/smoo-nx-go-test-build.d.ts +3 -0
- package/dist/bin/smoo-nx-go-test-build.d.ts.map +1 -0
- package/dist/bin/smoo-nx-go-test-build.js +79 -0
- package/dist/bin/smoo-nx-go-test-run.d.ts +3 -0
- package/dist/bin/smoo-nx-go-test-run.d.ts.map +1 -0
- package/dist/bin/smoo-nx-go-test-run.js +129 -0
- package/dist/bin/smoo-nx-publish.d.ts +3 -0
- package/dist/bin/smoo-nx-publish.d.ts.map +1 -0
- package/dist/bin/smoo-nx-publish.js +3 -0
- package/dist/bounded-test-policy.d.ts +1 -1
- package/dist/bounded-test-policy.d.ts.map +1 -1
- package/dist/bounded-test-policy.js +9 -8
- package/dist/cargo-retention-hook.d.ts +6 -2
- package/dist/cargo-retention-hook.d.ts.map +1 -1
- package/dist/cargo-retention-hook.js +13 -7
- package/dist/cargo-workspace.d.ts +10 -20
- package/dist/cargo-workspace.d.ts.map +1 -1
- package/dist/cargo-workspace.js +12 -22
- package/dist/cross-check-policy.d.ts +2 -2
- package/dist/cross-check-policy.js +2 -2
- package/dist/deploy-policy.d.ts +6 -0
- package/dist/deploy-policy.d.ts.map +1 -1
- package/dist/deploy-policy.js +11 -0
- package/dist/eslint-file-set.d.ts +4 -1
- package/dist/eslint-file-set.d.ts.map +1 -1
- package/dist/eslint-sources.d.ts +25 -0
- package/dist/eslint-sources.d.ts.map +1 -0
- package/dist/eslint-sources.js +99 -0
- package/dist/executors/all-verdicts/executor.d.ts +2 -1
- package/dist/executors/all-verdicts/executor.d.ts.map +1 -1
- package/dist/executors/all-verdicts/executor.js +48 -2
- package/dist/executors/all-verdicts/schema.d.ts +13 -0
- package/dist/executors/all-verdicts/schema.d.ts.map +1 -1
- package/dist/executors/all-verdicts/schema.js +7 -0
- package/dist/executors/bounded-exec/bounds.d.ts +57 -8
- package/dist/executors/bounded-exec/bounds.d.ts.map +1 -1
- package/dist/executors/bounded-exec/bounds.js +100 -11
- package/dist/executors/bounded-exec/executor.d.ts +2 -1
- package/dist/executors/bounded-exec/executor.d.ts.map +1 -1
- package/dist/executors/bounded-exec/executor.js +289 -34
- package/dist/executors/bounded-exec/hang-diagnostics.d.ts +2 -0
- package/dist/executors/bounded-exec/hang-diagnostics.d.ts.map +1 -1
- package/dist/executors/bounded-exec/hang-diagnostics.js +2 -2
- package/dist/executors/bounded-exec/mbx-pool.d.ts +56 -10
- package/dist/executors/bounded-exec/mbx-pool.d.ts.map +1 -1
- package/dist/executors/bounded-exec/mbx-pool.js +145 -11
- package/dist/executors/bounded-exec/mbx-queue.d.ts +30 -0
- package/dist/executors/bounded-exec/mbx-queue.d.ts.map +1 -0
- package/dist/executors/bounded-exec/mbx-queue.js +229 -0
- package/dist/executors/bounded-exec/progress.d.ts +9 -2
- package/dist/executors/bounded-exec/progress.d.ts.map +1 -1
- package/dist/executors/bounded-exec/progress.js +151 -25
- package/dist/executors/bounded-exec/runner-sizing.d.ts +40 -2
- package/dist/executors/bounded-exec/runner-sizing.d.ts.map +1 -1
- package/dist/executors/bounded-exec/runner-sizing.js +55 -4
- package/dist/executors/bounded-exec/runtime-pin.js +1 -1
- package/dist/executors/bounded-exec/test-result-writer.d.ts +30 -0
- package/dist/executors/bounded-exec/test-result-writer.d.ts.map +1 -0
- package/dist/executors/bounded-exec/test-result-writer.js +126 -0
- package/dist/executors/bounded-exec/test-results.d.ts +33 -0
- package/dist/executors/bounded-exec/test-results.d.ts.map +1 -0
- package/dist/executors/bounded-exec/test-results.js +33 -0
- package/dist/executors/bounded-exec/verdict.d.ts +26 -2
- package/dist/executors/bounded-exec/verdict.d.ts.map +1 -1
- package/dist/executors/bounded-exec/verdict.js +108 -4
- package/dist/executors/wrangler-deploy/deploy-hash.d.ts +10 -0
- package/dist/executors/wrangler-deploy/deploy-hash.d.ts.map +1 -0
- package/dist/executors/wrangler-deploy/deploy-hash.js +14 -0
- package/dist/executors/wrangler-deploy/executor.d.ts +24 -0
- package/dist/executors/wrangler-deploy/executor.d.ts.map +1 -0
- package/dist/executors/wrangler-deploy/executor.js +43 -0
- package/dist/executors/wrangler-deploy/hasher.d.ts +27 -0
- package/dist/executors/wrangler-deploy/hasher.d.ts.map +1 -0
- package/dist/executors/wrangler-deploy/hasher.js +90 -0
- package/dist/executors/wrangler-deploy/schema.d.ts +5 -0
- package/dist/executors/wrangler-deploy/schema.d.ts.map +1 -0
- package/dist/go-tests.d.ts +30 -0
- package/dist/go-tests.d.ts.map +1 -0
- package/dist/go-tests.js +43 -0
- package/dist/index.d.ts +12 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +338 -295
- package/dist/managed-files/files.d.ts.map +1 -1
- package/dist/managed-files/files.js +5 -0
- package/dist/nx-publish.d.ts +24 -0
- package/dist/nx-publish.d.ts.map +1 -0
- package/dist/nx-publish.js +150 -0
- package/dist/process-group.js +2 -2
- package/dist/runtime-input-policy.d.ts +17 -3
- package/dist/runtime-input-policy.d.ts.map +1 -1
- package/dist/runtime-input-policy.js +4 -4
- package/dist/test-timings.d.ts +23 -4
- package/dist/test-timings.d.ts.map +1 -1
- package/dist/test-timings.js +72 -12
- package/dist/tool-bins.d.ts +6 -8
- package/dist/tool-bins.d.ts.map +1 -1
- package/dist/tool-bins.js +7 -5
- package/dist/version-actions.cjs +10 -11
- package/dist/version-actions.d.cts.map +1 -1
- package/dist/workspace-config-policy.d.ts.map +1 -1
- package/dist/workspace-config-policy.js +17 -22
- package/dist/workspace-index.d.ts +7 -0
- package/dist/workspace-index.d.ts.map +1 -1
- package/dist/workspace-index.js +11 -0
- package/dist/workspace-manifest.js +3 -3
- package/executors.json +7 -6
- package/managed/raw/patches/nx@23.2.1.patch +118 -24
- package/managed/raw/patches/ttsc@0.34.1.patch +139 -0
- package/managed/raw/tooling/devenv +1 -2
- package/managed/raw/tooling/direnv/developer-links.ts +124 -51
- package/managed/raw/tooling/direnv/devenv.smoo.nix +34 -15
- package/managed/raw/tooling/direnv/github-actions-bootstrap.sh +20 -10
- package/managed/raw/tooling/direnv/installed-bun-links.ts +7 -6
- package/managed/raw/tooling/direnv/setup-environment.ts +49 -24
- package/managed/raw/tooling/direnv/ttsc-env.sh +8 -6
- package/managed/raw/tooling/git-hooks/pinned-revisions-served.ts +252 -0
- package/managed/raw/tooling/git-hooks/pre-push.sh +34 -32
- package/managed/templates/github/actions/cache-node-modules/action.yml +1 -1
- package/managed/templates/github/actions/cache-ttsc-plugins/action.yml +12 -11
- package/package.json +277 -11
- package/runtime/nx-publish/.build-inputs.json +11 -0
- package/runtime/nx-publish/cache_adapter.js +45 -0
- package/runtime/nx-publish/nx_publish.js +60 -0
- package/runtime-input.sh +62 -26
- package/src/bin/smoo-nx-go-test-build.ts +83 -0
- package/src/bin/smoo-nx-go-test-run.ts +140 -0
- package/src/bin/smoo-nx-publish.ts +4 -0
- package/src/bounded-test-policy.ts +9 -8
- package/src/cargo-retention-hook.ts +16 -10
- package/src/cargo-workspace.ts +12 -24
- package/src/cross-check-policy.ts +2 -2
- package/src/deploy-policy.ts +11 -0
- package/src/eslint-file-set.ts +4 -1
- package/src/eslint-sources.ts +134 -0
- package/src/executors/all-verdicts/executor.ts +58 -3
- package/src/executors/all-verdicts/schema.json +4 -0
- package/src/executors/all-verdicts/schema.ts +14 -0
- package/src/executors/bounded-exec/bounds.ts +132 -15
- package/src/executors/bounded-exec/executor.ts +329 -34
- package/src/executors/bounded-exec/hang-diagnostics.ts +3 -2
- package/src/executors/bounded-exec/mbx-pool.ts +158 -17
- package/src/executors/bounded-exec/mbx-queue.ts +170 -0
- package/src/executors/bounded-exec/progress.ts +171 -18
- package/src/executors/bounded-exec/runner-sizing.ts +73 -7
- package/src/executors/bounded-exec/runtime-pin.ts +1 -1
- package/src/executors/bounded-exec/test-result-writer.ts +152 -0
- package/src/executors/bounded-exec/test-results.ts +39 -0
- package/src/executors/bounded-exec/verdict.ts +115 -5
- package/src/executors/wrangler-deploy/deploy-hash.ts +15 -0
- package/src/executors/wrangler-deploy/executor.ts +63 -0
- package/src/executors/wrangler-deploy/hasher.ts +111 -0
- package/src/executors/wrangler-deploy/schema.json +16 -0
- package/src/executors/wrangler-deploy/schema.ts +4 -0
- package/src/go-tests.ts +67 -0
- package/src/index.ts +368 -323
- package/src/managed-files/files.ts +5 -0
- package/src/nx-publish.ts +157 -0
- package/src/process-group.ts +2 -2
- package/src/runtime-input-policy.ts +4 -4
- package/src/test-timings.ts +72 -14
- package/src/tool-bins.ts +13 -9
- package/src/version-actions.cts +10 -11
- package/src/workspace-config-policy.ts +20 -29
- package/src/workspace-index.ts +12 -0
- package/src/workspace-manifest.ts +3 -3
- package/test-timings.json +131 -125
- package/dist/executors/clean-outputs/executor.d.ts +0 -26
- package/dist/executors/clean-outputs/executor.d.ts.map +0 -1
- package/dist/executors/clean-outputs/executor.js +0 -83
- package/dist/executors/clean-outputs/schema.d.ts +0 -4
- package/dist/executors/clean-outputs/schema.d.ts.map +0 -1
- package/src/executors/clean-outputs/executor.ts +0 -131
- package/src/executors/clean-outputs/schema.json +0 -15
- package/src/executors/clean-outputs/schema.ts +0 -3
- /package/dist/executors/{clean-outputs → wrangler-deploy}/schema.js +0 -0
|
@@ -73,22 +73,12 @@ export declare function requireExternalRustCratesInput(workspaceRoot: string, ma
|
|
|
73
73
|
*/
|
|
74
74
|
export declare const CARGO_TEST_TARGET = "cargo-test";
|
|
75
75
|
/**
|
|
76
|
-
* The one workspace-wide
|
|
77
|
-
*
|
|
78
|
-
*
|
|
79
|
-
*
|
|
76
|
+
* The one workspace-wide test build every per-crate runner executes from, in
|
|
77
|
+
* place. Named here beside the other cargo target names so the policy that
|
|
78
|
+
* checks a workspace's test graph and the inference that builds it read the
|
|
79
|
+
* same string.
|
|
80
80
|
*/
|
|
81
|
-
export declare const
|
|
82
|
-
/**
|
|
83
|
-
* Where that archive lands, relative to the cargo workspace root — the cwd both
|
|
84
|
-
* the archive command and every runner already use. `cargo nextest archive`
|
|
85
|
-
* does NOT create this parent directory and fails the whole build when it is
|
|
86
|
-
* missing ("error writing to archive ... No such file or directory"), so the
|
|
87
|
-
* target mkdir's it first.
|
|
88
|
-
* The archive is an Nx-restored output, so it lives on the source volume, never
|
|
89
|
-
* beneath Cargo's symlinked target directory (16_build_volumes.md).
|
|
90
|
-
*/
|
|
91
|
-
export declare const CARGO_TEST_ARCHIVE_FILE = ".cache/nextest/archive.tar.zst";
|
|
81
|
+
export declare const CARGO_TEST_BUILD_TARGET = "cargo-test-build";
|
|
92
82
|
/**
|
|
93
83
|
* One foreign target triple this cargo workspace also archives its tests for.
|
|
94
84
|
*/
|
|
@@ -148,7 +138,7 @@ export declare function cargoTestGroupTargetName(group: string): string;
|
|
|
148
138
|
* crate collapse back to that crate, so a split crate counts as covered once.
|
|
149
139
|
*
|
|
150
140
|
* The workspace-wide `cargo-test-*` targets are not crates: reading them as one
|
|
151
|
-
* would invent
|
|
141
|
+
* would invent a member named "build", and a serial group's runner
|
|
152
142
|
* would invent one named after its group. Each reports every crate's coverage
|
|
153
143
|
* against a set that can never match.
|
|
154
144
|
*/
|
|
@@ -246,9 +236,9 @@ export declare const PLUGIN_NEXTEST_CONFIG_PATH = "node_modules/@smoothbricks/nx
|
|
|
246
236
|
* The plugin's own nextest settings, as a config layer BENEATH the repository's.
|
|
247
237
|
*
|
|
248
238
|
* `--config-file` replaces `<workspace>/.config/nextest.toml` outright, which
|
|
249
|
-
* made every plugin default unoverridable and
|
|
250
|
-
*
|
|
251
|
-
* cdylib or fixture
|
|
239
|
+
* made every plugin default unoverridable and left a repository no way to
|
|
240
|
+
* declare a setting of its own, such as the `archive.include` a cross lane needs
|
|
241
|
+
* for a cdylib or fixture. `--tool-config-file` is nextest's mechanism
|
|
252
242
|
* for exactly this: "lower than --config-file in priority but above the default
|
|
253
243
|
* config shipped with nextest". Measured: with only this layer a 1s
|
|
254
244
|
* slow-timeout terminates a 3s test; adding `.config/nextest.toml` with 10s
|
|
@@ -256,7 +246,7 @@ export declare const PLUGIN_NEXTEST_CONFIG_PATH = "node_modules/@smoothbricks/nx
|
|
|
256
246
|
*
|
|
257
247
|
* The path must be absolute, and an absolute path written into the command text
|
|
258
248
|
* would differ per checkout and split one Nx cache entry per machine. `$PWD`
|
|
259
|
-
* resolves at exec time — both the
|
|
249
|
+
* resolves at exec time — both the test build (`nx:run-commands`) and the runners
|
|
260
250
|
* (`bounded-exec`, which spawns with `shell: true`) go through a shell — so the
|
|
261
251
|
* command text stays identical everywhere. Quoted, because a workspace path may
|
|
262
252
|
* contain spaces.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cargo-workspace.d.ts","sourceRoot":"","sources":["../src/cargo-workspace.ts"],"names":[],"mappings":"AAIA,OAAO,EAAsB,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAE/D,OAAO,EAAgB,KAAK,YAAY,EAAE,KAAK,kBAAkB,EAAmB,MAAM,wBAAwB,CAAC;AAEnH,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,+BAAgC,SAAQ,qBAAqB;IAC5E,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,0BAA0B,CAAC,mBAAmB,EAAE,MAAM,GAAG,qBAAqB,EAAE,CAkF/F;AA0ED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,SAAS,qBAAqB,EAAE,EAC1C,QAAQ,EAAE,SAAS,qBAAqB,EAAE,GACzC,+BAA+B,EAAE,CAgBnC;AAED;;;;;;GAMG;AACH,eAAO,MAAM,0BAA0B,uBAAuB,CAAC;AAE/D,MAAM,WAAW,6BAA6B;IAC5C,oEAAoE;IACpE,aAAa,EAAE,MAAM,CAAC;IACtB,mEAAmE;IACnE,mBAAmB,EAAE,MAAM,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,mGAAmG;IACnG,KAAK,EAAE,YAAY,CAAC;IACpB,6FAA6F;IAC7F,KAAK,CAAC,EAAE,gBAAgB,CAAC;CAC1B;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IACpD,QAAQ,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAChD,QAAQ,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAC5D,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;CAClD;AAED,wBAAgB,sBAAsB,IAAI,gBAAgB,CAEzD;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,6BAA6B,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAQhG;AAuID;;;;GAIG;AACH,wBAAgB,8BAA8B,CAC5C,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,IAAI,CAWN;AA8JD;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,eAAe,CAAC;AAE9C;;;;;GAKG;AACH,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"cargo-workspace.d.ts","sourceRoot":"","sources":["../src/cargo-workspace.ts"],"names":[],"mappings":"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"}
|
package/dist/cargo-workspace.js
CHANGED
|
@@ -188,7 +188,7 @@ async function deriveCargoPackageTestInputs({ workspaceRoot, absoluteProjectRoot
|
|
|
188
188
|
// hashes a `{projectRoot}` glob against only the files its project OWNS, and
|
|
189
189
|
// a nested Nx project owns the crates under it. A repository-root cargo
|
|
190
190
|
// workspace whose members live in `packages/*` would then hash none of its
|
|
191
|
-
// members' sources, and its
|
|
191
|
+
// members' sources, and its test build would cache-hit against edited crates
|
|
192
192
|
// while every per-crate runner reran on the stale binaries.
|
|
193
193
|
const inputRoot = posix.join('{workspaceRoot}', relative(workspaceRoot, absoluteProjectRoot).split(sep).join('/'));
|
|
194
194
|
const loadManifest = (path) => {
|
|
@@ -472,22 +472,12 @@ function readTestShards(cratePackage, crateTomlPath) {
|
|
|
472
472
|
*/
|
|
473
473
|
export const CARGO_TEST_TARGET = 'cargo-test';
|
|
474
474
|
/**
|
|
475
|
-
* The one workspace-wide
|
|
476
|
-
*
|
|
477
|
-
*
|
|
478
|
-
*
|
|
475
|
+
* The one workspace-wide test build every per-crate runner executes from, in
|
|
476
|
+
* place. Named here beside the other cargo target names so the policy that
|
|
477
|
+
* checks a workspace's test graph and the inference that builds it read the
|
|
478
|
+
* same string.
|
|
479
479
|
*/
|
|
480
|
-
export const
|
|
481
|
-
/**
|
|
482
|
-
* Where that archive lands, relative to the cargo workspace root — the cwd both
|
|
483
|
-
* the archive command and every runner already use. `cargo nextest archive`
|
|
484
|
-
* does NOT create this parent directory and fails the whole build when it is
|
|
485
|
-
* missing ("error writing to archive ... No such file or directory"), so the
|
|
486
|
-
* target mkdir's it first.
|
|
487
|
-
* The archive is an Nx-restored output, so it lives on the source volume, never
|
|
488
|
-
* beneath Cargo's symlinked target directory (16_build_volumes.md).
|
|
489
|
-
*/
|
|
490
|
-
export const CARGO_TEST_ARCHIVE_FILE = '.cache/nextest/archive.tar.zst';
|
|
480
|
+
export const CARGO_TEST_BUILD_TARGET = 'cargo-test-build';
|
|
491
481
|
/**
|
|
492
482
|
* Foreign target triples this cargo workspace archives tests for, from
|
|
493
483
|
* `[workspace.metadata.smoothbricks.test] cross-targets`. An entry is either
|
|
@@ -581,13 +571,13 @@ export function cargoTestGroupTargetName(group) {
|
|
|
581
571
|
* crate collapse back to that crate, so a split crate counts as covered once.
|
|
582
572
|
*
|
|
583
573
|
* The workspace-wide `cargo-test-*` targets are not crates: reading them as one
|
|
584
|
-
* would invent
|
|
574
|
+
* would invent a member named "build", and a serial group's runner
|
|
585
575
|
* would invent one named after its group. Each reports every crate's coverage
|
|
586
576
|
* against a set that can never match.
|
|
587
577
|
*/
|
|
588
578
|
export function packageNameFromCargoTestTarget(targetName) {
|
|
589
579
|
if (!targetName.startsWith('cargo-test-') ||
|
|
590
|
-
targetName ===
|
|
580
|
+
targetName === CARGO_TEST_BUILD_TARGET ||
|
|
591
581
|
targetName.startsWith(CARGO_TEST_GROUP_PREFIX)) {
|
|
592
582
|
return null;
|
|
593
583
|
}
|
|
@@ -881,9 +871,9 @@ export const PLUGIN_NEXTEST_CONFIG_PATH = 'node_modules/@smoothbricks/nx-plugin/
|
|
|
881
871
|
* The plugin's own nextest settings, as a config layer BENEATH the repository's.
|
|
882
872
|
*
|
|
883
873
|
* `--config-file` replaces `<workspace>/.config/nextest.toml` outright, which
|
|
884
|
-
* made every plugin default unoverridable and
|
|
885
|
-
*
|
|
886
|
-
* cdylib or fixture
|
|
874
|
+
* made every plugin default unoverridable and left a repository no way to
|
|
875
|
+
* declare a setting of its own, such as the `archive.include` a cross lane needs
|
|
876
|
+
* for a cdylib or fixture. `--tool-config-file` is nextest's mechanism
|
|
887
877
|
* for exactly this: "lower than --config-file in priority but above the default
|
|
888
878
|
* config shipped with nextest". Measured: with only this layer a 1s
|
|
889
879
|
* slow-timeout terminates a 3s test; adding `.config/nextest.toml` with 10s
|
|
@@ -891,7 +881,7 @@ export const PLUGIN_NEXTEST_CONFIG_PATH = 'node_modules/@smoothbricks/nx-plugin/
|
|
|
891
881
|
*
|
|
892
882
|
* The path must be absolute, and an absolute path written into the command text
|
|
893
883
|
* would differ per checkout and split one Nx cache entry per machine. `$PWD`
|
|
894
|
-
* resolves at exec time — both the
|
|
884
|
+
* resolves at exec time — both the test build (`nx:run-commands`) and the runners
|
|
895
885
|
* (`bounded-exec`, which spawns with `shell: true`) go through a shell — so the
|
|
896
886
|
* command text stays identical everywhere. Quoted, because a workspace path may
|
|
897
887
|
* contain spaces.
|
|
@@ -202,8 +202,8 @@ export declare function cargoCrossTestArchiveTargetName(triple: string): string;
|
|
|
202
202
|
/** The bounded runner that executes one triple's archive. */
|
|
203
203
|
export declare function cargoCrossTestTargetName(triple: string): string;
|
|
204
204
|
/**
|
|
205
|
-
* One archive file per triple,
|
|
206
|
-
*
|
|
205
|
+
* One archive file per triple, relative to the cargo workspace root: the only
|
|
206
|
+
* test archives, since a same-platform run executes `cargo-test-build`'s binaries in place. Distinct
|
|
207
207
|
* paths are what let both exist: each is a declared Nx output, so a single path
|
|
208
208
|
* for two triples would let a restored cache serve one machine's binaries under
|
|
209
209
|
* the other's name.
|
|
@@ -220,8 +220,8 @@ export function cargoCrossTestTargetName(triple) {
|
|
|
220
220
|
return `cargo-cross-test-${triple}`;
|
|
221
221
|
}
|
|
222
222
|
/**
|
|
223
|
-
* One archive file per triple,
|
|
224
|
-
*
|
|
223
|
+
* One archive file per triple, relative to the cargo workspace root: the only
|
|
224
|
+
* test archives, since a same-platform run executes `cargo-test-build`'s binaries in place. Distinct
|
|
225
225
|
* paths are what let both exist: each is a declared Nx output, so a single path
|
|
226
226
|
* for two triples would let a restored cache serve one machine's binaries under
|
|
227
227
|
* the other's name.
|
package/dist/deploy-policy.d.ts
CHANGED
|
@@ -23,4 +23,10 @@ export declare const PRODUCTION_PUSH_DEPLOY_TAG = "production-push-deploy-target
|
|
|
23
23
|
* never widens it.
|
|
24
24
|
*/
|
|
25
25
|
export declare function stageDeploysProject(tags: string[] | undefined, stage: DeploymentStage): boolean;
|
|
26
|
+
/**
|
|
27
|
+
* The tag a deploy uploads its version under, from the artifact hash it deploys: `nx-` and that hash when it is
|
|
28
|
+
* decimal (Nx's own), or the first 32 digits of a hexadecimal hash of at least 32. `smoo wrangler deploy-stage` tags
|
|
29
|
+
* with it, and the wrangler-deploy hasher compares the stage's live tag with it. Null for any other hash.
|
|
30
|
+
*/
|
|
31
|
+
export declare function deployVersionTag(artifactHash: string): string | null;
|
|
26
32
|
//# sourceMappingURL=deploy-policy.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-policy.d.ts","sourceRoot":"","sources":["../src/deploy-policy.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,YAAY,GAAG,KAAK,MAAM,EAAE,CAAC;AAKvE,8EAA8E;AAC9E,eAAO,MAAM,kBAAkB,0BAA0B,CAAC;AAE1D,yEAAyE;AACzE,eAAO,MAAM,oBAAoB,4BAA4B,CAAC;AAE9D,uEAAuE;AACvE,eAAO,MAAM,0BAA0B,kCAAkC,CAAC;AAE1E;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,KAAK,EAAE,eAAe,GAAG,OAAO,CAK/F"}
|
|
1
|
+
{"version":3,"file":"deploy-policy.d.ts","sourceRoot":"","sources":["../src/deploy-policy.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,YAAY,GAAG,KAAK,MAAM,EAAE,CAAC;AAKvE,8EAA8E;AAC9E,eAAO,MAAM,kBAAkB,0BAA0B,CAAC;AAE1D,yEAAyE;AACzE,eAAO,MAAM,oBAAoB,4BAA4B,CAAC;AAE9D,uEAAuE;AACvE,eAAO,MAAM,0BAA0B,kCAAkC,CAAC;AAE1E;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,KAAK,EAAE,eAAe,GAAG,OAAO,CAK/F;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAIpE"}
|
package/dist/deploy-policy.js
CHANGED
|
@@ -34,3 +34,14 @@ export function stageDeploysProject(tags, stage) {
|
|
|
34
34
|
return stage === 'staging';
|
|
35
35
|
return tags.includes(STAGE_DEPLOY_TAG);
|
|
36
36
|
}
|
|
37
|
+
/**
|
|
38
|
+
* The tag a deploy uploads its version under, from the artifact hash it deploys: `nx-` and that hash when it is
|
|
39
|
+
* decimal (Nx's own), or the first 32 digits of a hexadecimal hash of at least 32. `smoo wrangler deploy-stage` tags
|
|
40
|
+
* with it, and the wrangler-deploy hasher compares the stage's live tag with it. Null for any other hash.
|
|
41
|
+
*/
|
|
42
|
+
export function deployVersionTag(artifactHash) {
|
|
43
|
+
if (/^(?:0|[1-9][0-9]*)$/.test(artifactHash))
|
|
44
|
+
return `nx-${artifactHash}`;
|
|
45
|
+
const normalized = artifactHash.toLowerCase();
|
|
46
|
+
return /^[0-9a-f]{32,}$/.test(normalized) ? `nx-${normalized.slice(0, 32)}` : null;
|
|
47
|
+
}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
/**
|
|
1
|
+
/**
|
|
2
|
+
* What source-aware ESLint inference retains for cache inspectors: the command, which names no file, and the sources
|
|
3
|
+
* the graph that wrote it resolved. The run reads the sources it lints when it starts.
|
|
4
|
+
*/
|
|
2
5
|
export interface EslintFileSet {
|
|
3
6
|
readonly command: string;
|
|
4
7
|
readonly files: readonly string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eslint-file-set.d.ts","sourceRoot":"","sources":["../src/eslint-file-set.ts"],"names":[],"mappings":"AAEA
|
|
1
|
+
{"version":3,"file":"eslint-file-set.d.ts","sourceRoot":"","sources":["../src/eslint-file-set.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;CACnC;AAED,eAAO,MAAM,eAAe,4CAAsC,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
/** Every JavaScript and TypeScript module kind ESLint is handed, as one glob. */
|
|
2
|
+
export declare const ESLINT_SOURCES_GLOB = "**/*.{js,jsx,cjs,mjs,ts,tsx,cts,mts}";
|
|
3
|
+
/** What ESLint lints for one project, and the lint inputs that key its verdict beyond the project's own files. */
|
|
4
|
+
export interface EslintSources {
|
|
5
|
+
/** The files ESLint is handed, workspace-relative and sorted. */
|
|
6
|
+
readonly files: readonly string[];
|
|
7
|
+
/**
|
|
8
|
+
* The test declaration, then a glob for each directory its include patterns walk and each other program file by
|
|
9
|
+
* name: a file the program gains later is keyed without the graph naming it.
|
|
10
|
+
*/
|
|
11
|
+
readonly inputs: readonly string[];
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* What ESLint lints for `projectRoot`, out of `indexed`, the JavaScript and TypeScript modules of an Nx workspace file
|
|
15
|
+
* index (.gitignore and .nxignore applied): its `src` files, and the files its `tsconfig.test.json` declares wherever
|
|
16
|
+
* they live. Only an indexed module counts: an ignored one is build output a fresh checkout lacks, and a JSON file is
|
|
17
|
+
* not ESLint's. Which index `indexed` comes from is the caller's: the graph's to describe a project, the filesystem's
|
|
18
|
+
* now to run ESLint on it.
|
|
19
|
+
*/
|
|
20
|
+
export declare function eslintSources(workspaceRoot: string, projectRoot: string, indexed: ReadonlySet<string>): EslintSources;
|
|
21
|
+
/** What ESLint lints for `projectRoot` as the filesystem holds it now, through a fresh workspace file index. */
|
|
22
|
+
export declare function freshEslintSources(workspaceRoot: string, projectRoot: string): EslintSources;
|
|
23
|
+
/** `command` with each {@link ESLINT_SOURCES_TOKEN} replaced by the shell words of `files`. */
|
|
24
|
+
export declare function expandEslintSources(command: string, files: readonly string[]): string;
|
|
25
|
+
//# sourceMappingURL=eslint-sources.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"eslint-sources.d.ts","sourceRoot":"","sources":["../src/eslint-sources.ts"],"names":[],"mappings":"AAiBA,iFAAiF;AACjF,eAAO,MAAM,mBAAmB,yCAAyB,CAAC;AAK1D,kHAAkH;AAClH,MAAM,WAAW,aAAa;IAC5B,iEAAiE;IACjE,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC;;;OAGG;IACH,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;CACpC;AAmCD;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,aAAa,CAgDrH;AAED,gHAAgH;AAChH,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,aAAa,CAE5F;AAED,+FAA+F;AAC/F,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAGrF"}
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import { existsSync } from 'node:fs';
|
|
2
|
+
import { dirname, isAbsolute, join, posix, relative, sep } from 'node:path';
|
|
3
|
+
import { parseJsonConfigFileContent, readConfigFile, sys as typescriptSys, WatchDirectoryFlags, } from 'typescript';
|
|
4
|
+
import { ESLINT_SOURCES_TOKEN } from './executors/all-verdicts/schema.js';
|
|
5
|
+
import { shellWord } from './runtime-input.js';
|
|
6
|
+
import { isNonSourceDirectory } from './source-directories.js';
|
|
7
|
+
import { freshIndexedFiles } from './workspace-index.js';
|
|
8
|
+
/** The module kinds ESLint is handed. */
|
|
9
|
+
const SOURCE_KINDS = '{js,jsx,cjs,mjs,ts,tsx,cts,mts}';
|
|
10
|
+
/** Every JavaScript and TypeScript module kind ESLint is handed, as one glob. */
|
|
11
|
+
export const ESLINT_SOURCES_GLOB = `**/*.${SOURCE_KINDS}`;
|
|
12
|
+
/** TypeScript's code for a declaration that selects no file: a test program of none, not a broken one. */
|
|
13
|
+
const NO_INPUTS_FOUND = 18003;
|
|
14
|
+
/**
|
|
15
|
+
* Read a tsconfig with this plugin's own TypeScript. `@nx/js`'s readTsConfig does an
|
|
16
|
+
* undeclared `require('typescript')` resolved from its own location: where that lands on the
|
|
17
|
+
* TypeScript 7 native package (whose entry exports only its version), `sys` is undefined and
|
|
18
|
+
* graph construction dies reading `sys.readFile`. The plugin declares TypeScript 6, whose
|
|
19
|
+
* `sys` this uses, so the resolution is the one this package's manifest promises.
|
|
20
|
+
*/
|
|
21
|
+
function readTestTsConfig(testConfig) {
|
|
22
|
+
const readResult = readConfigFile(testConfig, typescriptSys.readFile);
|
|
23
|
+
return parseJsonConfigFileContent(readResult.config, typescriptSys, dirname(testConfig));
|
|
24
|
+
}
|
|
25
|
+
/** The workspace-relative POSIX path of `absolute`, or null when it lies outside the workspace. */
|
|
26
|
+
function insideWorkspace(workspaceRoot, absolute) {
|
|
27
|
+
const path = relative(workspaceRoot, absolute).split(sep).join('/');
|
|
28
|
+
return path === '..' || path.startsWith('../') || isAbsolute(path) ? null : path;
|
|
29
|
+
}
|
|
30
|
+
function walks({ directory, recursive }, path) {
|
|
31
|
+
const within = directory === '' ? path : path.startsWith(`${directory}/`) ? path.slice(directory.length + 1) : null;
|
|
32
|
+
return within !== null && (recursive || !within.includes('/'));
|
|
33
|
+
}
|
|
34
|
+
function walkedInput({ directory, recursive }) {
|
|
35
|
+
return `{workspaceRoot}/${directory === '' ? '' : `${directory}/`}${recursive ? '**/' : ''}*.${SOURCE_KINDS}`;
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* What ESLint lints for `projectRoot`, out of `indexed`, the JavaScript and TypeScript modules of an Nx workspace file
|
|
39
|
+
* index (.gitignore and .nxignore applied): its `src` files, and the files its `tsconfig.test.json` declares wherever
|
|
40
|
+
* they live. Only an indexed module counts: an ignored one is build output a fresh checkout lacks, and a JSON file is
|
|
41
|
+
* not ESLint's. Which index `indexed` comes from is the caller's: the graph's to describe a project, the filesystem's
|
|
42
|
+
* now to run ESLint on it.
|
|
43
|
+
*/
|
|
44
|
+
export function eslintSources(workspaceRoot, projectRoot, indexed) {
|
|
45
|
+
const files = new Set();
|
|
46
|
+
const sourcePrefix = projectRoot === '.' ? 'src/' : `${posix.normalize(projectRoot)}/src/`;
|
|
47
|
+
for (const path of indexed) {
|
|
48
|
+
if (path.startsWith(sourcePrefix) &&
|
|
49
|
+
!path.slice(sourcePrefix.length).split('/').slice(0, -1).some(isNonSourceDirectory)) {
|
|
50
|
+
files.add(path);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
const inputs = [];
|
|
54
|
+
const testConfig = join(workspaceRoot, projectRoot, 'tsconfig.test.json');
|
|
55
|
+
if (existsSync(testConfig)) {
|
|
56
|
+
// A test program can live anywhere the declaration selects, not just src.
|
|
57
|
+
// Use the compiler's file set and the existing declaration-chain hasher,
|
|
58
|
+
// so inherited includes and files outside this project keep their keys.
|
|
59
|
+
const program = readTestTsConfig(testConfig);
|
|
60
|
+
const errors = program.errors.filter(({ code }) => code !== NO_INPUTS_FOUND);
|
|
61
|
+
if (errors.length > 0) {
|
|
62
|
+
throw new Error(`${testConfig}: ${errors.map(({ code, messageText }) => `TS${code}: ${JSON.stringify(messageText)}`).join('; ')}`);
|
|
63
|
+
}
|
|
64
|
+
inputs.push('{projectRoot}/tsconfig.test.json');
|
|
65
|
+
// The directories the include patterns walk are keyed as globs, so a file added to one is keyed the moment it
|
|
66
|
+
// exists, and the compiler's own set of walked directories says which they are.
|
|
67
|
+
const walked = [];
|
|
68
|
+
for (const [absolute, flags] of Object.entries(program.wildcardDirectories ?? {})) {
|
|
69
|
+
const directory = insideWorkspace(workspaceRoot, absolute);
|
|
70
|
+
if (directory !== null && !directory.split('/').some(isNonSourceDirectory)) {
|
|
71
|
+
walked.push({ directory, recursive: (flags & WatchDirectoryFlags.Recursive) !== 0 });
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
inputs.push(...walked.map(walkedInput).sort());
|
|
75
|
+
const named = [];
|
|
76
|
+
for (const absolute of program.fileNames) {
|
|
77
|
+
const path = insideWorkspace(workspaceRoot, absolute);
|
|
78
|
+
if (path === null) {
|
|
79
|
+
throw new Error(`${testConfig}: test source ${absolute} is outside the workspace and cannot be hashed`);
|
|
80
|
+
}
|
|
81
|
+
if (!indexed.has(path) || path.split('/').some(isNonSourceDirectory))
|
|
82
|
+
continue;
|
|
83
|
+
files.add(path);
|
|
84
|
+
if (!walked.some((entry) => walks(entry, path)))
|
|
85
|
+
named.push(`{workspaceRoot}/${path}`);
|
|
86
|
+
}
|
|
87
|
+
inputs.push(...named.sort());
|
|
88
|
+
}
|
|
89
|
+
return { files: [...files].sort(), inputs: [...new Set(inputs)] };
|
|
90
|
+
}
|
|
91
|
+
/** What ESLint lints for `projectRoot` as the filesystem holds it now, through a fresh workspace file index. */
|
|
92
|
+
export function freshEslintSources(workspaceRoot, projectRoot) {
|
|
93
|
+
return eslintSources(workspaceRoot, projectRoot, new Set(freshIndexedFiles(workspaceRoot, [ESLINT_SOURCES_GLOB])));
|
|
94
|
+
}
|
|
95
|
+
/** `command` with each {@link ESLINT_SOURCES_TOKEN} replaced by the shell words of `files`. */
|
|
96
|
+
export function expandEslintSources(command, files) {
|
|
97
|
+
const words = files.map((file) => shellWord(file)).join(' ');
|
|
98
|
+
return command.replaceAll(ESLINT_SOURCES_TOKEN, () => words);
|
|
99
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type AllVerdictsOptions } from './schema.js';
|
|
2
2
|
/**
|
|
3
3
|
* A command's verdict. Only a command that exited reached one. A command a signal ended, one that never started and
|
|
4
4
|
* one still running when the run itself was signalled are unjudged: never a pass, and never left out of the report.
|
|
@@ -26,6 +26,7 @@ export declare function verdictReport(verdicts: readonly CommandVerdict[]): stri
|
|
|
26
26
|
* another's until a later run. Here no command ends another. Each command's output prints as one block when it closes,
|
|
27
27
|
* then every command's verdict. A signal to the run ends every command's process group, reports each command still
|
|
28
28
|
* running UNJUDGED, and ends the run by the same signal. The run succeeds only when every command passed.
|
|
29
|
+
* A command that names the ESLint sources placeholder is resolved first, and the verdicts name it as it ran.
|
|
29
30
|
*/
|
|
30
31
|
export default function allVerdictsExecutor(options: AllVerdictsOptions, context: {
|
|
31
32
|
readonly root: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/executors/all-verdicts/executor.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/executors/all-verdicts/executor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,kBAAkB,EAAwB,MAAM,aAAa,CAAC;AAE5E;;;GAGG;AACH,MAAM,MAAM,OAAO,GACf;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACzB;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAChD;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1D,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC3B;AAED,6GAA6G;AAC7G,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,GAAG,OAAO,CAIzF;AAoBD,0GAA0G;AAC1G,wBAAgB,aAAa,CAAC,QAAQ,EAAE,SAAS,cAAc,EAAE,GAAG,MAAM,CAQzE;AA4FD;;;;;;;GAOG;AACH,wBAA8B,mBAAmB,CAC/C,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACjC,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CA6D/B"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
2
|
import { resolve } from 'node:path';
|
|
3
|
+
import { ESLINT_SOURCES_TOKEN } from './schema.js';
|
|
3
4
|
/** The verdict of a process that closed with exit `code`, or, when `code` is null, was ended by `signal`. */
|
|
4
5
|
export function closedVerdict(code, signal) {
|
|
5
6
|
if (code === 0)
|
|
@@ -84,12 +85,37 @@ function judge(run, cwd) {
|
|
|
84
85
|
child.once('close', (code, signal) => close(closedVerdict(code, signal)));
|
|
85
86
|
});
|
|
86
87
|
}
|
|
88
|
+
/**
|
|
89
|
+
* The commands as they run now. A command that names {@link ESLINT_SOURCES_TOKEN} gets the files ESLint is handed for
|
|
90
|
+
* `eslintProjectRoot` as the filesystem holds them at this moment, read through a fresh workspace file index: a graph the
|
|
91
|
+
* daemon serves past a deletion or an addition its watcher never reported still lints the files that exist. A project
|
|
92
|
+
* with none has nothing to lint, and no ESLint process starts for it.
|
|
93
|
+
*/
|
|
94
|
+
async function planCommands(options, root) {
|
|
95
|
+
if (!options.commands.some((command) => command.includes(ESLINT_SOURCES_TOKEN))) {
|
|
96
|
+
return options.commands.map((command) => ({ command }));
|
|
97
|
+
}
|
|
98
|
+
const projectRoot = options.eslintProjectRoot;
|
|
99
|
+
if (projectRoot === undefined) {
|
|
100
|
+
throw new Error(`a command names ${ESLINT_SOURCES_TOKEN}, and the target names no eslintProjectRoot to resolve it for`);
|
|
101
|
+
}
|
|
102
|
+
const { expandEslintSources, freshEslintSources } = await import('../../eslint-sources.js');
|
|
103
|
+
const { files } = freshEslintSources(root, projectRoot);
|
|
104
|
+
return options.commands.map((command) => {
|
|
105
|
+
if (!command.includes(ESLINT_SOURCES_TOKEN))
|
|
106
|
+
return { command };
|
|
107
|
+
if (files.length === 0)
|
|
108
|
+
return { command, noRun: `no ESLint sources under ${projectRoot}: nothing to lint` };
|
|
109
|
+
return { command: expandEslintSources(command, files) };
|
|
110
|
+
});
|
|
111
|
+
}
|
|
87
112
|
/**
|
|
88
113
|
* Starts every command at once and lets each reach its own verdict. Nx's run-commands cannot: in parallel it terminates
|
|
89
114
|
* the other commands once one fails, and serially it never starts the ones after a failure, so one tool's errors hide
|
|
90
115
|
* another's until a later run. Here no command ends another. Each command's output prints as one block when it closes,
|
|
91
116
|
* then every command's verdict. A signal to the run ends every command's process group, reports each command still
|
|
92
117
|
* running UNJUDGED, and ends the run by the same signal. The run succeeds only when every command passed.
|
|
118
|
+
* A command that names the ESLint sources placeholder is resolved first, and the verdicts name it as it ran.
|
|
93
119
|
*/
|
|
94
120
|
export default async function allVerdictsExecutor(options, context) {
|
|
95
121
|
if (options.commands.length === 0) {
|
|
@@ -97,7 +123,20 @@ export default async function allVerdictsExecutor(options, context) {
|
|
|
97
123
|
return { success: false };
|
|
98
124
|
}
|
|
99
125
|
const cwd = resolve(context.root, options.cwd);
|
|
100
|
-
|
|
126
|
+
let planned;
|
|
127
|
+
try {
|
|
128
|
+
planned = await planCommands(options, context.root);
|
|
129
|
+
}
|
|
130
|
+
catch (error) {
|
|
131
|
+
process.stderr.write(`all-verdicts: cannot resolve the commands to run: ${error instanceof Error ? error.message : String(error)}\n`);
|
|
132
|
+
return { success: false };
|
|
133
|
+
}
|
|
134
|
+
const runs = planned.map(({ command, noRun }) => ({
|
|
135
|
+
command,
|
|
136
|
+
output: noRun === undefined ? [] : [`${noRun}\n`],
|
|
137
|
+
pid: undefined,
|
|
138
|
+
verdict: noRun === undefined ? null : { kind: 'pass' },
|
|
139
|
+
}));
|
|
101
140
|
const onExit = () => {
|
|
102
141
|
for (const run of runs) {
|
|
103
142
|
if (run.verdict === null && run.pid !== undefined)
|
|
@@ -126,7 +165,14 @@ export default async function allVerdictsExecutor(options, context) {
|
|
|
126
165
|
process.on('exit', onExit);
|
|
127
166
|
for (const [signal, listener] of listeners)
|
|
128
167
|
process.on(signal, listener);
|
|
129
|
-
|
|
168
|
+
// A command that needs no run is already judged: its block prints now, the others' as they close.
|
|
169
|
+
for (const run of runs)
|
|
170
|
+
if (run.verdict !== null)
|
|
171
|
+
process.stdout.write(block(run));
|
|
172
|
+
const verdicts = await Promise.all(runs.map(async (run) => ({
|
|
173
|
+
command: run.command,
|
|
174
|
+
verdict: run.verdict ?? (await judge(run, cwd)),
|
|
175
|
+
})));
|
|
130
176
|
detach();
|
|
131
177
|
process.stdout.write(verdictReport(verdicts));
|
|
132
178
|
return { success: verdicts.every(({ verdict }) => verdict.kind === 'pass') };
|
|
@@ -1,10 +1,23 @@
|
|
|
1
1
|
/** The executor the inferred `lint` target runs its tool commands with. */
|
|
2
2
|
export declare const ALL_VERDICTS_EXECUTOR = "@smoothbricks/nx-plugin:all-verdicts";
|
|
3
|
+
/**
|
|
4
|
+
* Where an inferred ESLint command names its files. The graph holds no list of them: a list is the files of the moment
|
|
5
|
+
* the graph was computed, and a run that outlives that moment fails on a file since deleted (ESLint refuses a pattern
|
|
6
|
+
* no file matches) and skips one since added. The executor replaces each occurrence with the files ESLint is handed
|
|
7
|
+
* when the command runs.
|
|
8
|
+
*/
|
|
9
|
+
export declare const ESLINT_SOURCES_TOKEN = "{eslintSources}";
|
|
3
10
|
/** Options of `@smoothbricks/nx-plugin:all-verdicts`. */
|
|
4
11
|
export interface AllVerdictsOptions {
|
|
5
12
|
/** Shell commands, all started at once; none ends another. An empty list is refused: it could never fail. */
|
|
6
13
|
readonly commands: readonly string[];
|
|
7
14
|
/** Where every command runs, relative to the workspace root. */
|
|
8
15
|
readonly cwd: string;
|
|
16
|
+
/**
|
|
17
|
+
* The project, by workspace-relative root, whose ESLint sources replace {@link ESLINT_SOURCES_TOKEN} in a command when
|
|
18
|
+
* it runs: its `src` files and those its `tsconfig.test.json` declares, read from a fresh workspace file index. A
|
|
19
|
+
* command that names the token with no project is refused. A project with none passes without running ESLint.
|
|
20
|
+
*/
|
|
21
|
+
readonly eslintProjectRoot?: string;
|
|
9
22
|
}
|
|
10
23
|
//# sourceMappingURL=schema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/executors/all-verdicts/schema.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,eAAO,MAAM,qBAAqB,yCAAyC,CAAC;AAE5E,yDAAyD;AACzD,MAAM,WAAW,kBAAkB;IACjC,6GAA6G;IAC7G,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,gEAAgE;IAChE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/executors/all-verdicts/schema.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,eAAO,MAAM,qBAAqB,yCAAyC,CAAC;AAE5E;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,oBAAoB,CAAC;AAEtD,yDAAyD;AACzD,MAAM,WAAW,kBAAkB;IACjC,6GAA6G;IAC7G,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,gEAAgE;IAChE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;CACrC"}
|
|
@@ -1,2 +1,9 @@
|
|
|
1
1
|
/** The executor the inferred `lint` target runs its tool commands with. */
|
|
2
2
|
export const ALL_VERDICTS_EXECUTOR = '@smoothbricks/nx-plugin:all-verdicts';
|
|
3
|
+
/**
|
|
4
|
+
* Where an inferred ESLint command names its files. The graph holds no list of them: a list is the files of the moment
|
|
5
|
+
* the graph was computed, and a run that outlives that moment fails on a file since deleted (ESLint refuses a pattern
|
|
6
|
+
* no file matches) and skips one since added. The executor replaces each occurrence with the files ESLint is handed
|
|
7
|
+
* when the command runs.
|
|
8
|
+
*/
|
|
9
|
+
export const ESLINT_SOURCES_TOKEN = '{eslintSources}';
|
|
@@ -3,11 +3,10 @@
|
|
|
3
3
|
* a pure function of the run's events and the times they happened at, so a table can test it with no clock and no
|
|
4
4
|
* process (verdict.ts says why the bounds are separate).
|
|
5
5
|
*
|
|
6
|
-
* -
|
|
7
|
-
* -
|
|
8
|
-
* - The
|
|
9
|
-
*
|
|
10
|
-
* starting again after a build, and stopped while nothing tests.
|
|
6
|
+
* - A scheduled leaf arms nothing until its first grant. Later zero-hold intervals pause only the idle budget.
|
|
7
|
+
* - Any explicitly queued task process pauses idle, including alongside held grants; ceilings keep running.
|
|
8
|
+
* - The fixture ceiling ends with its segment. The idle clock also stops outside the testing lifecycle.
|
|
9
|
+
* - Finished tests reset the idle budget whether their release byte arrived before or after their output.
|
|
11
10
|
*/
|
|
12
11
|
/** The limits a run was given, in milliseconds; an absent one never expires. */
|
|
13
12
|
export interface BoundLimits {
|
|
@@ -15,20 +14,48 @@ export interface BoundLimits {
|
|
|
15
14
|
readonly fixtureMs?: number;
|
|
16
15
|
readonly totalMs?: number;
|
|
17
16
|
}
|
|
18
|
-
/**
|
|
17
|
+
/**
|
|
18
|
+
* When each armed bound expires, in the clock's milliseconds; `null` when it is not armed. `queued`: the run waits for
|
|
19
|
+
* its pool's grant, so none is armed yet.
|
|
20
|
+
*/
|
|
19
21
|
export interface Bounds {
|
|
20
22
|
readonly idle: number | null;
|
|
21
23
|
readonly fixture: number | null;
|
|
22
24
|
readonly total: number | null;
|
|
25
|
+
readonly queued: boolean;
|
|
26
|
+
readonly holds: number | null;
|
|
27
|
+
readonly idleRemaining: number | null;
|
|
28
|
+
readonly admissionWaiting: boolean;
|
|
23
29
|
}
|
|
24
|
-
export type BoundKind =
|
|
30
|
+
export type BoundKind = 'idle' | 'fixture' | 'total';
|
|
25
31
|
export type BoundEvent =
|
|
26
|
-
/**
|
|
32
|
+
/**
|
|
33
|
+
* The command started; `testing` is the lifecycle's answer then, `fixture` whether a supervised fixture leads it,
|
|
34
|
+
* `queued` whether mbx schedules this leaf, as known before spawn.
|
|
35
|
+
*/
|
|
27
36
|
{
|
|
28
37
|
readonly kind: 'spawn';
|
|
29
38
|
readonly at: number;
|
|
30
39
|
readonly testing: boolean;
|
|
31
40
|
readonly fixture: boolean;
|
|
41
|
+
readonly queued: boolean;
|
|
42
|
+
}
|
|
43
|
+
/** Each admission begins a hold; the first one starts the queued leaf's ceilings. */
|
|
44
|
+
| {
|
|
45
|
+
readonly kind: 'granted';
|
|
46
|
+
readonly at: number;
|
|
47
|
+
readonly testing: boolean;
|
|
48
|
+
readonly fixture: boolean;
|
|
49
|
+
} | {
|
|
50
|
+
readonly kind: 'released';
|
|
51
|
+
readonly at: number;
|
|
52
|
+
}
|
|
53
|
+
/** A successful public snapshot proved whether a live task process is queued; `at` is completion, not poll start. */
|
|
54
|
+
| {
|
|
55
|
+
readonly kind: 'admission-queue';
|
|
56
|
+
readonly at: number;
|
|
57
|
+
readonly waiting: boolean;
|
|
58
|
+
readonly testing: boolean;
|
|
32
59
|
}
|
|
33
60
|
/**
|
|
34
61
|
* The runner's state may have moved: a test finished (`finished`), a phase changed, or the lifecycle failed.
|
|
@@ -53,4 +80,26 @@ export declare function earliestBound(bounds: Bounds): {
|
|
|
53
80
|
readonly kind: BoundKind;
|
|
54
81
|
readonly at: number;
|
|
55
82
|
} | null;
|
|
83
|
+
/** Observed queue duration on a monotonic clock; stopping closes its interval permanently, before cleanup begins. */
|
|
84
|
+
export type AdmissionWait = {
|
|
85
|
+
readonly kind: 'observing';
|
|
86
|
+
readonly since: number | null;
|
|
87
|
+
readonly waitedMs: number;
|
|
88
|
+
} | {
|
|
89
|
+
readonly kind: 'stopped';
|
|
90
|
+
readonly waitedMs: number;
|
|
91
|
+
};
|
|
92
|
+
export type AdmissionWaitEvent = {
|
|
93
|
+
readonly kind: 'snapshot';
|
|
94
|
+
readonly at: number;
|
|
95
|
+
readonly waiting: boolean;
|
|
96
|
+
} | {
|
|
97
|
+
readonly kind: 'stop';
|
|
98
|
+
readonly at: number;
|
|
99
|
+
};
|
|
100
|
+
export declare const NO_ADMISSION_WAIT: AdmissionWait;
|
|
101
|
+
/** Read the observed duration, not the time later spent tearing down the command or reading its report. */
|
|
102
|
+
export declare function admissionWaitMs(wait: AdmissionWait, at: number): number;
|
|
103
|
+
/** A successful completed observation opens/closes an interval; terminal/cancellation stops freeze it. */
|
|
104
|
+
export declare function stepAdmissionWait(wait: AdmissionWait, event: AdmissionWaitEvent): AdmissionWait;
|
|
56
105
|
//# sourceMappingURL=bounds.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bounds.d.ts","sourceRoot":"","sources":["../../../src/executors/bounded-exec/bounds.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"bounds.d.ts","sourceRoot":"","sources":["../../../src/executors/bounded-exec/bounds.ts"],"names":[],"mappings":"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"}
|