Merge branch 'main' into vitest_poc

Author: pvdz

.config/rollup.base.config.mjs

@@ -75,10 +75,8 @@ const requireUrlAssignmentRegExp =
 const splitUrlRequiresRegExp = /require\(["']u["']\s*\+\s*["']rl["']\)/g
 
 function isAncestorsExternal(id, depStats) {
-  const { rootPackageJsonPath } = constants
-
-  const { dependencies: pkgDeps } = require(rootPackageJsonPath)
-
+  // Lazily access constants.rootPackageJsonPath.
+  const { dependencies: pkgDeps } = require(constants.rootPackageJsonPath)
   let currNmIndex = id.indexOf(SLASH_NODE_MODULES_SLASH)
   while (currNmIndex !== -1) {
     const nextNmIndex = id.indexOf(SLASH_NODE_MODULES_SLASH, currNmIndex + 1)
@@ -97,7 +95,7 @@ function isAncestorsExternal(id, depStats) {
       dependencies = {},
       optionalDependencies = {},
       peerDependencies = {}
-    } = readPackageJsonSync(`${id.slice(0, nameEnd)}/package.json`)
+    } = readPackageJsonSync(id.slice(0, nameEnd))
     const range =
       dependencies[name] ??
       optionalDependencies[name] ??
@@ -113,23 +111,17 @@ function isAncestorsExternal(id, depStats) {
 }
 
 export default function baseConfig(extendConfig = {}) {
-  // Lazily access constants props.
-  const {
-    babelConfigPath,
-    rootPackageJsonPath,
-    rootPath,
-    rootSrcPath,
-    tsconfigPath
-  } = constants
-
+  // Lazily access constants.rootSrcPath.
+  const { rootSrcPath } = constants
   const {
     dependencies: pkgDeps,
     devDependencies: pkgDevDeps,
     overrides: pkgOverrides
-  } = require(rootPackageJsonPath)
-
+    // Lazily access constants.rootPackageJsonPath.
+  } = require(constants.rootPackageJsonPath)
   const constantsSrcPath = path.join(rootSrcPath, `${CONSTANTS}.ts`)
-  const babelConfig = require(babelConfigPath)
+  // Lazily access constants.babelConfigPath.
+  const babelConfig = require(constants.babelConfigPath)
   const tsPlugin = require('rollup-plugin-ts')
 
   const depStats = {
@@ -197,9 +189,7 @@ export default function baseConfig(extendConfig = {}) {
           dependencies = {},
           optionalDependencies = {},
           peerDependencies = {}
-        } = readPackageJsonSync(
-          `${parentId.slice(0, parentNameEnd)}/package.json`
-        )
+        } = readPackageJsonSync(parentId.slice(0, parentNameEnd))
         const range =
           dependencies[name] ??
           optionalDependencies[name] ??
@@ -229,7 +219,8 @@ export default function baseConfig(extendConfig = {}) {
         transpileOnly: true,
         exclude: ['**/*.json'],
         babelConfig,
-        tsconfig: tsconfigPath
+        // Lazily access constants.tsconfigPath.
+        tsconfig: constants.tsconfigPath
       }),
       purgePolyfills.rollup({
         replacements: {}
@@ -338,7 +329,8 @@ function ${SOCKET_INTEROP}(e) {
       delimiters: ['(?<=["\'])', '/'],
       preventAssignment: false,
       values: {
-        [rootPath]: '../../'
+        // Lazily access constants.rootPath.
+        [constants.rootPath]: '../../'
       }
     })
     return { name, renderChunk }

.config/rollup.dist.config.mjs

@@ -29,29 +29,31 @@ import {
 
 const {
   BABEL_RUNTIME,
+  CLI,
   CONSTANTS,
+  INSTRUMENT_WITH_SENTRY,
   MODULE_SYNC,
   NPM_INJECTION,
   REQUIRE,
   ROLLUP_EXTERNAL_SUFFIX,
   SHADOW_BIN,
+  SOCKET,
   SOCKET_CLI_LEGACY_BUILD,
   SOCKET_CLI_PUBLISHED_BUILD,
   SOCKET_CLI_SENTRY_BUILD,
   SOCKET_CLI_VERSION_HASH,
   VENDOR,
   VITEST,
+  WITH_SENTRY,
   depStatsPath,
   rootDistPath,
   rootPackageLockPath,
   rootPath,
   rootSrcPath
 } = constants
 
-const WITH_SENTRY = 'with-sentry'
-const INSTRUMENT_WITH_SENTRY = `instrument-${WITH_SENTRY}`
+const CLI_WITH_SENTRY = `${CLI}-${WITH_SENTRY}`
 const SENTRY_NODE = '@sentry/node'
-const SOCKET = 'socket'
 const SOCKET_DESCRIPTION = 'CLI tool for Socket.dev'
 const SOCKET_DESCRIPTION_WITH_SENTRY = `${SOCKET_DESCRIPTION}, includes Sentry error handling, otherwise identical to the regular \`${SOCKET}\` package`
 const SOCKET_NPM = 'socket-npm'
@@ -153,12 +155,12 @@ async function removeJsFiles(namePattern, srcPath) {
 
 function resetBin(bin) {
   const tmpBin = {
-    socket: bin?.[SOCKET] ?? bin?.[SOCKET_WITH_SENTRY],
+    [SOCKET]: bin?.[SOCKET] ?? bin?.[SOCKET_WITH_SENTRY],
     [SOCKET_NPM]: bin?.[SOCKET_NPM] ?? bin?.[SOCKET_NPM_WITH_SENTRY],
     [SOCKET_NPX]: bin?.[SOCKET_NPX] ?? bin?.[SOCKET_NPX_WITH_SENTRY]
   }
   const newBin = {
-    ...(tmpBin[SOCKET] ? { socket: tmpBin.socket } : {}),
+    ...(tmpBin[SOCKET] ? { [SOCKET]: tmpBin.socket } : {}),
     ...(tmpBin[SOCKET_NPM] ? { [SOCKET_NPM]: tmpBin[SOCKET_NPM] } : {}),
     ...(tmpBin[SOCKET_NPX] ? { [SOCKET_NPX]: tmpBin[SOCKET_NPX] } : {})
   }
@@ -243,12 +245,8 @@ async function updatePackageJson() {
     editablePkgJson.update({
       name: SOCKET_SECURITY_CLI,
       bin: {
-        cli: bin.socket,
+        [CLI]: bin[SOCKET],
         ...bin
-      },
-      dependencies: {
-        ...dependencies,
-        [SENTRY_NODE]: (await getSentryManifest()).version
       }
     })
   }
@@ -258,7 +256,8 @@ async function updatePackageJson() {
       name: SOCKET_SECURITY_CLI_WITH_SENTRY,
       description: SOCKET_DESCRIPTION_WITH_SENTRY,
       bin: {
-        [SOCKET_WITH_SENTRY]: bin.socket,
+        [CLI_WITH_SENTRY]: bin[SOCKET],
+        [SOCKET_WITH_SENTRY]: bin[SOCKET],
         [SOCKET_NPM_WITH_SENTRY]: bin[SOCKET_NPM],
         [SOCKET_NPX_WITH_SENTRY]: bin[SOCKET_NPX]
       },
@@ -289,14 +288,20 @@ async function updatePackageLockFile() {
     lockJson.name = SOCKET_SECURITY_CLI
     rootPkg.name = SOCKET_SECURITY_CLI
     rootPkg.bin = toSortedObject({
-      cli: bin.socket,
+      [CLI]: bin[SOCKET],
       ...bin
     })
   }
   // Lazily access constants.ENV[SOCKET_CLI_SENTRY_BUILD].
   else if (constants.ENV[SOCKET_CLI_SENTRY_BUILD]) {
     lockJson.name = SOCKET_SECURITY_CLI_WITH_SENTRY
     rootPkg.name = SOCKET_SECURITY_CLI_WITH_SENTRY
+    rootPkg.bin = {
+      [CLI_WITH_SENTRY]: bin[SOCKET],
+      [SOCKET_WITH_SENTRY]: bin[SOCKET],
+      [SOCKET_NPM_WITH_SENTRY]: bin[SOCKET_NPM],
+      [SOCKET_NPX_WITH_SENTRY]: bin[SOCKET_NPX]
+    }
     rootPkg.dependencies = toSortedObject({
       ...dependencies,
       [SENTRY_NODE]: (await getSentryManifest()).version

.dep-stats.json

@@ -10,7 +10,7 @@
     "@socketregistry/is-unicode-supported": "^1.0.0",
     "@socketregistry/packageurl-js": "^1.0.2",
     "@socketsecurity/config": "^2.1.3",
-    "@socketsecurity/registry": "^1.0.90",
+    "@socketsecurity/registry": "^1.0.93",
     "@socketsecurity/sdk": "^1.4.5",
     "blessed": "^0.1.81",
     "blessed-contrib": "^4.11.0",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "socket",
-  "version": "0.14.43",
+  "version": "0.14.46",
   "description": "CLI tool for Socket.dev",
   "homepage": "http://github.com/SocketDev/socket-cli",
   "license": "MIT",
@@ -36,8 +36,8 @@
   },
   "scripts": {
     "build": "run-s build:*",
-    "build:dist": "rollup -c .config/rollup.dist.config.mjs",
-    "build:test": "rollup -c .config/rollup.test.config.mjs",
+    "build:dist": "del-cli 'dist' && rollup -c .config/rollup.dist.config.mjs",
+    "build:test": "del-cli 'test/dist' && rollup -c .config/rollup.test.config.mjs",
     "check": "run-p -c --aggregate-output check:*",
     "check:lint": "eslint --report-unused-disable-directives .",
     "check:lint:fix": "npm run check:lint -- --fix",
@@ -75,7 +75,7 @@
     "@socketregistry/is-unicode-supported": "^1.0.0",
     "@socketregistry/packageurl-js": "^1.0.2",
     "@socketsecurity/config": "^2.1.3",
-    "@socketsecurity/registry": "^1.0.90",
+    "@socketsecurity/registry": "^1.0.93",
     "@socketsecurity/sdk": "^1.4.5",
     "blessed": "^0.1.81",
     "blessed-contrib": "^4.11.0",
@@ -147,7 +147,7 @@
     "eslint-plugin-sort-destructure-keys": "^2.0.0",
     "eslint-plugin-unicorn": "^56.0.1",
     "husky": "^9.1.7",
-    "knip": "^5.44.5",
+    "knip": "^5.45.0",
     "lint-staged": "^15.4.3",
     "magic-string": "^0.30.17",
     "mock-fs": "^5.5.0",

package.json

@@ -12,15 +12,18 @@ const {
   [kInternalsSymbol]: { createConstantsObject }
 } = registryConstants
 
+const WITH_SENTRY = 'with-sentry'
 const CLI = 'cli'
 const CONSTANTS = 'constants'
+const INSTRUMENT_WITH_SENTRY = `instrument-${WITH_SENTRY}`
 const MODULE_SYNC = 'module-sync'
 const NPM_INJECTION = 'npm-injection'
 const REQUIRE = 'require'
 const ROLLUP_ENTRY_SUFFIX = '?commonjs-entry'
 const ROLLUP_EXTERNAL_SUFFIX = '?commonjs-external'
 const SHADOW_BIN = 'shadow-bin'
 const SLASH_NODE_MODULES_SLASH = '/node_modules/'
+const SOCKET = 'socket'
 const SOCKET_CLI_LEGACY_BUILD = 'SOCKET_CLI_LEGACY_BUILD'
 const SOCKET_CLI_PUBLISHED_BUILD = 'SOCKET_CLI_PUBLISHED_BUILD'
 const SOCKET_CLI_SENTRY_BUILD = 'SOCKET_CLI_SENTRY_BUILD'
@@ -83,19 +86,22 @@ const constants = createConstantsObject(
     CLI,
     CONSTANTS,
     ENV: undefined,
+    INSTRUMENT_WITH_SENTRY,
     MODULE_SYNC,
     NPM_INJECTION,
     REQUIRE,
     ROLLUP_ENTRY_SUFFIX,
     ROLLUP_EXTERNAL_SUFFIX,
     SHADOW_BIN,
     SLASH_NODE_MODULES_SLASH,
+    SOCKET,
     SOCKET_CLI_LEGACY_BUILD,
     SOCKET_CLI_PUBLISHED_BUILD,
     SOCKET_CLI_SENTRY_BUILD,
     SOCKET_CLI_VERSION_HASH,
     VENDOR,
     VITEST,
+    WITH_SENTRY,
     babelConfigPath: undefined,
     depStatsPath: undefined,
     rootConfigPath: undefined,

scripts/constants.js

@@ -35,12 +35,12 @@ import { AuthError, InputError, captureException } from './utils/errors'
 import { getLogSymbols } from './utils/logging'
 import { meowWithSubcommands } from './utils/meow-with-subcommands'
 
-const { rootPkgJsonPath } = constants
+const { SOCKET, rootPkgJsonPath } = constants
 
 // TODO: Add autocompletion using https://socket.dev/npm/package/omelette
 void (async () => {
   await updateNotifier({
-    name: 'socket',
+    name: SOCKET,
     version: require(rootPkgJsonPath).version,
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
@@ -80,7 +80,7 @@ void (async () => {
           }
         },
         argv: process.argv.slice(2),
-        name: 'socket',
+        name: SOCKET,
         importMeta: { url: `${pathToFileURL(__filename)}` } as ImportMeta
       }
     )

src/cli.ts

@@ -8,6 +8,7 @@ import { envAsBoolean } from '@socketsecurity/registry/lib/env'
 import type { Remap } from '@socketsecurity/registry/lib/objects'
 
 const {
+  NODE_MODULES,
   PACKAGE_JSON,
   kInternalsSymbol,
   [kInternalsSymbol as unknown as 'Symbol(kInternalsSymbol)']: {
@@ -79,6 +80,7 @@ type Constants = Remap<
     readonly PNPM: 'pnpm'
     readonly REQUIRE: 'require'
     readonly SHADOW_BIN: 'shadow-bin'
+    readonly SOCKET: 'socket'
     readonly SOCKET_CLI_DEBUG: 'SOCKET_CLI_DEBUG'
     readonly SOCKET_CLI_FIX: 'SOCKET_CLI_FIX'
     readonly SOCKET_CLI_ISSUES_URL: 'https://github.com/SocketDev/socket-cli/issues'
@@ -127,6 +129,7 @@ const NPX = 'npx'
 const PNPM = 'pnpm'
 const REQUIRE = 'require'
 const SHADOW_BIN = 'shadow-bin'
+const SOCKET = 'socket'
 const SOCKET_CLI_DEBUG = 'SOCKET_CLI_DEBUG'
 const SOCKET_CLI_FIX = 'SOCKET_CLI_FIX'
 const SOCKET_CLI_ISSUES_URL = 'https://github.com/SocketDev/socket-cli/issues'
@@ -190,7 +193,7 @@ const lazyInstrumentWithSentryPath = () =>
 
 const lazyNmBinPath = () =>
   // Lazily access constants.rootPath.
-  path.join(constants.rootPath, 'node_modules/.bin')
+  path.join(constants.rootPath, `${NODE_MODULES}/.bin`)
 
 const lazyNpmInjectionPath = () =>
   // Lazily access constants.distPath.
@@ -250,6 +253,7 @@ const constants = <Constants>createConstantsObject(
     PNPM,
     REQUIRE,
     SHADOW_BIN,
+    SOCKET,
     SOCKET_CLI_DEBUG,
     SOCKET_CLI_FIX,
     SOCKET_CLI_ISSUES_URL,