fix: check resolvedProtocol instead of isSupportedProtocol

Author: 9romise

src/providers/completion-item/version.ts

@@ -3,7 +3,7 @@ import { PRERELEASE_PATTERN } from '#constants'
 import { config } from '#state'
 import { getPackageInfo } from '#utils/api/package'
 import { offsetRangeToRange } from '#utils/ast'
-import { formatUpgradeVersion, isSupportedProtocol } from '#utils/version'
+import { formatUpgradeVersion } from '#utils/version'
 import { getResolvedDependencyByOffset } from '#utils/workspace'
 import { CompletionItem, CompletionItemKind } from 'vscode'
 
@@ -14,7 +14,7 @@ export class VersionCompletionItemProvider implements CompletionItemProvider {
     if (!info)
       return
 
-    if (!isSupportedProtocol(info.protocol))
+    if (info.resolvedProtocol !== 'npm')
       return
 
     const pkg = await getPackageInfo(info.resolvedName)

src/providers/document-link/npmx.ts

@@ -2,7 +2,6 @@ import type { DocumentLink, DocumentLinkProvider, TextDocument } from 'vscode'
 import { config } from '#state'
 import { offsetRangeToRange } from '#utils/ast'
 import { npmxPackageUrl } from '#utils/links'
-import { isSupportedProtocol } from '#utils/version'
 import { getResolvedDependencies } from '#utils/workspace'
 import { Uri, DocumentLink as VscodeDocumentLink } from 'vscode'
 
@@ -14,9 +13,11 @@ export class NpmxDocumentLinkProvider implements DocumentLinkProvider {
 
     const links: DocumentLink[] = []
     const linkMode = config.packageLinks
-    const supportedDeps = dependencies.filter((dep) => isSupportedProtocol(dep.protocol))
 
-    for (const dep of supportedDeps) {
+    for (const dep of dependencies) {
+      if (dep.resolvedProtocol !== 'npm')
+        continue
+
       const { resolvedName, resolvedSpec, nameRange } = dep
 
       let targetVersion: string | undefined

src/providers/hover/npmx.ts

@@ -1,9 +1,6 @@
 import type { HoverProvider, Position, TextDocument } from 'vscode'
 import { SPACER } from '#constants'
-import { getPackageInfo } from '#utils/api/package'
 import { jsrPackageUrl, npmxDocsUrl, npmxPackageUrl } from '#utils/links'
-import { isJsrNpmPackage, jsrNpmToJsrName } from '#utils/package'
-import { isSupportedProtocol } from '#utils/version'
 import { getResolvedDependencyByOffset } from '#utils/workspace'
 import { Hover, MarkdownString } from 'vscode'
 
@@ -14,43 +11,42 @@ export class NpmxHoverProvider implements HoverProvider {
     if (!dep)
       return
 
-    const { protocol, resolvedName, resolvedSpec } = dep
+    const { resolvedName, resolvedSpec, resolvedProtocol, packageInfo } = dep
 
-    if (protocol === 'jsr' || isJsrNpmPackage(resolvedName)) {
-      const jsrMd = new MarkdownString('', true)
-      jsrMd.isTrusted = true
+    switch (resolvedProtocol) {
+      case 'jsr': {
+        const jsrMd = new MarkdownString('', true)
+        jsrMd.isTrusted = true
 
-      const jsrName = jsrNpmToJsrName(resolvedName)
-      const jsrPackageLink = `[$(package)${SPACER}View on jsr.io](${jsrPackageUrl(jsrName)})`
-      jsrMd.appendMarkdown(`${jsrPackageLink} | $(warning) Not on npmx`)
-      return new Hover(jsrMd)
-    }
-
-    if (!isSupportedProtocol(protocol))
-      return
+        const jsrPackageLink = `[$(package)${SPACER}View on jsr.io](${jsrPackageUrl(resolvedName)})`
+        jsrMd.appendMarkdown(`${jsrPackageLink} | $(warning) Not on npmx`)
+        return new Hover(jsrMd)
+      }
+      case 'npm': {
+        const pkg = await packageInfo()
+        if (!pkg) {
+          const errorMd = new MarkdownString('', true)
 
-    const pkg = await getPackageInfo(resolvedName)
-    if (!pkg) {
-      const errorMd = new MarkdownString('', true)
+          errorMd.isTrusted = true
+          errorMd.appendMarkdown('$(warning) Unable to fetch package information')
 
-      errorMd.isTrusted = true
-      errorMd.appendMarkdown('$(warning) Unable to fetch package information')
+          return new Hover(errorMd)
+        }
 
-      return new Hover(errorMd)
-    }
-
-    const md = new MarkdownString('', true)
-    md.isTrusted = true
+        const md = new MarkdownString('', true)
+        md.isTrusted = true
 
-    const exactVersion = await dep.resolvedVersion()
-    if (exactVersion && pkg.versionsMeta[exactVersion]?.provenance)
-      md.appendMarkdown(`[$(verified)${SPACER}Verified provenance](${npmxPackageUrl(resolvedName, resolvedSpec)}#provenance)\n\n`)
+        const exactVersion = await dep.resolvedVersion()
+        if (exactVersion && pkg.versionsMeta[exactVersion]?.provenance)
+          md.appendMarkdown(`[$(verified)${SPACER}Verified provenance](${npmxPackageUrl(resolvedName, resolvedSpec)}#provenance)\n\n`)
 
-    const packageLink = `[$(package)${SPACER}View on npmx.dev](${npmxPackageUrl(resolvedName)})`
-    const docsLink = `[$(book)${SPACER}View docs on npmx.dev](${npmxDocsUrl(resolvedName, resolvedSpec)})`
+        const packageLink = `[$(package)${SPACER}View on npmx.dev](${npmxPackageUrl(resolvedName)})`
+        const docsLink = `[$(book)${SPACER}View docs on npmx.dev](${npmxDocsUrl(resolvedName, resolvedSpec)})`
 
-    md.appendMarkdown(`${packageLink} | ${docsLink}`)
+        md.appendMarkdown(`${packageLink} | ${docsLink}`)
 
-    return new Hover(md)
+        return new Hover(md)
+      }
+    }
   }
 }

src/utils/version.ts

@@ -1,12 +1,6 @@
-import type { DependencyProtocol, ResolvedDependencyInfo } from '#types/context'
+import type { ResolvedDependencyInfo } from '#types/context'
 import { formatPackageId } from './package'
 
-const UNSUPPORTED_PROTOCOLS = new Set<DependencyProtocol>(['workspace', 'catalog', 'jsr'])
-
-export function isSupportedProtocol(protocol: DependencyProtocol | null): boolean {
-  return !protocol || !UNSUPPORTED_PROTOCOLS.has(protocol)
-}
-
 const RANGE_PREFIXES = ['>=', '<=', '=', '>', '<']
 
 function getVersionRangePrefix(v: string): string {