Skip to content

Commit

Permalink
[INTERNAL][WIP] VersionInfo: with manifest infos
Browse files Browse the repository at this point in the history
simplified merge logic
  • Loading branch information
tobiasso85 committed Dec 2, 2020
1 parent d89c2eb commit 7618c57
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions lib/processors/versionInfoGenerator.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ const resolve = (libName, libraryInfosMap, resolvedCache) => {
return resolvedCache.get(libName);
}
const manifestHint = libraryInfosMap.get(libName);
let resolved = {};
let resolved = manifestHint;
if (!manifestHint) {
log.error(`no manifest information in dependencies for ${libName}`);
resolvedCache.set(libName, resolved);
Expand All @@ -164,12 +164,11 @@ const resolve = (libName, libraryInfosMap, resolvedCache) => {
const keys = Object.keys(manifestHint);
keys.forEach((childLibName) => {
const childResolved = resolve(childLibName, libraryInfosMap, resolvedCache);
resolved = merge(resolved, childResolved);
// set a copy of the resolved libraries to avoid modifying it while iterating (recursively)
resolved = merge(resolved, clone(childResolved));
});
resolved = merge(resolved, libraryInfosMap.get(libName));

// set a copy of the resolved libraries to avoid modifying it while iterating (recursively)
libraryInfosMap.set(libName, clone(resolved));
libraryInfosMap.set(libName, resolved);
resolvedCache.set(libName, resolved);
return resolved;
};
Expand Down

0 comments on commit 7618c57

Please sign in to comment.