cacache 16.1.3 → 17.0.1

package/README.md

@@ -601,7 +601,7 @@ See: [options](#tmp-options)
 
 ```javascript
 cacache.tmp.withTmp(cache, dir => {
-  return fs.writeFileAsync(path.join(dir, 'blablabla'), Buffer#<1234>, ...)
+  return fs.writeFile(path.join(dir, 'blablabla'), 'blabla contents', { encoding: 'utf8' })
 }).then(() => {
   // `dir` no longer exists
 })

package/lib/content/read.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const fs = require('@npmcli/fs')
+const fs = require('fs/promises')
 const fsm = require('fs-minipass')
 const ssri = require('ssri')
 const contentPath = require('./path')
@@ -46,24 +46,6 @@ const readPipeline = (cpath, size, sri, stream) => {
   return stream
 }
 
-module.exports.sync = readSync
-
-function readSync (cache, integrity, opts = {}) {
-  const { size } = opts
-  return withContentSriSync(cache, integrity, (cpath, sri) => {
-    const data = fs.readFileSync(cpath, { encoding: null })
-    if (typeof size === 'number' && size !== data.length) {
-      throw sizeError(size, data.length)
-    }
-
-    if (ssri.checkData(data, sri)) {
-      return data
-    }
-
-    throw integrityError(sri, cpath)
-  })
-}
-
 module.exports.stream = readStream
 module.exports.readStream = readStream
 
@@ -88,7 +70,6 @@ function readStream (cache, integrity, opts = {}) {
 }
 
 module.exports.copy = copy
-module.exports.copy.sync = copySync
 
 function copy (cache, integrity, dest) {
   return withContentSri(cache, integrity, (cpath, sri) => {
@@ -96,12 +77,6 @@ function copy (cache, integrity, dest) {
   })
 }
 
-function copySync (cache, integrity, dest) {
-  return withContentSriSync(cache, integrity, (cpath, sri) => {
-    return fs.copyFileSync(cpath, dest)
-  })
-}
-
 module.exports.hasContent = hasContent
 
 async function hasContent (cache, integrity) {
@@ -130,34 +105,6 @@ async function hasContent (cache, integrity) {
   }
 }
 
-module.exports.hasContent.sync = hasContentSync
-
-function hasContentSync (cache, integrity) {
-  if (!integrity) {
-    return false
-  }
-
-  return withContentSriSync(cache, integrity, (cpath, sri) => {
-    try {
-      const stat = fs.statSync(cpath)
-      return { size: stat.size, sri, stat }
-    } catch (err) {
-      if (err.code === 'ENOENT') {
-        return false
-      }
-
-      if (err.code === 'EPERM') {
-        /* istanbul ignore else */
-        if (process.platform !== 'win32') {
-          throw err
-        } else {
-          return false
-        }
-      }
-    }
-  })
-}
-
 async function withContentSri (cache, integrity, fn) {
   const sri = ssri.parse(integrity)
   // If `integrity` has multiple entries, pick the first digest
@@ -201,28 +148,6 @@ async function withContentSri (cache, integrity, fn) {
   }
 }
 
-function withContentSriSync (cache, integrity, fn) {
-  const sri = ssri.parse(integrity)
-  // If `integrity` has multiple entries, pick the first digest
-  // with available local data.
-  const algo = sri.pickAlgorithm()
-  const digests = sri[algo]
-  if (digests.length <= 1) {
-    const cpath = contentPath(cache, digests[0])
-    return fn(cpath, digests[0])
-  } else {
-    let lastErr = null
-    for (const meta of digests) {
-      try {
-        return withContentSriSync(cache, meta, fn)
-      } catch (err) {
-        lastErr = err
-      }
-    }
-    throw lastErr
-  }
-}
-
 function sizeError (expected, found) {
   /* eslint-disable-next-line max-len */
   const err = new Error(`Bad data size: expected inserted data to be ${expected} bytes, but got ${found} instead`)

package/lib/content/rm.js

@@ -1,10 +1,8 @@
 'use strict'
 
-const util = require('util')
-
+const fs = require('fs/promises')
 const contentPath = require('./path')
 const { hasContent } = require('./read')
-const rimraf = util.promisify(require('rimraf'))
 
 module.exports = rm
 
@@ -12,7 +10,7 @@ async function rm (cache, integrity) {
   const content = await hasContent(cache, integrity)
   // ~pretty~ sure we can't end up with a content lacking sri, but be safe
   if (content && content.sri) {
-    await rimraf(contentPath(cache, content.sri))
+    await fs.rm(contentPath(cache, content.sri), { recursive: true, force: true })
     return true
   } else {
     return false

package/lib/content/write.js

@@ -1,17 +1,14 @@
 'use strict'
 
 const events = require('events')
-const util = require('util')
 
 const contentPath = require('./path')
-const fixOwner = require('../util/fix-owner')
-const fs = require('@npmcli/fs')
+const fs = require('fs/promises')
 const moveFile = require('../util/move-file')
 const Minipass = require('minipass')
 const Pipeline = require('minipass-pipeline')
 const Flush = require('minipass-flush')
 const path = require('path')
-const rimraf = util.promisify(require('rimraf'))
 const ssri = require('ssri')
 const uniqueFilename = require('unique-filename')
 const fsm = require('fs-minipass')
@@ -40,7 +37,7 @@ async function write (cache, data, opts = {}) {
     return { integrity: sri, size: data.length }
   } finally {
     if (!tmp.moved) {
-      await rimraf(tmp.target)
+      await fs.rm(tmp.target, { recursive: true, force: true })
     }
   }
 }
@@ -111,7 +108,7 @@ async function handleContent (inputStream, cache, opts) {
     return res
   } finally {
     if (!tmp.moved) {
-      await rimraf(tmp.target)
+      await fs.rm(tmp.target, { recursive: true, force: true })
     }
   }
 }
@@ -152,7 +149,7 @@ async function pipeToTmp (inputStream, cache, tmpTarget, opts) {
 
 async function makeTmp (cache, opts) {
   const tmpTarget = uniqueFilename(path.join(cache, 'tmp'), opts.tmpPrefix)
-  await fixOwner.mkdirfix(cache, path.dirname(tmpTarget))
+  await fs.mkdir(path.dirname(tmpTarget), { recursive: true })
   return {
     target: tmpTarget,
     moved: false,
@@ -163,10 +160,9 @@ async function moveToDestination (tmp, cache, sri, opts) {
   const destination = contentPath(cache, sri)
   const destDir = path.dirname(destination)
 
-  await fixOwner.mkdirfix(cache, destDir)
+  await fs.mkdir(destDir, { recursive: true })
   await moveFile(tmp.target, destination)
   tmp.moved = true
-  await fixOwner.chownr(cache, destination)
 }
 
 function sizeError (expected, found) {

package/lib/entry-index.js

@@ -1,21 +1,23 @@
 'use strict'
 
-const util = require('util')
 const crypto = require('crypto')
-const fs = require('@npmcli/fs')
+const {
+  appendFile,
+  mkdir,
+  readFile,
+  readdir,
+  rm,
+  writeFile,
+} = require('fs/promises')
 const Minipass = require('minipass')
 const path = require('path')
 const ssri = require('ssri')
 const uniqueFilename = require('unique-filename')
 
 const contentPath = require('./content/path')
-const fixOwner = require('./util/fix-owner')
 const hashToSegments = require('./util/hash-to-segments')
 const indexV = require('../package.json')['cache-version'].index
 const moveFile = require('@npmcli/move-file')
-const _rimraf = require('rimraf')
-const rimraf = util.promisify(_rimraf)
-rimraf.sync = _rimraf.sync
 
 module.exports.NotFoundError = class NotFoundError extends Error {
   constructor (cache, key) {
@@ -66,7 +68,7 @@ async function compact (cache, key, matchFn, opts = {}) {
 
   const setup = async () => {
     const target = uniqueFilename(path.join(cache, 'tmp'), opts.tmpPrefix)
-    await fixOwner.mkdirfix(cache, path.dirname(target))
+    await mkdir(path.dirname(target), { recursive: true })
     return {
       target,
       moved: false,
@@ -75,24 +77,17 @@ async function compact (cache, key, matchFn, opts = {}) {
 
   const teardown = async (tmp) => {
     if (!tmp.moved) {
-      return rimraf(tmp.target)
+      return rm(tmp.target, { recursive: true, force: true })
     }
   }
 
   const write = async (tmp) => {
-    await fs.writeFile(tmp.target, newIndex, { flag: 'wx' })
-    await fixOwner.mkdirfix(cache, path.dirname(bucket))
+    await writeFile(tmp.target, newIndex, { flag: 'wx' })
+    await mkdir(path.dirname(bucket), { recursive: true })
     // we use @npmcli/move-file directly here because we
     // want to overwrite the existing file
     await moveFile(tmp.target, bucket)
     tmp.moved = true
-    try {
-      await fixOwner.chownr(cache, bucket)
-    } catch (err) {
-      if (err.code !== 'ENOENT') {
-        throw err
-      }
-    }
   }
 
   // write the file atomically
@@ -124,7 +119,7 @@ async function insert (cache, key, integrity, opts = {}) {
     metadata,
   }
   try {
-    await fixOwner.mkdirfix(cache, path.dirname(bucket))
+    await mkdir(path.dirname(bucket), { recursive: true })
     const stringified = JSON.stringify(entry)
     // NOTE - Cleverness ahoy!
     //
@@ -134,44 +129,13 @@ async function insert (cache, key, integrity, opts = {}) {
     //
     // Thanks to @isaacs for the whiteboarding session that ended up with
     // this.
-    await fs.appendFile(bucket, `\n${hashEntry(stringified)}\t${stringified}`)
-    await fixOwner.chownr(cache, bucket)
+    await appendFile(bucket, `\n${hashEntry(stringified)}\t${stringified}`)
   } catch (err) {
     if (err.code === 'ENOENT') {
       return undefined
     }
 
     throw err
-    // There's a class of race conditions that happen when things get deleted
-    // during fixOwner, or between the two mkdirfix/chownr calls.
-    //
-    // It's perfectly fine to just not bother in those cases and lie
-    // that the index entry was written. Because it's a cache.
-  }
-  return formatEntry(cache, entry)
-}
-
-module.exports.insert.sync = insertSync
-
-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,
-    metadata,
-  }
-  fixOwner.mkdirfix.sync(cache, path.dirname(bucket))
-  const stringified = JSON.stringify(entry)
-  fs.appendFileSync(bucket, `\n${hashEntry(stringified)}\t${stringified}`)
-  try {
-    fixOwner.chownr.sync(cache, bucket)
-  } catch (err) {
-    if (err.code !== 'ENOENT') {
-      throw err
-    }
   }
   return formatEntry(cache, entry)
 }
@@ -198,27 +162,6 @@ async function find (cache, key) {
   }
 }
 
-module.exports.find.sync = findSync
-
-function findSync (cache, key) {
-  const bucket = bucketPath(cache, key)
-  try {
-    return bucketEntriesSync(bucket).reduce((latest, next) => {
-      if (next && next.key === key) {
-        return formatEntry(cache, next)
-      } else {
-        return latest
-      }
-    }, null)
-  } catch (err) {
-    if (err.code === 'ENOENT') {
-      return null
-    } else {
-      throw err
-    }
-  }
-}
-
 module.exports.delete = del
 
 function del (cache, key, opts = {}) {
@@ -227,18 +170,7 @@ function del (cache, key, opts = {}) {
   }
 
   const bucket = bucketPath(cache, key)
-  return rimraf(bucket)
-}
-
-module.exports.delete.sync = delSync
-
-function delSync (cache, key, opts = {}) {
-  if (!opts.removeFully) {
-    return insertSync(cache, key, null, opts)
-  }
-
-  const bucket = bucketPath(cache, key)
-  return rimraf.sync(bucket)
+  return rm(bucket, { recursive: true, force: true })
 }
 
 module.exports.lsStream = lsStream
@@ -304,14 +236,7 @@ async function ls (cache) {
 module.exports.bucketEntries = bucketEntries
 
 async function bucketEntries (bucket, filter) {
-  const data = await fs.readFile(bucket, 'utf8')
-  return _bucketEntries(data, filter)
-}
-
-module.exports.bucketEntries.sync = bucketEntriesSync
-
-function bucketEntriesSync (bucket, filter) {
-  const data = fs.readFileSync(bucket, 'utf8')
+  const data = await readFile(bucket, 'utf8')
   return _bucketEntries(data, filter)
 }
 
@@ -331,10 +256,11 @@ function _bucketEntries (data, filter) {
     let obj
     try {
       obj = JSON.parse(pieces[1])
-    } catch (e) {
-      // Entry is corrupted!
-      return
+    } catch (_) {
+      // eslint-ignore-next-line no-empty-block
     }
+    // coverage disabled here, no need to test with an entry that parses to something falsey
+    // istanbul ignore else
     if (obj) {
       entries.push(obj)
     }
@@ -394,7 +320,7 @@ function formatEntry (cache, entry, keepAll) {
 }
 
 function readdirOrEmpty (dir) {
-  return fs.readdir(dir).catch((err) => {
+  return readdir(dir).catch((err) => {
     if (err.code === 'ENOENT' || err.code === 'ENOTDIR') {
       return []
     }

package/lib/get.js

@@ -53,61 +53,6 @@ async function getDataByDigest (cache, key, opts = {}) {
 }
 module.exports.byDigest = getDataByDigest
 
-function getDataSync (cache, key, opts = {}) {
-  const { integrity, memoize, size } = opts
-  const memoized = memo.get(cache, key, opts)
-
-  if (memoized && memoize !== false) {
-    return {
-      metadata: memoized.entry.metadata,
-      data: memoized.data,
-      integrity: memoized.entry.integrity,
-      size: memoized.entry.size,
-    }
-  }
-  const entry = index.find.sync(cache, key, opts)
-  if (!entry) {
-    throw new index.NotFoundError(cache, key)
-  }
-  const data = read.sync(cache, entry.integrity, {
-    integrity: integrity,
-    size: size,
-  })
-  const res = {
-    metadata: entry.metadata,
-    data: data,
-    size: entry.size,
-    integrity: entry.integrity,
-  }
-  if (memoize) {
-    memo.put(cache, entry, res.data, opts)
-  }
-
-  return res
-}
-
-module.exports.sync = getDataSync
-
-function getDataByDigestSync (cache, digest, opts = {}) {
-  const { integrity, memoize, size } = opts
-  const memoized = memo.get.byDigest(cache, digest, opts)
-
-  if (memoized && memoize !== false) {
-    return memoized
-  }
-
-  const res = read.sync(cache, digest, {
-    integrity: integrity,
-    size: size,
-  })
-  if (memoize) {
-    memo.put.byDigest(cache, digest, res, opts)
-  }
-
-  return res
-}
-module.exports.sync.byDigest = getDataByDigestSync
-
 const getMemoizedStream = (memoized) => {
   const stream = new Minipass()
   stream.on('newListener', function (ev, cb) {

package/lib/index.js

@@ -17,15 +17,12 @@ module.exports.ls.stream = index.lsStream
 
 module.exports.get = get
 module.exports.get.byDigest = get.byDigest
-module.exports.get.sync = get.sync
-module.exports.get.sync.byDigest = get.sync.byDigest
 module.exports.get.stream = get.stream
 module.exports.get.stream.byDigest = get.stream.byDigest
 module.exports.get.copy = get.copy
 module.exports.get.copy.byDigest = get.copy.byDigest
 module.exports.get.info = get.info
 module.exports.get.hasContent = get.hasContent
-module.exports.get.hasContent.sync = get.hasContent.sync
 
 module.exports.put = put
 module.exports.put.stream = put.stream

package/lib/rm.js

@@ -1,11 +1,10 @@
 'use strict'
 
-const util = require('util')
-
+const { rm } = require('fs/promises')
+const glob = require('./util/glob.js')
 const index = require('./entry-index')
 const memo = require('./memoization')
 const path = require('path')
-const rimraf = util.promisify(require('rimraf'))
 const rmContent = require('./content/rm')
 
 module.exports = entry
@@ -25,7 +24,8 @@ function content (cache, integrity) {
 
 module.exports.all = all
 
-function all (cache) {
+async function all (cache) {
   memo.clearMemoized()
-  return rimraf(path.join(cache, '*(content-*|index-*)'))
+  const paths = await glob(path.join(cache, '*(content-*|index-*)'), { silent: true, nosort: true })
+  return Promise.all(paths.map((p) => rm(p, { recursive: true, force: true })))
 }

package/lib/util/glob.js

@@ -0,0 +1,7 @@
+'use strict'
+
+const { promisify } = require('util')
+const glob = promisify(require('glob'))
+
+const globify = (pattern) => pattern.split('//').join('/')
+module.exports = (path, options) => glob(globify(path), options)

package/lib/util/move-file.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const fs = require('@npmcli/fs')
+const fs = require('fs/promises')
 const move = require('@npmcli/move-file')
 const pinflight = require('promise-inflight')
 

package/lib/util/tmp.js

@@ -1,8 +1,7 @@
 'use strict'
 
-const fs = require('@npmcli/fs')
-
-const fixOwner = require('./fix-owner')
+const { withTempDir } = require('@npmcli/fs')
+const fs = require('fs/promises')
 const path = require('path')
 
 module.exports.mkdir = mktmpdir
@@ -23,11 +22,5 @@ function withTmp (cache, opts, cb) {
     cb = opts
     opts = {}
   }
-  return fs.withTempDir(path.join(cache, 'tmp'), cb, opts)
-}
-
-module.exports.fix = fixtmpdir
-
-function fixtmpdir (cache) {
-  return fixOwner(cache, path.join(cache, 'tmp'))
+  return withTempDir(path.join(cache, 'tmp'), cb, opts)
 }

package/lib/verify.js

@@ -1,20 +1,21 @@
 'use strict'
 
-const util = require('util')
-
+const {
+  mkdir,
+  readFile,
+  rm,
+  stat,
+  truncate,
+  writeFile,
+} = require('fs/promises')
 const pMap = require('p-map')
 const contentPath = require('./content/path')
-const fixOwner = require('./util/fix-owner')
-const fs = require('@npmcli/fs')
 const fsm = require('fs-minipass')
-const glob = util.promisify(require('glob'))
+const glob = require('./util/glob.js')
 const index = require('./entry-index')
 const path = require('path')
-const rimraf = util.promisify(require('rimraf'))
 const ssri = require('ssri')
 
-const globify = pattern => pattern.split('\\').join('/')
-
 const hasOwnProperty = (obj, key) =>
   Object.prototype.hasOwnProperty.call(obj, key)
 
@@ -77,9 +78,7 @@ async function markEndTime (cache, opts) {
 
 async function fixPerms (cache, opts) {
   opts.log.silly('verify', 'fixing cache permissions')
-  await fixOwner.mkdirfix(cache, cache)
-  // TODO - fix file permissions too
-  await fixOwner.chownr(cache, cache)
+  await mkdir(cache, { recursive: true })
   return null
 }
 
@@ -90,7 +89,7 @@ async function fixPerms (cache, opts) {
 // 2. Mark each integrity value as "live"
 // 3. Read entire filesystem tree in `content-vX/` dir
 // 4. If content is live, verify its checksum and delete it if it fails
-// 5. If content is not marked as live, rimraf it.
+// 5. If content is not marked as live, rm it.
 //
 async function garbageCollect (cache, opts) {
   opts.log.silly('verify', 'garbage collecting content')
@@ -107,7 +106,7 @@ async function garbageCollect (cache, opts) {
     indexStream.on('end', resolve).on('error', reject)
   })
   const contentDir = contentPath.contentDir(cache)
-  const files = await glob(globify(path.join(contentDir, '**')), {
+  const files = await glob(path.join(contentDir, '**'), {
     follow: false,
     nodir: true,
     nosort: true,
@@ -139,8 +138,8 @@ async function garbageCollect (cache, opts) {
       } else {
         // No entries refer to this content. We can delete.
         stats.reclaimedCount++
-        const s = await fs.stat(f)
-        await rimraf(f)
+        const s = await stat(f)
+        await rm(f, { recursive: true, force: true })
         stats.reclaimedSize += s.size
       }
       return stats
@@ -153,7 +152,7 @@ async function garbageCollect (cache, opts) {
 async function verifyContent (filepath, sri) {
   const contentInfo = {}
   try {
-    const { size } = await fs.stat(filepath)
+    const { size } = await stat(filepath)
     contentInfo.size = size
     contentInfo.valid = true
     await ssri.checkStream(new fsm.ReadStream(filepath), sri)
@@ -165,7 +164,7 @@ async function verifyContent (filepath, sri) {
       throw err
     }
 
-    await rimraf(filepath)
+    await rm(filepath, { recursive: true, force: true })
     contentInfo.valid = false
   }
   return contentInfo
@@ -211,13 +210,13 @@ async function rebuildIndex (cache, opts) {
 }
 
 async function rebuildBucket (cache, bucket, stats, opts) {
-  await fs.truncate(bucket._path)
+  await truncate(bucket._path)
   // This needs to be serialized because cacache explicitly
   // lets very racy bucket conflicts clobber each other.
   for (const entry of bucket) {
     const content = contentPath(cache, entry.integrity)
     try {
-      await fs.stat(content)
+      await stat(content)
       await index.insert(cache, entry.key, entry.integrity, {
         metadata: entry.metadata,
         size: entry.size,
@@ -236,22 +235,18 @@ async function rebuildBucket (cache, bucket, stats, opts) {
 
 function cleanTmp (cache, opts) {
   opts.log.silly('verify', 'cleaning tmp directory')
-  return rimraf(path.join(cache, 'tmp'))
+  return rm(path.join(cache, 'tmp'), { recursive: true, force: true })
 }
 
-function writeVerifile (cache, opts) {
+async function writeVerifile (cache, opts) {
   const verifile = path.join(cache, '_lastverified')
   opts.log.silly('verify', 'writing verifile to ' + verifile)
-  try {
-    return fs.writeFile(verifile, `${Date.now()}`)
-  } finally {
-    fixOwner.chownr.sync(cache, verifile)
-  }
+  return writeFile(verifile, `${Date.now()}`)
 }
 
 module.exports.lastRun = lastRun
 
 async function lastRun (cache) {
-  const data = await fs.readFile(path.join(cache, '_lastverified'), { encoding: 'utf8' })
+  const data = await readFile(path.join(cache, '_lastverified'), { encoding: 'utf8' })
   return new Date(+data)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cacache",
-  "version": "16.1.3",
+  "version": "17.0.1",
   "cache-version": {
     "content": "2",
     "index": "5"
@@ -12,9 +12,6 @@
     "lib/"
   ],
   "scripts": {
-    "preversion": "npm test",
-    "postversion": "npm publish",
-    "prepublishOnly": "git push origin --follow-tags",
     "test": "tap",
     "snap": "tap",
     "coverage": "tap",
@@ -48,37 +45,39 @@
   ],
   "license": "ISC",
   "dependencies": {
-    "@npmcli/fs": "^2.1.0",
-    "@npmcli/move-file": "^2.0.0",
-    "chownr": "^2.0.0",
+    "@npmcli/fs": "^3.0.0",
+    "@npmcli/move-file": "^3.0.0",
     "fs-minipass": "^2.1.0",
     "glob": "^8.0.1",
-    "infer-owner": "^1.0.4",
     "lru-cache": "^7.7.1",
     "minipass": "^3.1.6",
     "minipass-collect": "^1.0.2",
     "minipass-flush": "^1.0.5",
     "minipass-pipeline": "^1.2.4",
-    "mkdirp": "^1.0.4",
     "p-map": "^4.0.0",
     "promise-inflight": "^1.0.1",
-    "rimraf": "^3.0.2",
-    "ssri": "^9.0.0",
+    "ssri": "^10.0.0",
     "tar": "^6.1.11",
-    "unique-filename": "^2.0.0"
+    "unique-filename": "^3.0.0"
   },
   "devDependencies": {
-    "@npmcli/eslint-config": "^3.0.1",
-    "@npmcli/template-oss": "3.5.0",
+    "@npmcli/eslint-config": "^4.0.0",
+    "@npmcli/template-oss": "4.5.1",
     "tap": "^16.0.0"
   },
   "engines": {
-    "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+    "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
     "windowsCI": false,
-    "version": "3.5.0"
+    "version": "4.5.1"
   },
-  "author": "GitHub Inc."
+  "author": "GitHub Inc.",
+  "tap": {
+    "nyc-arg": [
+      "--exclude",
+      "tap-snapshots/**"
+    ]
+  }
 }

package/lib/util/fix-owner.js

@@ -1,145 +0,0 @@
-'use strict'
-
-const util = require('util')
-
-const chownr = util.promisify(require('chownr'))
-const mkdirp = require('mkdirp')
-const inflight = require('promise-inflight')
-const inferOwner = require('infer-owner')
-
-// Memoize getuid()/getgid() calls.
-// patch process.setuid/setgid to invalidate cached value on change
-const self = { uid: null, gid: null }
-const getSelf = () => {
-  if (typeof self.uid !== 'number') {
-    self.uid = process.getuid()
-    const setuid = process.setuid
-    process.setuid = (uid) => {
-      self.uid = null
-      process.setuid = setuid
-      return process.setuid(uid)
-    }
-  }
-  if (typeof self.gid !== 'number') {
-    self.gid = process.getgid()
-    const setgid = process.setgid
-    process.setgid = (gid) => {
-      self.gid = null
-      process.setgid = setgid
-      return process.setgid(gid)
-    }
-  }
-}
-
-module.exports.chownr = fixOwner
-
-async function fixOwner (cache, filepath) {
-  if (!process.getuid) {
-    // This platform doesn't need ownership fixing
-    return
-  }
-
-  getSelf()
-  if (self.uid !== 0) {
-    // almost certainly can't chown anyway
-    return
-  }
-
-  const { uid, gid } = await inferOwner(cache)
-
-  // No need to override if it's already what we used.
-  if (self.uid === uid && self.gid === gid) {
-    return
-  }
-
-  return inflight('fixOwner: fixing ownership on ' + filepath, () =>
-    chownr(
-      filepath,
-      typeof uid === 'number' ? uid : self.uid,
-      typeof gid === 'number' ? gid : self.gid
-    ).catch((err) => {
-      if (err.code === 'ENOENT') {
-        return null
-      }
-
-      throw err
-    })
-  )
-}
-
-module.exports.chownr.sync = fixOwnerSync
-
-function fixOwnerSync (cache, filepath) {
-  if (!process.getuid) {
-    // This platform doesn't need ownership fixing
-    return
-  }
-  const { uid, gid } = inferOwner.sync(cache)
-  getSelf()
-  if (self.uid !== 0) {
-    // almost certainly can't chown anyway
-    return
-  }
-
-  if (self.uid === uid && self.gid === gid) {
-    // No need to override if it's already what we used.
-    return
-  }
-  try {
-    chownr.sync(
-      filepath,
-      typeof uid === 'number' ? uid : self.uid,
-      typeof gid === 'number' ? gid : self.gid
-    )
-  } catch (err) {
-    // only catch ENOENT, any other error is a problem.
-    if (err.code === 'ENOENT') {
-      return null
-    }
-
-    throw err
-  }
-}
-
-module.exports.mkdirfix = mkdirfix
-
-async function mkdirfix (cache, p, cb) {
-  // we have to infer the owner _before_ making the directory, even though
-  // we aren't going to use the results, since the cache itself might not
-  // exist yet.  If we mkdirp it, then our current uid/gid will be assumed
-  // to be correct if it creates the cache folder in the process.
-  await inferOwner(cache)
-  try {
-    const made = await mkdirp(p)
-    if (made) {
-      await fixOwner(cache, made)
-      return made
-    }
-  } catch (err) {
-    if (err.code === 'EEXIST') {
-      await fixOwner(cache, p)
-      return null
-    }
-    throw err
-  }
-}
-
-module.exports.mkdirfix.sync = mkdirfixSync
-
-function mkdirfixSync (cache, p) {
-  try {
-    inferOwner.sync(cache)
-    const made = mkdirp.sync(p)
-    if (made) {
-      fixOwnerSync(cache, made)
-      return made
-    }
-  } catch (err) {
-    if (err.code === 'EEXIST') {
-      fixOwnerSync(cache, p)
-      return null
-    } else {
-      throw err
-    }
-  }
-}