From 56368beff399ae50f2b644294dedf9dca328d1b6 Mon Sep 17 00:00:00 2001
From: Itai Steinherz <itaisteinherz@gmail.com>
Date: Sun, 23 Sep 2018 22:14:39 +0300
Subject: [PATCH] Simplify promises in `cli/api.js` (#3198)

---
 cli/api.js | 50 +++++++++++++++++++++-----------------------------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/cli/api.js b/cli/api.js
index e6c7af30..590a571a 100644
--- a/cli/api.js
+++ b/cli/api.js
@@ -90,40 +90,32 @@ function getPackageName(plugin) {
 
 function install(plugin, locally) {
   const array = locally ? getLocalPlugins() : getPlugins();
-  return new Promise((resolve, reject) => {
-    existsOnNpm(plugin)
-      .then(() => {
-        if (isInstalled(plugin, locally)) {
-          return reject(`${plugin} is already installed`);
-        }
+  return existsOnNpm(plugin)
+    .catch(err => {
+      const {statusCode} = err;
+      if (statusCode && (statusCode === 404 || statusCode === 200)) {
+        return Promise.reject(`${plugin} not found on npm`);
+      }
+      return Promise.reject(`${err.message}\nPlugin check failed. Check your internet connection or retry later.`);
+    })
+    .then(() => {
+      if (isInstalled(plugin, locally)) {
+        return Promise.reject(`${plugin} is already installed`);
+      }
 
-        array.push(recast.types.builders.literal(plugin));
-        save()
-          .then(resolve)
-          .catch(err => reject(err));
-      })
-      .catch(err => {
-        const {statusCode} = err;
-        if (statusCode && (statusCode === 404 || statusCode === 200)) {
-          return reject(`${plugin} not found on npm`);
-        }
-        return reject(`${err.message}\nPlugin check failed. Check your internet connection or retry later.`);
-      });
-  });
+      array.push(recast.types.builders.literal(plugin));
+      return save();
+    });
 }
 
 function uninstall(plugin) {
-  return new Promise((resolve, reject) => {
-    if (!isInstalled(plugin)) {
-      return reject(`${plugin} is not installed`);
-    }
+  if (!isInstalled(plugin)) {
+    return Promise.reject(`${plugin} is not installed`);
+  }
 
-    const index = getPlugins().findIndex(entry => entry.value === plugin);
-    getPlugins().splice(index, 1);
-    save()
-      .then(resolve)
-      .catch(err => reject(err));
-  });
+  const index = getPlugins().findIndex(entry => entry.value === plugin);
+  getPlugins().splice(index, 1);
+  return save();
 }
 
 function list() {