Clear pnpvfs cache on test cleanup

Author: GGomez99

internal/testutil/harnessutil/harnessutil.go

@@ -212,6 +212,12 @@ func CompileFilesEx(
 	pnpApi := pnp.InitPnpApi(fs, currentDirectory)
 	if pnpApi != nil {
 		fs = pnpvfs.From(fs)
+		t.Cleanup(func() {
+			err := fs.(*pnpvfs.PnpFS).ClearCache()
+			if err != nil {
+				t.Errorf("Failed to clear PnP cache: %v", err)
+			}
+		})
 	}
 
 	fs = NewOutputRecorderFS(fs)

internal/vfs/pnpvfs/pnpvfs.go

@@ -13,24 +13,24 @@ import (
 	"github.com/microsoft/typescript-go/internal/vfs/iovfs"
 )
 
-type pnpFS struct {
+type PnpFS struct {
 	fs                  vfs.FS
 	cachedZipReadersMap map[string]*zip.ReadCloser
 	cacheReaderMutex    sync.Mutex
 }
 
-var _ vfs.FS = (*pnpFS)(nil)
+var _ vfs.FS = (*PnpFS)(nil)
 
-func From(fs vfs.FS) *pnpFS {
-	pnpFS := &pnpFS{
+func From(fs vfs.FS) *PnpFS {
+	pnpFS := &PnpFS{
 		fs:                  fs,
 		cachedZipReadersMap: make(map[string]*zip.ReadCloser),
 	}
 
 	return pnpFS
 }
 
-func (pnpFS *pnpFS) DirectoryExists(path string) bool {
+func (pnpFS *PnpFS) DirectoryExists(path string) bool {
 	path, _, _ = resolveVirtual(path)
 
 	if strings.HasSuffix(path, ".zip") {
@@ -42,7 +42,7 @@ func (pnpFS *pnpFS) DirectoryExists(path string) bool {
 	return fs.DirectoryExists(formattedPath)
 }
 
-func (pnpFS *pnpFS) FileExists(path string) bool {
+func (pnpFS *PnpFS) FileExists(path string) bool {
 	path, _, _ = resolveVirtual(path)
 
 	if strings.HasSuffix(path, ".zip") {
@@ -53,7 +53,7 @@ func (pnpFS *pnpFS) FileExists(path string) bool {
 	return fs.FileExists(formattedPath)
 }
 
-func (pnpFS *pnpFS) GetAccessibleEntries(path string) vfs.Entries {
+func (pnpFS *PnpFS) GetAccessibleEntries(path string) vfs.Entries {
 	path, hash, basePath := resolveVirtual(path)
 
 	fs, formattedPath, zipPath := getMatchingFS(pnpFS, path)
@@ -72,48 +72,48 @@ func (pnpFS *pnpFS) GetAccessibleEntries(path string) vfs.Entries {
 	return entries
 }
 
-func (pnpFS *pnpFS) ReadFile(path string) (contents string, ok bool) {
+func (pnpFS *PnpFS) ReadFile(path string) (contents string, ok bool) {
 	path, _, _ = resolveVirtual(path)
 
 	fs, formattedPath, _ := getMatchingFS(pnpFS, path)
 	return fs.ReadFile(formattedPath)
 }
 
-func (pnpFS *pnpFS) Chtimes(path string, mtime time.Time, atime time.Time) error {
+func (pnpFS *PnpFS) Chtimes(path string, mtime time.Time, atime time.Time) error {
 	path, _, _ = resolveVirtual(path)
 
 	fs, formattedPath, _ := getMatchingFS(pnpFS, path)
 	return fs.Chtimes(formattedPath, mtime, atime)
 }
 
-func (pnpFS *pnpFS) Realpath(path string) string {
+func (pnpFS *PnpFS) Realpath(path string) string {
 	path, hash, basePath := resolveVirtual(path)
 
 	fs, formattedPath, zipPath := getMatchingFS(pnpFS, path)
 	fullPath := zipPath + fs.Realpath(formattedPath)
 	return makeVirtualPath(basePath, hash, fullPath)
 }
 
-func (pnpFS *pnpFS) Remove(path string) error {
+func (pnpFS *PnpFS) Remove(path string) error {
 	path, _, _ = resolveVirtual(path)
 
 	fs, formattedPath, _ := getMatchingFS(pnpFS, path)
 	return fs.Remove(formattedPath)
 }
 
-func (pnpFS *pnpFS) Stat(path string) vfs.FileInfo {
+func (pnpFS *PnpFS) Stat(path string) vfs.FileInfo {
 	path, _, _ = resolveVirtual(path)
 
 	fs, formattedPath, _ := getMatchingFS(pnpFS, path)
 	return fs.Stat(formattedPath)
 }
 
-func (pnpFS *pnpFS) UseCaseSensitiveFileNames() bool {
+func (pnpFS *PnpFS) UseCaseSensitiveFileNames() bool {
 	// pnp fs is always case sensitive
 	return true
 }
 
-func (pnpFS *pnpFS) WalkDir(root string, walkFn vfs.WalkDirFunc) error {
+func (pnpFS *PnpFS) WalkDir(root string, walkFn vfs.WalkDirFunc) error {
 	root, hash, basePath := resolveVirtual(root)
 
 	fs, formattedPath, zipPath := getMatchingFS(pnpFS, root)
@@ -123,7 +123,7 @@ func (pnpFS *pnpFS) WalkDir(root string, walkFn vfs.WalkDirFunc) error {
 	}))
 }
 
-func (pnpFS *pnpFS) WriteFile(path string, data string, writeByteOrderMark bool) error {
+func (pnpFS *PnpFS) WriteFile(path string, data string, writeByteOrderMark bool) error {
 	path, _, _ = resolveVirtual(path)
 
 	fs, formattedPath, zipPath := getMatchingFS(pnpFS, path)
@@ -142,7 +142,7 @@ func splitZipPath(path string) (string, string) {
 	return parts[0] + ".zip", "/" + parts[1]
 }
 
-func getMatchingFS(pnpFS *pnpFS, path string) (vfs.FS, string, string) {
+func getMatchingFS(pnpFS *PnpFS, path string) (vfs.FS, string, string) {
 	if !tspath.IsZipPath(path) {
 		return pnpFS.fs, path, ""
 	}
@@ -233,3 +233,19 @@ func makeVirtualPath(basePath string, hash string, targetPath string) string {
 
 	return path.Join(basePath, hash, strconv.Itoa(depth), subPath)
 }
+
+func (pnpFS *PnpFS) ClearCache() error {
+	pnpFS.cacheReaderMutex.Lock()
+	defer pnpFS.cacheReaderMutex.Unlock()
+
+	for _, reader := range pnpFS.cachedZipReadersMap {
+		err := reader.Close()
+		if err != nil {
+			return err
+		}
+	}
+
+	pnpFS.cachedZipReadersMap = make(map[string]*zip.ReadCloser)
+
+	return nil
+}