Merge branch 'main' into repos_v2

Author: jdalton

.config/rollup.base.config.mjs

@@ -16,7 +16,6 @@ import {
   readPackageJsonSync
 } from '@socketsecurity/registry/lib/packages'
 import { isRelative } from '@socketsecurity/registry/lib/path'
-import { escapeRegExp } from '@socketsecurity/registry/lib/regexps'
 import { spawnSync } from '@socketsecurity/registry/lib/spawn'
 
 import constants from '../scripts/constants.js'
@@ -38,6 +37,9 @@ const {
   ROLLUP_ENTRY_SUFFIX,
   ROLLUP_EXTERNAL_SUFFIX,
   SLASH_NODE_MODULES_SLASH,
+  SHADOW_NPM_BIN,
+  SHADOW_NPM_INJECT,
+  SHADOW_NPM_PATHS,
   SOCKET_CLI_LEGACY_BUILD,
   SOCKET_CLI_PUBLISHED_BUILD,
   SOCKET_CLI_SENTRY_BUILD,
@@ -148,7 +150,12 @@ export default function baseConfig(extendConfig = {}) {
     overrides: pkgOverrides
     // Lazily access constants.rootPackageJsonPath.
   } = require(constants.rootPackageJsonPath)
-  const constantsSrcPath = path.join(rootSrcPath, `${CONSTANTS}.ts`)
+
+  const constantsSrcPath = path.join(rootSrcPath, `constants.ts`)
+  const shadowNpmBinSrcPath = path.join(rootSrcPath, 'shadow/npm/bin.ts')
+  const shadowNpmInjectSrcPath = path.join(rootSrcPath, 'shadow/npm/inject.ts')
+  const shadowNpmPathsSrcPath = path.join(rootSrcPath, 'shadow/npm/paths.ts')
+
   // Lazily access constants.babelConfigPath.
   const babelConfig = require(constants.babelConfigPath)
   const tsPlugin = require('rollup-plugin-ts')
@@ -383,13 +390,19 @@ function ${SOCKET_INTEROP}(e) {
     chunkFileNames: '[name].js',
     manualChunks: id_ => {
       const id = normalizeId(id_)
-      if (id === constantsSrcPath) {
-        return CONSTANTS
-      }
-      if (id.includes(SLASH_NODE_MODULES_SLASH)) {
-        return VENDOR
+      switch (id) {
+        case constantsSrcPath:
+          return CONSTANTS
+        case shadowNpmBinSrcPath:
+          return SHADOW_NPM_BIN
+        case shadowNpmInjectSrcPath:
+          return SHADOW_NPM_INJECT
+        case shadowNpmPathsSrcPath:
+          return SHADOW_NPM_PATHS
+        default: {
+          return id.includes(SLASH_NODE_MODULES_SLASH) ? VENDOR : null
+        }
       }
-      return null
     }
   }))
 

.config/rollup.dist.config.mjs

@@ -25,49 +25,48 @@ import {
 } from '../scripts/utils/packages.js'
 
 const {
-  CLI,
   CONSTANTS,
   INSTRUMENT_WITH_SENTRY,
   MODULE_SYNC,
-  NPM_INJECTION,
   REQUIRE,
   ROLLUP_EXTERNAL_SUFFIX,
-  SHADOW_BIN,
-  SOCKET,
+  SHADOW_NPM_BIN,
+  SHADOW_NPM_INJECT,
+  SOCKET_CLI_BIN_NAME,
+  SOCKET_CLI_BIN_NAME_ALIAS,
   SOCKET_CLI_LEGACY_BUILD,
   SOCKET_CLI_LEGACY_PACKAGE_NAME,
+  SOCKET_CLI_NPM_BIN_NAME,
+  SOCKET_CLI_NPX_BIN_NAME,
   SOCKET_CLI_PACKAGE_NAME,
+  SOCKET_CLI_SENTRY_BIN_NAME,
+  SOCKET_CLI_SENTRY_BIN_NAME_ALIAS,
   SOCKET_CLI_SENTRY_BUILD,
+  SOCKET_CLI_SENTRY_NPM_BIN_NAME,
+  SOCKET_CLI_SENTRY_NPX_BIN_NAME,
   SOCKET_CLI_SENTRY_PACKAGE_NAME,
   SOCKET_CLI_TEST_DIST_BUILD,
   VENDOR,
-  WITH_SENTRY,
   depStatsPath,
   rootDistPath,
   rootPackageLockPath,
   rootPath,
   rootSrcPath
 } = constants
 
-const CLI_WITH_SENTRY = `${CLI}-${WITH_SENTRY}`
 const SENTRY_NODE = '@sentry/node'
 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'
-const SOCKET_NPX = 'socket-npx'
-const SOCKET_WITH_SENTRY = `socket-${WITH_SENTRY}`
-const SOCKET_NPM_WITH_SENTRY = `${SOCKET_NPM}-${WITH_SENTRY}`
-const SOCKET_NPX_WITH_SENTRY = `${SOCKET_NPX}-${WITH_SENTRY}`
+const SOCKET_DESCRIPTION_WITH_SENTRY = `${SOCKET_DESCRIPTION}, includes Sentry error handling, otherwise identical to the regular \`${SOCKET_CLI_BIN_NAME}\` package`
 const VENDOR_JS = `${VENDOR}.js`
 
 const distModuleSyncPath = path.join(rootDistPath, MODULE_SYNC)
 const distRequirePath = path.join(rootDistPath, REQUIRE)
 
 const sharedInputs = {
   cli: `${rootSrcPath}/cli.ts`,
-  [CONSTANTS]: `${rootSrcPath}/${CONSTANTS}.ts`,
-  [SHADOW_BIN]: `${rootSrcPath}/shadow/${SHADOW_BIN}.ts`,
-  [NPM_INJECTION]: `${rootSrcPath}/shadow/${NPM_INJECTION}.ts`
+  [CONSTANTS]: `${rootSrcPath}/constants.ts`,
+  [SHADOW_NPM_BIN]: `${rootSrcPath}/shadow/npm/bin.ts`,
+  [SHADOW_NPM_INJECT]: `${rootSrcPath}/shadow/npm/inject.ts`
 }
 
 const sharedOutputs = {
@@ -145,20 +144,29 @@ async function removeJsFiles(namePattern, srcPath) {
 
 function resetBin(bin) {
   const tmpBin = {
-    [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]
+    [SOCKET_CLI_BIN_NAME]:
+      bin?.[SOCKET_CLI_BIN_NAME] ?? bin?.[SOCKET_CLI_SENTRY_BIN_NAME],
+    [SOCKET_CLI_NPM_BIN_NAME]:
+      bin?.[SOCKET_CLI_NPM_BIN_NAME] ?? bin?.[SOCKET_CLI_SENTRY_NPM_BIN_NAME],
+    [SOCKET_CLI_NPX_BIN_NAME]:
+      bin?.[SOCKET_CLI_NPX_BIN_NAME] ?? bin?.[SOCKET_CLI_SENTRY_NPX_BIN_NAME]
   }
   const newBin = {
-    ...(tmpBin[SOCKET] ? { [SOCKET]: tmpBin.socket } : {}),
-    ...(tmpBin[SOCKET_NPM] ? { [SOCKET_NPM]: tmpBin[SOCKET_NPM] } : {}),
-    ...(tmpBin[SOCKET_NPX] ? { [SOCKET_NPX]: tmpBin[SOCKET_NPX] } : {})
+    ...(tmpBin[SOCKET_CLI_BIN_NAME]
+      ? { [SOCKET_CLI_BIN_NAME]: tmpBin.socket }
+      : {}),
+    ...(tmpBin[SOCKET_CLI_NPM_BIN_NAME]
+      ? { [SOCKET_CLI_NPM_BIN_NAME]: tmpBin[SOCKET_CLI_NPM_BIN_NAME] }
+      : {}),
+    ...(tmpBin[SOCKET_CLI_NPX_BIN_NAME]
+      ? { [SOCKET_CLI_NPX_BIN_NAME]: tmpBin[SOCKET_CLI_NPX_BIN_NAME] }
+      : {})
   }
   assert(
     util.isDeepStrictEqual(Object.keys(newBin).sort(naturalCompare), [
-      SOCKET,
-      SOCKET_NPM,
-      SOCKET_NPX
+      SOCKET_CLI_BIN_NAME,
+      SOCKET_CLI_NPM_BIN_NAME,
+      SOCKET_CLI_NPX_BIN_NAME
     ]),
     "Update the rollup Legacy and Sentry build's .bin to match the default build."
   )
@@ -235,7 +243,7 @@ async function updatePackageJson() {
     editablePkgJson.update({
       name: SOCKET_CLI_LEGACY_PACKAGE_NAME,
       bin: {
-        [CLI]: bin[SOCKET],
+        [SOCKET_CLI_BIN_NAME_ALIAS]: bin[SOCKET_CLI_BIN_NAME],
         ...bin
       }
     })
@@ -246,10 +254,10 @@ async function updatePackageJson() {
       name: SOCKET_CLI_SENTRY_PACKAGE_NAME,
       description: SOCKET_DESCRIPTION_WITH_SENTRY,
       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]
+        [SOCKET_CLI_SENTRY_BIN_NAME_ALIAS]: bin[SOCKET_CLI_BIN_NAME],
+        [SOCKET_CLI_SENTRY_BIN_NAME]: bin[SOCKET_CLI_BIN_NAME],
+        [SOCKET_CLI_SENTRY_NPM_BIN_NAME]: bin[SOCKET_CLI_NPM_BIN_NAME],
+        [SOCKET_CLI_SENTRY_NPX_BIN_NAME]: bin[SOCKET_CLI_NPX_BIN_NAME]
       },
       dependencies: {
         ...dependencies,
@@ -278,7 +286,7 @@ async function updatePackageLockFile() {
     lockJson.name = SOCKET_CLI_LEGACY_PACKAGE_NAME
     rootPkg.name = SOCKET_CLI_LEGACY_PACKAGE_NAME
     rootPkg.bin = toSortedObject({
-      [CLI]: bin[SOCKET],
+      [SOCKET_CLI_BIN_NAME_ALIAS]: bin[SOCKET_CLI_BIN_NAME],
       ...bin
     })
   }
@@ -287,10 +295,10 @@ async function updatePackageLockFile() {
     lockJson.name = SOCKET_CLI_SENTRY_PACKAGE_NAME
     rootPkg.name = SOCKET_CLI_SENTRY_PACKAGE_NAME
     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]
+      [SOCKET_CLI_SENTRY_BIN_NAME_ALIAS]: bin[SOCKET_CLI_BIN_NAME],
+      [SOCKET_CLI_SENTRY_BIN_NAME]: bin[SOCKET_CLI_BIN_NAME],
+      [SOCKET_CLI_SENTRY_NPM_BIN_NAME]: bin[SOCKET_CLI_NPM_BIN_NAME],
+      [SOCKET_CLI_SENTRY_NPX_BIN_NAME]: bin[SOCKET_CLI_NPX_BIN_NAME]
     }
     rootPkg.dependencies = toSortedObject({
       ...dependencies,

.oxlintrc.json

@@ -9,7 +9,7 @@
   "settings": {},
   "rules": {
     "@typescript-eslint/array-type": ["error", { "default": "array-simple" }],
-    "@typescript-eslint/no-misused-new": ["error"],
+    "@typescript-eslint/no-misused-new": "error",
     "@typescript-eslint/no-this-alias": [
       "error",
       { "allowDestructuring": true }
@@ -20,6 +20,7 @@
     "no-control-regex": "off",
     "no-new": "off",
     "no-self-assign": "off",
+    "no-undef": "off",
     "no-unused-vars": "off"
   }
 }

bin/cli.js

@@ -5,15 +5,15 @@ const process = require('node:process')
 
 const constants = require('../dist/constants')
 
-const { CLI, DIST_TYPE, SOCKET_CLI_SENTRY_BUILD } = constants
+const { DIST_TYPE, SOCKET_CLI_SENTRY_BUILD } = constants
 
 if (
   DIST_TYPE === 'require' &&
   // Lazily access constants.ENV[SOCKET_CLI_SENTRY_BUILD].
   !constants.ENV[SOCKET_CLI_SENTRY_BUILD]
 ) {
-  // Lazily access constants.distPath.
-  require(`${constants.distPath}/${CLI}.js`)
+  // Lazily access constants.distCliPath.
+  require(constants.distCliPath)
 } else {
   const path = require('node:path')
   const { spawn } = require('@socketsecurity/registry/lib/spawn')
@@ -29,12 +29,12 @@ if (
       ...(constants.ENV[SOCKET_CLI_SENTRY_BUILD]
         ? [
             '--require',
-            // Lazily access constants.instrumentWithSentryPath.
-            constants.instrumentWithSentryPath
+            // Lazily access constants.distInstrumentWithSentryPath.
+            constants.distInstrumentWithSentryPath
           ]
         : []),
-      // Lazily access constants.distPath.
-      path.join(constants.distPath, `${CLI}.js`),
+      // Lazily access constants.distCliPath.
+      constants.distCliPath,
       ...process.argv.slice(2)
     ],
     {

bin/npm-cli.js

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

bin/npx-cli.js

@@ -2,5 +2,7 @@
 'use strict'
 
 const constants = require('../dist/constants')
-const shadowBin = require(`${constants.distPath}/${constants.SHADOW_BIN}.js`)
+const shadowBin = require(
+  `${constants.distPath}/${constants.SHADOW_NPM_BIN}.js`
+)
 shadowBin(constants.NPX)

eslint.config.js

@@ -13,6 +13,7 @@ const importXPlugin = require('eslint-plugin-import-x')
 const nodePlugin = require('eslint-plugin-n')
 const sortDestructureKeysPlugin = require('eslint-plugin-sort-destructure-keys')
 const unicornPlugin = require('eslint-plugin-unicorn')
+const globals = require('globals')
 const tsEslint = require('typescript-eslint')
 
 const constants = require('@socketsecurity/registry/lib/constants')
@@ -34,15 +35,16 @@ const sharedPlugins = {
 }
 
 const sharedRules = {
-  'no-await-in-loop': ['error'],
-  'no-control-regex': ['error'],
+  'no-await-in-loop': 'error',
+  'no-control-regex': 'error',
   'no-empty': ['error', { allowEmptyCatch: true }],
-  'no-new': ['error'],
-  'no-proto': ['error'],
+  'no-new': 'error',
+  'no-proto': 'error',
+  'no-undef': 'error',
   'no-warning-comments': ['warn', { terms: ['fixme'] }],
-  'sort-destructure-keys/sort-destructure-keys': ['error'],
+  'sort-destructure-keys/sort-destructure-keys': 'error',
   'sort-imports': ['error', { ignoreDeclarationSort: true }],
-  'unicorn/consistent-function-scoping': ['error']
+  'unicorn/consistent-function-scoping': 'error'
 }
 
 const sharedRulesForImportX = {
@@ -141,6 +143,14 @@ module.exports = [
   {
     files: ['src/**/*.ts', 'test/**/*.ts'],
     languageOptions: {
+      globals: {
+        BufferConstructor: 'readonly',
+        BufferEncoding: 'readonly',
+        NodeJS: 'readonly',
+        ...Object.fromEntries(
+          Object.entries(globals.node).map(([k]) => [k, 'readonly'])
+        )
+      },
       parser: tsParser,
       parserOptions: {
         projectService: {
@@ -160,7 +170,7 @@ module.exports = [
     rules: {
       ...sharedRules,
       '@typescript-eslint/array-type': ['error', { default: 'array-simple' }],
-      '@typescript-eslint/no-misused-new': ['error'],
+      '@typescript-eslint/no-misused-new': 'error',
       '@typescript-eslint/no-this-alias': [
         'error',
         { allowDestructuring: true }
@@ -192,9 +202,9 @@ module.exports = [
       // The n/no-unpublished-bin rule does does not support non-trivial glob
       // patterns used in package.json "files" fields. In those cases we simplify
       // the glob patterns used.
-      'n/no-unpublished-bin': ['error'],
-      'n/no-unsupported-features/es-builtins': ['error'],
-      'n/no-unsupported-features/es-syntax': ['error'],
+      'n/no-unpublished-bin': 'error',
+      'n/no-unsupported-features/es-builtins': 'error',
+      'n/no-unsupported-features/es-syntax': 'error',
       'n/no-unsupported-features/node-builtins': [
         'error',
         {
@@ -203,7 +213,7 @@ module.exports = [
           version: constants.maintainedNodeVersions.previous
         }
       ],
-      'n/prefer-node-protocol': ['error'],
+      'n/prefer-node-protocol': 'error',
       'no-unused-vars': [
         'error',
         { argsIgnorePattern: '^_|^this$', ignoreRestSiblings: true }