fix(lib/modules/finders/filters): generate proper keys for relative.withDependencies
This commit is contained in:
parent
a0c03057b4
commit
913c987951
1 changed files with 11 additions and 5 deletions
|
|
@ -382,19 +382,25 @@ function depGenFilterKey(deps: ComparableDependencyMap): string {
|
|||
if (dep === undefined) key += ','
|
||||
else if (Array.isArray(dep)) {
|
||||
if (dep.l) key += '#'
|
||||
// relative.withDependencies?
|
||||
if (dep.r) key += depGenRelativeKeyPart(dep.r)
|
||||
|
||||
key += `[${depGenFilterKey(dep)}],`
|
||||
} else {
|
||||
if (dep & RelativeBit) {
|
||||
const magnitude = depGetRelMagnitude(dep)
|
||||
const prefix = dep & RelativeRootBit ? '~' : '^'
|
||||
key += `${prefix}${magnitude},`
|
||||
} else key += `${dep},`
|
||||
if (dep & RelativeBit) key += depGenRelativeKeyPart(dep)
|
||||
else key += `${dep},`
|
||||
}
|
||||
}
|
||||
|
||||
return key.substring(0, key.length - 1)
|
||||
}
|
||||
|
||||
function depGenRelativeKeyPart(dep: number) {
|
||||
const magnitude = depGetRelMagnitude(dep)
|
||||
const prefix = dep & RelativeRootBit ? '~' : '^'
|
||||
return `${prefix}${magnitude},`
|
||||
}
|
||||
|
||||
export type Every = FilterGenerator<{
|
||||
<F1 extends Filter, F2 extends Filter>(
|
||||
f1: F1,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue