feat: follow up semver v2.0.0-rc.2

Author: 9romise

src/providers/code-lens/version.ts

@@ -2,8 +2,7 @@ import type { DependencyInfo, Extractor } from '#types/extractor'
 import type { CodeLensProvider, TextDocument } from 'vscode'
 import { internalCommands } from '#state'
 import { getPackageInfo } from '#utils/api/package'
-import { getUpdateType } from '#utils/semver'
-import { formatVersion, isSupportedProtocol, parseVersion } from '#utils/version'
+import { formatVersion, getUpdateType, isSupportedProtocol, parseVersion } from '#utils/version'
 import { debounce } from 'perfect-debounce'
 import { CodeLens, EventEmitter } from 'vscode'
 

src/utils/semver.ts

@@ -49,7 +49,52 @@ export function parseVersion(rawVersion: string): ParsedVersion | null {
   return { protocol, prefix, semver }
 }
 
+/** related to: https://semver.org/spec/v2.0.0-rc.2.html */
+const CORE_VERSION_PATTERN = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)/
+type CoreVersion = [major: number, minor: number, patch: number]
+
+function stripBuildMetadata(version: string): string {
+  const idx = version.indexOf('+')
+  return idx === -1 ? version : version.slice(0, idx)
+}
+
+function parseCoreVersion(version: string): CoreVersion | null {
+  const match = version.match(CORE_VERSION_PATTERN)
+  if (!match)
+    return null
+
+  return [Number(match[1]), Number(match[2]), Number(match[3])]
+}
+
+export type UpdateType = 'major' | 'minor' | 'patch' | 'prerelease' | 'none'
+
+export function getUpdateType(current: string, latest: string): UpdateType {
+  current = stripBuildMetadata(current)
+  latest = stripBuildMetadata(latest)
+
+  const cur = parseCoreVersion(current)
+  const lat = parseCoreVersion(latest)
+
+  if (!cur || !lat)
+    return 'none'
+
+  if (lat[0] !== cur[0])
+    return lat[0] > cur[0] ? 'major' : 'none'
+
+  if (lat[1] !== cur[1])
+    return lat[1] > cur[1] ? 'minor' : 'none'
+
+  if (lat[2] !== cur[2])
+    return lat[2] > cur[2] ? 'patch' : 'none'
+
+  if (current !== latest && current.includes('-') && !latest.includes('-'))
+    return 'prerelease'
+
+  return 'none'
+}
+
 export function getPrereleaseId(version: string): string | null {
+  version = stripBuildMetadata(version)
   const idx = version.indexOf('-')
   if (idx === -1)
     return null
@@ -75,8 +120,14 @@ function comparePrereleasePrecedence(a: string, b: string): number {
 
     const numA = Number(partsA[i])
     const numB = Number(partsB[i])
-    if (!Number.isNaN(numA) && !Number.isNaN(numB)) {
-      return numA - numB
+    const isNumA = !Number.isNaN(numA)
+    const isNumB = !Number.isNaN(numB)
+
+    if (isNumA && isNumB) {
+      if (numA !== numB)
+        return numA - numB
+    } else if (isNumA !== isNumB) {
+      return isNumA ? -1 : 1
     } else if (partsA[i] !== partsB[i]) {
       return partsA[i] < partsB[i] ? -1 : 1
     }
@@ -86,10 +137,14 @@ function comparePrereleasePrecedence(a: string, b: string): number {
 }
 
 export function lt(a: string, b: string): boolean {
-  const [coreA, preA] = a.split('-', 2)
-  const [coreB, preB] = b.split('-', 2)
-  const partsA = coreA.split('.').map(Number)
-  const partsB = coreB.split('.').map(Number)
+  a = stripBuildMetadata(a)
+  b = stripBuildMetadata(b)
+
+  const [coreA, preA] = a.split('-')
+  const [coreB, preB] = b.split('-')
+
+  const partsA = parseCoreVersion(coreA)!
+  const partsB = parseCoreVersion(coreB)!
   for (let i = 0; i < 3; i++) {
     const diff = (partsA[i] || 0) - (partsB[i] || 0)
     if (diff !== 0)

src/utils/version.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { getPrereleaseId, lt, parseVersion } from '../../src/utils/version'
+import { getPrereleaseId, getUpdateType, lt, parseVersion } from '../../src/utils/version'
 
 describe('parseVersion', () => {
   it('should parse plain version', () => {
@@ -85,6 +85,11 @@ describe('getPrereleaseId', () => {
   it('should handle prerelease without dots', () => {
     expect(getPrereleaseId('1.0.0-canary')).toBe('canary')
   })
+
+  it('should ignore build metadata', () => {
+    expect(getPrereleaseId('1.0.0-beta.1+build')).toBe('beta')
+    expect(getPrereleaseId('1.0.0+build')).toBeNull()
+  })
 })
 
 describe('lt', () => {
@@ -126,4 +131,39 @@ describe('lt', () => {
     expect(lt('1.0.0-beta', '1.0.0-beta.1')).toBe(true)
     expect(lt('1.0.0-beta.1', '1.0.0-beta')).toBe(false)
   })
+
+  it('should ignore build metadata for precedence', () => {
+    expect(lt('1.0.0+build1', '1.0.0+build2')).toBe(false)
+    expect(lt('1.0.0-alpha+001', '1.0.0')).toBe(true)
+    expect(lt('1.0.0-alpha+001', '1.0.0-alpha.1')).toBe(true)
+  })
+
+  it('should rank numeric identifiers lower than non-numeric', () => {
+    expect(lt('1.0.0-1', '1.0.0-alpha')).toBe(true)
+    expect(lt('1.0.0-alpha', '1.0.0-1')).toBe(false)
+  })
+
+  it('should follow rc.2 spec precedence example', () => {
+    expect(lt('1.0.0-alpha', '1.0.0-alpha.1')).toBe(true)
+    expect(lt('1.0.0-alpha.1', '1.0.0-beta.2')).toBe(true)
+    expect(lt('1.0.0-beta.2', '1.0.0-beta.11')).toBe(true)
+    expect(lt('1.0.0-beta.11', '1.0.0-rc.1')).toBe(true)
+    expect(lt('1.0.0-rc.1', '1.0.0')).toBe(true)
+  })
+
+  it('should handle prerelease identifiers containing hyphens', () => {
+    expect(lt('1.0.0-alpha-beta', '1.0.0-alpha-gamma')).toBe(true)
+    expect(lt('1.0.0-alpha-gamma', '1.0.0-alpha-beta')).toBe(false)
+  })
+})
+
+describe('getUpdateType', () => {
+  it('should ignore build metadata', () => {
+    expect(getUpdateType('1.0.0+build', '2.0.0+build')).toBe('major')
+    expect(getUpdateType('1.0.0+build1', '1.0.0+build2')).toBe('none')
+  })
+
+  it('should detect prerelease with build metadata', () => {
+    expect(getUpdateType('1.0.0-alpha+001', '1.0.0')).toBe('prerelease')
+  })
 })