refactor: use ocache's built-in invalidate API (#85)

* refactor: use ocache's built-in invalidate API

* update

Author: 9romise

extensions/vscode/src/composables/workspace-context.ts

@@ -1,5 +1,5 @@
 import type { Uri } from 'vscode'
-import { deleteWorkspaceContextCache, getWorkspaceContext } from '#core/workspace'
+import { getWorkspaceContext } from '#core/workspace'
 import { logger } from '#state'
 import { SUPPORTED_DOCUMENT_PATTERN } from '#utils/constants'
 import { PACKAGE_JSON_BASENAME } from 'npmx-language-core/constants'
@@ -10,8 +10,7 @@ import { window, workspace } from 'vscode'
 export function useWorkspaceContext() {
   useDisposable(workspace.onDidChangeWorkspaceFolders(({ removed }) => {
     removed.forEach((folder) => {
-      deleteWorkspaceContextCache(folder)
-      logger.info(`[workspace-context] delete workspace folder cache: ${folder.uri.path}`)
+      getWorkspaceContext.invalidate(folder.uri)
     })
   }))
 
@@ -23,7 +22,7 @@ export function useWorkspaceContext() {
     if (!ctx)
       return
 
-    ctx.invalidateDependencyInfo(uri)
+    await ctx.invalidateDependencyInfo(uri)
     logger.info(`[workspace-context] invalidate dependencies cache: ${uri.path}`)
     if (reload) {
       const folderPath = ctx!.folder.uri.path

extensions/vscode/src/core/workspace.ts

@@ -50,7 +50,6 @@ class WorkspaceContext {
   packageManager: PackageManager = 'npm'
   workspaceFileUri?: Uri
   #catalogs?: PromiseWithResolvers<CatalogsInfo | undefined>
-  #invalidatedPaths = new Set<string>()
 
   private constructor(folder: WorkspaceFolder) {
     this.folder = folder
@@ -74,7 +73,7 @@ class WorkspaceContext {
       this.workspaceFileUri = Uri.joinPath(this.folder.uri, workspaceFilename)
       this.#catalogs.resolve(
         await accessOk(this.workspaceFileUri)
-          ? (await this.loadWorkspaceCatalogInfo(this.workspaceFileUri))?.catalogs
+          ? (await this.loadWorkspaceFileInfo(this.workspaceFileUri))?.catalogs
           : undefined,
       )
     } else {
@@ -87,12 +86,6 @@ class WorkspaceContext {
     maxAge: 0,
     swr: false,
     staleMaxAge: 0,
-    shouldInvalidateCache: (uri) => this.#invalidatedPaths.delete(uri.path),
-  }
-
-  invalidateDependencyInfo(uri: Uri) {
-    const path = uri.path
-    this.#invalidatedPaths.add(path)
   }
 
   async getCatalogs(): Promise<CatalogsInfo | undefined> {
@@ -154,7 +147,7 @@ class WorkspaceContext {
     }
   }, this.#cacheOptions)
 
-  loadWorkspaceCatalogInfo = defineCachedFunction<
+  loadWorkspaceFileInfo = defineCachedFunction<
     WithDependencyInfo<WorkspaceCatalogInfo> | undefined,
     [Uri]
   >(async (uri) => {
@@ -178,37 +171,33 @@ class WorkspaceContext {
       dependencies: info.dependencies.map((dep) => this.#createResolvedDependencyInfo(dep)),
     }
   }, this.#cacheOptions)
-}
 
-const invalidatedFolderPaths = new Set<string>()
+  async invalidateDependencyInfo(uri: Uri) {
+    if (isPackageManifest(uri.path))
+      await this.loadPackageManifestInfo.invalidate(uri)
+    else if (isWorkspaceFile(uri.path))
+      await this.loadWorkspaceFileInfo.invalidate(uri)
+  }
+}
 
-const getWorkspaceContextByFolder = defineCachedFunction<
+export const getWorkspaceContext = defineCachedFunction<
   WorkspaceContext | undefined,
-  [WorkspaceFolder]
-> (async (folder) => {
+  [Uri]
+>(async (uri) => {
+  const folder = workspace.getWorkspaceFolder(uri)
+  if (!folder)
+    return
+
   logger.info(`[workspace-context] built ${folder.uri.path}`)
   return await WorkspaceContext.create(folder)
 }, {
   name: 'workspace-context',
-  getKey: (folder) => folder.uri.path,
+  getKey: (uri) => workspace.getWorkspaceFolder(uri)?.uri.path ?? '',
   swr: false,
   maxAge: 0,
   staleMaxAge: 0,
-  shouldInvalidateCache: (folder) => invalidatedFolderPaths.delete(folder.uri.path),
 })
 
-export function deleteWorkspaceContextCache(folder: WorkspaceFolder) {
-  invalidatedFolderPaths.add(folder.uri.path)
-}
-
-export async function getWorkspaceContext(uri: Uri) {
-  const folder = workspace.getWorkspaceFolder(uri)
-  if (!folder)
-    return
-
-  return await getWorkspaceContextByFolder(folder)
-}
-
 export async function getResolvedDependencies(uri: Uri): Promise<DependencyInfo[] | undefined> {
   const ctx = await getWorkspaceContext(uri)
   if (!ctx)
@@ -217,7 +206,7 @@ export async function getResolvedDependencies(uri: Uri): Promise<DependencyInfo[
   return (
     isPackageManifest(uri.path)
       ? await ctx.loadPackageManifestInfo(uri)
-      : await ctx.loadWorkspaceCatalogInfo(uri)
+      : await ctx.loadWorkspaceFileInfo(uri)
   )?.dependencies
 }
 

extensions/vscode/src/providers/definition/catalog.ts

@@ -15,11 +15,11 @@ export class CatalogDefinitionProvider implements DefinitionProvider {
     if (!ctx?.workspaceFileUri)
       return
 
-    const catalogInfo = await ctx.loadWorkspaceCatalogInfo(ctx.workspaceFileUri)
-    if (!catalogInfo)
+    const dependencies = (await ctx.loadWorkspaceFileInfo(ctx.workspaceFileUri))?.dependencies
+    if (!dependencies)
       return
 
-    const target = catalogInfo.dependencies.find(
+    const target = dependencies.find(
       (dep) =>
         dep.rawName === info.resolvedName
         && dep.categoryName != null && info.categoryName != null

pnpm-lock.yaml

@@ -20,7 +20,7 @@ catalogs:
   inline:
     fast-npm-meta: ^1.4.2
     jsonc-parser: ^3.3.1
-    ocache: ^0.1.2
+    ocache: ^0.1.4
     ofetch: ^2.0.0-alpha.3
     pathe: ^2.0.3
     perfect-debounce: ^2.1.0