fix: watch files change, more logs

Author: 9romise

src/composables/workspace-context.ts

@@ -0,0 +1,42 @@
+import type { Uri } from 'vscode'
+import { SUPPORTED_DOCUMENT_PATTERN } from '#constants'
+import { isSupportedDependencyDocument } from '#extractors'
+import { logger } from '#state'
+import { getWorkspaceContextState } from '#utils/workspace'
+import { useActiveTextEditor, useDocumentText, useFileSystemWatcher, watch } from 'reactive-vscode'
+import { workspace } from 'vscode'
+
+export function useWorkspaceContext() {
+  workspace.onDidChangeWorkspaceFolders(({ removed }) => {
+    removed.forEach((folder) => {
+      getWorkspaceContextState.delete(folder.uri)
+      logger.info(`[workspace-context] delete workspace folder cache: ${folder.uri.path}`)
+    })
+  })
+
+  async function deleteCacheByUri(uri: Uri) {
+    const ctx = await getWorkspaceContextState(uri)
+    if (!ctx)
+      return
+
+    ctx.loadPackageManifestInfo.delete(uri)
+    ctx.loadWorkspaceCatalogInfo.delete(uri)
+    logger.info(`[workspace-context] delete cache: ${uri.path}`)
+  }
+
+  const activeEditor = useActiveTextEditor()
+  const activeDocumentText = useDocumentText(() => activeEditor.value?.document)
+
+  watch(activeDocumentText, async () => {
+    const document = activeEditor.value?.document
+    if (!document || !isSupportedDependencyDocument(document))
+      return
+
+    deleteCacheByUri(document.uri)
+  }, { flush: 'pre' })
+
+  const { onDidChange, onDidDelete } = useFileSystemWatcher(SUPPORTED_DOCUMENT_PATTERN)
+
+  onDidChange(deleteCacheByUri)
+  onDidDelete(deleteCacheByUri)
+}

src/index.ts

@@ -1,3 +1,4 @@
+import { useWorkspaceContext } from '#composables/workspace-context'
 import { defineExtension, useCommands } from 'reactive-vscode'
 import { openFileInNpmx } from './commands/open-file-in-npmx'
 import { openInBrowser } from './commands/open-in-browser'
@@ -12,6 +13,8 @@ import { logger } from './state'
 export const { activate, deactivate } = defineExtension(() => {
   logger.info(`${displayName} Activated, v${version}`)
 
+  useWorkspaceContext()
+
   useDiagnostics()
   useCodeActions()
   useHover()

src/providers/completion-item/version.ts

@@ -1,7 +1,6 @@
 import type { CompletionItemProvider, Position, TextDocument } from 'vscode'
 import { PRERELEASE_PATTERN } from '#constants'
 import { config } from '#state'
-import { getPackageInfo } from '#utils/api/package'
 import { offsetRangeToRange } from '#utils/ast'
 import { formatUpgradeVersion } from '#utils/version'
 import { getResolvedDependencyByOffset } from '#utils/workspace'
@@ -17,7 +16,7 @@ export class VersionCompletionItemProvider implements CompletionItemProvider {
     if (info.resolvedProtocol !== 'npm')
       return
 
-    const pkg = await getPackageInfo(info.resolvedName)
+    const pkg = await info.packageInfo()
     if (!pkg)
       return
 

src/providers/diagnostics/index.ts

@@ -8,7 +8,7 @@ import { config, logger } from '#state'
 import { offsetRangeToRange } from '#utils/ast'
 import { getResolvedDependencies } from '#utils/workspace'
 import { debounce } from 'perfect-debounce'
-import { computed, useActiveTextEditor, useDisposable, useDocumentText, useFileSystemWatcher, watch } from 'reactive-vscode'
+import { computed, nextTick, useActiveTextEditor, useDisposable, useDocumentText, useFileSystemWatcher, watch } from 'reactive-vscode'
 import { languages, TabInputText, window, workspace } from 'vscode'
 import { displayName } from '../../generated-meta'
 import { checkDeprecation } from './rules/deprecation'
@@ -57,6 +57,7 @@ export function useDiagnostics() {
   }
 
   async function collectDiagnostics(document: TextDocument) {
+    await nextTick()
     logger.info(`[diagnostics] collect: ${document.uri.path}`)
     diagnosticCollection.set(document.uri, [])
 

src/providers/document-link/npmx.ts

@@ -1,12 +1,13 @@
 import type { DocumentLink, DocumentLinkProvider, TextDocument } from 'vscode'
-import { config } from '#state'
+import { config, logger } from '#state'
 import { offsetRangeToRange } from '#utils/ast'
 import { npmxPackageUrl } from '#utils/links'
 import { getResolvedDependencies } from '#utils/workspace'
 import { Uri, DocumentLink as VscodeDocumentLink } from 'vscode'
 
 export class NpmxDocumentLinkProvider implements DocumentLinkProvider {
   async provideDocumentLinks(document: TextDocument): Promise<DocumentLink[]> {
+    logger.info('[document-link] set document links')
     const dependencies = await getResolvedDependencies(document.uri)
     if (!dependencies)
       return []

src/utils/memoize.ts

@@ -20,7 +20,7 @@ type MemoizeReturn<R> = R extends Promise<infer V> ? Promise<V | undefined> : R
 
 export interface MemoizedFunction<P, V> {
   (params: P): MemoizeReturn<V>
-  deleteByKey: (key: MemoizeKey) => void
+  delete: (params: P) => void
 }
 
 export function memoize<P, V>(fn: (params: P) => V, options: MemoizeOptions<P> = {}): MemoizedFunction<P, V> {
@@ -77,12 +77,6 @@ export function memoize<P, V>(fn: (params: P) => V, options: MemoizeOptions<P> =
     })
   }
 
-  function deleteByKey(key: MemoizeKey): void {
-    cache.delete(key)
-    pending.delete(key)
-    versions.set(key, getVersion(key) + 1)
-  }
-
   const cachedFn = function cachedFn(params: P) {
     const key = getKey(params)
     const keyVersion = getVersion(key)
@@ -121,7 +115,12 @@ export function memoize<P, V>(fn: (params: P) => V, options: MemoizeOptions<P> =
     }
   } as MemoizedFunction<P, V>
 
-  cachedFn.deleteByKey = deleteByKey
+  cachedFn.delete = (p: P) => {
+    const key = getKey(p)
+    cache.delete(key)
+    pending.delete(key)
+    versions.set(key, getVersion(key) + 1)
+  }
 
   return cachedFn
 }

src/utils/workspace.ts

@@ -42,10 +42,11 @@ function createResolvedDependencyInfo(
   catalogs?: CatalogsInfo,
 ): ResolvedDependencyInfo {
   const resolution = resolveDependencySpec(dependency.rawName, dependency.rawSpec, catalogs)
+
   const packageInfo = lazyInit(
-    () => resolution.resolvedProtocol === 'npm'
-      ? getPackageInfo(resolution.resolvedName).then((pkg) => pkg ?? null)
-      : Promise.resolve(null),
+    async () => resolution.resolvedProtocol === 'npm'
+      ? await getPackageInfo(resolution.resolvedName) ?? null
+      : null,
   )
 
   return {
@@ -75,6 +76,7 @@ export const getWorkspaceContextState = memoize<Uri, Promise<WorkspaceContextSta
 
   const loadWorkspaceCatalogInfo = memoize(async (uri: Uri): Promise<WithResolvedDependencyInfo<WorkspaceCatalogInfo> | undefined> => {
     const path = uri.path
+    logger.info(`[workspace-context] load workspace catalog info: ${path}`)
 
     for (const entry of workspaceCatalogExtractorEntries) {
       if (!path.endsWith(`/${entry.basename}`))
@@ -91,7 +93,7 @@ export const getWorkspaceContextState = memoize<Uri, Promise<WorkspaceContextSta
         dependencies: info.dependencies.map((dependency) => createResolvedDependencyInfo(dependency)),
       }
     }
-  }, { ttl: false, maxSize: Number.POSITIVE_INFINITY, fallbackToCachedOnError: false })
+  }, { getKey: (uri) => uri.path, ttl: false, maxSize: Number.POSITIVE_INFINITY, fallbackToCachedOnError: false })
 
   let catalogs: CatalogsInfo | undefined
 
@@ -115,6 +117,7 @@ export const getWorkspaceContextState = memoize<Uri, Promise<WorkspaceContextSta
       if (!isPackageManifestPath(uri.path))
         return
 
+      logger.info(`[workspace-context] load package manifest info: ${uri.path}`)
       const text = await getDocumentText(uri)
 
       const info = packageManifestExtractorEntry.extractor.getPackageManifestInfo(text)
@@ -125,7 +128,7 @@ export const getWorkspaceContextState = memoize<Uri, Promise<WorkspaceContextSta
         ...info,
         dependencies: info.dependencies.map((dependency) => createResolvedDependencyInfo(dependency, catalogs)),
       }
-    }, { ttl: false, maxSize: Number.POSITIVE_INFINITY, fallbackToCachedOnError: false }),
+    }, { getKey: (uri) => uri.path, ttl: false, maxSize: Number.POSITIVE_INFINITY, fallbackToCachedOnError: false }),
     loadWorkspaceCatalogInfo,
   }
 }, {

tests/utils/memoize.test.ts

@@ -115,7 +115,7 @@ describe('memoize', () => {
     const memoized = memoize(fn, { ttl: 0 })
 
     const stalePromise = memoized('key')
-    memoized.deleteByKey('key')
+    memoized.delete('key')
     const freshPromise = memoized('key')
 
     expect(fn).toHaveBeenCalledTimes(2)