socket 1.0.57 → 1.0.59

package/dist/cli.js

@@ -1205,7 +1205,7 @@ function createLeaf(art, alert, policyAction) {
     type: alert.type,
     policy: policyAction,
     url: utils.getSocketDevPackageOverviewUrlFromPurl(art),
-    manifest: art.manifestFiles?.map(obj => obj.file) ?? []
+    manifest: art.manifestFiles?.map(o => o.file) ?? []
   };
   return leaf;
 }
@@ -3457,22 +3457,26 @@ async function openPr(owner, repo, branch, purl, newVersion, options) {
   return null;
 }
 async function setGitRemoteGithubRepoUrl(owner, repo, token, cwd = process.cwd()) {
-  const stdioIgnoreOptions = {
-    cwd,
-    stdio: debug.isDebug('stdio') ? 'inherit' : 'ignore'
-  };
   const {
     host
   } = new URL(constants.ENV.GITHUB_SERVER_URL);
   const url = `https://x-access-token:${token}@${host}/${owner}/${repo}`;
+  const stdioIgnoreOptions = {
+    cwd,
+    stdio: debug.isDebug('stdio') ? 'inherit' : 'ignore'
+  };
+  const quotedCmd = `\`git remote set-url origin ${url}\``;
+  debug.debugFn('stdio', `spawn: ${quotedCmd}`);
   try {
     await spawn.spawn('git', ['remote', 'set-url', 'origin', url], stdioIgnoreOptions);
+    return true;
   } catch (e) {
-    debug.debugFn('error', 'caught: unexpected error');
+    debug.debugFn('error', `caught: ${quotedCmd} failed`);
     debug.debugDir('inspect', {
       error: e
     });
   }
+  return false;
 }
 
 function ciRepoInfo() {
@@ -3712,6 +3716,7 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
   };
   const handleInstallFail = () => {
     cleanupInfoEntriesLoop();
+    spinner?.stop();
     return {
       ok: false,
       message: 'Install failed',
@@ -4105,22 +4110,47 @@ function getFixAlertsMapOptions(options = {}) {
 
 async function install$1(pkgEnvDetails, options) {
   const {
-    args,
+    args: extraArgs,
     cwd,
     spinner
   } = {
     __proto__: null,
     ...options
   };
+  const args = ['--ignore-scripts', '--no-audit', '--no-fund', '--no-progress', '--no-save', '--silent', ...(extraArgs ?? [])];
+  const quotedCmd = `\`${pkgEnvDetails.agent} install ${args.join(' ')}\``;
+  debug.debugFn('stdio', `spawn: ${quotedCmd}`);
+  const isSpinning = spinner?.isSpinning;
+  spinner?.stop();
+  let errored = false;
   try {
     await utils.runAgentInstall(pkgEnvDetails, {
-      args: ['--ignore-scripts', '--no-audit', '--no-fund', '--no-progress', '--no-save', '--silent', ...(args ?? [])],
+      args,
       spinner,
       stdio: debug.isDebug('stdio') ? 'inherit' : 'ignore'
     });
-    return await getActualTree(cwd);
-  } catch {}
-  return null;
+  } catch (e) {
+    debug.debugFn('error', `caught: ${quotedCmd} failed`);
+    debug.debugDir('inspect', {
+      error: e
+    });
+    errored = true;
+  }
+  let actualTree = null;
+  if (!errored) {
+    try {
+      actualTree = await getActualTree(cwd);
+    } catch (e) {
+      debug.debugFn('error', 'caught: Arborist error');
+      debug.debugDir('inspect', {
+        error: e
+      });
+    }
+  }
+  if (isSpinning) {
+    spinner.start();
+  }
+  return actualTree;
 }
 async function npmFix(pkgEnvDetails, fixConfig) {
   const {
@@ -4226,28 +4256,53 @@ const {
 } = constants;
 async function install(pkgEnvDetails, options) {
   const {
-    args,
+    args: extraArgs,
     cwd,
     spinner
   } = {
     __proto__: null,
     ...options
   };
+  const args = [
+  // Enable pnpm updates to pnpm-lock.yaml in CI environments.
+  // https://pnpm.io/cli/install#--frozen-lockfile
+  '--no-frozen-lockfile',
+  // Enable a non-interactive pnpm install
+  // https://github.com/pnpm/pnpm/issues/6778
+  '--config.confirmModulesPurge=false', ...(extraArgs ?? [])];
+  const quotedCmd = `\`${pkgEnvDetails.agent} install ${args.join(' ')}\``;
+  debug.debugFn('stdio', `spawn: ${quotedCmd}`);
+  const isSpinning = spinner?.isSpinning;
+  spinner?.stop();
+  let errored = false;
   try {
     await utils.runAgentInstall(pkgEnvDetails, {
-      args: [
-      // Enable pnpm updates to pnpm-lock.yaml in CI environments.
-      // https://pnpm.io/cli/install#--frozen-lockfile
-      '--no-frozen-lockfile',
-      // Enable a non-interactive pnpm install
-      // https://github.com/pnpm/pnpm/issues/6778
-      '--config.confirmModulesPurge=false', ...(args ?? [])],
+      args,
       spinner,
       stdio: debug.isDebug('stdio') ? 'inherit' : 'ignore'
     });
-    return await getActualTree(cwd);
-  } catch {}
-  return null;
+  } catch (e) {
+    debug.debugFn('error', `caught: ${quotedCmd} failed`);
+    debug.debugDir('inspect', {
+      error: e
+    });
+    errored = true;
+  }
+  let actualTree = null;
+  if (!errored) {
+    try {
+      actualTree = await getActualTree(cwd);
+    } catch (e) {
+      debug.debugFn('error', 'caught: Arborist error');
+      debug.debugDir('inspect', {
+        error: e
+      });
+    }
+  }
+  if (isSpinning) {
+    spinner.start();
+  }
+  return actualTree;
 }
 async function pnpmFix(pkgEnvDetails, fixConfig) {
   const {
@@ -6295,8 +6350,8 @@ async function setupManifestConfig(cwd, defaultOnReadError = false) {
   logger.logger.log('      CLI commands. You can still override them by explicitly');
   logger.logger.log('      setting the flag. It is meant to be a convenience tool.');
   logger.logger.log('');
-  logger.logger.log('This command will generate a `socket.json` file in the target cwd.');
-  logger.logger.log('You can choose to add this file to your repo (handy for collab)');
+  logger.logger.log('This command will generate a socket.json file in the target cwd.');
+  logger.logger.log('You can choose to add this file to your repo (handy for collaboration)');
   logger.logger.log('or to add it to the ignored files, or neither. This file is only');
   logger.logger.log('used in CLI workflows.');
   logger.logger.log('');
@@ -7484,7 +7539,7 @@ async function updateLockfile(pkgEnvDetails, options) {
     __proto__: null,
     ...options
   };
-  const isSpinning = !!spinner?.['isSpinning'];
+  const isSpinning = !!spinner?.isSpinning;
   if (!isSpinning) {
     spinner?.start();
   }
@@ -10245,9 +10300,7 @@ async function suggestTarget() {
       description: 'Do not use the current directory (this will end in a no-op)'
     }]
   });
-  if (proceed) {
-    return ['.'];
-  }
+  return proceed ? ['.'] : [];
 }
 
 const {
@@ -10475,8 +10528,7 @@ async function run$c(argv, importMeta, {
   // the command without requiring user input, as a suggestion.
   let updatedInput = false;
   if (!targets.length && !dryRun && interactive) {
-    const received = await suggestTarget();
-    targets = received ?? [];
+    targets = await suggestTarget();
     updatedInput = true;
   }
 
@@ -14158,5 +14210,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=4fadc2fa-389d-44dd-820e-1cd78bae1dd6
+//# debugId=b9685bcd-e040-4012-90f5-54b3bfba5ba0
 //# sourceMappingURL=cli.js.map