Skip to content

Commit e7ffc20

Browse files
authored
Merge pull request #28 from adenvt/0.1.1
2 parents 7e6d5f0 + 2f8d6bc commit e7ffc20

File tree

6 files changed

+50
-20
lines changed

6 files changed

+50
-20
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"ufo": "^1.0.1"
3232
},
3333
"devDependencies": {
34-
"@privyid/browserslist-config": "^0.9.0",
34+
"@privyid/browserslist-config": "^0.16.0",
3535
"@tsconfig/node16": "^1.0.3",
3636
"@types/jest": "^29.4.0",
3737
"@types/polyfill-library": "^3.108.1",

src/lib/get-version-range.spec.ts

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import getVersionRange from "./get-version-range"
2+
3+
it('should return array of version', () => {
4+
const result = getVersionRange('16.0-16.5')
5+
6+
expect(result).toStrictEqual([
7+
'16.0.0',
8+
'16.1.0',
9+
'16.2.0',
10+
'16.3.0',
11+
'16.4.0',
12+
'16.5.0',
13+
])
14+
})
15+
16+
it('should return version itself if version wasn\'t not a range', () => {
17+
const result = getVersionRange('16')
18+
19+
expect(result).toStrictEqual([
20+
'16.0.0',
21+
])
22+
})

src/lib/get-version-range.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@ import { coerce, satisfies } from "semver";
44
* Return array of version range
55
* @param range version range
66
* @example
7-
* getVersionRange('14.5-14.7') // ['14.5', '14.6', '14.7']
7+
* getVersionRange('14.5-14.7') // ['14.5.0', '14.6.0', '14.7.0']
88
*/
99
export default function getVersionRange(range: string): string[] {
10-
if (!range.includes('-'))
11-
return [range]
10+
if (!range.includes('-')) {
11+
const version = coerce(range, {loose: true})
12+
13+
return version
14+
? [version.version]
15+
: []
16+
}
1217

1318
const [start, end] = range.split('-')
1419
const result: string[] = []

src/lib/version-match.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import isVersionMatch from "./version-match";
33
interface ITestCase {
44
browserVersion: string,
55
featureVersion: string,
6-
matches: boolean
6+
matches: boolean,
77
}
88

99
describe('isVersionMatch', () => {

src/lib/version-match.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ export default function isVersionMatch(browserVersion: string, featureVersion: s
1313
return true
1414

1515
const parsedBrowserVersion = coerce(browserVersion, { loose: true })
16-
if (!parsedBrowserVersion) return false
16+
17+
if (!parsedBrowserVersion)
18+
return false
19+
1720
return satisfies(parsedBrowserVersion, featureVersion, {loose: true})
1821
}

yarn.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -766,10 +766,10 @@ __metadata:
766766
languageName: node
767767
linkType: hard
768768

769-
"@privyid/browserslist-config@npm:^0.9.0":
770-
version: 0.9.0
771-
resolution: "@privyid/browserslist-config@npm:0.9.0"
772-
checksum: b0851bedae585ded2d0b28c546179059000979046f387fff919e404fa9c1d335f49fbc3b8517302e426376e16efdac579327b64bb4cee121869746585ba068f7
769+
"@privyid/browserslist-config@npm:^0.16.0":
770+
version: 0.16.0
771+
resolution: "@privyid/browserslist-config@npm:0.16.0"
772+
checksum: 082224b658b9a8a8d67326099260adadbb12c1cbb6be1685929974a3b068f5e2b7e7ceda0a085494e60e7cf0ec0399fc86f9f6bc3a798e080b66934a9301251d
773773
languageName: node
774774
linkType: hard
775775

@@ -987,9 +987,9 @@ __metadata:
987987
linkType: hard
988988

989989
"@types/semver@npm:^7.3.13":
990-
version: 7.3.13
991-
resolution: "@types/semver@npm:7.3.13"
992-
checksum: 00c0724d54757c2f4bc60b5032fe91cda6410e48689633d5f35ece8a0a66445e3e57fa1d6e07eb780f792e82ac542948ec4d0b76eb3484297b79bd18b8cf1cb0
990+
version: 7.5.0
991+
resolution: "@types/semver@npm:7.5.0"
992+
checksum: 0a64b9b9c7424d9a467658b18dd70d1d781c2d6f033096a6e05762d20ebbad23c1b69b0083b0484722aabf35640b78ccc3de26368bcae1129c87e9df028a22e2
993993
languageName: node
994994
linkType: hard
995995

@@ -3193,8 +3193,8 @@ __metadata:
31933193
linkType: hard
31943194

31953195
"polyfill-library@npm:^4.6.0":
3196-
version: 4.7.0
3197-
resolution: "polyfill-library@npm:4.7.0"
3196+
version: 4.8.0
3197+
resolution: "polyfill-library@npm:4.8.0"
31983198
dependencies:
31993199
"@financial-times/polyfill-useragent-normaliser": ^2.0.1
32003200
from2-string: ^1.1.0
@@ -3204,15 +3204,15 @@ __metadata:
32043204
stream-from-promise: ^1.0.0
32053205
stream-to-string: ^1.1.0
32063206
toposort: ^2.0.2
3207-
checksum: 53164543feefd95e19a672180c705d21d3afffa628b7de92da2cdbae3edc3ad8e64696296dc75f218d3d3e0437a197b910a0b13dc90ecf77df1b2994b1861fdc
3207+
checksum: 98c19e6313bf57fd843c46c88ece190d3f3b73d11e0887f9a413f477404a5add3e032202d3ef889d54f5f315382f7a59c50e9aee4fd516c0be80f0f73ac75a8d
32083208
languageName: node
32093209
linkType: hard
32103210

32113211
"polyfillist@workspace:.":
32123212
version: 0.0.0-use.local
32133213
resolution: "polyfillist@workspace:."
32143214
dependencies:
3215-
"@privyid/browserslist-config": ^0.9.0
3215+
"@privyid/browserslist-config": ^0.16.0
32163216
"@tsconfig/node16": ^1.0.3
32173217
"@types/jest": ^29.4.0
32183218
"@types/polyfill-library": ^3.108.1
@@ -3537,13 +3537,13 @@ __metadata:
35373537
linkType: hard
35383538

35393539
"semver@npm:^7.1.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.8":
3540-
version: 7.5.0
3541-
resolution: "semver@npm:7.5.0"
3540+
version: 7.5.3
3541+
resolution: "semver@npm:7.5.3"
35423542
dependencies:
35433543
lru-cache: ^6.0.0
35443544
bin:
35453545
semver: bin/semver.js
3546-
checksum: 2d266937756689a76f124ffb4c1ea3e1bbb2b263219f90ada8a11aebebe1280b13bb76cca2ca96bdee3dbc554cbc0b24752eb895b2a51577aa644427e9229f2b
3546+
checksum: 9d58db16525e9f749ad0a696a1f27deabaa51f66e91d2fa2b0db3de3e9644e8677de3b7d7a03f4c15bc81521e0c3916d7369e0572dbde250d9bedf5194e2a8a7
35473547
languageName: node
35483548
linkType: hard
35493549

0 commit comments

Comments
 (0)