fix: rename base-cmd to match other commands

lukekarrys · lukekarrys · commit 7e04417d4b08 · 2024-04-24T14:33:19.000-07:00
diff --git a/lib/arborist-cmd.js b/lib/arborist-cmd.js
@@ -1,10 +1,9 @@
 const { log } = require('proc-log')
+const BaseCommand = require('./base-cmd.js')
 
 // This is the base for all commands whose execWorkspaces just gets
 // a list of workspace names and passes it on to new Arborist() to
 // be able to run a filtered Arborist.reify() at some point.
-
-const BaseCommand = require('./base-command.js')
 class ArboristCmd extends BaseCommand {
   get isArboristCmd () {
     return true
diff --git a/lib/base-cmd.js b/lib/base-cmd.js
diff --git a/lib/commands/access.js b/lib/commands/access.js
@@ -5,7 +5,7 @@ const pkgJson = require('@npmcli/package-json')
 const localeCompare = require('@isaacs/string-locale-compare')('en')
 const otplease = require('../utils/otplease.js')
 const getIdentity = require('../utils/get-identity.js')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 const commands = [
   'get',
diff --git a/lib/commands/adduser.js b/lib/commands/adduser.js
@@ -1,7 +1,7 @@
 const { log, output } = require('proc-log')
 const { redactLog: replaceInfo } = require('@npmcli/redact')
 const auth = require('../utils/auth.js')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class AddUser extends BaseCommand {
   static description = 'Add a registry user account'
diff --git a/lib/commands/cache.js b/lib/commands/cache.js
@@ -3,7 +3,7 @@ const pacote = require('pacote')
 const fs = require('fs/promises')
 const { join } = require('path')
 const semver = require('semver')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 const npa = require('npm-package-arg')
 const jsonParse = require('json-parse-even-better-errors')
 const localeCompare = require('@isaacs/string-locale-compare')('en')
diff --git a/lib/commands/completion.js b/lib/commands/completion.js
@@ -36,7 +36,7 @@ const Npm = require('../npm.js')
 const { definitions, shorthands } = require('@npmcli/config/lib/definitions')
 const { commands, aliases, deref } = require('../utils/cmd-list.js')
 const { isWindowsShell } = require('../utils/is-windows.js')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 const fileExists = (file) => fs.stat(file).then(s => s.isFile()).catch(() => false)
 
diff --git a/lib/commands/config.js b/lib/commands/config.js
@@ -6,7 +6,7 @@ const localeCompare = require('@isaacs/string-locale-compare')('en')
 const pkgJson = require('@npmcli/package-json')
 const { defaults, definitions } = require('@npmcli/config/lib/definitions')
 const { log, output } = require('proc-log')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 // These are the configs that we can nerf-dart. Not all of them currently even
 // *have* config definitions so we have to explicitly validate them here
diff --git a/lib/commands/deprecate.js b/lib/commands/deprecate.js
@@ -4,7 +4,7 @@ const npa = require('npm-package-arg')
 const semver = require('semver')
 const getIdentity = require('../utils/get-identity.js')
 const libaccess = require('libnpmaccess')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class Deprecate extends BaseCommand {
   static description = 'Deprecate a version of a package'
diff --git a/lib/commands/diff.js b/lib/commands/diff.js
@@ -6,7 +6,7 @@ const pacote = require('pacote')
 const pickManifest = require('npm-pick-manifest')
 const { log, output } = require('proc-log')
 const pkgJson = require('@npmcli/package-json')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class Diff extends BaseCommand {
   static description = 'The registry diff command'
diff --git a/lib/commands/dist-tag.js b/lib/commands/dist-tag.js
@@ -4,7 +4,7 @@ const semver = require('semver')
 const { log, output } = require('proc-log')
 const otplease = require('../utils/otplease.js')
 const pkgJson = require('@npmcli/package-json')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class DistTag extends BaseCommand {
   static description = 'Modify package distribution tags'
diff --git a/lib/commands/doctor.js b/lib/commands/doctor.js
@@ -8,7 +8,7 @@ const semver = require('semver')
 const { log, output } = require('proc-log')
 const ping = require('../utils/ping.js')
 const { defaults } = require('@npmcli/config/lib/definitions')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 const maskLabel = mask => {
   const label = []
diff --git a/lib/commands/edit.js b/lib/commands/edit.js
@@ -2,7 +2,7 @@ const { resolve } = require('path')
 const { lstat } = require('fs/promises')
 const cp = require('child_process')
 const completion = require('../utils/installed-shallow.js')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 const splitPackageNames = (path) => path.split('/')
 // combine scoped parts
diff --git a/lib/commands/exec.js b/lib/commands/exec.js
@@ -1,6 +1,6 @@
 const { resolve } = require('path')
 const libexec = require('libnpmexec')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class Exec extends BaseCommand {
   static description = 'Run a command from a local or remote npm package'
diff --git a/lib/commands/explore.js b/lib/commands/explore.js
@@ -3,7 +3,7 @@ const runScript = require('@npmcli/run-script')
 const { join, relative } = require('path')
 const { log, output } = require('proc-log')
 const completion = require('../utils/installed-shallow.js')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 // npm explore <pkg>[@<version>]
 // open a subshell to the package folder.
diff --git a/lib/commands/get.js b/lib/commands/get.js
@@ -1,5 +1,5 @@
 const Npm = require('../npm.js')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class Get extends BaseCommand {
   static description = 'Get a value from the npm configuration'
diff --git a/lib/commands/help-search.js b/lib/commands/help-search.js
@@ -2,7 +2,7 @@ const { readFile } = require('node:fs/promises')
 const path = require('node:path')
 const { glob } = require('glob')
 const { output } = require('proc-log')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 const globify = pattern => pattern.split('\\').join('/')
 
diff --git a/lib/commands/help.js b/lib/commands/help.js
@@ -5,7 +5,7 @@ const { glob } = require('glob')
 const { output } = require('proc-log')
 const localeCompare = require('@isaacs/string-locale-compare')('en')
 const { deref } = require('../utils/cmd-list.js')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 const globify = pattern => pattern.split('\\').join('/')
 
diff --git a/lib/commands/hook.js b/lib/commands/hook.js
@@ -2,7 +2,7 @@ const hookApi = require('libnpmhook')
 const otplease = require('../utils/otplease.js')
 const relativeDate = require('tiny-relative-date')
 const { output } = require('proc-log')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class Hook extends BaseCommand {
   static description = 'Manage registry hooks'
diff --git a/lib/commands/init.js b/lib/commands/init.js
@@ -8,7 +8,7 @@ const mapWorkspaces = require('@npmcli/map-workspaces')
 const PackageJson = require('@npmcli/package-json')
 const { log, output } = require('proc-log')
 const updateWorkspaces = require('../utils/update-workspaces.js')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 const posixPath = p => p.split('\\').join('/')
 
diff --git a/lib/commands/login.js b/lib/commands/login.js
@@ -1,7 +1,7 @@
 const { log, output } = require('proc-log')
 const { redactLog: replaceInfo } = require('@npmcli/redact')
 const auth = require('../utils/auth.js')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class Login extends BaseCommand {
   static description = 'Login to a registry user account'
diff --git a/lib/commands/logout.js b/lib/commands/logout.js
@@ -1,7 +1,7 @@
 const npmFetch = require('npm-registry-fetch')
 const { getAuth } = npmFetch
 const { log } = require('proc-log')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class Logout extends BaseCommand {
   static description = 'Log out of the registry'
diff --git a/lib/commands/org.js b/lib/commands/org.js
@@ -1,6 +1,6 @@
 const liborg = require('libnpmorg')
 const otplease = require('../utils/otplease.js')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 const { output } = require('proc-log')
 
 class Org extends BaseCommand {
diff --git a/lib/commands/owner.js b/lib/commands/owner.js
@@ -4,7 +4,7 @@ const pacote = require('pacote')
 const { log, output } = require('proc-log')
 const otplease = require('../utils/otplease.js')
 const pkgJson = require('@npmcli/package-json')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 const { redact } = require('@npmcli/redact')
 
 const readJson = async (path) => {
diff --git a/lib/commands/pack.js b/lib/commands/pack.js
@@ -3,7 +3,7 @@ const libpack = require('libnpmpack')
 const npa = require('npm-package-arg')
 const { log, output } = require('proc-log')
 const { getContents, logTar } = require('../utils/tar.js')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class Pack extends BaseCommand {
   static description = 'Create a tarball from a package'
diff --git a/lib/commands/ping.js b/lib/commands/ping.js
@@ -1,7 +1,7 @@
 const { redact } = require('@npmcli/redact')
 const { log, output } = require('proc-log')
 const pingUtil = require('../utils/ping.js')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class Ping extends BaseCommand {
   static description = 'Ping npm registry'
diff --git a/lib/commands/pkg.js b/lib/commands/pkg.js
@@ -1,6 +1,6 @@
 const { output } = require('proc-log')
 const PackageJson = require('@npmcli/package-json')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 const Queryable = require('../utils/queryable.js')
 
 class Pkg extends BaseCommand {
diff --git a/lib/commands/prefix.js b/lib/commands/prefix.js
@@ -1,5 +1,5 @@
 const { output } = require('proc-log')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class Prefix extends BaseCommand {
   static description = 'Display prefix'
diff --git a/lib/commands/profile.js b/lib/commands/profile.js
@@ -5,7 +5,7 @@ const npmProfile = require('npm-profile')
 const qrcodeTerminal = require('qrcode-terminal')
 const otplease = require('../utils/otplease.js')
 const readUserInfo = require('../utils/read-user-info.js')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 const qrcode = url =>
   new Promise((resolve) => qrcodeTerminal.generate(url, resolve))
diff --git a/lib/commands/publish.js b/lib/commands/publish.js
@@ -15,7 +15,7 @@ const { getContents, logTar } = require('../utils/tar.js')
 // change that ought to get a RFC written on it.
 const { flatten } = require('@npmcli/config/lib/definitions')
 const pkgJson = require('@npmcli/package-json')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class Publish extends BaseCommand {
   static description = 'Publish a package'
diff --git a/lib/commands/query.js b/lib/commands/query.js
@@ -1,5 +1,5 @@
 const { resolve } = require('node:path')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 const { log, output } = require('proc-log')
 
 class QuerySelectorItem {
diff --git a/lib/commands/root.js b/lib/commands/root.js
@@ -1,5 +1,5 @@
 const { output } = require('proc-log')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class Root extends BaseCommand {
   static description = 'Display npm root'
diff --git a/lib/commands/run-script.js b/lib/commands/run-script.js
@@ -1,6 +1,6 @@
 const { log, output } = require('proc-log')
 const pkgJson = require('@npmcli/package-json')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class RunScript extends BaseCommand {
   static description = 'Run arbitrary package scripts'
diff --git a/lib/commands/sbom.js b/lib/commands/sbom.js
@@ -1,5 +1,5 @@
 const localeCompare = require('@isaacs/string-locale-compare')('en')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 const { log, output } = require('proc-log')
 const { cyclonedxOutput } = require('../utils/sbom-cyclonedx.js')
 const { spdxOutput } = require('../utils/sbom-spdx.js')
diff --git a/lib/commands/search.js b/lib/commands/search.js
@@ -2,8 +2,8 @@ const Pipeline = require('minipass-pipeline')
 const libSearch = require('libnpmsearch')
 const { log, output } = require('proc-log')
 const formatSearchStream = require('../utils/format-search-stream.js')
+const BaseCommand = require('../base-cmd.js')
 
-const BaseCommand = require('../base-command.js')
 class Search extends BaseCommand {
   static description = 'Search for packages'
   static name = 'search'
diff --git a/lib/commands/set.js b/lib/commands/set.js
@@ -1,5 +1,5 @@
 const Npm = require('../npm.js')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class Set extends BaseCommand {
   static description = 'Set a value in the npm configuration'
diff --git a/lib/commands/shrinkwrap.js b/lib/commands/shrinkwrap.js
@@ -1,7 +1,7 @@
 const { resolve, basename } = require('path')
 const { unlink } = require('fs/promises')
 const { log } = require('proc-log')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class Shrinkwrap extends BaseCommand {
   static description = 'Lock down dependency versions for publication'
diff --git a/lib/commands/star.js b/lib/commands/star.js
@@ -2,7 +2,7 @@ const fetch = require('npm-registry-fetch')
 const npa = require('npm-package-arg')
 const { log, output } = require('proc-log')
 const getIdentity = require('../utils/get-identity')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class Star extends BaseCommand {
   static description = 'Mark your favorite packages'
diff --git a/lib/commands/stars.js b/lib/commands/stars.js
@@ -1,7 +1,7 @@
 const fetch = require('npm-registry-fetch')
 const { log, output } = require('proc-log')
 const getIdentity = require('../utils/get-identity.js')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class Stars extends BaseCommand {
   static description = 'View packages marked as favorites'
diff --git a/lib/commands/team.js b/lib/commands/team.js
@@ -3,7 +3,7 @@ const libteam = require('libnpmteam')
 const { output } = require('proc-log')
 const otplease = require('../utils/otplease.js')
 
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 class Team extends BaseCommand {
   static description = 'Manage organization teams and team memberships'
   static name = 'team'
diff --git a/lib/commands/token.js b/lib/commands/token.js
@@ -2,7 +2,7 @@ const { log, output } = require('proc-log')
 const profile = require('npm-profile')
 const otplease = require('../utils/otplease.js')
 const readUserInfo = require('../utils/read-user-info.js')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class Token extends BaseCommand {
   static description = 'Manage your authentication tokens'
diff --git a/lib/commands/unpublish.js b/lib/commands/unpublish.js
@@ -7,7 +7,7 @@ const pkgJson = require('@npmcli/package-json')
 const { flatten } = require('@npmcli/config/lib/definitions')
 const getIdentity = require('../utils/get-identity.js')
 const otplease = require('../utils/otplease.js')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 const LAST_REMAINING_VERSION_ERROR = 'Refusing to delete the last version of the package. ' +
 'It will block from republishing a new version for 24 hours.\n' +
diff --git a/lib/commands/version.js b/lib/commands/version.js
@@ -1,7 +1,7 @@
 const { resolve } = require('node:path')
 const { readFile } = require('node:fs/promises')
 const { output } = require('proc-log')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class Version extends BaseCommand {
   static description = 'Bump a package version'
diff --git a/lib/commands/view.js b/lib/commands/view.js
@@ -10,7 +10,7 @@ const semver = require('semver')
 const { inspect } = require('util')
 const { packument } = require('pacote')
 const Queryable = require('../utils/queryable.js')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 const readJson = async file => jsonParse(await readFile(file, 'utf8'))
 
diff --git a/lib/commands/whoami.js b/lib/commands/whoami.js
@@ -1,6 +1,6 @@
 const { output } = require('proc-log')
 const getIdentity = require('../utils/get-identity.js')
-const BaseCommand = require('../base-command.js')
+const BaseCommand = require('../base-cmd.js')
 
 class Whoami extends BaseCommand {
   static description = 'Display npm username'
diff --git a/lib/lifecycle-cmd.js b/lib/lifecycle-cmd.js
@@ -1,7 +1,7 @@
+const BaseCommand = require('./base-cmd.js')
+
 // The implementation of commands that are just "run a script"
 // restart, start, stop, test
-
-const BaseCommand = require('./base-command.js')
 class LifecycleCmd extends BaseCommand {
   static usage = ['[-- <args>]']
   static isShellout = true
diff --git a/lib/package-url-cmd.js b/lib/package-url-cmd.js
@@ -1,11 +1,9 @@
-// Base command for opening urls from a package manifest (bugs, docs, repo)
-
 const pacote = require('pacote')
-
 const openUrl = require('./utils/open-url.js')
 const { log } = require('proc-log')
+const BaseCommand = require('./base-cmd.js')
 
-const BaseCommand = require('./base-command.js')
+// Base command for opening urls from a package manifest (bugs, docs, repo)
 class PackageUrlCommand extends BaseCommand {
   static params = [
     'browser',
diff --git a/test/lib/load-all-commands.js b/test/lib/load-all-commands.js
