fix: make "ipfs resolve" cli command recursive by default

packages/interface-ipfs-core/src/miscellaneous/resolve.js

@@ -83,7 +83,7 @@ module.exports = (common, options) => {
       expect(isIpfs.ipfsPath(resolved)).to.be.true()
     })
 
-    it('should resolve IPNS link recursively', async function () {
+    it('should resolve IPNS link recursively by default', async function () {
       this.timeout(20 * 1000)
       // webworkers are not dialable because webrtc is not available
       const node = (await common.spawn({ type: isWebWorker ? 'go' : undefined })).api
@@ -94,8 +94,23 @@ module.exports = (common, options) => {
       await ipfs.name.publish(path, { allowOffline: true })
       await ipfs.name.publish(`/ipns/${ipfs.peerId.id}`, { allowOffline: true, key: 'key-name', resolve: false })
 
-      return expect(await ipfs.resolve(`/ipns/${keyId}`, { recursive: true }))
+      return expect(await ipfs.resolve(`/ipns/${keyId}`))
         .to.eq(`/ipfs/${path}`)
     })
+
+    it('should resolve IPNS link non-recursively if recursive==false', async function () {
+      this.timeout(20 * 1000)
+      // webworkers are not dialable because webrtc is not available
+      const node = (await common.spawn({ type: isWebWorker ? 'go' : undefined })).api
+      await ipfs.swarm.connect(node.peerId.addresses[0])
+      const { path } = await ipfs.add(uint8ArrayFromString('should resolve an IPNS key if recursive === false'))
+      const { id: keyId } = await ipfs.key.gen('new-key-name', { type: 'rsa', size: 2048 })
+
+      await ipfs.name.publish(path, { allowOffline: true })
+      await ipfs.name.publish(`/ipns/${ipfs.peerId.id}`, { allowOffline: true, key: 'new-key-name', resolve: false })
+
+      return expect(await ipfs.resolve(`/ipns/${keyId}`, { recursive: false }))
+        .to.eq(`/ipns/${ipfs.peerId.id}`)
+    })
   })
 }

packages/ipfs-cli/src/commands/resolve.js

@@ -15,7 +15,7 @@ module.exports = {
     recursive: {
       alias: 'r',
       type: 'boolean',
-      default: false
+      default: true
     },
     'cid-base': {
       describe: 'Number base to display CIDs in.',

packages/ipfs-cli/test/resolve.js

@@ -7,7 +7,7 @@ const cli = require('./utils/cli')
 const sinon = require('sinon')
 
 const defaultOptions = {
-  recursive: false,
+  recursive: true,
   cidBase: undefined,
   timeout: undefined
 }
@@ -31,27 +31,24 @@ describe('resolve', () => {
     expect(out).to.equal(resolved + '\n')
   })
 
-  it('resolves a CID recursively', async () => {
+  it('resolves a CID recursively by default', async () => {
     const resolved = `/ipfs/${cid}`
 
-    ipfs.resolve.withArgs(cid.toString(), {
-      ...defaultOptions,
-      recursive: true
-    }).resolves(resolved)
+    ipfs.resolve.withArgs(cid.toString(), defaultOptions).resolves(resolved)
 
     const out = await cli(`resolve ${cid} --recursive`, { ipfs })
     expect(out).to.equal(resolved + '\n')
   })
 
-  it('resolves a CID recursively (short option)', async () => {
+  it('allows non-recursive lookups with flag', async () => {
     const resolved = `/ipfs/${cid}`
 
     ipfs.resolve.withArgs(cid.toString(), {
       ...defaultOptions,
-      recursive: true
+      recursive: false
     }).resolves(resolved)
 
-    const out = await cli(`resolve ${cid} -r`, { ipfs })
+    const out = await cli(`resolve ${cid} --recursive=false`, { ipfs })
     expect(out).to.equal(resolved + '\n')
   })
 

packages/ipfs-core/src/components/resolve.js

@@ -29,12 +29,12 @@ module.exports = ({ ipld, name }) => {
       }
     }
 
-    const [, , hash, ...rest] = path.split('/') // ['', 'ipfs', 'hash', ...path]
+    const [, scheme, hash, ...rest] = path.split('/') // ['', 'ipfs', 'hash', ...path]
     const cid = new CID(hash)
 
     // nothing to resolve return the input
     if (rest.length === 0) {
-      return `/ipfs/${cidToString(cid, { base: opts.cidBase })}`
+      return `/${scheme}/${cidToString(cid, { base: opts.cidBase })}`
     }
 
     path = rest.join('/')

packages/ipfs-message-port-client/src/client/query.js

@@ -22,7 +22,7 @@ module.exports = class Query {
       this.namespace = namespace
       this.method = method
       this.timeout = input.timeout == null ? Infinity : input.timeout
-      /** @type {number|null} */
+      /** @type {ReturnType<typeof setTimeout>|null} */
       this.timerID = null
     })
   }