refactor: remove yargs-promise from cli (#2795)

Also improves bin.js, parser.js and utils.js to support it and future refactor of the tests.

Author: achingbrain

packages/ipfs-mfs/package.json

@@ -55,8 +55,7 @@
     "sinon": "^8.0.4",
     "stream-to-promise": "^2.2.0",
     "temp-write": "^4.0.0",
-    "yargs": "^15.0.2",
-    "yargs-promise": "^1.1.0"
+    "yargs": "^15.1.0"
   },
   "dependencies": {
     "@hapi/boom": "^7.4.3",

packages/ipfs-mfs/src/cli/chmod.js

@@ -49,24 +49,20 @@ module.exports = {
 
   handler (argv) {
     const {
+      ctx: { ipfs },
       path,
       mode,
-      getIpfs,
       recursive,
       hashAlg,
       flush,
       shardSplitThreshold
     } = argv
 
-    argv.resolve((async () => {
-      const ipfs = await getIpfs()
-
-      return ipfs.files.chmod(path, mode, {
-        recursive,
-        hashAlg,
-        flush,
-        shardSplitThreshold
-      })
-    })())
+    return ipfs.files.chmod(path, mode, {
+      recursive,
+      hashAlg,
+      flush,
+      shardSplitThreshold
+    })
   }
 }

packages/ipfs-mfs/src/cli/cp.js

@@ -39,23 +39,20 @@ module.exports = {
 
   handler (argv) {
     const {
+      ctx: { ipfs },
       source,
       dest,
-      getIpfs,
       parents,
       flush,
       hashAlg,
       shardSplitThreshold
     } = argv
 
-    argv.resolve((async () => {
-      const ipfs = await getIpfs()
-      return ipfs.files.cp(source, dest, {
-        parents,
-        flush,
-        hashAlg,
-        shardSplitThreshold
-      })
-    })())
+    return ipfs.files.cp(source, dest, {
+      parents,
+      flush,
+      hashAlg,
+      shardSplitThreshold
+    })
   }
 }

packages/ipfs-mfs/src/cli/flush.js

@@ -15,25 +15,21 @@ module.exports = {
     }
   },
 
-  handler (argv) {
+  async handler (argv) {
     const {
+      ctx: { ipfs, print },
       path,
-      getIpfs,
-      cidBase,
-      print
+      cidBase
     } = argv
 
-    argv.resolve((async () => {
-      const ipfs = await getIpfs()
-      let cid = await ipfs.files.flush(path || FILE_SEPARATOR, {})
+    let cid = await ipfs.files.flush(path || FILE_SEPARATOR, {})
 
-      if (cidBase && cidBase !== 'base58btc' && cid.version === 0) {
-        cid = cid.toV1()
-      }
+    if (cidBase && cidBase !== 'base58btc' && cid.version === 0) {
+      cid = cid.toV1()
+    }
 
-      print(JSON.stringify({
-        Cid: cid.toString(cidBase)
-      }))
-    })())
+    print(JSON.stringify({
+      Cid: cid.toString(cidBase)
+    }))
   }
 }

packages/ipfs-mfs/src/cli/ls.js

@@ -35,42 +35,37 @@ module.exports = {
     }
   },
 
-  handler (argv) {
+  async handler (argv) {
     const {
+      ctx: { ipfs, print },
       path,
-      getIpfs,
       long,
       sort,
-      cidBase,
-      print
+      cidBase
     } = argv
 
-    argv.resolve((async () => {
-      const ipfs = await getIpfs()
-
-      const printListing = file => {
-        if (long) {
-          print(`${formatMode(file.mode, file.type === 1)}\t${formatMtime(file.mtime)}\t${file.name}\t${file.cid.toString(cidBase)}\t${file.size}`)
-        } else {
-          print(file.name)
-        }
+    const printListing = file => {
+      if (long) {
+        print(`${formatMode(file.mode, file.type === 1)}\t${formatMtime(file.mtime)}\t${file.name}\t${file.cid.toString(cidBase)}\t${file.size}`)
+      } else {
+        print(file.name)
       }
+    }
 
-      // https://github.com/ipfs/go-ipfs/issues/5181
-      if (sort) {
-        let files = await all(ipfs.files.ls(path || FILE_SEPARATOR))
+    // https://github.com/ipfs/go-ipfs/issues/5181
+    if (sort) {
+      let files = await all(ipfs.files.ls(path || FILE_SEPARATOR))
 
-        files = files.sort((a, b) => {
-          return a.name.localeCompare(b.name)
-        })
+      files = files.sort((a, b) => {
+        return a.name.localeCompare(b.name)
+      })
 
-        files.forEach(printListing)
-        return
-      }
+      files.forEach(printListing)
+      return
+    }
 
-      for await (const file of ipfs.files.ls(path || FILE_SEPARATOR)) {
-        printListing(file)
-      }
-    })())
+    for await (const file of ipfs.files.ls(path || FILE_SEPARATOR)) {
+      printListing(file)
+    }
   }
 }

packages/ipfs-mfs/src/cli/mkdir.js

@@ -57,8 +57,8 @@ module.exports = {
 
   handler (argv) {
     const {
+      ctx: { ipfs },
       path,
-      getIpfs,
       parents,
       cidVersion,
       hashAlg,
@@ -68,18 +68,14 @@ module.exports = {
       mtime
     } = argv
 
-    argv.resolve((async () => {
-      const ipfs = await getIpfs()
-
-      return ipfs.files.mkdir(path, {
-        parents,
-        cidVersion,
-        hashAlg,
-        flush,
-        shardSplitThreshold,
-        mode,
-        mtime
-      })
-    })())
+    return ipfs.files.mkdir(path, {
+      parents,
+      cidVersion,
+      hashAlg,
+      flush,
+      shardSplitThreshold,
+      mode,
+      mtime
+    })
   }
 }

packages/ipfs-mfs/src/cli/mv.js

@@ -52,9 +52,9 @@ module.exports = {
 
   handler (argv) {
     const {
+      ctx: { ipfs },
       source,
       dest,
-      getIpfs,
       parents,
       recursive,
       cidVersion,
@@ -63,17 +63,13 @@ module.exports = {
       shardSplitThreshold
     } = argv
 
-    argv.resolve((async () => {
-      const ipfs = await getIpfs()
-
-      return ipfs.files.mv(source, dest, {
-        parents,
-        recursive,
-        cidVersion,
-        hashAlg,
-        flush,
-        shardSplitThreshold
-      })
-    })())
+    return ipfs.files.mv(source, dest, {
+      parents,
+      recursive,
+      cidVersion,
+      hashAlg,
+      flush,
+      shardSplitThreshold
+    })
   }
 }

packages/ipfs-mfs/src/cli/read.js

@@ -18,24 +18,19 @@ module.exports = {
     }
   },
 
-  handler (argv) {
+  async handler (argv) {
     const {
+      ctx: { ipfs, print },
       path,
-      getIpfs,
-      print,
       offset,
       length
     } = argv
 
-    argv.resolve((async () => {
-      const ipfs = await getIpfs()
-
-      for await (const buffer of ipfs.files.read(path, {
-        offset,
-        length
-      })) {
-        print(buffer, false)
-      }
-    })())
+    for await (const buffer of ipfs.files.read(path, {
+      offset,
+      length
+    })) {
+      print(buffer, false)
+    }
   }
 }

packages/ipfs-mfs/src/cli/rm.js

@@ -21,17 +21,13 @@ module.exports = {
 
   handler (argv) {
     const {
+      ctx: { ipfs },
       path,
-      getIpfs,
       recursive
     } = argv
 
-    argv.resolve((async () => {
-      const ipfs = await getIpfs()
-
-      return ipfs.files.rm(path, {
-        recursive
-      })
-    })())
+    return ipfs.files.rm(path, {
+      recursive
+    })
   }
 }

packages/ipfs-mfs/src/cli/stat.js

@@ -52,41 +52,36 @@ Mtime: <mtime>`,
 
   handler (argv) {
     const {
+      ctx: { ipfs, print },
       path,
-      getIpfs,
-      print,
       format,
       hash,
       size,
       withLocal,
       cidBase
     } = argv
 
-    argv.resolve((async () => {
-      const ipfs = await getIpfs()
+    return ipfs.files.stat(path, {
+      withLocal
+    })
+      .then((stats) => {
+        if (hash) {
+          return print(stats.cid.toString(cidBase))
+        }
 
-      return ipfs.files.stat(path, {
-        withLocal
-      })
-        .then((stats) => {
-          if (hash) {
-            return print(stats.cid.toString(cidBase))
-          }
-
-          if (size) {
-            return print(stats.size)
-          }
+        if (size) {
+          return print(stats.size)
+        }
 
-          print(format
-            .replace('<hash>', stats.cid.toString(cidBase))
-            .replace('<size>', stats.size)
-            .replace('<cumulsize>', stats.cumulativeSize)
-            .replace('<childs>', stats.blocks)
-            .replace('<type>', stats.type)
-            .replace('<mode>', formatMode(stats.mode, stats.type === 'directory'))
-            .replace('<mtime>', formatMtime(stats.mtime))
-          )
-        })
-    })())
+        print(format
+          .replace('<hash>', stats.cid.toString(cidBase))
+          .replace('<size>', stats.size)
+          .replace('<cumulsize>', stats.cumulativeSize)
+          .replace('<childs>', stats.blocks)
+          .replace('<type>', stats.type)
+          .replace('<mode>', formatMode(stats.mode, stats.type === 'directory'))
+          .replace('<mtime>', formatMtime(stats.mtime))
+        )
+      })
   }
 }