move fileSources to libzip impl

Author: goloveychuk

.pnp.cjs

@@ -109,12 +109,6 @@ export class ZipFS extends BasePortableFakeFS {
   private readonly listings: Map<PortablePath, Set<Filename>> = new Map();
   private readonly entries: Map<PortablePath, number> = new Map();
 
-  /**
-   * A cache of indices mapped to file sources.
-   * Populated by `setFileSource` calls.
-   * Required for supporting read after write.
-   */
-  private readonly fileSources: Map<number, Buffer> = new Map();
 
   private symlinkCount: number;
 
@@ -742,8 +736,6 @@ export class ZipFS extends BasePortableFakeFS {
     if (typeof entry === `undefined`)
       return;
 
-    this.fileSources.delete(entry);
-
     if (this.isSymbolicLink(entry)) {
       this.symlinkCount--;
     }
@@ -827,7 +819,6 @@ export class ZipFS extends BasePortableFakeFS {
     }
 
     const newIndex = this.zipImpl.setFileSource(target, compression, buffer);
-    this.fileSources.set(newIndex, buffer);
 
     return newIndex;
   }
@@ -851,13 +842,8 @@ export class ZipFS extends BasePortableFakeFS {
   private getFileSource(index: number, opts: {asyncDecompress: true}): Promise<Buffer>;
   private getFileSource(index: number, opts: {asyncDecompress: boolean}): Promise<Buffer> | Buffer;
   private getFileSource(index: number, opts: {asyncDecompress: boolean} = {asyncDecompress: false}): Promise<Buffer> | Buffer {
-    const cachedFileSource = this.fileSources.get(index);
-    if (typeof cachedFileSource !== `undefined`)
-      return cachedFileSource;
-
     const {data, compressionMethod} = this.zipImpl.getFileSource(index);
     if (compressionMethod === STORE) {
-      this.fileSources.set(index, data);
       return data;
     } else if (compressionMethod === DEFLATE) {
       if (opts.asyncDecompress) {
@@ -866,15 +852,12 @@ export class ZipFS extends BasePortableFakeFS {
             if (error) {
               reject(error);
             } else {
-              this.fileSources.set(index, result);
               resolve(result);
             }
           });
         });
       } else {
-        const decompressedData = zlib.inflateRawSync(data);
-        this.fileSources.set(index, decompressedData);
-        return decompressedData;
+        return zlib.inflateRawSync(data);
       }
     } else {
       throw new Error(`Unsupported compression method: ${compressionMethod}`);

packages/yarnpkg-libzip/sources/ZipFS.ts

@@ -21,6 +21,13 @@ export class LibZipImpl implements ZipImpl {
   private readonly lzSource: number;
   private readonly zip: number;
 
+  /**
+   * A cache of indices mapped to file sources.
+   * Populated by `setFileSource` calls.
+   * Required for supporting read after write.
+   */
+  private readonly fileSources: Map<number, Buffer> = new Map();
+
   private readonly listings: Array<string>;
   private readonly symlinkCount: number;
 
@@ -120,6 +127,7 @@ export class LibZipImpl implements ZipImpl {
           throw this.makeLibzipError(this.libzip.getError(this.zip));
         }
       }
+      this.fileSources.set(newIndex, buffer);
       return newIndex;
     } catch (error) {
       this.libzip.source.free(lzSource);
@@ -156,6 +164,10 @@ export class LibZipImpl implements ZipImpl {
   }
 
   getFileSource(index: number) {
+    const cachedFileSource = this.fileSources.get(index);
+    if (typeof cachedFileSource !== `undefined`)
+      return {data: cachedFileSource, compressionMethod: 0};
+
     const stat = this.libzip.struct.statS();
 
     const rc = this.libzip.statIndex(this.zip, index, 0, 0, stat);
@@ -194,6 +206,7 @@ export class LibZipImpl implements ZipImpl {
   }
 
   deleteEntry(index: number) {
+    this.fileSources.delete(index);
     const rc = this.libzip.delete(this.zip, index);
     if (rc === -1) {
       throw this.makeLibzipError(this.libzip.getError(this.zip));