socket 0.14.35 → 0.14.37

package/bin/cli.js

@@ -3,15 +3,15 @@
 
 const constants = require('../dist/constants')
 
-const { DIST_TYPE } = constants
+const { DIST_TYPE, distPath } = constants
 
 if (DIST_TYPE === 'require') {
-  require(`../dist/${DIST_TYPE}/cli.js`)
+  require(`${distPath}/cli.js`)
 } else {
   const path = require('node:path')
   const spawn = require('@npmcli/promise-spawn')
 
-  const { abortSignal, execPath, rootDistPath } = constants
+  const { abortSignal, distPath, execPath } = constants
 
   process.exitCode = 1
   const spawnPromise = spawn(
@@ -19,7 +19,7 @@ if (DIST_TYPE === 'require') {
     [
       // Lazily access constants.nodeNoWarningsFlags.
       ...constants.nodeNoWarningsFlags,
-      path.join(rootDistPath, DIST_TYPE, 'cli.js'),
+      path.join(distPath, 'cli.js'),
       ...process.argv.slice(2)
     ],
     {
@@ -27,9 +27,13 @@ if (DIST_TYPE === 'require') {
       stdio: 'inherit'
     }
   )
-  spawnPromise.process.on('exit', (code, signal) => {
-    if (signal) {
-      process.kill(process.pid, signal)
+  // 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) {
       process.exit(code)
     }

package/bin/npm-cli.js

@@ -2,5 +2,5 @@
 'use strict'
 
 const constants = require('../dist/constants')
-const shadowBin = require(`../dist/${constants.DIST_TYPE}/shadow-bin.js`)
-shadowBin('npm')
+const shadowBin = require(`${constants.distPath}/shadow-bin.js`)
+shadowBin(constants.NPM)

package/bin/npx-cli.js

@@ -2,5 +2,5 @@
 'use strict'
 
 const constants = require('../dist/constants')
-const shadowBin = require(`../dist/${constants.DIST_TYPE}/shadow-bin.js`)
-shadowBin('npx')
+const shadowBin = require(`${constants.distPath}/shadow-bin.js`)
+shadowBin(constants.NPX)

package/dist/constants.js

@@ -6,52 +6,96 @@ var env = require('@socketsecurity/registry/lib/env');
 var registryConstants = require('@socketsecurity/registry/lib/constants');
 
 const {
-  kInternalsSymbol,
   PACKAGE_JSON,
+  kInternalsSymbol,
   [kInternalsSymbol]: {
     createConstantsObject
   }
 } = registryConstants;
 const API_V0_URL = 'https://api.socket.dev/v0';
+const BABEL_RUNTIME = '@babel/runtime';
+const BINARY_LOCK_EXT = '.lockb';
+const BUN = 'bun';
+const LOCK_EXT = '.lock';
 const NPM_REGISTRY_URL = 'https://registry.npmjs.org';
+const NPX = 'npx';
+const PNPM = 'pnpm';
 const SOCKET_CLI_ISSUES_URL = 'https://github.com/SocketDev/socket-cli/issues';
 const UPDATE_SOCKET_OVERRIDES_IN_PACKAGE_LOCK_FILE = 'UPDATE_SOCKET_OVERRIDES_IN_PACKAGE_LOCK_FILE';
-const ENV = Object.freeze({
+const VLT = 'vlt';
+const YARN_BERRY = 'yarn/berry';
+const YARN_CLASSIC = 'yarn/classic';
+const LAZY_DIST_TYPE = () => registryConstants.SUPPORTS_NODE_REQUIRE_MODULE ? 'module-sync' : 'require';
+const LAZY_ENV = () => Object.freeze({
+  // Lazily access registryConstants.ENV.
   ...registryConstants.ENV,
   // Flag set by the optimize command to bypass the packagesHaveRiskyIssues check.
   [UPDATE_SOCKET_OVERRIDES_IN_PACKAGE_LOCK_FILE]: env.envAsBoolean(process.env[UPDATE_SOCKET_OVERRIDES_IN_PACKAGE_LOCK_FILE])
 });
-const rootPath = path.resolve(fs.realpathSync(__dirname), '..');
-const rootDistPath = path.join(rootPath, 'dist');
-const rootBinPath = path.join(rootPath, 'bin');
-const rootPkgJsonPath = path.join(rootPath, PACKAGE_JSON);
-const nmBinPath = path.join(rootPath, 'node_modules/.bin');
-const cdxgenBinPath = path.join(nmBinPath, 'cdxgen');
-const shadowBinPath = path.join(rootPath, 'shadow-bin');
-const synpBinPath = path.join(nmBinPath, 'synp');
-const LAZY_DIST_TYPE = () => registryConstants.SUPPORTS_NODE_REQUIRE_MODULE ? 'module-sync' : 'require';
-const lazyDistPath = () => path.join(rootDistPath, constants.DIST_TYPE);
+const lazyCdxgenBinPath = () =>
+// Lazily access constants.nmBinPath.
+path.join(constants.nmBinPath, 'cdxgen');
+const lazyDistPath = () =>
+// Lazily access constants.rootDistPath and constants.DIST_TYPE.
+path.join(constants.rootDistPath, constants.DIST_TYPE);
+const lazyNmBinPath = () =>
+// Lazily access constants.rootPath.
+path.join(constants.rootPath, 'node_modules/.bin');
+const lazyRootBinPath = () =>
+// Lazily access constants.rootPath.
+path.join(constants.rootPath, 'bin');
+const lazyRootDistPath = () =>
+// Lazily access constants.rootPath.
+path.join(constants.rootPath, 'dist');
+const lazyRootPath = () => path.resolve(fs.realpathSync(__dirname), '..');
+const lazyRootPkgJsonPath = () =>
+// Lazily access constants.rootPath.
+path.join(constants.rootPath, PACKAGE_JSON);
+const lazyShadowBinPath = () =>
+// Lazily access constants.rootPath.
+path.join(constants.rootPath, 'shadow-bin');
+const lazySynpBinPath = () =>
+// Lazily access constants.nmBinPath.
+path.join(constants.nmBinPath, 'synp');
 const constants = createConstantsObject({
   API_V0_URL,
-  ENV,
+  BABEL_RUNTIME,
+  BINARY_LOCK_EXT,
+  BUN,
+  ENV: undefined,
   // Lazily defined values are initialized as `undefined` to keep their key order.
   DIST_TYPE: undefined,
+  LOCK_EXT,
   NPM_REGISTRY_URL,
+  NPX,
+  PNPM,
   SOCKET_CLI_ISSUES_URL,
   UPDATE_SOCKET_OVERRIDES_IN_PACKAGE_LOCK_FILE,
-  cdxgenBinPath,
+  VLT,
+  YARN_BERRY,
+  YARN_CLASSIC,
+  cdxgenBinPath: undefined,
   distPath: undefined,
-  nmBinPath,
-  rootBinPath,
-  rootDistPath,
-  rootPath,
-  rootPkgJsonPath,
-  shadowBinPath,
-  synpBinPath
+  nmBinPath: undefined,
+  rootBinPath: undefined,
+  rootDistPath: undefined,
+  rootPath: undefined,
+  rootPkgJsonPath: undefined,
+  shadowBinPath: undefined,
+  synpBinPath: undefined
 }, {
   getters: {
     DIST_TYPE: LAZY_DIST_TYPE,
-    distPath: lazyDistPath
+    ENV: LAZY_ENV,
+    distPath: lazyDistPath,
+    cdxgenBinPath: lazyCdxgenBinPath,
+    nmBinPath: lazyNmBinPath,
+    rootBinPath: lazyRootBinPath,
+    rootDistPath: lazyRootDistPath,
+    rootPath: lazyRootPath,
+    rootPkgJsonPath: lazyRootPkgJsonPath,
+    shadowBinPath: lazyShadowBinPath,
+    synpBinPath: lazySynpBinPath
   },
   mixin: registryConstants
 });