cacache 14.0.0 → 15.0.0

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [15.0.0](https://github.com/npm/cacache/compare/v14.0.0...v15.0.0) (2020-02-18)
+
+
+### ⚠ BREAKING CHANGES
+
+* drop figgy-pudding and use canonical option names.
+
+### Features
+
+* remove figgy-pudding ([57d11bc](https://github.com/npm/cacache/commit/57d11bce34f979247d1057d258acc204c4944491))
+
 ## [14.0.0](https://github.com/npm/cacache/compare/v13.0.1...v14.0.0) (2020-01-28)
 
 

package/README.md

@@ -33,7 +33,6 @@ just as easily be used on its own.
   * Writing
     * [`put`](#put-data)
     * [`put.stream`](#put-stream)
-    * [`put*` opts](#put-options)
     * [`rm.all`](#rm-all)
     * [`rm.entry`](#rm-entry)
     * [`rm.content`](#rm-content)
@@ -92,7 +91,7 @@ cacache.get.byDigest(cachePath, integrityHash).then(data => {
 * Lockless, high-concurrency cache access
 * Streaming support
 * Promise support
-* Pretty darn fast -- sub-millisecond reads and writes including verification
+* Fast -- sub-millisecond reads and writes including verification
 * Arbitrary metadata storage
 * Garbage collection and additional offline verification
 * Thorough test coverage
@@ -201,6 +200,8 @@ A sub-function, `get.byDigest` may be used for identical behavior, except lookup
 will happen by integrity hash, bypassing the index entirely. This version of the
 function *only* returns `data` itself, without any wrapper.
 
+See: [options](#get-options)
+
 ##### Note
 
 This function loads the entire cache entry into memory before returning it. If
@@ -242,6 +243,8 @@ A sub-function, `get.stream.byDigest` may be used for identical behavior,
 except lookup will happen by integrity hash, bypassing the index entirely. This
 version does not emit the `metadata` and `integrity` events at all.
 
+See: [options](#get-options)
+
 ##### Example
 
 ```javascript
@@ -328,12 +331,33 @@ cacache.get.hasContent(cachePath, 'sha521-NOT+IN/CACHE==').then(console.log)
 false
 ```
 
+##### <a name="get-options"></a> Options
+
+##### `opts.integrity`
+If present, the pre-calculated digest for the inserted content. If this option
+is provided and does not match the post-insertion digest, insertion will fail
+with an `EINTEGRITY` error.
+
+##### `opts.memoize`
+
+Default: null
+
+If explicitly truthy, cacache will read from memory and memoize data on bulk read. If `false`, cacache will read from disk data. Reader functions by default read from in-memory cache.
+
+##### `opts.size`
+If provided, the data stream will be verified to check that enough data was
+passed through. If there's more or less data than expected, insertion will fail
+with an `EBADSIZE` error.
+
+
 #### <a name="put-data"></a> `> cacache.put(cache, key, data, [opts]) -> Promise`
 
 Inserts data passed to it into the cache. The returned Promise resolves with a
 digest (generated according to [`opts.algorithms`](#optsalgorithms)) after the
 cache entry has been successfully written.
 
+See: [options](#put-options)
+
 ##### Example
 
 ```javascript
@@ -353,6 +377,8 @@ Stream](https://nodejs.org/api/stream.html#stream_writable_streams) that inserts
 data written to it into the cache. Emits an `integrity` event with the digest of
 written contents when it succeeds.
 
+See: [options](#put-options)
+
 ##### Example
 
 ```javascript
@@ -365,9 +391,7 @@ request.get(
 )
 ```
 
-#### <a name="put-options"></a> `> cacache.put options`
-
-`cacache.put` functions have a number of options in common.
+##### <a name="put-options"></a> Options
 
 ##### `opts.metadata`
 
@@ -382,7 +406,7 @@ with an `EBADSIZE` error.
 ##### `opts.integrity`
 
 If present, the pre-calculated digest for the inserted content. If this option
-if provided and does not match the post-insertion digest, insertion will fail
+is provided and does not match the post-insertion digest, insertion will fail
 with an `EINTEGRITY` error.
 
 `algorithms` has no effect if this option is present.
@@ -415,6 +439,11 @@ cache.
 Reading from disk data can be forced by explicitly passing `memoize: false` to
 the reader functions, but their default will be to read from memory.
 
+##### `opts.tmpPrefix`
+Default: null
+
+Prefix to append on the temporary directory name inside the cache's tmp dir. 
+
 #### <a name="rm-all"></a> `> cacache.rm.all(cache) -> Promise`
 
 Clears the entire cache. Mainly by blowing away the cache directory itself.
@@ -478,6 +507,8 @@ permissions.
 If you want automatic cleanup of this directory, use
 [`tmp.withTmp()`](#with-tpm)
 
+See: [options](#tmp-options)
+
 ##### Example
 
 ```javascript
@@ -517,6 +548,8 @@ promise completes.
 The same caveats apply when it comes to managing permissions for the tmp dir's
 contents.
 
+See: [options](#tmp-options)
+
 ##### Example
 
 ```javascript
@@ -527,6 +560,13 @@ cacache.tmp.withTmp(cache, dir => {
 })
 ```
 
+##### <a name="tmp-options"></a> Options
+
+##### `opts.tmpPrefix`
+Default: null
+
+Prefix to append on the temporary directory name inside the cache's tmp dir. 
+
 #### <a name="integrity"></a> Subresource Integrity Digests
 
 For content verification and addressing, cacache uses strings following the
@@ -582,10 +622,24 @@ When it's done, it'll return an object with various stats about the verification
 process, including amount of storage reclaimed, number of valid entries, number
 of entries removed, etc.
 
-##### Options
+##### <a name="verify-options"></a> Options
+
+##### `opts.concurrency`
+
+Default: 20
 
-* `opts.filter` - receives a formatted entry. Return false to remove it.
-                  Note: might be called more than once on the same entry.
+Number of concurrently read files in the filesystem while doing clean up.
+
+##### `opts.filter`
+Receives a formatted entry. Return false to remove it.
+Note: might be called more than once on the same entry.
+
+##### `opts.log`
+Custom logger function:
+```
+  log: { silly () {} }
+  log.silly('verify', 'verifying cache at', cache)
+```
 
 ##### Example
 

package/get.js

@@ -1,8 +1,6 @@
 'use strict'
 
 const util = require('util')
-
-const figgyPudding = require('figgy-pudding')
 const fs = require('fs')
 const index = require('./lib/entry-index')
 const memo = require('./lib/memoization')
@@ -14,12 +12,6 @@ const Pipeline = require('minipass-pipeline')
 
 const writeFile = util.promisify(fs.writeFile)
 
-const GetOpts = figgyPudding({
-  integrity: {},
-  memoize: {},
-  size: {}
-})
-
 module.exports = function get (cache, key, opts) {
   return getData(false, cache, key, opts)
 }
@@ -27,12 +19,12 @@ module.exports.byDigest = function getByDigest (cache, digest, opts) {
   return getData(true, cache, digest, opts)
 }
 
-function getData (byDigest, cache, key, opts) {
-  opts = GetOpts(opts)
+function getData (byDigest, cache, key, opts = {}) {
+  const { integrity, memoize, size } = opts
   const memoized = byDigest
     ? memo.get.byDigest(cache, key, opts)
     : memo.get(cache, key, opts)
-  if (memoized && opts.memoize !== false) {
+  if (memoized && memoize !== false) {
     return Promise.resolve(
       byDigest
         ? memoized
@@ -50,23 +42,23 @@ function getData (byDigest, cache, key, opts) {
         throw new index.NotFoundError(cache, key)
       }
       return read(cache, byDigest ? key : entry.integrity, {
-        integrity: opts.integrity,
-        size: opts.size
+        integrity,
+        size
       })
         .then((data) =>
           byDigest
             ? data
             : {
+              data,
               metadata: entry.metadata,
-              data: data,
               size: entry.size,
               integrity: entry.integrity
             }
         )
         .then((res) => {
-          if (opts.memoize && byDigest) {
+          if (memoize && byDigest) {
             memo.put.byDigest(cache, key, res, opts)
-          } else if (opts.memoize) {
+          } else if (memoize) {
             memo.put(cache, entry, res.data, opts)
           }
           return res
@@ -82,12 +74,12 @@ module.exports.sync.byDigest = function getByDigest (cache, digest, opts) {
   return getDataSync(true, cache, digest, opts)
 }
 
-function getDataSync (byDigest, cache, key, opts) {
-  opts = GetOpts(opts)
+function getDataSync (byDigest, cache, key, opts = {}) {
+  const { integrity, memoize, size } = opts
   const memoized = byDigest
     ? memo.get.byDigest(cache, key, opts)
     : memo.get(cache, key, opts)
-  if (memoized && opts.memoize !== false) {
+  if (memoized && memoize !== false) {
     return byDigest
       ? memoized
       : {
@@ -102,8 +94,8 @@ function getDataSync (byDigest, cache, key, opts) {
     throw new index.NotFoundError(cache, key)
   }
   const data = read.sync(cache, byDigest ? key : entry.integrity, {
-    integrity: opts.integrity,
-    size: opts.size
+    integrity: integrity,
+    size: size
   })
   const res = byDigest
     ? data
@@ -113,9 +105,9 @@ function getDataSync (byDigest, cache, key, opts) {
       size: entry.size,
       integrity: entry.integrity
     }
-  if (opts.memoize && byDigest) {
+  if (memoize && byDigest) {
     memo.put.byDigest(cache, key, res, opts)
-  } else if (opts.memoize) {
+  } else if (memoize) {
     memo.put(cache, entry, res.data, opts)
   }
   return res
@@ -134,10 +126,10 @@ const getMemoizedStream = (memoized) => {
   return stream
 }
 
-function getStream (cache, key, opts) {
-  opts = GetOpts(opts)
+function getStream (cache, key, opts = {}) {
+  const { memoize, size } = opts
   const memoized = memo.get(cache, key, opts)
-  if (memoized && opts.memoize !== false) {
+  if (memoized && memoize !== false) {
     return getMemoizedStream(memoized)
   }
 
@@ -160,12 +152,10 @@ function getStream (cache, key, opts) {
       const src = read.readStream(
         cache,
         entry.integrity,
-        opts.concat({
-          size: opts.size == null ? entry.size : opts.size
-        })
+        { ...opts, size: typeof size !== 'number' ? entry.size : size }
       )
 
-      if (opts.memoize) {
+      if (memoize) {
         const memoStream = new Collect.PassThrough()
         memoStream.on('collect', data => memo.put(cache, entry, data, opts))
         stream.unshift(memoStream)
@@ -179,16 +169,16 @@ function getStream (cache, key, opts) {
 
 module.exports.stream.byDigest = getStreamDigest
 
-function getStreamDigest (cache, integrity, opts) {
-  opts = GetOpts(opts)
+function getStreamDigest (cache, integrity, opts = {}) {
+  const { memoize } = opts
   const memoized = memo.get.byDigest(cache, integrity, opts)
-  if (memoized && opts.memoize !== false) {
+  if (memoized && memoize !== false) {
     const stream = new Minipass()
     stream.end(memoized)
     return stream
   } else {
     const stream = read.readStream(cache, integrity, opts)
-    if (!opts.memoize) {
+    if (!memoize) {
       return stream
     }
     const memoStream = new Collect.PassThrough()
@@ -204,10 +194,10 @@ function getStreamDigest (cache, integrity, opts) {
 
 module.exports.info = info
 
-function info (cache, key, opts) {
-  opts = GetOpts(opts)
+function info (cache, key, opts = {}) {
+  const { memoize } = opts
   const memoized = memo.get(cache, key, opts)
-  if (memoized && opts.memoize !== false) {
+  if (memoized && memoize !== false) {
     return Promise.resolve(memoized.entry)
   } else {
     return index.find(cache, key)
@@ -228,8 +218,7 @@ function cpDigest (cache, digest, dest, opts) {
 
 module.exports.copy.byDigest = cpDigest
 
-function copy (byDigest, cache, key, dest, opts) {
-  opts = GetOpts(opts)
+function copy (byDigest, cache, key, dest, opts = {}) {
   if (read.copy) {
     return (byDigest
       ? Promise.resolve(null)

package/lib/content/read.js

@@ -2,8 +2,7 @@
 
 const util = require('util')
 
-const figgyPudding = require('figgy-pudding')
-const fs = require('graceful-fs')
+const fs = require('fs')
 const fsm = require('fs-minipass')
 const ssri = require('ssri')
 const contentPath = require('./path')
@@ -12,21 +11,17 @@ const Pipeline = require('minipass-pipeline')
 const lstat = util.promisify(fs.lstat)
 const readFile = util.promisify(fs.readFile)
 
-const ReadOpts = figgyPudding({
-  size: {}
-})
-
 module.exports = read
 
 const MAX_SINGLE_READ_SIZE = 64 * 1024 * 1024
-function read (cache, integrity, opts) {
-  opts = ReadOpts(opts)
+function read (cache, integrity, opts = {}) {
+  const { size } = opts
   return withContentSri(cache, integrity, (cpath, sri) => {
     // get size
     return lstat(cpath).then(stat => ({ stat, cpath, sri }))
   }).then(({ stat, cpath, sri }) => {
-    if (typeof opts.size === 'number' && stat.size !== opts.size) {
-      throw sizeError(opts.size, stat.size)
+    if (typeof size === 'number' && stat.size !== size) {
+      throw sizeError(size, stat.size)
     }
     if (stat.size > MAX_SINGLE_READ_SIZE) {
       return readPipeline(cpath, stat.size, sri, new Pipeline()).concat()
@@ -57,12 +52,12 @@ const readPipeline = (cpath, size, sri, stream) => {
 
 module.exports.sync = readSync
 
-function readSync (cache, integrity, opts) {
-  opts = ReadOpts(opts)
+function readSync (cache, integrity, opts = {}) {
+  const { size } = opts
   return withContentSriSync(cache, integrity, (cpath, sri) => {
     const data = fs.readFileSync(cpath)
-    if (typeof opts.size === 'number' && opts.size !== data.length) {
-      throw sizeError(opts.size, data.length)
+    if (typeof size === 'number' && size !== data.length) {
+      throw sizeError(size, data.length)
     }
 
     if (ssri.checkData(data, sri)) {
@@ -76,16 +71,15 @@ function readSync (cache, integrity, opts) {
 module.exports.stream = readStream
 module.exports.readStream = readStream
 
-function readStream (cache, integrity, opts) {
-  opts = ReadOpts(opts)
-
+function readStream (cache, integrity, opts = {}) {
+  const { size } = opts
   const stream = new Pipeline()
   withContentSri(cache, integrity, (cpath, sri) => {
     // just lstat to ensure it exists
     return lstat(cpath).then((stat) => ({ stat, cpath, sri }))
   }).then(({ stat, cpath, sri }) => {
-    if (typeof opts.size === 'number' && opts.size !== stat.size) {
-      return stream.emit('error', sizeError(opts.size, stat.size))
+    if (typeof size === 'number' && size !== stat.size) {
+      return stream.emit('error', sizeError(size, stat.size))
     }
     readPipeline(cpath, stat.size, sri, stream)
   }, er => stream.emit('error', er))
@@ -100,15 +94,13 @@ if (fs.copyFile) {
   copyFile = util.promisify(fs.copyFile)
 }
 
-function copy (cache, integrity, dest, opts) {
-  opts = ReadOpts(opts)
+function copy (cache, integrity, dest) {
   return withContentSri(cache, integrity, (cpath, sri) => {
     return copyFile(cpath, dest)
   })
 }
 
-function copySync (cache, integrity, dest, opts) {
-  opts = ReadOpts(opts)
+function copySync (cache, integrity, dest) {
   return withContentSriSync(cache, integrity, (cpath, sri) => {
     return fs.copyFileSync(cpath, dest)
   })

package/lib/content/write.js

@@ -4,7 +4,7 @@ const util = require('util')
 
 const contentPath = require('./path')
 const fixOwner = require('../util/fix-owner')
-const fs = require('graceful-fs')
+const fs = require('fs')
 const moveFile = require('../util/move-file')
 const Minipass = require('minipass')
 const Pipeline = require('minipass-pipeline')
@@ -20,19 +20,17 @@ const writeFile = util.promisify(fs.writeFile)
 
 module.exports = write
 
-function write (cache, data, opts) {
-  opts = opts || {}
-  if (opts.algorithms && opts.algorithms.length > 1) {
+function write (cache, data, opts = {}) {
+  const { algorithms, size, integrity } = opts
+  if (algorithms && algorithms.length > 1) {
     throw new Error('opts.algorithms only supports a single algorithm for now')
   }
-  if (typeof opts.size === 'number' && data.length !== opts.size) {
-    return Promise.reject(sizeError(opts.size, data.length))
+  if (typeof size === 'number' && data.length !== size) {
+    return Promise.reject(sizeError(size, data.length))
   }
-  const sri = ssri.fromData(data, {
-    algorithms: opts.algorithms
-  })
-  if (opts.integrity && !ssri.checkData(data, opts.integrity, opts)) {
-    return Promise.reject(checksumError(opts.integrity, sri))
+  const sri = ssri.fromData(data, algorithms ? { algorithms } : {})
+  if (integrity && !ssri.checkData(data, integrity, opts)) {
+    return Promise.reject(checksumError(integrity, sri))
   }
 
   return disposer(makeTmp(cache, opts), makeTmpDisposer,
@@ -90,8 +88,7 @@ class CacacheWriteStream extends Flush {
   }
 }
 
-function writeStream (cache, opts) {
-  opts = opts || {}
+function writeStream (cache, opts = {}) {
   return new CacacheWriteStream(cache, opts)
 }
 

package/lib/entry-index.js

@@ -3,8 +3,7 @@
 const util = require('util')
 
 const crypto = require('crypto')
-const figgyPudding = require('figgy-pudding')
-const fs = require('graceful-fs')
+const fs = require('fs')
 const Minipass = require('minipass')
 const path = require('path')
 const ssri = require('ssri')
@@ -26,22 +25,17 @@ module.exports.NotFoundError = class NotFoundError extends Error {
   }
 }
 
-const IndexOpts = figgyPudding({
-  metadata: {},
-  size: {}
-})
-
 module.exports.insert = insert
 
-function insert (cache, key, integrity, opts) {
-  opts = IndexOpts(opts)
+function insert (cache, key, integrity, opts = {}) {
+  const { metadata, size } = opts
   const bucket = bucketPath(cache, key)
   const entry = {
     key,
     integrity: integrity && ssri.stringify(integrity),
     time: Date.now(),
-    size: opts.size,
-    metadata: opts.metadata
+    size,
+    metadata
   }
   return fixOwner
     .mkdirfix(cache, path.dirname(bucket))
@@ -75,15 +69,15 @@ function insert (cache, key, integrity, opts) {
 
 module.exports.insert.sync = insertSync
 
-function insertSync (cache, key, integrity, opts) {
-  opts = IndexOpts(opts)
+function insertSync (cache, key, integrity, opts = {}) {
+  const { metadata, size } = opts
   const bucket = bucketPath(cache, key)
   const entry = {
     key,
     integrity: integrity && ssri.stringify(integrity),
     time: Date.now(),
-    size: opts.size,
-    metadata: opts.metadata
+    size,
+    metadata
   }
   fixOwner.mkdirfix.sync(cache, path.dirname(bucket))
   const stringified = JSON.stringify(entry)

package/lib/util/move-file.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const fs = require('graceful-fs')
+const fs = require('fs')
 const util = require('util')
 const chmod = util.promisify(fs.chmod)
 const unlink = util.promisify(fs.unlink)

package/lib/util/tmp.js

@@ -2,22 +2,17 @@
 
 const util = require('util')
 
-const figgyPudding = require('figgy-pudding')
 const fixOwner = require('./fix-owner')
 const path = require('path')
 const rimraf = util.promisify(require('rimraf'))
 const uniqueFilename = require('unique-filename')
 const { disposer } = require('./disposer')
 
-const TmpOpts = figgyPudding({
-  tmpPrefix: {}
-})
-
 module.exports.mkdir = mktmpdir
 
-function mktmpdir (cache, opts) {
-  opts = TmpOpts(opts)
-  const tmpTarget = uniqueFilename(path.join(cache, 'tmp'), opts.tmpPrefix)
+function mktmpdir (cache, opts = {}) {
+  const { tmpPrefix } = opts
+  const tmpTarget = uniqueFilename(path.join(cache, 'tmp'), tmpPrefix)
   return fixOwner.mkdirfix(cache, tmpTarget).then(() => {
     return tmpTarget
   })
@@ -28,10 +23,8 @@ module.exports.withTmp = withTmp
 function withTmp (cache, opts, cb) {
   if (!cb) {
     cb = opts
-    opts = null
+    opts = {}
   }
-  opts = TmpOpts(opts)
-
   return disposer(mktmpdir(cache, opts), rimraf, cb)
 }
 

package/lib/verify.js

@@ -4,9 +4,8 @@ const util = require('util')
 
 const pMap = require('p-map')
 const contentPath = require('./content/path')
-const figgyPudding = require('figgy-pudding')
 const fixOwner = require('./util/fix-owner')
-const fs = require('graceful-fs')
+const fs = require('fs')
 const fsm = require('fs-minipass')
 const glob = util.promisify(require('glob'))
 const index = require('./entry-index')
@@ -22,20 +21,16 @@ const truncate = util.promisify(fs.truncate)
 const writeFile = util.promisify(fs.writeFile)
 const readFile = util.promisify(fs.readFile)
 
-const VerifyOpts = figgyPudding({
-  concurrency: {
-    default: 20
-  },
-  filter: {},
-  log: {
-    default: { silly () {} }
-  }
+const verifyOpts = (opts) => ({
+  concurrency: 20,
+  log: { silly () {} },
+  ...opts
 })
 
 module.exports = verify
 
 function verify (cache, opts) {
-  opts = VerifyOpts(opts)
+  opts = verifyOpts(opts)
   opts.log.silly('verify', 'verifying cache at', cache)
 
   const steps = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cacache",
-  "version": "14.0.0",
+  "version": "15.0.0",
   "cache-version": {
     "content": "2",
     "index": "5"
@@ -9,19 +9,19 @@
   "main": "index.js",
   "files": [
     "*.js",
-    "lib",
-    "locales"
+    "lib"
   ],
   "scripts": {
     "benchmarks": "node test/benchmarks",
+    "lint": "standard",
+    "postrelease": "npm publish",
+    "posttest": "npm run lint",
+    "prepublishOnly": "git push --follow-tags",
     "prerelease": "npm t",
-    "postrelease": "npm publish && git push --follow-tags",
-    "pretest": "standard",
     "release": "standard-version -s",
-    "test": "tap test/*.js",
-    "test-docker": "docker run -it --rm --name pacotest -v \"$PWD\":/tmp -w /tmp node:latest npm test",
-    "update-coc": "weallbehave -o . && git add CODE_OF_CONDUCT.md && git commit -m 'docs(coc): updated CODE_OF_CONDUCT.md'",
-    "update-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'"
+    "test": "tap",
+    "coverage": "tap",
+    "test-docker": "docker run -it --rm --name pacotest -v \"$PWD\":/tmp -w /tmp node:latest npm test"
   },
   "repository": "https://github.com/npm/cacache",
   "keywords": [
@@ -59,13 +59,11 @@
   "license": "ISC",
   "dependencies": {
     "chownr": "^1.1.2",
-    "figgy-pudding": "^3.5.1",
     "fs-minipass": "^2.0.0",
     "glob": "^7.1.4",
-    "graceful-fs": "^4.2.2",
     "infer-owner": "^1.0.4",
     "lru-cache": "^5.1.1",
-    "minipass": "^3.0.0",
+    "minipass": "^3.1.1",
     "minipass-collect": "^1.0.2",
     "minipass-flush": "^1.0.5",
     "minipass-pipeline": "^1.2.2",
@@ -74,24 +72,22 @@
     "p-map": "^3.0.0",
     "promise-inflight": "^1.0.1",
     "rimraf": "^2.7.1",
-    "ssri": "^7.0.0",
-    "tar": "^6.0.0",
+    "ssri": "^8.0.0",
+    "tar": "^6.0.1",
     "unique-filename": "^1.1.1"
   },
   "devDependencies": {
     "benchmark": "^2.1.4",
     "chalk": "^2.4.2",
-    "cross-env": "^5.2.1",
     "require-inject": "^1.4.4",
-    "standard": "^14.3.0",
-    "standard-version": "^7.0.0",
+    "standard": "^14.3.1",
+    "standard-version": "^7.1.0",
     "tacks": "^1.3.0",
-    "tap": "^14.6.9",
-    "weallbehave": "^1.2.0",
-    "weallcontribute": "^1.0.9"
+    "tap": "^14.10.6"
   },
   "tap": {
-    "100": true
+    "100": true,
+    "test-regex": "test/[^/]*.js"
   },
   "engines": {
     "node": ">= 10"

package/put.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const figgyPudding = require('figgy-pudding')
 const index = require('./lib/entry-index')
 const memo = require('./lib/memoization')
 const write = require('./lib/content/write')
@@ -8,31 +7,21 @@ const Flush = require('minipass-flush')
 const { PassThrough } = require('minipass-collect')
 const Pipeline = require('minipass-pipeline')
 
-const PutOpts = figgyPudding({
-  algorithms: {
-    default: ['sha512']
-  },
-  integrity: {},
-  memoize: {},
-  metadata: {},
-  pickAlgorithm: {},
-  size: {},
-  tmpPrefix: {},
-  single: {},
-  sep: {},
-  error: {},
-  strict: {}
+const putOpts = (opts) => ({
+  algorithms: ['sha512'],
+  ...opts
 })
 
 module.exports = putData
 
-function putData (cache, key, data, opts) {
-  opts = PutOpts(opts)
+function putData (cache, key, data, opts = {}) {
+  const { memoize } = opts
+  opts = putOpts(opts)
   return write(cache, data, opts).then((res) => {
     return index
-      .insert(cache, key, res.integrity, opts.concat({ size: res.size }))
+      .insert(cache, key, res.integrity, { ...opts, size: res.size })
       .then((entry) => {
-        if (opts.memoize) {
+        if (memoize) {
           memo.put(cache, entry, data, opts)
         }
         return res.integrity
@@ -42,8 +31,9 @@ function putData (cache, key, data, opts) {
 
 module.exports.stream = putStream
 
-function putStream (cache, key, opts) {
-  opts = PutOpts(opts)
+function putStream (cache, key, opts = {}) {
+  const { memoize } = opts
+  opts = putOpts(opts)
   let integrity
   let size
 
@@ -51,7 +41,7 @@ function putStream (cache, key, opts) {
   const pipeline = new Pipeline()
   // first item in the pipeline is the memoizer, because we need
   // that to end first and get the collected data.
-  if (opts.memoize) {
+  if (memoize) {
     const memoizer = new PassThrough().on('collect', data => {
       memoData = data
     })
@@ -75,9 +65,9 @@ function putStream (cache, key, opts) {
   pipeline.push(new Flush({
     flush () {
       return index
-        .insert(cache, key, integrity, opts.concat({ size }))
+        .insert(cache, key, integrity, { ...opts, size })
         .then((entry) => {
-          if (opts.memoize && memoData) {
+          if (memoize && memoData) {
             memo.put(cache, entry, memoData, opts)
           }
           if (integrity) {