Merge branch 'npm:latest' into mm/fix-cache-add

Author: milaninfy

lib/commands/access.js

@@ -208,7 +208,7 @@ class Access extends BaseCommand {
       outputs[item] = lookup[val] || val
     }
     if (this.npm.config.get('json')) {
-      output.standard(JSON.stringify(outputs, null, 2))
+      output.buffer(outputs)
     } else {
       for (const item of Object.keys(outputs).sort(localeCompare)) {
         if (!limiter || limiter === item) {

lib/commands/config.js

@@ -403,7 +403,7 @@ ${defData}
 
       publicConf[key] = value
     }
-    output.standard(JSON.stringify(publicConf, null, 2))
+    output.buffer(publicConf)
   }
 }
 

lib/commands/explain.js

@@ -76,7 +76,7 @@ class Explain extends ArboristWorkspaceCmd {
     }
 
     if (this.npm.flatOptions.json) {
-      output.standard(JSON.stringify(expls, null, 2))
+      output.buffer(expls)
     } else {
       output.standard(expls.map(expl => {
         return explainNode(expl, Infinity, this.npm.chalk)

lib/commands/fund.js

@@ -85,16 +85,12 @@ class Fund extends ArboristWorkspaceCmd {
     })
 
     if (this.npm.config.get('json')) {
-      output.standard(this.printJSON(fundingInfo))
+      output.buffer(fundingInfo)
     } else {
       output.standard(this.printHuman(fundingInfo))
     }
   }
 
-  printJSON (fundingInfo) {
-    return JSON.stringify(fundingInfo, null, 2)
-  }
-
   printHuman (fundingInfo) {
     const unicode = this.npm.config.get('unicode')
     const seenUrls = new Map()

lib/commands/hook.js

@@ -40,7 +40,7 @@ class Hook extends BaseCommand {
   async add (pkg, uri, secret, opts) {
     const hook = await hookApi.add(pkg, uri, secret, opts)
     if (opts.json) {
-      output.standard(JSON.stringify(hook, null, 2))
+      output.buffer(hook)
     } else if (opts.parseable) {
       output.standard(Object.keys(hook).join('\t'))
       output.standard(Object.keys(hook).map(k => hook[k]).join('\t'))
@@ -53,7 +53,7 @@ class Hook extends BaseCommand {
     const hooks = await hookApi.ls({ ...opts, package: pkg })
 
     if (opts.json) {
-      output.standard(JSON.stringify(hooks, null, 2))
+      output.buffer(hooks)
     } else if (opts.parseable) {
       output.standard(Object.keys(hooks[0]).join('\t'))
       hooks.forEach(hook => {
@@ -80,7 +80,7 @@ class Hook extends BaseCommand {
   async rm (id, opts) {
     const hook = await hookApi.rm(id, opts)
     if (opts.json) {
-      output.standard(JSON.stringify(hook, null, 2))
+      output.buffer(hook)
     } else if (opts.parseable) {
       output.standard(Object.keys(hook).join('\t'))
       output.standard(Object.keys(hook).map(k => hook[k]).join('\t'))
@@ -92,7 +92,7 @@ class Hook extends BaseCommand {
   async update (id, uri, secret, opts) {
     const hook = await hookApi.update(id, uri, secret, opts)
     if (opts.json) {
-      output.standard(JSON.stringify(hook, null, 2))
+      output.buffer(hook)
     } else if (opts.parseable) {
       output.standard(Object.keys(hook).join('\t'))
       output.standard(Object.keys(hook).map(k => hook[k]).join('\t'))

lib/commands/ls.js

@@ -177,11 +177,14 @@ class LS extends ArboristWorkspaceCmd {
     const [rootError] = tree.errors.filter(e =>
       e.code === 'EJSONPARSE' && e.path === resolve(path, 'package.json'))
 
-    output.buffer(
-      json ? jsonOutput({ path, problems, result, rootError, seenItems }) :
-      parseable ? parseableOutput({ seenNodes, global, long }) :
-      humanOutput({ chalk, result, seenItems, unicode })
-    )
+    if (json) {
+      output.buffer(jsonOutput({ path, problems, result, rootError, seenItems }))
+    } else {
+      output.standard(parseable
+        ? parseableOutput({ seenNodes, global, long })
+        : humanOutput({ chalk, result, seenItems, unicode })
+      )
+    }
 
     // if filtering items, should exit with error code on no results
     if (result && !result[_include] && args.length) {

lib/commands/org.js

@@ -100,14 +100,12 @@ class Org extends BaseCommand {
     org = org.replace(/^[~@]?/, '')
     const userCount = Object.keys(roster).length
     if (opts.json) {
-      output.standard(
-        JSON.stringify({
-          user,
-          org,
-          userCount,
-          deleted: true,
-        })
-      )
+      output.buffer({
+        user,
+        org,
+        userCount,
+        deleted: true,
+      })
     } else if (opts.parseable) {
       output.standard(['user', 'org', 'userCount', 'deleted'].join('\t'))
       output.standard([user, org, userCount, true].join('\t'))
@@ -135,7 +133,7 @@ class Org extends BaseCommand {
       roster = newRoster
     }
     if (opts.json) {
-      output.standard(JSON.stringify(roster, null, 2))
+      output.buffer(roster)
     } else if (opts.parseable) {
       output.standard(['user', 'role'].join('\t'))
       Object.keys(roster).forEach(u => {

lib/commands/ping.js

@@ -16,11 +16,11 @@ class Ping extends BaseCommand {
     const time = Date.now() - start
     log.notice('PONG', `${time}ms`)
     if (this.npm.config.get('json')) {
-      output.standard(JSON.stringify({
+      output.buffer({
         registry: cleanRegistry,
         time,
         details,
-      }, null, 2))
+      })
     } else if (Object.keys(details).length) {
       log.notice('PONG', JSON.stringify(details, null, 2))
     }

lib/commands/profile.js

@@ -108,7 +108,7 @@ class Profile extends BaseCommand {
     }
 
     if (this.npm.config.get('json')) {
-      output.standard(JSON.stringify(info, null, 2))
+      output.buffer(info)
       return
     }
 
@@ -211,7 +211,7 @@ class Profile extends BaseCommand {
     const result = await otplease(this.npm, conf, c => set(newUser, c))
 
     if (this.npm.config.get('json')) {
-      output.standard(JSON.stringify({ [prop]: result[prop] }, null, 2))
+      output.buffer({ [prop]: result[prop] })
     } else if (this.npm.config.get('parseable')) {
       output.standard(prop + '\t' + result[prop])
     } else if (result[prop] != null) {
@@ -378,7 +378,7 @@ class Profile extends BaseCommand {
     await set({ tfa: { password: password, mode: 'disable' } }, conf)
 
     if (this.npm.config.get('json')) {
-      output.standard(JSON.stringify({ tfa: false }, null, 2))
+      output.buffer({ tfa: false })
     } else if (this.npm.config.get('parseable')) {
       output.standard('tfa\tfalse')
     } else {

lib/commands/query.js

@@ -51,70 +51,71 @@ class Query extends BaseCommand {
     'expect-results',
   ]
 
-  get parsedResponse () {
-    return JSON.stringify(this.#response, null, 2)
+  constructor (...args) {
+    super(...args)
+    this.npm.config.set('json', true)
   }
 
   async exec (args) {
-    // one dir up from wherever node_modules lives
-    const where = resolve(this.npm.dir, '..')
+    const packageLock = this.npm.config.get('package-lock-only')
     const Arborist = require('@npmcli/arborist')
-    const opts = {
+    const arb = new Arborist({
       ...this.npm.flatOptions,
-      path: where,
-      forceActual: true,
-    }
-    const arb = new Arborist(opts)
+      // one dir up from wherever node_modules lives
+      path: resolve(this.npm.dir, '..'),
+      forceActual: !packageLock,
+    })
     let tree
-    if (this.npm.config.get('package-lock-only')) {
+    if (packageLock) {
       try {
         tree = await arb.loadVirtual()
       } catch (err) {
         log.verbose('loadVirtual', err.stack)
-        /* eslint-disable-next-line max-len */
-        throw this.usageError('A package lock or shrinkwrap file is required in package-lock-only mode')
+        throw this.usageError(
+          'A package lock or shrinkwrap file is required in package-lock-only mode'
+        )
       }
     } else {
-      tree = await arb.loadActual(opts)
+      tree = await arb.loadActual()
     }
-    const items = await tree.querySelectorAll(args[0], this.npm.flatOptions)
-    this.buildResponse(items)
-
-    this.checkExpected(this.#response.length)
-    output.standard(this.parsedResponse)
+    await this.#queryTree(tree, args[0])
+    this.#output()
   }
 
   async execWorkspaces (args) {
     await this.setWorkspaces()
     const Arborist = require('@npmcli/arborist')
-    const opts = {
+    const arb = new Arborist({
       ...this.npm.flatOptions,
       path: this.npm.prefix,
+    })
+    // FIXME: Workspace support in query does not work as expected so this does not
+    // do the same package-lock-only check as this.exec().
+    // https://github.com/npm/cli/pull/6732#issuecomment-1708804921
+    const tree = await arb.loadActual()
+    for (const path of this.workspacePaths) {
+      const wsTree = path === tree.root.path
+        ? tree // --includes-workspace-root
+        : await tree.querySelectorAll(`.workspace:path(${path})`).then(r => r[0].target)
+      await this.#queryTree(wsTree, args[0])
     }
-    const arb = new Arborist(opts)
-    const tree = await arb.loadActual(opts)
-    for (const workspacePath of this.workspacePaths) {
-      let items
-      if (workspacePath === tree.root.path) {
-        // include-workspace-root
-        items = await tree.querySelectorAll(args[0])
-      } else {
-        const [workspace] = await tree.querySelectorAll(`.workspace:path(${workspacePath})`)
-        items = await workspace.target.querySelectorAll(args[0], this.npm.flatOptions)
-      }
-      this.buildResponse(items)
-    }
+    this.#output()
+  }
+
+  #output () {
     this.checkExpected(this.#response.length)
-    output.standard(this.parsedResponse)
+    output.buffer(this.#response)
   }
 
   // builds a normalized inventory
-  buildResponse (items) {
+  async #queryTree (tree, arg) {
+    const items = await tree.querySelectorAll(arg, this.npm.flatOptions)
     for (const node of items) {
-      if (!node.target.location || !this.#seen.has(node.target.location)) {
+      const { location } = node.target
+      if (!location || !this.#seen.has(location)) {
         const item = new QuerySelectorItem(node)
         this.#response.push(item)
-        if (node.target.location) {
+        if (location) {
           this.#seen.add(item.location)
         }
       }