From 2e60abbfdbd9b42fc7f0bc7b595d4d4ff24ffee4 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 17 Sep 2022 16:47:09 +0300 Subject: [PATCH] style: fix --- .../src/resolveDependencies.ts | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/packages/resolve-dependencies/src/resolveDependencies.ts b/packages/resolve-dependencies/src/resolveDependencies.ts index 7c328ac7d69..8aba0a48ba0 100644 --- a/packages/resolve-dependencies/src/resolveDependencies.ts +++ b/packages/resolve-dependencies/src/resolveDependencies.ts @@ -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, } } @@ -1253,19 +1255,17 @@ async function resolveDependency ( ? path.resolve(ctx.lockfileDir, pkgResponse.body.resolution['directory']) : options.prefix let missingPeersOfChildren!: pDefer.DeferredPromise | 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() - ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id] = { - parentNodeId: options.parentPkg.nodeId, - missingPeers: missingPeersOfChildren, + missingPeersOfChildren = pDefer() + ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id] = { + parentNodeId: options.parentPkg.nodeId, + missingPeers: missingPeersOfChildren, + } } } return {