__proto__ nits

jdalton · jdalton · commit 13e481a879ee · 2024-10-30T23:04:59.000-04:00
diff --git a/.config/rollup.base.config.mjs b/.config/rollup.base.config.mjs
@@ -219,7 +219,6 @@ export default (extendConfig = {}) => {
         ? [config.output]
         : []
   ).map(o => ({
-    __proto__: null,
     ...o,
     chunkFileNames: '[name].js',
     manualChunks(id) {
diff --git a/.config/rollup.dist.config.mjs b/.config/rollup.dist.config.mjs
@@ -84,7 +84,6 @@ export default () => {
               /(?<="dependencies":\s*)\{[^\}]*\}/,
               () => {
                 const deps = {
-                  __proto__: null,
                   ...depStats.dependencies,
                   ...depStats.transitives
                 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -79,6 +79,7 @@
     "tinyglobby": "^0.2.10",
     "which": "^5.0.0",
     "write-file-atomic": "^6.0.0",
+    "yaml": "^2.6.0",
     "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
@@ -145,9 +146,6 @@
     "validate-npm-package-name": "^6.0.0"
   },
   "overrides": {
-    "@cyclonedx/cdxgen": {
-      "packageurl-js": "https://registry.npmjs.org/packageurl-js/-/packageurl-js-2.0.1.tgz"
-    },
     "aggregate-error": "npm:@socketregistry/aggregate-error@^1",
     "es-define-property": "npm:@socketregistry/es-define-property@^1",
     "function-bind": "npm:@socketregistry/function-bind@^1",
@@ -161,12 +159,14 @@
     "is-core-module": "npm:@socketregistry/is-core-module@^1",
     "isarray": "npm:@socketregistry/isarray@^1",
     "npm-package-arg": "$npm-package-arg",
+    "packageurl-js": "https://registry.npmjs.org/packageurl-js/-/packageurl-js-2.0.1.tgz",
     "path-parse": "npm:@socketregistry/path-parse@^1",
     "safe-buffer": "npm:@socketregistry/safe-buffer@^1",
     "safer-buffer": "npm:@socketregistry/safer-buffer@^1",
     "semver": "$semver",
     "set-function-length": "npm:@socketregistry/set-function-length@^1",
-    "side-channel": "npm:@socketregistry/side-channel@^1"
+    "side-channel": "npm:@socketregistry/side-channel@^1",
+    "yaml": "$yaml"
   },
   "resolutions": {
     "aggregate-error": "npm:@socketregistry/aggregate-error@^1",
@@ -182,12 +182,14 @@
     "is-core-module": "npm:@socketregistry/is-core-module@^1",
     "isarray": "npm:@socketregistry/isarray@^1",
     "npm-package-arg": "^12.0.0",
+    "packageurl-js": "https://registry.npmjs.org/packageurl-js/-/packageurl-js-2.0.1.tgz",
     "path-parse": "npm:@socketregistry/path-parse@^1",
     "safe-buffer": "npm:@socketregistry/safe-buffer@^1",
     "safer-buffer": "npm:@socketregistry/safer-buffer@^1",
     "semver": "^7.6.3",
     "set-function-length": "npm:@socketregistry/set-function-length@^1",
-    "side-channel": "npm:@socketregistry/side-channel@^1"
+    "side-channel": "npm:@socketregistry/side-channel@^1",
+    "yaml": "^2.6.0"
   },
   "engines": {
     "node": "^20.9.0 || >=22.0.0"
diff --git a/src/commands/analytics.ts b/src/commands/analytics.ts
@@ -102,7 +102,6 @@ function setupCommand(
   importMeta: ImportMeta
 ): void | CommandContext {
   const flags: { [key: string]: any } = {
-    __proto__: null,
     ...commonFlags,
     ...outputFlags,
     ...analyticsFlags
diff --git a/src/commands/audit-log.ts b/src/commands/audit-log.ts
@@ -73,7 +73,6 @@ function setupCommand(
   importMeta: ImportMeta
 ): CommandContext | undefined {
   const flags: { [key: string]: any } = {
-    __proto__: null,
     ...auditLogFlags,
     ...commonFlags,
     ...outputFlags
diff --git a/src/commands/cdxgen.ts b/src/commands/cdxgen.ts
@@ -153,7 +153,6 @@ export const cdxgen: CliSubcommand = {
   description: 'Create an SBOM with CycloneDX generator (cdxgen)',
   async run(argv_) {
     const yargv = <any>{
-      __proto__: null,
       ...yargsParse(<string[]>argv_, yargsConfig)
     }
     const unknown: string[] = yargv._
diff --git a/src/commands/dependencies.ts b/src/commands/dependencies.ts
@@ -59,7 +59,6 @@ function setupCommand(
   importMeta: ImportMeta
 ): CommandContext | undefined {
   const flags: { [key: string]: any } = {
-    __proto__: null,
     ...commonFlags,
     ...dependenciesFlags,
     ...outputFlags
diff --git a/src/commands/diff-scan/get.ts b/src/commands/diff-scan/get.ts
@@ -79,7 +79,6 @@ function setupCommand(
   importMeta: ImportMeta
 ): CommandContext | undefined {
   const flags: { [key: string]: any } = {
-    __proto__: null,
     ...commonFlags,
     ...getDiffScanFlags,
     ...outputFlags
diff --git a/src/commands/info.ts b/src/commands/info.ts
@@ -71,7 +71,6 @@ function setupCommand(
   importMeta: ImportMeta
 ): void | CommandContext {
   const flags: { [key: string]: any } = {
-    __proto__: null,
     ...commonFlags,
     ...outputFlags,
     ...validationFlags
diff --git a/src/commands/optimize.ts b/src/commands/optimize.ts
@@ -283,7 +283,6 @@ async function fetchPackageManifest(
   options?: FetchPackageManifestOptions
 ) {
   const pacoteOptions = <PacoteOptions & { signal?: AbortSignal }>{
-    __proto__: null,
     ...options,
     packumentCache,
     preferOffline: true
@@ -368,8 +367,7 @@ export const optimize: CliSubcommand = {
         semver.satisfies(semver.coerce(data.engines.node)!, nodeRange)
       )
       await addOverrides(
-        <AddOverridesConfig>{
-          __proto__: null,
+        {
           agent: agent === 'bun' ? 'yarn' : agent,
           isPrivate,
           isWorkspace,
@@ -404,11 +402,10 @@ export const optimize: CliSubcommand = {
           const wrapperPath = path.join(distPath, 'npm-cli.js')
           await spawn(process.execPath, [wrapperPath, 'install'], {
             stdio: 'pipe',
-            env: (<unknown>{
-              __proto__: null,
+            env: {
               ...process.env,
               UPDATE_SOCKET_OVERRIDES_IN_PACKAGE_LOCK_FILE: '1'
-            }) as NodeJS.ProcessEnv
+            }
           })
         } else {
           await spawn(agentExecPath, ['install'], { stdio: 'pipe' })
@@ -442,7 +439,6 @@ function setupCommand(
   importMeta: ImportMeta
 ): CommandContext | undefined {
   const flags: { [key: string]: any } = {
-    __proto__: null,
     ...commonFlags,
     pin: {
       type: 'boolean',
diff --git a/src/commands/raw-npm.ts b/src/commands/raw-npm.ts
@@ -25,7 +25,6 @@ async function setupCommand(
   importMeta: ImportMeta
 ): Promise<void> {
   const flags: { [key: string]: any } = {
-    __proto__: null,
     ...commonFlags,
     ...validationFlags
   }
diff --git a/src/commands/raw-npx.ts b/src/commands/raw-npx.ts
@@ -25,7 +25,6 @@ async function setupCommand(
   importMeta: ImportMeta
 ): Promise<void> {
   const flags: { [key: string]: any } = {
-    __proto__: null,
     ...commonFlags,
     ...validationFlags
   }
diff --git a/src/commands/report/create.ts b/src/commands/report/create.ts
@@ -95,7 +95,6 @@ async function setupCommand(
   importMeta: ImportMeta
 ): Promise<void | CommandContext> {
   const flags: { [key: string]: any } = {
-    __proto__: null,
     ...commonFlags,
     ...outputFlags,
     ...validationFlags,
diff --git a/src/commands/report/view.ts b/src/commands/report/view.ts
@@ -66,7 +66,6 @@ function setupCommand(
   importMeta: ImportMeta
 ): CommandContext | undefined {
   const flags: { [key: string]: any } = {
-    __proto__: null,
     ...commonFlags,
     ...outputFlags,
     ...validationFlags
diff --git a/src/commands/repos/create.ts b/src/commands/repos/create.ts
@@ -86,7 +86,6 @@ function setupCommand(
   importMeta: ImportMeta
 ): CommandContext | undefined {
   const flags: { [key: string]: any } = {
-    __proto__: null,
     ...commonFlags,
     ...outputFlags,
     ...repositoryCreationFlags
diff --git a/src/commands/repos/list.ts b/src/commands/repos/list.ts
@@ -80,7 +80,6 @@ function setupCommand(
   importMeta: ImportMeta
 ): CommandContext | undefined {
   const flags: { [key: string]: any } = {
-    __proto__: null,
     ...commonFlags,
     ...listRepoFlags,
     ...outputFlags
diff --git a/src/commands/repos/update.ts b/src/commands/repos/update.ts
@@ -86,7 +86,6 @@ function setupCommand(
   importMeta: ImportMeta
 ): CommandContext | undefined {
   const flags: { [key: string]: any } = {
-    __proto__: null,
     ...commonFlags,
     ...outputFlags,
     ...repositoryUpdateFlags
diff --git a/src/commands/repos/view.ts b/src/commands/repos/view.ts
@@ -51,7 +51,6 @@ function setupCommand(
   importMeta: ImportMeta
 ): CommandContext | undefined {
   const flags: { [key: string]: any } = {
-    __proto__: null,
     ...commonFlags,
     ...outputFlags
   }
diff --git a/src/commands/scan/delete.ts b/src/commands/scan/delete.ts
@@ -49,7 +49,6 @@ function setupCommand(
   importMeta: ImportMeta
 ): CommandContext | undefined {
   const flags: { [key: string]: any } = {
-    __proto__: null,
     ...commonFlags,
     ...outputFlags
   }
diff --git a/src/commands/scan/list.ts b/src/commands/scan/list.ts
@@ -96,7 +96,6 @@ function setupCommand(
   importMeta: ImportMeta
 ): CommandContext | undefined {
   const flags: { [key: string]: any } = {
-    __proto__: null,
     ...commonFlags,
     ...listFullScanFlags,
     ...outputFlags
diff --git a/src/commands/scan/metadata.ts b/src/commands/scan/metadata.ts
@@ -49,7 +49,6 @@ function setupCommand(
   importMeta: ImportMeta
 ): CommandContext | undefined {
   const flags: { [key: string]: any } = {
-    __proto__: null,
     ...commonFlags,
     ...outputFlags
   }
diff --git a/src/commands/scan/stream.ts b/src/commands/scan/stream.ts
@@ -56,7 +56,6 @@ function setupCommand(
   importMeta: ImportMeta
 ): CommandContext | undefined {
   const flags: { [key: string]: any } = {
-    __proto__: null,
     ...commonFlags,
     ...outputFlags
   }
diff --git a/src/commands/threat-feed.ts b/src/commands/threat-feed.ts
@@ -77,7 +77,6 @@ function setupCommand(
   importMeta: ImportMeta
 ): CommandContext | undefined {
   const flags: { [key: string]: any } = {
-    __proto__: null,
     ...commonFlags,
     ...outputFlags,
     ...threatFeedFlags
diff --git a/src/utils/meow-with-subcommands.ts b/src/utils/meow-with-subcommands.ts
@@ -59,7 +59,6 @@ export async function meowWithSubcommands(
     }
   }
   const flags = {
-    __proto__: null,
     ...commonFlags,
     ...additionalOptions.flags
   }
diff --git a/src/utils/path-resolve.ts b/src/utils/path-resolve.ts
@@ -42,13 +42,9 @@ async function globWithGitIgnore(
     socketConfig,
     cwd = process.cwd(),
     ...additionalOptions
-  } = <GlobWithGitIgnoreOptions>{
-    __proto__: null,
-    ...options
-  }
+  } = <GlobWithGitIgnoreOptions>{ __proto__: null, ...options }
   const projectIgnorePaths = socketConfig?.projectIgnorePaths
-  const ignoreFiles = await tinyGlob(['**/.gitignore'], <GlobOptions>{
-    __proto__: null,
+  const ignoreFiles = await tinyGlob(['**/.gitignore'], {
     absolute: true,
     cwd,
     expandDirectories: true
@@ -76,7 +72,6 @@ async function globWithGitIgnore(
   ]
   const hasNegatedPattern = ignores.some(p => p.charCodeAt(0) === 33 /*'!'*/)
   const globOptions = {
-    __proto__: null,
     absolute: true,
     cwd,
     expandDirectories: false,

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,6 @@ export default () => {`
`84`	`84`	`/(?<="dependencies":\s)\{[^\}]\}/,`
`85`	`85`	`() => {`
`86`	`86`	`const deps = {`
`87`		`- __proto__: null,`
`88`	`87`	`...depStats.dependencies,`
`89`	`88`	`...depStats.transitives`
`90`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,6 @@ export const cdxgen: CliSubcommand = {`
`153`	`153`	`description: 'Create an SBOM with CycloneDX generator (cdxgen)',`
`154`	`154`	`async run(argv_) {`
`155`	`155`	`const yargv = <any>{`
`156`		`- __proto__: null,`
`157`	`156`	`...yargsParse(<string[]>argv_, yargsConfig)`
`158`	`157`	`}`
`159`	`158`	`const unknown: string[] = yargv._`