Skip to content

Commit 9c8b129

Browse files
committed
update
1 parent 76d2294 commit 9c8b129

2 files changed

Lines changed: 9 additions & 8 deletions

File tree

src/providers/diagnostics/rules/deprecation.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ export const checkDeprecation: DiagnosticRule = async ({ dep, pkg }) => {
1515
if (!versionInfo.deprecated)
1616
return
1717

18-
const { resolvedName } = dep
18+
const { specRange, resolvedName, resolvedSpec } = dep
1919

2020
if (checkIgnored({ ignoreList: config.ignore.deprecation, name: resolvedName, version: resolvedVersion }))
2121
return
2222

2323
return {
24-
range: dep.specRange,
24+
range: specRange,
2525
message: `"${formatPackageId(resolvedName, resolvedVersion)}" has been deprecated: ${versionInfo.deprecated}`,
2626
severity: DiagnosticSeverity.Error,
2727
code: {
2828
value: 'deprecation',
29-
target: Uri.parse(npmxPackageUrl(resolvedName, dep.resolvedSpec)),
29+
target: Uri.parse(npmxPackageUrl(resolvedName, resolvedSpec)),
3030
},
3131
tags: [DiagnosticTag.Deprecated],
3232
}

src/utils/version.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,17 @@ function getVersionRangePrefix(v: string): string {
2929

3030
const PROTOCOL_PATTERN = /^[a-z]+:/
3131

32-
export function formatUpgradeVersion(dep: Pick<ResolvedDependencyInfo, 'protocol' | 'resolvedName' | 'resolvedSpec' | 'rawName' | 'rawSpec'>, target: string): string {
33-
const prefix = getVersionRangePrefix(dep.resolvedSpec)
32+
export function formatUpgradeVersion(dep: ResolvedDependencyInfo, target: string): string {
33+
const { rawName, rawSpec, resolvedName, resolvedSpec, protocol } = dep
34+
const prefix = getVersionRangePrefix(resolvedSpec)
3435

3536
const result = prefix === '*' ? '*' : `${prefix}${target}`
3637

37-
const declaredProtocol = PROTOCOL_PATTERN.test(dep.rawSpec) ? dep.protocol : null
38+
const declaredProtocol = PROTOCOL_PATTERN.test(rawSpec) ? protocol : null
3839
if (!declaredProtocol)
3940
return result
4041

41-
const isAlias = dep.resolvedName !== dep.rawName
42-
const versionPart = isAlias ? formatPackageId(dep.resolvedName, result) : result
42+
const isAlias = resolvedName !== rawName
43+
const versionPart = isAlias ? formatPackageId(resolvedName, result) : result
4344
return `${declaredProtocol}:${versionPart}`
4445
}

0 commit comments

Comments
 (0)