@socketsecurity/cli-with-sentry 0.14.52 → 0.14.55

package/dist/module-sync/reify.d.ts

@@ -992,22 +992,22 @@ type SocketPackageAlert = {
     raw: any;
 };
 declare function findPackageNodes(tree: SafeNode, packageName: string): SafeNode[];
-declare function updateNode(node: SafeNode, packument: Packument, vulnerableVersionRange?: string, firstPatchedVersionIdentifier?: string): boolean;
+declare function updateNode(node: SafeNode, packument: Packument, vulnerableVersionRange?: string, firstPatchedVersionIdentifier?: string | undefined): boolean;
 type GetPackageAlertsOptions = {
-    output?: Writable;
-    consolidate?: boolean;
-    includeExisting?: boolean;
-    includeUnfixable?: boolean;
+    output?: Writable | undefined;
+    consolidate?: boolean | undefined;
+    includeExisting?: boolean | undefined;
+    includeUnfixable?: boolean | undefined;
 };
-declare function getPackagesAlerts(arb: SafeArborist, options?: GetPackageAlertsOptions): Promise<SocketPackageAlert[]>;
-type CveInfoByPackage = Map<string, {
+declare function getPackagesAlerts(arb: SafeArborist, options?: GetPackageAlertsOptions | undefined): Promise<SocketPackageAlert[]>;
+type CveInfoByPackage = Map<string, Array<{
     firstPatchedVersionIdentifier: string;
     vulnerableVersionRange: string;
-}[]>;
+}>>;
 type GetCveInfoByPackageOptions = {
-    excludeUpgrades?: boolean;
+    excludeUpgrades?: boolean | undefined;
 };
-declare function getCveInfoByPackage(alerts: SocketPackageAlert[], options?: GetCveInfoByPackageOptions): CveInfoByPackage | null;
+declare function getCveInfoByPackage(alerts: SocketPackageAlert[], options?: GetCveInfoByPackageOptions | undefined): CveInfoByPackage | null;
 declare function updateAdvisoryNodes(arb: SafeArborist, alerts: SocketPackageAlert[]): Promise<void>;
 declare function updateSocketRegistryNodes(arb: SafeArborist): Promise<void>;
 declare const kRiskyReify: unique symbol;

package/dist/module-sync/settings.d.ts

@@ -3,7 +3,7 @@ interface Settings {
     apiBaseUrl?: string | null | undefined;
     apiKey?: string | null | undefined;
     apiProxy?: string | null | undefined;
-    enforcedOrgs?: string[] | null | undefined;
+    enforcedOrgs?: string[] | readonly string[] | null | undefined;
     apiToken?: string | null | undefined;
 }
 declare function findSocketYmlSync(): {

package/dist/module-sync/shadow-bin.js

@@ -10,12 +10,12 @@ function _socketInterop(e) {
 }
 
 var process = require('node:process');
-var spawn = _socketInterop(require('@npmcli/promise-spawn'));
+var npm = require('@socketsecurity/registry/lib/npm');
+var spawn = require('@socketsecurity/registry/lib/spawn');
 var path = require('node:path');
 var cmdShim = _socketInterop(require('cmd-shim'));
 var npmPaths = require('./npm-paths.js');
 var constants = require('./constants.js');
-var npm = require('./npm.js');
 
 const {
   CLI,
@@ -47,17 +47,24 @@ async function installLinks(realBinPath, binName) {
 }
 
 const {
+  NPM,
+  SOCKET_CLI_LEGACY_PACKAGE_NAME,
+  SOCKET_CLI_PACKAGE_NAME,
   SOCKET_CLI_SAFE_WRAPPER,
   SOCKET_CLI_SENTRY_BUILD,
-  SOCKET_IPC_HANDSHAKE,
-  abortSignal
+  SOCKET_CLI_SENTRY_PACKAGE_NAME,
+  SOCKET_IPC_HANDSHAKE
 } = constants;
 async function shadowBin(binName, args = process.argv.slice(2)) {
   process.exitCode = 1;
   const terminatorPos = args.indexOf('--');
-  const binArgs = (terminatorPos === -1 ? args : args.slice(0, terminatorPos)).filter(a => !npm.isProgressFlag(a));
+  const skipSocketCliUpgrade = binName === NPM && args.length === 3 && args[0] === 'install' && args[1] === '-g' && (args[2] === SOCKET_CLI_PACKAGE_NAME || args[2] === SOCKET_CLI_LEGACY_PACKAGE_NAME || args[2] === SOCKET_CLI_SENTRY_PACKAGE_NAME);
+  let binArgs = terminatorPos === -1 ? args : args.slice(0, terminatorPos);
+  if (!skipSocketCliUpgrade) {
+    binArgs = binArgs.filter(a => !npm.isProgressFlag(a));
+  }
   const otherArgs = terminatorPos === -1 ? [] : args.slice(terminatorPos);
-  const spawnPromise = spawn(
+  const spawnPromise = spawn.spawn(
   // Lazily access constants.execPath.
   constants.execPath, [
   // Lazily access constants.nodeNoWarningsFlags.
@@ -72,18 +79,14 @@ async function shadowBin(binName, args = process.argv.slice(2)) {
   await installLinks(constants.shadowBinPath, binName),
   // Add `--no-progress` and `--quiet` flags to fix input being swallowed by
   // the spinner when running the command with recent versions of npm.
-  '--no-progress',
+  ...(skipSocketCliUpgrade ? [] : ['--no-progress']),
   // Add the '--quiet' flag if a loglevel flag is not provided.
-  ...(binArgs.some(npm.isLoglevelFlag) ? [] : ['--quiet']), ...binArgs, ...otherArgs], {
-    signal: abortSignal,
+  ...(binArgs.some(npm.isLoglevelFlag) ? [] : skipSocketCliUpgrade ? ['--loglevel', 'error'] : ['--quiet']), ...binArgs, ...otherArgs], {
     // 'inherit' + 'ipc'
     stdio: [0, 1, 2, 'ipc']
   });
   // See https://nodejs.org/api/all.html#all_child_process_event-exit.
   spawnPromise.process.on('exit', (code, signalName) => {
-    if (abortSignal.aborted) {
-      return;
-    }
     if (signalName) {
       process.kill(process.pid, signalName);
     } else if (code !== null) {
@@ -99,5 +102,5 @@ async function shadowBin(binName, args = process.argv.slice(2)) {
 }
 
 module.exports = shadowBin;
-//# debugId=f578bd6f-82f7-4281-b443-42099e9e8c53
+//# debugId=4b080160-768f-48ff-859c-2da65a395a61
 //# sourceMappingURL=shadow-bin.js.map

package/dist/module-sync/shadow-bin.js.map

@@ -1 +1 @@
-{"version":3,"file":"shadow-bin.js","sources":["../../src/shadow/link.ts","../../src/shadow/shadow-bin.ts"],"sourcesContent":["import path from 'node:path'\nimport process from 'node:process'\n\nimport cmdShim from 'cmd-shim'\n\nimport {\n  getNpmBinPath,\n  getNpxBinPath,\n  isNpmBinPathShadowed,\n  isNpxBinPathShadowed\n} from './npm-paths'\nimport constants from '../constants'\n\nconst { CLI, NPX } = constants\n\nexport async function installLinks(\n  realBinPath: string,\n  binName: 'npm' | 'npx'\n): Promise<string> {\n  const isNpx = binName === NPX\n  // Find package manager being shadowed by this process.\n  const binPath = isNpx ? getNpxBinPath() : getNpmBinPath()\n  // Lazily access constants.WIN32.\n  const { WIN32 } = constants\n  // TODO: Is this early exit needed?\n  if (WIN32 && binPath) {\n    return binPath\n  }\n  const shadowed = isNpx ? isNpxBinPathShadowed() : isNpmBinPathShadowed()\n  // Move our bin directory to front of PATH so its found first.\n  if (!shadowed) {\n    if (WIN32) {\n      await cmdShim(\n        // Lazily access constants.rootDistPath.\n        path.join(constants.rootDistPath, `${binName}-${CLI}.js`),\n        path.join(realBinPath, binName)\n      )\n    }\n    process.env['PATH'] =\n      `${realBinPath}${path.delimiter}${process.env['PATH']}`\n  }\n  return binPath\n}\n","import process from 'node:process'\n\nimport spawn from '@npmcli/promise-spawn'\n\nimport { installLinks } from './link'\nimport constants from '../constants'\nimport { isLoglevelFlag, isProgressFlag } from '../utils/npm'\n\nconst {\n  SOCKET_CLI_SAFE_WRAPPER,\n  SOCKET_CLI_SENTRY_BUILD,\n  SOCKET_IPC_HANDSHAKE,\n  abortSignal\n} = constants\n\nexport default async function shadowBin(\n  binName: 'npm' | 'npx',\n  args = process.argv.slice(2)\n) {\n  process.exitCode = 1\n  const terminatorPos = args.indexOf('--')\n  const binArgs = (\n    terminatorPos === -1 ? args : args.slice(0, terminatorPos)\n  ).filter(a => !isProgressFlag(a))\n  const otherArgs = terminatorPos === -1 ? [] : args.slice(terminatorPos)\n  const spawnPromise = spawn(\n    // Lazily access constants.execPath.\n    constants.execPath,\n    [\n      // Lazily access constants.nodeNoWarningsFlags.\n      ...constants.nodeNoWarningsFlags,\n      // Lazily access constants.ENV[SOCKET_CLI_SENTRY_BUILD].\n      ...(constants.ENV[SOCKET_CLI_SENTRY_BUILD]\n        ? [\n            '--require',\n            // Lazily access constants.instrumentWithSentryPath.\n            constants.instrumentWithSentryPath\n          ]\n        : []),\n      '--require',\n      // Lazily access constants.npmInjectionPath.\n      constants.npmInjectionPath,\n      // Lazily access constants.shadowBinPath.\n      await installLinks(constants.shadowBinPath, binName),\n      // Add `--no-progress` and `--quiet` flags to fix input being swallowed by\n      // the spinner when running the command with recent versions of npm.\n      '--no-progress',\n      // Add the '--quiet' flag if a loglevel flag is not provided.\n      ...(binArgs.some(isLoglevelFlag) ? [] : ['--quiet']),\n      ...binArgs,\n      ...otherArgs\n    ],\n    {\n      signal: abortSignal,\n      // 'inherit' + 'ipc'\n      stdio: [0, 1, 2, 'ipc']\n    }\n  )\n  // See https://nodejs.org/api/all.html#all_child_process_event-exit.\n  spawnPromise.process.on('exit', (code, signalName) => {\n    if (abortSignal.aborted) {\n      return\n    }\n    if (signalName) {\n      process.kill(process.pid, signalName)\n    } else if (code !== null) {\n      process.exit(code)\n    }\n  })\n  spawnPromise.process.send({\n    [SOCKET_IPC_HANDSHAKE]: {\n      [SOCKET_CLI_SAFE_WRAPPER]: true\n    }\n  })\n  await spawnPromise\n}\n"],"names":["NPX","WIN32","process","abortSignal","constants","signal","spawnPromise"],"mappings":";;;;;;;;;;;;;;;;;;;AAaA;;AAAaA;AAAI;AAEV;AAIL;AACA;;AAEA;;AACQC;AAAM;AACd;;AAEE;AACF;;AAEA;;AAEE;AACE;AACE;;AAIJ;AACAC;AAEF;AACA;AACF;;AClCA;;;;AAIEC;AACF;AAEe;;AAKb;AACA;AAGA;;AAEE;;AAGE;;AAEA;;AAIM;AACAC;AAIN;AACAA;AACA;AACA;AACA;AACA;;AAEA;;AAMAC;AACA;;AAEF;AAEF;;;AAGI;AACF;AACA;;AAEA;AACEH;AACF;AACF;AACAI;AACE;AACE;AACF;AACF;AACA;AACF;;","debugId":"f578bd6f-82f7-4281-b443-42099e9e8c53"}
+{"version":3,"file":"shadow-bin.js","sources":["../../src/shadow/link.ts","../../src/shadow/shadow-bin.ts"],"sourcesContent":["import path from 'node:path'\nimport process from 'node:process'\n\nimport cmdShim from 'cmd-shim'\n\nimport {\n  getNpmBinPath,\n  getNpxBinPath,\n  isNpmBinPathShadowed,\n  isNpxBinPathShadowed\n} from './npm-paths'\nimport constants from '../constants'\n\nconst { CLI, NPX } = constants\n\nexport async function installLinks(\n  realBinPath: string,\n  binName: 'npm' | 'npx'\n): Promise<string> {\n  const isNpx = binName === NPX\n  // Find package manager being shadowed by this process.\n  const binPath = isNpx ? getNpxBinPath() : getNpmBinPath()\n  // Lazily access constants.WIN32.\n  const { WIN32 } = constants\n  // TODO: Is this early exit needed?\n  if (WIN32 && binPath) {\n    return binPath\n  }\n  const shadowed = isNpx ? isNpxBinPathShadowed() : isNpmBinPathShadowed()\n  // Move our bin directory to front of PATH so its found first.\n  if (!shadowed) {\n    if (WIN32) {\n      await cmdShim(\n        // Lazily access constants.rootDistPath.\n        path.join(constants.rootDistPath, `${binName}-${CLI}.js`),\n        path.join(realBinPath, binName)\n      )\n    }\n    process.env['PATH'] =\n      `${realBinPath}${path.delimiter}${process.env['PATH']}`\n  }\n  return binPath\n}\n","import process from 'node:process'\n\nimport {\n  isLoglevelFlag,\n  isProgressFlag\n} from '@socketsecurity/registry/lib/npm'\nimport { spawn } from '@socketsecurity/registry/lib/spawn'\n\nimport { installLinks } from './link'\nimport constants from '../constants'\n\nconst {\n  NPM,\n  SOCKET_CLI_LEGACY_PACKAGE_NAME,\n  SOCKET_CLI_PACKAGE_NAME,\n  SOCKET_CLI_SAFE_WRAPPER,\n  SOCKET_CLI_SENTRY_BUILD,\n  SOCKET_CLI_SENTRY_PACKAGE_NAME,\n  SOCKET_IPC_HANDSHAKE\n} = constants\n\nexport default async function shadowBin(\n  binName: 'npm' | 'npx',\n  args = process.argv.slice(2)\n) {\n  process.exitCode = 1\n  const terminatorPos = args.indexOf('--')\n  const skipSocketCliUpgrade =\n    binName === NPM &&\n    args.length === 3 &&\n    args[0] === 'install' &&\n    args[1] === '-g' &&\n    (args[2] === SOCKET_CLI_PACKAGE_NAME ||\n      args[2] === SOCKET_CLI_LEGACY_PACKAGE_NAME ||\n      args[2] === SOCKET_CLI_SENTRY_PACKAGE_NAME)\n\n  let binArgs = terminatorPos === -1 ? args : args.slice(0, terminatorPos)\n  if (!skipSocketCliUpgrade) {\n    binArgs = binArgs.filter(a => !isProgressFlag(a))\n  }\n  const otherArgs = terminatorPos === -1 ? [] : args.slice(terminatorPos)\n  const spawnPromise = spawn(\n    // Lazily access constants.execPath.\n    constants.execPath,\n    [\n      // Lazily access constants.nodeNoWarningsFlags.\n      ...constants.nodeNoWarningsFlags,\n      // Lazily access constants.ENV[SOCKET_CLI_SENTRY_BUILD].\n      ...(constants.ENV[SOCKET_CLI_SENTRY_BUILD]\n        ? [\n            '--require',\n            // Lazily access constants.instrumentWithSentryPath.\n            constants.instrumentWithSentryPath\n          ]\n        : []),\n      '--require',\n      // Lazily access constants.npmInjectionPath.\n      constants.npmInjectionPath,\n      // Lazily access constants.shadowBinPath.\n      await installLinks(constants.shadowBinPath, binName),\n      // Add `--no-progress` and `--quiet` flags to fix input being swallowed by\n      // the spinner when running the command with recent versions of npm.\n      ...(skipSocketCliUpgrade ? [] : ['--no-progress']),\n      // Add the '--quiet' flag if a loglevel flag is not provided.\n      ...(binArgs.some(isLoglevelFlag)\n        ? []\n        : skipSocketCliUpgrade\n          ? ['--loglevel', 'error']\n          : ['--quiet']),\n      ...binArgs,\n      ...otherArgs\n    ],\n    {\n      // 'inherit' + 'ipc'\n      stdio: [0, 1, 2, 'ipc']\n    }\n  )\n  // See https://nodejs.org/api/all.html#all_child_process_event-exit.\n  spawnPromise.process.on('exit', (code, signalName) => {\n    if (signalName) {\n      process.kill(process.pid, signalName)\n    } else if (code !== null) {\n      process.exit(code)\n    }\n  })\n  spawnPromise.process.send({\n    [SOCKET_IPC_HANDSHAKE]: {\n      [SOCKET_CLI_SAFE_WRAPPER]: true\n    }\n  })\n  await spawnPromise\n}\n"],"names":["NPX","WIN32","process","SOCKET_IPC_HANDSHAKE","binArgs","constants","spawnPromise"],"mappings":";;;;;;;;;;;;;;;;;;;AAaA;;AAAaA;AAAI;AAEV;AAIL;AACA;;AAEA;;AACQC;AAAM;AACd;;AAEE;AACF;;AAEA;;AAEE;AACE;AACE;;AAIJ;AACAC;AAEF;AACA;AACF;;AC/BA;;;;;;;AAOEC;AACF;AAEe;;AAKb;;AAUA;;AAEEC;AACF;AACA;;AAEE;;AAGE;;AAEA;;AAIM;AACAC;AAIN;AACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AASA;;AAEF;AAEF;;AAEE;;AAEA;AACEH;AACF;AACF;AACAI;AACE;AACE;AACF;AACF;AACA;AACF;;","debugId":"4b080160-768f-48ff-859c-2da65a395a61"}