feat: improve installation jobs reporting

medikoo · Nov 15, 2018 · 618b22f · 618b22f
1 parent dcd0258
commit 618b22f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/lib/private/cli/index.js b/lib/private/cli/index.js
@@ -38,18 +38,23 @@ module.exports = async (command, packageName, inputOptions) => {
 			log.notice("installed %s", endedPackageName);
 		} else if (installationJobs.size) {
 			const jobTerms = new Set();
-			let updatedDependenciesCount = 0;
+			let updatedDependenciesCount = 0, installedDependenciesCount = 0;
 			for (const job of installationJobs) {
 				if (job === "pull") jobTerms.add("pulled");
 				else if (job === "push") jobTerms.add("pushed");
 				else if (job === "link") jobTerms.add("linked");
-				else if (job.startsWith("setup-dependency:")) ++updatedDependenciesCount;
+				else if (job.startsWith("update-dependency:")) ++updatedDependenciesCount;
+				else if (job.startsWith("install-dependency:")) ++installedDependenciesCount;
 			}
 			if (updatedDependenciesCount === 1) {
 				jobTerms.add("updated 1 dependency");
 			} else if (updatedDependenciesCount > 1) {
 				jobTerms.add(`updated ${ updatedDependenciesCount } dependencies`);
 			}
+			if (!installationJobs.has("link") && installedDependenciesCount) {
+				if (installedDependenciesCount === 1) jobTerms.add("installed 1 dependency");
+				else jobTerms.add(`installed ${ installedDependenciesCount } dependencies`);
+			}
 			log.notice("updated %s (%#s)", endedPackageName, Array.from(jobTerms).join(", "));
 		}
 		updateProgress();

diff --git a/lib/private/setup-dependencies/setup-dependency/index.js b/lib/private/setup-dependencies/setup-dependency/index.js
@@ -12,8 +12,13 @@ module.exports = async (dependencyContext, userConfiguration, inputOptions, prog
 				{ name }, userConfiguration, inputOptions, progressData
 			);
 		}
-		if ((done.get(name) || ongoing.get(name)).installationJobs.size) {
-			dependentContext.installationJobs.add(`setup-dependency:${ name }`);
+		const dependencyInstallationJobs = (done.get(name) || ongoing.get(name)).installationJobs;
+		if (dependencyInstallationJobs.size) {
+			dependentContext.installationJobs.add(
+				`$${ dependencyInstallationJobs.has("clone") ? "install" : "update" }-dependency:${
+					name
+				}`
+			);
 		}
 	}
 	await npmLinkDependency(dependencyContext, progressData);

diff --git a/lib/private/setup-dependencies/setup-dependency/npm-link-dependency/index.js b/lib/private/setup-dependencies/setup-dependency/npm-link-dependency/index.js
@@ -73,7 +73,7 @@ module.exports = async (dependencyContext, progressData) => {
 		return;
 	}
 
-	dependentContext.installationJobs.add(`setup-dependency:${ name }`);
+	dependentContext.installationJobs.add(`install-dependency:${ name }`);
 	if (ongoing.has(name)) {
 		ongoing
 			.get(name)

diff --git a/lib/private/setup-dependencies/setup-dependency/npm-link-dependency/install-external.js b/lib/private/setup-dependencies/setup-dependency/npm-link-dependency/install-external.js
@@ -58,7 +58,7 @@ module.exports = async dependencyContext => {
 	);
 	if (!sourceDirname) return;
 
-	dependentContext.installationJobs.add(`setup-dependency:${ name }`);
+	dependentContext.installationJobs.add(`install-dependency:${ name }`);
 	await copyDir(sourceDirname, path);
 
 	// Ensure to map binaries

diff --git a/lib/private/setup-dependencies/setup-dependency/npm-link-dependency/setup-external.js b/lib/private/setup-dependencies/setup-dependency/npm-link-dependency/setup-external.js
@@ -59,7 +59,7 @@ module.exports = async (dependencyContext, progressData) => {
 		return;
 	}
 
-	dependentContext.installationJobs.add(`setup-dependency:${ name }`);
+	dependentContext.installationJobs.add(`install-dependency:${ name }`);
 	log.info("%s link external dependency %s", dependentContext.name, name);
 	await rm(path, { loose: true, recursive: true, force: true });
 	await muteErrorIfOptional(dependencyContext, async () => {