Use mri instead of yargs

package.json

@@ -44,6 +44,7 @@
   "dependencies": {
     "@aminya/underscore-plus": "^1.9.0",
     "@atom/plist": "0.4.4",
+    "@types/mri": "^1.1.1",
     "asar-require": "0.3.0",
     "async": "^3.2.0",
     "colors": "~1.4.0",
@@ -53,6 +54,7 @@
     "glob": "^7.1.7",
     "hosted-git-info": "^3.0.8",
     "keytar": "^7.7.0",
+    "mri": "^1.1.6",
     "mv": "2.1.1",
     "ncp": "~2.0.0",
     "node-gyp": "^9.0.0",

src/apm-cli.ts

@@ -19,6 +19,7 @@ import "asar-require"
 import * as config from "./apm"
 import fs from "./fs"
 import * as git from "./git"
+import Command from "./command"
 
 function setupTempDirectory() {
   const temp = require("temp")
@@ -143,12 +144,12 @@ Run \`apm help <command>\` to see the more details about a specific command.\
   return options
 }
 
-function showHelp(options: CliOptions) {
+function showHelp(options: CliOptions, cmd?: Command & { help: () => string }) {
   if (options == null) {
     return
   }
 
-  let help = options.help()
+  let help = typeof options.help !== "function" ? cmd?.help() /* mri */ : options.help() /* yargs */
   if (help.indexOf("Options:") >= 0) {
     help += "\n  Prefix an option with `no-` to set it to false such as --no-color to disable"
     help += "\n  colored output."
@@ -280,7 +281,7 @@ function getPythonVersion(callback) {
 
 export type RunCallback = (error?: string | Error | null) => any
 
-export function run(args, callback: RunCallback) {
+export function run(args: string[], callback: RunCallback) {
   let Command
   config.setupApmRcFile()
   const options = parseOptions(args)
@@ -313,21 +314,34 @@ export function run(args, callback: RunCallback) {
     return callback?.(error)
   }
 
-  args = options.argv
   const { command } = options
-  if (args.version) {
-    return printVersions(args, handleErrorCallback)
-  } else if (args.help) {
+  if (options.argv.version) {
+    return printVersions(options.argv, handleErrorCallback)
+  } else if (options.argv.help) {
     if ((Command = commands[options.command]?.())) {
-      showHelp(new Command().parseOptions?.(options.command))
+      const cmd = new Command()
+      if (typeof cmd.help === "function") {
+        // converted to mri
+        showHelp(cmd.parseOptions?.(args), cmd)
+      } else {
+        // yargs
+        showHelp(cmd.parseOptions?.(options.command), cmd)
+      }
     } else {
       showHelp(options)
     }
     return handleErrorCallback()
   } else if (command) {
     if (command === "help") {
       if ((Command = commands[options.commandArgs]?.())) {
-        showHelp(new Command().parseOptions?.(options.commandArgs))
+        const cmd = new Command()
+        if (typeof cmd.help === "function") {
+          // converted to mri
+          showHelp(cmd.parseOptions?.(args), cmd)
+        } else {
+          // yargs
+          showHelp(cmd.parseOptions?.(options.commandArgs), cmd)
+        }
       } else {
         showHelp(options)
       }

src/clean.ts

@@ -1,27 +1,27 @@
-/*
- * decaffeinate suggestions:
- * DS101: Remove unnecessary use of Array.from
- * DS102: Remove unnecessary code created because of implicit returns
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
- */
-import yargs from "yargs"
 import Command, { LogCommandResultsArgs } from "./command"
 import type { CliOptions, RunCallback } from "./apm-cli"
+import mri from "mri"
 
 export default class Clean extends Command {
   parseOptions(argv: string[]) {
-    const options = yargs(argv).wrap(Math.min(100, yargs.terminalWidth()))
+    return mri<{ help: boolean }>(argv, {
+      alias: { h: "help" },
+      boolean: "help",
+    })
+  }
 
-    options.usage(`\
-Usage: apm clean
+  help() {
+    return `Usage: apm clean
 
 Deletes all packages in the node_modules folder that are not referenced
-as a dependency in the package.json file.\
-`)
-    return options.alias("h", "help").describe("help", "Print this usage message")
+as a dependency in the package.json file.
+
+Options:
+  -h, --help  Print this usage message
+`
   }
 
-  run(options: CliOptions, callback: RunCallback) {
+  run(_options: CliOptions, callback: RunCallback) {
     process.stdout.write("Removing extraneous modules ")
     return this.fork(this.atomNpmPath, ["prune"], (...args: LogCommandResultsArgs) => {
       return this.logCommandResults(callback, ...args)

src/command.ts

@@ -92,11 +92,11 @@ export default class Command {
     return this.spawn(process.execPath, args, ...Array.from(remaining))
   }
 
-  packageNamesFromArgv(argv) {
+  packageNamesFromArgv(argv: { _: string[] }): string[] {
     return this.sanitizePackageNames(argv._)
   }
 
-  sanitizePackageNames(packageNames: string[] = []) {
+  sanitizePackageNames(packageNames: string[] = []): string[] {
     packageNames = packageNames.map((packageName) => packageName.trim())
     return _.compact(_.uniq(packageNames))
   }

src/dedupe.ts

@@ -5,35 +5,55 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 import async from "async"
-import yargs from "yargs"
 import * as config from "./apm"
-import Command, { LogCommandResultsArgs } from "./command"
+import Command, { LogCommandResultsArgs, SpawnArgs } from "./command"
 import fs from "./fs"
 import type { CliOptions, RunCallback } from "./apm-cli"
+import mri from "mri"
 
 export default class Dedupe extends Command {
   parseOptions(argv: string[]) {
-    const options = yargs(argv).wrap(Math.min(100, yargs.terminalWidth()))
-    options.usage(`\
+    return mri<{
+      help: boolean
+      silent: boolean
+      quiet: boolean
+      _: string[]
+
+      // added later
+      cwd: string
+    }>(argv, {
+      alias: { h: "help" },
+      boolean: ["help", "silent", "quiet"],
+    })
+  }
 
-Usage: apm dedupe [<package_name>...]
+  help() {
+    return `Usage: apm dedupe [<package_name>...]
 
 Reduce duplication in the node_modules folder in the current directory.
 
-This command is experimental.\
-`)
-    return options.alias("h", "help").describe("help", "Print this usage message")
+This command is experimental.
+
+Options:
+  -h, --help  Print this usage message
+  --silent
+  --quiet
+`
   }
 
-  dedupeModules(options, callback) {
+  dedupeModules(
+    options: ReturnType<Dedupe["parseOptions"]>,
+    packageNames: string[],
+    callback: (error?: string) => void
+  ) {
     process.stdout.write("Deduping modules ")
 
-    return this.forkDedupeCommand(options, (...args: LogCommandResultsArgs) => {
+    return this.forkDedupeCommand(options, packageNames, (...args: LogCommandResultsArgs) => {
       return this.logCommandResults(callback, ...args)
     })
   }
 
-  forkDedupeCommand(options, callback) {
+  forkDedupeCommand(options: ReturnType<Dedupe["parseOptions"]>, packageNames: string[], callback: SpawnArgs) {
     const dedupeArgs = [
       "--globalconfig",
       config.getGlobalConfigPath(),
@@ -42,14 +62,14 @@ This command is experimental.\
       "dedupe",
     ]
     dedupeArgs.push(...Array.from(this.getNpmBuildFlags() || []))
-    if (options.argv.silent) {
+    if (options.silent) {
       dedupeArgs.push("--silent")
     }
-    if (options.argv.quiet) {
+    if (options.quiet) {
       dedupeArgs.push("--quiet")
     }
 
-    for (const packageName of options.argv._) {
+    for (const packageName of packageNames) {
       dedupeArgs.push(packageName)
     }
 
@@ -58,7 +78,7 @@ This command is experimental.\
     const env = { ...process.env, HOME: this.atomNodeDirectory, RUSTUP_HOME: config.getRustupHomeDirPath() }
     this.addBuildEnvVars(env)
 
-    const dedupeOptions = { env }
+    const dedupeOptions: Record<string, string | undefined> = { env }
     if (options.cwd) {
       dedupeOptions.cwd = options.cwd
     }
@@ -71,16 +91,15 @@ This command is experimental.\
     return fs.makeTreeSync(this.atomNodeDirectory)
   }
 
-  run(options: CliOptions, callback: RunCallback) {
-    const { cwd } = options
-    options = this.parseOptions(options.commandArgs)
-    options.cwd = cwd
+  run(givenOptions: CliOptions, callback: RunCallback) {
+    const options = this.parseOptions(givenOptions.commandArgs)
+    const packageNames = this.packageNamesFromArgv(options)
 
     this.createAtomDirectories()
 
     const commands = []
     commands.push((callback) => this.loadInstalledAtomMetadata(callback))
-    commands.push((callback) => this.dedupeModules(options, callback))
+    commands.push((callback) => this.dedupeModules(options, packageNames, callback))
     return async.waterfall(commands, callback)
   }
 }