@socketsecurity/cli-with-sentry 1.0.7 → 1.0.8

package/dist/utils.js

@@ -736,30 +736,23 @@ async function queryApiSafeText(path, fetchSpinnerDesc) {
       cause: 'User must be authenticated to run this command. To log in, run the command `socket login` and enter your API key.'
     };
   }
+
+  // Lazily access constants.spinner.
+  const {
+    spinner
+  } = constants;
   if (fetchSpinnerDesc) {
-    // Lazily access constants.spinner.
-    const {
-      spinner
-    } = constants;
     spinner.start(`Requesting ${fetchSpinnerDesc} from API...`);
   }
   let result;
   try {
     result = await queryApi(path, apiToken);
     if (fetchSpinnerDesc) {
-      // Lazily access constants.spinner.
-      const {
-        spinner
-      } = constants;
       spinner.successAndStop(`Received API response (after requesting ${fetchSpinnerDesc}).`);
     }
   } catch (e) {
     if (fetchSpinnerDesc) {
-      // Lazily access constants.spinner.
-      const {
-        spinner
-      } = constants;
-      spinner.failAndStop(`An error was thrown while requesting ${fetchSpinnerDesc}`);
+      spinner.failAndStop(`An error was thrown while requesting ${fetchSpinnerDesc}.`);
     }
     const cause = e?.message;
     debug.debugFn('catch: queryApi() error\n', e);
@@ -1250,8 +1243,8 @@ async function meowWithSubcommands(subcommands, options) {
     });
     if (commands.size) {
       logger.logger.fail('Found commands in the list that were not marked as public or not defined at all:',
-      // Node < 22 will print 'Object (n)' before the array. So to have
-      // consistent test snapshots we use joinAnd.
+      // Node < 22 will print 'Object (n)' before the array. So to have consistent
+      // test snapshots we use joinAnd.
       arrays.joinAnd(Array.from(commands).sort(sorts.naturalCompare).map(c => `'${c}'`)));
     }
     const out = [];
@@ -1318,11 +1311,11 @@ ${isRootCommand ? `      $ ${name} scan create --json` : ''}${isRootCommand ? `\
     flags,
     // Do not strictly check for flags here.
     allowUnknownFlags: true,
-    booleanDefault: undefined,
-    // We want to detect whether a bool flag is given at all.
-    // We will emit help when we're ready
+    // We will emit help when we're ready.
     // Plus, if we allow this then meow() can just exit here.
-    autoHelp: false
+    autoHelp: false,
+    // We want to detect whether a bool flag is given at all.
+    booleanDefault: undefined
   });
 
   // ...else we provide basic instructions and help.
@@ -1345,8 +1338,8 @@ ${isRootCommand ? `      $ ${name} scan create --json` : ''}${isRootCommand ? `\
  * Note: meow will exit immediately if it calls its .showHelp()
  */
 function meowOrExit({
-  // allowUnknownFlags, // commands that pass-through args need to allow this
   argv,
+  collectUnknownFlags = true,
   config,
   importMeta,
   parentName
@@ -1356,15 +1349,15 @@ function meowOrExit({
   // This exits if .printHelp() is called either by meow itself or by us.
   const cli = vendor.meow({
     argv,
-    description: config.description,
-    help: config.help(command, config),
-    importMeta,
-    flags: config.flags,
-    allowUnknownFlags: true,
-    // meow will exit(1) before printing the banner
+    autoHelp: false,
+    // meow will exit(0) before printing the banner.
     booleanDefault: undefined,
     // We want to detect whether a bool flag is given at all.
-    autoHelp: false // meow will exit(0) before printing the banner
+    collectUnknownFlags,
+    description: config.description,
+    flags: config.flags,
+    help: config.help(command, config),
+    importMeta
   });
   if (!cli.flags['nobanner']) {
     emitBanner(command, String(cli.flags['org'] || '') || undefined);
@@ -1373,18 +1366,18 @@ function meowOrExit({
   }
 
   // As per https://github.com/sindresorhus/meow/issues/178
-  // Setting allowUnknownFlags:true makes it reject camel cased flags...
+  // Setting `allowUnknownFlags: false` makes it reject camel cased flags.
   // if (!allowUnknownFlags) {
   //   // Run meow specifically with the flag setting. It will exit(2) if an
   //   // invalid flag is set and print a message.
   //   meow({
   //     argv,
+  //     allowUnknownFlags: false,
+  //     autoHelp: false,
   //     description: config.description,
+  //     flags: config.flags,
   //     help: config.help(command, config),
   //     importMeta,
-  //     flags: config.flags,
-  //     allowUnknownFlags: false,
-  //     autoHelp: false,
   //   })
   // }
 
@@ -1402,7 +1395,7 @@ function meowOrExit({
     importMeta,
     flags: config.flags,
     // As per https://github.com/sindresorhus/meow/issues/178
-    // Setting allowUnknownFlags:true makes it reject camel cased flags...
+    // Setting `allowUnknownFlags: false` makes it reject camel cased flags.
     // allowUnknownFlags: Boolean(allowUnknownFlags),
     autoHelp: false
   });
@@ -1650,7 +1643,7 @@ function findBinPathDetailsSync(binName) {
     if (path.dirname(binPath) === shadowBinPath) {
       shadowIndex = i;
     } else {
-      theBinPath = npm.resolveBinPath(binPath);
+      theBinPath = npm.resolveBinPathSync(binPath);
       break;
     }
   }
@@ -2618,18 +2611,14 @@ async function getAlertsMapFromPurls(purls, options_) {
       const statusMessage = batchResult.error ?? 'No status message';
       throw new Error(`Socket API server error (${statusCode}): ${statusMessage}`);
     } else {
-      const {
-        spinner
-      } = constants;
-      spinner.stop();
+      spinner?.stop();
       debug.debugFn('Received a result=false:', batchResult);
       logger.logger.fail(`Received a ${batchResult.status} response from Socket API which we consider a permanent failure:`, batchResult.error, batchResult.cause ? `( ${batchResult.cause} )` : '');
       break;
     }
     remaining -= 1;
-    if (spinner && remaining > 0) {
-      spinner.start();
-      spinner.setText(getText());
+    if (remaining > 0) {
+      spinner?.start(getText());
     }
   }
   spinner?.stop();
@@ -2716,10 +2705,10 @@ function safeNpmInstall(options) {
   const useDebug = debug.isDebug();
   const terminatorPos = args.indexOf('--');
   const rawBinArgs = terminatorPos === -1 ? args : args.slice(0, terminatorPos);
-  const progressArg = rawBinArgs.findLast(npm.isProgressFlag) !== '--no-progress';
-  const binArgs = rawBinArgs.filter(a => !npm.isAuditFlag(a) && !npm.isFundFlag(a) && !npm.isProgressFlag(a));
+  const progressArg = rawBinArgs.findLast(npm.isNpmProgressFlag) !== '--no-progress';
+  const binArgs = rawBinArgs.filter(a => !npm.isNpmAuditFlag(a) && !npm.isNpmFundFlag(a) && !npm.isNpmProgressFlag(a));
   const otherArgs = terminatorPos === -1 ? [] : args.slice(terminatorPos);
-  const isSilent = !useDebug && !binArgs.some(npm.isLoglevelFlag);
+  const isSilent = !useDebug && !binArgs.some(npm.isNpmLoglevelFlag);
   const logLevelArgs = isSilent ? ['--loglevel', 'silent'] : [];
   const spawnPromise = spawn.spawn(
   // Lazily access constants.execPath.
@@ -2733,7 +2722,7 @@ function safeNpmInstall(options) {
   // Lazily access constants.instrumentWithSentryPath.
   constants.instrumentWithSentryPath] : []), '--require',
   // Lazily access constants.shadowNpmInjectPath.
-  constants.shadowNpmInjectPath, npm.realExecPathSync(agentExecPath), 'install',
+  constants.shadowNpmInjectPath, npm.resolveBinPathSync(agentExecPath), 'install',
   // Avoid code paths for 'audit' and 'fund'.
   '--no-audit', '--no-fund',
   // Add '--no-progress' to fix input being swallowed by the npm spinner.
@@ -3307,5 +3296,5 @@ exports.tildify = tildify;
 exports.updateConfigValue = updateConfigValue;
 exports.walkNestedMap = walkNestedMap;
 exports.writeSocketJson = writeSocketJson;
-//# debugId=c449034f-0662-4913-b76c-200b29ef02a1
+//# debugId=8665890c-d81b-4306-b3df-f3ed91367593
 //# sourceMappingURL=utils.js.map