@xrystal/core 3.37.4 → 3.38.1
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 +1 -1
- package/x/bin/commands/doctor.mjs +14 -5
- package/x/bin/scripts/version-check.mjs +119 -29
package/package.json
CHANGED
|
@@ -9,7 +9,7 @@ import {
|
|
|
9
9
|
readProjectPackageJson,
|
|
10
10
|
} from '../helpers/project-root.mjs'
|
|
11
11
|
import { listRuntimeInventory, resolveRuntimeInfo } from '../helpers/runtime-info.mjs'
|
|
12
|
-
import { evaluateVersionBump,
|
|
12
|
+
import { evaluateVersionBump, getVersionState, resolveCommitVersionHint, resolveVersionBaseline, VERSION_PATTERN } from '../scripts/version-check.mjs'
|
|
13
13
|
import { auditTsconfigAlignment, resolveToolchainPathsFromProject } from '../helpers/toolchain-config.mjs'
|
|
14
14
|
import { isGitHookInstalled } from '../scripts/install-git-hooks.mjs'
|
|
15
15
|
|
|
@@ -112,14 +112,23 @@ export function registerDoctorCommand(cli, { cliName = 'xcore' } = {}) {
|
|
|
112
112
|
console.log(` ${'disk version'.padEnd(18)}${state.disk.version}`)
|
|
113
113
|
console.log(` ${'version match'.padEnd(18)}${state.versionMatch ? chalk.green('yes') : chalk.red('no')}`)
|
|
114
114
|
console.log(` ${'package.json'.padEnd(18)}${state.isPackageJsonClean ? chalk.green('committed') : chalk.yellow('dirty')}`)
|
|
115
|
-
const latestTag =
|
|
115
|
+
const { latestTag, parentVersion } = resolveVersionBaseline(root)
|
|
116
|
+
const commitHint = resolveCommitVersionHint(root)
|
|
116
117
|
console.log(` ${'latest tag'.padEnd(18)}${latestTag ? `v${latestTag}` : chalk.gray('none')}`)
|
|
118
|
+
console.log(` ${'prev commit'.padEnd(18)}${parentVersion ? `v${parentVersion}` : chalk.gray('none')}`)
|
|
119
|
+
console.log(` ${'commit hint'.padEnd(18)}${commitHint ? `v${commitHint}` : chalk.gray('none')}`)
|
|
120
|
+
if (commitHint && commitHint !== state.committed.version) {
|
|
121
|
+
console.log(` ${'commit/pkg'.padEnd(18)}${chalk.red(`mismatch (want v${commitHint})`)}`)
|
|
122
|
+
} else if (commitHint) {
|
|
123
|
+
console.log(` ${'commit/pkg'.padEnd(18)}${chalk.green('aligned')}`)
|
|
124
|
+
}
|
|
117
125
|
const evaluation = evaluateVersionBump(state.committed.version, 'HEAD', root)
|
|
118
126
|
if (evaluation.baselineVersion) {
|
|
119
|
-
const bumpText = evaluation.ok
|
|
120
|
-
? chalk.green(`ok (${evaluation.status})`)
|
|
121
|
-
: chalk.red(`must be > ${evaluation.baselineVersion}`)
|
|
127
|
+
const bumpText = evaluation.ok ? chalk.green(`ok (${evaluation.status})`) : chalk.red(evaluation.status)
|
|
122
128
|
console.log(` bump vs ${evaluation.baselineLabel}: ${bumpText}`)
|
|
129
|
+
if (evaluation.gap?.warnings?.length) {
|
|
130
|
+
console.log(` ${'jump warning'.padEnd(18)}${chalk.yellow(evaluation.gap.warnings.join('; '))}`)
|
|
131
|
+
}
|
|
123
132
|
} else {
|
|
124
133
|
console.log(` ${'bump check'.padEnd(18)}${chalk.green('first release baseline')}`)
|
|
125
134
|
}
|
|
@@ -118,56 +118,130 @@ export function getLatestTagVersion(root = getProjectRoot()) {
|
|
|
118
118
|
}
|
|
119
119
|
}
|
|
120
120
|
|
|
121
|
+
export function pickHigherSemver(a, b) {
|
|
122
|
+
if (!a) return b ?? null
|
|
123
|
+
if (!b) return a
|
|
124
|
+
return compareSemver(a, b) >= 0 ? a : b
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
export function getHeadCommitSubject(root = getProjectRoot()) {
|
|
128
|
+
try {
|
|
129
|
+
return run('git log -1 --pretty=%s', { root })
|
|
130
|
+
} catch {
|
|
131
|
+
return ''
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
export function extractVersionFromCommitMessage(message) {
|
|
136
|
+
const text = String(message ?? '').trim()
|
|
137
|
+
const exact = text.match(/^v?(\d+\.\d+\.\d+(?:-[0-9A-Za-z-.]+)?)$/i)
|
|
138
|
+
if (exact) return exact[1]
|
|
139
|
+
const embedded = text.match(/\bv?(\d+\.\d+\.\d+(?:-[0-9A-Za-z-.]+)?)\b/)
|
|
140
|
+
return embedded?.[1] ?? null
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
export function resolveCommitVersionHint(root = getProjectRoot()) {
|
|
144
|
+
return extractVersionFromCommitMessage(getHeadCommitSubject(root))
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
export function analyzeSemverGap(from, to) {
|
|
148
|
+
if (!from || !to) return { kind: 'unknown', warnings: [] }
|
|
149
|
+
const cmp = compareSemver(to, from)
|
|
150
|
+
if (cmp < 0) return { kind: 'downgrade', warnings: [`downgrade ${from} → ${to}`] }
|
|
151
|
+
if (cmp === 0) return { kind: 'same', warnings: [] }
|
|
152
|
+
|
|
153
|
+
const f = parseSemver(from)
|
|
154
|
+
const t = parseSemver(to)
|
|
155
|
+
const warnings = []
|
|
156
|
+
const majorJump = t.major - f.major
|
|
157
|
+
const minorJump = t.minor - f.minor
|
|
158
|
+
const patchJump = t.patch - f.patch
|
|
159
|
+
|
|
160
|
+
if (majorJump > 1) warnings.push(`major jump +${majorJump} (${from} → ${to})`)
|
|
161
|
+
if (majorJump === 0 && minorJump > 1) warnings.push(`minor jump +${minorJump} (${from} → ${to})`)
|
|
162
|
+
if (majorJump === 0 && minorJump === 0 && patchJump > 1) warnings.push(`patch jump +${patchJump} (${from} → ${to})`)
|
|
163
|
+
if (majorJump === 0 && minorJump > 0 && patchJump > 0) warnings.push(`mixed minor+patch bump (${from} → ${to})`)
|
|
164
|
+
|
|
165
|
+
const kind = majorJump > 0 ? 'major' : minorJump > 0 ? 'minor' : 'patch'
|
|
166
|
+
return { kind, warnings }
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
export function assertCommitPackageVersionAlign(version, root = getProjectRoot()) {
|
|
170
|
+
const hint = resolveCommitVersionHint(root)
|
|
171
|
+
if (!hint) return { hint: null, aligned: true }
|
|
172
|
+
if (hint === version) return { hint, aligned: true }
|
|
173
|
+
throw new Error(
|
|
174
|
+
`Version mismatch:\n commit message: v${hint}\n package.json: ${version}\n\nBump package.json to ${hint} (or fix the commit message) before tagging.`,
|
|
175
|
+
)
|
|
176
|
+
}
|
|
177
|
+
|
|
121
178
|
export function resolveVersionBaseline(root = getProjectRoot()) {
|
|
122
179
|
const latestTag = getLatestTagVersion(root)
|
|
180
|
+
const headVersion = readPackageJsonVersionAtRef('HEAD', root)
|
|
123
181
|
const parentVersion = readPackageJsonVersionAtRef('HEAD~1', root)
|
|
124
|
-
const baselineVersion = latestTag
|
|
125
|
-
|
|
126
|
-
|
|
182
|
+
const baselineVersion = pickHigherSemver(latestTag, parentVersion)
|
|
183
|
+
|
|
184
|
+
let baselineLabel = 'first release'
|
|
185
|
+
if (latestTag && parentVersion) {
|
|
186
|
+
if (latestTag === parentVersion) baselineLabel = `latest tag / previous commit v${latestTag}`
|
|
187
|
+
else if (compareSemver(latestTag, parentVersion) > 0) baselineLabel = `latest tag v${latestTag} (> previous commit v${parentVersion})`
|
|
188
|
+
else baselineLabel = `previous commit v${parentVersion} (> latest tag v${latestTag})`
|
|
189
|
+
} else if (latestTag) {
|
|
190
|
+
baselineLabel = `latest tag v${latestTag}`
|
|
191
|
+
} else if (parentVersion) {
|
|
192
|
+
baselineLabel = `previous commit v${parentVersion}`
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
return { baselineVersion, baselineLabel, latestTag, parentVersion, headVersion }
|
|
127
196
|
}
|
|
128
197
|
|
|
129
198
|
export function resolveStagedVersionBaseline(root = getProjectRoot()) {
|
|
130
199
|
const headVersion = readPackageJsonVersionAtRef('HEAD', root)
|
|
131
200
|
const latestTag = getLatestTagVersion(root)
|
|
201
|
+
const parentVersion = readPackageJsonVersionAtRef('HEAD~1', root)
|
|
202
|
+
const baselineVersion = pickHigherSemver(pickHigherSemver(latestTag, headVersion), parentVersion)
|
|
132
203
|
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
baselineLabel: preferTag ? `latest tag v${latestTag}` : 'current HEAD commit',
|
|
138
|
-
latestTag,
|
|
139
|
-
headVersion,
|
|
140
|
-
}
|
|
141
|
-
}
|
|
142
|
-
|
|
143
|
-
if (latestTag) {
|
|
144
|
-
return { baselineVersion: latestTag, baselineLabel: `latest tag v${latestTag}`, latestTag, headVersion }
|
|
145
|
-
}
|
|
204
|
+
let baselineLabel = 'version floor'
|
|
205
|
+
if (baselineVersion === latestTag) baselineLabel = `latest tag v${latestTag}`
|
|
206
|
+
else if (baselineVersion === headVersion) baselineLabel = 'current HEAD commit'
|
|
207
|
+
else if (baselineVersion === parentVersion) baselineLabel = 'previous commit'
|
|
146
208
|
|
|
147
|
-
return {
|
|
148
|
-
baselineVersion: headVersion,
|
|
149
|
-
baselineLabel: 'current HEAD commit',
|
|
150
|
-
latestTag: null,
|
|
151
|
-
headVersion,
|
|
152
|
-
}
|
|
209
|
+
return { baselineVersion, baselineLabel, latestTag, headVersion, parentVersion }
|
|
153
210
|
}
|
|
154
211
|
|
|
155
|
-
/** @returns {{ ok: boolean, baselineVersion: string|null, baselineLabel: string, status: string }} */
|
|
212
|
+
/** @returns {{ ok: boolean, baselineVersion: string|null, baselineLabel: string, status: string, gap: ReturnType<typeof analyzeSemverGap>, commitHint: string|null, alignedWithCommit: boolean }} */
|
|
156
213
|
export function evaluateVersionBump(version, ref = 'HEAD', root = getProjectRoot()) {
|
|
157
|
-
const { baselineVersion, baselineLabel, latestTag } = resolveVersionBaseline(root)
|
|
214
|
+
const { baselineVersion, baselineLabel, latestTag, headVersion, parentVersion } = resolveVersionBaseline(root)
|
|
215
|
+
const commitHint = resolveCommitVersionHint(root)
|
|
216
|
+
const alignedWithCommit = !commitHint || commitHint === version
|
|
217
|
+
const gap = baselineVersion ? analyzeSemverGap(baselineVersion, version) : { kind: 'unknown', warnings: [] }
|
|
218
|
+
|
|
158
219
|
if (!baselineVersion) {
|
|
159
|
-
return { ok: true, baselineVersion: null, baselineLabel: 'first release', status: 'first release' }
|
|
220
|
+
return { ok: true, baselineVersion: null, baselineLabel: 'first release', status: 'first release', gap, commitHint, alignedWithCommit }
|
|
160
221
|
}
|
|
161
222
|
|
|
162
223
|
assertVersionFormat(version)
|
|
163
224
|
const cmp = compareSemver(version, baselineVersion)
|
|
164
225
|
|
|
226
|
+
if (!alignedWithCommit) {
|
|
227
|
+
return {
|
|
228
|
+
ok: false,
|
|
229
|
+
baselineVersion,
|
|
230
|
+
baselineLabel,
|
|
231
|
+
status: `commit wants v${commitHint}, package.json is ${version}`,
|
|
232
|
+
gap,
|
|
233
|
+
commitHint,
|
|
234
|
+
alignedWithCommit,
|
|
235
|
+
}
|
|
236
|
+
}
|
|
237
|
+
|
|
165
238
|
if (cmp > 0) {
|
|
166
|
-
|
|
239
|
+
const jump = gap.warnings.length ? ` [${gap.warnings.join('; ')}]` : ''
|
|
240
|
+
return { ok: true, baselineVersion, baselineLabel, status: `>${baselineVersion} (${gap.kind})${jump}`, gap, commitHint, alignedWithCommit }
|
|
167
241
|
}
|
|
168
242
|
|
|
169
243
|
if (cmp < 0) {
|
|
170
|
-
return { ok: false, baselineVersion, baselineLabel, status: `<${baselineVersion}
|
|
244
|
+
return { ok: false, baselineVersion, baselineLabel, status: `<${baselineVersion}`, gap, commitHint, alignedWithCommit }
|
|
171
245
|
}
|
|
172
246
|
|
|
173
247
|
if (latestTag && version === latestTag) {
|
|
@@ -178,6 +252,9 @@ export function evaluateVersionBump(version, ref = 'HEAD', root = getProjectRoot
|
|
|
178
252
|
baselineVersion,
|
|
179
253
|
baselineLabel,
|
|
180
254
|
status: `=${latestTag} (retag on new commit)`,
|
|
255
|
+
gap,
|
|
256
|
+
commitHint,
|
|
257
|
+
alignedWithCommit,
|
|
181
258
|
}
|
|
182
259
|
}
|
|
183
260
|
return {
|
|
@@ -185,10 +262,13 @@ export function evaluateVersionBump(version, ref = 'HEAD', root = getProjectRoot
|
|
|
185
262
|
baselineVersion,
|
|
186
263
|
baselineLabel,
|
|
187
264
|
status: `=${latestTag} (tag on HEAD)`,
|
|
265
|
+
gap,
|
|
266
|
+
commitHint,
|
|
267
|
+
alignedWithCommit,
|
|
188
268
|
}
|
|
189
269
|
}
|
|
190
270
|
|
|
191
|
-
return { ok: false, baselineVersion, baselineLabel, status: `=${baselineVersion}
|
|
271
|
+
return { ok: false, baselineVersion, baselineLabel, status: `=${baselineVersion}`, gap, commitHint, alignedWithCommit }
|
|
192
272
|
}
|
|
193
273
|
|
|
194
274
|
export function assertVersionIncreased(current, baseline, baselineLabel = 'previous version') {
|
|
@@ -296,7 +376,17 @@ export function assertReadyToTag({ requireClean = false, root = getProjectRoot()
|
|
|
296
376
|
}
|
|
297
377
|
|
|
298
378
|
assertVersionFormat(version)
|
|
299
|
-
|
|
379
|
+
assertCommitPackageVersionAlign(version, root)
|
|
380
|
+
|
|
381
|
+
const evaluation = evaluateVersionBump(version, 'HEAD', root)
|
|
382
|
+
if (!evaluation.ok) {
|
|
383
|
+
throw new Error(
|
|
384
|
+
`package.json version is not valid for release.\n current: ${version}\n floor: ${evaluation.baselineVersion} (${evaluation.baselineLabel})\n status: ${evaluation.status}`,
|
|
385
|
+
)
|
|
386
|
+
}
|
|
387
|
+
if (evaluation.gap?.warnings?.length) {
|
|
388
|
+
console.warn(`⚠ Large version jump: ${evaluation.gap.warnings.join('; ')}`)
|
|
389
|
+
}
|
|
300
390
|
|
|
301
391
|
const tag = resolveTagState(version, 'HEAD', root)
|
|
302
392
|
|