cacache 13.0.1 → 14.0.0

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 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.
 
+## [14.0.0](https://github.com/npm/cacache/compare/v13.0.1...v14.0.0) (2020-01-28)
+
+
+### ⚠ BREAKING CHANGES
+
+* **deps:** bumps engines to >= 10
+
+* **deps:** tar v6 and mkdirp v1 ([5a66e7a](https://github.com/npm/cacache/commit/5a66e7a))
+
 ### [13.0.1](https://github.com/npm/cacache/compare/v13.0.0...v13.0.1) (2019-09-30)
 
 

package/README.md

@@ -12,8 +12,6 @@ when running as `root`.
 It was written to be used as [npm](https://npm.im)'s local cache, but can
 just as easily be used on its own.
 
-_Translations: [español](README.es.md)_
-
 ## Install
 
 `$ npm install --save cacache`

package/lib/content/path.js

@@ -15,9 +15,10 @@ module.exports = contentPath
 function contentPath (cache, integrity) {
   const sri = ssri.parse(integrity, { single: true })
   // contentPath is the *strongest* algo given
-  return path.join.apply(
-    path,
-    [contentDir(cache), sri.algorithm].concat(hashToSegments(sri.hexDigest()))
+  return path.join(
+    contentDir(cache),
+    sri.algorithm,
+    ...hashToSegments(sri.hexDigest())
   )
 }
 

package/lib/content/read.js

@@ -127,6 +127,7 @@ function hasContent (cache, integrity) {
       return false
     }
     if (err.code === 'EPERM') {
+      /* istanbul ignore else */
       if (process.platform !== 'win32') {
         throw err
       } else {
@@ -151,6 +152,7 @@ function hasContentSync (cache, integrity) {
         return false
       }
       if (err.code === 'EPERM') {
+        /* istanbul ignore else */
         if (process.platform !== 'win32') {
           throw err
         } else {
@@ -175,7 +177,7 @@ function withContentSri (cache, integrity, fn) {
     } else {
       // Can't use race here because a generic error can happen before a ENOENT error, and can happen before a valid result
       return Promise
-        .all(sri[sri.pickAlgorithm()].map((meta) => {
+        .all(digests.map((meta) => {
           return withContentSri(cache, meta, fn)
             .catch((err) => {
               if (err.code === 'ENOENT') {
@@ -201,10 +203,7 @@ function withContentSri (cache, integrity, fn) {
           }
 
           // Throw generic error
-          const genericError = results.find((r) => r instanceof Error)
-          if (genericError) {
-            throw genericError
-          }
+          throw results.find((r) => r instanceof Error)
         })
     }
   }
@@ -231,16 +230,14 @@ function withContentSriSync (cache, integrity, fn) {
     return fn(cpath, digests[0])
   } else {
     let lastErr = null
-    for (const meta of sri[sri.pickAlgorithm()]) {
+    for (const meta of digests) {
       try {
         return withContentSriSync(cache, meta, fn)
       } catch (err) {
         lastErr = err
       }
     }
-    if (lastErr) {
-      throw lastErr
-    }
+    throw lastErr
   }
 }
 

package/lib/content/rm.js

@@ -10,11 +10,9 @@ module.exports = rm
 
 function rm (cache, integrity) {
   return hasContent(cache, integrity).then((content) => {
-    if (content) {
-      const sri = content.sri
-      if (sri) {
-        return rimraf(contentPath(cache, sri)).then(() => true)
-      }
+    // ~pretty~ sure we can't end up with a content lacking sri, but be safe
+    if (content && content.sri) {
+      return rimraf(contentPath(cache, content.sri)).then(() => true)
     } else {
       return false
     }

package/lib/util/fix-owner.js

@@ -3,7 +3,7 @@
 const util = require('util')
 
 const chownr = util.promisify(require('chownr'))
-const mkdirp = util.promisify(require('mkdirp'))
+const mkdirp = require('mkdirp')
 const inflight = require('promise-inflight')
 const inferOwner = require('infer-owner')
 

package/lib/util/move-file.js

@@ -11,6 +11,9 @@ const pinflight = require('promise-inflight')
 module.exports = moveFile
 
 function moveFile (src, dest) {
+  const isWindows = global.__CACACHE_TEST_FAKE_WINDOWS__ ||
+    process.platform === 'win32'
+
   // This isn't quite an fs.rename -- the assumption is that
   // if `dest` already exists, and we get certain errors while
   // trying to move it, we should just not bother.
@@ -23,22 +26,31 @@ function moveFile (src, dest) {
   return new Promise((resolve, reject) => {
     fs.link(src, dest, (err) => {
       if (err) {
-        if (err.code === 'EEXIST' || err.code === 'EBUSY') {
+        if (isWindows && err.code === 'EPERM') {
+          // XXX This is a really weird way to handle this situation, as it
+          // results in the src file being deleted even though the dest
+          // might not exist.  Since we pretty much always write files to
+          // deterministic locations based on content hash, this is likely
+          // ok (or at worst, just ends in a future cache miss).  But it would
+          // be worth investigating at some time in the future if this is
+          // really what we want to do here.
+          return resolve()
+        } else if (err.code === 'EEXIST' || err.code === 'EBUSY') {
           // file already exists, so whatever
-        } else if (err.code === 'EPERM' && process.platform === 'win32') {
-          // file handle stayed open even past graceful-fs limits
+          return resolve()
         } else {
           return reject(err)
         }
+      } else {
+        return resolve()
       }
-      return resolve()
     })
   })
     .then(() => {
       // content should never change for any reason, so make it read-only
       return Promise.all([
         unlink(src),
-        process.platform !== 'win32' && chmod(dest, '0444')
+        !isWindows && chmod(dest, '0444')
       ])
     })
     .catch(() => {

package/lib/verify.js

@@ -50,7 +50,7 @@ function verify (cache, opts) {
 
   return steps
     .reduce((promise, step, i) => {
-      const label = step.name || `step #${i}`
+      const label = step.name
       const start = new Date()
       return promise.then((stats) => {
         return step(cache, opts).then((s) => {
@@ -208,6 +208,7 @@ function rebuildIndex (cache, opts) {
     }
     const buckets = {}
     for (const k in entries) {
+      /* istanbul ignore else */
       if (hasOwnProperty(entries, k)) {
         const hashed = index.hashKey(k)
         const entry = entries[k]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cacache",
-  "version": "13.0.1",
+  "version": "14.0.0",
   "cache-version": {
     "content": "2",
     "index": "5"
@@ -69,12 +69,13 @@
     "minipass-collect": "^1.0.2",
     "minipass-flush": "^1.0.5",
     "minipass-pipeline": "^1.2.2",
-    "mkdirp": "^0.5.1",
+    "mkdirp": "^1.0.3",
     "move-concurrently": "^1.0.1",
     "p-map": "^3.0.0",
     "promise-inflight": "^1.0.1",
     "rimraf": "^2.7.1",
     "ssri": "^7.0.0",
+    "tar": "^6.0.0",
     "unique-filename": "^1.1.1"
   },
   "devDependencies": {
@@ -89,7 +90,10 @@
     "weallbehave": "^1.2.0",
     "weallcontribute": "^1.0.9"
   },
+  "tap": {
+    "100": true
+  },
   "engines": {
-    "node": ">= 8"
+    "node": ">= 10"
   }
 }