socket 1.1.9 → 1.1.11

package/dist/cli.js

@@ -7,7 +7,7 @@ var require$$9 = require('../external/@socketsecurity/registry/lib/debug');
 var logger = require('../external/@socketsecurity/registry/lib/logger');
 var utils = require('./utils.js');
 var fs = require('node:fs/promises');
-var Module = require('node:module');
+var require$$5 = require('node:module');
 var constants = require('./constants.js');
 var flags = require('./flags.js');
 var path = require('node:path');
@@ -68,7 +68,7 @@ async function fetchRepoAnalyticsData(repo, time, options) {
 
 // Note: Widgets does not seem to actually work as code :'(
 
-const require$5 = Module.createRequire(require('node:url').pathToFileURL(__filename).href);
+const require$5 = require$$5.createRequire((typeof document === 'undefined' ? require$$0.pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.js', document.baseURI).href)));
 const METRICS = ['total_critical_alerts', 'total_high_alerts', 'total_medium_alerts', 'total_low_alerts', 'total_critical_added', 'total_medium_added', 'total_low_added', 'total_high_added', 'total_critical_prevented', 'total_high_prevented', 'total_medium_prevented', 'total_low_prevented'];
 
 // Note: This maps `new Date(date).getMonth()` to English three letters
@@ -500,7 +500,7 @@ async function fetchAuditLog(config, options) {
   });
 }
 
-const require$4 = Module.createRequire(require('node:url').pathToFileURL(__filename).href);
+const require$4 = require$$5.createRequire((typeof document === 'undefined' ? require$$0.pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.js', document.baseURI).href)));
 async function outputAuditLog(result, {
   logType,
   orgSlug,
@@ -3263,7 +3263,7 @@ async function openSocketFixPr(owner, repo, branch, ghsaIds, options) {
     }
     require$$9.debugFn('error', message);
   }
-  return null;
+  return undefined;
 }
 async function getSocketFixPrs(owner, repo, options) {
   return (await getSocketFixPrsWithContext(owner, repo, options)).map(d => d.match);
@@ -3388,7 +3388,7 @@ function ciRepoInfo() {
   const ownerSlashRepo = GITHUB_REPOSITORY;
   const slashIndex = ownerSlashRepo.indexOf('/');
   if (slashIndex === -1) {
-    return null;
+    return undefined;
   }
   return {
     owner: ownerSlashRepo.slice(0, slashIndex),
@@ -3411,7 +3411,7 @@ async function getFixEnv() {
     const envVars = [...(constants.default.ENV.CI ? [] : ['process.env.CI']), ...(gitEmail ? [] : ['process.env.SOCKET_CLI_GIT_USER_EMAIL']), ...(gitUser ? [] : ['process.env.SOCKET_CLI_GIT_USER_NAME']), ...(githubToken ? [] : ['process.env.GITHUB_TOKEN'])];
     require$$9.debugFn('notice', `miss: fixEnv.isCi is false, expected ${arrays.joinAnd(envVars)} to be set`);
   }
-  let repoInfo = null;
+  let repoInfo;
   if (isCi) {
     repoInfo = ciRepoInfo();
   }
@@ -4055,7 +4055,7 @@ async function setupTabCompletion(targetName) {
   };
 }
 function getTabCompletionScriptRaw() {
-  const sourceDir = path.dirname(require$$0.fileURLToPath(require('node:url').pathToFileURL(__filename).href));
+  const sourceDir = path.dirname(require$$0.fileURLToPath((typeof document === 'undefined' ? require$$0.pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.js', document.baseURI).href))));
   const sourcePath = path.join(sourceDir, 'socket-completion.bash');
   if (!fs$1.existsSync(sourcePath)) {
     return {
@@ -4533,7 +4533,6 @@ function argvToArray(argvObj) {
   return result;
 }
 async function runCdxgen(argvObj) {
-  let cleanupPackageLock = false;
   const argvMutable = {
     __proto__: null,
     ...argvObj
@@ -4546,6 +4545,7 @@ async function runCdxgen(argvObj) {
     },
     stdio: 'inherit'
   };
+  let cleanupPackageLock = false;
   if (argvMutable['type'] !== YARN && nodejsPlatformTypes.has(argvMutable['type']) && fs$1.existsSync(`./${YARN_LOCK}`)) {
     if (fs$1.existsSync(`./${PACKAGE_LOCK_JSON}`)) {
       argvMutable['type'] = constants.NPM;
@@ -4787,9 +4787,13 @@ const cmdManifestCdxgen = {
   hidden: config$e.hidden,
   run: run$D
 };
-async function run$D(argv, importMeta, {
-  parentName
-}) {
+async function run$D(argv, importMeta, context) {
+  const {
+    parentName
+  } = {
+    __proto__: null,
+    ...context
+  };
   const cli = utils.meowOrExit({
     // Don't let meow take over --help.
     argv: argv.filter(a => !utils.isHelpFlag(a)),
@@ -4797,11 +4801,17 @@ async function run$D(argv, importMeta, {
     importMeta,
     parentName
   });
-  const dryRun = !!cli.flags['dryRun'];
+  const {
+    dryRun
+  } = cli.flags;
 
-  // TODO: Convert yargs to meow.
+  // Filter Socket flags from argv but keep --no-banner and --help for cdxgen
+  const argsToProcess = utils.filterFlags(argv, {
+    ...flags.commonFlags,
+    ...flags.outputFlags
+  }, ['--no-banner', '--help', '-h']);
   const yargv = {
-    ...vendor.yargsParser(argv, yargsConfig)
+    ...vendor.yargsParser(argsToProcess, yargsConfig)
   };
   const pathArgs = [];
   const unknowns = [];
@@ -6107,7 +6117,7 @@ async function run$w(argv, importMeta, {
   });
 }
 
-const require$3 = Module.createRequire(require('node:url').pathToFileURL(__filename).href);
+const require$3 = require$$5.createRequire((typeof document === 'undefined' ? require$$0.pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.js', document.baseURI).href)));
 const CMD_NAME$p = constants.NPM;
 const description$u = 'Run npm with the Socket wrapper';
 const hidden$o = false;
@@ -6116,9 +6126,13 @@ const cmdNpm = {
   hidden: hidden$o,
   run: run$v
 };
-async function run$v(argv, importMeta, {
-  parentName
-}) {
+async function run$v(argv, importMeta, context) {
+  const {
+    parentName
+  } = {
+    __proto__: null,
+    ...context
+  };
   const config = {
     commandName: CMD_NAME$p,
     description: description$u,
@@ -6156,9 +6170,15 @@ async function run$v(argv, importMeta, {
   }
   const shadowBin = /*@__PURE__*/require$3(constants.default.shadowNpmBinPath);
   process.exitCode = 1;
+
+  // Filter Socket flags from argv but keep --json for npm
+  const argsToForward = utils.filterFlags(argv, {
+    ...flags.commonFlags,
+    ...flags.outputFlags
+  }, ['--json']);
   const {
     spawnPromise
-  } = await shadowBin(constants.NPM, argv, {
+  } = await shadowBin(constants.NPM, argsToForward, {
     stdio: 'inherit'
   });
 
@@ -6174,7 +6194,7 @@ async function run$v(argv, importMeta, {
   await spawnPromise;
 }
 
-const require$2 = Module.createRequire(require('node:url').pathToFileURL(__filename).href);
+const require$2 = require$$5.createRequire((typeof document === 'undefined' ? require$$0.pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.js', document.baseURI).href)));
 const CMD_NAME$o = constants.NPX;
 const description$t = 'Run npx with the Socket wrapper';
 const hidden$n = false;
@@ -9837,25 +9857,26 @@ async function run$f(argv, importMeta, {
       },
       org: {
         type: 'string',
+        default: '',
         description: 'Force override the organization slug, overrides the default org from config'
       },
       perPage: {
         type: 'number',
-        shortFlag: 'pp',
         default: 30,
-        description: 'Number of results per page'
+        description: 'Number of results per page',
+        shortFlag: 'pp'
       },
       page: {
         type: 'number',
-        shortFlag: 'p',
         default: 1,
-        description: 'Page number'
+        description: 'Page number',
+        shortFlag: 'p'
       },
       sort: {
         type: 'string',
-        shortFlag: 's',
         default: 'created_at',
-        description: 'Sorting option'
+        description: 'Sorting option',
+        shortFlag: 's'
       }
     },
     help: (command, config) => `
@@ -9882,16 +9903,19 @@ async function run$f(argv, importMeta, {
   const {
     all,
     direction = 'desc',
+    dryRun,
+    interactive,
     json,
     markdown,
-    org: orgFlag
+    org: orgFlag,
+    page,
+    perPage,
+    sort
   } = cli.flags;
-  const dryRun = !!cli.flags['dryRun'];
-  const interactive = !!cli.flags['interactive'];
   const hasApiToken = utils.hasDefaultApiToken();
   const {
     0: orgSlug
-  } = await utils.determineOrgSlug(String(orgFlag || ''), interactive, dryRun);
+  } = await utils.determineOrgSlug(orgFlag, interactive, dryRun);
   const outputKind = utils.getOutputKind(json, markdown);
   const wasValidInput = utils.checkCommandInput(outputKind, {
     nook: true,
@@ -9922,13 +9946,13 @@ async function run$f(argv, importMeta, {
     return;
   }
   await handleListRepos({
-    all: Boolean(all),
-    direction: direction === 'asc' ? 'asc' : 'desc',
+    all,
+    direction,
     orgSlug,
     outputKind,
-    page: Number(cli.flags['page']) || 1,
-    perPage: Number(cli.flags['perPage']) || 30,
-    sort: String(cli.flags['sort'] || 'created_at')
+    page,
+    perPage,
+    sort
   });
 }
 
@@ -11128,12 +11152,12 @@ async function run$a(argv, importMeta, {
   const SOCKET_SBOM_URL_PREFIX_LENGTH = SOCKET_SBOM_URL_PREFIX.length;
   const {
     depth,
+    dryRun,
     file,
     json,
     markdown,
     org: orgFlag
   } = cli.flags;
-  const dryRun = !!cli.flags['dryRun'];
   const interactive = !!cli.flags['interactive'];
   let [id1 = '', id2 = ''] = cli.input;
   // Support dropping in full socket urls to an sbom.
@@ -11176,12 +11200,12 @@ async function run$a(argv, importMeta, {
     return;
   }
   await handleDiffScan({
-    id1: String(id1 || ''),
-    id2: String(id2 || ''),
-    depth: Number(depth),
+    id1,
+    id2,
+    depth,
     orgSlug,
     outputKind,
-    file: String(file || '')
+    file
   });
 }
 
@@ -13210,7 +13234,7 @@ async function fetchScan(orgSlug, scanId) {
         error: e,
         line
       });
-      return null;
+      return undefined;
     }
   });
   if (ok) {
@@ -13485,7 +13509,7 @@ async function fetchThreatFeed({
   return await utils.queryApiSafeJson(`orgs/${orgSlug}/threat-feed?${queryParams}`, 'the Threat Feed data');
 }
 
-const require$1 = Module.createRequire(require('node:url').pathToFileURL(__filename).href);
+const require$1 = require$$5.createRequire((typeof document === 'undefined' ? require$$0.pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.js', document.baseURI).href)));
 async function outputThreatFeed(result, outputKind) {
   if (!result.ok) {
     process.exitCode = result.code ?? 1;
@@ -14362,7 +14386,7 @@ const rootAliases = {
   }
 };
 
-const __filename$1 = require$$0.fileURLToPath(require('node:url').pathToFileURL(__filename).href);
+const __filename$1 = require$$0.fileURLToPath((typeof document === 'undefined' ? require$$0.pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.js', document.baseURI).href)));
 void (async () => {
   const registryUrl = vendor.registryUrl();
   await vendor.updater({
@@ -14440,5 +14464,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=712a8ff2-24bd-4ae4-981f-0c05a45a4d0f
+//# debugId=d42a0267-36a6-4b2d-a161-8a78c8038a13
 //# sourceMappingURL=cli.js.map