Skip to content

Commit

Permalink
style: fix
Browse files Browse the repository at this point in the history
  • Loading branch information
zkochan committed Sep 17, 2022
1 parent 371431d commit 2e60abb
Showing 1 changed file with 27 additions and 27 deletions.
54 changes: 27 additions & 27 deletions packages/resolve-dependencies/src/resolveDependencies.ts
Expand Up @@ -637,24 +637,26 @@ async function resolveDependenciesOfDependency (
if (!resolveDependencyResult.isNew) {
return {
resolveDependencyResult,
missingPeersPromise: resolveDependencyResult.missingPeersOfChildren != null ? async (postponedResolutionOpts) => {
const missingPeers = await resolveDependencyResult.missingPeersOfChildren!.promise
const newMissing = {} as MissingPeers
const resolvedPeers = {} as ResolvedPeers
for (const [peerName, peerVersion] of Object.entries(missingPeers)) {
if (postponedResolutionOpts.parentPkgAliases[peerName]) {
if (postponedResolutionOpts.parentPkgAliases[peerName] !== true) {
resolvedPeers[peerName] = postponedResolutionOpts.parentPkgAliases[peerName] as PkgAddress
missingPeersPromise: resolveDependencyResult.missingPeersOfChildren != null
? async (postponedResolutionOpts) => {
const missingPeers = await resolveDependencyResult.missingPeersOfChildren!.promise
const newMissing = {} as MissingPeers
const resolvedPeers = {} as ResolvedPeers
for (const [peerName, peerVersion] of Object.entries(missingPeers)) {
if (postponedResolutionOpts.parentPkgAliases[peerName]) {
if (postponedResolutionOpts.parentPkgAliases[peerName] !== true) {
resolvedPeers[peerName] = postponedResolutionOpts.parentPkgAliases[peerName] as PkgAddress
}
} else {
newMissing[peerName] = peerVersion
}
} else {
newMissing[peerName] = peerVersion
}
return {
missingPeers: newMissing,
resolvedPeers,
}
}
return {
missingPeers: newMissing,
resolvedPeers,
}
} : undefined,
: undefined,
}
}

Expand Down Expand Up @@ -1253,19 +1255,17 @@ async function resolveDependency (
? path.resolve(ctx.lockfileDir, pkgResponse.body.resolution['directory'])
: options.prefix
let missingPeersOfChildren!: pDefer.DeferredPromise<MissingPeers> | undefined
if (nodeIdContains(options.parentPkg.nodeId, depPath)) {
} else if (ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id]) {
if (!options.parentPkg.nodeId.startsWith(ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id].parentNodeId)) {
missingPeersOfChildren = ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id].missingPeers
if (!nodeIdContains(options.parentPkg.nodeId, depPath)) {
if (ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id]) {
if (!options.parentPkg.nodeId.startsWith(ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id].parentNodeId)) {
missingPeersOfChildren = ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id].missingPeers
}
} else {
// console.log('current', options.parentPkg.nodeId)
// console.log('in cache', ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id].parentNodeId)
}
} else {
missingPeersOfChildren = pDefer<MissingPeers>()
ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id] = {
parentNodeId: options.parentPkg.nodeId,
missingPeers: missingPeersOfChildren,
missingPeersOfChildren = pDefer<MissingPeers>()
ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id] = {
parentNodeId: options.parentPkg.nodeId,
missingPeers: missingPeersOfChildren,
}
}
}
return {
Expand Down

0 comments on commit 2e60abb

Please sign in to comment.