socket 1.0.40 → 1.0.42

package/dist/cli.js

@@ -3812,9 +3812,9 @@ function getOverridesData(pkgEnvDetails, pkgJson) {
 
 const noopHandler = () => {};
 async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
-  beforeInstall = noopHandler,
-  // eslint-disable-next-line sort-destructure-keys/sort-destructure-keys
   afterInstall = noopHandler,
+  afterUpdate = noopHandler,
+  beforeInstall = noopHandler,
   revertInstall = noopHandler
 }, fixConfig) {
   const {
@@ -3826,7 +3826,7 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
     cwd,
     limit,
     minSatisfying,
-    noPrCheck,
+    prCheck,
     rangeStyle,
     spinner,
     test,
@@ -4007,7 +4007,7 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
           if (seenBranches.has(branch)) {
             continue infosLoop;
           }
-          const pr = noPrCheck ? undefined : prs.find(p => p.headRefName === branch);
+          const pr = prCheck ? prs.find(p => p.headRefName === branch) : undefined;
           if (pr) {
             debug.debugFn('notice', `skip: PR #${pr.number} for ${name} exists`);
             seenBranches.add(branch);
@@ -4040,6 +4040,9 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
             ignoreWhitespace: true
           });
 
+          // eslint-disable-next-line no-await-in-loop
+          await afterUpdate(editablePkgJson, packument, oldVersion, newVersion, vulnerableVersionRange, fixConfig);
+
           // eslint-disable-next-line no-await-in-loop
           const unstagedCResult = await gitUnstagedModifiedFiles(cwd);
           const moddedFilepaths = unstagedCResult.ok ? unstagedCResult.data.filter(filepath => {
@@ -4057,11 +4060,6 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
             }
             continue infosLoop;
           }
-
-          // eslint-disable-next-line no-await-in-loop
-          const pkgJsonSrc = await fs$1.promises.readFile(editablePkgJson.filename, 'utf8');
-          // eslint-disable-next-line no-await-in-loop
-          const lockSrc = await utils.readLockfile(pkgEnvDetails.lockPath);
           if (!hasAnnouncedWorkspace) {
             hasAnnouncedWorkspace = true;
             workspaceLogCallCount = logger.logger.logCallCount;
@@ -4102,11 +4100,6 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
 
           // Check repoInfo to make TypeScript happy.
           if (!errored && fixEnv.isCi && fixEnv.repoInfo) {
-            // Rewrite files in case the install reverted them.
-            // eslint-disable-next-line no-await-in-loop
-            await fs$1.promises.writeFile(editablePkgJson.filename, pkgJsonSrc, 'utf8');
-            // eslint-disable-next-line no-await-in-loop
-            await fs$1.promises.writeFile(pkgEnvDetails.lockPath, lockSrc, 'utf8');
             try {
               if (
               // eslint-disable-next-line no-await-in-loop
@@ -4328,7 +4321,7 @@ async function npmFix(pkgEnvDetails, fixConfig) {
   }
   let revertData;
   return await agentFix(pkgEnvDetails, actualTree, alertsMap, install$1, {
-    async beforeInstall(editablePkgJson, packument, oldVersion, newVersion) {
+    async beforeInstall(editablePkgJson) {
       revertData = {
         ...(editablePkgJson.content.dependencies && {
           dependencies: {
@@ -4346,15 +4339,20 @@ async function npmFix(pkgEnvDetails, fixConfig) {
           }
         })
       };
-      const arb = new shadowNpmInject.Arborist({
-        path: pkgEnvDetails.pkgPath,
-        ...flatConfig
-      });
-      const idealTree = await arb.buildIdealTree();
-      const node = shadowNpmInject.findPackageNode(idealTree, packument.name, oldVersion);
-      if (node) {
-        shadowNpmInject.updateNode(node, newVersion, packument.versions[newVersion]);
-        await arb.reify();
+    },
+    async afterUpdate(editablePkgJson, packument, oldVersion, newVersion) {
+      const isWorkspaceRoot = editablePkgJson.filename === pkgEnvDetails.editablePkgJson.filename;
+      if (isWorkspaceRoot) {
+        const arb = new shadowNpmInject.Arborist({
+          path: pkgEnvDetails.pkgPath,
+          ...flatConfig
+        });
+        const idealTree = await arb.buildIdealTree();
+        const node = shadowNpmInject.findPackageNode(idealTree, packument.name, oldVersion);
+        if (node) {
+          shadowNpmInject.updateNode(node, newVersion, packument.versions[newVersion]);
+          await arb.reify();
+        }
       }
     },
     async revertInstall(editablePkgJson) {
@@ -4553,8 +4551,8 @@ async function handleFix({
   ghsas,
   limit,
   minSatisfying,
-  noPrCheck,
   outputKind,
+  prCheck,
   purls,
   rangeStyle,
   spinner,
@@ -4649,7 +4647,7 @@ async function handleFix({
     cwd,
     limit,
     minSatisfying,
-    noPrCheck,
+    prCheck,
     purls,
     rangeStyle,
     spinner,
@@ -4699,10 +4697,10 @@ const config$H = {
       default: false,
       description: 'Constrain dependency updates to the minimum satisfying version'
     },
-    noPrCheck: {
+    prCheck: {
       type: 'boolean',
-      default: false,
-      description: 'Skip PR existence check',
+      default: true,
+      description: 'Check for an existing PR before attempting a fix',
       hidden: true
     },
     purl: {
@@ -4810,7 +4808,7 @@ async function run$H(argv, importMeta, {
   const limit = (cli.flags['limit'] ? parseInt(String(cli.flags['limit'] || ''), 10) : Infinity) || Infinity;
   const maxSatisfying = Boolean(cli.flags['maxSatisfying']);
   const minSatisfying = Boolean(cli.flags['minSatisfying']) || !maxSatisfying;
-  const noPrCheck = Boolean(cli.flags['noPrCheck']);
+  const prCheck = Boolean(cli.flags['prCheck']);
   const purls = utils.cmdFlagValueToArray(cli.flags['purl']);
   const testScript = String(cli.flags['testScript'] || 'test');
   await handleFix({
@@ -4819,7 +4817,7 @@ async function run$H(argv, importMeta, {
     ghsas,
     limit,
     minSatisfying,
-    noPrCheck,
+    prCheck,
     outputKind,
     purls,
     rangeStyle,
@@ -14305,5 +14303,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=3ce082f3-7ea0-4639-948c-06f3fe9c1b80
+//# debugId=1cc1c955-a609-45d8-a905-6f7ba892424a
 //# sourceMappingURL=cli.js.map