pnpm 7.9.1 → 7.9.2

package/dist/node_modules/ssri/{index.js → lib/index.js}

@@ -19,7 +19,7 @@ const defaultOpts = {
   pickAlgorithm: getPrioritizedHash,
   sep: ' ',
   single: false,
-  strict: false
+  strict: false,
 }
 
 const ssriOpts = (opts = {}) => ({ ...defaultOpts, ...opts })
@@ -30,6 +30,10 @@ const getOptString = options => !options || !options.length
 
 const _onEnd = Symbol('_onEnd')
 const _getOptions = Symbol('_getOptions')
+const _emittedSize = Symbol('_emittedSize')
+const _emittedIntegrity = Symbol('_emittedIntegrity')
+const _emittedVerified = Symbol('_emittedVerified')
+
 class IntegrityStream extends MiniPass {
   constructor (opts) {
     super()
@@ -51,7 +55,7 @@ class IntegrityStream extends MiniPass {
     const {
       integrity,
       size,
-      options
+      options,
     } = { ...defaultOpts, ...this.opts }
 
     // For verification
@@ -63,8 +67,26 @@ class IntegrityStream extends MiniPass {
     this.optString = getOptString(options)
   }
 
+  on (ev, handler) {
+    if (ev === 'size' && this[_emittedSize]) {
+      return handler(this[_emittedSize])
+    }
+
+    if (ev === 'integrity' && this[_emittedIntegrity]) {
+      return handler(this[_emittedIntegrity])
+    }
+
+    if (ev === 'verified' && this[_emittedVerified]) {
+      return handler(this[_emittedVerified])
+    }
+
+    return super.on(ev, handler)
+  }
+
   emit (ev, data) {
-    if (ev === 'end') this[_onEnd]()
+    if (ev === 'end') {
+      this[_onEnd]()
+    }
     return super.emit(ev, data)
   }
 
@@ -84,6 +106,7 @@ class IntegrityStream extends MiniPass {
     // Integrity verification mode
     const match = this.goodSri && newSri.match(this.sri, this.opts)
     if (typeof this.expectedSize === 'number' && this.size !== this.expectedSize) {
+      /* eslint-disable-next-line max-len */
       const err = new Error(`stream size mismatch when checking ${this.sri}.\n  Wanted: ${this.expectedSize}\n  Found: ${this.size}`)
       err.code = 'EBADSIZE'
       err.found = this.size
@@ -91,6 +114,7 @@ class IntegrityStream extends MiniPass {
       err.sri = this.sri
       this.emit('error', err)
     } else if (this.sri && !match) {
+      /* eslint-disable-next-line max-len */
       const err = new Error(`${this.sri} integrity checksum failed when using ${this.algorithm}: wanted ${this.digests} but got ${newSri}. (${this.size} bytes)`)
       err.code = 'EINTEGRITY'
       err.found = newSri
@@ -99,15 +123,23 @@ class IntegrityStream extends MiniPass {
       err.sri = this.sri
       this.emit('error', err)
     } else {
+      this[_emittedSize] = this.size
       this.emit('size', this.size)
+      this[_emittedIntegrity] = newSri
       this.emit('integrity', newSri)
-      match && this.emit('verified', match)
+      if (match) {
+        this[_emittedVerified] = match
+        this.emit('verified', match)
+      }
     }
   }
 }
 
 class Hash {
-  get isHash () { return true }
+  get isHash () {
+    return true
+  }
+
   constructor (hash, opts) {
     opts = ssriOpts(opts)
     const strict = !!opts.strict
@@ -126,8 +158,12 @@ class Hash {
         ? STRICT_SRI_REGEX
         : SRI_REGEX
     )
-    if (!match) { return }
-    if (strict && !SPEC_ALGORITHMS.some(a => a === match[1])) { return }
+    if (!match) {
+      return
+    }
+    if (strict && !SPEC_ALGORITHMS.some(a => a === match[1])) {
+      return
+    }
     this.algorithm = match[1]
     this.digest = match[2]
 
@@ -175,7 +211,10 @@ class Hash {
 }
 
 class Integrity {
-  get isIntegrity () { return true }
+  get isIntegrity () {
+    return true
+  }
+
   toJSON () {
     return this.toString()
   }
@@ -255,7 +294,9 @@ class Integrity {
 
 module.exports.parse = parse
 function parse (sri, opts) {
-  if (!sri) return null
+  if (!sri) {
+    return null
+  }
   opts = ssriOpts(opts)
   if (typeof sri === 'string') {
     return _parse(sri, opts)
@@ -278,7 +319,9 @@ function _parse (integrity, opts) {
     const hash = new Hash(string, opts)
     if (hash.algorithm && hash.digest) {
       const algo = hash.algorithm
-      if (!acc[algo]) { acc[algo] = [] }
+      if (!acc[algo]) {
+        acc[algo] = []
+      }
       acc[algo].push(hash)
     }
     return acc
@@ -324,9 +367,11 @@ function fromData (data, opts) {
      * just calculated with an algo did not have an algo or digest.
      */
     if (hash.algorithm && hash.digest) {
-      const algo = hash.algorithm
-      if (!acc[algo]) { acc[algo] = [] }
-      acc[algo].push(hash)
+      const hashAlgo = hash.algorithm
+      if (!acc[hashAlgo]) {
+        acc[hashAlgo] = []
+      }
+      acc[hashAlgo].push(hash)
     }
     return acc
   }, new Integrity())
@@ -341,7 +386,9 @@ function fromStream (stream, opts) {
     stream.on('error', reject)
     istream.on('error', reject)
     let sri
-    istream.on('integrity', s => { sri = s })
+    istream.on('integrity', s => {
+      sri = s
+    })
     istream.on('end', () => resolve(sri))
     istream.on('data', () => {})
   })
@@ -355,7 +402,7 @@ function checkData (data, sri, opts) {
     if (opts.error) {
       throw Object.assign(
         new Error('No valid integrity hashes to check against'), {
-          code: 'EINTEGRITY'
+          code: 'EINTEGRITY',
         }
       )
     } else {
@@ -369,6 +416,7 @@ function checkData (data, sri, opts) {
   if (match || !opts.error) {
     return match
   } else if (typeof opts.size === 'number' && (data.length !== opts.size)) {
+    /* eslint-disable-next-line max-len */
     const err = new Error(`data size mismatch when checking ${sri}.\n  Wanted: ${opts.size}\n  Found: ${data.length}`)
     err.code = 'EBADSIZE'
     err.found = data.length
@@ -376,6 +424,7 @@ function checkData (data, sri, opts) {
     err.sri = sri
     throw err
   } else {
+    /* eslint-disable-next-line max-len */
     const err = new Error(`Integrity checksum failed when using ${algorithm}: Wanted ${sri}, but got ${newSri}. (${data.length} bytes)`)
     err.code = 'EINTEGRITY'
     err.found = newSri
@@ -394,7 +443,7 @@ function checkStream (stream, sri, opts) {
   if (!sri || !Object.keys(sri).length) {
     return Promise.reject(Object.assign(
       new Error('No valid integrity hashes to check against'), {
-        code: 'EINTEGRITY'
+        code: 'EINTEGRITY',
       }
     ))
   }
@@ -403,9 +452,11 @@ function checkStream (stream, sri, opts) {
     stream.pipe(checker)
     stream.on('error', reject)
     checker.on('error', reject)
-    let sri
-    checker.on('verified', s => { sri = s })
-    checker.on('end', () => resolve(sri))
+    let verified
+    checker.on('verified', s => {
+      verified = s
+    })
+    checker.on('end', () => resolve(verified))
     checker.on('data', () => {})
   })
 }
@@ -439,15 +490,17 @@ function createIntegrity (opts) {
          * just calculated with an algo did not have an algo or digest.
          */
         if (hash.algorithm && hash.digest) {
-          const algo = hash.algorithm
-          if (!acc[algo]) { acc[algo] = [] }
-          acc[algo].push(hash)
+          const hashAlgo = hash.algorithm
+          if (!acc[hashAlgo]) {
+            acc[hashAlgo] = []
+          }
+          acc[hashAlgo].push(hash)
         }
         return acc
       }, new Integrity())
 
       return integrity
-    }
+    },
   }
 }
 
@@ -460,10 +513,11 @@ const DEFAULT_PRIORITY = [
   //        for the algorithm, so we guesswork it based on the OpenSSL names.
   'sha3',
   'sha3-256', 'sha3-384', 'sha3-512',
-  'sha3_256', 'sha3_384', 'sha3_512'
+  'sha3_256', 'sha3_384', 'sha3_512',
 ].filter(algo => NODE_HASHES.has(algo))
 
 function getPrioritizedHash (algo1, algo2) {
+  /* eslint-disable-next-line max-len */
   return DEFAULT_PRIORITY.indexOf(algo1.toLowerCase()) >= DEFAULT_PRIORITY.indexOf(algo2.toLowerCase())
     ? algo1
     : algo2

package/dist/node_modules/ssri/package.json

@@ -1,23 +1,34 @@
 {
   "name": "ssri",
-  "version": "8.0.1",
+  "version": "9.0.1",
   "description": "Standard Subresource Integrity library -- parses, serializes, generates, and verifies integrity metadata according to the SRI spec.",
-  "main": "index.js",
-  "files": [],
+  "main": "lib/index.js",
+  "files": [
+    "bin/",
+    "lib/"
+  ],
   "scripts": {
     "prerelease": "npm t",
     "postrelease": "npm publish",
-    "prepublishOnly": "git push --follow-tags",
+    "prepublishOnly": "git push origin --follow-tags",
     "posttest": "npm run lint",
-    "release": "standard-version -s",
     "test": "tap",
     "coverage": "tap",
-    "lint": "standard"
+    "lint": "eslint \"**/*.js\"",
+    "postlint": "template-oss-check",
+    "template-oss-apply": "template-oss-apply --force",
+    "lintfix": "npm run lint -- --fix",
+    "preversion": "npm test",
+    "postversion": "npm publish",
+    "snap": "tap"
   },
   "tap": {
     "check-coverage": true
   },
-  "repository": "https://github.com/npm/ssri",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/npm/ssri.git"
+  },
   "keywords": [
     "w3c",
     "web",
@@ -32,21 +43,21 @@
     "sri generator",
     "html"
   ],
-  "author": {
-    "name": "Kat Marchán",
-    "email": "kzm@sykosomatic.org",
-    "twitter": "maybekatz"
-  },
+  "author": "GitHub Inc.",
   "license": "ISC",
   "dependencies": {
     "minipass": "^3.1.1"
   },
   "devDependencies": {
-    "standard": "^16.0.3",
-    "standard-version": "^9.1.0",
-    "tap": "^14.10.6"
+    "@npmcli/eslint-config": "^3.0.1",
+    "@npmcli/template-oss": "3.5.0",
+    "tap": "^16.0.1"
   },
   "engines": {
-    "node": ">= 8"
+    "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+  },
+  "templateOSS": {
+    "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
+    "version": "3.5.0"
   }
 }