Never provide the string 'null' as an integrity value

Author: isaacs

lib/dir.js

@@ -85,7 +85,7 @@ class DirFetcher extends Fetcher {
     return readPackageJson(this.resolved + '/package.json')
       .then(mani => this.package = {
         ...mani,
-        _integrity: String(this.integrity),
+        _integrity: this.integrity && String(this.integrity),
         _resolved: this.resolved,
         _from: this.from,
       })

lib/fetcher.js

@@ -174,7 +174,7 @@ class FetcherBase {
       stream.on('error', er => rej(er))
       stream.on('end', () => {
         const data = Buffer.concat(buf)
-        data.integrity = String(this.integrity)
+        data.integrity = this.integrity && String(this.integrity)
         data.resolved = this.resolved
         data.from = this.from
         return res(data)

lib/file.js

@@ -29,7 +29,7 @@ class FileFetcher extends Fetcher {
       .then(() => readPackageJson(dir + '/package.json'))
       .then(mani => this.package = {
         ...mani,
-        _integrity: String(this.integrity),
+        _integrity: this.integrity && String(this.integrity),
         _resolved: this.resolved,
         _from: this.from,
       }))
@@ -82,7 +82,7 @@ class FileFetcher extends Fetcher {
           ...mani,
           dist: {
             tarball: `file:${this.resolved}`,
-            integrity: String(this.integrity),
+            integrity: this.integrity && String(this.integrity),
           }
         }
       }

lib/remote.js

@@ -49,7 +49,8 @@ class RemoteFetcher extends Fetcher {
       'pacote-version': pacoteVersion,
       'pacote-req-type': 'tarball',
       'pacote-pkg-id': this.pkgid,
-      'pacote-integrity': String(this.integrity),
+      ...(this.integrity ? { 'pacote-integrity': String(this.integrity) }
+        : {}),
     }
   }
 

tap-snapshots/test-dir.js-TAP.test.js

@@ -17,7 +17,7 @@ exports[`test/dir.js TAP basic > manifest 1`] = `
 Object {
   "_from": "file:test/fixtures/abbrev",
   "_id": "abbrev@1.1.1",
-  "_integrity": "null",
+  "_integrity": null,
   "_resolved": "\${CWD}/test/fixtures/abbrev",
   "author": "Isaac Z. Schlueter <i@izs.me>",
   "description": "Like ruby's abbrev module, but in js",
@@ -75,15 +75,15 @@ Object {
     "1.1.1": Object {
       "_from": "file:test/fixtures/abbrev",
       "_id": "abbrev@1.1.1",
-      "_integrity": "null",
+      "_integrity": null,
       "_resolved": "\${CWD}/test/fixtures/abbrev",
       "author": "Isaac Z. Schlueter <i@izs.me>",
       "description": "Like ruby's abbrev module, but in js",
       "devDependencies": Object {
         "tap": "^10.1",
       },
       "dist": Object {
-        "integrity": "null",
+        "integrity": null,
         "tarball": "file:\${CWD}/test/fixtures/abbrev",
       },
       "files": Array [
@@ -109,7 +109,7 @@ exports[`test/dir.js TAP basic > saved package.json 1`] = `
 Object {
   "_from": "file:test/fixtures/abbrev",
   "_id": "abbrev@1.1.1",
-  "_integrity": "null",
+  "_integrity": null,
   "_resolved": "\${CWD}/test/fixtures/abbrev",
   "author": "Isaac Z. Schlueter <i@izs.me>",
   "description": "Like ruby's abbrev module, but in js",
@@ -133,6 +133,46 @@ Object {
 }
 `
 
+exports[`test/dir.js TAP dir with integrity > packument 1`] = `
+Object {
+  "dist-tags": Object {
+    "latest": "1.1.1",
+  },
+  "name": "abbrev",
+  "versions": Object {
+    "1.1.1": Object {
+      "_from": "file:test/fixtures/abbrev",
+      "_id": "abbrev@1.1.1",
+      "_integrity": "sha512-whatever-this-is-only-checked-if-we-extract-it",
+      "_resolved": "\${CWD}/test/fixtures/abbrev",
+      "author": "Isaac Z. Schlueter <i@izs.me>",
+      "description": "Like ruby's abbrev module, but in js",
+      "devDependencies": Object {
+        "tap": "^10.1",
+      },
+      "dist": Object {
+        "integrity": "sha512-whatever-this-is-only-checked-if-we-extract-it",
+        "tarball": "file:\${CWD}/test/fixtures/abbrev",
+      },
+      "files": Array [
+        "abbrev.js",
+      ],
+      "license": "ISC",
+      "main": "abbrev.js",
+      "name": "abbrev",
+      "repository": "http://github.com/isaacs/abbrev-js",
+      "scripts": Object {
+        "postpublish": "git push origin --all; git push origin --tags",
+        "postversion": "npm publish",
+        "preversion": "npm test",
+        "test": "tap test.js --100",
+      },
+      "version": "1.1.1",
+    },
+  },
+}
+`
+
 exports[`test/dir.js TAP make bins executable > results of unpack 1`] = `
 Object {
   "from": "file:test/fixtures/bin-object",
@@ -161,7 +201,7 @@ exports[`test/dir.js TAP with prepare script > manifest 1`] = `
 Object {
   "_from": "file:test/fixtures/prepare-script",
   "_id": "git-prepare-script@1.0.0",
-  "_integrity": "null",
+  "_integrity": null,
   "_resolved": "\${CWD}/test/fixtures/prepare-script",
   "devDependencies": Object {
     "abbrev": "^1.1.1",
@@ -186,13 +226,13 @@ Object {
     "1.0.0": Object {
       "_from": "file:test/fixtures/prepare-script",
       "_id": "git-prepare-script@1.0.0",
-      "_integrity": "null",
+      "_integrity": null,
       "_resolved": "\${CWD}/test/fixtures/prepare-script",
       "devDependencies": Object {
         "abbrev": "^1.1.1",
       },
       "dist": Object {
-        "integrity": "null",
+        "integrity": null,
         "tarball": "file:\${CWD}/test/fixtures/prepare-script",
       },
       "license": "ISC",

test/dir.js

@@ -25,6 +25,15 @@ t.test('basic', t => {
     .then(() => f.manifest().then(mani => t.equal(mani, f.package)))
 })
 
+t.test('dir with integrity', t => {
+  const f = new DirFetcher(abbrevspec, {
+    integrity: 'sha512-whatever-this-is-only-checked-if-we-extract-it',
+  })
+  t.same(f.types, ['directory'])
+  t.resolveMatchSnapshot(f.packument(), 'packument')
+  return t.end()
+})
+
 const prepare = resolve(__dirname, 'fixtures/prepare-script')
 const preparespec = `file:${relative(process.cwd(), prepare)}`