mirror of
https://github.com/pnpm/pnpm.git
synced 2026-05-18 13:51:38 -04:00
refactor: resolvePeers.ts
This commit is contained in:
@@ -230,7 +230,7 @@ function buildTree (
|
||||
childrenNodeIds[child.alias] = child.depPath
|
||||
continue
|
||||
}
|
||||
if (nodeIdContainsSequence(parentNodeId, parentId, child.depPath)) {
|
||||
if (nodeIdContainsSequence(parentNodeId, parentId, child.depPath) || parentId === child.depPath) {
|
||||
continue
|
||||
}
|
||||
const childNodeId = createNodeId(parentNodeId, child.depPath)
|
||||
|
||||
@@ -191,10 +191,10 @@ function resolvePeersOfNode<T extends PartialResolvedPackage> (
|
||||
: {
|
||||
...parentParentPkgs,
|
||||
...toPkgByName(
|
||||
Object.keys(children).map((alias) => ({
|
||||
Object.entries(children).map(([alias, nodeId]) => ({
|
||||
alias,
|
||||
node: ctx.dependenciesTree[children[alias]],
|
||||
nodeId: children[alias],
|
||||
node: ctx.dependenciesTree[nodeId],
|
||||
nodeId,
|
||||
}))
|
||||
),
|
||||
}
|
||||
@@ -339,9 +339,12 @@ function getPreviouslyResolvedChildren<T extends PartialResolvedPackage> (nodeId
|
||||
nodeIdChunks.reduce((accNodeId, part) => {
|
||||
accNodeId += `>${part}>${ownId}`
|
||||
const parentNode = dependenciesTree[`${accNodeId}>`]
|
||||
if (typeof parentNode.children === 'function') {
|
||||
parentNode.children = parentNode.children()
|
||||
}
|
||||
Object.assign(
|
||||
allChildren,
|
||||
typeof parentNode.children === 'function' ? parentNode.children() : parentNode.children
|
||||
parentNode.children
|
||||
)
|
||||
return accNodeId
|
||||
}, '')
|
||||
|
||||
Reference in New Issue
Block a user