@atlaspack/cache 3.2.48 → 3.2.50

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @atlaspack/cache
 
+## 3.2.50
+
+### Patch Changes
+
+- [#1035](https://github.com/atlassian-labs/atlaspack/pull/1035) [`936209f`](https://github.com/atlassian-labs/atlaspack/commit/936209f3c6c201288720dd62b61e1f538368268c) Thanks [@marcins](https://github.com/marcins)! - Remove `cachePerformanceImprovements` feature flag
+
+- Updated dependencies [[`06bb8c1`](https://github.com/atlassian-labs/atlaspack/commit/06bb8c14657722658c55283835f23ed7e7c6ecb4), [`a2d8e7a`](https://github.com/atlassian-labs/atlaspack/commit/a2d8e7a2444a1d6502239de8b8ceab4227270ec7), [`f9aec27`](https://github.com/atlassian-labs/atlaspack/commit/f9aec2736d27afa7a1f2a9701d46e29e566ab352), [`ecf8b79`](https://github.com/atlassian-labs/atlaspack/commit/ecf8b7931c5516df2117d525cefff5d7e1d20bee), [`93ec107`](https://github.com/atlassian-labs/atlaspack/commit/93ec10729ad5a328b4320955357339746cd472f3), [`a2c5747`](https://github.com/atlassian-labs/atlaspack/commit/a2c574770d2e616576e817801842576ead072532), [`f216e22`](https://github.com/atlassian-labs/atlaspack/commit/f216e227e0aca8a3944f66267d3f75238c732802), [`e88b258`](https://github.com/atlassian-labs/atlaspack/commit/e88b25808a181fafbe98e5ca278b35bfc0197caf), [`ad3c822`](https://github.com/atlassian-labs/atlaspack/commit/ad3c8223ab1abce9e8da81239cc56f27d37c7cad), [`936209f`](https://github.com/atlassian-labs/atlaspack/commit/936209f3c6c201288720dd62b61e1f538368268c), [`857962a`](https://github.com/atlassian-labs/atlaspack/commit/857962a352bb0aebaf74a8765e8c44d7e875a4e9)]:
+  - @atlaspack/rust@3.24.0
+  - @atlaspack/feature-flags@2.30.1
+  - @atlaspack/fs@2.15.50
+  - @atlaspack/logger@2.14.47
+  - @atlaspack/utils@3.3.7
+  - @atlaspack/build-cache@2.13.13
+
+## 3.2.49
+
+### Patch Changes
+
+- [#1017](https://github.com/atlassian-labs/atlaspack/pull/1017) [`3ad8e88`](https://github.com/atlassian-labs/atlaspack/commit/3ad8e880c4c2b9126cbfb6963a3862a75306a26f) Thanks [@vykimnguyen](https://github.com/vykimnguyen)! - reduce test lmdbcache mapsize and remove unused setup-cache
+
+- Updated dependencies [[`c4082ba`](https://github.com/atlassian-labs/atlaspack/commit/c4082ba3fc1a9328a2e5f23195d5972fbc5d10c8), [`d8e984b`](https://github.com/atlassian-labs/atlaspack/commit/d8e984b7f6d04fa03707fa299bfd8b8bf9f58280), [`ca78e1d`](https://github.com/atlassian-labs/atlaspack/commit/ca78e1d2007bfecd267b283d66a73f3695da4234), [`94e1a58`](https://github.com/atlassian-labs/atlaspack/commit/94e1a58a1a8ed5a4e329745d8a7e6a9530b5cb11), [`4c1f39a`](https://github.com/atlassian-labs/atlaspack/commit/4c1f39a911acaefd630d877af1ae5a039931662f), [`fcf7ec5`](https://github.com/atlassian-labs/atlaspack/commit/fcf7ec56fea644e21f7a67d649e6efd1f03c4a6e), [`45a0dc5`](https://github.com/atlassian-labs/atlaspack/commit/45a0dc530fd9472dbfdebcbb05f1aad812ab3b23)]:
+  - @atlaspack/rust@3.23.0
+  - @atlaspack/feature-flags@2.30.0
+  - @atlaspack/utils@3.3.6
+  - @atlaspack/fs@2.15.49
+  - @atlaspack/logger@2.14.46
+  - @atlaspack/build-cache@2.13.12
+
 ## 3.2.48
 
 ### Patch Changes

package/dist/FSCache.js

@@ -13,8 +13,6 @@ exports.FSCache = void 0;
 const stream_1 = __importDefault(require("stream"));
 const path_1 = __importDefault(require("path"));
 const util_1 = require("util");
-const rust_1 = require("@atlaspack/rust");
-const feature_flags_1 = require("@atlaspack/feature-flags");
 const logger_1 = __importDefault(require("@atlaspack/logger"));
 const build_cache_1 = require("@atlaspack/build-cache");
 // flowlint-next-line untyped-import:off
@@ -41,10 +39,6 @@ class FSCache {
         await Promise.all(dirPromises);
     }
     _getCachePath(cacheId) {
-        if ((0, feature_flags_1.getFeatureFlag)('cachePerformanceImprovements')) {
-            const cleanId = (0, rust_1.hashString)(cacheId);
-            return path_1.default.join(this.dir, cleanId.slice(0, 2), cleanId.slice(2));
-        }
         return path_1.default.join(this.dir, cacheId.slice(0, 2), cacheId.slice(2));
     }
     getStream(key) {
@@ -155,9 +149,6 @@ class FSCache {
 }
 exports.FSCache = FSCache;
 _FSCache_instances = new WeakSet(), _FSCache_getFilePath = function _FSCache_getFilePath(key, index) {
-    if ((0, feature_flags_1.getFeatureFlag)('cachePerformanceImprovements')) {
-        return path_1.default.join(this.dir, `${(0, rust_1.hashString)(key)}-${index}`);
-    }
     return path_1.default.join(this.dir, `${key}-${index}`);
 }, _FSCache_unlinkChunks = async function _FSCache_unlinkChunks(key, index) {
     try {

package/dist/LMDBLiteCache.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LMDBLiteCache = exports.LmdbWrapper = void 0;
 exports.open = open;
 const build_cache_1 = require("@atlaspack/build-cache");
-const feature_flags_1 = require("@atlaspack/feature-flags");
 const rust_1 = require("@atlaspack/rust");
 // @ts-expect-error TS7016
 const ncp_1 = __importDefault(require("ncp"));
@@ -57,7 +56,7 @@ openOptions) {
         path: directory,
         asyncWrites: true,
         mapSize: process.env.ATLASPACK_BUILD_ENV === 'test'
-            ? 1024 * 1024 * 1024
+            ? 256 * 1024 * 1024
             : 1024 * 1024 * 1024 * 15,
     }));
 }
@@ -81,9 +80,7 @@ class LMDBLiteCache {
         return this.store.lmdb;
     }
     async ensure() {
-        if (!(0, feature_flags_1.getFeatureFlag)('cachePerformanceImprovements')) {
-            await this.fsCache.ensure();
-        }
+        await this.fsCache.ensure();
         await this.fs.mkdirp(this.cacheFilesDirectory);
         return Promise.resolve();
     }
@@ -109,18 +106,10 @@ class LMDBLiteCache {
         await this.setBlob(key, (0, build_cache_1.serialize)(value));
     }
     getStream(key) {
-        if (!(0, feature_flags_1.getFeatureFlag)('cachePerformanceImprovements')) {
-            return this.fs.createReadStream(path_1.default.join(this.dir, key));
-        }
-        return this.fs.createReadStream(this.getFileKey(key));
+        return this.fs.createReadStream(path_1.default.join(this.dir, key));
     }
-    async setStream(key, stream) {
-        if (!(0, feature_flags_1.getFeatureFlag)('cachePerformanceImprovements')) {
-            return pipeline(stream, this.fs.createWriteStream(path_1.default.join(this.dir, key)));
-        }
-        const filePath = this.getFileKey(key);
-        await this.fs.mkdirp(path_1.default.dirname(filePath));
-        return pipeline(stream, this.fs.createWriteStream(filePath));
+    setStream(key, stream) {
+        return pipeline(stream, this.fs.createWriteStream(path_1.default.join(this.dir, key)));
     }
     // eslint-disable-next-line require-await
     async getBlob(key) {
@@ -140,33 +129,19 @@ class LMDBLiteCache {
         return Promise.resolve(this.store.get(key));
     }
     hasLargeBlob(key) {
-        if (!(0, feature_flags_1.getFeatureFlag)('cachePerformanceImprovements')) {
-            return this.fsCache.hasLargeBlob(key);
-        }
-        return this.fs.exists(this.getFileKey(key));
+        return this.fsCache.hasLargeBlob(key);
     }
     getLargeBlob(key) {
-        if (!(0, feature_flags_1.getFeatureFlag)('cachePerformanceImprovements')) {
-            return this.fsCache.getLargeBlob(key);
-        }
-        return this.fs.readFile(this.getFileKey(key));
+        return this.fsCache.getLargeBlob(key);
     }
-    async setLargeBlob(key, contents, options) {
-        if (!(0, feature_flags_1.getFeatureFlag)('cachePerformanceImprovements')) {
-            return this.fsCache.setLargeBlob(key, contents, options);
-        }
-        const targetPath = this.getFileKey(key);
-        await this.fs.mkdirp(path_1.default.dirname(targetPath));
-        return this.fs.writeFile(targetPath, contents);
+    setLargeBlob(key, contents, options) {
+        return this.fsCache.setLargeBlob(key, contents, options);
     }
     /**
      * @deprecated Use store.delete instead.
      */
     deleteLargeBlob(key) {
-        if (!(0, feature_flags_1.getFeatureFlag)('cachePerformanceImprovements')) {
-            return this.fsCache.deleteLargeBlob(key);
-        }
-        return this.store.delete(key);
+        return this.fsCache.deleteLargeBlob(key);
     }
     keys() {
         return this.store.keys();

package/lib/FSCache.js

@@ -25,20 +25,6 @@ function _util() {
   };
   return data;
 }
-function _rust() {
-  const data = require("@atlaspack/rust");
-  _rust = function () {
-    return data;
-  };
-  return data;
-}
-function _featureFlags() {
-  const data = require("@atlaspack/feature-flags");
-  _featureFlags = function () {
-    return data;
-  };
-  return data;
-}
 function _logger() {
   const data = _interopRequireDefault(require("@atlaspack/logger"));
   _logger = function () {
@@ -79,10 +65,6 @@ class FSCache {
     await Promise.all(dirPromises);
   }
   _getCachePath(cacheId) {
-    if ((0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
-      const cleanId = (0, _rust().hashString)(cacheId);
-      return _path().default.join(this.dir, cleanId.slice(0, 2), cleanId.slice(2));
-    }
     return _path().default.join(this.dir, cacheId.slice(0, 2), cacheId.slice(2));
   }
   getStream(key) {
@@ -112,9 +94,6 @@ class FSCache {
     }
   }
   #getFilePath(key, index) {
-    if ((0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
-      return _path().default.join(this.dir, `${(0, _rust().hashString)(key)}-${index}`);
-    }
     return _path().default.join(this.dir, `${key}-${index}`);
   }
   async #unlinkChunks(key, index) {

package/lib/LMDBLiteCache.js

@@ -12,13 +12,6 @@ function _buildCache() {
   };
   return data;
 }
-function _featureFlags() {
-  const data = require("@atlaspack/feature-flags");
-  _featureFlags = function () {
-    return data;
-  };
-  return data;
-}
 function _rust() {
   const data = require("@atlaspack/rust");
   _rust = function () {
@@ -112,7 +105,7 @@ openOptions) {
   return new LmdbWrapper(new (_rust().Lmdb)({
     path: directory,
     asyncWrites: true,
-    mapSize: process.env.ATLASPACK_BUILD_ENV === 'test' ? 1024 * 1024 * 1024 : 1024 * 1024 * 1024 * 15
+    mapSize: process.env.ATLASPACK_BUILD_ENV === 'test' ? 256 * 1024 * 1024 : 1024 * 1024 * 1024 * 15
   }));
 }
 const pipeline = (0, _util().promisify)(_stream().default.pipeline);
@@ -140,9 +133,7 @@ class LMDBLiteCache {
     return this.store.lmdb;
   }
   async ensure() {
-    if (!(0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
-      await this.fsCache.ensure();
-    }
+    await this.fsCache.ensure();
     await this.fs.mkdirp(this.cacheFilesDirectory);
     return Promise.resolve();
   }
@@ -168,18 +159,10 @@ class LMDBLiteCache {
     await this.setBlob(key, (0, _buildCache().serialize)(value));
   }
   getStream(key) {
-    if (!(0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
-      return this.fs.createReadStream(_path().default.join(this.dir, key));
-    }
-    return this.fs.createReadStream(this.getFileKey(key));
+    return this.fs.createReadStream(_path().default.join(this.dir, 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 this.fs.mkdirp(_path().default.dirname(filePath));
-    return pipeline(stream, this.fs.createWriteStream(filePath));
+  setStream(key, stream) {
+    return pipeline(stream, this.fs.createWriteStream(_path().default.join(this.dir, key)));
   }
 
   // eslint-disable-next-line require-await
@@ -200,34 +183,20 @@ class LMDBLiteCache {
     return Promise.resolve(this.store.get(key));
   }
   hasLargeBlob(key) {
-    if (!(0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
-      return this.fsCache.hasLargeBlob(key);
-    }
-    return this.fs.exists(this.getFileKey(key));
+    return this.fsCache.hasLargeBlob(key);
   }
   getLargeBlob(key) {
-    if (!(0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
-      return this.fsCache.getLargeBlob(key);
-    }
-    return this.fs.readFile(this.getFileKey(key));
+    return this.fsCache.getLargeBlob(key);
   }
-  async setLargeBlob(key, contents, options) {
-    if (!(0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
-      return this.fsCache.setLargeBlob(key, contents, options);
-    }
-    const targetPath = this.getFileKey(key);
-    await this.fs.mkdirp(_path().default.dirname(targetPath));
-    return this.fs.writeFile(targetPath, contents);
+  setLargeBlob(key, contents, options) {
+    return this.fsCache.setLargeBlob(key, contents, options);
   }
 
   /**
    * @deprecated Use store.delete instead.
    */
   deleteLargeBlob(key) {
-    if (!(0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
-      return this.fsCache.deleteLargeBlob(key);
-    }
-    return this.store.delete(key);
+    return this.fsCache.deleteLargeBlob(key);
   }
   keys() {
     return this.store.keys();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@atlaspack/cache",
   "description": "Interface for defining caches and file-system, IDB and LMDB implementations.",
-  "version": "3.2.48",
+  "version": "3.2.50",
   "license": "(MIT OR Apache-2.0)",
   "type": "commonjs",
   "publishConfig": {
@@ -22,12 +22,12 @@
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.11",
-    "@atlaspack/feature-flags": "2.29.1",
-    "@atlaspack/fs": "2.15.48",
-    "@atlaspack/logger": "2.14.45",
-    "@atlaspack/rust": "3.22.1",
-    "@atlaspack/utils": "3.3.5",
+    "@atlaspack/build-cache": "2.13.13",
+    "@atlaspack/feature-flags": "2.30.1",
+    "@atlaspack/fs": "2.15.50",
+    "@atlaspack/logger": "2.14.47",
+    "@atlaspack/rust": "3.24.0",
+    "@atlaspack/utils": "3.3.7",
     "ncp": "^2.0.0"
   },
   "devDependencies": {

package/src/FSCache.ts

@@ -7,8 +7,6 @@ import stream from 'stream';
 import path from 'path';
 import {promisify} from 'util';
 
-import {hashString} from '@atlaspack/rust';
-import {getFeatureFlag} from '@atlaspack/feature-flags';
 import logger from '@atlaspack/logger';
 import {
   deserialize,
@@ -52,10 +50,6 @@ export class FSCache implements Cache {
   }
 
   _getCachePath(cacheId: string): FilePath {
-    if (getFeatureFlag('cachePerformanceImprovements')) {
-      const cleanId = hashString(cacheId);
-      return path.join(this.dir, cleanId.slice(0, 2), cleanId.slice(2));
-    }
     return path.join(this.dir, cacheId.slice(0, 2), cacheId.slice(2));
   }
 
@@ -95,9 +89,6 @@ export class FSCache implements Cache {
   }
 
   #getFilePath(key: string, index: number): string {
-    if (getFeatureFlag('cachePerformanceImprovements')) {
-      return path.join(this.dir, `${hashString(key)}-${index}`);
-    }
     return path.join(this.dir, `${key}-${index}`);
   }
 

package/src/LMDBLiteCache.ts

@@ -3,7 +3,6 @@ import {
   registerSerializableClass,
   serialize,
 } from '@atlaspack/build-cache';
-import {getFeatureFlag} from '@atlaspack/feature-flags';
 import {Lmdb} from '@atlaspack/rust';
 import type {FilePath} from '@atlaspack/types';
 import type {Cache} from './types';
@@ -81,7 +80,7 @@ export function open(
       asyncWrites: true,
       mapSize:
         process.env.ATLASPACK_BUILD_ENV === 'test'
-          ? 1024 * 1024 * 1024
+          ? 256 * 1024 * 1024
           : 1024 * 1024 * 1024 * 15,
     }),
   );
@@ -126,9 +125,7 @@ export class LMDBLiteCache implements Cache {
   }
 
   async ensure(): Promise<void> {
-    if (!getFeatureFlag('cachePerformanceImprovements')) {
-      await this.fsCache.ensure();
-    }
+    await this.fsCache.ensure();
     await this.fs.mkdirp(this.cacheFilesDirectory);
     return Promise.resolve();
   }
@@ -161,24 +158,14 @@ export class LMDBLiteCache implements Cache {
   }
 
   getStream(key: string): Readable {
-    if (!getFeatureFlag('cachePerformanceImprovements')) {
-      return this.fs.createReadStream(path.join(this.dir, key));
-    }
-
-    return this.fs.createReadStream(this.getFileKey(key));
+    return this.fs.createReadStream(path.join(this.dir, key));
   }
 
-  async setStream(key: string, stream: Readable): Promise<void> {
-    if (!getFeatureFlag('cachePerformanceImprovements')) {
-      return pipeline(
-        stream,
-        this.fs.createWriteStream(path.join(this.dir, key)),
-      );
-    }
-
-    const filePath = this.getFileKey(key);
-    await this.fs.mkdirp(path.dirname(filePath));
-    return pipeline(stream, this.fs.createWriteStream(filePath));
+  setStream(key: string, stream: Readable): Promise<void> {
+    return pipeline(
+      stream,
+      this.fs.createWriteStream(path.join(this.dir, key)),
+    );
   }
 
   // eslint-disable-next-line require-await
@@ -203,45 +190,28 @@ export class LMDBLiteCache implements Cache {
   }
 
   hasLargeBlob(key: string): Promise<boolean> {
-    if (!getFeatureFlag('cachePerformanceImprovements')) {
-      return this.fsCache.hasLargeBlob(key);
-    }
-
-    return this.fs.exists(this.getFileKey(key));
+    return this.fsCache.hasLargeBlob(key);
   }
 
   getLargeBlob(key: string): Promise<Buffer> {
-    if (!getFeatureFlag('cachePerformanceImprovements')) {
-      return this.fsCache.getLargeBlob(key);
-    }
-    return this.fs.readFile(this.getFileKey(key));
+    return this.fsCache.getLargeBlob(key);
   }
 
-  async setLargeBlob(
+  setLargeBlob(
     key: string,
     contents: Buffer | string,
     options?: {
       signal?: AbortSignal;
     },
   ): Promise<void> {
-    if (!getFeatureFlag('cachePerformanceImprovements')) {
-      return this.fsCache.setLargeBlob(key, contents, options);
-    }
-
-    const targetPath = this.getFileKey(key);
-    await this.fs.mkdirp(path.dirname(targetPath));
-    return this.fs.writeFile(targetPath, contents);
+    return this.fsCache.setLargeBlob(key, contents, options);
   }
 
   /**
    * @deprecated Use store.delete instead.
    */
   deleteLargeBlob(key: string): Promise<void> {
-    if (!getFeatureFlag('cachePerformanceImprovements')) {
-      return this.fsCache.deleteLargeBlob(key);
-    }
-
-    return this.store.delete(key);
+    return this.fsCache.deleteLargeBlob(key);
   }
 
   keys(): Iterable<string> {