mirror/pnpm
1
0
Fork 0
mirror of https://github.com/pnpm/pnpm.git synced 2026-04-27 18:46:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

perf(modules-cleaner): replace ramda difference with better alternative (#6760)

Browse Source
This commit is contained in:
Bogdan Savluk
2023-07-03 22:16:08 +02:00
committed by GitHub
parent e334e56709
commit 6fb5da19db
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/young-scissors-grow.md Normal file
View File

@@ -0,0 +1,5 @@
---
"@pnpm/modules-cleaner": patch
---
Replace ineffective use of ramda `difference` with better alternative

27
pkg-manager/modules-cleaner/src/prune.ts
View File

@@ -26,7 +26,6 @@ import difference from 'ramda/src/difference'
import equals from 'ramda/src/equals'
import mergeAll from 'ramda/src/mergeAll'
import pickAll from 'ramda/src/pickAll'
import props from 'ramda/src/props'
import { removeDirectDependency } from './removeDirectDependency'
export async function prune (
@@ -62,23 +61,26 @@ export async function prune (
await Promise.all(importers.map(async ({ binsDir, id, modulesDir, pruneDirectDependencies, removePackages, rootDir }) => {
const currentImporter = opts.currentLockfile.importers[id] || {} as ProjectSnapshot
const currentPkgs = Object.entries(mergeDependencies(currentImporter))
const wantedPkgs = Object.entries(mergeDependencies(wantedLockfile.importers[id]))
const wantedPkgs = mergeDependencies(wantedLockfile.importers[id])
const allCurrentPackages = new Set(
(pruneDirectDependencies === true || removePackages?.length)
? (await readModulesDir(modulesDir) ?? [])
: []
)
const depsToRemove = new Set([
...(removePackages ?? []).filter((removePackage) => allCurrentPackages.has(removePackage)),
...difference(currentPkgs, wantedPkgs).map(([depName]) => depName),
])
const depsToRemove = new Set(
(removePackages ?? []).filter((removePackage) => allCurrentPackages.has(removePackage))
)
currentPkgs.forEach(([depName, depVersion]) => {
if (!wantedPkgs[depName] || wantedPkgs[depName] !== depVersion) {
depsToRemove.add(depName)
}
})
if (pruneDirectDependencies) {
const publiclyHoistedDeps = getPubliclyHoistedDependencies(opts.hoistedDependencies)
if (allCurrentPackages.size > 0) {
const newPkgsSet = new Set<string>(wantedPkgs.map(([depName]) => depName))
for (const currentPackage of Array.from(allCurrentPackages)) {
if (!newPkgsSet.has(currentPackage) && !publiclyHoistedDeps.has(currentPackage)) {
for (const currentPackage of allCurrentPackages) {
if (!wantedPkgs[currentPackage] && !publiclyHoistedDeps.has(currentPackage)) {
depsToRemove.add(currentPackage)
}
}
@@ -110,11 +112,8 @@ export async function prune (
: getPkgsDepPathsOwnedOnlyByImporters(selectedImporterIds, opts.registries, opts.currentLockfile, opts.include, opts.skipped)
const wantedPkgIdsByDepPaths = getPkgsDepPaths(opts.registries, wantedLockfile.packages ?? {}, opts.skipped)
const oldDepPaths = Object.keys(currentPkgIdsByDepPaths)
const newDepPaths = Object.keys(wantedPkgIdsByDepPaths)
const orphanDepPaths = difference(oldDepPaths, newDepPaths)
const orphanPkgIds = new Set(props<string, string>(orphanDepPaths, currentPkgIdsByDepPaths))
const orphanDepPaths = Object.keys(currentPkgIdsByDepPaths).filter(path => !wantedPkgIdsByDepPaths[path])
const orphanPkgIds = new Set(orphanDepPaths.map(path => currentPkgIdsByDepPaths[path]))
statsLogger.debug({
prefix: opts.lockfileDir,