feat: allow formatEntry to keep entries with no integrity value

PR-URL: #53
Credit: @nlf
Close: #53
Reviewed-by: @isaacs

lib/entry-index.js

@@ -85,7 +85,7 @@ async function compact (cache, key, matchFn, opts = {}) {
   // write the file atomically
   await disposer(setup(), teardown, write)
 
-  return newEntries.map((entry) => formatEntry(cache, entry))
+  return newEntries.map((entry) => formatEntry(cache, entry, true))
 }
 
 module.exports.insert = insert
@@ -346,15 +346,15 @@ function hash (str, digest) {
     .digest('hex')
 }
 
-function formatEntry (cache, entry) {
+function formatEntry (cache, entry, keepAll) {
   // Treat null digests as deletions. They'll shadow any previous entries.
-  if (!entry.integrity) {
+  if (!entry.integrity && !keepAll) {
     return null
   }
   return {
     key: entry.key,
     integrity: entry.integrity,
-    path: contentPath(cache, entry.integrity),
+    path: entry.integrity ? contentPath(cache, entry.integrity) : undefined,
     size: entry.size,
     time: entry.time,
     metadata: entry.metadata

test/entry-index.js

@@ -60,19 +60,21 @@ test('compact', async (t) => {
     index.insert(CACHE, KEY, INTEGRITY, { metadata: { rev: 1 } }),
     index.insert(CACHE, KEY, INTEGRITY, { metadata: { rev: 2 } }),
     index.insert(CACHE, KEY, INTEGRITY, { metadata: { rev: 2 } }),
-    index.insert(CACHE, KEY, INTEGRITY, { metadata: { rev: 1 } })
+    index.insert(CACHE, KEY, INTEGRITY, { metadata: { rev: 1 } }),
+    // compact will return entries with a null integrity
+    index.insert(CACHE, KEY, null, { metadata: { rev: 3 } })
   ])
 
   const bucket = index.bucketPath(CACHE, KEY)
   const entries = await index.bucketEntries(bucket)
-  t.equal(entries.length, 4, 'started with 4 entries')
+  t.equal(entries.length, 5, 'started with 5 entries')
 
   const filter = (entryA, entryB) => entryA.metadata.rev === entryB.metadata.rev
   const compacted = await index.compact(CACHE, KEY, filter)
-  t.equal(compacted.length, 2, 'should return only two entries')
+  t.equal(compacted.length, 3, 'should return only three entries')
 
   const newEntries = await index.bucketEntries(bucket)
-  t.equal(newEntries.length, 2, 'bucket was deduplicated')
+  t.equal(newEntries.length, 3, 'bucket was deduplicated')
 })
 
 test('compact: ENOENT in chownr does not cause failure', async (t) => {