From ea57efdc0968278d1ca1e65dc353c78b085d77ce Mon Sep 17 00:00:00 2001
From: Gar <gar+gh@danger.computer>
Date: Wed, 3 Mar 2021 20:26:33 -0800
Subject: [PATCH] fix(usage): clean up usage declarations

Small refactor of commands to allow usage to be more programmatically
generated, leading us in the direction of more tighly coupling each
command to the params it accepts.
---
 lib/access.js                                 |  48 +--
 lib/adduser.js                                |  16 +-
 lib/audit.js                                  |  21 +-
 lib/base-command.js                           |  35 ++
 lib/bin.js                                    |  13 +-
 lib/bugs.js                                   |  13 +-
 lib/cache.js                                  |  30 +-
 lib/ci.js                                     |  12 +-
 lib/completion.js                             |  13 +-
 lib/config.js                                 |  33 +-
 lib/dedupe.js                                 |  11 +-
 lib/deprecate.js                              |  23 +-
 lib/diff.js                                   |  27 +-
 lib/dist-tag.js                               |  23 +-
 lib/doctor.js                                 |  12 +-
 lib/edit.js                                   |  13 +-
 lib/exec.js                                   |  42 +-
 lib/explain.js                                |  13 +-
 lib/explore.js                                |  13 +-
 lib/find-dupes.js                             |  12 +-
 lib/fund.js                                   |  18 +-
 lib/get.js                                    |  16 +-
 lib/help-search.js                            |  14 +-
 lib/help.js                                   |  13 +-
 lib/hook.js                                   |  24 +-
 lib/init.js                                   |  22 +-
 lib/install-ci-test.js                        |  17 +-
 lib/install-test.js                           |  21 +-
 lib/install.js                                |  39 +-
 lib/link.js                                   |  20 +-
 lib/ll.js                                     |  13 +-
 lib/logout.js                                 |  16 +-
 lib/ls.js                                     |  16 +-
 lib/org.js                                    |  23 +-
 lib/outdated.js                               |  15 +-
 lib/owner.js                                  |  39 +-
 lib/pack.js                                   |  13 +-
 lib/ping.js                                   |  13 +-
 lib/prefix.js                                 |  13 +-
 lib/profile.js                                |  25 +-
 lib/prune.js                                  |  15 +-
 lib/publish.js                                |  19 +-
 lib/rebuild.js                                |  13 +-
 lib/repo.js                                   |  13 +-
 lib/restart.js                                |   5 +-
 lib/root.js                                   |  13 +-
 lib/run-script.js                             |  16 +-
 lib/search.js                                 |  16 +-
 lib/set-script.js                             |  13 +-
 lib/set.js                                    |  17 +-
 lib/shrinkwrap.js                             |  13 +-
 lib/star.js                                   |  18 +-
 lib/stars.js                                  |  13 +-
 lib/start.js                                  |   5 +-
 lib/stop.js                                   |   5 +-
 lib/team.js                                   |  27 +-
 lib/test.js                                   |   5 +-
 lib/token.js                                  |  28 +-
 lib/uninstall.js                              |  17 +-
 lib/unpublish.js                              |  14 +-
 lib/unstar.js                                 |   5 +
 lib/update.js                                 |  16 +-
 lib/utils/lifecycle-cmd.js                    |  15 +-
 lib/version.js                                |  21 +-
 lib/view.js                                   |  17 +-
 lib/whoami.js                                 |  22 +-
 .../test-lib-dist-tag.js-TAP.test.js          |  15 +
 tap-snapshots/test-lib-publish.js-TAP.test.js |   6 +-
 .../test-lib-utils-npm-usage.js-TAP.test.js   | 364 +++++++++++++-----
 test/lib/access.js                            |   2 +-
 test/lib/config.js                            |  13 +-
 test/lib/deprecate.js                         |   4 +-
 test/lib/explore.js                           |   2 +-
 test/lib/load-all-commands.js                 |   4 +-
 test/lib/npm.js                               |   2 +-
 test/lib/owner.js                             |  36 +-
 test/lib/restart.js                           |   1 -
 test/lib/start.js                             |   1 -
 test/lib/stop.js                              |   1 -
 test/lib/utils/lifecycle-cmd.js               |   7 +-
 80 files changed, 888 insertions(+), 764 deletions(-)
 create mode 100644 lib/base-command.js

diff --git a/lib/access.js b/lib/access.js
index e11934af43ebc..e77ed3c6d7ac6 100644
--- a/lib/access.js
+++ b/lib/access.js
@@ -5,8 +5,8 @@ const readPackageJson = require('read-package-json-fast')
 
 const output = require('./utils/output.js')
 const otplease = require('./utils/otplease.js')
-const usageUtil = require('./utils/usage.js')
 const getIdentity = require('./utils/get-identity.js')
+const BaseCommand = require('./base-command.js')
 
 const subcommands = [
   'public',
@@ -20,24 +20,25 @@ const subcommands = [
   '2fa-not-required',
 ]
 
-class Access {
-  constructor (npm) {
-    this.npm = npm
+class Access extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'access'
   }
 
-  get usage () {
-    return usageUtil(
-      'access',
-      'npm access public [<package>]\n' +
-      'npm access restricted [<package>]\n' +
-      'npm access grant <read-only|read-write> <scope:team> [<package>]\n' +
-      'npm access revoke <scope:team> [<package>]\n' +
-      'npm access 2fa-required [<package>]\n' +
-      'npm access 2fa-not-required [<package>]\n' +
-      'npm access ls-packages [<user>|<scope>|<scope:team>]\n' +
-      'npm access ls-collaborators [<package> [<user>]]\n' +
-      'npm access edit [<package>]'
-    )
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return [
+      'public [<package>]',
+      'restricted [<package>]',
+      'grant <read-only|read-write> <scope:team> [<package>]',
+      'revoke <scope:team> [<package>]',
+      '2fa-required [<package>]',
+      '2fa-not-required [<package>]',
+      'ls-packages [<user>|<scope>|<scope:team>]',
+      'ls-collaborators [<package> [<user>]]',
+      'edit [<package>]',
+    ]
   }
 
   async completion (opts) {
@@ -67,12 +68,7 @@ class Access {
   }
 
   exec (args, cb) {
-    this.access(args)
-      .then(x => cb(null, x))
-      .catch(err => err.code === 'EUSAGE'
-        ? cb(err.message)
-        : cb(err)
-      )
+    this.access(args).then(() => cb()).catch(cb)
   }
 
   async access ([cmd, ...args]) {
@@ -203,12 +199,6 @@ class Access {
         return name
     }
   }
-
-  usageError (msg) {
-    return Object.assign(new Error(`\nUsage: ${msg}\n\n` + this.usage), {
-      code: 'EUSAGE',
-    })
-  }
 }
 
 module.exports = Access
diff --git a/lib/adduser.js b/lib/adduser.js
index dac0f5a46840d..dcb0de8fb225f 100644
--- a/lib/adduser.js
+++ b/lib/adduser.js
@@ -1,7 +1,7 @@
 const log = require('npmlog')
 const output = require('./utils/output.js')
-const usageUtil = require('./utils/usage.js')
 const replaceInfo = require('./utils/replace-info.js')
+const BaseCommand = require('./base-command.js')
 const authTypes = {
   legacy: require('./auth/legacy.js'),
   oauth: require('./auth/oauth.js'),
@@ -9,17 +9,15 @@ const authTypes = {
   sso: require('./auth/sso.js'),
 }
 
-class AddUser {
-  constructor (npm) {
-    this.npm = npm
+class AddUser extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'adduser'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil(
-      'adduser',
-      'npm adduser [--registry=url] [--scope=@orgname] [--always-auth]'
-    )
+  static get usage () {
+    return ['[--registry=url] [--scope=@orgname] [--always-auth]']
   }
 
   exec (args, cb) {
diff --git a/lib/audit.js b/lib/audit.js
index dfa01cb2709fa..c134d858ada22 100644
--- a/lib/audit.js
+++ b/lib/audit.js
@@ -3,21 +3,20 @@ const auditReport = require('npm-audit-report')
 const output = require('./utils/output.js')
 const reifyFinish = require('./utils/reify-finish.js')
 const auditError = require('./utils/audit-error.js')
-const usageUtil = require('./utils/usage.js')
+const BaseCommand = require('./base-command.js')
 
-class Audit {
-  constructor (npm) {
-    this.npm = npm
+class Audit extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'audit'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil(
-      'audit',
-      'npm audit [--json] [--production]' +
-      '\nnpm audit fix ' +
-      '[--force|--package-lock-only|--dry-run|--production|--only=(dev|prod)]'
-    )
+  static get usage () {
+    return [
+      '[--json] [--production]',
+      'fix [--force|--package-lock-only|--dry-run|--production|--only=(dev|prod)]',
+    ]
   }
 
   async completion (opts) {
diff --git a/lib/base-command.js b/lib/base-command.js
new file mode 100644
index 0000000000000..48023a4d602f6
--- /dev/null
+++ b/lib/base-command.js
@@ -0,0 +1,35 @@
+// Base class for npm.commands[cmd]
+const usageUtil = require('./utils/usage.js')
+
+class BaseCommand {
+  constructor (npm) {
+    this.npm = npm
+  }
+
+  get usage () {
+    let usage = ` ${this.constructor.name}\n\n`
+    if (this.constructor.description)
+      usage = `${usage}${this.constructor.description}\n\n`
+
+    usage = `${usage}Usage:\n`
+    if (!this.constructor.usage)
+      usage = `${usage}npm ${this.constructor.name}`
+    else
+      usage = `${usage}${this.constructor.usage.map(u => `npm ${this.constructor.name} ${u}`).join('\n')}`
+
+    return usageUtil(this.constructor.name, usage)
+  }
+
+  usageError (msg) {
+    if (!msg) {
+      return Object.assign(new Error(`\nUsage: ${this.usage}`), {
+        code: 'EUSAGE',
+      })
+    }
+
+    return Object.assign(new Error(`\nUsage: ${msg}\n\n${this.usage}`), {
+      code: 'EUSAGE',
+    })
+  }
+}
+module.exports = BaseCommand
diff --git a/lib/bin.js b/lib/bin.js
index 11490c41cbcc5..f033f7e1c0edc 100644
--- a/lib/bin.js
+++ b/lib/bin.js
@@ -1,15 +1,16 @@
 const output = require('./utils/output.js')
 const envPath = require('./utils/path.js')
-const usageUtil = require('./utils/usage.js')
+const BaseCommand = require('./base-command.js')
 
-class Bin {
-  constructor (npm) {
-    this.npm = npm
+class Bin extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'bin'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('bin', 'npm bin [-g]')
+  static get usage () {
+    return ['[-g]']
   }
 
   exec (args, cb) {
diff --git a/lib/bugs.js b/lib/bugs.js
index fb0d7c92770c7..7c542f2790bc4 100644
--- a/lib/bugs.js
+++ b/lib/bugs.js
@@ -1,17 +1,18 @@
 const log = require('npmlog')
 const pacote = require('pacote')
 const openUrl = require('./utils/open-url.js')
-const usageUtil = require('./utils/usage.js')
 const hostedFromMani = require('./utils/hosted-git-info-from-manifest.js')
+const BaseCommand = require('./base-command.js')
 
-class Bugs {
-  constructor (npm) {
-    this.npm = npm
+class Bugs extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'bugs'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('bugs', 'npm bugs [<pkgname>]')
+  static get usage () {
+    return ['[<pkgname>]']
   }
 
   exec (args, cb) {
diff --git a/lib/cache.js b/lib/cache.js
index 8469559764fb3..0f473ad4b9a5b 100644
--- a/lib/cache.js
+++ b/lib/cache.js
@@ -5,23 +5,25 @@ const output = require('./utils/output.js')
 const pacote = require('pacote')
 const path = require('path')
 const rimraf = promisify(require('rimraf'))
+const BaseCommand = require('./base-command.js')
 
-const usageUtil = require('./utils/usage.js')
-class Cache {
-  constructor (npm) {
-    this.npm = npm
+class Cache extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'cache'
   }
 
-  get usage () {
-    return usageUtil('cache',
-      'npm cache add <tarball file>' +
-      '\nnpm cache add <folder>' +
-      '\nnpm cache add <tarball url>' +
-      '\nnpm cache add <git url>' +
-      '\nnpm cache add <name>@<version>' +
-      '\nnpm cache clean' +
-      '\nnpm cache verify'
-    )
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return [
+      'add <tarball file>',
+      'add <folder>',
+      'add <tarball url>',
+      'add <git url>',
+      'add <name>@<version>',
+      'clean',
+      'verify',
+    ]
   }
 
   async completion (opts) {
diff --git a/lib/ci.js b/lib/ci.js
index 03a91a60463f2..3ea19937616e6 100644
--- a/lib/ci.js
+++ b/lib/ci.js
@@ -7,7 +7,6 @@ const fs = require('fs')
 const readdir = util.promisify(fs.readdir)
 
 const log = require('npmlog')
-const usageUtil = require('./utils/usage.js')
 
 const removeNodeModules = async where => {
   const rimrafOpts = { glob: false }
@@ -18,15 +17,12 @@ const removeNodeModules = async where => {
   await Promise.all(entries.map(f => rimraf(`${path}/${f}`, rimrafOpts)))
   process.emit('timeEnd', 'npm-ci:rm')
 }
+const BaseCommand = require('./base-command.js')
 
-class CI {
-  constructor (npm) {
-    this.npm = npm
-  }
-
+class CI extends BaseCommand {
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('ci', 'npm ci')
+  static get name () {
+    return 'ci'
   }
 
   exec (args, cb) {
diff --git a/lib/completion.js b/lib/completion.js
index 4c37e6ef354ef..8663a48c79049 100644
--- a/lib/completion.js
+++ b/lib/completion.js
@@ -42,17 +42,18 @@ const isWindowsShell = require('./utils/is-windows-shell.js')
 const output = require('./utils/output.js')
 const fileExists = require('./utils/file-exists.js')
 
-const usageUtil = require('./utils/usage.js')
 const { promisify } = require('util')
+const BaseCommand = require('./base-command.js')
 
-class Completion {
-  constructor (npm) {
-    this.npm = npm
+class Completion extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'completion'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('completion', 'source <(npm completion)')
+  static get description () {
+    return 'npm command completion script. save to ~/.bashrc or ~/.zshrc'
   }
 
   // completion for the completion command
diff --git a/lib/config.js b/lib/config.js
index 2805db9b80ec7..d14db41992b6f 100644
--- a/lib/config.js
+++ b/lib/config.js
@@ -1,5 +1,4 @@
 const { defaults, types } = require('./utils/config.js')
-const usageUtil = require('./utils/usage.js')
 const output = require('./utils/output.js')
 
 const mkdirp = require('mkdirp-infer-owner')
@@ -29,22 +28,22 @@ const keyValues = args => {
 
 const publicVar = k => !/^(\/\/[^:]+:)?_/.test(k)
 
-class Config {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Config extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'config'
   }
 
-  get usage () {
-    return usageUtil(
-      'config',
-      'npm config set <key>=<value> [<key>=<value> ...]' +
-      '\nnpm config get [<key> [<key> ...]]' +
-      '\nnpm config delete <key> [<key> ...]' +
-      '\nnpm config list [--json]' +
-      '\nnpm config edit' +
-      '\nnpm set <key>=<value> [<key>=<value> ...]' +
-      '\nnpm get [<key> [<key> ...]]'
-    )
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return [
+      'set <key>=<value> [<key>=<value> ...]',
+      'get [<key> [<key> ...]]',
+      'delete <key> [<key> ...]',
+      'list [--json]',
+      'edit',
+    ]
   }
 
   async completion (opts) {
@@ -254,10 +253,6 @@ ${defData}
     }
     output(JSON.stringify(publicConf, null, 2))
   }
-
-  usageError () {
-    return Object.assign(new Error(this.usage), { code: 'EUSAGE' })
-  }
 }
 
 module.exports = Config
diff --git a/lib/dedupe.js b/lib/dedupe.js
index 59978895effb2..50a56211fc847 100644
--- a/lib/dedupe.js
+++ b/lib/dedupe.js
@@ -1,16 +1,13 @@
 // dedupe duplicated packages, or find them in the tree
 const Arborist = require('@npmcli/arborist')
-const usageUtil = require('./utils/usage.js')
 const reifyFinish = require('./utils/reify-finish.js')
 
-class Dedupe {
-  constructor (npm) {
-    this.npm = npm
-  }
+const BaseCommand = require('./base-command.js')
 
+class Dedupe extends BaseCommand {
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('dedupe', 'npm dedupe')
+  static get name () {
+    return 'dedupe'
   }
 
   exec (args, cb) {
diff --git a/lib/deprecate.js b/lib/deprecate.js
index 48f27ab6c35e8..a0c67f805d2f9 100644
--- a/lib/deprecate.js
+++ b/lib/deprecate.js
@@ -4,18 +4,17 @@ const npa = require('npm-package-arg')
 const semver = require('semver')
 const getIdentity = require('./utils/get-identity.js')
 const libaccess = require('libnpmaccess')
-const usageUtil = require('./utils/usage.js')
+const BaseCommand = require('./base-command.js')
 
-class Deprecate {
-  constructor (npm) {
-    this.npm = npm
+class Deprecate extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'deprecate'
   }
 
-  get usage () {
-    return usageUtil(
-      'deprecate',
-      'npm deprecate <pkg>[@<version>] <message>'
-    )
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return ['<pkg>[@<version>] <message>']
   }
 
   async completion (opts) {
@@ -71,12 +70,6 @@ class Deprecate {
       ignoreBody: true,
     }))
   }
-
-  usageError () {
-    return Object.assign(new Error(`\nUsage: ${this.usage}`), {
-      code: 'EUSAGE',
-    })
-  }
 }
 
 module.exports = Deprecate
diff --git a/lib/diff.js b/lib/diff.js
index 859e6f76feeef..2ec92c0467bd7 100644
--- a/lib/diff.js
+++ b/lib/diff.js
@@ -8,24 +8,25 @@ const npmlog = require('npmlog')
 const pacote = require('pacote')
 const pickManifest = require('npm-pick-manifest')
 
-const usageUtil = require('./utils/usage.js')
 const output = require('./utils/output.js')
 const readLocalPkg = require('./utils/read-local-package.js')
+const BaseCommand = require('./base-command.js')
 
-class Diff {
-  constructor (npm) {
-    this.npm = npm
+class Diff extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'diff'
   }
 
-  get usage () {
-    return usageUtil(
-      'diff',
-      'npm diff [...<paths>]' +
-      '\nnpm diff --diff=<pkg-name> [...<paths>]' +
-      '\nnpm diff --diff=<version-a> [--diff=<version-b>] [...<paths>]' +
-      '\nnpm diff --diff=<spec-a> [--diff=<spec-b>] [...<paths>]' +
-      '\nnpm diff [--diff-ignore-all-space] [--diff-name-only] [...<paths>] [...<paths>]'
-    )
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return [
+      '[...<paths>]',
+      '--diff=<pkg-name> [...<paths>]',
+      '--diff=<version-a> [--diff=<version-b>] [...<paths>]',
+      '--diff=<spec-a> [--diff=<spec-b>] [...<paths>]',
+      '[--diff-ignore-all-space] [--diff-name-only] [...<paths>] [...<paths>]',
+    ]
   }
 
   get where () {
diff --git a/lib/dist-tag.js b/lib/dist-tag.js
index 171a88c527e5d..283b1e3bf5f15 100644
--- a/lib/dist-tag.js
+++ b/lib/dist-tag.js
@@ -6,20 +6,21 @@ const semver = require('semver')
 const output = require('./utils/output.js')
 const otplease = require('./utils/otplease.js')
 const readLocalPkgName = require('./utils/read-local-package.js')
-const usageUtil = require('./utils/usage.js')
+const BaseCommand = require('./base-command.js')
 
-class DistTag {
-  constructor (npm) {
-    this.npm = npm
+class DistTag extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'dist-tag'
   }
 
-  get usage () {
-    return usageUtil(
-      'dist-tag',
-      'npm dist-tag add <pkg>@<version> [<tag>]' +
-      '\nnpm dist-tag rm <pkg> <tag>' +
-      '\nnpm dist-tag ls [<pkg>]'
-    )
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return [
+      'add <pkg>@<version> [<tag>]',
+      'rm <pkg> <tag>',
+      'ls [<pkg>]',
+    ]
   }
 
   async completion (opts) {
diff --git a/lib/doctor.js b/lib/doctor.js
index 81860004e344e..b09b8132d37d4 100644
--- a/lib/doctor.js
+++ b/lib/doctor.js
@@ -12,7 +12,6 @@ const ansiTrim = require('./utils/ansi-trim.js')
 const isWindows = require('./utils/is-windows.js')
 const output = require('./utils/output.js')
 const ping = require('./utils/ping.js')
-const usageUtil = require('./utils/usage.js')
 const { defaults: { registry: defaultRegistry } } = require('./utils/config.js')
 const lstat = promisify(fs.lstat)
 const readdir = promisify(fs.readdir)
@@ -32,14 +31,11 @@ const maskLabel = mask => {
   return label.join(', ')
 }
 
-class Doctor {
-  constructor (npm) {
-    this.npm = npm
-  }
-
+const BaseCommand = require('./base-command.js')
+class Doctor extends BaseCommand {
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('doctor', 'npm doctor')
+  static get name () {
+    return 'doctor'
   }
 
   exec (args, cb) {
diff --git a/lib/edit.js b/lib/edit.js
index a7dbb38205b02..1dbe8e4c103ad 100644
--- a/lib/edit.js
+++ b/lib/edit.js
@@ -4,18 +4,19 @@
 const { resolve } = require('path')
 const fs = require('graceful-fs')
 const { spawn } = require('child_process')
-const usageUtil = require('./utils/usage.js')
 const splitPackageNames = require('./utils/split-package-names.js')
 const completion = require('./utils/completion/installed-shallow.js')
+const BaseCommand = require('./base-command.js')
 
-class Edit {
-  constructor (npm) {
-    this.npm = npm
+class Edit extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'edit'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('edit', 'npm edit <pkg>[/<subpkg>...]')
+  static get usage () {
+    return ['<pkg>[/<subpkg>...]']
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
diff --git a/lib/exec.js b/lib/exec.js
index d1db49128587e..8ea6d8ebb6804 100644
--- a/lib/exec.js
+++ b/lib/exec.js
@@ -1,5 +1,4 @@
 const output = require('./utils/output.js')
-const usageUtil = require('./utils/usage.js')
 const { promisify } = require('util')
 const read = promisify(require('read'))
 const mkdirp = require('mkdirp-infer-owner')
@@ -13,6 +12,7 @@ const pacote = require('pacote')
 const npa = require('npm-package-arg')
 const fileExists = require('./utils/file-exists.js')
 const PATH = require('./utils/path.js')
+const BaseCommand = require('./base-command.js')
 
 // it's like this:
 //
@@ -39,31 +39,25 @@ const PATH = require('./utils/path.js')
 // runScript({ pkg, event: 'npx', ... })
 // process.env.npm_lifecycle_event = 'npx'
 
-class Exec {
-  constructor (npm) {
-    this.npm = npm
+class Exec extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'exec'
   }
 
-  get usage () {
-    return usageUtil('exec',
-      'Run a command from a local or remote npm package.\n\n' +
-
-      'npm exec -- <pkg>[@<version>] [args...]\n' +
-      'npm exec --package=<pkg>[@<version>] -- <cmd> [args...]\n' +
-      'npm exec -c \'<cmd> [args...]\'\n' +
-      'npm exec --package=foo -c \'<cmd> [args...]\'\n' +
-      '\n' +
-      'npx <pkg>[@<specifier>] [args...]\n' +
-      'npx -p <pkg>[@<specifier>] <cmd> [args...]\n' +
-      'npx -c \'<cmd> [args...]\'\n' +
-      'npx -p <pkg>[@<specifier>] -c \'<cmd> [args...]\'' +
-      '\n' +
-      'Run without --call or positional args to open interactive subshell\n',
-
-      '\n--package=<pkg> (may be specified multiple times)\n' +
-      '-p is a shorthand for --package only when using npx executable\n' +
-      '-c <cmd> --call=<cmd> (may not be mixed with positional arguments)'
-    )
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get description () {
+    return 'Run a command from a local or remote npm package.'
+  }
+
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return [
+      '-- <pkg>[@<version>] [args...]',
+      '--package=<pkg>[@<version>] -- <cmd> [args...]',
+      '-c \'<cmd> [args...]\'',
+      '--package=foo -c \'<cmd> [args...]\'',
+    ]
   }
 
   exec (args, cb) {
diff --git a/lib/explain.js b/lib/explain.js
index 01541040ef649..bd3d1359e67f2 100644
--- a/lib/explain.js
+++ b/lib/explain.js
@@ -1,4 +1,3 @@
-const usageUtil = require('./utils/usage.js')
 const { explainNode } = require('./utils/explain-dep.js')
 const completion = require('./utils/completion/installed-deep.js')
 const output = require('./utils/output.js')
@@ -7,15 +6,17 @@ const npa = require('npm-package-arg')
 const semver = require('semver')
 const { relative, resolve } = require('path')
 const validName = require('validate-npm-package-name')
+const BaseCommand = require('./base-command.js')
 
-class Explain {
-  constructor (npm) {
-    this.npm = npm
+class Explain extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'explain'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('explain', 'npm explain <folder | specifier>')
+  static get usage () {
+    return ['<folder | specifier>']
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
diff --git a/lib/explore.js b/lib/explore.js
index fdfe6e1bcf7c8..cf9c5774fb7d7 100644
--- a/lib/explore.js
+++ b/lib/explore.js
@@ -6,16 +6,17 @@ const runScript = require('@npmcli/run-script')
 const { join, resolve, relative } = require('path')
 const completion = require('./utils/completion/installed-shallow.js')
 const output = require('./utils/output.js')
-const usageUtil = require('./utils/usage.js')
+const BaseCommand = require('./base-command.js')
 
-class Explore {
-  constructor (npm) {
-    this.npm = npm
+class Explore extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'explore'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('explore', 'npm explore <pkg> [ -- <command>]')
+  static get usage () {
+    return ['<pkg> [ -- <command>]']
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
diff --git a/lib/find-dupes.js b/lib/find-dupes.js
index 5061be9cc381a..ecb945f47bb41 100644
--- a/lib/find-dupes.js
+++ b/lib/find-dupes.js
@@ -1,14 +1,10 @@
 // dedupe duplicated packages, or find them in the tree
-const usageUtil = require('./utils/usage.js')
-
-class FindDupes {
-  constructor (npm) {
-    this.npm = npm
-  }
+const BaseCommand = require('./base-command.js')
 
+class FindDupes extends BaseCommand {
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('find-dupes', 'npm find-dupes')
+  static get name () {
+    return 'find-dupes'
   }
 
   exec (args, cb) {
diff --git a/lib/fund.js b/lib/fund.js
index 1e9724266401f..7456411772683 100644
--- a/lib/fund.js
+++ b/lib/fund.js
@@ -14,25 +14,23 @@ const {
 const completion = require('./utils/completion/installed-deep.js')
 const output = require('./utils/output.js')
 const openUrl = require('./utils/open-url.js')
-const usageUtil = require('./utils/usage.js')
 
 const getPrintableName = ({ name, version }) => {
   const printableVersion = version ? `@${version}` : ''
   return `${name}${printableVersion}`
 }
 
-class Fund {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+
+class Fund extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'fund'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil(
-      'fund',
-      'npm fund',
-      'npm fund [--json] [--browser] [--unicode] [[<@scope>/]<pkg> [--which=<fundingSourceNumber>]'
-    )
+  static get usage () {
+    return ['[--json] [--browser] [--unicode] [[<@scope>/]<pkg> [--which=<fundingSourceNumber>]']
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
diff --git a/lib/get.js b/lib/get.js
index a5b2f5514473d..a5d58accc8307 100644
--- a/lib/get.js
+++ b/lib/get.js
@@ -1,16 +1,14 @@
-const usageUtil = require('./utils/usage.js')
+const BaseCommand = require('./base-command.js')
 
-class Get {
-  constructor (npm) {
-    this.npm = npm
+class Get extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'get'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil(
-      'get',
-      'npm get [<key> ...] (See `npm config`)'
-    )
+  static get usage () {
+    return ['[<key> ...] (See `npm config`)']
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
diff --git a/lib/help-search.js b/lib/help-search.js
index ed2bc23b9109d..568fb27b7300c 100644
--- a/lib/help-search.js
+++ b/lib/help-search.js
@@ -2,21 +2,23 @@ const fs = require('fs')
 const path = require('path')
 const color = require('ansicolors')
 const output = require('./utils/output.js')
-const usageUtil = require('./utils/usage.js')
 const npmUsage = require('./utils/npm-usage.js')
 const { promisify } = require('util')
 const glob = promisify(require('glob'))
 const readFile = promisify(fs.readFile)
 const didYouMean = require('./utils/did-you-mean.js')
 const { cmdList } = require('./utils/cmd-list.js')
+const BaseCommand = require('./base-command.js')
 
-class HelpSearch {
-  constructor (npm) {
-    this.npm = npm
+class HelpSearch extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'help-search'
   }
 
-  get usage () {
-    return usageUtil('help-search', 'npm help-search <text>')
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return ['<text>']
   }
 
   exec (args, cb) {
diff --git a/lib/help.js b/lib/help.js
index d7897326f3118..7ceab6472de63 100644
--- a/lib/help.js
+++ b/lib/help.js
@@ -6,16 +6,17 @@ const openUrl = require('./utils/open-url.js')
 const glob = require('glob')
 const output = require('./utils/output.js')
 
-const usage = require('./utils/usage.js')
+const BaseCommand = require('./base-command.js')
 
-class Help {
-  constructor (npm) {
-    this.npm = npm
+class Help extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'help'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usage('help', 'npm help <term> [<terms..>]')
+  static get usage () {
+    return ['<term> [<terms..>]']
   }
 
   async completion (opts) {
diff --git a/lib/hook.js b/lib/hook.js
index 312f542d7cff6..e4b9389d89391 100644
--- a/lib/hook.js
+++ b/lib/hook.js
@@ -3,20 +3,22 @@ const output = require('./utils/output.js')
 const otplease = require('./utils/otplease.js')
 const relativeDate = require('tiny-relative-date')
 const Table = require('cli-table3')
-const usageUtil = require('./utils/usage.js')
 
-class Hook {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Hook extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'hook'
   }
 
-  get usage () {
-    return usageUtil('hook', [
-      'npm hook add <pkg> <url> <secret> [--type=<type>]',
-      'npm hook ls [pkg]',
-      'npm hook rm <id>',
-      'npm hook update <id> <url> <secret>',
-    ].join('\n'))
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return [
+      'add <pkg> <url> <secret> [--type=<type>]',
+      'ls [pkg]',
+      'rm <id>',
+      'update <id> <url> <secret>',
+    ]
   }
 
   exec (args, cb) {
diff --git a/lib/init.js b/lib/init.js
index af97a9614e368..a81b7e4f7ded7 100644
--- a/lib/init.js
+++ b/lib/init.js
@@ -1,22 +1,22 @@
 const initJson = require('init-package-json')
 const npa = require('npm-package-arg')
 
-const usageUtil = require('./utils/usage.js')
+const BaseCommand = require('./base-command.js')
 const output = require('./utils/output.js')
 
-class Init {
-  constructor (npm) {
-    this.npm = npm
+class Init extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'init'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil(
-      'init',
-      '\nnpm init [--force|-f|--yes|-y|--scope]' +
-      '\nnpm init <@scope> (same as `npx <@scope>/create`)' +
-      '\nnpm init [<@scope>/]<name> (same as `npx [<@scope>/]create-<name>`)'
-    )
+  static get usage () {
+    return [
+      '[--force|-f|--yes|-y|--scope]',
+      '<@scope> (same as `npx <@scope>/create`)',
+      '[<@scope>/]<name> (same as `npx [<@scope>/]create-<name>`)',
+    ]
   }
 
   exec (args, cb) {
diff --git a/lib/install-ci-test.js b/lib/install-ci-test.js
index d1740999d4b67..c52b5c9e8073f 100644
--- a/lib/install-ci-test.js
+++ b/lib/install-ci-test.js
@@ -1,19 +1,12 @@
 // npm install-ci-test
 // Runs `npm ci` and then runs `npm test`
 
-const usageUtil = require('./utils/usage.js')
+const CI = require('./ci.js')
 
-class InstallCITest {
-  constructor (npm) {
-    this.npm = npm
-  }
-
-  get usage () {
-    return usageUtil(
-      'install-ci-test',
-      'npm install-ci-test [args]' +
-      '\nSame args as `npm ci`'
-    )
+class InstallCITest extends CI {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'install-ci-test'
   }
 
   exec (args, cb) {
diff --git a/lib/install-test.js b/lib/install-test.js
index 487f8da00b6d3..76c6f367dd3c8 100644
--- a/lib/install-test.js
+++ b/lib/install-test.js
@@ -1,23 +1,12 @@
 // npm install-test
 // Runs `npm install` and then runs `npm test`
 
-const usageUtil = require('./utils/usage.js')
+const Install = require('./install.js')
 
-class InstallTest {
-  constructor (npm) {
-    this.npm = npm
-  }
-
-  get usage () {
-    return usageUtil(
-      'install-test',
-      'npm install-test [args]' +
-      '\nSame args as `npm install`'
-    )
-  }
-
-  async completion (opts) {
-    return this.npm.commands.install.completion(opts)
+class InstallTest extends Install {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'install-test'
   }
 
   exec (args, cb) {
diff --git a/lib/install.js b/lib/install.js
index d7fd384d5bd6f..77a305018a107 100644
--- a/lib/install.js
+++ b/lib/install.js
@@ -3,35 +3,34 @@
 const fs = require('fs')
 const util = require('util')
 const readdir = util.promisify(fs.readdir)
-const usageUtil = require('./utils/usage.js')
 const reifyFinish = require('./utils/reify-finish.js')
 const log = require('npmlog')
 const { resolve, join } = require('path')
 const Arborist = require('@npmcli/arborist')
 const runScript = require('@npmcli/run-script')
 
-class Install {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Install extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'install'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil(
-      'install',
-      'npm install (with no args, in package dir)' +
-      '\nnpm install [<@scope>/]<pkg>' +
-      '\nnpm install [<@scope>/]<pkg>@<tag>' +
-      '\nnpm install [<@scope>/]<pkg>@<version>' +
-      '\nnpm install [<@scope>/]<pkg>@<version range>' +
-      '\nnpm install <alias>@npm:<name>' +
-      '\nnpm install <folder>' +
-      '\nnpm install <tarball file>' +
-      '\nnpm install <tarball url>' +
-      '\nnpm install <git:// url>' +
-      '\nnpm install <github username>/<github project>',
-      '[--save-prod|--save-dev|--save-optional|--save-peer] [--save-exact] [--no-save]'
-    )
+  static get usage () {
+    return [
+      '(with no args, in package dir)',
+      '[<@scope>/]<pkg>',
+      '[<@scope>/]<pkg>@<tag>',
+      '[<@scope>/]<pkg>@<version>',
+      '[<@scope>/]<pkg>@<version range>',
+      '<alias>@npm:<name>',
+      '<folder>',
+      '<tarball file>',
+      '<tarball url>',
+      '<git:// url>',
+      '<github username>/<github project> [--save-prod|--save-dev|--save-optional|--save-peer] [--save-exact] [--no-save]',
+    ]
   }
 
   async completion (opts) {
diff --git a/lib/link.js b/lib/link.js
index 6d5e207105825..66f83d9f5b0a7 100644
--- a/lib/link.js
+++ b/lib/link.js
@@ -8,21 +8,21 @@ const npa = require('npm-package-arg')
 const rpj = require('read-package-json-fast')
 const semver = require('semver')
 
-const usageUtil = require('./utils/usage.js')
 const reifyFinish = require('./utils/reify-finish.js')
 
-class Link {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Link extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'link'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil(
-      'link',
-      'npm link (in package dir)' +
-      '\nnpm link [<@scope>/]<pkg>[@<version>]'
-    )
+  static get usage () {
+    return [
+      '(in package dir)',
+      '[<@scope>/]<pkg>[@<version>]',
+    ]
   }
 
   async completion (opts) {
diff --git a/lib/ll.js b/lib/ll.js
index 7915f5d27c011..3e3428a7ff5eb 100644
--- a/lib/ll.js
+++ b/lib/ll.js
@@ -1,13 +1,14 @@
 const LS = require('./ls.js')
-const usageUtil = require('./utils/usage.js')
 
 class LL extends LS {
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil(
-      'll',
-      'npm ll [[<@scope>/]<pkg> ...]'
-    )
+  static get name () {
+    return 'll'
+  }
+
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return ['[[<@scope>/]<pkg> ...]']
   }
 
   exec (args, cb) {
diff --git a/lib/logout.js b/lib/logout.js
index 9fb1eab21a152..b3f64f671d326 100644
--- a/lib/logout.js
+++ b/lib/logout.js
@@ -1,19 +1,17 @@
 const log = require('npmlog')
 const getAuth = require('npm-registry-fetch/auth.js')
 const npmFetch = require('npm-registry-fetch')
-const usageUtil = require('./utils/usage.js')
+const BaseCommand = require('./base-command.js')
 
-class Logout {
-  constructor (npm) {
-    this.npm = npm
+class Logout extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'logout'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil(
-      'logout',
-      'npm logout [--registry=<url>] [--scope=<@scope>]'
-    )
+  static get usage () {
+    return ['[--registry=<url>] [--scope=<@scope>]']
   }
 
   exec (args, cb) {
diff --git a/lib/ls.js b/lib/ls.js
index 359fe21e6f8cc..788a258b4eaf5 100644
--- a/lib/ls.js
+++ b/lib/ls.js
@@ -7,7 +7,6 @@ const Arborist = require('@npmcli/arborist')
 const { breadth } = require('treeverse')
 const npa = require('npm-package-arg')
 
-const usageUtil = require('./utils/usage.js')
 const completion = require('./utils/completion/installed-deep.js')
 const output = require('./utils/output.js')
 
@@ -22,18 +21,17 @@ const _parent = Symbol('parent')
 const _problems = Symbol('problems')
 const _required = Symbol('required')
 const _type = Symbol('type')
+const BaseCommand = require('./base-command.js')
 
-class LS {
-  constructor (npm) {
-    this.npm = npm
+class LS extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'ls'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil(
-      'ls',
-      'npm ls [[<@scope>/]<pkg> ...]'
-    )
+  static get usage () {
+    return ['npm ls [[<@scope>/]<pkg> ...]']
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
diff --git a/lib/org.js b/lib/org.js
index 054e1833dba4b..9f0348e65929c 100644
--- a/lib/org.js
+++ b/lib/org.js
@@ -1,21 +1,22 @@
 const liborg = require('libnpmorg')
-const usageUtil = require('./utils/usage.js')
 const output = require('./utils/output.js')
 const otplease = require('./utils/otplease.js')
 const Table = require('cli-table3')
+const BaseCommand = require('./base-command.js')
 
-class Org {
-  constructor (npm) {
-    this.npm = npm
+class Org extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'org'
   }
 
-  get usage () {
-    return usageUtil(
-      'org',
-      'npm org set orgname username [developer | admin | owner]\n' +
-      'npm org rm orgname username\n' +
-      'npm org ls orgname [<username>]'
-    )
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return [
+      'set orgname username [developer | admin | owner]',
+      'rm orgname username',
+      'ls orgname [<username>]',
+    ]
   }
 
   async completion (opts) {
diff --git a/lib/outdated.js b/lib/outdated.js
index fc6967faf60fe..5a953008a4f5b 100644
--- a/lib/outdated.js
+++ b/lib/outdated.js
@@ -10,19 +10,18 @@ const pickManifest = require('npm-pick-manifest')
 const Arborist = require('@npmcli/arborist')
 
 const output = require('./utils/output.js')
-const usageUtil = require('./utils/usage.js')
 const ansiTrim = require('./utils/ansi-trim.js')
+const BaseCommand = require('./base-command.js')
 
-class Outdated {
-  constructor (npm) {
-    this.npm = npm
+class Outdated extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'outdated'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('outdated',
-      'npm outdated [[<@scope>/]<pkg> ...]'
-    )
+  static get usage () {
+    return ['[[<@scope>/]<pkg> ...]']
   }
 
   exec (args, cb) {
diff --git a/lib/owner.js b/lib/owner.js
index 6cb9904880dc2..962a972801759 100644
--- a/lib/owner.js
+++ b/lib/owner.js
@@ -6,24 +6,21 @@ const pacote = require('pacote')
 const output = require('./utils/output.js')
 const otplease = require('./utils/otplease.js')
 const readLocalPkg = require('./utils/read-local-package.js')
-const usageUtil = require('./utils/usage.js')
+const BaseCommand = require('./base-command.js')
 
-class Owner {
-  constructor (npm) {
-    this.npm = npm
+class Owner extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'owner'
   }
 
-  get usage () {
-    return usageUtil(
-      'owner',
-      'npm owner add <user> [<@scope>/]<pkg>' +
-      '\nnpm owner rm <user> [<@scope>/]<pkg>' +
-      '\nnpm owner ls [<@scope>/]<pkg>'
-    )
-  }
-
-  get usageError () {
-    return Object.assign(new Error(this.usage), { code: 'EUSAGE' })
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return [
+      'add <user> [<@scope>/]<pkg>',
+      'rm <user> [<@scope>/]<pkg>',
+      'ls [<@scope>/]<pkg>',
+    ]
   }
 
   async completion (opts) {
@@ -70,7 +67,7 @@ class Owner {
       case 'remove':
         return this.rm(args[0], args[1], opts)
       default:
-        throw this.usageError
+        throw this.usageError()
     }
   }
 
@@ -78,7 +75,7 @@ class Owner {
     if (!pkg) {
       const pkgName = await readLocalPkg(this.npm)
       if (!pkgName)
-        throw this.usageError
+        throw this.usageError()
 
       pkg = pkgName
     }
@@ -102,12 +99,12 @@ class Owner {
 
   async add (user, pkg, opts) {
     if (!user)
-      throw this.usageError
+      throw this.usageError()
 
     if (!pkg) {
       const pkgName = await readLocalPkg(this.npm)
       if (!pkgName)
-        throw this.usageError
+        throw this.usageError()
 
       pkg = pkgName
     }
@@ -119,12 +116,12 @@ class Owner {
 
   async rm (user, pkg, opts) {
     if (!user)
-      throw this.usageError
+      throw this.usageError()
 
     if (!pkg) {
       const pkgName = await readLocalPkg(this.npm)
       if (!pkgName)
-        throw this.usageError
+        throw this.usageError()
 
       pkg = pkgName
     }
diff --git a/lib/pack.js b/lib/pack.js
index cf1e77f48ee69..141784a9a8b1e 100644
--- a/lib/pack.js
+++ b/lib/pack.js
@@ -9,16 +9,17 @@ const { getContents, logTar } = require('./utils/tar.js')
 const writeFile = util.promisify(require('fs').writeFile)
 const output = require('./utils/output.js')
 
-const usageUtil = require('./utils/usage.js')
+const BaseCommand = require('./base-command.js')
 
-class Pack {
-  constructor (npm) {
-    this.npm = npm
+class Pack extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'pack'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('pack', 'npm pack [[<@scope>/]<pkg>...] [--dry-run]')
+  static get usage () {
+    return ['[[<@scope>/]<pkg>...] [--dry-run]']
   }
 
   exec (args, cb) {
diff --git a/lib/ping.js b/lib/ping.js
index e43f0640f212b..b3df6abefb1d4 100644
--- a/lib/ping.js
+++ b/lib/ping.js
@@ -1,16 +1,17 @@
 const log = require('npmlog')
 const output = require('./utils/output.js')
-const usageUtil = require('./utils/usage.js')
 const pingUtil = require('./utils/ping.js')
+const BaseCommand = require('./base-command.js')
 
-class Ping {
-  constructor (npm) {
-    this.npm = npm
+class Ping extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'ping'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('ping', 'npm ping\nping registry')
+  static get description () {
+    return 'ping registry'
   }
 
   exec (args, cb) {
diff --git a/lib/prefix.js b/lib/prefix.js
index e46f9c4cdd94a..d44b4fd189b3b 100644
--- a/lib/prefix.js
+++ b/lib/prefix.js
@@ -1,14 +1,15 @@
 const output = require('./utils/output.js')
-const usageUtil = require('./utils/usage.js')
+const BaseCommand = require('./base-command.js')
 
-class Prefix {
-  constructor (npm) {
-    this.npm = npm
+class Prefix extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'prefix'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('prefix', 'npm prefix [-g]')
+  static get usage () {
+    return ['[-g]']
   }
 
   exec (args, cb) {
diff --git a/lib/profile.js b/lib/profile.js
index dab99092b0a0f..2a823a1eb7508 100644
--- a/lib/profile.js
+++ b/lib/profile.js
@@ -10,7 +10,6 @@ const otplease = require('./utils/otplease.js')
 const output = require('./utils/output.js')
 const pulseTillDone = require('./utils/pulse-till-done.js')
 const readUserInfo = require('./utils/read-user-info.js')
-const usageUtil = require('./utils/usage.js')
 
 const qrcode = url =>
   new Promise((resolve) => qrcodeTerminal.generate(url, resolve))
@@ -38,19 +37,21 @@ const writableProfileKeys = [
   'github',
 ]
 
-class Profile {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Profile extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'profile'
   }
 
-  get usage () {
-    return usageUtil(
-      'profile',
-      'npm profile enable-2fa [auth-only|auth-and-writes]\n',
-      'npm profile disable-2fa\n',
-      'npm profile get [<key>]\n',
-      'npm profile set <key> <value>'
-    )
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return [
+      'enable-2fa [auth-only|auth-and-writes]',
+      'disable-2fa',
+      'get [<key>]',
+      'set <key> <value>',
+    ]
   }
 
   async completion (opts) {
diff --git a/lib/prune.js b/lib/prune.js
index b839301d5194c..c2cddb1a22b33 100644
--- a/lib/prune.js
+++ b/lib/prune.js
@@ -1,18 +1,17 @@
 // prune extraneous packages
 const Arborist = require('@npmcli/arborist')
-const usageUtil = require('./utils/usage.js')
 const reifyFinish = require('./utils/reify-finish.js')
 
-class Prune {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Prune extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'prune'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('prune',
-      'npm prune [[<@scope>/]<pkg>...] [--production]'
-    )
+  static get usage () {
+    return ['[[<@scope>/]<pkg>...] [--production]']
   }
 
   exec (args, cb) {
diff --git a/lib/publish.js b/lib/publish.js
index c8e82c44c5a3c..ff45d6a395e1a 100644
--- a/lib/publish.js
+++ b/lib/publish.js
@@ -11,7 +11,6 @@ const npmFetch = require('npm-registry-fetch')
 const { flatten } = require('./utils/flat-options.js')
 const output = require('./utils/output.js')
 const otplease = require('./utils/otplease.js')
-const usageUtil = require('./utils/usage.js')
 const { getContents, logTar } = require('./utils/tar.js')
 
 // this is the only case in the CLI where we use the old full slow
@@ -19,16 +18,18 @@ const { getContents, logTar } = require('./utils/tar.js')
 // defaults and metadata, like git sha's and default scripts and all that.
 const readJson = util.promisify(require('read-package-json'))
 
-class Publish {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Publish extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'publish'
   }
 
-  get usage () {
-    return usageUtil('publish',
-      'npm publish [<folder>] [--tag <tag>] [--access <public|restricted>] [--dry-run]' +
-      '\n\nPublishes \'.\' if no argument supplied' +
-      '\nSets tag `latest` if no --tag specified')
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return [
+      '[<folder>] [--tag <tag>] [--access <public|restricted>] [--dry-run]',
+    ]
   }
 
   exec (args, cb) {
diff --git a/lib/rebuild.js b/lib/rebuild.js
index 1091b01589389..56f811c558a1e 100644
--- a/lib/rebuild.js
+++ b/lib/rebuild.js
@@ -2,18 +2,19 @@ const { resolve } = require('path')
 const Arborist = require('@npmcli/arborist')
 const npa = require('npm-package-arg')
 const semver = require('semver')
-const usageUtil = require('./utils/usage.js')
 const output = require('./utils/output.js')
 const completion = require('./utils/completion/installed-deep.js')
 
-class Rebuild {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Rebuild extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'rebuild'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('rebuild', 'npm rebuild [[<@scope>/]<name>[@<version>] ...]')
+  static get usage () {
+    return ['[[<@scope>/]<name>[@<version>] ...]']
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
diff --git a/lib/repo.js b/lib/repo.js
index f0be99d4d69e9..aa07e07a819f7 100644
--- a/lib/repo.js
+++ b/lib/repo.js
@@ -4,16 +4,17 @@ const { URL } = require('url')
 
 const hostedFromMani = require('./utils/hosted-git-info-from-manifest.js')
 const openUrl = require('./utils/open-url.js')
-const usageUtil = require('./utils/usage.js')
 
-class Repo {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Repo extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'repo'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('repo', 'npm repo [<pkgname> [<pkgname> ...]]')
+  static get usage () {
+    return ['[<pkgname> [<pkgname> ...]]']
   }
 
   exec (args, cb) {
diff --git a/lib/restart.js b/lib/restart.js
index d5a7789ca92c0..1f3eb5af94f82 100644
--- a/lib/restart.js
+++ b/lib/restart.js
@@ -2,8 +2,9 @@ const LifecycleCmd = require('./utils/lifecycle-cmd.js')
 
 // This ends up calling run-script(['restart', ...args])
 class Restart extends LifecycleCmd {
-  constructor (npm) {
-    super(npm, 'restart')
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'restart'
   }
 }
 module.exports = Restart
diff --git a/lib/root.js b/lib/root.js
index 8e5ac63d7b9b8..f9dad07ef6ca8 100644
--- a/lib/root.js
+++ b/lib/root.js
@@ -1,14 +1,15 @@
 const output = require('./utils/output.js')
-const usageUtil = require('./utils/usage.js')
 
-class Root {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Root extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'root'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('root', 'npm root [-g]')
+  static get usage () {
+    return ['[-g]']
   }
 
   exec (args, cb) {
diff --git a/lib/run-script.js b/lib/run-script.js
index cdfd88f10f7b8..ce535088b602e 100644
--- a/lib/run-script.js
+++ b/lib/run-script.js
@@ -4,7 +4,6 @@ const readJson = require('read-package-json-fast')
 const { resolve } = require('path')
 const output = require('./utils/output.js')
 const log = require('npmlog')
-const usageUtil = require('./utils/usage.js')
 const didYouMean = require('./utils/did-you-mean.js')
 const isWindowsShell = require('./utils/is-windows-shell.js')
 
@@ -19,17 +18,16 @@ const cmdList = [
   'version',
 ].reduce((l, p) => l.concat(['pre' + p, p, 'post' + p]), [])
 
-class RunScript {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class RunScript extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'run-script'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil(
-      'run-script',
-      'npm run-script <command> [-- <args>]'
-    )
+  static get usage () {
+    return ['<command> [-- <args>]']
   }
 
   async completion (opts) {
diff --git a/lib/search.js b/lib/search.js
index e0922b9846cdb..5470a086b654d 100644
--- a/lib/search.js
+++ b/lib/search.js
@@ -6,7 +6,6 @@ const log = require('npmlog')
 const formatPackageStream = require('./search/format-package-stream.js')
 const packageFilter = require('./search/package-filter.js')
 const output = require('./utils/output.js')
-const usageUtil = require('./utils/usage.js')
 
 function prepareIncludes (args) {
   return args
@@ -26,17 +25,16 @@ function prepareExcludes (searchexclude) {
     .filter(s => s)
 }
 
-class Search {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Search extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'search'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil(
-      'search',
-      'npm search [-l|--long] [--json] [--parseable] [--no-description] [search terms ...]'
-    )
+  static get usage () {
+    return ['[-l|--long] [--json] [--parseable] [--no-description] [search terms ...]']
   }
 
   exec (args, cb) {
diff --git a/lib/set-script.js b/lib/set-script.js
index 25545898e1640..6241981323c4a 100644
--- a/lib/set-script.js
+++ b/lib/set-script.js
@@ -1,17 +1,18 @@
 const log = require('npmlog')
-const usageUtil = require('./utils/usage.js')
 const fs = require('fs')
 const parseJSON = require('json-parse-even-better-errors')
 const rpj = require('read-package-json-fast')
 
-class SetScript {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class SetScript extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'set-script'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('set-script', 'npm set-script [<script>] [<command>]')
+  static get usage () {
+    return ['[<script>] [<command>]']
   }
 
   exec (args, cb) {
diff --git a/lib/set.js b/lib/set.js
index cbce1547e891b..787a8012c0b6a 100644
--- a/lib/set.js
+++ b/lib/set.js
@@ -1,15 +1,14 @@
-const usageUtil = require('./utils/usage.js')
+const BaseCommand = require('./base-command.js')
 
-class Set {
-  constructor (npm) {
-    this.npm = npm
+class Set extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'set'
   }
 
-  get usage () {
-    return usageUtil(
-      'set',
-      'npm set <key>=<value> [<key>=<value> ...] (See `npm config`)'
-    )
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return ['<key>=<value> [<key>=<value> ...] (See `npm config`)']
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
diff --git a/lib/shrinkwrap.js b/lib/shrinkwrap.js
index a7516131d2f7e..b52cf41957b2d 100644
--- a/lib/shrinkwrap.js
+++ b/lib/shrinkwrap.js
@@ -5,16 +5,11 @@ const { unlink } = fs.promises || { unlink: util.promisify(fs.unlink) }
 const Arborist = require('@npmcli/arborist')
 const log = require('npmlog')
 
-const usageUtil = require('./utils/usage.js')
-
-class Shrinkwrap {
-  constructor (npm) {
-    this.npm = npm
-  }
-
+const BaseCommand = require('./base-command.js')
+class Shrinkwrap extends BaseCommand {
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('shrinkwrap', 'npm shrinkwrap')
+  static get name () {
+    return 'shrinkwrap'
   }
 
   exec (args, cb) {
diff --git a/lib/star.js b/lib/star.js
index b39d23b2c1170..d32c0b01f8ca0 100644
--- a/lib/star.js
+++ b/lib/star.js
@@ -3,20 +3,18 @@ const log = require('npmlog')
 const npa = require('npm-package-arg')
 
 const output = require('./utils/output.js')
-const usageUtil = require('./utils/usage.js')
 const getIdentity = require('./utils/get-identity')
 
-class Star {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Star extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'star'
   }
 
-  get usage () {
-    return usageUtil(
-      'star',
-      'npm star [<pkg>...]\n' +
-      'npm unstar [<pkg>...]'
-    )
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return ['[<pkg>...]']
   }
 
   exec (args, cb) {
diff --git a/lib/stars.js b/lib/stars.js
index fe280705b4b5c..0923f76ae06c0 100644
--- a/lib/stars.js
+++ b/lib/stars.js
@@ -3,16 +3,17 @@ const fetch = require('npm-registry-fetch')
 
 const output = require('./utils/output.js')
 const getIdentity = require('./utils/get-identity.js')
-const usageUtil = require('./utils/usage.js')
 
-class Stars {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Stars extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'stars'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil('stars', 'npm stars [<user>]')
+  static get usage () {
+    return ['[<user>]']
   }
 
   exec (args, cb) {
diff --git a/lib/start.js b/lib/start.js
index 3d46a3a7ba1ab..8987bc2931eb5 100644
--- a/lib/start.js
+++ b/lib/start.js
@@ -2,8 +2,9 @@ const LifecycleCmd = require('./utils/lifecycle-cmd.js')
 
 // This ends up calling run-script(['start', ...args])
 class Start extends LifecycleCmd {
-  constructor (npm) {
-    super(npm, 'start')
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'start'
   }
 }
 module.exports = Start
diff --git a/lib/stop.js b/lib/stop.js
index d7df5887e7efa..a3857ab1360be 100644
--- a/lib/stop.js
+++ b/lib/stop.js
@@ -2,8 +2,9 @@ const LifecycleCmd = require('./utils/lifecycle-cmd.js')
 
 // This ends up calling run-script(['stop', ...args])
 class Stop extends LifecycleCmd {
-  constructor (npm) {
-    super(npm, 'stop')
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'stop'
   }
 }
 module.exports = Stop
diff --git a/lib/team.js b/lib/team.js
index 4947739a045c4..576f68fb070f6 100644
--- a/lib/team.js
+++ b/lib/team.js
@@ -3,22 +3,23 @@ const libteam = require('libnpmteam')
 
 const output = require('./utils/output.js')
 const otplease = require('./utils/otplease.js')
-const usageUtil = require('./utils/usage.js')
 
-class Team {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Team extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'team'
   }
 
-  get usage () {
-    return usageUtil(
-      'team',
-      'npm team create <scope:team> [--otp <otpcode>]\n' +
-      'npm team destroy <scope:team> [--otp <otpcode>]\n' +
-      'npm team add <scope:team> <user> [--otp <otpcode>]\n' +
-      'npm team rm <scope:team> <user> [--otp <otpcode>]\n' +
-      'npm team ls <scope>|<scope:team>\n'
-    )
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return [
+      'create <scope:team> [--otp <otpcode>]',
+      'destroy <scope:team> [--otp <otpcode>]',
+      'add <scope:team> <user> [--otp <otpcode>]',
+      'rm <scope:team> <user> [--otp <otpcode>]',
+      'ls <scope>|<scope:team>',
+    ]
   }
 
   async completion (opts) {
diff --git a/lib/test.js b/lib/test.js
index 12292d2924ed2..991d1c873cbfb 100644
--- a/lib/test.js
+++ b/lib/test.js
@@ -2,8 +2,9 @@ const LifecycleCmd = require('./utils/lifecycle-cmd.js')
 
 // This ends up calling run-script(['test', ...args])
 class Test extends LifecycleCmd {
-  constructor (npm) {
-    super(npm, 'test')
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'test'
   }
 
   exec (args, cb) {
diff --git a/lib/token.js b/lib/token.js
index ad6d5c6fcb82c..13c563921d0de 100644
--- a/lib/token.js
+++ b/lib/token.js
@@ -8,19 +8,21 @@ const otplease = require('./utils/otplease.js')
 const output = require('./utils/output.js')
 const pulseTillDone = require('./utils/pulse-till-done.js')
 const readUserInfo = require('./utils/read-user-info.js')
-const usageUtil = require('./utils/usage.js')
 
-class Token {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Token extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'token'
   }
 
-  get usage () {
-    return usageUtil('token',
-      'npm token list\n' +
-      'npm token revoke <id|token>\n' +
-      'npm token create [--read-only] [--cidr=list]'
-    )
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return [
+      'list',
+      'revoke <id|token>',
+      'create [--read-only] [--cidr=list]',
+    ]
   }
 
   async completion (opts) {
@@ -189,12 +191,6 @@ class Token {
     return conf
   }
 
-  usageError (msg) {
-    return Object.assign(new Error(`\nUsage: ${msg}\n\n` + this.usage), {
-      code: 'EUSAGE',
-    })
-  }
-
   invalidCIDRError (msg) {
     return Object.assign(new Error(msg), { code: 'EINVALIDCIDR' })
   }
diff --git a/lib/uninstall.js b/lib/uninstall.js
index d7116e4c2dc2b..ee0f338e9fc0a 100644
--- a/lib/uninstall.js
+++ b/lib/uninstall.js
@@ -2,20 +2,19 @@ const { resolve } = require('path')
 const Arborist = require('@npmcli/arborist')
 const rpj = require('read-package-json-fast')
 
-const usageUtil = require('./utils/usage.js')
 const reifyFinish = require('./utils/reify-finish.js')
 const completion = require('./utils/completion/installed-shallow.js')
 
-class Uninstall {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Uninstall extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'uninstall'
   }
 
-  get usage () {
-    return usageUtil(
-      'uninstall',
-      'npm uninstall [<@scope>/]<pkg>[@<version>]... [-S|--save|--no-save]'
-    )
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return ['[<@scope>/]<pkg>[@<version>]... [-S|--save|--no-save]']
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
diff --git a/lib/unpublish.js b/lib/unpublish.js
index 34751da4a5909..ac80479e2584a 100644
--- a/lib/unpublish.js
+++ b/lib/unpublish.js
@@ -7,18 +7,20 @@ const npmFetch = require('npm-registry-fetch')
 const libunpub = require('libnpmpublish').unpublish
 const readJson = util.promisify(require('read-package-json'))
 
-const usageUtil = require('./utils/usage.js')
 const output = require('./utils/output.js')
 const otplease = require('./utils/otplease.js')
 const getIdentity = require('./utils/get-identity.js')
 
-class Unpublish {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Unpublish extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'unpublish'
   }
 
-  get usage () {
-    return usageUtil('unpublish', 'npm unpublish [<@scope>/]<pkg>[@<version>]')
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return ['[<@scope>/]<pkg>[@<version>]']
   }
 
   async completion (args) {
diff --git a/lib/unstar.js b/lib/unstar.js
index c814ef2b66807..5786cfce60f73 100644
--- a/lib/unstar.js
+++ b/lib/unstar.js
@@ -1,6 +1,11 @@
 const Star = require('./star.js')
 
 class Unstar extends Star {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'unstar'
+  }
+
   exec (args, cb) {
     this.npm.config.set('star.unstar', true)
     super.exec(args, cb)
diff --git a/lib/update.js b/lib/update.js
index 98043e09c7650..87540b96e07e5 100644
--- a/lib/update.js
+++ b/lib/update.js
@@ -3,21 +3,19 @@ const path = require('path')
 const Arborist = require('@npmcli/arborist')
 const log = require('npmlog')
 
-const usageUtil = require('./utils/usage.js')
 const reifyFinish = require('./utils/reify-finish.js')
 const completion = require('./utils/completion/installed-deep.js')
 
-class Update {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Update extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'update'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil(
-      'update',
-      'npm update [-g] [<pkg>...]'
-    )
+  static get usage () {
+    return ['[-g] [<pkg>...]']
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
diff --git a/lib/utils/lifecycle-cmd.js b/lib/utils/lifecycle-cmd.js
index 8be9b5a12f9a3..1917bef367855 100644
--- a/lib/utils/lifecycle-cmd.js
+++ b/lib/utils/lifecycle-cmd.js
@@ -1,19 +1,14 @@
 // The implementation of commands that are just "run a script"
 // restart, start, stop, test
-const usageUtil = require('./usage.js')
 
-class LifecycleCmd {
-  constructor (npm, stage) {
-    this.npm = npm
-    this.stage = stage
-  }
-
-  get usage () {
-    return usageUtil(this.stage, `npm ${this.stage} [-- <args>]`)
+const BaseCommand = require('../base-command.js')
+class LifecycleCmd extends BaseCommand {
+  static get usage () {
+    return ['[-- <args>]']
   }
 
   exec (args, cb) {
-    this.npm.commands['run-script']([this.stage, ...args], cb)
+    this.npm.commands['run-script']([this.constructor.name, ...args], cb)
   }
 }
 module.exports = LifecycleCmd
diff --git a/lib/version.js b/lib/version.js
index 1ba834f5d711b..dd065f68d48cc 100644
--- a/lib/version.js
+++ b/lib/version.js
@@ -1,21 +1,16 @@
 const libversion = require('libnpmversion')
 const output = require('./utils/output.js')
-const usageUtil = require('./utils/usage.js')
 
-class Version {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Version extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'version'
   }
 
-  get usage () {
-    return usageUtil(
-      'version',
-      'npm version [<newversion> | major | minor | patch | premajor | preminor | prepatch | prerelease [--preid=<prerelease-id>] | from-git]\n' +
-      '(run in package dir)\n\n' +
-      `'npm -v' or 'npm --version' to print npm version (${this.npm.version})\n` +
-      `'npm view <pkg> version' to view a package's published version\n` +
-      `'npm ls' to inspect current package/dependency versions\n`
-    )
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get usage () {
+    return ['[<newversion> | major | minor | patch | premajor | preminor | prepatch | prerelease [--preid=<prerelease-id>] | from-git]']
   }
 
   async completion (opts) {
diff --git a/lib/view.js b/lib/view.js
index d0d5fa59d462b..0a6688fc2b13d 100644
--- a/lib/view.js
+++ b/lib/view.js
@@ -14,22 +14,19 @@ const style = require('ansistyles')
 const { inspect, promisify } = require('util')
 const { packument } = require('pacote')
 
-const usageUtil = require('./utils/usage.js')
-
 const readFile = promisify(fs.readFile)
 const readJson = async file => jsonParse(await readFile(file, 'utf8'))
 
-class View {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class View extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'view'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil(
-      'view',
-      'npm view [<@scope>/]<pkg>[@<version>] [<field>[.subfield]...]'
-    )
+  static get usage () {
+    return ['[<@scope>/]<pkg>[@<version>] [<field>[.subfield]...]']
   }
 
   async completion (opts) {
diff --git a/lib/whoami.js b/lib/whoami.js
index 39184ed9c581c..9f33a66393eee 100644
--- a/lib/whoami.js
+++ b/lib/whoami.js
@@ -1,19 +1,21 @@
 const output = require('./utils/output.js')
 const getIdentity = require('./utils/get-identity.js')
-const usageUtil = require('./utils/usage.js')
 
-class Whoami {
-  constructor (npm) {
-    this.npm = npm
+const BaseCommand = require('./base-command.js')
+class Whoami extends BaseCommand {
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get name () {
+    return 'whoami'
+  }
+
+  /* istanbul ignore next - see test/lib/load-all-commands.js */
+  static get description () {
+    return 'prints username according to given registry'
   }
 
   /* istanbul ignore next - see test/lib/load-all-commands.js */
-  get usage () {
-    return usageUtil(
-      'whoami',
-      'npm whoami [--registry <registry>]\n' +
-      '(just prints username according to given registry)'
-    )
+  static get usage () {
+    return ['[--registry <registry>]']
   }
 
   exec (args, cb) {
diff --git a/tap-snapshots/test-lib-dist-tag.js-TAP.test.js b/tap-snapshots/test-lib-dist-tag.js-TAP.test.js
index b135b1001bcec..026f355209bc4 100644
--- a/tap-snapshots/test-lib-dist-tag.js-TAP.test.js
+++ b/tap-snapshots/test-lib-dist-tag.js-TAP.test.js
@@ -6,6 +6,9 @@
  */
 'use strict'
 exports[`test/lib/dist-tag.js TAP add missing args > should exit usage error message 1`] = `
+ dist-tag
+
+Usage:
 npm dist-tag add <pkg>@<version> [<tag>]
 npm dist-tag rm <pkg> <tag>
 npm dist-tag ls [<pkg>]
@@ -14,6 +17,9 @@ alias: dist-tags
 `
 
 exports[`test/lib/dist-tag.js TAP add missing pkg name > should exit usage error message 1`] = `
+ dist-tag
+
+Usage:
 npm dist-tag add <pkg>@<version> [<tag>]
 npm dist-tag rm <pkg> <tag>
 npm dist-tag ls [<pkg>]
@@ -31,6 +37,9 @@ dist-tag add 1.0.0 to @scoped/another@7.7.7
 `
 
 exports[`test/lib/dist-tag.js TAP borked cmd usage > should show usage error 1`] = `
+ dist-tag
+
+Usage:
 npm dist-tag add <pkg>@<version> [<tag>]
 npm dist-tag rm <pkg> <tag>
 npm dist-tag ls [<pkg>]
@@ -45,6 +54,9 @@ latest: 1.0.0
 `
 
 exports[`test/lib/dist-tag.js TAP ls on missing name in current package > should throw usage error message 1`] = `
+ dist-tag
+
+Usage:
 npm dist-tag add <pkg>@<version> [<tag>]
 npm dist-tag rm <pkg> <tag>
 npm dist-tag ls [<pkg>]
@@ -89,6 +101,9 @@ exports[`test/lib/dist-tag.js TAP remove existing tag > should return success ms
 `
 
 exports[`test/lib/dist-tag.js TAP remove missing pkg name > should exit usage error message 1`] = `
+ dist-tag
+
+Usage:
 npm dist-tag add <pkg>@<version> [<tag>]
 npm dist-tag rm <pkg> <tag>
 npm dist-tag ls [<pkg>]
diff --git a/tap-snapshots/test-lib-publish.js-TAP.test.js b/tap-snapshots/test-lib-publish.js-TAP.test.js
index 6af6c13f56b9f..e4100eaf47f87 100644
--- a/tap-snapshots/test-lib-publish.js-TAP.test.js
+++ b/tap-snapshots/test-lib-publish.js-TAP.test.js
@@ -6,8 +6,8 @@
  */
 'use strict'
 exports[`test/lib/publish.js TAP shows usage with wrong set of arguments > should print usage 1`] = `
-npm publish [<folder>] [--tag <tag>] [--access <public|restricted>] [--dry-run]
+ publish
 
-Publishes '.' if no argument supplied
-Sets tag \`latest\` if no --tag specified
+Usage:
+npm publish [<folder>] [--tag <tag>] [--access <public|restricted>] [--dry-run]
 `
diff --git a/tap-snapshots/test-lib-utils-npm-usage.js-TAP.test.js b/tap-snapshots/test-lib-utils-npm-usage.js-TAP.test.js
index 8e1603eb4c881..fc3e871d08957 100644
--- a/tap-snapshots/test-lib-utils-npm-usage.js-TAP.test.js
+++ b/tap-snapshots/test-lib-utils-npm-usage.js-TAP.test.js
@@ -207,7 +207,10 @@ npm help npm       more involved overview
 
 All commands:
 
-    access          npm access public [<package>]
+    access           access
+                    
+                    Usage:
+                    npm access public [<package>]
                     npm access restricted [<package>]
                     npm access grant <read-only|read-write> <scope:team> [<package>]
                     npm access revoke <scope:team> [<package>]
@@ -217,20 +220,35 @@ All commands:
                     npm access ls-collaborators [<package> [<user>]]
                     npm access edit [<package>]
 
-    adduser         npm adduser [--registry=url] [--scope=@orgname] [--always-auth]
+    adduser          adduser
+                    
+                    Usage:
+                    npm adduser [--registry=url] [--scope=@orgname] [--always-auth]
                     
                     aliases: login, add-user
 
-    audit           npm audit [--json] [--production]
+    audit            audit
+                    
+                    Usage:
+                    npm audit [--json] [--production]
                     npm audit fix [--force|--package-lock-only|--dry-run|--production|--only=(dev|prod)]
 
-    bin             npm bin [-g]
+    bin              bin
+                    
+                    Usage:
+                    npm bin [-g]
 
-    bugs            npm bugs [<pkgname>]
+    bugs             bugs
+                    
+                    Usage:
+                    npm bugs [<pkgname>]
                     
                     alias: issues
 
-    cache           npm cache add <tarball file>
+    cache            cache
+                    
+                    Usage:
+                    npm cache add <tarball file>
                     npm cache add <folder>
                     npm cache add <tarball url>
                     npm cache add <git url>
@@ -238,35 +256,56 @@ All commands:
                     npm cache clean
                     npm cache verify
 
-    ci              npm ci
+    ci               ci
+                    
+                    Usage:
+                    npm ci
                     
                     aliases: clean-install, ic, install-clean, isntall-clean
 
-    completion      source <(npm completion)
+    completion       completion
+                    
+                    npm command completion script. save to ~/.bashrc or ~/.zshrc
+                    
+                    Usage:
+                    npm completion
 
-    config          npm config set <key>=<value> [<key>=<value> ...]
+    config           config
+                    
+                    Usage:
+                    npm config set <key>=<value> [<key>=<value> ...]
                     npm config get [<key> [<key> ...]]
                     npm config delete <key> [<key> ...]
                     npm config list [--json]
                     npm config edit
-                    npm set <key>=<value> [<key>=<value> ...]
-                    npm get [<key> [<key> ...]]
                     
                     alias: c
 
-    dedupe          npm dedupe
+    dedupe           dedupe
+                    
+                    Usage:
+                    npm dedupe
                     
                     alias: ddp
 
-    deprecate       npm deprecate <pkg>[@<version>] <message>
+    deprecate        deprecate
+                    
+                    Usage:
+                    npm deprecate <pkg>[@<version>] <message>
 
-    diff            npm diff [...<paths>]
+    diff             diff
+                    
+                    Usage:
+                    npm diff [...<paths>]
                     npm diff --diff=<pkg-name> [...<paths>]
                     npm diff --diff=<version-a> [--diff=<version-b>] [...<paths>]
                     npm diff --diff=<spec-a> [--diff=<spec-b>] [...<paths>]
                     npm diff [--diff-ignore-all-space] [--diff-name-only] [...<paths>] [...<paths>]
 
-    dist-tag        npm dist-tag add <pkg>@<version> [<tag>]
+    dist-tag         dist-tag
+                    
+                    Usage:
+                    npm dist-tag add <pkg>@<version> [<tag>]
                     npm dist-tag rm <pkg> <tag>
                     npm dist-tag ls [<pkg>]
                     
@@ -276,61 +315,83 @@ All commands:
                     
                     alias: home
 
-    doctor          npm doctor
+    doctor           doctor
+                    
+                    Usage:
+                    npm doctor
 
-    edit            npm edit <pkg>[/<subpkg>...]
+    edit             edit
+                    
+                    Usage:
+                    npm edit <pkg>[/<subpkg>...]
 
-    exec            Run a command from a local or remote npm package.
+    exec             exec
                     
+                    Run a command from a local or remote npm package.
+                    
+                    Usage:
                     npm exec -- <pkg>[@<version>] [args...]
                     npm exec --package=<pkg>[@<version>] -- <cmd> [args...]
                     npm exec -c '<cmd> [args...]'
                     npm exec --package=foo -c '<cmd> [args...]'
                     
-                    npx <pkg>[@<specifier>] [args...]
-                    npx -p <pkg>[@<specifier>] <cmd> [args...]
-                    npx -c '<cmd> [args...]'
-                    npx -p <pkg>[@<specifier>] -c '<cmd> [args...]'
-                    Run without --call or positional args to open interactive subshell
-                    
-                    
                     alias: x
-                    common options: 
-                    --package=<pkg> (may be specified multiple times)
-                    -p is a shorthand for --package only when using npx executable
-                    -c <cmd> --call=<cmd> (may not be mixed with positional arguments)
 
-    explain         npm explain <folder | specifier>
+    explain          explain
+                    
+                    Usage:
+                    npm explain <folder | specifier>
                     
                     alias: why
 
-    explore         npm explore <pkg> [ -- <command>]
+    explore          explore
+                    
+                    Usage:
+                    npm explore <pkg> [ -- <command>]
 
-    find-dupes      npm find-dupes
+    find-dupes       find-dupes
+                    
+                    Usage:
+                    npm find-dupes
 
-    fund            npm fund
+    fund             fund
                     
-                    common options: npm fund [--json] [--browser] [--unicode] [[<@scope>/]<pkg> [--which=<fundingSourceNumber>]
+                    Usage:
+                    npm fund [--json] [--browser] [--unicode] [[<@scope>/]<pkg> [--which=<fundingSourceNumber>]
 
-    get             npm get [<key> ...] (See \`npm config\`)
+    get              get
+                    
+                    Usage:
+                    npm get [<key> ...] (See \`npm config\`)
 
-    help            npm help <term> [<terms..>]
+    help             help
+                    
+                    Usage:
+                    npm help <term> [<terms..>]
                     
                     alias: hlep
 
-    hook            npm hook add <pkg> <url> <secret> [--type=<type>]
+    hook             hook
+                    
+                    Usage:
+                    npm hook add <pkg> <url> <secret> [--type=<type>]
                     npm hook ls [pkg]
                     npm hook rm <id>
                     npm hook update <id> <url> <secret>
 
-    init            
+    init             init
+                    
+                    Usage:
                     npm init [--force|-f|--yes|-y|--scope]
                     npm init <@scope> (same as \`npx <@scope>/create\`)
                     npm init [<@scope>/]<name> (same as \`npx [<@scope>/]create-<name>\`)
                     
                     aliases: create, innit
 
-    install         npm install (with no args, in package dir)
+    install          install
+                    
+                    Usage:
+                    npm install (with no args, in package dir)
                     npm install [<@scope>/]<pkg>
                     npm install [<@scope>/]<pkg>@<tag>
                     npm install [<@scope>/]<pkg>@<version>
@@ -340,151 +401,264 @@ All commands:
                     npm install <tarball file>
                     npm install <tarball url>
                     npm install <git:// url>
-                    npm install <github username>/<github project>
+                    npm install <github username>/<github project> [--save-prod|--save-dev|--save-optional|--save-peer] [--save-exact] [--no-save]
                     
                     aliases: i, in, ins, inst, insta, instal, isnt, isnta, isntal, add
-                    common options: [--save-prod|--save-dev|--save-optional|--save-peer] [--save-exact] [--no-save]
 
-    install-ci-test npm install-ci-test [args]
-                    Same args as \`npm ci\`
+    install-ci-test  install-ci-test
+                    
+                    Usage:
+                    npm install-ci-test
                     
                     alias: cit
 
-    install-test    npm install-test [args]
-                    Same args as \`npm install\`
+    install-test     install-test
+                    
+                    Usage:
+                    npm install-test (with no args, in package dir)
+                    npm install-test [<@scope>/]<pkg>
+                    npm install-test [<@scope>/]<pkg>@<tag>
+                    npm install-test [<@scope>/]<pkg>@<version>
+                    npm install-test [<@scope>/]<pkg>@<version range>
+                    npm install-test <alias>@npm:<name>
+                    npm install-test <folder>
+                    npm install-test <tarball file>
+                    npm install-test <tarball url>
+                    npm install-test <git:// url>
+                    npm install-test <github username>/<github project> [--save-prod|--save-dev|--save-optional|--save-peer] [--save-exact] [--no-save]
                     
                     alias: it
 
-    link            npm link (in package dir)
+    link             link
+                    
+                    Usage:
+                    npm link (in package dir)
                     npm link [<@scope>/]<pkg>[@<version>]
                     
                     alias: ln
 
-    ll              npm ll [[<@scope>/]<pkg> ...]
+    ll               ll
+                    
+                    Usage:
+                    npm ll [[<@scope>/]<pkg> ...]
                     
                     alias: la
 
-    login           npm adduser [--registry=url] [--scope=@orgname] [--always-auth]
+    login            adduser
+                    
+                    Usage:
+                    npm adduser [--registry=url] [--scope=@orgname] [--always-auth]
                     
                     aliases: login, add-user
 
-    logout          npm logout [--registry=<url>] [--scope=<@scope>]
+    logout           logout
+                    
+                    Usage:
+                    npm logout [--registry=<url>] [--scope=<@scope>]
 
-    ls              npm ls [[<@scope>/]<pkg> ...]
+    ls               ls
+                    
+                    Usage:
+                    npm ls npm ls [[<@scope>/]<pkg> ...]
                     
                     alias: list
 
-    org             npm org set orgname username [developer | admin | owner]
+    org              org
+                    
+                    Usage:
+                    npm org set orgname username [developer | admin | owner]
                     npm org rm orgname username
                     npm org ls orgname [<username>]
                     
                     alias: ogr
 
-    outdated        npm outdated [[<@scope>/]<pkg> ...]
+    outdated         outdated
+                    
+                    Usage:
+                    npm outdated [[<@scope>/]<pkg> ...]
 
-    owner           npm owner add <user> [<@scope>/]<pkg>
+    owner            owner
+                    
+                    Usage:
+                    npm owner add <user> [<@scope>/]<pkg>
                     npm owner rm <user> [<@scope>/]<pkg>
                     npm owner ls [<@scope>/]<pkg>
                     
                     alias: author
 
-    pack            npm pack [[<@scope>/]<pkg>...] [--dry-run]
+    pack             pack
+                    
+                    Usage:
+                    npm pack [[<@scope>/]<pkg>...] [--dry-run]
 
-    ping            npm ping
+    ping             ping
+                    
                     ping registry
-
-    prefix          npm prefix [-g]
-
-    profile         npm profile enable-2fa [auth-only|auth-and-writes]
                     
+                    Usage:
+                    npm ping
+
+    prefix           prefix
                     
-                    common options: npm profile disable-2fa
+                    Usage:
+                    npm prefix [-g]
+
+    profile          profile
                     
+                    Usage:
+                    npm profile enable-2fa [auth-only|auth-and-writes]
+                    npm profile disable-2fa
+                    npm profile get [<key>]
+                    npm profile set <key> <value>
 
-    prune           npm prune [[<@scope>/]<pkg>...] [--production]
+    prune            prune
+                    
+                    Usage:
+                    npm prune [[<@scope>/]<pkg>...] [--production]
 
-    publish         npm publish [<folder>] [--tag <tag>] [--access <public|restricted>] [--dry-run]
+    publish          publish
                     
-                    Publishes '.' if no argument supplied
-                    Sets tag \`latest\` if no --tag specified
+                    Usage:
+                    npm publish [<folder>] [--tag <tag>] [--access <public|restricted>] [--dry-run]
 
-    rebuild         npm rebuild [[<@scope>/]<name>[@<version>] ...]
+    rebuild          rebuild
+                    
+                    Usage:
+                    npm rebuild [[<@scope>/]<name>[@<version>] ...]
                     
                     alias: rb
 
-    repo            npm repo [<pkgname> [<pkgname> ...]]
+    repo             repo
+                    
+                    Usage:
+                    npm repo [<pkgname> [<pkgname> ...]]
 
-    restart         npm restart [-- <args>]
+    restart          restart
+                    
+                    Usage:
+                    npm restart [-- <args>]
 
-    root            npm root [-g]
+    root             root
+                    
+                    Usage:
+                    npm root [-g]
 
-    run-script      npm run-script <command> [-- <args>]
+    run-script       run-script
+                    
+                    Usage:
+                    npm run-script <command> [-- <args>]
                     
                     aliases: run, rum, urn
 
-    search          npm search [-l|--long] [--json] [--parseable] [--no-description] [search terms ...]
+    search           search
+                    
+                    Usage:
+                    npm search [-l|--long] [--json] [--parseable] [--no-description] [search terms ...]
                     
                     aliases: s, se, find
 
-    set             npm set <key>=<value> [<key>=<value> ...] (See \`npm config\`)
+    set              set
+                    
+                    Usage:
+                    npm set <key>=<value> [<key>=<value> ...] (See \`npm config\`)
 
-    set-script      npm set-script [<script>] [<command>]
+    set-script       set-script
+                    
+                    Usage:
+                    npm set-script [<script>] [<command>]
 
-    shrinkwrap      npm shrinkwrap
+    shrinkwrap       shrinkwrap
+                    
+                    Usage:
+                    npm shrinkwrap
 
-    star            npm star [<pkg>...]
-                    npm unstar [<pkg>...]
+    star             star
+                    
+                    Usage:
+                    npm star [<pkg>...]
 
-    stars           npm stars [<user>]
+    stars            stars
+                    
+                    Usage:
+                    npm stars [<user>]
 
-    start           npm start [-- <args>]
+    start            start
+                    
+                    Usage:
+                    npm start [-- <args>]
 
-    stop            npm stop [-- <args>]
+    stop             stop
+                    
+                    Usage:
+                    npm stop [-- <args>]
 
-    team            npm team create <scope:team> [--otp <otpcode>]
+    team             team
+                    
+                    Usage:
+                    npm team create <scope:team> [--otp <otpcode>]
                     npm team destroy <scope:team> [--otp <otpcode>]
                     npm team add <scope:team> <user> [--otp <otpcode>]
                     npm team rm <scope:team> <user> [--otp <otpcode>]
                     npm team ls <scope>|<scope:team>
-                    
 
-    test            npm test [-- <args>]
+    test             test
+                    
+                    Usage:
+                    npm test [-- <args>]
                     
                     aliases: tst, t
 
-    token           npm token list
+    token            token
+                    
+                    Usage:
+                    npm token list
                     npm token revoke <id|token>
                     npm token create [--read-only] [--cidr=list]
 
-    uninstall       npm uninstall [<@scope>/]<pkg>[@<version>]... [-S|--save|--no-save]
+    uninstall        uninstall
+                    
+                    Usage:
+                    npm uninstall [<@scope>/]<pkg>[@<version>]... [-S|--save|--no-save]
                     
                     aliases: un, unlink, remove, rm, r
 
-    unpublish       npm unpublish [<@scope>/]<pkg>[@<version>]
+    unpublish        unpublish
+                    
+                    Usage:
+                    npm unpublish [<@scope>/]<pkg>[@<version>]
 
-    unstar          npm star [<pkg>...]
+    unstar           unstar
+                    
+                    Usage:
                     npm unstar [<pkg>...]
 
-    update          npm update [-g] [<pkg>...]
+    update           update
+                    
+                    Usage:
+                    npm update [-g] [<pkg>...]
                     
                     aliases: up, upgrade, udpate
 
-    version         npm version [<newversion> | major | minor | patch | premajor | preminor | prepatch | prerelease [--preid=<prerelease-id>] | from-git]
-                    (run in package dir)
-                    
-                    'npm -v' or 'npm --version' to print npm version ({VERSION})
-                    'npm view <pkg> version' to view a package's published version
-                    'npm ls' to inspect current package/dependency versions
+    version          version
                     
+                    Usage:
+                    npm version [<newversion> | major | minor | patch | premajor | preminor | prepatch | prerelease [--preid=<prerelease-id>] | from-git]
                     
                     alias: verison
 
-    view            npm view [<@scope>/]<pkg>[@<version>] [<field>[.subfield]...]
+    view             view
+                    
+                    Usage:
+                    npm view [<@scope>/]<pkg>[@<version>] [<field>[.subfield]...]
                     
                     aliases: v, info, show
 
-    whoami          npm whoami [--registry <registry>]
-                    (just prints username according to given registry)
+    whoami           whoami
+                    
+                    prints username according to given registry
+                    
+                    Usage:
+                    npm whoami [--registry <registry>]
 
 Specify configs in the ini-formatted file:
     /some/config/file/.npmrc
diff --git a/test/lib/access.js b/test/lib/access.js
index 3a732ad0aac37..8372bb23845d8 100644
--- a/test/lib/access.js
+++ b/test/lib/access.js
@@ -37,7 +37,7 @@ test('completion', t => {
 test('subcommand required', t => {
   const access = new Access({ flatOptions: {} })
   access.exec([], (err) => {
-    t.equal(err, '\nUsage: Subcommand is required.\n\n' + access.usage)
+    t.match(err, access.usageError('Subcommand is required.'))
     t.end()
   })
 })
diff --git a/test/lib/config.js b/test/lib/config.js
index c2420aefb4a00..e7bcfdcfa0970 100644
--- a/test/lib/config.js
+++ b/test/lib/config.js
@@ -180,12 +180,7 @@ t.test('config list --json', t => {
 
 t.test('config delete no args', t => {
   config.exec(['delete'], (err) => {
-    t.equal(
-      err.message,
-      'usage instructions',
-      'should throw usage error'
-    )
-    t.equal(err.code, 'EUSAGE', 'should throw expected error code')
+    t.match(err, { message: '\nUsage: usage instructions' })
     t.end()
   })
 })
@@ -265,11 +260,7 @@ t.test('config delete key --global', t => {
 
 t.test('config set no args', t => {
   config.exec(['set'], (err) => {
-    t.equal(
-      err.message,
-      'usage instructions',
-      'should throw usage error'
-    )
+    t.match(err, { message: '\nUsage: usage instructions' })
     t.end()
   })
 })
diff --git a/test/lib/deprecate.js b/test/lib/deprecate.js
index 03100166a012c..e278a3e3ca7c7 100644
--- a/test/lib/deprecate.js
+++ b/test/lib/deprecate.js
@@ -60,14 +60,14 @@ test('completion', async t => {
 
 test('no args', t => {
   deprecate.exec([], (err) => {
-    t.match(err, /Usage: npm deprecate/, 'logs usage')
+    t.match(err, 'Usage:', 'logs usage')
     t.end()
   })
 })
 
 test('only one arg', t => {
   deprecate.exec(['foo'], (err) => {
-    t.match(err, /Usage: npm deprecate/, 'logs usage')
+    t.match(err, 'Usage:', 'logs usage')
     t.end()
   })
 })
diff --git a/test/lib/explore.js b/test/lib/explore.js
index 6f1f3bb47f240..e76f3ce5f1693 100644
--- a/test/lib/explore.js
+++ b/test/lib/explore.js
@@ -338,7 +338,7 @@ t.test('usage if no pkg provided', t => {
   for (const args of noPkg) {
     t.test(JSON.stringify(args), t => {
       posixExplore.exec(args, er => {
-        t.equal(er, 'npm explore <pkg> [ -- <command>]')
+        t.match(er, 'Usage:')
         t.strictSame({
           ERROR_HANDLER_CALLED: null,
           RPJ_CALLED,
diff --git a/test/lib/load-all-commands.js b/test/lib/load-all-commands.js
index f6d1ae9e1817d..e31a2b99369e1 100644
--- a/test/lib/load-all-commands.js
+++ b/test/lib/load-all-commands.js
@@ -1,6 +1,6 @@
 // Thanks to nyc not working properly with proxies this
-// doesn't affect coverage. but it does ensure that every command
-// has a usage, and if it has completion it is a function
+// doesn't affect coverage. but it does ensure that every command has a usage
+// that contains its name, and if it has completion it is a function
 const npm = require('../../lib/npm.js')
 const t = require('tap')
 const { cmdList } = require('../../lib/utils/cmd-list.js')
diff --git a/test/lib/npm.js b/test/lib/npm.js
index 1f7a54e228a0e..87cbea8f2c617 100644
--- a/test/lib/npm.js
+++ b/test/lib/npm.js
@@ -357,7 +357,7 @@ t.test('loading as main will load the cli', t => {
   p.on('close', (code, signal) => {
     t.equal(code, 0)
     t.equal(signal, null)
-    t.equal(Buffer.concat(out).toString().trim(), ls.usage)
+    t.match(Buffer.concat(out).toString(), ls.usage)
     t.end()
   })
 })
diff --git a/test/lib/owner.js b/test/lib/owner.js
index 4f8f430886b7e..da999bcee7f43 100644
--- a/test/lib/owner.js
+++ b/test/lib/owner.js
@@ -40,11 +40,7 @@ t.test('owner no args', t => {
   })
 
   owner.exec([], err => {
-    t.equal(
-      err.message,
-      'usage instructions',
-      'should throw usage instructions'
-    )
+    t.match(err, /usage instructions/, 'should not error out on empty locations')
     t.end()
   })
 })
@@ -87,11 +83,7 @@ t.test('owner ls no args no cwd package', t => {
   })
 
   owner.exec(['ls'], err => {
-    t.equal(
-      err.message,
-      'usage instructions',
-      'should throw usage instructions if no cwd package available'
-    )
+    t.match(err, /usage instructions/, 'should throw usage instructions if no cwd package available')
     t.end()
   })
 })
@@ -467,11 +459,7 @@ t.test('owner add no user', t => {
   })
 
   owner.exec(['add'], err => {
-    t.equal(
-      err.message,
-      'usage instructions',
-      'should throw usage instructions if no user provided'
-    )
+    t.match(err, /usage instructions/, 'should throw usage instructions if user provided')
     t.end()
   })
 })
@@ -483,11 +471,7 @@ t.test('owner add <user> no cwd package', t => {
   })
 
   owner.exec(['add', 'foo'], err => {
-    t.equal(
-      err.message,
-      'usage instructions',
-      'should throw usage instructions if no user provided'
-    )
+    t.match(err, /usage instructions/, 'should throw usage instructions if no user provided')
     t.end()
   })
 })
@@ -674,11 +658,7 @@ t.test('owner rm no user', t => {
   })
 
   owner.exec(['rm'], err => {
-    t.equal(
-      err.message,
-      'usage instructions',
-      'should throw usage instructions if no user provided to rm'
-    )
+    t.match(err, /usage instructions/, 'should throw usage instructions if no user provided to rm')
     t.end()
   })
 })
@@ -690,11 +670,7 @@ t.test('owner rm <user> no cwd package', t => {
   })
 
   owner.exec(['rm', 'foo'], err => {
-    t.equal(
-      err.message,
-      'usage instructions',
-      'should throw usage instructions if no user provided to rm'
-    )
+    t.match(err, /usage instructions/, 'should throw usage instructions if no user provided to rm')
     t.end()
   })
 })
diff --git a/test/lib/restart.js b/test/lib/restart.js
index f29592d9bfcec..9719476c41807 100644
--- a/test/lib/restart.js
+++ b/test/lib/restart.js
@@ -10,7 +10,6 @@ const npm = {
 }
 const Restart = require('../../lib/restart.js')
 const restart = new Restart(npm)
-t.equal(restart.usage, 'npm restart [-- <args>]')
 restart.exec(['foo'], () => {
   t.match(runArgs, ['restart', 'foo'])
   t.end()
diff --git a/test/lib/start.js b/test/lib/start.js
index 9a3328309b84a..4e77f9691b815 100644
--- a/test/lib/start.js
+++ b/test/lib/start.js
@@ -10,7 +10,6 @@ const npm = {
 }
 const Start = require('../../lib/start.js')
 const start = new Start(npm)
-t.equal(start.usage, 'npm start [-- <args>]')
 start.exec(['foo'], () => {
   t.match(runArgs, ['start', 'foo'])
   t.end()
diff --git a/test/lib/stop.js b/test/lib/stop.js
index e6cb193b62973..92ca84bd8741a 100644
--- a/test/lib/stop.js
+++ b/test/lib/stop.js
@@ -10,7 +10,6 @@ const npm = {
 }
 const Stop = require('../../lib/stop.js')
 const stop = new Stop(npm)
-t.equal(stop.usage, 'npm stop [-- <args>]')
 stop.exec(['foo'], () => {
   t.match(runArgs, ['stop', 'foo'])
   t.end()
diff --git a/test/lib/utils/lifecycle-cmd.js b/test/lib/utils/lifecycle-cmd.js
index 2f1f693f2df4d..3e3a7da43443e 100644
--- a/test/lib/utils/lifecycle-cmd.js
+++ b/test/lib/utils/lifecycle-cmd.js
@@ -10,7 +10,12 @@ const npm = {
   },
 }
 t.test('create a lifecycle command', t => {
-  const cmd = new LifecycleCmd(npm, 'test-stage')
+  class TestStage extends LifecycleCmd {
+    static get name () {
+      return 'test-stage'
+    }
+  }
+  const cmd = new TestStage(npm)
   t.match(cmd.usage, /test-stage/)
   cmd.exec(['some', 'args'], (er, result) => {
     t.same(runArgs, ['test-stage', 'some', 'args'])