cacache 18.0.1 → 18.0.3

package/lib/content/read.js

@@ -13,18 +13,20 @@ async function read (cache, integrity, opts = {}) {
   const { size } = opts
   const { stat, cpath, sri } = await withContentSri(cache, integrity, async (cpath, sri) => {
     // get size
-    const stat = await fs.stat(cpath)
+    const stat = size ? { size } : await fs.stat(cpath)
     return { stat, cpath, sri }
   })
-  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()
   }
 
   const data = await fs.readFile(cpath, { encoding: null })
+
+  if (stat.size !== data.length) {
+    throw sizeError(stat.size, data.length)
+  }
+
   if (!ssri.checkData(data, sri)) {
     throw integrityError(sri, cpath)
   }
@@ -55,13 +57,10 @@ function readStream (cache, integrity, opts = {}) {
   // Set all this up to run on the stream and then just return the stream
   Promise.resolve().then(async () => {
     const { stat, cpath, sri } = await withContentSri(cache, integrity, async (cpath, sri) => {
-      // just stat to ensure it exists
-      const stat = await fs.stat(cpath)
+      // get size
+      const stat = size ? { size } : await fs.stat(cpath)
       return { stat, cpath, sri }
     })
-    if (typeof size === 'number' && size !== stat.size) {
-      return stream.emit('error', sizeError(size, stat.size))
-    }
 
     return readPipeline(cpath, stat.size, sri, stream)
   }).catch(err => stream.emit('error', err))
@@ -72,7 +71,7 @@ function readStream (cache, integrity, opts = {}) {
 module.exports.copy = copy
 
 function copy (cache, integrity, dest) {
-  return withContentSri(cache, integrity, (cpath, sri) => {
+  return withContentSri(cache, integrity, (cpath) => {
     return fs.copyFile(cpath, dest)
   })
 }

package/lib/content/write.js

@@ -160,7 +160,7 @@ async function makeTmp (cache, opts) {
   }
 }
 
-async function moveToDestination (tmp, cache, sri, opts) {
+async function moveToDestination (tmp, cache, sri) {
   const destination = contentPath(cache, sri)
   const destDir = path.dirname(destination)
   if (moveOperations.has(destination)) {

package/lib/entry-index.js

@@ -240,7 +240,7 @@ async function bucketEntries (bucket, filter) {
   return _bucketEntries(data, filter)
 }
 
-function _bucketEntries (data, filter) {
+function _bucketEntries (data) {
   const entries = []
   data.split('\n').forEach((entry) => {
     if (!entry) {

package/lib/verify.js

@@ -68,11 +68,11 @@ async function verify (cache, opts) {
   return stats
 }
 
-async function markStartTime (cache, opts) {
+async function markStartTime () {
   return { startTime: new Date() }
 }
 
-async function markEndTime (cache, opts) {
+async function markEndTime () {
   return { endTime: new Date() }
 }
 
@@ -213,7 +213,7 @@ async function rebuildIndex (cache, opts) {
   return stats
 }
 
-async function rebuildBucket (cache, bucket, stats, opts) {
+async function rebuildBucket (cache, bucket, stats) {
   await truncate(bucket._path)
   // This needs to be serialized because cacache explicitly
   // lets very racy bucket conflicts clobber each other.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cacache",
-  "version": "18.0.1",
+  "version": "18.0.3",
   "cache-version": {
     "content": "2",
     "index": "5"
@@ -16,7 +16,7 @@
     "snap": "tap",
     "coverage": "tap",
     "test-docker": "docker run -it --rm --name pacotest -v \"$PWD\":/tmp -w /tmp node:latest npm test",
-    "lint": "eslint \"**/*.js\"",
+    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
     "npmclilint": "npmcli-lint",
     "lintfix": "npm run lint -- --fix",
     "postsnap": "npm run lintfix --",
@@ -26,7 +26,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/npm/cacache.git"
+    "url": "git+https://github.com/npm/cacache.git"
   },
   "keywords": [
     "cache",
@@ -60,7 +60,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.19.0",
+    "@npmcli/template-oss": "4.22.0",
     "tap": "^16.0.0"
   },
   "engines": {
@@ -69,7 +69,7 @@
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
     "windowsCI": false,
-    "version": "4.19.0",
+    "version": "4.22.0",
     "publish": "true"
   },
   "author": "GitHub Inc.",