fix: add support for resolving to the middle of an IPLD block

see: ipfs-inactive/interface-js-ipfs-core#385

Author: Stebalien

src/core/components/resolve.js

@@ -34,17 +34,15 @@ module.exports = (self) => {
 
     const path = split.slice(3).join('/')
 
-    resolve(cid, path, (err, cid) => {
+    resolve(cid, path, (err, cid, remainder) => {
       if (err) return cb(err)
-      if (!cid) return cb(new Error('found non-link at given path'))
-      cb(null, `/ipfs/${cidToString(cid, { base: opts.cidBase })}`)
+      cb(null, `/ipfs/${cidToString(cid, { base: opts.cidBase })}${!remainder ? '/' + remainder : ''}`)
     })
   })
 
   // Resolve the given CID + path to a CID.
   function resolve (cid, path, callback) {
     let value
-
     doUntil(
       (cb) => {
         self.block.get(cid, (err, block) => {
@@ -65,22 +63,20 @@ module.exports = (self) => {
         })
       },
       () => {
-        const endReached = !path || path === '/'
-
-        if (endReached) {
-          return true
-        }
-
-        if (value) {
+        if (value && value['/']) {
+          // If we've hit a CID, replace the current CID.
           cid = new CID(value['/'])
+        } else {
+          // We've hit a value. Return the current CID and the remaining path.
+          return false
         }
 
-        return false
+        // Continue resolving unless the path is empty.
+        return !path || path === '/'
       },
       (err) => {
         if (err) return callback(err)
-        if (value && value['/']) return callback(null, new CID(value['/']))
-        callback()
+        callback(null, cid, path)
       }
     )
   }

test/cli/resolve.js

@@ -71,4 +71,21 @@ describe('resolve', () => runOnAndOff((thing) => {
         expect(out).to.contain(`/ipfs/${fileHash}`)
       })
   })
+
+  it('should resolve an IPFS path non-link', (done) => {
+    const content = { path: { to: { file: 'foobar' } } }
+    const options = { format: 'dag-cbor', hashAlg: 'sha2-256' }
+
+    ipfs.dag.put(content, options, (err, cid) => {
+      expect(err).to.not.exist()
+
+      // FIXME: This should be /ipld/... but that's not supported yet.
+      const path = `/ipfs/${cid.toBaseEncodedString()}/path/to/file`
+      ipfs.resolve(path, (err, path) => {
+        expect(err).to.not.exist()
+        expect(path).to.equal(path)
+        done()
+      })
+    })
+  })
 }))