Merge branch 'main' into resolve

# Conflicts:
#	src/index.ts

Author: 9romise

src/constants.ts

@@ -4,7 +4,6 @@ export const YARN_WORKSPACE_BASENAME = '.yarnrc.yml'
 
 export const SUPPORTED_DOCUMENT_PATTERN = `**/{${PACKAGE_JSON_BASENAME},${PNPM_WORKSPACE_BASENAME},${YARN_WORKSPACE_BASENAME}}`
 
-export const VERSION_TRIGGER_CHARACTERS = [':', '^', '~', '.', ...Array.from({ length: 10 }).map((_, i) => `${i}`)]
 export const PRERELEASE_PATTERN = /-.+/
 
 export const CACHE_TTL_ONE_DAY = 1000 * 60 * 60 * 24

src/index.ts

@@ -1,55 +1,22 @@
-import { SUPPORTED_DOCUMENT_PATTERN, VERSION_TRIGGER_CHARACTERS } from '#constants'
-import { defineExtension, useCommands, watchEffect } from 'reactive-vscode'
-import { languages } from 'vscode'
+import { defineExtension, useCommands } from 'reactive-vscode'
 import { openFileInNpmx } from './commands/open-file-in-npmx'
 import { openInBrowser } from './commands/open-in-browser'
 import { commands, displayName, version } from './generated-meta'
 import { useCodeActions } from './providers/code-actions'
-import { VersionCompletionItemProvider } from './providers/completion-item/version'
+import { useCompletionItem } from './providers/completion-item'
 import { useDiagnostics } from './providers/diagnostics'
-import { NpmxDocumentLinkProvider } from './providers/document-link/npmx'
-import { NpmxHoverProvider } from './providers/hover/npmx'
-import { config, logger } from './state'
-
-const documentFilter = { pattern: SUPPORTED_DOCUMENT_PATTERN }
+import { useDocumentLink } from './providers/document-link'
+import { useHover } from './providers/hover'
+import { logger } from './state'
 
 export const { activate, deactivate } = defineExtension(() => {
   logger.info(`${displayName} Activated, v${version}`)
 
-  watchEffect((onCleanup) => {
-    if (!config.hover.enabled)
-      return
-
-    const disposable = languages.registerHoverProvider(documentFilter, new NpmxHoverProvider())
-
-    onCleanup(() => disposable.dispose())
-  })
-
-  watchEffect((onCleanup) => {
-    if (config.completion.version === 'off')
-      return
-
-    const disposable = languages.registerCompletionItemProvider(
-      documentFilter,
-      new VersionCompletionItemProvider(),
-      ...VERSION_TRIGGER_CHARACTERS,
-    )
-
-    onCleanup(() => disposable.dispose())
-  })
-
-  watchEffect((onCleanup) => {
-    if (config.packageLinks === 'off')
-      return
-
-    const disposable = languages.registerDocumentLinkProvider(documentFilter, new NpmxDocumentLinkProvider())
-
-    onCleanup(() => disposable.dispose())
-  })
-
   useDiagnostics()
-
   useCodeActions()
+  useHover()
+  useCompletionItem()
+  useDocumentLink()
 
   useCommands({
     [commands.openInBrowser]: openInBrowser,

src/providers/completion-item/index.ts

@@ -0,0 +1,22 @@
+import { SUPPORTED_DOCUMENT_PATTERN } from '#constants'
+import { config } from '#state'
+import { watchEffect } from 'reactive-vscode'
+import { languages } from 'vscode'
+import { VersionCompletionItemProvider } from './version'
+
+export const VERSION_TRIGGER_CHARACTERS = [':', '^', '~', '.', ...Array.from({ length: 10 }).map((_, i) => `${i}`)]
+
+export function useCompletionItem() {
+  watchEffect((onCleanup) => {
+    if (!config.hover.enabled)
+      return
+
+    const disposable = languages.registerCompletionItemProvider(
+      { pattern: SUPPORTED_DOCUMENT_PATTERN },
+      new VersionCompletionItemProvider(),
+      ...VERSION_TRIGGER_CHARACTERS,
+    )
+
+    onCleanup(() => disposable.dispose())
+  })
+}

src/providers/document-link/index.ts

@@ -0,0 +1,16 @@
+import { SUPPORTED_DOCUMENT_PATTERN } from '#constants'
+import { config } from '#state'
+import { watchEffect } from 'reactive-vscode'
+import { languages } from 'vscode'
+import { NpmxDocumentLinkProvider } from './npmx'
+
+export function useDocumentLink() {
+  watchEffect((onCleanup) => {
+    if (config.packageLinks === 'off')
+      return
+
+    const disposable = languages.registerDocumentLinkProvider({ pattern: SUPPORTED_DOCUMENT_PATTERN }, new NpmxDocumentLinkProvider())
+
+    onCleanup(() => disposable.dispose())
+  })
+}

src/providers/hover/index.ts

@@ -0,0 +1,16 @@
+import { SUPPORTED_DOCUMENT_PATTERN } from '#constants'
+import { config } from '#state'
+import { watchEffect } from 'reactive-vscode'
+import { languages } from 'vscode'
+import { NpmxHoverProvider } from './npmx'
+
+export function useHover() {
+  watchEffect((onCleanup) => {
+    if (!config.hover.enabled)
+      return
+
+    const disposable = languages.registerHoverProvider({ pattern: SUPPORTED_DOCUMENT_PATTERN }, new NpmxHoverProvider())
+
+    onCleanup(() => disposable.dispose())
+  })
+}

src/utils/workspace.ts

@@ -66,12 +66,14 @@ function createResolvedDependencyInfo(
   }
 }
 
-async function createWorkspaceContext(folder: WorkspaceFolder): Promise<WorkspaceContextState> {
+export const getWorkspaceContextState = memoize<Uri, Promise<WorkspaceContextState | undefined>>(async (uri) => {
+  const folder = workspace.getWorkspaceFolder(uri)
+  if (!folder)
+    return
+
   const workspacePath = folder.uri.path
   const packageManager = await detectPackageManager(folder)
 
-  logger.info(`[workspace-context] built ${workspacePath}`)
-
   const loadWorkspaceCatalogInfo = memoize(async (uri: Uri): Promise<WithResolvedDependencyInfo<WorkspaceCatalogInfo> | undefined> => {
     const path = uri.path
 
@@ -96,6 +98,8 @@ async function createWorkspaceContext(folder: WorkspaceFolder): Promise<Workspac
     ? undefined
     : (await loadWorkspaceCatalogInfo(folder.uri))?.catalogs
 
+  logger.info(`[workspace-context] built ${workspacePath}`)
+
   return {
     folder,
     workspaceContext: {
@@ -119,24 +123,12 @@ async function createWorkspaceContext(folder: WorkspaceFolder): Promise<Workspac
     }, { ttl: false, maxSize: Number.POSITIVE_INFINITY, fallbackToCachedOnError: false }),
     loadWorkspaceCatalogInfo,
   }
-}
-
-export const getWorkspaceContextState = memoize<Uri, Promise<WorkspaceContextState | undefined>>(async (uri) => {
-  const folder = workspace.getWorkspaceFolder(uri)
-  if (!folder)
-    return
-
-  return createWorkspaceContext(folder)
 }, {
   getKey: (uri: Uri) => workspace.getWorkspaceFolder(uri)!.uri.path,
   ttl: false,
   fallbackToCachedOnError: false,
 })
 
-export function deleteWorkspaceContextState(workspacePath: string) {
-  getWorkspaceContextState.deleteByKey(workspacePath)
-}
-
 export async function getResolvedDependencies(uri: Uri): Promise<ResolvedDependencyInfo[] | undefined> {
   const state = await getWorkspaceContextState(uri)
   if (!state)

tests/diagnostics/context.ts

@@ -2,6 +2,7 @@ import type { PackageInfo } from '#utils/api/package'
 import type { Engines } from 'fast-npm-meta'
 import type { DiagnosticContext } from '../../src/providers/diagnostics'
 import { resolveDependencySpec } from '#utils/dependency'
+import { Uri } from 'vscode'
 
 interface CreateContextOptions {
   name: string
@@ -32,5 +33,5 @@ export function createContext(options: CreateContextOptions): DiagnosticContext
     resolvedVersion: async () => '',
     packageInfo: async () => (pkg),
   }
-  return { uri, dep, pkg }
+  return { uri: Uri.file('package.json'), dep, pkg }
 }