@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
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-results.d.ts","sourceRoot":"","sources":["../../../src/executors/bounded-exec/test-results.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,KAAK,IAAI,EAAE,MAAM,OAAO,CAAC;AAEzC,eAAO,MAAM,iBAAiB,uBAAuB,CAAC;AACtD,eAAO,MAAM,kBAAkB,sBAAsB,CAAC;AAEtD,KAAK,UAAU,GAAG,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAEhF,8FAA8F;AAC9F,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IAC1C,QAAQ,CAAC,MAAM,EAAE,QAAQ,GAAG,UAAU,GAAG,OAAO,CAAC;IACjD,qFAAqF;IACrF,QAAQ,CAAC,iBAAiB,CAAC,EAAE,UAAU,CAAC;IACxC,oFAAoF;IACpF,QAAQ,CAAC,UAAU,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IACvD,qEAAqE;IACrE,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,sFAAsF;IACtF,QAAQ,CAAC,QAAQ,EAAE;QACjB,QAAQ,CAAC,IAAI,EAAE,OAAO,kBAAkB,CAAC;QACzC,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;QAC/B,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;KAC9B,GAAG,IAAI,CAAC;IACT,gFAAgF;IAChF,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;CAC7B;AAED,eAAO,MAAM,kBAAkB,+CAAyC,CAAC;AAEzE,sGAAsG;AACtG,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAMlG"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import * as _isFormatUuid_1 from "typia/lib/internal/_isFormatUuid";
|
|
2
|
+
import * as _isTypeUint64_1 from "typia/lib/internal/_isTypeUint64";
|
|
3
|
+
import typia from 'typia';
|
|
4
|
+
export const TEST_RESULTS_FILE = 'test-results.jsonl';
|
|
5
|
+
export const TEST_FAILURES_FILE = 'test-failures.log';
|
|
6
|
+
export const isClosedTestResult = (() => {
|
|
7
|
+
const _io0 = (input, _exceptionable = true) => "string" === typeof input.runId && _isFormatUuid_1._isFormatUuid(input.runId) && "string" === typeof input.id && ("fail" === input.status || "pass" === input.status || "skip" === input.status) && ("junit" === input.source || "native" === input.source || "progress" === input.source) && (undefined === input.contradictsCursor || "number" === typeof input.contradictsCursor && (_isTypeUint64_1._isTypeUint64(input.contradictsCursor) && input.contradictsCursor <= 9007199254740991)) && (null === input.durationMs || "number" === typeof input.durationMs && 0 <= input.durationMs) && (null === input.sourceRef || "string" === typeof input.sourceRef) && (null === input.causeRef || "object" === typeof input.causeRef && null !== input.causeRef && _io1(input.causeRef, true && _exceptionable)) && ("number" === typeof input.cursor && (_isTypeUint64_1._isTypeUint64(input.cursor) && input.cursor <= 9007199254740991)) && (8 === Object.keys(input).length || Object.keys(input).every(key => {
|
|
8
|
+
if (["runId", "id", "status", "source", "contradictsCursor", "durationMs", "sourceRef", "causeRef", "cursor"].some(prop => key === prop))
|
|
9
|
+
return true;
|
|
10
|
+
const value = input[key];
|
|
11
|
+
if (undefined === value)
|
|
12
|
+
return true;
|
|
13
|
+
return false;
|
|
14
|
+
}));
|
|
15
|
+
const _io1 = (input, _exceptionable = true) => "test-failures.log" === input.path && ("number" === typeof input.startByte && (_isTypeUint64_1._isTypeUint64(input.startByte) && input.startByte <= 9007199254740991)) && ("number" === typeof input.endByte && (_isTypeUint64_1._isTypeUint64(input.endByte) && input.endByte <= 9007199254740991)) && (3 === Object.keys(input).length || Object.keys(input).every(key => {
|
|
16
|
+
if (["path", "startByte", "endByte"].some(prop => key === prop))
|
|
17
|
+
return true;
|
|
18
|
+
const value = input[key];
|
|
19
|
+
if (undefined === value)
|
|
20
|
+
return true;
|
|
21
|
+
return false;
|
|
22
|
+
}));
|
|
23
|
+
return (input, _exceptionable = true) => "object" === typeof input && null !== input && _io0(input, true);
|
|
24
|
+
})();
|
|
25
|
+
/** A producer-normalized workspace-relative declaration location, never inferred from a test name. */
|
|
26
|
+
export function parseTestSourceRef(sourceRef) {
|
|
27
|
+
if (sourceRef === null)
|
|
28
|
+
return null;
|
|
29
|
+
const match = /^(.+):([1-9]\d*)$/.exec(sourceRef);
|
|
30
|
+
const path = match?.[1];
|
|
31
|
+
const line = Number(match?.[2]);
|
|
32
|
+
return path !== undefined && Number.isSafeInteger(line) ? { path, line } : null;
|
|
33
|
+
}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import type { CpuWaitRow } from './lease-wait.js';
|
|
2
2
|
import { type LockWait } from './lock-wait.js';
|
|
3
|
+
import type { MbxQueuedRequest } from './mbx-queue.js';
|
|
4
|
+
import type { NativeTestResult } from './test-result-writer.js';
|
|
3
5
|
/**
|
|
4
6
|
* Why one bounded run ended, recorded per Nx task so a caller can tell a load-sensitive bound
|
|
5
7
|
* from a real failure without reading the run's output.
|
|
@@ -18,12 +20,17 @@ import { type LockWait } from './lock-wait.js';
|
|
|
18
20
|
* - `no-space`: the run failed and its output said a write found no space (ENOSPC). Whatever its tests then reported,
|
|
19
21
|
* they failed on the disk, not on their own: the verdict names the line that said so and, when the task held one,
|
|
20
22
|
* its RAM temp volume as it stood when that line arrived.
|
|
23
|
+
* - `queued`: the command failed before any admission after a live task PID was explicitly seen waiting in mbx.
|
|
24
|
+
* Its observed wait and public queue positions describe admission pressure, never a wedged test.
|
|
21
25
|
* - `failed`: anything else that did not pass. That includes an assertion named in the report,
|
|
22
26
|
* or a non-zero exit with no report to say why.
|
|
23
27
|
*/
|
|
24
28
|
export type BoundedExecVerdict = {
|
|
25
29
|
readonly outcome: 'passed';
|
|
26
|
-
} | {
|
|
30
|
+
} | ({
|
|
31
|
+
readonly outcome: 'queued';
|
|
32
|
+
readonly exitCode: number;
|
|
33
|
+
} & AdmissionQueueWait) | {
|
|
27
34
|
readonly outcome: 'bound';
|
|
28
35
|
readonly bound: 'total' | 'fixture';
|
|
29
36
|
readonly limitMs: number;
|
|
@@ -48,6 +55,11 @@ export type BoundedExecVerdict = {
|
|
|
48
55
|
readonly exitCode: number;
|
|
49
56
|
readonly tests: readonly string[];
|
|
50
57
|
};
|
|
58
|
+
/** Observed admission wait, supplied only while the command has never received a grant. */
|
|
59
|
+
export interface AdmissionQueueWait {
|
|
60
|
+
readonly waitedMs: number;
|
|
61
|
+
readonly requests: readonly MbxQueuedRequest[];
|
|
62
|
+
}
|
|
51
63
|
/**
|
|
52
64
|
* The task's RAM temp volume, read when a line saying ENOSPC arrived: the writer's own lease and the space left on the
|
|
53
65
|
* volume it was taken on (`measured`), or why there was none to measure: the lease was no longer on that volume
|
|
@@ -113,6 +125,8 @@ export interface JunitFailures {
|
|
|
113
125
|
* Retry elements (`flakyFailure`, `rerunFailure`, ...) describe attempts, not the verdict.
|
|
114
126
|
*/
|
|
115
127
|
export declare function junitFailures(xml: string): JunitFailures;
|
|
128
|
+
/** Bun's nested suites carry the describe chain; testcase.classname is in the reverse order. */
|
|
129
|
+
export declare function bunJunitResults(xml: string): NativeTestResult[];
|
|
116
130
|
/** One test case of a JUnit report: nextest's binary id (its `classname`), the test's name and its seconds. */
|
|
117
131
|
export interface JunitCaseTime {
|
|
118
132
|
readonly binary: string;
|
|
@@ -152,6 +166,8 @@ export interface RunEnd {
|
|
|
152
166
|
readonly noSpace: NoSpaceSighting | null;
|
|
153
167
|
/** The lock waits the expiry's snapshot named; empty when none, or when that capture did not complete. */
|
|
154
168
|
readonly lockWaits: readonly LockWait[];
|
|
169
|
+
/** Explicit observed queue evidence before first admission; absent after any grant. */
|
|
170
|
+
readonly admissionQueue?: AdmissionQueueWait | null;
|
|
155
171
|
}
|
|
156
172
|
/**
|
|
157
173
|
* Judge a run. A run that failed after its output said ENOSPC failed on the disk: that is read first, ahead of the
|
|
@@ -184,6 +200,12 @@ export declare const JUNIT_FILE = "report.xml";
|
|
|
184
200
|
export declare const BUN_TEST: RegExp;
|
|
185
201
|
export declare const NEXTEST_RUN: RegExp;
|
|
186
202
|
export declare const GO_TEST: RegExp;
|
|
203
|
+
/**
|
|
204
|
+
* `go test`, or `smoo-nx-go-test-run` running the test binaries `smoo-nx-go-test-build` made with `go test -c`, under
|
|
205
|
+
* any path: both write `go test -json` events on stdout and run `-p` packages at once. Only `go test` builds, so only
|
|
206
|
+
* it is asked for `-json` (withProgressReport) or given a build phase (withRunnerLifecycle).
|
|
207
|
+
*/
|
|
208
|
+
export declare const GO_TEST_RUNNER: RegExp;
|
|
187
209
|
/**
|
|
188
210
|
* `command` with its test runner asked to write a JUnit report into `directory`, the report
|
|
189
211
|
* `judgeRun` reads. Both runners are recognised by their invocation, so every target that runs
|
|
@@ -201,7 +223,7 @@ export declare function writeRecord(directory: string, record: BoundedExecRecord
|
|
|
201
223
|
/** The record in `directory`, or `null` when there is none. A malformed record throws. */
|
|
202
224
|
export declare function readRecord(directory: string): Promise<BoundedExecRecord | null>;
|
|
203
225
|
/** The JUnit report a command wrote into `directory`, or `null` when it wrote none. */
|
|
204
|
-
export declare function readJunitReport(directory: string): Promise<JunitFailures | null>;
|
|
226
|
+
export declare function readJunitReport(directory: string, bunClosed?: (results: readonly NativeTestResult[]) => void): Promise<JunitFailures | null>;
|
|
205
227
|
/** A failed task of an Nx run, and whether its bounded-exec record shows only a bound. */
|
|
206
228
|
export type FailedTask = {
|
|
207
229
|
readonly task: string;
|
|
@@ -220,6 +242,8 @@ export type FailedTask = {
|
|
|
220
242
|
* with no record, or a record from another hash, is not a bound; nothing is assumed.
|
|
221
243
|
*/
|
|
222
244
|
export declare function failedTasksOfRun(runJson: unknown, workspaceData: string): Promise<FailedTask[]>;
|
|
245
|
+
/** The same honest admission diagnostic in live output and a terminal verdict. */
|
|
246
|
+
export declare function describeAdmissionQueue(wait: AdmissionQueueWait): string;
|
|
223
247
|
export declare function describeVerdict(verdict: BoundedExecVerdict): string;
|
|
224
248
|
/**
|
|
225
249
|
* What a run's output said about a write that found no space, and where the run's temp files lived then. The free
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verdict.d.ts","sourceRoot":"","sources":["../../../src/executors/bounded-exec/verdict.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"verdict.d.ts","sourceRoot":"","sources":["../../../src/executors/bounded-exec/verdict.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
import { mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
|
|
2
2
|
import { join } from 'node:path';
|
|
3
|
+
import typia from 'typia';
|
|
3
4
|
import { describeHolders } from './lock-wait.js';
|
|
5
|
+
import { TEST_FAILURES_FILE, TEST_RESULTS_FILE } from './test-results.js';
|
|
6
|
+
const isQueuedVerdict = (() => {
|
|
7
|
+
const _io0 = input => _io1(input) && ("queued" === input.outcome && "number" === typeof input.exitCode);
|
|
8
|
+
const _io1 = input => "number" === typeof input.waitedMs && (Array.isArray(input.requests) && input.requests.every(elem => "object" === typeof elem && null !== elem && _io2(elem)));
|
|
9
|
+
const _io2 = input => "number" === typeof input.pid && "number" === typeof input.ticket && "number" === typeof input.queuePosition;
|
|
10
|
+
return input => "object" === typeof input && null !== input && _io0(input);
|
|
11
|
+
})();
|
|
4
12
|
/** The environment variable naming the absolute path a command writes its JUnit report to. */
|
|
5
13
|
export const JUNIT_REPORT_ENV = 'BOUNDED_EXEC_JUNIT';
|
|
6
14
|
/**
|
|
@@ -69,6 +77,68 @@ export function junitFailures(xml) {
|
|
|
69
77
|
close();
|
|
70
78
|
return { timedOut, cancelled, failed };
|
|
71
79
|
}
|
|
80
|
+
/** Bun's nested suites carry the describe chain; testcase.classname is in the reverse order. */
|
|
81
|
+
export function bunJunitResults(xml) {
|
|
82
|
+
const results = [];
|
|
83
|
+
const suites = [];
|
|
84
|
+
let current = null;
|
|
85
|
+
const text = xml;
|
|
86
|
+
const tags = /<!\[CDATA\[[\s\S]*?\]\]>|<!--[\s\S]*?-->|<(\/?)(testsuite|testcase)\b((?:[^>"']|"[^"]*"|'[^']*')*?)(\/?)>/g;
|
|
87
|
+
let end = 0;
|
|
88
|
+
const close = () => {
|
|
89
|
+
if (current === null)
|
|
90
|
+
return;
|
|
91
|
+
const name = attribute(current.attributes, 'name');
|
|
92
|
+
const file = attribute(current.attributes, 'file');
|
|
93
|
+
if (name !== null && file !== null) {
|
|
94
|
+
const failed = /<(?:failure|error)\b/.test(current.body);
|
|
95
|
+
const skipped = /<skipped\b/.test(current.body);
|
|
96
|
+
const line = attribute(current.attributes, 'line');
|
|
97
|
+
const time = attribute(current.attributes, 'time');
|
|
98
|
+
const seconds = time === null ? Number.NaN : Number(time);
|
|
99
|
+
const output = /<(?:failure|error)\b((?:[^>"']|"[^"]*"|'[^']*')*?)(?:\/>|>((?:<!\[CDATA\[[\s\S]*?\]\]>|(?!<!\[CDATA\[|<\/(?:failure|error)>)[\s\S])*)<\/(?:failure|error)>)/.exec(current.body);
|
|
100
|
+
const failureOutput = output === null
|
|
101
|
+
? null
|
|
102
|
+
: output[2] === undefined || output[2] === ''
|
|
103
|
+
? (attribute(output[1] ?? '', 'message') ?? '')
|
|
104
|
+
: decodeJunitText(output[2]);
|
|
105
|
+
results.push({
|
|
106
|
+
id: `${file}::${[...suites.slice(1), name].join(' > ')}`,
|
|
107
|
+
status: failed ? 'fail' : skipped ? 'skip' : 'pass',
|
|
108
|
+
source: 'junit',
|
|
109
|
+
durationMs: Number.isFinite(seconds) && seconds >= 0 ? seconds * 1000 : null,
|
|
110
|
+
sourceRef: line === null ? null : `${file}:${line}`,
|
|
111
|
+
failureOutput,
|
|
112
|
+
});
|
|
113
|
+
}
|
|
114
|
+
current = null;
|
|
115
|
+
};
|
|
116
|
+
for (const match of text.matchAll(tags)) {
|
|
117
|
+
if (current !== null)
|
|
118
|
+
current.body += text.slice(end, match.index);
|
|
119
|
+
end = match.index + match[0].length;
|
|
120
|
+
const [, slash, tag, attributes = '', selfClosing] = match;
|
|
121
|
+
if (tag === undefined) {
|
|
122
|
+
if (current !== null)
|
|
123
|
+
current.body += match[0];
|
|
124
|
+
}
|
|
125
|
+
else if (tag === 'testsuite') {
|
|
126
|
+
if (slash === '/')
|
|
127
|
+
suites.pop();
|
|
128
|
+
else if (selfClosing !== '/')
|
|
129
|
+
suites.push(attribute(attributes, 'name') ?? '');
|
|
130
|
+
}
|
|
131
|
+
else if (slash === '/')
|
|
132
|
+
close();
|
|
133
|
+
else {
|
|
134
|
+
close();
|
|
135
|
+
current = { attributes, body: '' };
|
|
136
|
+
if (selfClosing === '/')
|
|
137
|
+
close();
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
return results;
|
|
141
|
+
}
|
|
72
142
|
/** Every test case of a JUnit document with the `time` it ran for; a case without one is not timed and not listed. */
|
|
73
143
|
export function junitCaseTimes(xml) {
|
|
74
144
|
const text = xml.replace(/<!\[CDATA\[[\s\S]*?\]\]>/g, '').replace(/<!--[\s\S]*?-->/g, '');
|
|
@@ -91,6 +161,16 @@ function attribute(attributes, name) {
|
|
|
91
161
|
}
|
|
92
162
|
return decodeEntities(match[2] ?? match[3] ?? '');
|
|
93
163
|
}
|
|
164
|
+
function decodeJunitText(value) {
|
|
165
|
+
let text = '';
|
|
166
|
+
let end = 0;
|
|
167
|
+
for (const match of value.matchAll(/<!\[CDATA\[([\s\S]*?)\]\]>|<!--[\s\S]*?-->/g)) {
|
|
168
|
+
text += decodeEntities(value.slice(end, match.index));
|
|
169
|
+
text += match[1] ?? '';
|
|
170
|
+
end = match.index + match[0].length;
|
|
171
|
+
}
|
|
172
|
+
return text + decodeEntities(value.slice(end));
|
|
173
|
+
}
|
|
94
174
|
function decodeEntities(value) {
|
|
95
175
|
return value.replace(/&(#x[0-9a-fA-F]+|#[0-9]+|amp|lt|gt|quot|apos);/g, (_, entity) => {
|
|
96
176
|
switch (entity) {
|
|
@@ -122,6 +202,9 @@ export function judgeRun(run) {
|
|
|
122
202
|
const tests = run.report === null ? [] : [...run.report.failed, ...run.report.timedOut, ...run.report.cancelled];
|
|
123
203
|
return { outcome: 'no-space', exitCode: run.exitCode === 0 ? 1 : run.exitCode, tests, ...run.noSpace };
|
|
124
204
|
}
|
|
205
|
+
if (run.admissionQueue != null && run.exitCode !== 0) {
|
|
206
|
+
return { outcome: 'queued', exitCode: run.exitCode, ...run.admissionQueue };
|
|
207
|
+
}
|
|
125
208
|
if (run.expiry?.kind === 'idle') {
|
|
126
209
|
const tests = [...new Set([...run.expiry.tests, ...(run.report?.cancelled ?? [])])];
|
|
127
210
|
return { outcome: 'wedged', idleMs: run.expiry.limitMs, elapsedMs: run.elapsedMs, tests, lockWaits: run.lockWaits };
|
|
@@ -174,6 +257,12 @@ const NEXTEST_REPORT_CONFIG_FILE = 'nextest-report.toml';
|
|
|
174
257
|
export const BUN_TEST = /(?<=^|[\s;&|()])((?:[^\s;&|()<>'"`\\=]*\/)?bun)\s+test(?=\s|$)/g;
|
|
175
258
|
export const NEXTEST_RUN = /(?<=^|[\s;&|()-])nextest\s+run(?=\s|$)/g;
|
|
176
259
|
export const GO_TEST = /(?<=^|[\s;&|()])go\s+test(?=\s|$)/;
|
|
260
|
+
/**
|
|
261
|
+
* `go test`, or `smoo-nx-go-test-run` running the test binaries `smoo-nx-go-test-build` made with `go test -c`, under
|
|
262
|
+
* any path: both write `go test -json` events on stdout and run `-p` packages at once. Only `go test` builds, so only
|
|
263
|
+
* it is asked for `-json` (withProgressReport) or given a build phase (withRunnerLifecycle).
|
|
264
|
+
*/
|
|
265
|
+
export const GO_TEST_RUNNER = /(?<=^|[\s;&|()])(?:go\s+test|(?:[^\s;&|()<>'"`\\=]*\/)?smoo-nx-go-test-run)(?=\s|$)/;
|
|
177
266
|
/**
|
|
178
267
|
* `command` with its test runner asked to write a JUnit report into `directory`, the report
|
|
179
268
|
* `judgeRun` reads. Both runners are recognised by their invocation, so every target that runs
|
|
@@ -208,6 +297,8 @@ export async function clearTaskDirectory(directory) {
|
|
|
208
297
|
await Promise.all([
|
|
209
298
|
rm(join(directory, VERDICT_FILE), { force: true }),
|
|
210
299
|
rm(join(directory, JUNIT_FILE), { force: true }),
|
|
300
|
+
rm(join(directory, TEST_RESULTS_FILE), { force: true }),
|
|
301
|
+
rm(join(directory, TEST_FAILURES_FILE), { force: true }),
|
|
211
302
|
]);
|
|
212
303
|
}
|
|
213
304
|
export async function writeRecord(directory, record) {
|
|
@@ -231,14 +322,15 @@ export async function readRecord(directory) {
|
|
|
231
322
|
return parseRecord(JSON.parse(text));
|
|
232
323
|
}
|
|
233
324
|
/** The JUnit report a command wrote into `directory`, or `null` when it wrote none. */
|
|
234
|
-
export async function readJunitReport(directory) {
|
|
325
|
+
export async function readJunitReport(directory, bunClosed) {
|
|
235
326
|
try {
|
|
236
|
-
|
|
327
|
+
const xml = await readFile(join(directory, JUNIT_FILE), 'utf8');
|
|
328
|
+
bunClosed?.(bunJunitResults(xml));
|
|
329
|
+
return junitFailures(xml);
|
|
237
330
|
}
|
|
238
331
|
catch (error) {
|
|
239
|
-
if (isNotFound(error))
|
|
332
|
+
if (isNotFound(error))
|
|
240
333
|
return null;
|
|
241
|
-
}
|
|
242
334
|
throw error;
|
|
243
335
|
}
|
|
244
336
|
}
|
|
@@ -256,6 +348,10 @@ function parseVerdict(value) {
|
|
|
256
348
|
switch (value.outcome) {
|
|
257
349
|
case 'passed':
|
|
258
350
|
return { outcome: 'passed' };
|
|
351
|
+
case 'queued':
|
|
352
|
+
if (isQueuedVerdict(value))
|
|
353
|
+
return value;
|
|
354
|
+
break;
|
|
259
355
|
case 'bound':
|
|
260
356
|
if ((value.bound === 'total' || value.bound === 'fixture') &&
|
|
261
357
|
typeof value.limitMs === 'number' &&
|
|
@@ -391,10 +487,18 @@ export async function failedTasksOfRun(runJson, workspaceData) {
|
|
|
391
487
|
}
|
|
392
488
|
return failed;
|
|
393
489
|
}
|
|
490
|
+
/** The same honest admission diagnostic in live output and a terminal verdict. */
|
|
491
|
+
export function describeAdmissionQueue(wait) {
|
|
492
|
+
return `queued for admission ${(wait.waitedMs / 1_000).toFixed(1)} s; mbx ${wait.requests
|
|
493
|
+
.map((request) => `pid=${request.pid} ticket=${request.ticket} queue position=${request.queuePosition}`)
|
|
494
|
+
.join(', ')}`;
|
|
495
|
+
}
|
|
394
496
|
export function describeVerdict(verdict) {
|
|
395
497
|
switch (verdict.outcome) {
|
|
396
498
|
case 'passed':
|
|
397
499
|
return 'passed';
|
|
500
|
+
case 'queued':
|
|
501
|
+
return `${describeAdmissionQueue(verdict)}; exited ${verdict.exitCode} before first admission`;
|
|
398
502
|
case 'bound':
|
|
399
503
|
return verdict.bound === 'test'
|
|
400
504
|
? `per-test timeout only: ${verdict.tests.join(', ')}`
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The hash a wrangler deploy runs under when its hasher could not confirm that the stage serves its artifact's
|
|
3
|
+
* version: the artifact hash, then a nonce no cache holds, so the run misses whatever an earlier run stored, rolled
|
|
4
|
+
* back to or not. A miss is the right answer there. The deploy still tags the artifact's version
|
|
5
|
+
* (`deployArtifactHash`), so once that version is live the next hash is the artifact's own.
|
|
6
|
+
*/
|
|
7
|
+
export declare function unconfirmedDeployHash(artifactHash: string, nonce: string): string;
|
|
8
|
+
/** The artifact hash a wrangler deploy task's hash carries: all of a confirmed one, the part before an unconfirmed one's nonce. */
|
|
9
|
+
export declare function deployArtifactHash(taskHash: string): string;
|
|
10
|
+
//# sourceMappingURL=deploy-hash.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deploy-hash.d.ts","sourceRoot":"","sources":["../../../src/executors/wrangler-deploy/deploy-hash.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAEjF;AAED,mIAAmI;AACnI,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAG3D"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The hash a wrangler deploy runs under when its hasher could not confirm that the stage serves its artifact's
|
|
3
|
+
* version: the artifact hash, then a nonce no cache holds, so the run misses whatever an earlier run stored, rolled
|
|
4
|
+
* back to or not. A miss is the right answer there. The deploy still tags the artifact's version
|
|
5
|
+
* (`deployArtifactHash`), so once that version is live the next hash is the artifact's own.
|
|
6
|
+
*/
|
|
7
|
+
export function unconfirmedDeployHash(artifactHash, nonce) {
|
|
8
|
+
return `${artifactHash}-${nonce}`;
|
|
9
|
+
}
|
|
10
|
+
/** The artifact hash a wrangler deploy task's hash carries: all of a confirmed one, the part before an unconfirmed one's nonce. */
|
|
11
|
+
export function deployArtifactHash(taskHash) {
|
|
12
|
+
const nonce = taskHash.indexOf('-');
|
|
13
|
+
return nonce === -1 ? taskHash : taskHash.slice(0, nonce);
|
|
14
|
+
}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import type { WranglerDeployOptions } from './schema.js';
|
|
2
|
+
/** What the executor reads of Nx's context: the workspace and the project's root. */
|
|
3
|
+
interface WranglerDeployContext {
|
|
4
|
+
readonly root: string;
|
|
5
|
+
readonly projectName?: string | undefined;
|
|
6
|
+
readonly projectsConfigurations: {
|
|
7
|
+
readonly projects: Readonly<Record<string, {
|
|
8
|
+
readonly root: string;
|
|
9
|
+
}>>;
|
|
10
|
+
};
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* `smoo wrangler deploy-stage --stage <stage>` in the project, as the workspace's own `smoo`, under the artifact hash
|
|
14
|
+
* of the hash the task ran under: `deploy-stage` tags the version it deploys with that hash, and the hasher compares
|
|
15
|
+
* the stage's live tag with it.
|
|
16
|
+
*/
|
|
17
|
+
export declare function runWranglerDeploy(options: WranglerDeployOptions, context: WranglerDeployContext, env: NodeJS.ProcessEnv): Promise<{
|
|
18
|
+
success: boolean;
|
|
19
|
+
}>;
|
|
20
|
+
export default function wranglerDeployExecutor(options: WranglerDeployOptions, context: WranglerDeployContext): Promise<{
|
|
21
|
+
success: boolean;
|
|
22
|
+
}>;
|
|
23
|
+
export {};
|
|
24
|
+
//# sourceMappingURL=executor.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/executors/wrangler-deploy/executor.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEzD,qFAAqF;AACrF,UAAU,qBAAqB;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,QAAQ,CAAC,sBAAsB,EAAE;QAAE,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC,CAAA;KAAE,CAAC;CAC7G;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,qBAAqB,EAC9B,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAiC/B;AAED,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAC5C,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAE/B"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { spawn } from 'node:child_process';
|
|
2
|
+
import { join } from 'node:path';
|
|
3
|
+
import { deployArtifactHash } from './deploy-hash.js';
|
|
4
|
+
import { workspaceBinPath } from './hasher.js';
|
|
5
|
+
/**
|
|
6
|
+
* `smoo wrangler deploy-stage --stage <stage>` in the project, as the workspace's own `smoo`, under the artifact hash
|
|
7
|
+
* of the hash the task ran under: `deploy-stage` tags the version it deploys with that hash, and the hasher compares
|
|
8
|
+
* the stage's live tag with it.
|
|
9
|
+
*/
|
|
10
|
+
export function runWranglerDeploy(options, context, env) {
|
|
11
|
+
const project = context.projectName === undefined ? undefined : context.projectsConfigurations.projects[context.projectName];
|
|
12
|
+
if (project === undefined) {
|
|
13
|
+
throw new Error('@smoothbricks/nx-plugin:wrangler-deploy requires a project context.');
|
|
14
|
+
}
|
|
15
|
+
const hash = env.NX_TASK_HASH;
|
|
16
|
+
const deployEnv = {
|
|
17
|
+
...env,
|
|
18
|
+
PATH: workspaceBinPath(context.root, env),
|
|
19
|
+
...(hash === undefined ? {} : { NX_TASK_HASH: deployArtifactHash(hash) }),
|
|
20
|
+
};
|
|
21
|
+
const command = `smoo wrangler deploy-stage --stage ${options.stage}`;
|
|
22
|
+
// eslint-disable-next-line deadline/no-unbounded-wait -- WHY unbounded: a deploy lasts as long as wrangler's upload and the live-version wait deploy-stage bounds itself, as it did under nx:run-commands
|
|
23
|
+
return new Promise((resolve) => {
|
|
24
|
+
const child = spawn('smoo', ['wrangler', 'deploy-stage', '--stage', options.stage], {
|
|
25
|
+
cwd: join(context.root, project.root),
|
|
26
|
+
env: deployEnv,
|
|
27
|
+
stdio: 'inherit',
|
|
28
|
+
});
|
|
29
|
+
child.on('error', (error) => {
|
|
30
|
+
console.error(`wrangler-deploy: \`${command}\` could not start: ${error.message}`);
|
|
31
|
+
resolve({ success: false });
|
|
32
|
+
});
|
|
33
|
+
child.on('close', (code, signal) => {
|
|
34
|
+
if (code !== 0) {
|
|
35
|
+
console.error(`wrangler-deploy: \`${command}\` ${signal === null ? `exited ${code}` : `was ended by ${signal}`}`);
|
|
36
|
+
}
|
|
37
|
+
resolve({ success: code === 0 });
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
export default function wranglerDeployExecutor(options, context) {
|
|
42
|
+
return runWranglerDeploy(options, context, process.env);
|
|
43
|
+
}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import type { HasherContext } from 'nx/src/config/misc-interfaces';
|
|
2
|
+
import type { Task } from 'nx/src/config/task-graph';
|
|
3
|
+
import type { Hash } from 'nx/src/hasher/task-hasher';
|
|
4
|
+
/** What serves a stage: the tag of the version taking all its traffic (null for a version deployed untagged), or why that is not known. */
|
|
5
|
+
export type LiveTag = {
|
|
6
|
+
readonly kind: 'tag';
|
|
7
|
+
readonly tag: string | null;
|
|
8
|
+
} | {
|
|
9
|
+
readonly kind: 'unknown';
|
|
10
|
+
readonly reason: string;
|
|
11
|
+
};
|
|
12
|
+
/** The hash detail that says what the stage served when it was not the artifact's version. */
|
|
13
|
+
export declare const LIVE_VERSION_NODE = "wrangler:live-version";
|
|
14
|
+
/**
|
|
15
|
+
* A deploy's hash: `artifact`, Nx's hash of what the deploy uploads and the stage it names, while the stage serves the
|
|
16
|
+
* version tagged with it, so a cache hit replays a deploy that would change nothing. Any other live version, or none
|
|
17
|
+
* known, makes it `unconfirmedDeployHash`, which no cache holds, so the run deploys; a rollback is never answered
|
|
18
|
+
* from the cache. Hashing the live tag in instead would never converge: the deployed version is tagged with the hash.
|
|
19
|
+
*/
|
|
20
|
+
export declare function deployHash(artifact: Hash, live: LiveTag, nonce: string): Hash;
|
|
21
|
+
/** `env`'s PATH with the workspace's own bins first, as nx:run-commands runs a command. */
|
|
22
|
+
export declare function workspaceBinPath(root: string, env: NodeJS.ProcessEnv): string;
|
|
23
|
+
/** The tag serving `stage` for the project at `projectRoot`, read from Cloudflare now, never from a cached answer. */
|
|
24
|
+
export declare function probeLiveTag(root: string, projectRoot: string, stage: string, env?: NodeJS.ProcessEnv): Promise<LiveTag>;
|
|
25
|
+
/** Nx's custom hasher of `@smoothbricks/nx-plugin:wrangler-deploy`: `deployHash` of the task's own hash and its stage's live tag. */
|
|
26
|
+
export default function wranglerDeployHasher(task: Task, context: HasherContext): Promise<Hash>;
|
|
27
|
+
//# sourceMappingURL=hasher.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hasher.d.ts","sourceRoot":"","sources":["../../../src/executors/wrangler-deploy/hasher.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AActD,2IAA2I;AAC3I,MAAM,MAAM,OAAO,GACf;IAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACrD;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1D,8FAA8F;AAC9F,eAAO,MAAM,iBAAiB,0BAA0B,CAAC;AAEzD;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAc7E;AAED,2FAA2F;AAC3F,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAG7E;AAED,sHAAsH;AACtH,wBAAsB,YAAY,CAChC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,OAAO,CAAC,OAAO,CAAC,CA2BlB;AASD,qIAAqI;AACrI,wBAA8B,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAWpG"}
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
import { execFile } from 'node:child_process';
|
|
2
|
+
import { randomBytes } from 'node:crypto';
|
|
3
|
+
import { delimiter, join } from 'node:path';
|
|
4
|
+
import { promisify } from 'node:util';
|
|
5
|
+
import { workspaceRoot } from 'nx/src/utils/workspace-root';
|
|
6
|
+
import { deployVersionTag } from '../../deploy-policy.js';
|
|
7
|
+
import { isRecord } from '../../type-guards.js';
|
|
8
|
+
import { unconfirmedDeployHash } from './deploy-hash.js';
|
|
9
|
+
const execFileAsync = promisify(execFile);
|
|
10
|
+
/**
|
|
11
|
+
* `smoo wrangler deployed-version` asks Cloudflare twice through wrangler, in seconds. The bound is for one that never
|
|
12
|
+
* answers: the live version is then unknown, the hash misses, and the deploy reads Cloudflare itself.
|
|
13
|
+
*/
|
|
14
|
+
const LIVE_TAG_DEADLINE_MS = 120_000;
|
|
15
|
+
/** The hash detail that says what the stage served when it was not the artifact's version. */
|
|
16
|
+
export const LIVE_VERSION_NODE = 'wrangler:live-version';
|
|
17
|
+
/**
|
|
18
|
+
* A deploy's hash: `artifact`, Nx's hash of what the deploy uploads and the stage it names, while the stage serves the
|
|
19
|
+
* version tagged with it, so a cache hit replays a deploy that would change nothing. Any other live version, or none
|
|
20
|
+
* known, makes it `unconfirmedDeployHash`, which no cache holds, so the run deploys; a rollback is never answered
|
|
21
|
+
* from the cache. Hashing the live tag in instead would never converge: the deployed version is tagged with the hash.
|
|
22
|
+
*/
|
|
23
|
+
export function deployHash(artifact, live, nonce) {
|
|
24
|
+
const expected = deployVersionTag(artifact.value);
|
|
25
|
+
if (live.kind === 'tag' && expected !== null && live.tag === expected)
|
|
26
|
+
return artifact;
|
|
27
|
+
const served = expected === null
|
|
28
|
+
? `the artifact hash ${artifact.value} names no version tag`
|
|
29
|
+
: live.kind === 'unknown'
|
|
30
|
+
? live.reason
|
|
31
|
+
: `${live.tag ?? 'an untagged version'} is live, not ${expected}`;
|
|
32
|
+
return {
|
|
33
|
+
...artifact,
|
|
34
|
+
value: unconfirmedDeployHash(artifact.value, nonce),
|
|
35
|
+
details: { ...artifact.details, nodes: { ...artifact.details.nodes, [LIVE_VERSION_NODE]: served } },
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
/** `env`'s PATH with the workspace's own bins first, as nx:run-commands runs a command. */
|
|
39
|
+
export function workspaceBinPath(root, env) {
|
|
40
|
+
const bins = join(root, 'node_modules', '.bin');
|
|
41
|
+
return env.PATH === undefined || env.PATH === '' ? bins : `${bins}${delimiter}${env.PATH}`;
|
|
42
|
+
}
|
|
43
|
+
/** The tag serving `stage` for the project at `projectRoot`, read from Cloudflare now, never from a cached answer. */
|
|
44
|
+
export async function probeLiveTag(root, projectRoot, stage, env = process.env) {
|
|
45
|
+
const args = ['wrangler', 'deployed-version', '--stage', stage, '--refresh'];
|
|
46
|
+
const command = `smoo ${args.join(' ')}`;
|
|
47
|
+
try {
|
|
48
|
+
const { stdout } = await execFileAsync('smoo', args, {
|
|
49
|
+
cwd: join(root, projectRoot),
|
|
50
|
+
env: { ...env, PATH: workspaceBinPath(root, env) },
|
|
51
|
+
encoding: 'utf8',
|
|
52
|
+
timeout: LIVE_TAG_DEADLINE_MS,
|
|
53
|
+
killSignal: 'SIGKILL',
|
|
54
|
+
maxBuffer: 64 * 1024,
|
|
55
|
+
});
|
|
56
|
+
const tag = stdout.trim();
|
|
57
|
+
if (tag === '' || /\s/.test(tag)) {
|
|
58
|
+
return { kind: 'unknown', reason: `\`${command}\` printed no single tag: ${JSON.stringify(stdout)}` };
|
|
59
|
+
}
|
|
60
|
+
// `deployed-version` says `untagged` for a version deployed outside Nx.
|
|
61
|
+
return { kind: 'tag', tag: tag === 'untagged' ? null : tag };
|
|
62
|
+
}
|
|
63
|
+
catch (error) {
|
|
64
|
+
if (error instanceof Error && 'killed' in error && error.killed === true) {
|
|
65
|
+
return { kind: 'unknown', reason: `\`${command}\` gave no answer within ${LIVE_TAG_DEADLINE_MS} ms` };
|
|
66
|
+
}
|
|
67
|
+
const said = error instanceof Error && 'stderr' in error && typeof error.stderr === 'string' ? error.stderr.trim() : '';
|
|
68
|
+
const reason = said !== '' ? said : error instanceof Error ? error.message : String(error);
|
|
69
|
+
return { kind: 'unknown', reason: `\`${command}\` failed: ${reason}` };
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
/** The stage the task deploys: its `--stage` override, else its target's `stage` option. */
|
|
73
|
+
function deployStage(task, options) {
|
|
74
|
+
const overrides = task.overrides;
|
|
75
|
+
if (isRecord(overrides) && typeof overrides.stage === 'string')
|
|
76
|
+
return overrides.stage;
|
|
77
|
+
return isRecord(options) && typeof options.stage === 'string' ? options.stage : null;
|
|
78
|
+
}
|
|
79
|
+
/** Nx's custom hasher of `@smoothbricks/nx-plugin:wrangler-deploy`: `deployHash` of the task's own hash and its stage's live tag. */
|
|
80
|
+
export default async function wranglerDeployHasher(task, context) {
|
|
81
|
+
const artifact = await context.hasher.hashTask(task, context.taskGraph);
|
|
82
|
+
const project = context.projectsConfigurations.projects[task.target.project];
|
|
83
|
+
const stage = deployStage(task, project?.targets?.[task.target.target]?.options);
|
|
84
|
+
const live = project === undefined
|
|
85
|
+
? { kind: 'unknown', reason: `Nx names no project ${task.target.project}` }
|
|
86
|
+
: stage === null
|
|
87
|
+
? { kind: 'unknown', reason: 'the task names no --stage' }
|
|
88
|
+
: await probeLiveTag(workspaceRoot, project.root, stage);
|
|
89
|
+
return deployHash(artifact, live, randomBytes(8).toString('hex'));
|
|
90
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/executors/wrangler-deploy/schema.ts"],"names":[],"mappings":"AAAA,2GAA2G;AAC3G,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The manifest `smoo-nx-go-test-build` writes beside the test binaries it builds with `go test -c`, and
|
|
3
|
+
* `smoo-nx-go-test-run` runs. Every path in it is relative to the manifest's own directory, so the binaries and the
|
|
4
|
+
* packages they test are found wherever both are restored together, as an Nx cache restore puts them back.
|
|
5
|
+
*/
|
|
6
|
+
export declare const GO_TESTS_MANIFEST = "go-tests.json";
|
|
7
|
+
/** One package's test binary. */
|
|
8
|
+
export interface GoTestBinary {
|
|
9
|
+
/** The binary `go test -c` built for the package. */
|
|
10
|
+
readonly binary: string;
|
|
11
|
+
/** The package directory: `go test` runs a package's binary there, so its relative test data resolves alike. */
|
|
12
|
+
readonly dir: string;
|
|
13
|
+
/** The package's import path, every event's `Package`. */
|
|
14
|
+
readonly importPath: string;
|
|
15
|
+
}
|
|
16
|
+
export interface GoTestsManifest {
|
|
17
|
+
readonly version: 1;
|
|
18
|
+
/** One entry per package with test files, sorted by import path. */
|
|
19
|
+
readonly tests: readonly GoTestBinary[];
|
|
20
|
+
}
|
|
21
|
+
export type GoTestsRead = {
|
|
22
|
+
readonly ok: true;
|
|
23
|
+
readonly tests: readonly GoTestBinary[];
|
|
24
|
+
} | {
|
|
25
|
+
readonly ok: false;
|
|
26
|
+
readonly reason: string;
|
|
27
|
+
};
|
|
28
|
+
/** The binaries the manifest at `path` lists, their paths resolved against its directory, or why it lists none. */
|
|
29
|
+
export declare function readGoTestsManifest(path: string): GoTestsRead;
|
|
30
|
+
//# sourceMappingURL=go-tests.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"go-tests.d.ts","sourceRoot":"","sources":["../src/go-tests.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,kBAAkB,CAAC;AAEjD,iCAAiC;AACjC,MAAM,WAAW,YAAY;IAC3B,qDAAqD;IACrD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,gHAAgH;IAChH,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,0DAA0D;IAC1D,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IACpB,oEAAoE;IACpE,QAAQ,CAAC,KAAK,EAAE,SAAS,YAAY,EAAE,CAAC;CACzC;AAED,MAAM,MAAM,WAAW,GACnB;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,YAAY,EAAE,CAAA;CAAE,GAC9D;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEpD,mHAAmH;AACnH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CA8B7D"}
|