putitoutthere 0.2.19 → 0.2.20
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/dist/check.d.ts +49 -0
- package/dist/check.d.ts.map +1 -0
- package/dist/check.js +276 -0
- package/dist/check.js.map +1 -0
- package/dist/cli.d.ts +4 -0
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +32 -1
- package/dist/cli.js.map +1 -1
- package/package.json +1 -1
package/dist/check.d.ts
ADDED
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `putitoutthere check` — pre-merge configuration validation.
|
|
3
|
+
*
|
|
4
|
+
* Implements the "No release surprises" goal from
|
|
5
|
+
* `notes/design-commitments.md`: every check knowable from the
|
|
6
|
+
* consumer's repo state alone runs at PR time, before a release run
|
|
7
|
+
* could fail mid-publish on a precondition checkable in milliseconds.
|
|
8
|
+
*
|
|
9
|
+
* Each check function returns findings; the top-level `runChecks`
|
|
10
|
+
* aggregates them so the consumer fixes everything in one round-trip
|
|
11
|
+
* rather than chasing one error at a time across re-runs. `require-`
|
|
12
|
+
* style throwing helpers live in `preflight.ts` for the publish path;
|
|
13
|
+
* this file is read-only diagnostic.
|
|
14
|
+
*
|
|
15
|
+
* Non-goal #8 (parallel diagnostic surfaces): every check here either
|
|
16
|
+
* already runs at publish time via `preflight.ts` / `plan.ts` /
|
|
17
|
+
* `cascade.ts`, or — for the genuinely-new checks (path exists, globs
|
|
18
|
+
* match a tracked file, tag-template collisions, pyproject.toml +
|
|
19
|
+
* bundle_cli) — is a thin pre-pass of state the publish path already
|
|
20
|
+
* relies on. No parallel diagnostic code path; the engine entry point
|
|
21
|
+
* is shared with the publish phase.
|
|
22
|
+
*
|
|
23
|
+
* Issue #319.
|
|
24
|
+
*/
|
|
25
|
+
export interface CheckFinding {
|
|
26
|
+
/** The `[[package]].name` the finding is scoped to. Absent for
|
|
27
|
+
* file-level findings (missing config, root-level parse errors). */
|
|
28
|
+
package?: string;
|
|
29
|
+
/** Single-line, actionable message: failing artefact path or
|
|
30
|
+
* field, why it matters, what to change. */
|
|
31
|
+
message: string;
|
|
32
|
+
}
|
|
33
|
+
export interface CheckOptions {
|
|
34
|
+
cwd: string;
|
|
35
|
+
/** Override for tests. Defaults to `${cwd}/putitoutthere.toml`. */
|
|
36
|
+
configPath?: string;
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Run every check that's knowable from the consumer's repo state
|
|
40
|
+
* alone. Returns an aggregated finding list; an empty list means a
|
|
41
|
+
* release run from this commit would not surface configuration-level
|
|
42
|
+
* surprises.
|
|
43
|
+
*
|
|
44
|
+
* Short-circuits when the config can't be loaded — every downstream
|
|
45
|
+
* check assumes a parsed `Config`, and a missing or malformed file
|
|
46
|
+
* would otherwise cascade into a noisy stack trace per package.
|
|
47
|
+
*/
|
|
48
|
+
export declare function runChecks(opts: CheckOptions): CheckFinding[];
|
|
49
|
+
//# sourceMappingURL=check.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../src/check.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAiBH,MAAM,WAAW,YAAY;IAC3B;yEACqE;IACrE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;iDAC6C;IAC7C,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,mEAAmE;IACnE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,EAAE,CAqC5D"}
|
package/dist/check.js
ADDED
|
@@ -0,0 +1,276 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `putitoutthere check` — pre-merge configuration validation.
|
|
3
|
+
*
|
|
4
|
+
* Implements the "No release surprises" goal from
|
|
5
|
+
* `notes/design-commitments.md`: every check knowable from the
|
|
6
|
+
* consumer's repo state alone runs at PR time, before a release run
|
|
7
|
+
* could fail mid-publish on a precondition checkable in milliseconds.
|
|
8
|
+
*
|
|
9
|
+
* Each check function returns findings; the top-level `runChecks`
|
|
10
|
+
* aggregates them so the consumer fixes everything in one round-trip
|
|
11
|
+
* rather than chasing one error at a time across re-runs. `require-`
|
|
12
|
+
* style throwing helpers live in `preflight.ts` for the publish path;
|
|
13
|
+
* this file is read-only diagnostic.
|
|
14
|
+
*
|
|
15
|
+
* Non-goal #8 (parallel diagnostic surfaces): every check here either
|
|
16
|
+
* already runs at publish time via `preflight.ts` / `plan.ts` /
|
|
17
|
+
* `cascade.ts`, or — for the genuinely-new checks (path exists, globs
|
|
18
|
+
* match a tracked file, tag-template collisions, pyproject.toml +
|
|
19
|
+
* bundle_cli) — is a thin pre-pass of state the publish path already
|
|
20
|
+
* relies on. No parallel diagnostic code path; the engine entry point
|
|
21
|
+
* is shared with the publish phase.
|
|
22
|
+
*
|
|
23
|
+
* Issue #319.
|
|
24
|
+
*/
|
|
25
|
+
import { execFileSync } from 'node:child_process';
|
|
26
|
+
import { existsSync, readFileSync, statSync } from 'node:fs';
|
|
27
|
+
import { isAbsolute, join, resolve } from 'node:path';
|
|
28
|
+
import { parse as parseToml } from 'smol-toml';
|
|
29
|
+
import { assertNoCycles } from './cascade.js';
|
|
30
|
+
import { loadConfig } from './config.js';
|
|
31
|
+
import { ErrorCodes } from './error-codes.js';
|
|
32
|
+
import { matchesAny } from './glob.js';
|
|
33
|
+
import { assertTripleSupported } from './handlers/npm-platform.js';
|
|
34
|
+
import { checkCratesMetadata, checkProvenanceMetadata } from './preflight.js';
|
|
35
|
+
import { formatTag } from './tag-template.js';
|
|
36
|
+
import { normalizeTarget } from './types.js';
|
|
37
|
+
/**
|
|
38
|
+
* Run every check that's knowable from the consumer's repo state
|
|
39
|
+
* alone. Returns an aggregated finding list; an empty list means a
|
|
40
|
+
* release run from this commit would not surface configuration-level
|
|
41
|
+
* surprises.
|
|
42
|
+
*
|
|
43
|
+
* Short-circuits when the config can't be loaded — every downstream
|
|
44
|
+
* check assumes a parsed `Config`, and a missing or malformed file
|
|
45
|
+
* would otherwise cascade into a noisy stack trace per package.
|
|
46
|
+
*/
|
|
47
|
+
export function runChecks(opts) {
|
|
48
|
+
const findings = [];
|
|
49
|
+
const cwd = opts.cwd;
|
|
50
|
+
const cfgPath = opts.configPath ?? join(cwd, 'putitoutthere.toml');
|
|
51
|
+
if (!existsSync(cfgPath)) {
|
|
52
|
+
findings.push({
|
|
53
|
+
message: `putitoutthere.toml not found at ${cfgPath}. Drop one at the repo root; see https://github.com/thekevinscott/putitoutthere#2-drop-in-putitoutthere-toml`,
|
|
54
|
+
});
|
|
55
|
+
return findings;
|
|
56
|
+
}
|
|
57
|
+
let packages;
|
|
58
|
+
try {
|
|
59
|
+
const config = loadConfig(cfgPath);
|
|
60
|
+
// Anchor pkg.path to opts.cwd up front so per-kind fs ops point at
|
|
61
|
+
// the right tree even when the CLI is invoked with --cwd from
|
|
62
|
+
// outside the repo (mirrors publish.ts's loop).
|
|
63
|
+
packages = config.packages.map((p) => ({
|
|
64
|
+
...p,
|
|
65
|
+
path: isAbsolute(p.path) ? p.path : resolve(cwd, p.path),
|
|
66
|
+
}));
|
|
67
|
+
}
|
|
68
|
+
catch (err) {
|
|
69
|
+
findings.push({ message: err instanceof Error ? err.message : String(err) });
|
|
70
|
+
return findings;
|
|
71
|
+
}
|
|
72
|
+
checkPaths(packages, findings);
|
|
73
|
+
checkGlobsMatchTrackedFiles(packages, cwd, findings);
|
|
74
|
+
checkDependsOn(packages, findings);
|
|
75
|
+
checkTagTemplateCollisions(packages, findings);
|
|
76
|
+
checkNpmRepository(packages, findings);
|
|
77
|
+
checkCratesPackageMetadata(packages, findings);
|
|
78
|
+
checkPyprojectAndBundleCli(packages, cwd, findings);
|
|
79
|
+
checkNpmTargetTriples(packages, findings);
|
|
80
|
+
return findings;
|
|
81
|
+
}
|
|
82
|
+
/* ----------------------------- internals ----------------------------- */
|
|
83
|
+
function checkPaths(packages, findings) {
|
|
84
|
+
for (const p of packages) {
|
|
85
|
+
if (!existsSync(p.path) || !statSync(p.path).isDirectory()) {
|
|
86
|
+
findings.push({
|
|
87
|
+
package: p.name,
|
|
88
|
+
message: `path "${p.path}" does not exist or is not a directory in the worktree`,
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
function checkGlobsMatchTrackedFiles(packages, cwd, findings) {
|
|
94
|
+
const tracked = listTrackedFiles(cwd);
|
|
95
|
+
/* v8 ignore next -- tests always seed a git repo; defensive against
|
|
96
|
+
callers outside one */
|
|
97
|
+
if (tracked === null)
|
|
98
|
+
return;
|
|
99
|
+
for (const p of packages) {
|
|
100
|
+
const matched = tracked.some((f) => matchesAny(p.globs, f));
|
|
101
|
+
if (!matched) {
|
|
102
|
+
findings.push({
|
|
103
|
+
package: p.name,
|
|
104
|
+
message: `globs ${JSON.stringify(p.globs)} matched no tracked files. Empty globs mean the package will never cascade on a real commit.`,
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
function checkDependsOn(packages, findings) {
|
|
110
|
+
try {
|
|
111
|
+
assertNoCycles(packages);
|
|
112
|
+
}
|
|
113
|
+
catch (err) {
|
|
114
|
+
findings.push({ message: err instanceof Error ? err.message : String(err) });
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
function checkTagTemplateCollisions(packages, findings) {
|
|
118
|
+
// Templates collide when they resolve to the same tag at the same
|
|
119
|
+
// version — typically when `{name}` is omitted and every package
|
|
120
|
+
// thereafter races for one tag slot. A sentinel version is enough:
|
|
121
|
+
// differing templates differ on every version, identical templates
|
|
122
|
+
// collide on every version.
|
|
123
|
+
const seen = new Map();
|
|
124
|
+
for (const p of packages) {
|
|
125
|
+
const sentinel = formatTag(p.tag_format, { name: p.name, version: '0.0.0' });
|
|
126
|
+
const prior = seen.get(sentinel);
|
|
127
|
+
if (prior !== undefined) {
|
|
128
|
+
findings.push({
|
|
129
|
+
message: `tag_format collision: "${p.name}" and "${prior}" both resolve to tag "${sentinel}" at the same version. Include {name} in tag_format to disambiguate.`,
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
seen.set(sentinel, p.name);
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
function checkNpmRepository(packages, findings) {
|
|
138
|
+
for (const f of checkProvenanceMetadata(packages)) {
|
|
139
|
+
const reason = f.reason === 'missing'
|
|
140
|
+
? `${f.packageJsonPath} not found`
|
|
141
|
+
: `${f.packageJsonPath} has missing or empty \`repository\``;
|
|
142
|
+
findings.push({
|
|
143
|
+
package: f.package,
|
|
144
|
+
message: `[${ErrorCodes.NPM_MISSING_REPOSITORY}] ${reason}. \`npm publish --provenance\` hard-requires a non-empty repository.url.`,
|
|
145
|
+
});
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
function checkCratesPackageMetadata(packages, findings) {
|
|
149
|
+
for (const f of checkCratesMetadata(packages)) {
|
|
150
|
+
findings.push({
|
|
151
|
+
package: f.package,
|
|
152
|
+
message: `[${ErrorCodes.CRATES_MISSING_METADATA}] ${f.cargoTomlPath} missing required Cargo.toml [package] field(s): ${f.missing.join(', ')}. crates.io rejects the publish after cargo's verification build.`,
|
|
153
|
+
});
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
function checkPyprojectAndBundleCli(packages, cwd, findings) {
|
|
157
|
+
for (const p of packages) {
|
|
158
|
+
if (p.kind !== 'pypi')
|
|
159
|
+
continue;
|
|
160
|
+
const pyprojectPath = join(p.path, 'pyproject.toml');
|
|
161
|
+
if (!existsSync(pyprojectPath)) {
|
|
162
|
+
findings.push({
|
|
163
|
+
package: p.name,
|
|
164
|
+
message: `pyproject.toml not found at ${pyprojectPath}`,
|
|
165
|
+
});
|
|
166
|
+
continue;
|
|
167
|
+
}
|
|
168
|
+
if (p.build !== 'maturin' || p.bundle_cli === undefined)
|
|
169
|
+
continue;
|
|
170
|
+
const bundleCli = p.bundle_cli;
|
|
171
|
+
// `bundle_cli.crate_path` is documented as relative to the repo
|
|
172
|
+
// root (see config.ts: default = "."). Resolve against `cwd`,
|
|
173
|
+
// not the package path.
|
|
174
|
+
const cratePathAbs = isAbsolute(bundleCli.crate_path)
|
|
175
|
+
? bundleCli.crate_path
|
|
176
|
+
: resolve(cwd, bundleCli.crate_path);
|
|
177
|
+
const cargoTomlPath = join(cratePathAbs, 'Cargo.toml');
|
|
178
|
+
if (!existsSync(cratePathAbs) || !statSync(cratePathAbs).isDirectory()) {
|
|
179
|
+
findings.push({
|
|
180
|
+
package: p.name,
|
|
181
|
+
message: `bundle_cli.crate_path "${bundleCli.crate_path}" does not exist or is not a directory`,
|
|
182
|
+
});
|
|
183
|
+
continue;
|
|
184
|
+
}
|
|
185
|
+
if (!existsSync(cargoTomlPath)) {
|
|
186
|
+
findings.push({
|
|
187
|
+
package: p.name,
|
|
188
|
+
message: `bundle_cli.crate_path "${bundleCli.crate_path}" has no Cargo.toml`,
|
|
189
|
+
});
|
|
190
|
+
continue;
|
|
191
|
+
}
|
|
192
|
+
const declaredBins = readDeclaredBins(cargoTomlPath);
|
|
193
|
+
if (!declaredBins.includes(bundleCli.bin)) {
|
|
194
|
+
findings.push({
|
|
195
|
+
package: p.name,
|
|
196
|
+
message: `bundle_cli.bin "${bundleCli.bin}" is not declared as a [[bin]] in ${cargoTomlPath}. Declared bins: ${declaredBins.length === 0 ? '(none)' : declaredBins.join(', ')}.`,
|
|
197
|
+
});
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
function checkNpmTargetTriples(packages, findings) {
|
|
202
|
+
for (const p of packages) {
|
|
203
|
+
if (p.kind !== 'npm')
|
|
204
|
+
continue;
|
|
205
|
+
const targets = p.targets;
|
|
206
|
+
if (!targets)
|
|
207
|
+
continue;
|
|
208
|
+
for (const t of targets) {
|
|
209
|
+
const { triple } = normalizeTarget(t);
|
|
210
|
+
try {
|
|
211
|
+
assertTripleSupported(triple, p.name);
|
|
212
|
+
}
|
|
213
|
+
catch (err) {
|
|
214
|
+
findings.push({
|
|
215
|
+
package: p.name,
|
|
216
|
+
message: err instanceof Error ? err.message : String(err),
|
|
217
|
+
});
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
function listTrackedFiles(cwd) {
|
|
223
|
+
try {
|
|
224
|
+
const out = execFileSync('git', ['ls-files'], {
|
|
225
|
+
cwd,
|
|
226
|
+
encoding: 'utf8',
|
|
227
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
228
|
+
});
|
|
229
|
+
return out.split('\n').filter((l) => l.length > 0);
|
|
230
|
+
/* v8 ignore start -- defensive against callers outside a git repo */
|
|
231
|
+
}
|
|
232
|
+
catch {
|
|
233
|
+
return null;
|
|
234
|
+
}
|
|
235
|
+
/* v8 ignore stop */
|
|
236
|
+
}
|
|
237
|
+
function readDeclaredBins(cargoTomlPath) {
|
|
238
|
+
let raw;
|
|
239
|
+
try {
|
|
240
|
+
raw = readFileSync(cargoTomlPath, 'utf8');
|
|
241
|
+
/* v8 ignore next 3 -- existsSync gated the read above */
|
|
242
|
+
}
|
|
243
|
+
catch {
|
|
244
|
+
return [];
|
|
245
|
+
}
|
|
246
|
+
let parsed;
|
|
247
|
+
try {
|
|
248
|
+
parsed = parseToml(raw);
|
|
249
|
+
}
|
|
250
|
+
catch {
|
|
251
|
+
return [];
|
|
252
|
+
}
|
|
253
|
+
const result = [];
|
|
254
|
+
const bins = parsed.bin;
|
|
255
|
+
if (Array.isArray(bins)) {
|
|
256
|
+
for (const entry of bins) {
|
|
257
|
+
if (typeof entry === 'object' && entry !== null) {
|
|
258
|
+
const name = entry.name;
|
|
259
|
+
if (typeof name === 'string')
|
|
260
|
+
result.push(name);
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
}
|
|
264
|
+
// Cargo's implicit-binary rule: a crate without any explicit [[bin]]
|
|
265
|
+
// table ships a binary named after `[package].name` when
|
|
266
|
+
// `src/main.rs` exists. Include that name as a candidate so the
|
|
267
|
+
// common single-binary shape (one crate, one bin, no [[bin]] block)
|
|
268
|
+
// doesn't spuriously fail this check.
|
|
269
|
+
if (result.length === 0) {
|
|
270
|
+
const pkg = parsed.package;
|
|
271
|
+
if (pkg && typeof pkg.name === 'string')
|
|
272
|
+
result.push(pkg.name);
|
|
273
|
+
}
|
|
274
|
+
return result;
|
|
275
|
+
}
|
|
276
|
+
//# sourceMappingURL=check.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"check.js","sourceRoot":"","sources":["../src/check.ts"],"names":[],"mappings":"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"}
|
package/dist/cli.d.ts
CHANGED
|
@@ -7,6 +7,10 @@
|
|
|
7
7
|
* Commands:
|
|
8
8
|
* plan — compute and emit the release plan
|
|
9
9
|
* publish — execute the plan against the registries
|
|
10
|
+
* check — pre-merge configuration validation (#319). Runs every
|
|
11
|
+
* check knowable from the consumer's repo state alone.
|
|
12
|
+
* Internal — invoked by the pre-merge reusable workflow;
|
|
13
|
+
* not surfaced in user-facing docs per non-goal #7.
|
|
10
14
|
* write-version — bump a package's manifest to a planned version
|
|
11
15
|
* (pre-build hook for maturin; #276)
|
|
12
16
|
* version — print CLI version
|
package/dist/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AA0CH,UAAU,WAAW;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,IAAI,EAAE,OAAO,CAAC;IAId,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,WAAW,CA8B/D;AAED,wBAAsB,GAAG,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAsIlE"}
|
package/dist/cli.js
CHANGED
|
@@ -7,6 +7,10 @@
|
|
|
7
7
|
* Commands:
|
|
8
8
|
* plan — compute and emit the release plan
|
|
9
9
|
* publish — execute the plan against the registries
|
|
10
|
+
* check — pre-merge configuration validation (#319). Runs every
|
|
11
|
+
* check knowable from the consumer's repo state alone.
|
|
12
|
+
* Internal — invoked by the pre-merge reusable workflow;
|
|
13
|
+
* not surfaced in user-facing docs per non-goal #7.
|
|
10
14
|
* write-version — bump a package's manifest to a planned version
|
|
11
15
|
* (pre-build hook for maturin; #276)
|
|
12
16
|
* version — print CLI version
|
|
@@ -26,11 +30,12 @@
|
|
|
26
30
|
* errors out.
|
|
27
31
|
*/
|
|
28
32
|
import { isAbsolute, resolve } from 'node:path';
|
|
33
|
+
import { runChecks } from './check.js';
|
|
29
34
|
import { plan } from './plan.js';
|
|
30
35
|
import { publish } from './publish.js';
|
|
31
36
|
import { writeVersionForBuild } from './write-version.js';
|
|
32
37
|
import { VERSION } from './version.js';
|
|
33
|
-
const COMMANDS = ['plan', 'publish', 'write-version', 'version'];
|
|
38
|
+
const COMMANDS = ['plan', 'publish', 'check', 'write-version', 'version'];
|
|
34
39
|
function isCommand(value) {
|
|
35
40
|
return COMMANDS.includes(value);
|
|
36
41
|
}
|
|
@@ -41,6 +46,7 @@ function printUsage() {
|
|
|
41
46
|
'Commands:',
|
|
42
47
|
' plan Compute and emit the release plan',
|
|
43
48
|
' publish Execute the plan',
|
|
49
|
+
' check Pre-merge configuration validation (#319)',
|
|
44
50
|
' write-version Bump a package manifest to the planned version (pre-build; #276)',
|
|
45
51
|
' version Print CLI version',
|
|
46
52
|
'',
|
|
@@ -144,6 +150,31 @@ export async function run(argv) {
|
|
|
144
150
|
}
|
|
145
151
|
return 0;
|
|
146
152
|
}
|
|
153
|
+
case 'check': {
|
|
154
|
+
// #319: pre-merge config validation. Aggregates every finding
|
|
155
|
+
// in one round-trip rather than failing on the first so a
|
|
156
|
+
// consumer fixes the whole config in one push. Exits non-zero
|
|
157
|
+
// when any finding lands; CI surfaces the same vocabulary the
|
|
158
|
+
// publish-phase `require*` helpers use.
|
|
159
|
+
const findings = runChecks({
|
|
160
|
+
cwd: flags.cwd,
|
|
161
|
+
...(flags.config !== undefined ? { configPath: flags.config } : {}),
|
|
162
|
+
});
|
|
163
|
+
if (flags.json) {
|
|
164
|
+
process.stdout.write(JSON.stringify({ findings }) + '\n');
|
|
165
|
+
}
|
|
166
|
+
else if (findings.length === 0) {
|
|
167
|
+
process.stdout.write('check: no findings\n');
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
170
|
+
process.stderr.write(`putitoutthere check: ${findings.length} finding${findings.length === 1 ? '' : 's'}.\n\n`);
|
|
171
|
+
for (const f of findings) {
|
|
172
|
+
const prefix = f.package ? ` - ${f.package}: ` : ' - ';
|
|
173
|
+
process.stderr.write(`${prefix}${f.message}\n`);
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
return findings.length === 0 ? 0 : 1;
|
|
177
|
+
}
|
|
147
178
|
case 'write-version': {
|
|
148
179
|
// #276: pre-build hook used by `_matrix.yml`'s maturin steps.
|
|
149
180
|
// Maturin reads the version from disk at build time with no
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|