refactor: return CID instance from ipfs.add

BREAKING CHANGE: `ipfs.add` results now contain a `cid` property (a [CID instance](https://github.com./multiformats/js-cid)) instead of a string `hash` property.

refs ipfs-inactive/interface-js-ipfs-core#394

Author: Alan Shaw

src/cli/commands/add.js

@@ -156,7 +156,7 @@ module.exports = {
         ? globSource(argv.file, { recursive: argv.recursive })
         : process.stdin // Pipe directly to ipfs.add
 
-      let finalHash
+      let finalCid
 
       try {
         for await (const file of ipfs.add(source, options)) {
@@ -165,11 +165,11 @@ module.exports = {
           }
 
           if (argv.quieter) {
-            finalHash = file.hash
+            finalCid = file.cid
             continue
           }
 
-          const cid = cidToString(file.hash, { base: argv.cidBase })
+          const cid = cidToString(file.cid, { base: argv.cidBase })
           let message = cid
 
           if (!argv.quiet) {
@@ -197,7 +197,7 @@ module.exports = {
       }
 
       if (argv.quieter) {
-        log(cidToString(finalHash, { base: argv.cidBase }))
+        log(cidToString(finalCid, { base: argv.cidBase }))
       }
     })())
   }

src/core/components/add/index.js

@@ -59,12 +59,10 @@ module.exports = ({ ipld, dag, gcLock, preload, pin, constructorOptions }) => {
 function transformFile (dag, opts) {
   return async function * (source) {
     for await (const { cid, path, unixfs } of source) {
-      const hash = cid.toString()
-
       if (opts.onlyHash) {
         yield {
-          hash,
-          path: path || hash,
+          cid,
+          path: path || cid.toString(),
           size: unixfs.fileSize()
         }
 
@@ -74,8 +72,8 @@ function transformFile (dag, opts) {
       const { value: node } = await dag.get(cid, { ...opts, preload: false })
 
       yield {
-        hash,
-        path: path || hash,
+        cid,
+        path: path || cid.toString(),
         size: Buffer.isBuffer(node) ? node.length : node.size
       }
     }

src/http/api/resources/files-regular.js

@@ -225,7 +225,7 @@ exports.add = {
         for await (const file of source) {
           output.write(JSON.stringify({
             Name: file.path,
-            Hash: cidToString(file.hash, { base: request.query['cid-base'] }),
+            Hash: cidToString(file.cid, { base: request.query['cid-base'] }),
             Size: file.size
           }) + '\n')
         }