@xrystal/core 3.55.93 → 3.55.94
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/package.json
CHANGED
|
@@ -170,6 +170,17 @@ function resolveServiceLatestTag(root) {
|
|
|
170
170
|
return getLatestCalverTagForLane(root, lane) ?? getLatestTagVersion(root)
|
|
171
171
|
}
|
|
172
172
|
|
|
173
|
+
/** HEAD package.json version only when it matches the current branch CalVer lane. */
|
|
174
|
+
function headVersionInCurrentLane(root) {
|
|
175
|
+
const lane = resolveCalverLaneFromBranch(root)
|
|
176
|
+
if (!lane) return readPackageJsonVersionAtRef('HEAD', root)
|
|
177
|
+
const headVersion = readPackageJsonVersionAtRef('HEAD', root)
|
|
178
|
+
if (!headVersion) return null
|
|
179
|
+
const headLane = detectCalverLane(headVersion)
|
|
180
|
+
if (headLane && headLane !== lane) return null
|
|
181
|
+
return headVersion
|
|
182
|
+
}
|
|
183
|
+
|
|
173
184
|
export function pickHigherSemver(a, b) {
|
|
174
185
|
if (!a) return b ?? null
|
|
175
186
|
if (!b) return a
|
|
@@ -232,8 +243,9 @@ export function resolveVersionBaseline(root = getProjectRoot()) {
|
|
|
232
243
|
const headVersion = readPackageJsonVersionAtRef('HEAD', root)
|
|
233
244
|
const parentVersion = readPackageJsonVersionAtRef('HEAD~1', root)
|
|
234
245
|
const calverLane = !isCorePackageProject(root) && resolveCalverLaneFromBranch(root)
|
|
246
|
+
const laneHead = calverLane ? headVersionInCurrentLane(root) : headVersion
|
|
235
247
|
const baselineVersion = calverLane
|
|
236
|
-
? pickHigherSemver(latestTag,
|
|
248
|
+
? pickHigherSemver(latestTag, laneHead ?? parentVersion)
|
|
237
249
|
: pickHigherSemver(latestTag, parentVersion)
|
|
238
250
|
|
|
239
251
|
let baselineLabel = 'first release'
|
|
@@ -255,8 +267,9 @@ export function resolveStagedVersionBaseline(root = getProjectRoot()) {
|
|
|
255
267
|
const latestTag = resolveServiceLatestTag(root)
|
|
256
268
|
const parentVersion = readPackageJsonVersionAtRef('HEAD~1', root)
|
|
257
269
|
const calverLane = !isCorePackageProject(root) && resolveCalverLaneFromBranch(root)
|
|
270
|
+
const laneHead = calverLane ? headVersionInCurrentLane(root) : headVersion
|
|
258
271
|
const baselineVersion = calverLane
|
|
259
|
-
? pickHigherSemver(latestTag,
|
|
272
|
+
? pickHigherSemver(latestTag, laneHead ?? parentVersion)
|
|
260
273
|
: pickHigherSemver(pickHigherSemver(latestTag, headVersion), parentVersion)
|
|
261
274
|
|
|
262
275
|
let baselineLabel = 'version floor'
|