@git.zone/cli 8.8.1 → 8.9.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/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/helpers.workflow.d.ts +6 -2
- package/dist_ts/helpers.workflow.js +17 -4
- package/dist_ts/mod_config/index.js +39 -9
- package/dist_ts/mod_release/classes.releasejournal.d.ts +7 -5
- package/dist_ts/mod_release/classes.releasejournal.js +53 -13
- package/dist_ts/mod_release/helpers.gitremote.d.ts +6 -1
- package/dist_ts/mod_release/helpers.gitremote.js +23 -6
- package/dist_ts/mod_release/helpers.npmartifact.d.ts +3 -1
- package/dist_ts/mod_release/helpers.npmartifact.js +29 -3
- package/dist_ts/mod_release/helpers.releaseline.js +23 -4
- package/dist_ts/mod_release/helpers.releaseversion.d.ts +26 -2
- package/dist_ts/mod_release/helpers.releaseversion.js +126 -6
- package/dist_ts/mod_release/index.js +27 -5
- package/package.json +1 -1
- package/readme.md +78 -11
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/helpers.workflow.ts +43 -5
- package/ts/mod_config/index.ts +49 -5
- package/ts/mod_release/classes.releasejournal.ts +88 -15
- package/ts/mod_release/helpers.gitremote.ts +29 -6
- package/ts/mod_release/helpers.npmartifact.ts +33 -1
- package/ts/mod_release/helpers.releaseline.ts +30 -3
- package/ts/mod_release/helpers.releaseversion.ts +225 -4
- package/ts/mod_release/index.ts +55 -3
|
@@ -9,6 +9,71 @@ export class ReleaseVersionError extends Error {
|
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
11
|
const canonicalVersionPattern = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/;
|
|
12
|
+
const prereleaseVersionPattern = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)-([a-z][a-z0-9]*(?:-[a-z0-9]+)*)\.(0|[1-9]\d*)$/;
|
|
13
|
+
export const parsePrereleaseVersion = (valueArg) => {
|
|
14
|
+
const match = prereleaseVersionPattern.exec(valueArg);
|
|
15
|
+
if (!match ||
|
|
16
|
+
![match[1], match[2], match[3], match[5]].every((componentArg) => Number.isSafeInteger(Number(componentArg))))
|
|
17
|
+
return undefined;
|
|
18
|
+
return {
|
|
19
|
+
core: `${match[1]}.${match[2]}.${match[3]}`,
|
|
20
|
+
identifier: match[4],
|
|
21
|
+
sequence: Number(match[5]),
|
|
22
|
+
};
|
|
23
|
+
};
|
|
24
|
+
export const isSupportedReleaseVersion = (valueArg) => (isCanonicalReleaseVersion(valueArg) && hasSafeIntegerComponents(valueArg)) ||
|
|
25
|
+
parsePrereleaseVersion(valueArg) !== undefined;
|
|
26
|
+
export const releaseVersionCore = (valueArg) => parsePrereleaseVersion(valueArg)?.core ?? valueArg;
|
|
27
|
+
/** Semver ordering for stable versions and the supported identifier.N form. */
|
|
28
|
+
export const compareSupportedReleaseVersions = (leftArg, rightArg) => {
|
|
29
|
+
const coreOrder = compareReleaseVersions(releaseVersionCore(leftArg), releaseVersionCore(rightArg));
|
|
30
|
+
if (coreOrder !== 0)
|
|
31
|
+
return coreOrder;
|
|
32
|
+
const left = parsePrereleaseVersion(leftArg);
|
|
33
|
+
const right = parsePrereleaseVersion(rightArg);
|
|
34
|
+
if (!left && !right)
|
|
35
|
+
return 0;
|
|
36
|
+
if (!left)
|
|
37
|
+
return 1;
|
|
38
|
+
if (!right)
|
|
39
|
+
return -1;
|
|
40
|
+
if (left.identifier !== right.identifier)
|
|
41
|
+
return left.identifier < right.identifier ? -1 : 1;
|
|
42
|
+
return Math.sign(left.sequence - right.sequence);
|
|
43
|
+
};
|
|
44
|
+
export const parseReleasePrerelease = (valueArg, contextArg = "release.prerelease") => {
|
|
45
|
+
if (valueArg === undefined)
|
|
46
|
+
return undefined;
|
|
47
|
+
const fail = () => {
|
|
48
|
+
throw new ReleaseVersionError("invalid-prerelease-config", `${contextArg} must contain exactly identifier and distTag: lowercase letters and digits joined by hyphens, starting with a letter; distTag must not be latest or a semver range.`);
|
|
49
|
+
};
|
|
50
|
+
if (typeof valueArg !== "object" ||
|
|
51
|
+
valueArg === null ||
|
|
52
|
+
Array.isArray(valueArg))
|
|
53
|
+
return fail();
|
|
54
|
+
const config = valueArg;
|
|
55
|
+
if (Object.keys(config).length !== 2 ||
|
|
56
|
+
typeof config.identifier !== "string" ||
|
|
57
|
+
typeof config.distTag !== "string")
|
|
58
|
+
return fail();
|
|
59
|
+
const identifierPattern = /^[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/;
|
|
60
|
+
if (![config.identifier, config.distTag].every((partArg) => partArg.length <= 64 && identifierPattern.test(partArg)) ||
|
|
61
|
+
config.distTag === "latest" ||
|
|
62
|
+
/^v*(?:\d+|x)$/.test(config.distTag))
|
|
63
|
+
return fail();
|
|
64
|
+
return { identifier: config.identifier, distTag: config.distTag };
|
|
65
|
+
};
|
|
66
|
+
export const toReleasePrereleaseRecord = (prereleaseArg, floorArg) => {
|
|
67
|
+
if (!prereleaseArg)
|
|
68
|
+
return undefined;
|
|
69
|
+
const versionFloor = parseReleaseVersionFloor(floorArg, prereleaseArg);
|
|
70
|
+
if (!versionFloor)
|
|
71
|
+
throw new ReleaseVersionError("invalid-prerelease-config", "release.prerelease requires a matching prerelease release.versionFloor.");
|
|
72
|
+
return { ...prereleaseArg, versionFloor };
|
|
73
|
+
};
|
|
74
|
+
export const isSameReleasePrerelease = (leftArg, rightArg) => leftArg?.identifier === rightArg?.identifier &&
|
|
75
|
+
leftArg?.distTag === rightArg?.distTag &&
|
|
76
|
+
leftArg?.versionFloor === rightArg?.versionFloor;
|
|
12
77
|
// The semver.org 2.0.0 grammar. It is consulted only after the canonical form
|
|
13
78
|
// failed, so a match here means prerelease or build metadata.
|
|
14
79
|
const decoratedSemverPattern = /^(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(?:\+[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*)?$/;
|
|
@@ -31,14 +96,22 @@ export const compareReleaseVersions = (leftArg, rightArg) => {
|
|
|
31
96
|
return 0;
|
|
32
97
|
};
|
|
33
98
|
/** The major component of a canonical x.y.z version. */
|
|
34
|
-
export const releaseVersionMajor = (versionArg) => parseVersionCore(versionArg)[0];
|
|
99
|
+
export const releaseVersionMajor = (versionArg) => parseVersionCore(releaseVersionCore(versionArg))[0];
|
|
35
100
|
const majorOf = releaseVersionMajor;
|
|
36
101
|
// npm and the version bump arithmetic handle only safe integer components.
|
|
37
102
|
const hasSafeIntegerComponents = (versionArg) => versionArg
|
|
38
103
|
.split(".")
|
|
39
104
|
.every((componentArg) => Number.isSafeInteger(Number(componentArg)));
|
|
40
105
|
/** Validates `release.versionFloor`; absent means no floor. */
|
|
41
|
-
export const parseReleaseVersionFloor = (valueArg) => {
|
|
106
|
+
export const parseReleaseVersionFloor = (valueArg, prereleaseArg) => {
|
|
107
|
+
if (prereleaseArg) {
|
|
108
|
+
const parsed = typeof valueArg === "string"
|
|
109
|
+
? parsePrereleaseVersion(valueArg)
|
|
110
|
+
: undefined;
|
|
111
|
+
if (!parsed || parsed.identifier !== prereleaseArg.identifier)
|
|
112
|
+
throw new ReleaseVersionError("invalid-prerelease-config", "release.prerelease requires release.versionFloor in the matching x.y.z-identifier.N form; keep this floor to make older CLIs fail closed.");
|
|
113
|
+
return valueArg;
|
|
114
|
+
}
|
|
42
115
|
if (valueArg === undefined)
|
|
43
116
|
return undefined;
|
|
44
117
|
if (typeof valueArg === "string" && isCanonicalReleaseVersion(valueArg)) {
|
|
@@ -59,6 +132,38 @@ const decideFloorOutcome = (currentVersionArg, inferredVersionArg, floorArg) =>
|
|
|
59
132
|
}
|
|
60
133
|
return "applied";
|
|
61
134
|
};
|
|
135
|
+
const resolvePrereleaseVersion = (requestArg, prereleaseArg, floorArg, pendingLevelArg) => {
|
|
136
|
+
if (requestArg.levelOverride)
|
|
137
|
+
throw new ReleaseVersionError("invalid-prerelease-config", "Prerelease numbering is controlled by release.versionFloor; --major, --minor and --patch are not allowed while release.prerelease is configured.");
|
|
138
|
+
const current = parsePrereleaseVersion(requestArg.currentVersion);
|
|
139
|
+
const floor = parsePrereleaseVersion(floorArg);
|
|
140
|
+
if (!isSupportedReleaseVersion(requestArg.currentVersion) ||
|
|
141
|
+
(current && current.identifier !== prereleaseArg.identifier))
|
|
142
|
+
throw new ReleaseVersionError("noncanonical-version", "The current version must be stable or belong to the configured prerelease identifier.");
|
|
143
|
+
const coreOrder = compareReleaseVersions(floor.core, releaseVersionCore(requestArg.currentVersion));
|
|
144
|
+
if (!current && coreOrder <= 0)
|
|
145
|
+
throw new ReleaseVersionError("invalid-prerelease-config", "A prerelease floor must target a version above the current stable version.");
|
|
146
|
+
if (current && coreOrder < 0)
|
|
147
|
+
throw new ReleaseVersionError("invalid-prerelease-config", "A prerelease floor cannot move its version core backwards.");
|
|
148
|
+
if (current?.sequence === Number.MAX_SAFE_INTEGER)
|
|
149
|
+
throw new ReleaseVersionError("invalid-prerelease-config", "The prerelease sequence cannot exceed Number.MAX_SAFE_INTEGER.");
|
|
150
|
+
const inferredVersion = current
|
|
151
|
+
? `${current.core}-${prereleaseArg.identifier}.${current.sequence + 1}`
|
|
152
|
+
: requestArg.currentVersion;
|
|
153
|
+
const applied = compareSupportedReleaseVersions(floorArg, inferredVersion) > 0;
|
|
154
|
+
return {
|
|
155
|
+
currentVersion: requestArg.currentVersion,
|
|
156
|
+
level: pendingLevelArg,
|
|
157
|
+
levelSource: "pending-changelog",
|
|
158
|
+
inferredVersion,
|
|
159
|
+
version: applied ? floorArg : inferredVersion,
|
|
160
|
+
versionFloor: { floor: floorArg, outcome: applied ? "applied" : "inert" },
|
|
161
|
+
floorRaisesMajorWithoutBreakingChanges: applied &&
|
|
162
|
+
majorOf(floorArg) > majorOf(inferredVersion) &&
|
|
163
|
+
pendingLevelArg !== "major",
|
|
164
|
+
prerelease: prereleaseArg,
|
|
165
|
+
};
|
|
166
|
+
};
|
|
62
167
|
/**
|
|
63
168
|
* The only place that decides the next release version: the level-inferred
|
|
64
169
|
* version, raised to `release.versionFloor` when the floor is higher.
|
|
@@ -66,7 +171,17 @@ const decideFloorOutcome = (currentVersionArg, inferredVersionArg, floorArg) =>
|
|
|
66
171
|
export const resolveReleaseVersion = (requestArg) => {
|
|
67
172
|
const pendingLevel = inferVersionTypeFromPending(requestArg.pendingChangelog);
|
|
68
173
|
const level = requestArg.levelOverride ?? pendingLevel;
|
|
69
|
-
const
|
|
174
|
+
const currentPrerelease = parsePrereleaseVersion(requestArg.currentVersion);
|
|
175
|
+
const prerelease = parseReleasePrerelease(requestArg.prerelease);
|
|
176
|
+
const floor = parseReleaseVersionFloor(requestArg.versionFloor, prerelease);
|
|
177
|
+
if (prerelease)
|
|
178
|
+
return resolvePrereleaseVersion(requestArg, prerelease, floor, pendingLevel);
|
|
179
|
+
// Removing both channel settings explicitly promotes the exact prerelease core.
|
|
180
|
+
const inferredVersion = currentPrerelease
|
|
181
|
+
? currentPrerelease.core
|
|
182
|
+
: calculateNewVersion(requestArg.currentVersion, level);
|
|
183
|
+
if (currentPrerelease && requestArg.levelOverride)
|
|
184
|
+
throw new ReleaseVersionError("invalid-prerelease-config", "Promote a prerelease by removing release.prerelease and its floor, without a version-level flag.");
|
|
70
185
|
const levelSource = requestArg.levelOverride
|
|
71
186
|
? "flag"
|
|
72
187
|
: "pending-changelog";
|
|
@@ -76,7 +191,6 @@ export const resolveReleaseVersion = (requestArg) => {
|
|
|
76
191
|
levelSource,
|
|
77
192
|
inferredVersion,
|
|
78
193
|
};
|
|
79
|
-
const floor = parseReleaseVersionFloor(requestArg.versionFloor);
|
|
80
194
|
if (floor === undefined) {
|
|
81
195
|
return {
|
|
82
196
|
...unfloored,
|
|
@@ -124,7 +238,13 @@ const describeVersionFloor = (resolutionArg) => {
|
|
|
124
238
|
switch (decision.outcome) {
|
|
125
239
|
case "inert":
|
|
126
240
|
return [
|
|
127
|
-
|
|
241
|
+
...(resolutionArg.prerelease
|
|
242
|
+
? [
|
|
243
|
+
`prerelease floor: ${decision.floor} retained (older CLIs refuse this channel)`,
|
|
244
|
+
]
|
|
245
|
+
: [
|
|
246
|
+
`version floor: ${decision.floor} inert (current ${resolutionArg.currentVersion} already meets it); remove release.versionFloor`,
|
|
247
|
+
]),
|
|
128
248
|
];
|
|
129
249
|
case "satisfied":
|
|
130
250
|
return [
|
|
@@ -147,4 +267,4 @@ export const describeReleaseVersion = (resolutionArg) => [
|
|
|
147
267
|
`version level: ${resolutionArg.level} (${resolutionArg.levelSource === "flag" ? `--${resolutionArg.level}` : "Pending changelog"})`,
|
|
148
268
|
...describeVersionFloor(resolutionArg),
|
|
149
269
|
];
|
|
150
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5yZWxlYXNldmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3RzL21vZF9yZWxlYXNlL2hlbHBlcnMucmVsZWFzZXZlcnNpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDdEUsT0FBTyxFQUNMLG1CQUFtQixHQUVwQixNQUFNLDhCQUE4QixDQUFDO0FBUXRDLE1BQU0sT0FBTyxtQkFBb0IsU0FBUSxLQUFLO0lBRTFCO0lBRGxCLFlBQ2tCLElBQThCLEVBQzlDLFVBQWtCO1FBRWxCLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUhGLFNBQUksR0FBSixJQUFJLENBQTBCO1FBSTlDLElBQUksQ0FBQyxJQUFJLEdBQUcscUJBQXFCLENBQUM7SUFDcEMsQ0FBQztDQUNGO0FBcUNELE1BQU0sdUJBQXVCLEdBQUcsNENBQTRDLENBQUM7QUFDN0UsOEVBQThFO0FBQzlFLDhEQUE4RDtBQUM5RCxNQUFNLHNCQUFzQixHQUMxQix1TEFBdUwsQ0FBQztBQUUxTCxNQUFNLENBQUMsTUFBTSx5QkFBeUIsR0FBRyxDQUFDLFFBQWdCLEVBQVcsRUFBRSxDQUNyRSx1QkFBdUIsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7QUFFekMsTUFBTSxnQkFBZ0IsR0FBRyxDQUFDLFFBQWdCLEVBQTRCLEVBQUU7SUFDdEUsTUFBTSxLQUFLLEdBQUcsdUJBQXVCLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3JELElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNYLE1BQU0sSUFBSSxtQkFBbUIsQ0FDM0Isc0JBQXNCLEVBQ3RCLDBEQUEwRCxJQUFJLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQ3RGLENBQUM7SUFDSixDQUFDO0lBQ0QsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENB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
|
|
270
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helpers.releaseversion.js","sourceRoot":"","sources":["../../../ts/mod_release/helpers.releaseversion.ts"],"names":[],"mappings":"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"}
|