fix(refactor): use output.buffer for pkg

Author: lukekarrys

lib/commands/pkg.js

@@ -25,13 +25,7 @@ class Pkg extends BaseCommand {
   static workspaces = true
   static ignoreImplicitWorkspace = false
 
-  async exec (args, { prefix } = {}) {
-    if (!prefix) {
-      this.prefix = this.npm.localPrefix
-    } else {
-      this.prefix = prefix
-    }
-
+  async exec (args, { prefix = this.npm.localPrefix, ...opts } = {}) {
     if (this.npm.global) {
       throw Object.assign(
         new Error(`There's no package.json file to manage on global mode`),
@@ -42,38 +36,32 @@ class Pkg extends BaseCommand {
     const [cmd, ..._args] = args
     switch (cmd) {
       case 'get':
-        return this.get(_args)
+        return this.get(_args, { prefix, ...opts })
       case 'set':
-        return this.set(_args)
+        return this.set(_args, { prefix, ...opts }).then(p => p.save())
       case 'delete':
-        return this.delete(_args)
+        return this.delete(_args, { prefix, ...opts }).then(p => p.save())
       case 'fix':
-        return this.fix(_args)
+        return PackageJson.fix(prefix).then(p => p.save())
       default:
         throw this.usageError()
     }
   }
 
   async execWorkspaces (args) {
     await this.setWorkspaces()
-    const result = {}
-    for (const [workspaceName, workspacePath] of this.workspaces.entries()) {
-      this.prefix = workspacePath
-      result[workspaceName] = await this.exec(args, { prefix: workspacePath })
+    for (const [workspace, prefix] of this.workspaces.entries()) {
+      await this.exec(args, { prefix, workspace })
     }
-    // when running in workspaces names, make sure to key by workspace
-    // name the results of each value retrieved in each ws
-    output.standard(JSON.stringify(result, null, 2))
   }
 
-  async get (args) {
-    const pkgJson = await PackageJson.load(this.prefix)
+  async get (args, { prefix, workspace }) {
+    const pkgJson = await PackageJson.load(prefix)
 
-    const { content } = pkgJson
-    let result = !args.length && content
+    let result = pkgJson.content
 
-    if (!result) {
-      const q = new Queryable(content)
+    if (args.length) {
+      const q = new Queryable(result)
       result = q.query(args)
 
       // in case there's only a single result from the query
@@ -83,16 +71,10 @@ class Pkg extends BaseCommand {
       }
     }
 
-    // only outputs if not running with workspaces config
-    // execWorkspaces will handle the output otherwise
-    if (!this.workspaces) {
-      output.standard(JSON.stringify(result, null, 2))
-    }
-
-    return result
+    output.buffer(workspace ? { [workspace]: result } : result)
   }
 
-  async set (args) {
+  async set (args, { prefix }) {
     const setError = () =>
       this.usageError('npm pkg set expects a key=value pair of args.')
 
@@ -102,7 +84,7 @@ class Pkg extends BaseCommand {
 
     const force = this.npm.config.get('force')
     const json = this.npm.config.get('json')
-    const pkgJson = await PackageJson.load(this.prefix)
+    const pkgJson = await PackageJson.load(prefix)
     const q = new Queryable(pkgJson.content)
     for (const arg of args) {
       const [key, ...rest] = arg.split('=')
@@ -114,19 +96,18 @@ class Pkg extends BaseCommand {
       q.set(key, json ? JSON.parse(value) : value, { force })
     }
 
-    pkgJson.update(q.toJSON())
-    await pkgJson.save()
+    return pkgJson.update(q.toJSON())
   }
 
-  async delete (args) {
+  async delete (args, { prefix }) {
     const setError = () =>
       this.usageError('npm pkg delete expects key args.')
 
     if (!args.length) {
       throw setError()
     }
 
-    const pkgJson = await PackageJson.load(this.prefix)
+    const pkgJson = await PackageJson.load(prefix)
     const q = new Queryable(pkgJson.content)
     for (const key of args) {
       if (!key) {
@@ -136,13 +117,7 @@ class Pkg extends BaseCommand {
       q.delete(key)
     }
 
-    pkgJson.update(q.toJSON())
-    await pkgJson.save()
-  }
-
-  async fix () {
-    const pkgJson = await PackageJson.fix(this.prefix)
-    await pkgJson.save()
+    return pkgJson.update(q.toJSON())
   }
 }