feat: pass progressData with event, expose type on it

BREAKING CHANGE: progressDataEvent.type was moved to progressDataEvent.progressData.type
medikoo · Nov 14, 2018 · 3c2f8c3 · 3c2f8c3
1 parent 9dc1847
commit 3c2f8c3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/lib/private/cli/index.js b/lib/private/cli/index.js
@@ -29,7 +29,7 @@ module.exports = async (command, packageName, inputOptions) => {
 	};
 	const updateProgress = () => {
 		cliFooter.updateProgress(
-			Array.from(installsInProgress, ([inProgressPackageName, { type }]) =>
+			Array.from(installsInProgress, ([inProgressPackageName, { progressData: { type } }]) =>
 				format(`${ logWordForms.present[type] } %s`, inProgressPackageName)
 			)
 		);
@@ -39,7 +39,7 @@ module.exports = async (command, packageName, inputOptions) => {
 		updateProgress();
 	});
 	installPromise.on("end", ({ name: endedPackageName }) => {
-		const { type } = installsInProgress.get(endedPackageName);
+		const { progressData: { type } } = installsInProgress.get(endedPackageName);
 		installsInProgress.delete(endedPackageName);
 		log.notice(`${ logWordForms.past[type] } %s`, endedPackageName);
 		updateProgress();

diff --git a/lib/private/install-package/index.js b/lib/private/install-package/index.js
@@ -25,7 +25,7 @@ const finalize = async ({ name }, progressData) => {
 		for (const job of jobs) await job();
 		clear.call(jobs);
 	}
-	progressData.emit("end", { name });
+	progressData.emit("end", { name, progressData: packageProgressData });
 };
 
 module.exports = async (packageContext, userConfiguration, inputOptions, progressData) => {
@@ -39,11 +39,15 @@ module.exports = async (packageContext, userConfiguration, inputOptions, progres
 	}
 	const meta = (packageContext.meta = packagesMeta[name]);
 	const path = (packageContext.path = resolve(packagesPath, name));
-
-	progressData.emit("start", { name, type: (await isDirectory(path)) ? "update" : "install" });
+	const packageProgressData = {
+		type: (await isDirectory(path)) ? "update" : "install",
+		hooks: { after: [] }
+	};
 
 	log.debug("mark %s as ongoing", name);
-	ongoing.set(name, { hooks: { after: [] } });
+	ongoing.set(name, packageProgressData);
+
+	progressData.emit("start", { name, progressData: packageProgressData });
 
 	// Ensure repository is up to date
 	await setupRepository(path, meta.repoUrl, inputOptions);

diff --git a/lib/private/install.js b/lib/private/install.js
@@ -22,7 +22,7 @@ module.exports = async (packageContext, userConfiguration, inputOptions, progres
 	// Ensure to emit "start" event in next event loop
 	await wait();
 
-	progressData.emit("start", { name, type: "update" });
+	progressData.emit("start", { name, progressData: { type: "update" } });
 
 	// Cleanup outcome of eventual previous npm crashes
 	await cleanupNpmInstall(packageContext);