socket 0.14.123 → 0.14.125

package/dist/module-sync/cli.js

@@ -917,7 +917,7 @@ function emitBanner(name) {
   logger.logger.error(getAsciiHeader(name))
 }
 function getAsciiHeader(command) {
-  const cliVersion = '0.14.123:ac83b62:9fc01fd8:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.125:11530dd:821f8925:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
   const nodeVersion = process$1.version
   const apiToken = shadowNpmInject.getDefaultToken()
   const defaultOrg = shadowNpmInject.getConfigValue('defaultOrg')
@@ -3739,7 +3739,7 @@ function getPkgNameFromPurlObj(purlObj) {
 function getBaseGitBranch() {
   // Lazily access constants.ENV[GITHUB_REF_NAME].
   return (
-    constants.ENV[GITHUB_REF_NAME] ??
+    constants.ENV[GITHUB_REF_NAME] ||
     // GitHub defaults to branch name "main"
     // https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches#about-the-default-branch
     'main'
@@ -3858,16 +3858,6 @@ async function gitUnstagedModifiedFiles(cwd = process.cwd()) {
   const rawFiles = stdout?.trim().split('\n') ?? []
   return rawFiles.map(relPath => path.normalizePath(relPath))
 }
-async function isInGitRepo(cwd = process.cwd()) {
-  try {
-    await spawn.spawn('git', ['rev-parse', '--is-inside-work-tree'], {
-      cwd,
-      stdio: 'ignore'
-    })
-    return true
-  } catch {}
-  return false
-}
 
 const { GITHUB_ACTIONS, GITHUB_REPOSITORY, SOCKET_SECURITY_GITHUB_PAT } =
   constants
@@ -4054,10 +4044,10 @@ async function npmFix(
 
   // Lazily access constants.ENV[CI].
   const isCi = constants.ENV[CI$1]
-  const { 0: isRepo, 1: workspacePkgJsonPaths } = await Promise.all([
-    isInGitRepo(cwd),
-    shadowNpmInject.globWorkspace(pkgEnvDetails.agent, rootPath)
-  ])
+  const workspacePkgJsonPaths = await shadowNpmInject.globWorkspace(
+    pkgEnvDetails.agent,
+    rootPath
+  )
   const pkgJsonPaths = [
     ...workspacePkgJsonPaths,
     // Process the workspace root last since it will add an override to package.json.
@@ -4075,7 +4065,7 @@ async function npmFix(
     const oldVersions = arrays.arrayUnique(
       shadowNpmInject
         .findPackageNodes(arb.idealTree, name)
-        .map(n => n.version)
+        .map(n => n.target?.version ?? n.version)
         .filter(Boolean)
     )
     const packument =
@@ -4190,7 +4180,6 @@ async function npmFix(
           )
           let error
           let errored = false
-          let installed = false
           let saved = false
 
           // eslint-disable-next-line no-await-in-loop
@@ -4206,7 +4195,6 @@ async function npmFix(
             await install$1(arb.idealTree, {
               cwd
             })
-            installed = true
             if (test) {
               if (!testedSpecs.has(newSpecKey)) {
                 testedSpecs.add(newSpecKey)
@@ -4272,15 +4260,15 @@ async function npmFix(
             // eslint-disable-next-line no-await-in-loop
             await Promise.all([
               shadowNpmInject.removeNodeModules(cwd),
-              ...(isRepo ? [gitHardReset(cwd)] : []),
-              ...(saved && !isRepo ? [editablePkgJson.save()] : [])
+              ...(isCi
+                ? [gitCheckoutBaseBranchIfAvailable(baseBranch, cwd)]
+                : []),
+              ...(saved && !isCi ? [editablePkgJson.save()] : [])
             ])
-            if (!isRepo && installed) {
-              // eslint-disable-next-line no-await-in-loop
-              await install$1(revertTree, {
-                cwd
-              })
-            }
+            // eslint-disable-next-line no-await-in-loop
+            await install$1(revertTree, {
+              cwd
+            })
             if (errored) {
               if (!failedSpecs.has(newSpecKey)) {
                 failedSpecs.add(newSpecKey)
@@ -4476,37 +4464,34 @@ async function pnpmFix(
 
   // Lazily access constants.ENV[CI].
   const isCi = constants.ENV[CI]
-  const { 0: isRepo, 1: workspacePkgJsonPaths } = await Promise.all([
-    isInGitRepo(cwd),
-    shadowNpmInject.globWorkspace(pkgEnvDetails.agent, rootPath)
-  ])
+  const workspacePkgJsonPaths = await shadowNpmInject.globWorkspace(
+    pkgEnvDetails.agent,
+    rootPath
+  )
+  const baseBranch = isCi ? getBaseGitBranch() : ''
+  const { owner, repo } = isCi
+    ? getGitHubEnvRepoInfo()
+    : {
+        owner: '',
+        repo: ''
+      }
   const pkgJsonPaths = [
     ...workspacePkgJsonPaths,
     // Process the workspace root last since it will add an override to package.json.
     pkgEnvDetails.editablePkgJson.filename
   ]
-  let actualTree
+  let actualTree = await getActualTree(cwd)
   for (const { 0: name, 1: infos } of infoByPkg) {
     if (registry.getManifestData(NPM$c, name)) {
       spinner?.info(`Skipping ${name}. Socket Optimize package exists.`)
       continue
     }
-    // eslint-disable-next-line no-await-in-loop
-    await Promise.all([
-      shadowNpmInject.removeNodeModules(cwd),
-      ...(isRepo ? [gitHardReset(cwd)] : [])
-    ])
-    // eslint-disable-next-line no-await-in-loop
-    actualTree = await install(pkgEnvDetails, {
-      spinner
-    })
     const oldVersions = arrays.arrayUnique(
       shadowNpmInject
         .findPackageNodes(actualTree, name)
-        .map(n => n.version)
+        .map(n => n.target?.version ?? n.version)
         .filter(Boolean)
     )
-    debug.debugLog(name, 'oldVersions', oldVersions)
     const packument =
       oldVersions.length && infos.length
         ? // eslint-disable-next-line no-await-in-loop
@@ -4515,41 +4500,43 @@ async function pnpmFix(
     if (!packument) {
       continue
     }
-    const failedSpecs = new Set()
     const fixedSpecs = new Set()
-    const installedSpecs = new Set()
-    const testedSpecs = new Set()
-    const unavailableSpecs = new Set()
-    const revertedSpecs = new Set()
     for (const pkgJsonPath of pkgJsonPaths) {
+      // Re-read actualTree to avoid lockfile state issues
+      // eslint-disable-next-line no-await-in-loop
+      actualTree = await getActualTree(cwd)
+      const pkgPath = path$1.dirname(pkgJsonPath)
+      const isWorkspaceRoot =
+        pkgJsonPath === pkgEnvDetails.editablePkgJson.filename
+      const workspaceName = isWorkspaceRoot
+        ? 'root'
+        : path$1.relative(rootPath, pkgPath)
+      const editablePkgJson = isWorkspaceRoot
+        ? pkgEnvDetails.editablePkgJson
+        : // eslint-disable-next-line no-await-in-loop
+          await packages.readPackageJson(pkgJsonPath, {
+            editable: true
+          })
+
+      // Get current overrides for revert logic
+      const oldPnpmSection = editablePkgJson.content[PNPM$8]
+      const oldOverrides = oldPnpmSection?.[OVERRIDES$2]
       for (const oldVersion of oldVersions) {
         const oldSpec = `${name}@${oldVersion}`
         const oldPurl = `pkg:npm/${oldSpec}`
+        const node = shadowNpmInject.findPackageNode(
+          actualTree,
+          name,
+          oldVersion
+        )
+        if (!node) {
+          debug.debugLog(`Skipping ${oldSpec}, no node found in ${pkgJsonPath}`)
+          continue
+        }
         for (const {
           firstPatchedVersionIdentifier,
           vulnerableVersionRange
         } of infos) {
-          // eslint-disable-next-line no-await-in-loop
-          await Promise.all([
-            shadowNpmInject.removeNodeModules(cwd),
-            ...(isRepo ? [gitHardReset(cwd)] : [])
-          ])
-          // eslint-disable-next-line no-await-in-loop
-          actualTree = await install(pkgEnvDetails, {
-            spinner
-          })
-          const node = shadowNpmInject.findPackageNode(
-            actualTree,
-            name,
-            oldVersion
-          )
-          if (!node) {
-            debug.debugLog(
-              `Skipping ${oldSpec}, no node found in arborist.actualTree`,
-              pkgJsonPath
-            )
-            continue
-          }
           const availableVersions = Object.keys(packument.versions)
           const newVersion = shadowNpmInject.findBestPatchVersion(
             node,
@@ -4560,30 +4547,9 @@ async function pnpmFix(
             ? packument.versions[newVersion]
             : undefined
           if (!(newVersion && newVersionPackument)) {
-            if (!unavailableSpecs.has(oldSpec)) {
-              unavailableSpecs.add(oldSpec)
-              spinner?.fail(`No update available for ${oldSpec}`)
-            }
+            spinner?.fail(`No update available for ${oldSpec}`)
             continue
           }
-          const isWorkspaceRoot =
-            pkgJsonPath === pkgEnvDetails.editablePkgJson.filename
-          const workspaceName = isWorkspaceRoot
-            ? ''
-            : path$1.relative(rootPath, path$1.dirname(pkgJsonPath))
-          const workspaceDetails = workspaceName ? ` in ${workspaceName}` : ''
-          const editablePkgJson = isWorkspaceRoot
-            ? pkgEnvDetails.editablePkgJson
-            : // eslint-disable-next-line no-await-in-loop
-              await packages.readPackageJson(pkgJsonPath, {
-                editable: true
-              })
-          const oldPnpm = editablePkgJson.content[PNPM$8]
-          const oldPnpmKeyCount = oldPnpm ? Object.keys(oldPnpm).length : 0
-          const oldOverrides = oldPnpm?.[OVERRIDES$2]
-          const oldOverridesCount = oldOverrides
-            ? Object.keys(oldOverrides).length
-            : 0
           const overrideKey = `${name}@${vulnerableVersionRange}`
           const newVersionRange = shadowNpmInject.applyRange(
             oldOverrides?.[overrideKey] ?? oldVersion,
@@ -4591,14 +4557,20 @@ async function pnpmFix(
             rangeStyle
           )
           const newSpec = `${name}@${newVersionRange}`
-          const newSpecKey = `${workspaceName ? `${workspaceName}>` : ''}${newSpec}`
+          const newSpecKey = `${workspaceName}:${newSpec}`
+          if (fixedSpecs.has(newSpecKey)) {
+            debug.debugLog(
+              `Already fixed ${newSpec} in ${workspaceName}, skipping`
+            )
+            continue
+          }
           const updateData = isWorkspaceRoot
             ? {
                 [PNPM$8]: {
-                  ...oldPnpm,
+                  ...oldPnpmSection,
                   [OVERRIDES$2]: {
-                    [overrideKey]: newVersionRange,
-                    ...oldOverrides
+                    ...oldOverrides,
+                    [overrideKey]: newVersionRange
                   }
                 }
               }
@@ -4606,54 +4578,27 @@ async function pnpmFix(
           const revertData = {
             ...(isWorkspaceRoot
               ? {
-                  [PNPM$8]: oldPnpmKeyCount
-                    ? {
-                        ...oldPnpm,
-                        [OVERRIDES$2]:
-                          oldOverridesCount === 1
-                            ? undefined
-                            : {
-                                [overrideKey]: undefined,
-                                ...oldOverrides
-                              }
-                      }
-                    : undefined
+                  [PNPM$8]: {
+                    ...oldPnpmSection,
+                    [OVERRIDES$2]:
+                      oldOverrides && Object.keys(oldOverrides).length > 1
+                        ? {
+                            ...oldOverrides,
+                            [overrideKey]: undefined
+                          }
+                        : undefined
+                  }
                 }
               : {}),
-            ...(editablePkgJson.content.dependencies
-              ? {
-                  dependencies: editablePkgJson.content.dependencies
-                }
-              : undefined),
-            ...(editablePkgJson.content.optionalDependencies
-              ? {
-                  optionalDependencies:
-                    editablePkgJson.content.optionalDependencies
-                }
-              : undefined),
-            ...(editablePkgJson.content.peerDependencies
-              ? {
-                  peerDependencies: editablePkgJson.content.peerDependencies
-                }
-              : undefined)
-          }
-          const branch = isCi
-            ? getSocketBranchName(oldPurl, newVersion, workspaceName)
-            : ''
-          const baseBranch = isCi ? getBaseGitBranch() : ''
-          const { owner, repo } = isCi
-            ? getGitHubEnvRepoInfo()
-            : {
-                owner: '',
-                repo: ''
-              }
-          const shouldOpenPr = isCi
-            ? // eslint-disable-next-line no-await-in-loop
-              !(await doesPullRequestExistForBranch(owner, repo, branch))
-            : false
-          if (isCi) {
-            // eslint-disable-next-line no-await-in-loop
-            await gitCheckoutBaseBranchIfAvailable(baseBranch, cwd)
+            ...(editablePkgJson.content.dependencies && {
+              dependencies: editablePkgJson.content.dependencies
+            }),
+            ...(editablePkgJson.content.optionalDependencies && {
+              optionalDependencies: editablePkgJson.content.optionalDependencies
+            }),
+            ...(editablePkgJson.content.peerDependencies && {
+              peerDependencies: editablePkgJson.content.peerDependencies
+            })
           }
           if (updateData) {
             editablePkgJson.update(updateData)
@@ -4666,107 +4611,99 @@ async function pnpmFix(
             rangeStyle
           )
           debug.debugLog(`Updated package.json from node: ${modded}`)
-          let error
-          let errored = false
-          let installed = false
 
           // eslint-disable-next-line no-await-in-loop
           if (!(await editablePkgJson.save())) {
             debug.debugLog(
-              `Skipping nothing changed in ${editablePkgJson.filename}`
+              `No changes saved for ${pkgJsonPath}, skipping install`
             )
             continue
           }
-          if (!installedSpecs.has(newSpecKey)) {
-            installedSpecs.add(newSpecKey)
-            spinner?.info(`Installing ${newSpec}${workspaceDetails}`)
-          }
+          spinner?.info(`Installing ${newSpec} in ${workspaceName}`)
+          let errored = false
+          let error
           try {
             // eslint-disable-next-line no-await-in-loop
             actualTree = await install(pkgEnvDetails, {
               spinner
             })
-            installed = true
             if (test) {
-              if (!testedSpecs.has(newSpecKey)) {
-                testedSpecs.add(newSpecKey)
-                spinner?.info(`Testing ${newSpec}${workspaceDetails}`)
-              }
+              spinner?.info(`Testing ${newSpec} in ${workspaceName}`)
               // eslint-disable-next-line no-await-in-loop
               await npm.runScript(testScript, [], {
                 spinner,
                 stdio: 'ignore'
               })
             }
-            if (!fixedSpecs.has(newSpecKey)) {
-              fixedSpecs.add(newSpecKey)
-              spinner?.successAndStop(`Fixed ${name}${workspaceDetails}`)
-              spinner?.start()
-            }
-          } catch (e) {
-            error = e
-            errored = true
-          }
-          if (
-            !errored &&
-            shouldOpenPr &&
-            // eslint-disable-next-line no-await-in-loop
-            (await gitCreateAndPushBranchIfNeeded(
-              branch,
-              getSocketCommitMessage(oldPurl, newVersion, workspaceName),
-              cwd
-            ))
-          ) {
-            // eslint-disable-next-line no-await-in-loop
-            const prResponse = await openGitHubPullRequest(
-              owner,
-              repo,
-              baseBranch,
-              branch,
+            fixedSpecs.add(newSpecKey)
+            spinner?.successAndStop(`Fixed ${name} in ${workspaceName}`)
+            spinner?.start()
+            const branch = getSocketBranchName(
               oldPurl,
               newVersion,
-              {
-                cwd,
-                workspaceName
-              }
+              workspaceName
             )
-            if (prResponse) {
-              const { data } = prResponse
-              spinner?.info(`PR #${data.number} opened.`)
-              if (autoMerge) {
-                // eslint-disable-next-line no-await-in-loop
-                await enableAutoMerge(data)
+            const shouldOpenPr = isCi
+              ? // eslint-disable-next-line no-await-in-loop
+                !(await doesPullRequestExistForBranch(owner, repo, branch))
+              : false
+            if (
+              isCi &&
+              shouldOpenPr &&
+              // eslint-disable-next-line no-await-in-loop
+              (await gitCreateAndPushBranchIfNeeded(
+                branch,
+                getSocketCommitMessage(oldPurl, newVersion, workspaceName),
+                cwd
+              ))
+            ) {
+              // eslint-disable-next-line no-await-in-loop
+              const prResponse = await openGitHubPullRequest(
+                owner,
+                repo,
+                baseBranch,
+                branch,
+                oldPurl,
+                newVersion,
+                {
+                  cwd,
+                  workspaceName
+                }
+              )
+              if (prResponse) {
+                const { data } = prResponse
+                spinner?.info(`PR #${data.number} opened.`)
+                if (autoMerge) {
+                  // eslint-disable-next-line no-await-in-loop
+                  await enableAutoMerge(data)
+                }
               }
             }
+          } catch (e) {
+            error = e
+            errored = true
           }
           if (errored || isCi) {
-            if (errored) {
-              if (!revertedSpecs.has(newSpecKey)) {
-                revertedSpecs.add(newSpecKey)
-                spinner?.error(`Reverting ${newSpec}${workspaceDetails}`, error)
-              }
-            }
             editablePkgJson.update(revertData)
+
             // eslint-disable-next-line no-await-in-loop
             await Promise.all([
               shadowNpmInject.removeNodeModules(cwd),
-              ...(isRepo
-                ? [gitHardReset(cwd)]
-                : installed
-                  ? [editablePkgJson.save()]
-                  : [])
+              ...(isCi
+                ? [gitCheckoutBaseBranchIfAvailable(baseBranch, cwd)]
+                : []),
+              ...(isCi ? [] : [editablePkgJson.save()])
             ])
+
             // eslint-disable-next-line no-await-in-loop
             actualTree = await install(pkgEnvDetails, {
               spinner
             })
             if (errored) {
-              if (!failedSpecs.has(newSpecKey)) {
-                failedSpecs.add(newSpecKey)
-                spinner?.failAndStop(
-                  `Update failed for ${oldSpec}${workspaceDetails}`
-                )
-              }
+              spinner?.failAndStop(
+                `Update failed for ${oldSpec} in ${workspaceName}`,
+                error
+              )
             }
           }
         }
@@ -12341,7 +12278,7 @@ void (async () => {
   await vendor.updater({
     name: SOCKET_CLI_BIN_NAME,
     // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION']".
-    version: '0.14.123',
+    version: '0.14.125',
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
   try {
@@ -12409,5 +12346,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=5bad9b77-6e22-4b32-a047-7f16520f50a3
+//# debugId=8c8790a2-a162-431b-99ab-b980237160d8
 //# sourceMappingURL=cli.js.map