@npmcli/config 8.2.1 → 8.3.0

package/lib/index.js

@@ -2,12 +2,10 @@
 const { walkUp } = require('walk-up-path')
 const ini = require('ini')
 const nopt = require('nopt')
-const mapWorkspaces = require('@npmcli/map-workspaces')
-const rpj = require('read-package-json-fast')
-const log = require('proc-log')
+const { log, time } = require('proc-log')
 
-const { resolve, dirname, join } = require('path')
-const { homedir } = require('os')
+const { resolve, dirname, join } = require('node:path')
+const { homedir } = require('node:os')
 const {
   readFile,
   writeFile,
@@ -28,35 +26,12 @@ const dirExists = (...p) => stat(resolve(...p))
 const hasOwnProperty = (obj, key) =>
   Object.prototype.hasOwnProperty.call(obj, key)
 
-// define a custom getter, but turn into a normal prop
-// if we set it.  otherwise it can't be set on child objects
-const settableGetter = (obj, key, get) => {
-  Object.defineProperty(obj, key, {
-    get,
-    set (value) {
-      Object.defineProperty(obj, key, {
-        value,
-        configurable: true,
-        writable: true,
-        enumerable: true,
-      })
-    },
-    configurable: true,
-    enumerable: true,
-  })
-}
-
 const typeDefs = require('./type-defs.js')
 const nerfDart = require('./nerf-dart.js')
 const envReplace = require('./env-replace.js')
 const parseField = require('./parse-field.js')
-const typeDescription = require('./type-description.js')
 const setEnvs = require('./set-envs.js')
 
-const {
-  ErrInvalidAuth,
-} = require('./errors.js')
-
 // types that can be saved back to
 const confFileTypes = new Set([
   'global',
@@ -226,7 +201,7 @@ class Config {
     }
 
     // create the object for flat options passed to deps
-    process.emit('time', 'config:load:flatten')
+    const timeEnd = time.start('config:load:flatten')
     this.#flatOptions = {}
     // walk from least priority to highest
     for (const { data } of this.data.values()) {
@@ -234,7 +209,7 @@ class Config {
     }
     this.#flatOptions.nodeBin = this.execPath
     this.#flatOptions.npmBin = this.npmBin
-    process.emit('timeEnd', 'config:load:flatten')
+    timeEnd()
 
     return this.#flatOptions
   }
@@ -258,37 +233,24 @@ class Config {
       throw new Error('attempting to load npm config multiple times')
     }
 
-    process.emit('time', 'config:load')
     // first load the defaults, which sets the global prefix
-    process.emit('time', 'config:load:defaults')
     this.loadDefaults()
-    process.emit('timeEnd', 'config:load:defaults')
 
     // next load the builtin config, as this sets new effective defaults
-    process.emit('time', 'config:load:builtin')
     await this.loadBuiltinConfig()
-    process.emit('timeEnd', 'config:load:builtin')
 
     // cli and env are not async, and can set the prefix, relevant to project
-    process.emit('time', 'config:load:cli')
     this.loadCLI()
-    process.emit('timeEnd', 'config:load:cli')
-    process.emit('time', 'config:load:env')
     this.loadEnv()
-    process.emit('timeEnd', 'config:load:env')
 
     // next project config, which can affect userconfig location
-    process.emit('time', 'config:load:project')
     await this.loadProjectConfig()
-    process.emit('timeEnd', 'config:load:project')
+
     // then user config, which can affect globalconfig location
-    process.emit('time', 'config:load:user')
     await this.loadUserConfig()
-    process.emit('timeEnd', 'config:load:user')
+
     // last but not least, global config file
-    process.emit('time', 'config:load:global')
     await this.loadGlobalConfig()
-    process.emit('timeEnd', 'config:load:global')
 
     // set this before calling setEnvs, so that we don't have to share
     // private attributes, as that module also does a bunch of get operations
@@ -297,11 +259,7 @@ class Config {
     // set proper globalPrefix now that everything is loaded
     this.globalPrefix = this.get('prefix')
 
-    process.emit('time', 'config:load:setEnvs')
     this.setEnvs()
-    process.emit('timeEnd', 'config:load:setEnvs')
-
-    process.emit('timeEnd', 'config:load')
   }
 
   loadDefaults () {
@@ -329,7 +287,21 @@ class Config {
     // default the globalconfig file to that location, instead of the default
     // global prefix.  It's weird that `npm get globalconfig --prefix=/foo`
     // returns `/foo/etc/npmrc`, but better to not change it at this point.
-    settableGetter(data, 'globalconfig', () => resolve(this.#get('prefix'), 'etc/npmrc'))
+    // define a custom getter, but turn into a normal prop
+    // if we set it.  otherwise it can't be set on child objects
+    Object.defineProperty(data, 'globalconfig', {
+      get: () => resolve(this.#get('prefix'), 'etc/npmrc'),
+      set (value) {
+        Object.defineProperty(data, 'globalconfig', {
+          value,
+          configurable: true,
+          writable: true,
+          enumerable: true,
+        })
+      },
+      configurable: true,
+      enumerable: true,
+    })
   }
 
   loadHome () {
@@ -444,6 +416,7 @@ class Config {
       }
 
       if (authProblems.length) {
+        const { ErrInvalidAuth } = require('./errors.js')
         throw new ErrInvalidAuth(authProblems)
       }
 
@@ -512,6 +485,7 @@ class Config {
   }
 
   invalidHandler (k, val, type, source, where) {
+    const typeDescription = require('./type-description.js')
     log.warn(
       'invalid config',
       k + '=' + JSON.stringify(val),
@@ -610,8 +584,8 @@ class Config {
   }
 
   async #loadFile (file, type) {
-    process.emit('time', 'config:load:file:' + file)
     // only catch the error from readFile, not from the loadObject call
+    log.silly(`config:load:file:${file}`)
     await readFile(file, 'utf8').then(
       data => {
         const parsedConfig = ini.parse(data)
@@ -624,7 +598,6 @@ class Config {
       },
       er => this.#loadObject(null, type, file, er)
     )
-    process.emit('timeEnd', 'config:load:file:' + file)
   }
 
   loadBuiltinConfig () {
@@ -696,6 +669,7 @@ class Config {
       }
 
       if (this.localPrefix && hasPackageJson) {
+        const rpj = require('read-package-json-fast')
         // if we already set localPrefix but this dir has a package.json
         // then we need to see if `p` is a workspace root by reading its package.json
         // however, if reading it fails then we should just move on
@@ -704,6 +678,7 @@ class Config {
           continue
         }
 
+        const mapWorkspaces = require('@npmcli/map-workspaces')
         const workspaces = await mapWorkspaces({ cwd: p, pkg })
         for (const w of workspaces.values()) {
           if (w === this.localPrefix) {

package/lib/nerf-dart.js

@@ -1,4 +1,4 @@
-const { URL } = require('url')
+const { URL } = require('node:url')
 
 /**
  * Maps a URL to an identifier.

package/lib/parse-field.js

@@ -1,7 +1,7 @@
 // Parse a field, coercing it to the best type available.
 const typeDefs = require('./type-defs.js')
 const envReplace = require('./env-replace.js')
-const { resolve } = require('path')
+const { resolve } = require('node:path')
 
 const { parse: umaskParse } = require('./umask.js')
 

package/lib/type-defs.js

@@ -1,10 +1,12 @@
 const nopt = require('nopt')
 
-const { Umask, validate: validateUmask } = require('./umask.js')
+const { validate: validateUmask } = require('./umask.js')
 
-const semver = require('semver')
+class Umask {}
+class Semver {}
+const semverValid = require('semver/functions/valid')
 const validateSemver = (data, k, val) => {
-  const valid = semver.valid(val)
+  const valid = semverValid(val)
   if (!valid) {
     return false
   }
@@ -23,7 +25,7 @@ const validatePath = (data, k, val) => {
 module.exports = {
   ...nopt.typeDefs,
   semver: {
-    type: semver,
+    type: Semver,
     validate: validateSemver,
     description: 'full valid SemVer string',
   },

package/lib/umask.js

@@ -1,4 +1,3 @@
-class Umask {}
 const parse = val => {
   // this is run via nopt and parse field where everything is
   // converted to a string first, ignoring coverage for now
@@ -33,4 +32,4 @@ const validate = (data, k, val) => {
   }
 }
 
-module.exports = { Umask, parse, validate }
+module.exports = { parse, validate }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/config",
-  "version": "8.2.1",
+  "version": "8.3.0",
   "files": [
     "bin/",
     "lib/"
@@ -40,7 +40,7 @@
     "ci-info": "^4.0.0",
     "ini": "^4.1.2",
     "nopt": "^7.0.0",
-    "proc-log": "^3.0.0",
+    "proc-log": "^4.2.0",
     "read-package-json-fast": "^3.0.2",
     "semver": "^7.3.5",
     "walk-up-path": "^3.0.1"