@@ -11,7 +11,7 @@ const usage = require('./utils/npm-usage.js')

const LogFile = require('./utils/log-file.js')

const Timers = require('./utils/timers.js')

const Display = require('./utils/display.js')

const { log } = require('proc-log')

const { log, time } = require('proc-log')

const { redactLog: replaceInfo } = require('@npmcli/redact')

const updateNotifier = require('./utils/update-notifier.js')

const pkg = require('../package.json')

@@ -110,7 +110,7 @@ class Npm {

async exec (cmd, args = this.argv) {

const command = this.setCmd(cmd)

const timeEnd = this.time(`command:${cmd}`)

const timeEnd = time.start(`command:${cmd}`)

// this is async but we dont await it, since its ok if it doesnt

// finish before the command finishes running. it uses command and argv

@@ -137,7 +137,7 @@ class Npm {

async load () {

if (!this.#loadPromise) {

this.#loadPromise = this.time('npm:load', () => this.#load().catch((er) => {

this.#loadPromise = time.start('npm:load', () => this.#load().catch((er) => {

this.loadErr = er

throw er

}))

@@ -158,10 +158,6 @@ class Npm {

this.#logFile.off()

}

time (name, fn) {

return this.#timers.time(name, fn)

}

writeTimingFile () {

this.#timers.writeFile({

id: this.#runId,

@@ -181,7 +177,7 @@ class Npm {

}

async #load () {

await this.time('npm:load:whichnode', async () => {

await time.start('npm:load:whichnode', async () => {

// TODO should we throw here?

const node = await which(process.argv[0]).catch(() => {})

if (node && node.toUpperCase() !== process.execPath.toUpperCase()) {

@@ -191,7 +187,7 @@ class Npm {

}

})

await this.time('npm:load:configload', () => this.config.load())

await time.start('npm:load:configload', () => this.config.load())

// get createSupportsColor from chalk directly if this lands

// https://github.com/chalk/chalk/pull/600

@@ -211,21 +207,21 @@ class Npm {

// a different location. if this fails, then we don't have

// a cache dir, but we don't want to fail immediately since

// the command might not need a cache dir (like `npm --version`)

await this.time('npm:load:mkdirpcache', () =>

await time.start('npm:load:mkdirpcache', () =>

fs.mkdir(this.cache, { recursive: true })

.catch((e) => log.verbose('cache', `could not create cache: ${e}`)))

// it's ok if this fails. user might have specified an invalid dir

// which we will tell them about at the end

if (this.config.get('logs-max') > 0) {

await this.time('npm:load:mkdirplogs', () =>

await time.start('npm:load:mkdirplogs', () =>

fs.mkdir(this.logsDir, { recursive: true })

.catch((e) => log.verbose('logfile', `could not create logs-dir: ${e}`)))

}

// note: this MUST be shorter than the actual argv length, because it

// uses the same memory, so node will truncate it if it's too long.

this.time('npm:load:setTitle', () => {

time.start('npm:load:setTitle', () => {

const { parsedArgv: { cooked, remain } } = this.config

this.argv = remain

// Secrets are mostly in configs, so title is set using only the positional args

@@ -241,7 +237,7 @@ class Npm {

log.verbose('argv', this.#argvClean.map(JSON.stringify).join(' '))

})

this.time('npm:load:display', () => {

time.start('npm:load:display', () => {

this.#display.load({

loglevel: this.config.get('loglevel'),

// TODO: only pass in logColor and color and create chalk instances

@@ -260,21 +256,21 @@ class Npm {

process.env.COLOR = this.color ? '1' : '0'

})

this.time('npm:load:logFile', () => {

time.start('npm:load:logFile', () => {

this.#logFile.load({

path: this.logPath,

logsMax: this.config.get('logs-max'),

})

log.verbose('logfile', this.#logFile.files[0] || 'no logfile created')

})

this.time('npm:load:timers', () =>

time.start('npm:load:timers', () =>

this.#timers.load({

path: this.config.get('timing') ? this.logPath : null,

})

)

this.time('npm:load:configScope', () => {

time.start('npm:load:configScope', () => {

const configScope = this.config.get('scope')

if (configScope && !/^@/.test(configScope)) {

this.config.set('scope', `@${configScope}`, this.config.find('scope'))