@atlaspack/cache 3.1.1-canary.124 → 3.1.1-canary.126

package/lib/LMDBLiteCache.js

@@ -26,13 +26,6 @@ function _rust() {
   };
   return data;
 }
-function _fs() {
-  const data = _interopRequireDefault(require("fs"));
-  _fs = function () {
-    return data;
-  };
-  return data;
-}
 function _ncp() {
   const data = _interopRequireDefault(require("ncp"));
   _ncp = function () {
@@ -61,9 +54,9 @@ function _path() {
   };
   return data;
 }
-function _fs2() {
+function _fs() {
   const data = require("@atlaspack/fs");
-  _fs2 = function () {
+  _fs = function () {
     return data;
   };
   return data;
@@ -128,7 +121,7 @@ class LMDBLiteCache {
    */
 
   constructor(cacheDir) {
-    this.fs = new (_fs2().NodeFS)();
+    this.fs = new (_fs().NodeFS)();
     this.dir = cacheDir;
     this.cacheFilesDirectory = _path().default.join(cacheDir, 'files');
     this.fsCache = new _FSCache.FSCache(this.fs, cacheDir);
@@ -177,17 +170,15 @@ class LMDBLiteCache {
     if (!(0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
       return this.fs.createReadStream(_path().default.join(this.dir, key));
     }
-    return _fs().default.createReadStream(this.getFileKey(key));
+    return this.fs.createReadStream(this.getFileKey(key));
   }
   async setStream(key, stream) {
     if (!(0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
       return pipeline(stream, this.fs.createWriteStream(_path().default.join(this.dir, key)));
     }
     const filePath = this.getFileKey(key);
-    await _fs().default.promises.mkdir(_path().default.dirname(filePath), {
-      recursive: true
-    });
-    return pipeline(stream, _fs().default.createWriteStream(filePath));
+    await this.fs.mkdirp(_path().default.dirname(filePath));
+    return pipeline(stream, this.fs.createWriteStream(filePath));
   }
 
   // eslint-disable-next-line require-await
@@ -211,23 +202,21 @@ class LMDBLiteCache {
     if (!(0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
       return this.fsCache.hasLargeBlob(key);
     }
-    return _fs().default.promises.access(this.getFileKey(key), _fs().default.constants.F_OK).then(() => true).catch(() => false);
+    return this.fs.exists(this.getFileKey(key));
   }
   getLargeBlob(key) {
     if (!(0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
       return this.fsCache.getLargeBlob(key);
     }
-    return _fs().default.promises.readFile(this.getFileKey(key));
+    return this.fs.readFile(this.getFileKey(key));
   }
   async setLargeBlob(key, contents, options) {
     if (!(0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
       return this.fsCache.setLargeBlob(key, contents, options);
     }
     const targetPath = this.getFileKey(key);
-    await _fs().default.promises.mkdir(_path().default.dirname(targetPath), {
-      recursive: true
-    });
-    return _fs().default.promises.writeFile(targetPath, contents);
+    await this.fs.mkdirp(_path().default.dirname(targetPath));
+    return this.fs.writeFile(targetPath, contents);
   }
 
   /**
@@ -243,10 +232,8 @@ class LMDBLiteCache {
     return this.store.keys();
   }
   async compact(targetPath) {
-    await _fs().default.promises.mkdir(targetPath, {
-      recursive: true
-    });
-    const files = await _fs().default.promises.readdir(this.dir);
+    await this.fs.mkdirp(targetPath);
+    const files = await this.fs.readdir(this.dir);
     // copy all files except data.mdb and lock.mdb to the target path (recursive)
     for (const file of files) {
       const filePath = _path().default.join(this.dir, file);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@atlaspack/cache",
   "description": "Interface for defining caches and file-system, IDB and LMDB implementations.",
-  "version": "3.1.1-canary.124+c4415a455",
+  "version": "3.1.1-canary.126+c9631aff2",
   "license": "(MIT OR Apache-2.0)",
   "type": "commonjs",
   "publishConfig": {
@@ -23,12 +23,12 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.3-canary.192+c4415a455",
-    "@atlaspack/feature-flags": "2.14.1-canary.192+c4415a455",
-    "@atlaspack/fs": "2.14.5-canary.124+c4415a455",
-    "@atlaspack/logger": "2.14.5-canary.124+c4415a455",
-    "@atlaspack/rust": "3.2.1-canary.124+c4415a455",
-    "@atlaspack/utils": "2.14.5-canary.124+c4415a455",
+    "@atlaspack/build-cache": "2.13.3-canary.194+c9631aff2",
+    "@atlaspack/feature-flags": "2.14.1-canary.194+c9631aff2",
+    "@atlaspack/fs": "2.14.5-canary.126+c9631aff2",
+    "@atlaspack/logger": "2.14.5-canary.126+c9631aff2",
+    "@atlaspack/rust": "3.2.1-canary.126+c9631aff2",
+    "@atlaspack/utils": "2.14.5-canary.126+c9631aff2",
     "ncp": "^2.0.0"
   },
   "devDependencies": {
@@ -37,5 +37,5 @@
   "browser": {
     "./src/IDBCache.js": "./src/IDBCache.browser.js"
   },
-  "gitHead": "c4415a455543d984ca28452c2cb87a794d22497c"
+  "gitHead": "c9631aff284b2c1c27e8a52f9da392ce65d666e8"
 }

package/src/LMDBLiteCache.js

@@ -10,7 +10,6 @@ import {Lmdb} from '@atlaspack/rust';
 import type {FilePath} from '@atlaspack/types';
 import type {Cache} from './types';
 import type {Readable, Writable} from 'stream';
-import fs from 'fs';
 import ncp from 'ncp';
 import {promisify} from 'util';
 import stream from 'stream';
@@ -168,7 +167,7 @@ export class LMDBLiteCache implements Cache {
       return this.fs.createReadStream(path.join(this.dir, key));
     }
 
-    return fs.createReadStream(this.getFileKey(key));
+    return this.fs.createReadStream(this.getFileKey(key));
   }
 
   async setStream(key: string, stream: Readable): Promise<void> {
@@ -180,8 +179,8 @@ export class LMDBLiteCache implements Cache {
     }
 
     const filePath = this.getFileKey(key);
-    await fs.promises.mkdir(path.dirname(filePath), {recursive: true});
-    return pipeline(stream, fs.createWriteStream(filePath));
+    await this.fs.mkdirp(path.dirname(filePath));
+    return pipeline(stream, this.fs.createWriteStream(filePath));
   }
 
   // eslint-disable-next-line require-await
@@ -210,17 +209,14 @@ export class LMDBLiteCache implements Cache {
       return this.fsCache.hasLargeBlob(key);
     }
 
-    return fs.promises
-      .access(this.getFileKey(key), fs.constants.F_OK)
-      .then(() => true)
-      .catch(() => false);
+    return this.fs.exists(this.getFileKey(key));
   }
 
   getLargeBlob(key: string): Promise<Buffer> {
     if (!getFeatureFlag('cachePerformanceImprovements')) {
       return this.fsCache.getLargeBlob(key);
     }
-    return fs.promises.readFile(this.getFileKey(key));
+    return this.fs.readFile(this.getFileKey(key));
   }
 
   async setLargeBlob(
@@ -233,8 +229,8 @@ export class LMDBLiteCache implements Cache {
     }
 
     const targetPath = this.getFileKey(key);
-    await fs.promises.mkdir(path.dirname(targetPath), {recursive: true});
-    return fs.promises.writeFile(targetPath, contents);
+    await this.fs.mkdirp(path.dirname(targetPath));
+    return this.fs.writeFile(targetPath, contents);
   }
 
   /**
@@ -253,9 +249,9 @@ export class LMDBLiteCache implements Cache {
   }
 
   async compact(targetPath: string): Promise<void> {
-    await fs.promises.mkdir(targetPath, {recursive: true});
+    await this.fs.mkdirp(targetPath);
 
-    const files = await fs.promises.readdir(this.dir);
+    const files = await this.fs.readdir(this.dir);
     // copy all files except data.mdb and lock.mdb to the target path (recursive)
     for (const file of files) {
       const filePath = path.join(this.dir, file);