@socketsecurity/cli-with-sentry 0.14.48 → 0.14.49

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

@@ -1,16 +1,18 @@
 /// <reference types="npmcli__promise-spawn" />
 /// <reference types="node" />
 import spawn from '@npmcli/promise-spawn';
+import { Spinner } from '@socketsecurity/registry/lib/spinner';
 declare function isAuditFlag(cmdArg: string): boolean;
 declare function isFundFlag(cmdArg: string): boolean;
 declare function isLoglevelFlag(cmdArg: string): boolean;
 declare function isProgressFlag(cmdArg: string): boolean;
 type SpawnOption = Exclude<Parameters<typeof spawn>[2], undefined>;
 type SafeNpmInstallOptions = SpawnOption & {
-    args?: string[];
-    ipc?: object;
+    args?: string[] | undefined;
+    ipc?: object | undefined;
+    spinner?: Spinner | undefined;
 };
-declare function safeNpmInstall(opts?: SafeNpmInstallOptions): Promise<{
+declare function safeNpmInstall(options?: SafeNpmInstallOptions): Promise<{
     cmd: string;
     args: string[];
     code: number;

package/dist/module-sync/npm.js

@@ -38,21 +38,27 @@ function isLoglevelFlag(cmdArg) {
 function isProgressFlag(cmdArg) {
   return progressFlags.has(cmdArg);
 }
-function safeNpmInstall(opts) {
+function safeNpmInstall(options) {
   const {
     args = [],
     ipc,
+    spinner,
     ...spawnOptions
   } = {
     __proto__: null,
-    ...opts
+    ...options
   };
   const terminatorPos = args.indexOf('--');
   const npmArgs = (terminatorPos === -1 ? args : args.slice(0, terminatorPos)).filter(a => !isAuditFlag(a) && !isFundFlag(a) && !isProgressFlag(a));
   const otherArgs = terminatorPos === -1 ? [] : args.slice(terminatorPos);
   const useIpc = objects.isObject(ipc);
   const useDebug = npmPaths.isDebug();
-  const spawnPromise = spawn(
+  const isSilent = !useDebug && !npmArgs.some(isLoglevelFlag);
+  const isSpinning = spinner?.isSpinning ?? false;
+  if (!isSilent) {
+    spinner?.stop();
+  }
+  let spawnPromise = spawn(
   // Lazily access constants.execPath.
   constants.execPath, [
   // Lazily access constants.nodeNoWarningsFlags.
@@ -68,16 +74,16 @@ function safeNpmInstall(opts) {
   '--no-progress',
   // Add the '--silent' flag if a loglevel flag is not provided and the
   // SOCKET_CLI_DEBUG environment variable is not truthy.
-  ...(useDebug || npmArgs.some(isLoglevelFlag) ? [] : ['--silent']), ...npmArgs, ...otherArgs], {
+  ...(isSilent ? ['--silent'] : []), ...npmArgs, ...otherArgs], {
     signal: abortSignal,
     // Set stdio to include 'ipc'.
     // See https://github.com/nodejs/node/blob/v23.6.0/lib/child_process.js#L161-L166
     // and https://github.com/nodejs/node/blob/v23.6.0/lib/internal/child_process.js#L238.
-    stdio: useDebug ?
-    // 'inherit'
-    useIpc ? [0, 1, 2, 'ipc'] : 'inherit' :
+    stdio: isSilent ?
     // 'ignore'
-    useIpc ? ['ignore', 'ignore', 'ignore', 'ipc'] : 'ignore',
+    useIpc ? ['ignore', 'ignore', 'ignore', 'ipc'] : 'ignore' :
+    // 'inherit'
+    useIpc ? [0, 1, 2, 'ipc'] : 'inherit',
     ...spawnOptions,
     env: {
       ...process.env,
@@ -89,11 +95,19 @@ function safeNpmInstall(opts) {
       [SOCKET_IPC_HANDSHAKE]: ipc
     });
   }
+  if (!isSilent && isSpinning) {
+    const oldSpawnPromise = spawnPromise;
+    spawnPromise = spawnPromise.finally(() => {
+      spinner?.start();
+    });
+    spawnPromise.process = oldSpawnPromise.process;
+    spawnPromise.stdin = spawnPromise.stdin;
+  }
   return spawnPromise;
 }
 
 exports.isLoglevelFlag = isLoglevelFlag;
 exports.isProgressFlag = isProgressFlag;
 exports.safeNpmInstall = safeNpmInstall;
-//# debugId=73c2e7c8-ac5f-4a8a-8343-be29aaec8a8a
+//# debugId=e284aad0-2f5e-4bba-a5e4-010813e648a3
 //# sourceMappingURL=npm.js.map

package/dist/module-sync/npm.js.map

@@ -1 +1 @@
-{"version":3,"file":"npm.js","sources":["../../src/utils/npm.ts"],"sourcesContent":["import process from 'node:process'\n\nimport spawn from '@npmcli/promise-spawn'\n\nimport { isObject } from '@socketsecurity/registry/lib/objects'\n\nimport { isDebug } from './debug'\nimport constants from '../constants'\nimport { getNpmBinPath } from '../shadow/npm-paths'\n\nconst { SOCKET_IPC_HANDSHAKE, abortSignal } = constants\n\nconst auditFlags = new Set(['--audit', '--no-audit'])\n\nconst fundFlags = new Set(['--fund', '--no-fund'])\n\n// https://docs.npmjs.com/cli/v11/using-npm/logging#aliases\nconst logFlags = new Set([\n  '--loglevel',\n  '-d',\n  '--dd',\n  '--ddd',\n  '-q',\n  '--quiet',\n  '-s',\n  '--silent'\n])\n\nconst progressFlags = new Set(['--progress', '--no-progress'])\n\nexport function isAuditFlag(cmdArg: string) {\n  return auditFlags.has(cmdArg)\n}\n\nexport function isFundFlag(cmdArg: string) {\n  return fundFlags.has(cmdArg)\n}\n\nexport function isLoglevelFlag(cmdArg: string) {\n  // https://docs.npmjs.com/cli/v11/using-npm/logging#setting-log-levels\n  return cmdArg.startsWith('--loglevel=') || logFlags.has(cmdArg)\n}\n\nexport function isProgressFlag(cmdArg: string) {\n  return progressFlags.has(cmdArg)\n}\n\ntype SpawnOption = Exclude<Parameters<typeof spawn>[2], undefined>\n\ntype SafeNpmInstallOptions = SpawnOption & {\n  args?: string[]\n  ipc?: object\n}\n\nexport function safeNpmInstall(opts?: SafeNpmInstallOptions) {\n  const { args = [], ipc, ...spawnOptions } = { __proto__: null, ...opts }\n  const terminatorPos = args.indexOf('--')\n  const npmArgs = (\n    terminatorPos === -1 ? args : args.slice(0, terminatorPos)\n  ).filter(a => !isAuditFlag(a) && !isFundFlag(a) && !isProgressFlag(a))\n  const otherArgs = terminatorPos === -1 ? [] : args.slice(terminatorPos)\n  const useIpc = isObject(ipc)\n  const useDebug = isDebug()\n  const spawnPromise = spawn(\n    // Lazily access constants.execPath.\n    constants.execPath,\n    [\n      // Lazily access constants.nodeNoWarningsFlags.\n      ...constants.nodeNoWarningsFlags,\n      '--require',\n      // Lazily access constants.npmInjectionPath.\n      constants.npmInjectionPath,\n      getNpmBinPath(),\n      'install',\n      // Even though the '--silent' flag is passed npm will still run through\n      // code paths for 'audit' and 'fund' unless '--no-audit' and '--no-fund'\n      // flags are passed.\n      '--no-audit',\n      '--no-fund',\n      // Add `--no-progress` and `--silent` flags to fix input being swallowed\n      // by the spinner when running the command with recent versions of npm.\n      '--no-progress',\n      // Add the '--silent' flag if a loglevel flag is not provided and the\n      // SOCKET_CLI_DEBUG environment variable is not truthy.\n      ...(useDebug || npmArgs.some(isLoglevelFlag) ? [] : ['--silent']),\n      ...npmArgs,\n      ...otherArgs\n    ],\n    {\n      signal: abortSignal,\n      // Set stdio to include 'ipc'.\n      // See https://github.com/nodejs/node/blob/v23.6.0/lib/child_process.js#L161-L166\n      // and https://github.com/nodejs/node/blob/v23.6.0/lib/internal/child_process.js#L238.\n      stdio: useDebug\n        ? // 'inherit'\n          useIpc\n          ? [0, 1, 2, 'ipc']\n          : 'inherit'\n        : // 'ignore'\n          useIpc\n          ? ['ignore', 'ignore', 'ignore', 'ipc']\n          : 'ignore',\n      ...spawnOptions,\n      env: {\n        ...process.env,\n        ...spawnOptions.env\n      }\n    }\n  )\n  if (useIpc) {\n    spawnPromise.process.send({ [SOCKET_IPC_HANDSHAKE]: ipc })\n  }\n  return spawnPromise\n}\n"],"names":["abortSignal","args","__proto__","constants","signal","stdio","env","spawnPromise"],"mappings":";;;;;;;;;;;;;;;;;AAUA;;AAA8BA;AAAY;AAE1C;AAEA;;AAEA;AACA;AAWA;AAEO;AACL;AACF;AAEO;AACL;AACF;AAEO;AACL;AACA;AACF;AAEO;AACL;AACF;AASO;;AACGC;;;AAAgC;AAAMC;;;AAC9C;AACA;AAGA;AACA;AACA;;AAEE;;AAGE;AACA;AAEA;AACAC;AAGA;AACA;AACA;AACA;AAEA;AACA;;AAEA;AACA;;AAMAC;AACA;AACA;AACA;AACAC;AACI;;AAIA;;AAIJ;AACAC;;AAEE;AACF;AACF;AAEF;AACEC;AAA4B;AAA4B;AAC1D;AACA;AACF;;;;","debugId":"73c2e7c8-ac5f-4a8a-8343-be29aaec8a8a"}
+{"version":3,"file":"npm.js","sources":["../../src/utils/npm.ts"],"sourcesContent":["import process from 'node:process'\n\nimport spawn from '@npmcli/promise-spawn'\n\nimport { isObject } from '@socketsecurity/registry/lib/objects'\n\nimport { isDebug } from './debug'\nimport constants from '../constants'\nimport { getNpmBinPath } from '../shadow/npm-paths'\n\nimport type { Spinner } from '@socketsecurity/registry/lib/spinner'\n\nconst { SOCKET_IPC_HANDSHAKE, abortSignal } = constants\n\nconst auditFlags = new Set(['--audit', '--no-audit'])\n\nconst fundFlags = new Set(['--fund', '--no-fund'])\n\n// https://docs.npmjs.com/cli/v11/using-npm/logging#aliases\nconst logFlags = new Set([\n  '--loglevel',\n  '-d',\n  '--dd',\n  '--ddd',\n  '-q',\n  '--quiet',\n  '-s',\n  '--silent'\n])\n\nconst progressFlags = new Set(['--progress', '--no-progress'])\n\nexport function isAuditFlag(cmdArg: string) {\n  return auditFlags.has(cmdArg)\n}\n\nexport function isFundFlag(cmdArg: string) {\n  return fundFlags.has(cmdArg)\n}\n\nexport function isLoglevelFlag(cmdArg: string) {\n  // https://docs.npmjs.com/cli/v11/using-npm/logging#setting-log-levels\n  return cmdArg.startsWith('--loglevel=') || logFlags.has(cmdArg)\n}\n\nexport function isProgressFlag(cmdArg: string) {\n  return progressFlags.has(cmdArg)\n}\n\ntype SpawnOption = Exclude<Parameters<typeof spawn>[2], undefined>\n\ntype SafeNpmInstallOptions = SpawnOption & {\n  args?: string[] | undefined\n  ipc?: object | undefined\n  spinner?: Spinner | undefined\n}\n\nexport function safeNpmInstall(options?: SafeNpmInstallOptions) {\n  const {\n    args = [],\n    ipc,\n    spinner,\n    ...spawnOptions\n  } = <SafeNpmInstallOptions>{ __proto__: null, ...options }\n  const terminatorPos = args.indexOf('--')\n  const npmArgs = (\n    terminatorPos === -1 ? args : args.slice(0, terminatorPos)\n  ).filter(a => !isAuditFlag(a) && !isFundFlag(a) && !isProgressFlag(a))\n  const otherArgs = terminatorPos === -1 ? [] : args.slice(terminatorPos)\n  const useIpc = isObject(ipc)\n  const useDebug = isDebug()\n  const isSilent = !useDebug && !npmArgs.some(isLoglevelFlag)\n  const isSpinning = spinner?.isSpinning ?? false\n  if (!isSilent) {\n    spinner?.stop()\n  }\n  let spawnPromise = spawn(\n    // Lazily access constants.execPath.\n    constants.execPath,\n    [\n      // Lazily access constants.nodeNoWarningsFlags.\n      ...constants.nodeNoWarningsFlags,\n      '--require',\n      // Lazily access constants.npmInjectionPath.\n      constants.npmInjectionPath,\n      getNpmBinPath(),\n      'install',\n      // Even though the '--silent' flag is passed npm will still run through\n      // code paths for 'audit' and 'fund' unless '--no-audit' and '--no-fund'\n      // flags are passed.\n      '--no-audit',\n      '--no-fund',\n      // Add `--no-progress` and `--silent` flags to fix input being swallowed\n      // by the spinner when running the command with recent versions of npm.\n      '--no-progress',\n      // Add the '--silent' flag if a loglevel flag is not provided and the\n      // SOCKET_CLI_DEBUG environment variable is not truthy.\n      ...(isSilent ? ['--silent'] : []),\n      ...npmArgs,\n      ...otherArgs\n    ],\n    {\n      signal: abortSignal,\n      // Set stdio to include 'ipc'.\n      // See https://github.com/nodejs/node/blob/v23.6.0/lib/child_process.js#L161-L166\n      // and https://github.com/nodejs/node/blob/v23.6.0/lib/internal/child_process.js#L238.\n      stdio: isSilent\n        ? // 'ignore'\n          useIpc\n          ? ['ignore', 'ignore', 'ignore', 'ipc']\n          : 'ignore'\n        : // 'inherit'\n          useIpc\n          ? [0, 1, 2, 'ipc']\n          : 'inherit',\n      ...spawnOptions,\n      env: {\n        ...process.env,\n        ...spawnOptions.env\n      }\n    }\n  )\n  if (useIpc) {\n    spawnPromise.process.send({ [SOCKET_IPC_HANDSHAKE]: ipc })\n  }\n  if (!isSilent && isSpinning) {\n    const oldSpawnPromise = spawnPromise\n    spawnPromise = <typeof oldSpawnPromise>spawnPromise.finally(() => {\n      spinner?.start()\n    })\n    spawnPromise.process = oldSpawnPromise.process\n    ;(spawnPromise as any).stdin = (spawnPromise as any).stdin\n  }\n  return spawnPromise\n}\n"],"names":["abortSignal","args","__proto__","constants","signal","stdio","env","spawnPromise"],"mappings":";;;;;;;;;;;;;;;;;AAYA;;AAA8BA;AAAY;AAE1C;AAEA;;AAEA;AACA;AAWA;AAEO;AACL;AACF;AAEO;AACL;AACF;AAEO;AACL;AACA;AACF;AAEO;AACL;AACF;AAUO;;AAEHC;;;;AAIF;AAA6BC;;;AAC7B;AACA;AAGA;AACA;AACA;;AAEA;;;AAGA;;AAEE;;AAGE;AACA;AAEA;AACAC;AAGA;AACA;AACA;AACA;AAEA;AACA;;AAEA;AACA;AACA;AAKAC;AACA;AACA;AACA;AACAC;AACI;;AAIA;;AAIJ;AACAC;;AAEE;AACF;AACF;AAEF;AACEC;AAA4B;AAA4B;AAC1D;AACA;;AAEEA;;AAEA;AACAA;AACEA;AACJ;AACA;AACF;;;;","debugId":"e284aad0-2f5e-4bba-a5e4-010813e648a3"}