fixup: set json config in pkg get explicitly

npm · May 15, 2024 · 9da2d27 · 9da2d27
1 parent 804db2c
commit 9da2d27
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/lib/npm.js b/lib/npm.js
@@ -301,6 +301,8 @@ class Npm {
 
     output.flush({
       [META]: true,
+      // json can be set during a command so we send the
+      // final value of it to the display layer here
       json: this.config.get('json'),
       jsonError: jsonError(err, this),
     })

diff --git a/lib/utils/display.js b/lib/utils/display.js
@@ -172,8 +172,7 @@ class Display {
   #command
   #levelIndex
   #timing
-  #jsonConfig
-  #jsonOutput
+  #json
   #heading
   #silent
 
@@ -209,11 +208,6 @@ class Display {
     }
   }
 
-  // We are in json mode if set from the config or if jsonOutput is set via a handler
-  get #json () {
-    return this.#jsonConfig || this.#jsonOutput
-  }
-
   async load ({
     command,
     heading,
@@ -245,7 +239,7 @@ class Display {
     this.#command = command
     this.#levelIndex = LEVEL_OPTIONS[loglevel].index
     this.#timing = timing
-    this.#jsonConfig = json
+    this.#json = json
     this.#heading = heading
     this.#silent = this.#levelIndex <= 0
 
@@ -296,7 +290,7 @@ class Display {
   // Arrow function assigned to a private class field so it can be passed
   // directly as a listener and still reference "this"
   #outputHandler = withMeta((level, meta, ...args) => {
-    this.#jsonOutput = meta.json
+    this.#json = typeof meta.json === 'boolean' ? meta.json : this.#json
     switch (level) {
       case output.KEYS.flush: {
         this.#outputState.buffering = false