@atlaspack/cache 2.12.1-dev.3478 → 2.12.1-dev.3520

package/lib/FSCache.js

@@ -32,9 +32,9 @@ function _logger() {
   };
   return data;
 }
-function _core() {
-  const data = require("@atlaspack/core");
-  _core = function () {
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
     return data;
   };
   return data;
@@ -146,7 +146,7 @@ class FSCache {
   async get(key) {
     try {
       let data = await this.fs.readFile(this._getCachePath(key));
-      return (0, _core().deserialize)(data);
+      return (0, _buildCache().deserialize)(data);
     } catch (err) {
       if (err.code === 'ENOENT') {
         return null;
@@ -158,7 +158,7 @@ class FSCache {
   async set(key, value) {
     try {
       let blobPath = this._getCachePath(key);
-      let data = (0, _core().serialize)(value);
+      let data = (0, _buildCache().serialize)(value);
       await this.fs.writeFile(blobPath, data);
     } catch (err) {
       _logger().default.error(err, '@atlaspack/cache');
@@ -169,4 +169,4 @@ class FSCache {
   }
 }
 exports.FSCache = FSCache;
-(0, _core().registerSerializableClass)(`${_package.default.version}:FSCache`, FSCache);
+(0, _buildCache().registerSerializableClass)(`${_package.default.version}:FSCache`, FSCache);

package/lib/IDBCache.browser.js

@@ -11,9 +11,9 @@ function _stream() {
   };
   return data;
 }
-function _core() {
-  const data = require("@atlaspack/core");
-  _core = function () {
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
     return data;
   };
   return data;
@@ -25,7 +25,6 @@ function _utils() {
   };
   return data;
 }
-var _package = _interopRequireDefault(require("../package.json"));
 function _idb() {
   const data = require("idb");
   _idb = function () {
@@ -33,6 +32,7 @@ function _idb() {
   };
   return data;
 }
+var _package = _interopRequireDefault(require("../package.json"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // $FlowFixMe[untyped-import]
 // $FlowFixMe[untyped-import]
@@ -69,10 +69,10 @@ class IDBCache {
     if (data == null) {
       return null;
     }
-    return Promise.resolve((0, _core().deserialize)(data));
+    return Promise.resolve((0, _buildCache().deserialize)(data));
   }
   async set(key, value) {
-    await (await this.store).put(STORE_NAME, (0, _core().serialize)(value), key);
+    await (await this.store).put(STORE_NAME, (0, _buildCache().serialize)(value), key);
   }
   getStream(key) {
     let dataPromise = this.store.then(s => s.get(STORE_NAME, key)).then(d => Buffer.from(d)).catch(e => e);
@@ -145,4 +145,4 @@ class IDBCache {
   }
 }
 exports.IDBCache = IDBCache;
-(0, _core().registerSerializableClass)(`${_package.default.version}:IDBCache`, IDBCache);
+(0, _buildCache().registerSerializableClass)(`${_package.default.version}:IDBCache`, IDBCache);

package/lib/LMDBCache.js

@@ -25,9 +25,9 @@ function _util() {
   };
   return data;
 }
-function _core() {
-  const data = require("@atlaspack/core");
-  _core = function () {
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
     return data;
   };
   return data;
@@ -39,7 +39,6 @@ function _fs() {
   };
   return data;
 }
-var _package = _interopRequireDefault(require("../package.json"));
 function _lmdb() {
   const data = _interopRequireDefault(require("lmdb"));
   _lmdb = function () {
@@ -47,6 +46,7 @@ function _lmdb() {
   };
   return data;
 }
+var _package = _interopRequireDefault(require("../package.json"));
 var _FSCache = require("./FSCache");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // flowlint-next-line untyped-import:off
@@ -84,10 +84,10 @@ class LMDBCache {
     if (data == null) {
       return Promise.resolve(null);
     }
-    return Promise.resolve((0, _core().deserialize)(data));
+    return Promise.resolve((0, _buildCache().deserialize)(data));
   }
   async set(key, value) {
-    await this.setBlob(key, (0, _core().serialize)(value));
+    await this.setBlob(key, (0, _buildCache().serialize)(value));
   }
   getStream(key) {
     return this.fs.createReadStream(_path().default.join(this.dir, key));
@@ -133,4 +133,4 @@ class LMDBCache {
   }
 }
 exports.LMDBCache = LMDBCache;
-(0, _core().registerSerializableClass)(`${_package.default.version}:LMDBCache`, LMDBCache);
+(0, _buildCache().registerSerializableClass)(`${_package.default.version}:LMDBCache`, LMDBCache);

package/lib/LMDBLiteCache.js

@@ -5,6 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.LmdbWrapper = exports.LMDBLiteCache = void 0;
 exports.open = open;
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
+    return data;
+  };
+  return data;
+}
 function _rust() {
   const data = require("@atlaspack/rust");
   _rust = function () {
@@ -33,13 +40,6 @@ function _util() {
   };
   return data;
 }
-function _core() {
-  const data = require("@atlaspack/core");
-  _core = function () {
-    return data;
-  };
-  return data;
-}
 function _fs() {
   const data = require("@atlaspack/fs");
   _fs = function () {
@@ -81,8 +81,6 @@ function open(directory
 }
 const pipeline = (0, _util().promisify)(_stream().default.pipeline);
 class LMDBLiteCache {
-  // $FlowFixMe
-
   constructor(cacheDir) {
     this.fs = new (_fs().NodeFS)();
     this.dir = cacheDir;
@@ -93,6 +91,13 @@ class LMDBLiteCache {
       compression: true
     });
   }
+
+  /**
+   * Use this to pass the native LMDB instance back to Rust.
+   */
+  getNativeRef() {
+    return this.store.lmdb;
+  }
   ensure() {
     return Promise.resolve();
   }
@@ -101,8 +106,8 @@ class LMDBLiteCache {
       dir: this.dir
     };
   }
-  static deserialize(opts) {
-    return new LMDBLiteCache(opts.dir);
+  static deserialize(cache) {
+    return new LMDBLiteCache(cache.dir);
   }
   has(key) {
     return Promise.resolve(this.store.get(key) != null);
@@ -112,10 +117,10 @@ class LMDBLiteCache {
     if (data == null) {
       return Promise.resolve(null);
     }
-    return Promise.resolve((0, _core().deserialize)(data));
+    return Promise.resolve((0, _buildCache().deserialize)(data));
   }
   async set(key, value) {
-    await this.setBlob(key, (0, _core().serialize)(value));
+    await this.setBlob(key, (0, _buildCache().serialize)(value));
   }
   getStream(key) {
     return this.fs.createReadStream(_path().default.join(this.dir, key));
@@ -123,12 +128,10 @@ class LMDBLiteCache {
   setStream(key, stream) {
     return pipeline(stream, this.fs.createWriteStream(_path().default.join(this.dir, key)));
   }
-  getBlob(key) {
-    try {
-      return Promise.resolve(this.getBlobSync(key));
-    } catch (err) {
-      return Promise.reject(err);
-    }
+
+  // eslint-disable-next-line require-await
+  async getBlob(key) {
+    return this.getBlobSync(key);
   }
   getBlobSync(key) {
     const buffer = this.store.get(key);
@@ -171,4 +174,4 @@ class LMDBLiteCache {
   }
 }
 exports.LMDBLiteCache = LMDBLiteCache;
-(0, _core().registerSerializableClass)(`${_package.default.version}:LMDBLiteCache`, LMDBLiteCache);
+(0, _buildCache().registerSerializableClass)(`${_package.default.version}:LMDBLiteCache`, LMDBLiteCache);

package/lib/index.js

@@ -3,47 +3,47 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _LMDBCache = require("./LMDBCache");
-Object.keys(_LMDBCache).forEach(function (key) {
+var _FSCache = require("./FSCache");
+Object.keys(_FSCache).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _LMDBCache[key]) return;
+  if (key in exports && exports[key] === _FSCache[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
-      return _LMDBCache[key];
+      return _FSCache[key];
     }
   });
 });
-var _LMDBLiteCache = require("./LMDBLiteCache");
-Object.keys(_LMDBLiteCache).forEach(function (key) {
+var _IDBCache = require("./IDBCache");
+Object.keys(_IDBCache).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _LMDBLiteCache[key]) return;
+  if (key in exports && exports[key] === _IDBCache[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
-      return _LMDBLiteCache[key];
+      return _IDBCache[key];
     }
   });
 });
-var _FSCache = require("./FSCache");
-Object.keys(_FSCache).forEach(function (key) {
+var _LMDBCache = require("./LMDBCache");
+Object.keys(_LMDBCache).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _FSCache[key]) return;
+  if (key in exports && exports[key] === _LMDBCache[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
-      return _FSCache[key];
+      return _LMDBCache[key];
     }
   });
 });
-var _IDBCache = require("./IDBCache");
-Object.keys(_IDBCache).forEach(function (key) {
+var _LMDBLiteCache = require("./LMDBLiteCache");
+Object.keys(_LMDBLiteCache).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _IDBCache[key]) return;
+  if (key in exports && exports[key] === _LMDBLiteCache[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
-      return _IDBCache[key];
+      return _LMDBLiteCache[key];
     }
   });
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@atlaspack/cache",
   "description": "Interface for defining caches and file-system, IDB and LMDB implementations.",
-  "version": "2.12.1-dev.3478+5fd2da535",
+  "version": "2.12.1-dev.3520+8a5346e28",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -22,15 +22,13 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/fs": "2.12.1-dev.3478+5fd2da535",
-    "@atlaspack/logger": "2.12.1-dev.3478+5fd2da535",
-    "@atlaspack/rust": "2.12.1-dev.3478+5fd2da535",
-    "@atlaspack/utils": "2.12.1-dev.3478+5fd2da535",
+    "@atlaspack/build-cache": "2.12.1-dev.3520+8a5346e28",
+    "@atlaspack/fs": "2.12.1-dev.3520+8a5346e28",
+    "@atlaspack/logger": "2.12.1-dev.3520+8a5346e28",
+    "@atlaspack/rust": "2.12.1-dev.3520+8a5346e28",
+    "@atlaspack/utils": "2.12.1-dev.3520+8a5346e28",
     "lmdb": "2.8.5"
   },
-  "peerDependencies": {
-    "@atlaspack/core": "^2.12.1-dev.3478+5fd2da535"
-  },
   "devDependencies": {
     "idb": "^5.0.8"
   },
@@ -38,5 +36,5 @@
     "./src/IDBCache.js": "./src/IDBCache.browser.js",
     "./src/LMDBCache.js": false
   },
-  "gitHead": "5fd2da535ecbe096d57e03aec15e80bb1d7601f7"
+  "gitHead": "8a5346e28c1bb3b9cd40f1c4e77c66dd6666f1e4"
 }

package/src/FSCache.js

@@ -8,14 +8,17 @@ import type {Cache} from './types';
 import stream from 'stream';
 import path from 'path';
 import {promisify} from 'util';
+
 import logger from '@atlaspack/logger';
 import {
-  serialize,
   deserialize,
   registerSerializableClass,
-} from '@atlaspack/core';
+  serialize,
+} from '@atlaspack/build-cache';
+
 // flowlint-next-line untyped-import:off
 import packageJson from '../package.json';
+
 import {WRITE_LIMIT_CHUNK} from './constants';
 
 const pipeline: (Readable, Writable) => Promise<void> = promisify(

package/src/IDBCache.browser.js

@@ -2,17 +2,19 @@
 import type {Cache} from './types';
 
 import {Readable} from 'stream';
+
 import {
-  serialize,
   deserialize,
   registerSerializableClass,
-} from '@atlaspack/core';
+  serialize,
+} from '@atlaspack/build-cache';
 import {bufferStream} from '@atlaspack/utils';
 // $FlowFixMe[untyped-import]
-import packageJson from '../package.json';
-// $FlowFixMe[untyped-import]
 import {openDB} from 'idb';
 
+// $FlowFixMe[untyped-import]
+import packageJson from '../package.json';
+
 const STORE_NAME = 'cache';
 
 export class IDBCache implements Cache {

package/src/LMDBCache.js

@@ -6,17 +6,19 @@ import type {Readable, Writable} from 'stream';
 import stream from 'stream';
 import path from 'path';
 import {promisify} from 'util';
+
 import {
-  serialize,
   deserialize,
   registerSerializableClass,
-} from '@atlaspack/core';
+  serialize,
+} from '@atlaspack/build-cache';
 import {NodeFS} from '@atlaspack/fs';
 // flowlint-next-line untyped-import:off
-import packageJson from '../package.json';
-// $FlowFixMe
 import lmdb from 'lmdb';
 
+// $FlowFixMe
+import packageJson from '../package.json';
+
 import {FSCache} from './FSCache';
 
 const pipeline: (Readable, Writable) => Promise<void> = promisify(

package/src/LMDBLiteCache.js

@@ -1,5 +1,10 @@
 // @flow strict-local
 
+import {
+  deserialize,
+  registerSerializableClass,
+  serialize,
+} from '@atlaspack/build-cache';
 import {Lmdb} from '@atlaspack/rust';
 import type {FilePath} from '@atlaspack/types';
 import type {Cache} from './types';
@@ -8,12 +13,9 @@ import type {Readable, Writable} from 'stream';
 import stream from 'stream';
 import path from 'path';
 import {promisify} from 'util';
-import {
-  serialize,
-  deserialize,
-  registerSerializableClass,
-} from '@atlaspack/core';
+
 import {NodeFS} from '@atlaspack/fs';
+
 // $FlowFixMe
 import packageJson from '../package.json';
 
@@ -70,11 +72,14 @@ const pipeline: (Readable, Writable) => Promise<void> = promisify(
   stream.pipeline,
 );
 
+export type SerLMDBLiteCache = {|
+  dir: FilePath,
+|};
+
 export class LMDBLiteCache implements Cache {
   fs: NodeFS;
   dir: FilePath;
-  // $FlowFixMe
-  store: any;
+  store: LmdbWrapper;
   fsCache: FSCache;
 
   constructor(cacheDir: FilePath) {
@@ -89,18 +94,25 @@ export class LMDBLiteCache implements Cache {
     });
   }
 
+  /**
+   * Use this to pass the native LMDB instance back to Rust.
+   */
+  getNativeRef(): Lmdb {
+    return this.store.lmdb;
+  }
+
   ensure(): Promise<void> {
     return Promise.resolve();
   }
 
-  serialize(): {|dir: FilePath|} {
+  serialize(): SerLMDBLiteCache {
     return {
       dir: this.dir,
     };
   }
 
-  static deserialize(opts: {|dir: FilePath|}): LMDBLiteCache {
-    return new LMDBLiteCache(opts.dir);
+  static deserialize(cache: SerLMDBLiteCache): LMDBLiteCache {
+    return new LMDBLiteCache(cache.dir);
   }
 
   has(key: string): Promise<boolean> {
@@ -131,12 +143,9 @@ export class LMDBLiteCache implements Cache {
     );
   }
 
-  getBlob(key: string): Promise<Buffer> {
-    try {
-      return Promise.resolve(this.getBlobSync(key));
-    } catch (err) {
-      return Promise.reject(err);
-    }
+  // eslint-disable-next-line require-await
+  async getBlob(key: string): Promise<Buffer> {
+    return this.getBlobSync(key);
   }
 
   getBlobSync(key: string): Buffer {

package/src/index.js

@@ -1,6 +1,8 @@
 // @flow
-export type {Cache} from './types';
-export * from './LMDBCache';
-export * from './LMDBLiteCache';
+
 export * from './FSCache';
 export * from './IDBCache';
+export * from './LMDBCache';
+export * from './LMDBLiteCache';
+
+export type {Cache} from './types';