use @npmcli/config for configuration

This also refactors the completion.js command, still pending proper tests.

Author: isaacs

bin/npx-cli.js

@@ -24,7 +24,7 @@ const removed = new Set([
   ...removedOpts
 ])
 
-const { types, shorthands } = require('../lib/config/defaults.js')
+const { types, shorthands } = require('../lib/utils/config.js')
 const npmSwitches = Object.entries(types)
   .filter(([key, type]) => type === Boolean ||
     (Array.isArray(type) && type.includes(Boolean)))

lib/adduser.js

@@ -41,10 +41,6 @@ const getAuthType = ({ authType }) => {
   return type
 }
 
-const saveConfig = () => new Promise((resolve, reject) => {
-  npm.config.save('user', er => er ? reject(er) : resolve())
-})
-
 const updateConfig = async ({ newCreds, registry, scope }) => {
   npm.config.del('_token', 'user') // prevent legacy pollution
 
@@ -53,7 +49,7 @@ const updateConfig = async ({ newCreds, registry, scope }) => {
   }
 
   npm.config.setCredentialsByURI(registry, newCreds)
-  await saveConfig()
+  await npm.config.save('user')
 }
 
 const adduser = async (args) => {

lib/cli.js

@@ -17,9 +17,7 @@ module.exports = (process) => {
   checkForUnsupportedNode()
 
   const npm = require('../lib/npm.js')
-  const { defs: { shorthands, types } } = require('../lib/config/core.js')
   const errorHandler = require('../lib/utils/error-handler.js')
-  const nopt = require('nopt')
 
   // if npm is called as "npmg" or "npm_g", then
   // run in global mode.
@@ -29,19 +27,6 @@ module.exports = (process) => {
 
   log.verbose('cli', process.argv)
 
-  const conf = nopt(types, shorthands, process.argv)
-  npm.argv = conf.argv.remain
-
-  if (conf.version) {
-    console.log(npm.version)
-    return errorHandler.exit(0)
-  }
-
-  if (conf.versions) {
-    npm.argv = ['version']
-    conf.usage = false
-  }
-
   log.info('using', 'npm@%s', npm.version)
   log.info('using', 'node@%s', process.version)
 
@@ -50,10 +35,18 @@ module.exports = (process) => {
 
   // now actually fire up npm and run the command.
   // this is how to use npm programmatically:
-  conf._exit = true
   const updateNotifier = require('../lib/utils/update-notifier.js')
-  npm.load(conf, async er => {
+  npm.load(async er => {
     if (er) return errorHandler(er)
+    if (npm.config.get('version', 'cli')) {
+      console.log(npm.version)
+      return errorHandler.exit(0)
+    }
+
+    if (npm.config.get('versions', 'cli')) {
+      npm.argv = ['version']
+      npm.config.set('usage', false, 'cli')
+    }
 
     npm.updateNotification = await updateNotifier(npm)