issue/147 Return targets from install/uninstall and update

adaptlearning · Feb 28, 2022 · acce06a · acce06a
1 parent 6a05af2
commit acce06a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/lib/api.js b/lib/api.js
@@ -106,13 +106,13 @@ class API {
    * @param {Object} options
    * @param {[string]} [options.plugins=null] An array with name@version or name@path strings
    * @param {string} [options.cwd=process.cwd()] Root path of the framework installation
-   * @return {Promise}
+   * @return {Promise<[Target]>}
    */
   async installPlugins ({
     plugins = null,
     cwd = process.cwd()
   } = {}) {
-    await install({
+    return await install({
       plugins,
       isInteractive: false,
       cwd
@@ -124,13 +124,13 @@ class API {
    * @param {Object} options
    * @param {[string]} [options.plugins=null] An array with name@version or name@path strings
    * @param {string} [options.cwd=process.cwd()] Root path of the framework installation
-   * @return {Promise}
+   * @return {Promise<[Target]>}
    */
   async uninstallPlugins ({
     plugins = null,
     cwd = process.cwd()
   } = {}) {
-    await uninstall({
+    return await uninstall({
       plugins,
       isInteractive: false,
       cwd
@@ -143,13 +143,13 @@ class API {
    * @param {Object} options
    * @param {[string]} [options.plugins=null] An array with name@version or name@path strings
    * @param {string} [options.cwd=process.cwd()] Root path of the framework installation
-   * @return {Promise}
+   * @return {Promise<[Target]>}
    */
   async updatePlugins ({
     plugins = null,
     cwd = process.cwd()
   } = {}) {
-    await update({
+    return await update({
       plugins,
       isInteractive: false,
       cwd

diff --git a/lib/integration/PluginManagement/install.js b/lib/integration/PluginManagement/install.js
@@ -27,13 +27,13 @@ export default async function install ({
   logger?.log(chalk.cyan(`${dev ? 'cloning' : 'installing'} adapt dependencies...`))
 
   const targets = await getInstallTargets({ logger, project, plugins, isCompatibleEnabled })
-  if (!targets?.length) return
+  if (!targets?.length) return targets
 
   await loadPluginData({ logger, project, targets })
   await conflictResolution({ logger, targets, isInteractive, dev })
   if (isDryRun) {
     await summariseDryRun({ logger, targets })
-    return
+    return targets
   }
   const installTargetsToBeInstalled = targets.filter(target => target.isToBeInstalled)
   if (installTargetsToBeInstalled.length) {
@@ -47,6 +47,7 @@ export default async function install ({
     await updateManifest({ logger, project, targets, manifestDependencies, isInteractive })
   }
   await summariseInstallation({ logger, targets, dev })
+  return targets
 }
 
 /**

diff --git a/lib/integration/PluginManagement/uninstall.js b/lib/integration/PluginManagement/uninstall.js
@@ -21,7 +21,7 @@ export default async function uninstall ({
   logger?.log(chalk.cyan('uninstalling adapt dependencies...'))
 
   const targets = await getUninstallTargets({ logger, project, plugins, isInteractive })
-  if (!targets?.length) return
+  if (!targets?.length) return targets
 
   await loadPluginData({ logger, targets })
   await eachOfLimitProgress(
@@ -32,7 +32,8 @@ export default async function uninstall ({
   logger?.log(`${chalk.bold.cyan('<info>')} Uninstalling plugins 100% complete`)
   const installedDependencies = await project.getInstalledDependencies()
   await updateManifest({ project, targets, installedDependencies, isInteractive })
-  return summariseUninstallation({ logger, targets })
+  await summariseUninstallation({ logger, targets })
+  return targets
 }
 
 /**

diff --git a/lib/integration/PluginManagement/update.js b/lib/integration/PluginManagement/update.js
@@ -22,13 +22,13 @@ export default async function update ({
   logger?.log(chalk.cyan('update adapt dependencies...'))
 
   const targets = await getUpdateTargets({ logger, project, plugins, isDryRun, isInteractive })
-  if (!targets?.length) return
+  if (!targets?.length) return targets
 
   await loadPluginData({ logger, project, targets })
   await conflictResolution({ logger, targets, isInteractive })
   if (isDryRun) {
     await summariseDryRun({ logger, targets })
-    return
+    return targets
   }
   const updateTargetsToBeUpdated = targets.filter(target => target.isToBeInstalled)
   if (updateTargetsToBeUpdated.length) {
@@ -40,6 +40,7 @@ export default async function update ({
     logger?.log(`${chalk.bold.cyan('<info>')} Updating plugins 100% complete`)
   }
   await summariseUpdates({ logger, targets })
+  return targets
 }
 
 /**