@git.zone/cli 9.2.2 → 10.0.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/assets/templates/asset_binary_installer/install.sh +109 -34
- package/assets/templates/asset_binary_release_gitea/.gitea/workflows/release.yml +17 -4
- package/assets/templates/ci_rust/.gitea/workflows/rust_nottags.yaml +29 -0
- package/assets/templates/ci_rust/.gitea/workflows/rust_tags.yaml +32 -0
- package/assets/templates/gitignore/_gitignore +1 -1
- package/assets/templates/gitignore_rust/_gitignore +31 -0
- package/assets/templates/license_mit/license +4 -1
- package/assets/templates/rust/.smartscaf.yml +16 -0
- package/assets/templates/rust/_Cargo.toml +12 -0
- package/assets/templates/rust/_crate_Cargo.toml +10 -0
- package/assets/templates/rust/_crate_lib.rs +19 -0
- package/assets/templates/rust/_smartconfig.json +27 -0
- package/assets/templates/rust/readme.md +23 -0
- package/dist_ts/00_commitinfo_data.js +2 -2
- package/dist_ts/classes.gitzoneconfig.d.ts +3 -1
- package/dist_ts/classes.gitzoneconfig.js +9 -1
- package/dist_ts/helpers.managedassets.d.ts +1 -1
- package/dist_ts/helpers.managedassets.js +58 -14
- package/dist_ts/helpers.releasetargets.d.ts +6 -0
- package/dist_ts/helpers.releasetargets.js +13 -0
- package/dist_ts/helpers.smartconfigmigrations.js +42 -1
- package/dist_ts/helpers.toolconfig.d.ts +50 -0
- package/dist_ts/helpers.toolconfig.js +212 -0
- package/dist_ts/helpers.tssea.d.ts +9 -2
- package/dist_ts/helpers.tssea.js +47 -17
- package/dist_ts/helpers.tstest.d.ts +27 -8
- package/dist_ts/helpers.tstest.js +64 -26
- package/dist_ts/helpers.versionsource.d.ts +37 -0
- package/dist_ts/helpers.versionsource.js +112 -0
- package/dist_ts/helpers.workflow.d.ts +45 -1
- package/dist_ts/helpers.workflow.js +120 -5
- package/dist_ts/mod_commit/mod.helpers.d.ts +0 -24
- package/dist_ts/mod_commit/mod.helpers.js +1 -94
- package/dist_ts/mod_config/index.js +131 -18
- package/dist_ts/mod_format/formatters/assets.formatter.js +29 -27
- package/dist_ts/mod_format/formatters/gitignore.formatter.d.ts +4 -2
- package/dist_ts/mod_format/formatters/gitignore.formatter.js +10 -7
- package/dist_ts/mod_format/formatters/license.formatter.d.ts +8 -0
- package/dist_ts/mod_format/formatters/license.formatter.js +25 -2
- package/dist_ts/mod_format/formatters/packagejson.formatter.js +14 -3
- package/dist_ts/mod_format/formatters/rustfmt.formatter.d.ts +19 -0
- package/dist_ts/mod_format/formatters/rustfmt.formatter.js +97 -0
- package/dist_ts/mod_format/formatters/smartconfig.formatter.js +5 -2
- package/dist_ts/mod_format/index.js +3 -1
- package/dist_ts/mod_format/interfaces.format.js +2 -1
- package/dist_ts/mod_release/classes.releasejournal.d.ts +38 -2
- package/dist_ts/mod_release/classes.releasejournal.js +238 -66
- package/dist_ts/mod_release/helpers.cargorelease.d.ts +52 -0
- package/dist_ts/mod_release/helpers.cargorelease.js +195 -0
- package/dist_ts/mod_release/helpers.npmpackages.d.ts +18 -0
- package/dist_ts/mod_release/helpers.npmpackages.js +40 -2
- package/dist_ts/mod_release/helpers.releasecheck.d.ts +73 -0
- package/dist_ts/mod_release/helpers.releasecheck.js +269 -0
- package/dist_ts/mod_release/helpers.releasepreparation.d.ts +22 -8
- package/dist_ts/mod_release/helpers.releasepreparation.js +74 -26
- package/dist_ts/mod_release/helpers.releasepublication.d.ts +21 -1
- package/dist_ts/mod_release/helpers.releasepublication.js +249 -4
- package/dist_ts/mod_release/helpers.releaseversionsource.d.ts +10 -0
- package/dist_ts/mod_release/helpers.releaseversionsource.js +18 -0
- package/dist_ts/mod_release/helpers.rsrepoengine.d.ts +192 -0
- package/dist_ts/mod_release/helpers.rsrepoengine.js +457 -0
- package/dist_ts/mod_release/index.d.ts +3 -0
- package/dist_ts/mod_release/index.js +177 -65
- package/dist_ts/mod_template/index.js +6 -2
- package/package.json +1 -1
- package/readme.md +237 -21
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.gitzoneconfig.ts +10 -1
- package/ts/helpers.managedassets.ts +64 -14
- package/ts/helpers.releasetargets.ts +13 -0
- package/ts/helpers.smartconfigmigrations.ts +48 -0
- package/ts/helpers.toolconfig.ts +280 -0
- package/ts/helpers.tssea.ts +59 -16
- package/ts/helpers.tstest.ts +105 -35
- package/ts/helpers.versionsource.ts +169 -0
- package/ts/helpers.workflow.ts +197 -5
- package/ts/mod_commit/mod.helpers.ts +0 -119
- package/ts/mod_config/index.ts +169 -19
- package/ts/mod_format/formatters/assets.formatter.ts +28 -27
- package/ts/mod_format/formatters/gitignore.formatter.ts +10 -6
- package/ts/mod_format/formatters/license.formatter.ts +26 -1
- package/ts/mod_format/formatters/packagejson.formatter.ts +14 -2
- package/ts/mod_format/formatters/rustfmt.formatter.ts +107 -0
- package/ts/mod_format/formatters/smartconfig.formatter.ts +8 -1
- package/ts/mod_format/index.ts +2 -0
- package/ts/mod_format/interfaces.format.ts +1 -0
- package/ts/mod_release/classes.releasejournal.ts +312 -39
- package/ts/mod_release/helpers.cargorelease.ts +289 -0
- package/ts/mod_release/helpers.npmpackages.ts +76 -1
- package/ts/mod_release/helpers.releasecheck.ts +409 -0
- package/ts/mod_release/helpers.releasepreparation.ts +116 -36
- package/ts/mod_release/helpers.releasepublication.ts +462 -1
- package/ts/mod_release/helpers.releaseversionsource.ts +29 -0
- package/ts/mod_release/helpers.rsrepoengine.ts +790 -0
- package/ts/mod_release/index.ts +277 -84
- package/ts/mod_template/index.ts +5 -1
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import * as plugins from "./mod.plugins.js";
|
|
2
|
+
import type { IResolvedReleaseCargoConfiguration } from "../helpers.workflow.js";
|
|
3
|
+
import { type IReleaseCargoJournal } from "./classes.releasejournal.js";
|
|
4
|
+
import { type IRsrepoEngineClient, type IRsrepoPackedCrate, type IRsrepoPlanResult } from "./helpers.rsrepoengine.js";
|
|
5
|
+
/**
|
|
6
|
+
* The project's rsrepo engine, refused unless it supports every command a
|
|
7
|
+
* Cargo release runs.
|
|
8
|
+
*/
|
|
9
|
+
export declare const openCargoReleaseEngine: (smartshellArg: plugins.smartshell.Smartshell, cwdArg: string) => Promise<IRsrepoEngineClient>;
|
|
10
|
+
/** The workspace plan for the cargo target: its registries and member filter. */
|
|
11
|
+
export declare const readCargoReleasePlan: (engineArg: IRsrepoEngineClient, cwdArg: string, cargoArg: IResolvedReleaseCargoConfiguration) => Promise<IRsrepoPlanResult>;
|
|
12
|
+
/**
|
|
13
|
+
* Why the plan cannot be released, one line each; empty when it can. A
|
|
14
|
+
* release needs a committed Cargo.lock, one shared version, at least one
|
|
15
|
+
* selected crate, no blocking problem on a selected crate, and every
|
|
16
|
+
* selected crate's normal and build dependencies selected too, because a
|
|
17
|
+
* registry refuses a crate whose dependency version it does not have.
|
|
18
|
+
*/
|
|
19
|
+
export declare const findCargoReleaseProblems: (planArg: IRsrepoPlanResult, cargoArg: IResolvedReleaseCargoConfiguration) => string[];
|
|
20
|
+
export declare const assertCargoReleasePlan: (planArg: IRsrepoPlanResult, cargoArg: IResolvedReleaseCargoConfiguration) => void;
|
|
21
|
+
/** Why `gitzone release --plan` exits non-zero: the release would refuse this plan. */
|
|
22
|
+
export declare const describeCargoReleaseRefusal: (problemCountArg: number) => string;
|
|
23
|
+
/** The plan lines `gitzone release --plan` and `release check` print. */
|
|
24
|
+
export declare const describeCargoReleasePlan: (planArg: IRsrepoPlanResult, cargoArg: IResolvedReleaseCargoConfiguration) => string[];
|
|
25
|
+
/**
|
|
26
|
+
* A fresh release never publishes over an existing crate version: every
|
|
27
|
+
* selected crate's new version must be absent from every registry before
|
|
28
|
+
* anything is created.
|
|
29
|
+
*/
|
|
30
|
+
export declare const assertCargoVersionsUnpublished: (engineArg: IRsrepoEngineClient, planArg: IRsrepoPlanResult, cargoArg: IResolvedReleaseCargoConfiguration, versionArg: string) => Promise<void>;
|
|
31
|
+
/** Prints what each packed crate carries. */
|
|
32
|
+
export declare const describePackedCrates: (cratesArg: readonly IRsrepoPackedCrate[]) => string[];
|
|
33
|
+
/**
|
|
34
|
+
* Packs the selected crates of the release checkout through the engine and
|
|
35
|
+
* stores each as `crate.<sha256(name)>.crate` in `artifactDirectoryArg`. The
|
|
36
|
+
* plan is read from the checkout, so it is the release commit's plan.
|
|
37
|
+
*/
|
|
38
|
+
export declare const packReleaseCrates: (optionsArg: {
|
|
39
|
+
engine: IRsrepoEngineClient;
|
|
40
|
+
checkoutCwd: string;
|
|
41
|
+
artifactDirectory: string;
|
|
42
|
+
cargo: IResolvedReleaseCargoConfiguration;
|
|
43
|
+
version: string;
|
|
44
|
+
}) => Promise<{
|
|
45
|
+
journal: IReleaseCargoJournal;
|
|
46
|
+
packed: IRsrepoPackedCrate[];
|
|
47
|
+
}>;
|
|
48
|
+
/**
|
|
49
|
+
* `cargo publish` runs in a disposable checkout of the release commit, which
|
|
50
|
+
* fetches the locked Cargo dependencies and installs no npm packages.
|
|
51
|
+
*/
|
|
52
|
+
export declare const createCargoPublishCheckout: (smartshellArg: plugins.smartshell.Smartshell, repositoryCwdArg: string, mainOidArg: string) => <T>(useArg: (checkoutCwdArg: string) => Promise<T>) => Promise<T>;
|
|
@@ -0,0 +1,195 @@
|
|
|
1
|
+
import * as plugins from "./mod.plugins.js";
|
|
2
|
+
import { releaseCrateArtifactFile, } from "./classes.releasejournal.js";
|
|
3
|
+
import { RsrepoEngineClient, rsrepoEngineCommands, } from "./helpers.rsrepoengine.js";
|
|
4
|
+
import { withIsolatedReleaseCheckout } from "./helpers.releasepreparation.js";
|
|
5
|
+
/**
|
|
6
|
+
* The project's rsrepo engine, refused unless it supports every command a
|
|
7
|
+
* Cargo release runs.
|
|
8
|
+
*/
|
|
9
|
+
export const openCargoReleaseEngine = async (smartshellArg, cwdArg) => {
|
|
10
|
+
const engine = await RsrepoEngineClient.forProject(smartshellArg, cwdArg);
|
|
11
|
+
await engine.assertCapabilities(rsrepoEngineCommands);
|
|
12
|
+
return engine;
|
|
13
|
+
};
|
|
14
|
+
/** The workspace plan for the cargo target: its registries and member filter. */
|
|
15
|
+
export const readCargoReleasePlan = async (engineArg, cwdArg, cargoArg) => engineArg.plan({
|
|
16
|
+
cwd: cwdArg,
|
|
17
|
+
registries: cargoArg.registries,
|
|
18
|
+
...(cargoArg.members ? { members: cargoArg.members } : {}),
|
|
19
|
+
});
|
|
20
|
+
/**
|
|
21
|
+
* Why the plan cannot be released, one line each; empty when it can. A
|
|
22
|
+
* release needs a committed Cargo.lock, one shared version, at least one
|
|
23
|
+
* selected crate, no blocking problem on a selected crate, and every
|
|
24
|
+
* selected crate's normal and build dependencies selected too, because a
|
|
25
|
+
* registry refuses a crate whose dependency version it does not have.
|
|
26
|
+
*/
|
|
27
|
+
export const findCargoReleaseProblems = (planArg, cargoArg) => {
|
|
28
|
+
const problems = [];
|
|
29
|
+
if (!planArg.lockfile) {
|
|
30
|
+
problems.push("The Cargo workspace tracks no Cargo.lock; a cargo release publishes with --locked. Run `cargo generate-lockfile` and commit Cargo.lock.");
|
|
31
|
+
}
|
|
32
|
+
if (planArg.versionMode === "independent") {
|
|
33
|
+
problems.push("The Cargo workspace versions its crates independently; gitzone releases one shared [workspace.package] version.");
|
|
34
|
+
}
|
|
35
|
+
for (const member of cargoArg.members ?? []) {
|
|
36
|
+
if (!planArg.members.some((entry) => entry.name === member))
|
|
37
|
+
problems.push(`release.targets.cargo.members names ${member}, which is not a workspace member.`);
|
|
38
|
+
}
|
|
39
|
+
const selected = planArg.members.filter((member) => member.selected);
|
|
40
|
+
if (selected.length === 0) {
|
|
41
|
+
problems.push(`No workspace member is publishable to ${cargoArg.registries.join(", ")}${cargoArg.members ? " among release.targets.cargo.members" : ""}.`);
|
|
42
|
+
}
|
|
43
|
+
for (const member of selected) {
|
|
44
|
+
for (const problem of member.problems) {
|
|
45
|
+
if (problem.blocking)
|
|
46
|
+
problems.push(`${member.name}: ${problem.message}`);
|
|
47
|
+
}
|
|
48
|
+
for (const dependency of member.internalDependencies) {
|
|
49
|
+
if (dependency.kind === "dev")
|
|
50
|
+
continue;
|
|
51
|
+
if (!selected.some((entry) => entry.name === dependency.name)) {
|
|
52
|
+
problems.push(`${member.name} depends on ${dependency.name}, which this release does not publish to ${cargoArg.registries.join(", ")}.`);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
return problems;
|
|
57
|
+
};
|
|
58
|
+
export const assertCargoReleasePlan = (planArg, cargoArg) => {
|
|
59
|
+
const problems = findCargoReleaseProblems(planArg, cargoArg);
|
|
60
|
+
if (problems.length > 0) {
|
|
61
|
+
throw new Error(`The cargo release cannot publish this workspace:\n- ${problems.join("\n- ")}`);
|
|
62
|
+
}
|
|
63
|
+
};
|
|
64
|
+
/** Why `gitzone release --plan` exits non-zero: the release would refuse this plan. */
|
|
65
|
+
export const describeCargoReleaseRefusal = (problemCountArg) => `The release would be refused: ${problemCountArg} blocking cargo problem${problemCountArg === 1 ? "" : "s"}, listed above.`;
|
|
66
|
+
/** The plan lines `gitzone release --plan` and `release check` print. */
|
|
67
|
+
export const describeCargoReleasePlan = (planArg, cargoArg) => {
|
|
68
|
+
const lines = [
|
|
69
|
+
`cargo registries: ${cargoArg.registries.join(", ")}`,
|
|
70
|
+
`cargo workspace: ${planArg.workspaceRoot} (${planArg.versionMode} version${planArg.version ? ` ${planArg.version}` : "s"}, Cargo.lock ${planArg.lockfile ? "tracked" : "missing"})`,
|
|
71
|
+
`cargo publication order: ${planArg.order.length > 0 ? planArg.order.join(" -> ") : "none"}`,
|
|
72
|
+
`cargo index wait: ${cargoArg.verificationWindowMinutes} min per accepted crate`,
|
|
73
|
+
];
|
|
74
|
+
for (const member of planArg.members) {
|
|
75
|
+
if (!member.selected) {
|
|
76
|
+
lines.push(`cargo member ${member.name}: not published (${member.publish && member.publish.length === 0 ? "publish = false" : cargoArg.members && !cargoArg.members.includes(member.name) ? "not in release.targets.cargo.members" : `publish = [${(member.publish ?? []).join(", ")}]`})`);
|
|
77
|
+
}
|
|
78
|
+
for (const problem of member.problems) {
|
|
79
|
+
lines.push(`cargo member ${member.name}: ${problem.blocking ? "blocking problem" : "problem"} ${problem.code}: ${problem.message}`);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
for (const problem of findCargoReleaseProblems(planArg, cargoArg)) {
|
|
83
|
+
if (!planArg.members.some((member) => problem.startsWith(`${member.name}: `)))
|
|
84
|
+
lines.push(`cargo release problem: ${problem}`);
|
|
85
|
+
}
|
|
86
|
+
return lines;
|
|
87
|
+
};
|
|
88
|
+
/**
|
|
89
|
+
* A fresh release never publishes over an existing crate version: every
|
|
90
|
+
* selected crate's new version must be absent from every registry before
|
|
91
|
+
* anything is created.
|
|
92
|
+
*/
|
|
93
|
+
export const assertCargoVersionsUnpublished = async (engineArg, planArg, cargoArg, versionArg) => {
|
|
94
|
+
for (const name of planArg.order) {
|
|
95
|
+
for (const registry of cargoArg.registries) {
|
|
96
|
+
const probe = await engineArg.probe({
|
|
97
|
+
registry,
|
|
98
|
+
name,
|
|
99
|
+
version: versionArg,
|
|
100
|
+
cwd: planArg.workspaceRoot,
|
|
101
|
+
});
|
|
102
|
+
if (probe.present) {
|
|
103
|
+
throw new Error(`${name}@${versionArg} is already in cargo registry ${registry}; a published crate version is immutable. Release a new version.`);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
};
|
|
108
|
+
/** Prints what each packed crate carries. */
|
|
109
|
+
export const describePackedCrates = (cratesArg) => cratesArg.flatMap((crate) => [
|
|
110
|
+
`crate ${crate.name}@${crate.version}: ${crate.files.length} files, sha256 ${crate.sha256}`,
|
|
111
|
+
...crate.files.map((file) => ` ${file}`),
|
|
112
|
+
]);
|
|
113
|
+
const sha256File = async (pathArg) => {
|
|
114
|
+
const bytes = await plugins.fs.readFile(pathArg);
|
|
115
|
+
return {
|
|
116
|
+
sha256: plugins.crypto.createHash("sha256").update(bytes).digest("hex"),
|
|
117
|
+
size: bytes.byteLength,
|
|
118
|
+
};
|
|
119
|
+
};
|
|
120
|
+
/**
|
|
121
|
+
* Packs the selected crates of the release checkout through the engine and
|
|
122
|
+
* stores each as `crate.<sha256(name)>.crate` in `artifactDirectoryArg`. The
|
|
123
|
+
* plan is read from the checkout, so it is the release commit's plan.
|
|
124
|
+
*/
|
|
125
|
+
export const packReleaseCrates = async (optionsArg) => {
|
|
126
|
+
const plan = await readCargoReleasePlan(optionsArg.engine, optionsArg.checkoutCwd, optionsArg.cargo);
|
|
127
|
+
assertCargoReleasePlan(plan, optionsArg.cargo);
|
|
128
|
+
if (plan.version !== optionsArg.version) {
|
|
129
|
+
throw new Error(`The release checkout's Cargo workspace is at ${String(plan.version)}, not the release version ${optionsArg.version}.`);
|
|
130
|
+
}
|
|
131
|
+
const outDir = await plugins.fs.mkdtemp(plugins.path.join(optionsArg.artifactDirectory, ".crates-"));
|
|
132
|
+
try {
|
|
133
|
+
const packed = await optionsArg.engine.package({
|
|
134
|
+
cwd: optionsArg.checkoutCwd,
|
|
135
|
+
outDir,
|
|
136
|
+
members: plan.order,
|
|
137
|
+
});
|
|
138
|
+
const crates = [];
|
|
139
|
+
for (const crate of packed.crates) {
|
|
140
|
+
if (crate.version !== optionsArg.version)
|
|
141
|
+
throw new Error(`rsrepo packed ${crate.name}@${crate.version}, not the release version ${optionsArg.version}.`);
|
|
142
|
+
const file = releaseCrateArtifactFile(crate.name);
|
|
143
|
+
const target = plugins.path.join(optionsArg.artifactDirectory, file);
|
|
144
|
+
await plugins.fs.rename(crate.file, target);
|
|
145
|
+
const identity = await sha256File(target);
|
|
146
|
+
if (identity.sha256 !== crate.sha256) {
|
|
147
|
+
throw new Error(`rsrepo reported sha256 ${crate.sha256} for ${crate.name}, but the packed file hashes to ${identity.sha256}.`);
|
|
148
|
+
}
|
|
149
|
+
const member = plan.members.find((entry) => entry.name === crate.name);
|
|
150
|
+
crates.push({
|
|
151
|
+
kind: "cargo-crate",
|
|
152
|
+
file,
|
|
153
|
+
crateName: crate.name,
|
|
154
|
+
version: crate.version,
|
|
155
|
+
size: identity.size,
|
|
156
|
+
sha256: identity.sha256,
|
|
157
|
+
dependencies: member.internalDependencies
|
|
158
|
+
.filter((dependency) => dependency.kind !== "dev")
|
|
159
|
+
.map((dependency) => dependency.name)
|
|
160
|
+
.filter((name, index, names) => names.indexOf(name) === index),
|
|
161
|
+
});
|
|
162
|
+
}
|
|
163
|
+
return {
|
|
164
|
+
packed: packed.crates,
|
|
165
|
+
journal: {
|
|
166
|
+
engine: "rsrepo",
|
|
167
|
+
protocolVersion: 1,
|
|
168
|
+
crates,
|
|
169
|
+
registries: crates.flatMap((crate) => optionsArg.cargo.registries.map((registry) => ({
|
|
170
|
+
state: "pending",
|
|
171
|
+
attempts: 0,
|
|
172
|
+
attempt: null,
|
|
173
|
+
error: null,
|
|
174
|
+
registry,
|
|
175
|
+
crate: crate.crateName,
|
|
176
|
+
}))),
|
|
177
|
+
},
|
|
178
|
+
};
|
|
179
|
+
}
|
|
180
|
+
finally {
|
|
181
|
+
await plugins.fs.rm(outDir, { recursive: true, force: true });
|
|
182
|
+
}
|
|
183
|
+
};
|
|
184
|
+
/**
|
|
185
|
+
* `cargo publish` runs in a disposable checkout of the release commit, which
|
|
186
|
+
* fetches the locked Cargo dependencies and installs no npm packages.
|
|
187
|
+
*/
|
|
188
|
+
export const createCargoPublishCheckout = (smartshellArg, repositoryCwdArg, mainOidArg) => (useArg) => withIsolatedReleaseCheckout({
|
|
189
|
+
smartshell: smartshellArg,
|
|
190
|
+
repositoryCwd: repositoryCwdArg,
|
|
191
|
+
mainOid: mainOidArg,
|
|
192
|
+
cargo: true,
|
|
193
|
+
npmInstall: false,
|
|
194
|
+
}, (checkoutArg) => useArg(checkoutArg.path));
|
|
195
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helpers.cargorelease.js","sourceRoot":"","sources":["../../../ts/mod_release/helpers.cargorelease.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import * as plugins from "./mod.plugins.js";
|
|
2
|
+
import { type IPnpmReleaseCapability } from "./helpers.npmartifact.js";
|
|
3
|
+
import { type IReleasePackage } from "./classes.releasejournal.js";
|
|
2
4
|
/** A module a tspublish descriptor names, which the npm target publishes. */
|
|
3
5
|
export interface IReleaseNpmModule {
|
|
4
6
|
name: string;
|
|
@@ -39,3 +41,19 @@ export declare const describeReleaseNpmPackages: (packageSetArg: IReleaseNpmPack
|
|
|
39
41
|
* before a release creates anything.
|
|
40
42
|
*/
|
|
41
43
|
export declare const planReleaseNpmPackages: (cwdArg: string) => Promise<IReleaseNpmPackagePlan>;
|
|
44
|
+
export interface IReleaseNpmModulePackOptions {
|
|
45
|
+
smartshell: plugins.smartshell.Smartshell;
|
|
46
|
+
/**
|
|
47
|
+
* Absent canonical path outside every repository, where tspublish
|
|
48
|
+
* materializes the module packages; removed again after packing.
|
|
49
|
+
*/
|
|
50
|
+
preparationDirectory: string;
|
|
51
|
+
/** The version every module must carry. */
|
|
52
|
+
version: string;
|
|
53
|
+
pnpmCapability?: IPnpmReleaseCapability;
|
|
54
|
+
}
|
|
55
|
+
/**
|
|
56
|
+
* tspublish materializes the already built modules outside every repository,
|
|
57
|
+
* so each package is packed from its own generated manifest and nothing else.
|
|
58
|
+
*/
|
|
59
|
+
export declare const packReleaseNpmModules: (optionsArg: IReleaseNpmModulePackOptions, sourceCwdArg: string, planArg: plugins.tspublish.ITsPublishPlan, artifactDirectoryArg: string) => Promise<IReleasePackage[]>;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as plugins from "./mod.plugins.js";
|
|
2
|
-
import { assertNpmPackageName } from "./helpers.npmartifact.js";
|
|
2
|
+
import { assertNpmPackageName, packNpmArtifact, } from "./helpers.npmartifact.js";
|
|
3
|
+
import { releasePackageArtifactFile, } from "./classes.releasejournal.js";
|
|
3
4
|
/**
|
|
4
5
|
* Modules depend only on sibling modules and on external packages whose ranges
|
|
5
6
|
* tspublish takes from the root's dependencies, or from the root's
|
|
@@ -77,4 +78,41 @@ export const planReleaseNpmPackages = async (cwdArg) => {
|
|
|
77
78
|
plan,
|
|
78
79
|
};
|
|
79
80
|
};
|
|
80
|
-
|
|
81
|
+
/**
|
|
82
|
+
* tspublish materializes the already built modules outside every repository,
|
|
83
|
+
* so each package is packed from its own generated manifest and nothing else.
|
|
84
|
+
*/
|
|
85
|
+
export const packReleaseNpmModules = async (optionsArg, sourceCwdArg, planArg, artifactDirectoryArg) => {
|
|
86
|
+
const preparationDirectory = optionsArg.preparationDirectory;
|
|
87
|
+
// The directory is removed afterwards, so it must be one this call creates.
|
|
88
|
+
const preparationDirectoryExists = await plugins.fs
|
|
89
|
+
.lstat(preparationDirectory)
|
|
90
|
+
.then(() => true)
|
|
91
|
+
.catch((error) => {
|
|
92
|
+
if (error.code === "ENOENT")
|
|
93
|
+
return false;
|
|
94
|
+
throw error;
|
|
95
|
+
});
|
|
96
|
+
if (preparationDirectoryExists) {
|
|
97
|
+
throw new Error("Packing the npm modules requires an absent preparation directory, because it removes that directory after packing.");
|
|
98
|
+
}
|
|
99
|
+
try {
|
|
100
|
+
const prepared = await new plugins.tspublish.TsPublish().prepare(sourceCwdArg, preparationDirectory);
|
|
101
|
+
if (JSON.stringify(prepared.map(({ directory, ...module }) => module)) !==
|
|
102
|
+
JSON.stringify(planArg.modules)) {
|
|
103
|
+
throw new Error("tspublish package plan changed during preparation.");
|
|
104
|
+
}
|
|
105
|
+
const packages = [];
|
|
106
|
+
for (const module of prepared) {
|
|
107
|
+
const packed = await packNpmArtifact(optionsArg.smartshell, module.directory, artifactDirectoryArg, optionsArg.version, optionsArg.pnpmCapability, releasePackageArtifactFile(module.name));
|
|
108
|
+
if (packed.packageName !== module.name)
|
|
109
|
+
throw new Error("Prepared package identity changed during packing.");
|
|
110
|
+
packages.push({ folder: module.folder, artifact: packed });
|
|
111
|
+
}
|
|
112
|
+
return packages;
|
|
113
|
+
}
|
|
114
|
+
finally {
|
|
115
|
+
await plugins.fs.rm(preparationDirectory, { recursive: true, force: true });
|
|
116
|
+
}
|
|
117
|
+
};
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5ucG1wYWNrYWdlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3RzL21vZF9yZWxlYXNlL2hlbHBlcnMubnBtcGFja2FnZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEVBQ0wsb0JBQW9CLEVBQ3BCLGVBQWUsR0FFaEIsTUFBTSwwQkFBMEIsQ0FBQztBQUNsQyxPQUFPLEVBQ0wsMEJBQTBCLEdBRTNCLE1BQU0sNkJBQTZCLENBQUM7QUErQnJDOzs7Ozs7R0FNRztBQUNILE1BQU0sQ0FBQyxNQUFNLDZCQUE2QixHQUFHLENBQzNDLGFBQW9DLEVBQzFCLEVBQUUsQ0FBQztJQUNiLEdBQUcsYUFBYSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUM7SUFDM0QsR0FBRyxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztDQUNqRSxDQUFDO0FBRUYsK0NBQStDO0FBQy9DLE1BQU0sQ0FBQyxNQUFNLDBCQUEwQixHQUFHLENBQ3hDLGFBQW9DLEVBQzFCLEVBQUUsQ0FBQztJQUNiLG1DQUFtQztJQUNuQyxHQUFHLGFBQWEsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUMxQixDQUFDLFNBQVMsRUFBRSxFQUFFLENBQUMsS0FBSyxTQUFTLENBQUMsSUFBSSxLQUFLLFNBQVMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQ3ZFO0lBQ0QsYUFBYSxDQUFDLElBQUksQ0FBQyxPQUFPO1FBQ3hCLENBQUMsQ0FBQyxVQUFVLGFBQWEsQ0FBQyxJQUFJLENBQUMsSUFBSSwwQkFBMEI7UUFDN0QsQ0FBQyxDQUFD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
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import * as plugins from "./mod.plugins.js";
|
|
2
|
+
import type { IResolvedReleaseWorkflow, TReleaseTarget } from "../helpers.workflow.js";
|
|
3
|
+
/** Where a release check found a problem. */
|
|
4
|
+
export type TReleaseCheckArea = "tree" | "configuration" | "checkout" | "npm" | "cargo";
|
|
5
|
+
export interface IReleaseCheckProblem {
|
|
6
|
+
area: TReleaseCheckArea;
|
|
7
|
+
message: string;
|
|
8
|
+
}
|
|
9
|
+
/** One packed npm tarball and what it carries. */
|
|
10
|
+
export interface IReleaseCheckNpmPackage {
|
|
11
|
+
packageName: string;
|
|
12
|
+
version: string;
|
|
13
|
+
size: number;
|
|
14
|
+
sha256: string;
|
|
15
|
+
integrity: string;
|
|
16
|
+
files: string[];
|
|
17
|
+
}
|
|
18
|
+
/** One packed crate and what it carries. */
|
|
19
|
+
export interface IReleaseCheckCrate {
|
|
20
|
+
name: string;
|
|
21
|
+
version: string;
|
|
22
|
+
sha256: string;
|
|
23
|
+
files: string[];
|
|
24
|
+
}
|
|
25
|
+
/** What `gitzone release check` built and packed, and every problem it found. */
|
|
26
|
+
export interface IReleaseCheckReport {
|
|
27
|
+
ok: boolean;
|
|
28
|
+
/** The checked commit: HEAD of the clean working tree. */
|
|
29
|
+
sourceOid: string | null;
|
|
30
|
+
targets: TReleaseTarget[];
|
|
31
|
+
/** The configured release build, run in the isolated checkout; null when the release does not build. */
|
|
32
|
+
build: {
|
|
33
|
+
command: string;
|
|
34
|
+
passed: boolean;
|
|
35
|
+
} | null;
|
|
36
|
+
npm?: {
|
|
37
|
+
packages: IReleaseCheckNpmPackage[];
|
|
38
|
+
};
|
|
39
|
+
cargo?: {
|
|
40
|
+
registries: string[];
|
|
41
|
+
order: string[];
|
|
42
|
+
/** The plan lines `gitzone release --plan` prints. */
|
|
43
|
+
plan: string[];
|
|
44
|
+
crates: IReleaseCheckCrate[];
|
|
45
|
+
};
|
|
46
|
+
/** Active targets this check does not cover, with the reason. */
|
|
47
|
+
notChecked: Array<{
|
|
48
|
+
target: TReleaseTarget;
|
|
49
|
+
reason: string;
|
|
50
|
+
}>;
|
|
51
|
+
problems: IReleaseCheckProblem[];
|
|
52
|
+
}
|
|
53
|
+
export interface IReleaseCheckOptions {
|
|
54
|
+
smartshell: plugins.smartshell.Smartshell;
|
|
55
|
+
/** The working tree whose HEAD is checked. */
|
|
56
|
+
cwd: string;
|
|
57
|
+
workflow: IResolvedReleaseWorkflow;
|
|
58
|
+
/** Progress and content lines; the report carries the same facts. */
|
|
59
|
+
log: (lineArg: string) => void;
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* `gitzone release check`: everything a release builds and packs, without
|
|
63
|
+
* creating anything. It needs a clean working tree and a version source the
|
|
64
|
+
* release accepts, checks out HEAD into a
|
|
65
|
+
* disposable worktree exactly as a release checks out its release commit
|
|
66
|
+
* (npm install or `cargo fetch --locked`), runs the configured release build
|
|
67
|
+
* there, packs and verifies the npm packages and the crates of the active
|
|
68
|
+
* targets, and removes the checkout and every artifact again. It never
|
|
69
|
+
* changes the version, commits, tags, writes a journal or publishes.
|
|
70
|
+
*/
|
|
71
|
+
export declare const runReleaseCheck: (optionsArg: IReleaseCheckOptions) => Promise<IReleaseCheckReport>;
|
|
72
|
+
/** The human-readable summary of a report, after the progress output. */
|
|
73
|
+
export declare const describeReleaseCheckReport: (reportArg: IReleaseCheckReport) => string[];
|