stuff

Author: lukekarrys

DEPENDENCIES.md

@@ -191,6 +191,8 @@ graph LR;
   npmcli-config-->npmcli-arborist["@npmcli/arborist"];
   npmcli-config-->npmcli-eslint-config["@npmcli/eslint-config"];
   npmcli-config-->npmcli-map-workspaces["@npmcli/map-workspaces"];
+  npmcli-config-->npmcli-mock-globals["@npmcli/mock-globals"];
+  npmcli-config-->npmcli-promise-spawn["@npmcli/promise-spawn"];
   npmcli-config-->npmcli-template-oss["@npmcli/template-oss"];
   npmcli-config-->proc-log;
   npmcli-config-->read-package-json-fast;
@@ -630,11 +632,14 @@ graph LR;
   npmcli-arborist-->walk-up-path;
   npmcli-config-->ci-info;
   npmcli-config-->ini;
+  npmcli-config-->isaacs-string-locale-compare["@isaacs/string-locale-compare"];
   npmcli-config-->nopt;
   npmcli-config-->npm-registry-fetch;
   npmcli-config-->npmcli-arborist["@npmcli/arborist"];
   npmcli-config-->npmcli-eslint-config["@npmcli/eslint-config"];
   npmcli-config-->npmcli-map-workspaces["@npmcli/map-workspaces"];
+  npmcli-config-->npmcli-mock-globals["@npmcli/mock-globals"];
+  npmcli-config-->npmcli-promise-spawn["@npmcli/promise-spawn"];
   npmcli-config-->npmcli-template-oss["@npmcli/template-oss"];
   npmcli-config-->proc-log;
   npmcli-config-->read-package-json-fast;
@@ -800,5 +805,5 @@ packages higher up the chain.
  - npm-registry-fetch, libnpmversion
  - @npmcli/git, make-fetch-happen, init-package-json
  - @npmcli/installed-package-contents, @npmcli/map-workspaces, cacache, npm-pick-manifest, @npmcli/run-script, read-package-json, promzard
- - @npmcli/fs, npm-bundled, read-package-json-fast, unique-filename, npm-install-checks, npm-package-arg, npm-packlist, normalize-package-data, @npmcli/package-json, bin-links, nopt, npmlog, parse-conflict-json, read, @npmcli/mock-globals
+ - @npmcli/fs, npm-bundled, read-package-json-fast, unique-filename, npm-install-checks, npm-package-arg, npm-packlist, normalize-package-data, @npmcli/package-json, bin-links, nopt, npmlog, parse-conflict-json, @npmcli/mock-globals, read
  - semver, npm-normalize-package-bin, @npmcli/name-from-folder, json-parse-even-better-errors, fs-minipass, ssri, unique-slug, @npmcli/promise-spawn, hosted-git-info, proc-log, validate-npm-package-name, @npmcli/node-gyp, ignore-walk, minipass-fetch, @npmcli/query, cmd-shim, read-cmd-shim, write-file-atomic, abbrev, are-we-there-yet, gauge, treeverse, @npmcli/eslint-config, @npmcli/template-oss, minify-registry-metadata, ini, @npmcli/disparity-colors, mute-stream, npm-audit-report, npm-user-validate

bin/npx-cli.js

@@ -24,8 +24,8 @@ const removed = new Set([
   ...removedOpts,
 ])
 
-const { definitions, shorthands, configKeys } = require('@npmcli/config')
-const npmSwitches = configKeys.filter(k => definitions[k].isBoolean)
+const { definitions, shorthands, definitionKeys } = require('@npmcli/config')
+const npmSwitches = definitionKeys.filter(k => definitions[k].hasNonBoolean)
 
 // things that don't take a value
 const switches = new Set([

lib/commands/completion.js

@@ -30,15 +30,22 @@
 //
 
 const fs = require('fs/promises')
-const nopt = require('nopt')
 const { resolve } = require('path')
-
-const { definitions, shorthands, types, shortKeys, configKeys } = require('@npmcli/config')
 const { aliases, commands, plumbing } = require('../utils/cmd-list.js')
+const { isWindowsShell } = require('../utils/is-windows.js')
+const {
+  ConfigData,
+  Locations,
+  definitions,
+  definitionKeys,
+  shorthands,
+  shortKeys,
+} = require('@npmcli/config')
+
 const aliasNames = Object.keys(aliases)
 const fullList = commands.concat(aliasNames).filter(c => !plumbing.includes(c))
-const allConfs = configKeys.concat(shortKeys)
-const { isWindowsShell } = require('../utils/is-windows.js')
+const allConfs = definitionKeys.concat(shortKeys)
+
 const fileExists = (file) => fs.stat(file).then(s => s.isFile()).catch(() => false)
 
 const BaseCommand = require('../base-command.js')
@@ -140,8 +147,8 @@ class Completion extends BaseCommand {
     // take a little shortcut and use npm's arg parsing logic.
     // don't have to worry about the last arg being implicitly
     // boolean'ed, since the last block will catch that.
-    const parsed = opts.conf =
-      nopt(types, shorthands, partialWords.slice(0, -1), 0)
+    const config = new ConfigData(Locations.cli)
+    const parsed = opts.conf = config.load(partialWords.slice(0, -1))
     // check if there's a command already.
     const cmd = parsed.argv.remain[1]
     if (!cmd) {
@@ -237,7 +244,7 @@ const configCompl = opts => {
   const split = word.match(/^(-+)((?:no-)*)(.*)$/)
   const dashes = split[1]
   const no = split[2]
-  const flags = configKeys.filter(isFlag)
+  const flags = definitionKeys.filter(isFlag)
   return allConfs.map(c => dashes + c)
     .concat(flags.map(f => dashes + (no || 'no-') + f))
 }
@@ -253,10 +260,7 @@ const isFlag = word => {
   const no = split[2]
   const conf = split[3]
   const { type } = definitions[conf]
-  return no ||
-    type === Boolean ||
-    (Array.isArray(type) && type.includes(Boolean)) ||
-    shorthands[conf]
+  return no || type.isBoolean || shorthands[conf]
 }
 
 // complete against the npm commands

lib/commands/config.js

@@ -1,12 +1,8 @@
-const { mkdir, readFile, writeFile } = require('fs/promises')
-const { dirname, resolve } = require('path')
-const { spawn } = require('child_process')
-const { EOL } = require('os')
-const ini = require('ini')
+const { resolve } = require('path')
 const localeCompare = require('@isaacs/string-locale-compare')('en')
 const rpj = require('read-package-json-fast')
 const log = require('../utils/log-shim.js')
-const { keys: configKeys, NerfDarts, definitions, defaults } = require('@npmcli/config')
+const { NerfDarts, definitionKeys, definitions } = require('@npmcli/config')
 
 // take an array of `[key, value, k2=v2, k3, v3, ...]` and turn into
 // { key: value, k2: v2, k3: v3 }
@@ -88,7 +84,7 @@ class Config extends BaseCommand {
       case 'get':
       case 'delete':
       case 'rm':
-        return configKeys
+        return definitionKeys
       case 'edit':
       case 'list':
       case 'ls':
@@ -189,60 +185,9 @@ class Config extends BaseCommand {
   }
 
   async edit () {
-    const e = this.npm.flatOptions.editor
+    const { editor } = this.npm.flatOptions
     const where = this.npm.flatOptions.location
-    const { file } = this.npm.config.data.get(where)
-
-    // save first, just to make sure it's synced up
-    // this also removes all the comments from the last time we edited it.
-    await this.npm.config.save(where)
-
-    const data = (
-      await readFile(file, 'utf8').catch(() => '')
-    ).replace(/\r\n/g, '\n')
-    const entries = Object.entries(defaults)
-    const defData = entries.reduce((str, [key, val]) => {
-      const obj = { [key]: val }
-      const i = ini.stringify(obj)
-        .replace(/\r\n/g, '\n') // normalizes output from ini.stringify
-        .replace(/\n$/m, '')
-        .replace(/^/g, '; ')
-        .replace(/\n/g, '\n; ')
-        .split('\n')
-      return str + '\n' + i
-    }, '')
-
-    const tmpData = `;;;;
-; npm ${where}config file: ${file}
-; this is a simple ini-formatted file
-; lines that start with semi-colons are comments
-; run \`npm help 7 config\` for documentation of the various options
-;
-; Configs like \`@scope:registry\` map a scope to a given registry url.
-;
-; Configs like \`//<hostname>/:_authToken\` are auth that is restricted
-; to the registry host specified.
-
-${data.split('\n').sort(localeCompare).join('\n').trim()}
-
-;;;;
-; all available options shown below with default values
-;;;;
-
-${defData}
-`.split('\n').join(EOL)
-    await mkdir(dirname(file), { recursive: true })
-    await writeFile(file, tmpData, 'utf8')
-    await new Promise((res, rej) => {
-      const [bin, ...args] = e.split(/\s+/)
-      const editor = spawn(bin, [...args, file], { stdio: 'inherit' })
-      editor.on('exit', (code) => {
-        if (code) {
-          return rej(new Error(`editor process exited with code: ${code}`))
-        }
-        return res()
-      })
-    })
+    await this.npm.config.edit(where, { editor })
   }
 
   async fix () {

lib/commands/doctor.js

@@ -7,7 +7,7 @@ const pacote = require('pacote')
 const { resolve } = require('path')
 const semver = require('semver')
 const { promisify } = require('util')
-const { Types } = require('@npmcli/config')
+const { Locations } = require('@npmcli/config')
 const log = require('../utils/log-shim.js')
 const ping = require('../utils/ping.js')
 const lstat = promisify(fs.lstat)
@@ -362,7 +362,7 @@ class Doctor extends BaseCommand {
   }
 
   async checkNpmRegistry () {
-    const defaultRegistry = this.npm.config.get('registry', Types.default)
+    const defaultRegistry = this.npm.config.get('registry', Locations.default)
     if (this.npm.flatOptions.registry !== defaultRegistry) {
       throw `Try \`npm config set registry=${defaultRegistry}\``
     } else {

node_modules/@npmcli/promise-spawn/lib/index.js

@@ -131,7 +131,7 @@ const open = (_args, opts = {}, extra = {}) => {
   let platform = process.platform
   // process.platform === 'linux' may actually indicate WSL, if that's the case
   // we want to treat things as win32 anyway so the host can open the argument
-  if (platform === 'linux' && os.release().includes('Microsoft')) {
+  if (platform === 'linux' && os.release().toLowerCase().includes('microsoft')) {
     platform = 'win32'
   }
 

node_modules/@npmcli/promise-spawn/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/promise-spawn",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "files": [
     "bin/",
     "lib/"
@@ -32,8 +32,8 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.8.0",
-    "minipass": "^3.1.1",
+    "@npmcli/template-oss": "4.11.0",
+    "minipass": "^4.0.0",
     "spawk": "^1.7.1",
     "tap": "^16.0.1"
   },
@@ -42,7 +42,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.8.0"
+    "version": "4.11.0"
   },
   "dependencies": {
     "which": "^3.0.0"

package-lock.json

@@ -1155,8 +1155,9 @@
     },
     "node_modules/@isaacs/string-locale-compare": {
       "version": "1.1.0",
-      "inBundle": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz",
+      "integrity": "sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==",
+      "inBundle": true
     },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
@@ -2238,9 +2239,10 @@
       }
     },
     "node_modules/@npmcli/promise-spawn": {
-      "version": "6.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz",
+      "integrity": "sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==",
       "inBundle": true,
-      "license": "ISC",
       "dependencies": {
         "which": "^3.0.0"
       },
@@ -14391,9 +14393,10 @@
       "version": "6.1.0",
       "license": "ISC",
       "dependencies": {
+        "@isaacs/string-locale-compare": "^1.1.0",
         "@npmcli/arborist": "^6.1.5",
         "@npmcli/map-workspaces": "^3.0.0",
-        "@npmcli/mock-globals": "^1.0.0",
+        "@npmcli/promise-spawn": "^6.0.2",
         "ci-info": "^3.7.1",
         "ini": "^3.0.0",
         "nopt": "file:../../../nopt/nopt-7.0.0.tgz",
@@ -14406,6 +14409,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
+        "@npmcli/mock-globals": "^1.0.0",
         "@npmcli/template-oss": "4.11.0",
         "tap": "^16.3.2"
       },