diff --git a/lib/private/create-progress-data.js b/lib/private/create-progress-data.js index 9f205df..029b9df 100644 --- a/lib/private/create-progress-data.js +++ b/lib/private/create-progress-data.js @@ -2,4 +2,4 @@ const ee = require("event-emitter"); -module.exports = () => ee({ done: new Set(), ongoingMap: new Map(), externalsMap: new Map() }); +module.exports = () => ee({ done: new Set(), ongoing: new Map(), externalsMap: new Map() }); diff --git a/lib/private/install-package/index.js b/lib/private/install-package/index.js index a6caa8f..303157c 100644 --- a/lib/private/install-package/index.js +++ b/lib/private/install-package/index.js @@ -10,13 +10,13 @@ const { resolve } = require("path") , removeNonDirectDependencies = require("../remove-non-direct-dependencies"); const finalize = async ({ name }, progressData) => { - const { done, ongoingMap } = progressData; + const { done, ongoing } = progressData; log.debug("mark %s as done", name); done.add(name); - const pendingJobs = ongoingMap.get(name); + const pendingJobs = ongoing.get(name); log.debug("remove %s from ongoing", name); - ongoingMap.delete(name); + ongoing.delete(name); // Run pending jobs if (pendingJobs.length) { @@ -29,7 +29,7 @@ const finalize = async ({ name }, progressData) => { module.exports = async (packageContext, userConfiguration, inputOptions, progressData) => { const { name } = packageContext; const { hooks, packagesPath, packagesMeta } = userConfiguration; - const { ongoingMap } = progressData; + const { ongoing } = progressData; if (!packagesMeta[name]) { throw new NpmCrossLinkError( `Cannot install package. "${ name }" is not recognized as a dev package` @@ -42,7 +42,7 @@ module.exports = async (packageContext, userConfiguration, inputOptions, progres const pendingJobs = (packageContext.pendingJobs = []); log.debug("mark %s as ongoing", name); - ongoingMap.set(name, pendingJobs); + ongoing.set(name, pendingJobs); // Ensure repository is up to date await setupRepository(path, meta.repoUrl, inputOptions); diff --git a/lib/private/setup-dependencies/setup-dependency/index.js b/lib/private/setup-dependencies/setup-dependency/index.js index 19c9652..9d9b005 100644 --- a/lib/private/setup-dependencies/setup-dependency/index.js +++ b/lib/private/setup-dependencies/setup-dependency/index.js @@ -4,10 +4,10 @@ const npmLinkDependency = require("./npm-link-dependency"); module.exports = async (dependencyContext, userConfiguration, inputOptions, progressData) => { const { name, isExternal } = dependencyContext; - const { done, ongoingMap } = progressData; + const { done, ongoing } = progressData; if (!isExternal) { - if (ongoingMap.has(name)) { - ongoingMap.get(name).push(() => npmLinkDependency(dependencyContext, progressData)); + if (ongoing.has(name)) { + ongoing.get(name).push(() => npmLinkDependency(dependencyContext, progressData)); return; } if (!done.has(name)) {