Use more @socketsecurity/registry

SocketDev · Nov 7, 2024 · 4caa183 · 4caa183
1 parent 8315bc0
commit 4caa183
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 193 deletions.
diff --git a/.dep-stats.json b/.dep-stats.json
@@ -7,7 +7,7 @@
     "@npmcli/promise-spawn": "^8.0.2",
     "@socketregistry/hyrious__bun.lockb": "1.0.4",
     "@socketsecurity/config": "^2.1.3",
-    "@socketsecurity/registry": "^1.0.14",
+    "@socketsecurity/registry": "^1.0.16",
     "@socketsecurity/sdk": "^1.3.0",
     "blessed": "^0.1.81",
     "blessed-contrib": "^4.11.0",
@@ -17,7 +17,6 @@
     "ignore": "^6.0.2",
     "micromatch": "^4.0.8",
     "npm-package-arg": "^12.0.0",
-    "pacote": "^20.0.0",
     "pony-cause": "^2.1.11",
     "semver": "^7.6.3",
     "synp": "^1.9.13",
@@ -86,7 +85,7 @@
     "@npmcli/promise-spawn": "^8.0.2",
     "@socketregistry/hyrious__bun.lockb": "1.0.4",
     "@socketsecurity/config": "^2.1.3",
-    "@socketsecurity/registry": "^1.0.14",
+    "@socketsecurity/registry": "^1.0.16",
     "@socketsecurity/sdk": "^1.3.0",
     "blessed": "^0.1.81",
     "blessed-contrib": "^4.11.0",
@@ -98,7 +97,6 @@
     "ini": "4.1.1",
     "micromatch": "^4.0.8",
     "npm-package-arg": "^12.0.0",
-    "pacote": "^20.0.0",
     "pony-cause": "^2.1.11",
     "semver": "^7.6.3",
     "synp": "^1.9.13",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "@npmcli/promise-spawn": "^8.0.2",
     "@socketregistry/hyrious__bun.lockb": "1.0.4",
     "@socketsecurity/config": "^2.1.3",
-    "@socketsecurity/registry": "^1.0.14",
+    "@socketsecurity/registry": "^1.0.16",
     "@socketsecurity/sdk": "^1.3.0",
     "blessed": "^0.1.81",
     "blessed-contrib": "^4.11.0",
@@ -59,7 +59,6 @@
     "ini": "4.1.1",
     "micromatch": "^4.0.8",
     "npm-package-arg": "^12.0.0",
-    "pacote": "^20.0.0",
     "pony-cause": "^2.1.11",
     "semver": "^7.6.3",
     "synp": "^1.9.13",

diff --git a/src/commands/optimize.ts b/src/commands/optimize.ts
@@ -8,13 +8,11 @@ import { getManifestData } from '@socketsecurity/registry'
 import meow from 'meow'
 import npa from 'npm-package-arg'
 import ora from 'ora'
-import pacote from 'pacote'
 import semver from 'semver'
 import { glob as tinyGlob } from 'tinyglobby'
 import { parse as yamlParse } from 'yaml'
 
-//import { packumentCache, pacoteCachePath } from '../constants'
-import { packumentCache } from '../constants'
+import { fetchPackageManifest } from '@socketsecurity/registry/lib/packages'
 import { commonFlags } from '../flags'
 import { printFlagList } from '../utils/formatting'
 import { existsSync } from '../utils/fs'
@@ -24,10 +22,9 @@ import { pEach } from '@socketsecurity/registry/lib/promises'
 import { escapeRegExp } from '@socketsecurity/registry/lib/regexps'
 import { isNonEmptyString } from '@socketsecurity/registry/lib/strings'
 
-import type { Content as PackageJsonContent } from '@npmcli/package-json'
+import type { Content as NPMCliPackageJson } from '@npmcli/package-json'
 import type { ManifestEntry } from '@socketsecurity/registry'
 import type { Ora } from 'ora'
-import type { PacoteOptions } from 'pacote'
 import type { CliSubcommand } from '../utils/meow-with-subcommands'
 import type {
   Agent,
@@ -45,42 +42,42 @@ const manifestNpmOverrides = getManifestData('npm')!
 type NpmOverrides = { [key: string]: string | StringKeyValueObject }
 type PnpmOrYarnOverrides = { [key: string]: string }
 type Overrides = NpmOverrides | PnpmOrYarnOverrides
-type GetOverrides = (pkgJson: PackageJsonContent) => GetOverridesResult
+type GetOverrides = (pkgJson: NPMCliPackageJson) => GetOverridesResult
 type GetOverridesResult = {
   type: Agent
   overrides: Overrides
 }
 
 const getOverridesDataByAgent: Record<Agent, GetOverrides> = {
-  bun(pkgJson: PackageJsonContent) {
+  bun(pkgJson: NPMCliPackageJson) {
     const overrides = (pkgJson as any)?.resolutions ?? {}
     return { type: 'yarn/berry', overrides }
   },
   // npm overrides documentation:
   // https://docs.npmjs.com/cli/v10/configuring-npm/package-json#overrides
-  npm(pkgJson: PackageJsonContent) {
+  npm(pkgJson: NPMCliPackageJson) {
     const overrides = (pkgJson as any)?.overrides ?? {}
     return { type: 'npm', overrides }
   },
   // pnpm overrides documentation:
   // https://pnpm.io/package_json#pnpmoverrides
-  pnpm(pkgJson: PackageJsonContent) {
+  pnpm(pkgJson: NPMCliPackageJson) {
     const overrides = (pkgJson as any)?.pnpm?.overrides ?? {}
     return { type: 'pnpm', overrides }
   },
-  vlt(pkgJson: PackageJsonContent) {
+  vlt(pkgJson: NPMCliPackageJson) {
     const overrides = (pkgJson as any)?.overrides ?? {}
     return { type: 'vlt', overrides }
   },
   // Yarn resolutions documentation:
   // https://yarnpkg.com/configuration/manifest#resolutions
-  'yarn/berry'(pkgJson: PackageJsonContent) {
+  'yarn/berry'(pkgJson: NPMCliPackageJson) {
     const overrides = (pkgJson as any)?.resolutions ?? {}
     return { type: 'yarn/berry', overrides }
   },
   // Yarn resolutions documentation:
   // https://classic.yarnpkg.com/en/docs/selective-version-resolutions
-  'yarn/classic'(pkgJson: PackageJsonContent) {
+  'yarn/classic'(pkgJson: NPMCliPackageJson) {
     const overrides = (pkgJson as any)?.resolutions ?? {}
     return { type: 'yarn/classic', overrides }
   }
@@ -335,7 +332,7 @@ function createActionMessage(
   return `${verb} ${overrideCount} Socket.dev optimized overrides${workspaceCount ? ` in ${workspaceCount} workspace${workspaceCount > 1 ? 's' : ''}` : ''}`
 }
 
-function getDependencyEntries(pkgJson: PackageJsonContent) {
+function getDependencyEntries(pkgJson: NPMCliPackageJson) {
   const {
     dependencies,
     devDependencies,
@@ -367,7 +364,7 @@ function getDependencyEntries(pkgJson: PackageJsonContent) {
 async function getWorkspaceGlobs(
   agent: Agent,
   pkgPath: string,
-  pkgJson: PackageJsonContent
+  pkgJson: NPMCliPackageJson
 ): Promise<string[] | undefined> {
   let workspacePatterns
   if (agent === 'pnpm') {
@@ -471,7 +468,7 @@ async function addOverrides(
     editablePkgJson = await EditablePackageJson.load(pkgPath)
   }
   const { spinner } = state
-  const pkgJson: Readonly<PackageJsonContent> = editablePkgJson.content
+  const pkgJson: Readonly<NPMCliPackageJson> = editablePkgJson.content
   const isRoot = pkgPath === rootPath
   const isLockScanned = isRoot && !prod
   const workspaceName = path.relative(rootPath, pkgPath)
@@ -621,7 +618,7 @@ async function addOverrides(
     })
   }
   if (state.added.size > 0 || state.updated.size > 0) {
-    editablePkgJson.update(<PackageJsonContent>Object.fromEntries(depEntries))
+    editablePkgJson.update(<NPMCliPackageJson>Object.fromEntries(depEntries))
     for (const { overrides, type } of overridesDataObjects) {
       updateManifestByAgent[type](editablePkgJson, toSortedObject(overrides))
     }
@@ -630,61 +627,6 @@ async function addOverrides(
   return state
 }
 
-// type ExtractOptions = pacote.Options & {
-//   tmpPrefix?: string
-//   [key: string]: any
-// }
-
-// async function extractPackage(pkgNameOrId: string, options: ExtractOptions | undefined, callback: (tmpDirPath: string) => any) {
-//   if (arguments.length === 2 && typeof options === 'function') {
-//     callback = options
-//     options = undefined
-//   }
-//   const { tmpPrefix, ...extractOptions } = { __proto__: null, ...options }
-//   // cacache.tmp.withTmp DOES return a promise.
-//   await cacache.tmp.withTmp(
-//     pacoteCachePath,
-//     { tmpPrefix },
-//     // eslint-disable-next-line @typescript-eslint/no-misused-promises
-//     async tmpDirPath => {
-//       await pacote.extract(pkgNameOrId, tmpDirPath, {
-//         __proto__: null,
-//         packumentCache,
-//         preferOffline: true,
-//         ...<Omit<typeof extractOptions, '__proto__'>>extractOptions
-//       })
-//       await callback(tmpDirPath)
-//     }
-//   )
-// }
-
-type FetchPackageManifestOptions = {
-  signal?: AbortSignal
-}
-
-async function fetchPackageManifest(
-  pkgNameOrId: string,
-  options?: FetchPackageManifestOptions
-) {
-  const pacoteOptions = <PacoteOptions & { signal?: AbortSignal }>{
-    ...options,
-    packumentCache,
-    preferOffline: true
-  }
-  const { signal } = pacoteOptions
-  if (signal?.aborted) {
-    return null
-  }
-  let result
-  try {
-    result = await pacote.manifest(pkgNameOrId, pacoteOptions)
-  } catch {}
-  if (signal?.aborted) {
-    return null
-  }
-  return result
-}
-
 export const optimize: CliSubcommand = {
   description: 'Optimize dependencies with @socketregistry overrides',
   async run(argv, importMeta, { parentName }) {