socket 1.0.34 → 1.0.36

package/dist/cli.js

@@ -3091,7 +3091,7 @@ function getSocketPullRequestTitle(purl, newVersion, workspace) {
 async function gitCleanFdx(cwd = process.cwd()) {
   const stdioIgnoreOptions = {
     cwd,
-    stdio: 'ignore'
+    stdio: debug.isDebug('stdio') ? 'inherit' : 'ignore'
   };
   // TODO: propagate CResult?
   await spawn.spawn('git', ['clean', '-fdx'], stdioIgnoreOptions);
@@ -3109,16 +3109,8 @@ async function gitCreateAndPushBranch(branch, commitMsg, filepaths, options) {
   };
   const stdioIgnoreOptions = {
     cwd,
-    stdio: 'inherit'
+    stdio: debug.isDebug('stdio') ? 'inherit' : 'ignore'
   };
-  logger.logger.dir({
-    branch,
-    user,
-    email,
-    cwd,
-    filepaths,
-    commitMsg
-  });
   try {
     await gitEnsureIdentity(user, email, cwd);
     await spawn.spawn('git', ['checkout', '-b', branch], stdioIgnoreOptions);
@@ -3127,14 +3119,10 @@ async function gitCreateAndPushBranch(branch, commitMsg, filepaths, options) {
     await spawn.spawn('git', ['push', '--force', '--set-upstream', 'origin', branch], stdioIgnoreOptions);
     return true;
   } catch (e) {
-    logger.logger.dir({
+    debug.debugFn('error', `caught: git push --force --set-upstream origin ${branch} failed`);
+    debug.debugDir('inspect', {
       error: e
     });
-    // debugFn(
-    //   'error',
-    //   `caught: git push --force --set-upstream origin ${branch} failed`,
-    // )
-    // debugDir('inspect', { error: e })
   }
   try {
     // Will throw with exit code 1 if branch does not exist.
@@ -3183,7 +3171,7 @@ async function gitRepoInfo(cwd = process.cwd()) {
 async function gitEnsureIdentity(name, email, cwd = process.cwd()) {
   const stdioIgnoreOptions = {
     cwd,
-    stdio: 'ignore'
+    stdio: debug.isDebug('stdio') ? 'inherit' : 'ignore'
   };
   const stdioPipeOptions = {
     cwd
@@ -3228,7 +3216,7 @@ async function gitResetAndClean(branch = 'HEAD', cwd = process.cwd()) {
 async function gitResetHard(branch = 'HEAD', cwd = process.cwd()) {
   const stdioIgnoreOptions = {
     cwd,
-    stdio: 'ignore'
+    stdio: debug.isDebug('stdio') ? 'inherit' : 'ignore'
   };
   await spawn.spawn('git', ['reset', '--hard', branch], stdioIgnoreOptions);
 }
@@ -3238,13 +3226,10 @@ async function gitUnstagedModifiedFiles(cwd = process.cwd()) {
       cwd
     };
     const changedFilesDetails = (await spawn.spawn('git', ['diff', '--name-only'], stdioPipeOptions)).stdout;
-    const rawRelPaths = changedFilesDetails.split('\n') ?? [];
-    console.log({
-      rawRelPaths
-    });
+    const relPaths = changedFilesDetails.split('\n') ?? [];
     return {
       ok: true,
-      data: rawRelPaths.map(p => path$1.normalizePath(p))
+      data: relPaths.map(p => path$1.normalizePath(p))
     };
   } catch (e) {
     debug.debugFn('error', 'caught: git diff --name-only failed');
@@ -3644,7 +3629,7 @@ async function openPr(owner, repo, branch, purl, newVersion, options) {
 async function setGitRemoteGithubRepoUrl(owner, repo, token, cwd = process.cwd()) {
   const stdioIgnoreOptions = {
     cwd,
-    stdio: 'ignore'
+    stdio: debug.isDebug('stdio') ? 'inherit' : 'ignore'
   };
   const {
     host
@@ -3936,10 +3921,7 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
           cwd,
           spinner
         });
-        const maybeLockSrc = maybeActualTree ?
-        // eslint-disable-next-line no-await-in-loop
-        await utils.readLockfile(pkgEnvDetails.lockPath) : null;
-        if (maybeActualTree && maybeLockSrc) {
+        if (maybeActualTree && fs$1.existsSync(pkgEnvDetails.lockPath)) {
           actualTree = maybeActualTree;
         }
       }
@@ -4035,13 +4017,13 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
           shadowNpmInject.updatePackageJsonFromNode(editablePkgJson, actualTree, node, newVersion, rangeStyle);
 
           // eslint-disable-next-line no-await-in-loop
-          const res = await editablePkgJson.save({
+          await editablePkgJson.save({
             ignoreWhitespace: true
           });
 
           // eslint-disable-next-line no-await-in-loop
           const unstagedCResult = await gitUnstagedModifiedFiles(cwd);
-          const moddedFilepaths = res && unstagedCResult.ok ? unstagedCResult.data.filter(filepath => {
+          const moddedFilepaths = unstagedCResult.ok ? unstagedCResult.data.filter(filepath => {
             const basename = path.basename(filepath);
             return basename === 'package.json' || basename === pkgEnvDetails.lockName;
           }) : [];
@@ -4054,6 +4036,11 @@ 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;
@@ -4069,19 +4056,10 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
               cwd,
               spinner
             });
-            // eslint-disable-next-line no-await-in-loop
-            const unstagedCResult = await gitUnstagedModifiedFiles(cwd);
-            console.log('after installer', unstagedCResult);
-            const maybeLockSrc = maybeActualTree ?
-            // eslint-disable-next-line no-await-in-loop
-            await utils.readLockfile(pkgEnvDetails.lockPath) : null;
-            if (maybeActualTree && maybeLockSrc) {
+            if (maybeActualTree && fs$1.existsSync(pkgEnvDetails.lockPath)) {
               actualTree = maybeActualTree;
               // eslint-disable-next-line no-await-in-loop
               await afterInstall(editablePkgJson, packument, oldVersion, newVersion, vulnerableVersionRange, fixConfig);
-              // eslint-disable-next-line no-await-in-loop
-              const unstagedCResult = await gitUnstagedModifiedFiles(cwd);
-              console.log('after afterInstall', unstagedCResult);
               if (test) {
                 spinner?.info(`Testing ${newId} in ${workspace}.`);
                 // eslint-disable-next-line no-await-in-loop
@@ -4103,12 +4081,11 @@ 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
-            const unstagedCResult = await gitUnstagedModifiedFiles(cwd);
-            const moddedFilepaths = unstagedCResult.ok ? unstagedCResult.data.filter(filepath => {
-              const basename = path.basename(filepath);
-              return basename === 'package.json' || basename === pkgEnvDetails.lockName;
-            }) : [];
+            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
@@ -4125,10 +4102,7 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
                   cwd,
                   spinner
                 });
-                const maybeLockSrc = maybeActualTree ?
-                // eslint-disable-next-line no-await-in-loop
-                await utils.readLockfile(pkgEnvDetails.lockPath) : null;
-                if (maybeActualTree && maybeLockSrc) {
+                if (maybeActualTree && fs$1.existsSync(pkgEnvDetails.lockPath)) {
                   actualTree = maybeActualTree;
                   continue infosLoop;
                 }
@@ -4293,17 +4267,16 @@ async function npmFix(pkgEnvDetails, fixConfig) {
     spinner
   } = fixConfig;
   spinner?.start();
-  let arb;
+  const flatConfig = await utils.getNpmConfig({
+    npmVersion: pkgEnvDetails.agentVersion
+  });
   let actualTree;
   let alertsMap;
   try {
     if (purls.length) {
       alertsMap = await utils.getAlertsMapFromPurls(purls, getFixAlertsMapOptions());
     } else {
-      const flatConfig = await utils.getNpmConfig({
-        npmVersion: pkgEnvDetails.agentVersion
-      });
-      arb = new shadowNpmInject.Arborist({
+      const arb = new shadowNpmInject.Arborist({
         path: pkgEnvDetails.pkgPath,
         ...flatConfig
       });
@@ -4344,6 +4317,10 @@ 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) {
@@ -14289,5 +14266,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=eee3dc45-f185-4d70-b82d-838c0ee9c156
+//# debugId=de722ff7-23df-4530-81e3-f05cc7c7a02e
 //# sourceMappingURL=cli.js.map