Skip to content

Make fix find more transitives #558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 18, 2025
Merged

Make fix find more transitives #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 52 additions & 17 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
"@socketsecurity/sdk": "1.4.35",
"@types/blessed": "0.1.25",
"@types/cmd-shim": "5.0.2",
"@types/js-yaml": "4.0.9",
"@types/micromatch": "4.0.9",
"@types/mock-fs": "4.13.4",
"@types/node": "22.15.18",
Expand Down Expand Up @@ -139,6 +140,7 @@
"hpagent": "1.2.0",
"husky": "9.1.7",
"ignore": "7.0.4",
"js-yaml": "npm:@zkochan/[email protected]",
"knip": "5.56.0",
"lint-staged": "16.0.0",
"magic-string": "0.30.17",
Expand Down
40 changes: 21 additions & 19 deletions src/commands/fix/npm-fix.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
fetchPackagePackument,
readPackageJson
} from '@socketsecurity/registry/lib/packages'
import { naturalCompare } from '@socketsecurity/registry/lib/sorts'

import {
getBaseGitBranch,
Expand Down Expand Up @@ -60,16 +61,16 @@ type InstallOptions = {
}

async function install(
idealTree: SafeNode,
arb: SafeArborist,
options: InstallOptions
): Promise<void> {
): Promise<SafeNode> {
const { cwd = process.cwd() } = {
__proto__: null,
...options
} as InstallOptions
const arb = new Arborist({ path: cwd })
arb.idealTree = idealTree
await arb.reify()
const newArb = new Arborist({ path: cwd })
newArb.idealTree = await arb.buildIdealTree()
return await newArb.reify()
}

export async function npmFix(
Expand All @@ -95,12 +96,14 @@ export async function npmFix(
spinner?.start()

const { pkgPath: rootPath } = pkgEnvDetails

const arb = new SafeArborist({
path: rootPath,
...SAFE_ARBORIST_REIFY_OPTIONS_OVERRIDES
})
// Calling arb.reify() creates the arb.diff object and nulls-out arb.idealTree.
await arb.reify()
// Calling arb.reify() creates the arb.diff object, nulls-out arb.idealTree,
// and populates arb.actualTree.
let actualTree = await arb.reify()

const alertsMap = purls.length
? await getAlertsMapFromPurls(purls, getAlertMapOptions({ limit }))
Expand Down Expand Up @@ -129,7 +132,10 @@ export async function npmFix(
spinner?.stop()

let count = 0
infoByPkgNameLoop: for (const { 0: name, 1: infos } of infoByPkgName) {
const sortedInfoEntries = [...infoByPkgName.entries()].sort((a, b) =>
naturalCompare(a[0], b[0])
)
infoByPkgNameLoop: for (const { 0: name, 1: infos } of sortedInfoEntries) {
logger.log(`Processing vulnerable package: ${name}`)
logger.indent()
spinner?.indent()
Expand Down Expand Up @@ -159,12 +165,11 @@ export async function npmFix(

logger.log(`Checking workspace: ${workspaceName}`)

arb.idealTree = null
// eslint-disable-next-line no-await-in-loop
await arb.buildIdealTree()
actualTree = await install(arb, { cwd })

const oldVersions = arrayUnique(
findPackageNodes(arb.idealTree!, name)
findPackageNodes(actualTree, name)
.map(n => n.target?.version ?? n.version)
.filter(Boolean)
)
Expand All @@ -174,7 +179,7 @@ export async function npmFix(
`Unexpected condition: Lockfile entries not found for ${name}.\n`
)
if (isDebug()) {
console.dir(arb.idealTree!, { depth: 999 })
console.dir(actualTree, { depth: 999 })
}
continue
}
Expand All @@ -190,7 +195,7 @@ export async function npmFix(
const oldId = `${name}@${oldVersion}`
const oldPurl = idToPurl(oldId)

const node = findPackageNode(arb.idealTree!, name, oldVersion)
const node = findPackageNode(actualTree, name, oldVersion)
if (!node) {
logger.warn(
`Unexpected condition: Arborist node not found, skipping ${oldId}`
Expand Down Expand Up @@ -238,7 +243,8 @@ export async function npmFix(
updateNode(node, newVersion, newVersionPackument)
updatePackageJsonFromNode(
editablePkgJson,
arb.idealTree!,
// eslint-disable-next-line no-await-in-loop
await arb.buildIdealTree(),
node,
newVersion,
rangeStyle
Expand All @@ -261,7 +267,7 @@ export async function npmFix(
let errored = false
try {
// eslint-disable-next-line no-await-in-loop
await install(arb.idealTree!, { cwd })
actualTree = await install(arb, { cwd })
if (test) {
spinner?.info(`Testing ${newId} in ${workspaceName}`)
// eslint-disable-next-line no-await-in-loop
Expand Down Expand Up @@ -358,8 +364,6 @@ export async function npmFix(
if (isCi) {
// eslint-disable-next-line no-await-in-loop
await gitResetAndClean(baseBranch, cwd)
// eslint-disable-next-line no-await-in-loop
await install(arb.idealTree!, { cwd })
}
if (errored) {
if (!isCi) {
Expand All @@ -369,8 +373,6 @@ export async function npmFix(
removeNodeModules(cwd),
editablePkgJson.save({ ignoreWhitespace: true })
])
// eslint-disable-next-line no-await-in-loop
await install(arb.idealTree!, { cwd })
}
spinner?.failAndStop(
`Update failed for ${oldId} in ${workspaceName}`,
Expand Down
Loading
Loading