Add pkgJson to get-overrides-by-agent

Author: jdalton

src/commands/optimize/get-overrides-by-agent.mts

@@ -2,6 +2,7 @@ import constants from '../../constants.mts'
 
 import type { NpmOverrides, Overrides, PnpmOrYarnOverrides } from './types.mts'
 import type { Agent, EnvDetails } from '../../utils/package-environment.mts'
+import type { PackageJson } from '@socketsecurity/registry/lib/packages'
 
 const {
   BUN,
@@ -14,55 +15,67 @@ const {
   YARN_CLASSIC,
 } = constants
 
-function getOverridesDataBun(pkgEnvDetails: EnvDetails) {
-  const overrides =
-    pkgEnvDetails.editablePkgJson.content?.[RESOLUTIONS] ??
-    ({} as PnpmOrYarnOverrides)
+function getOverridesDataBun(
+  pkgEnvDetails: EnvDetails,
+  pkgJson = pkgEnvDetails.editablePkgJson.content,
+) {
+  const overrides = pkgJson?.[RESOLUTIONS] ?? ({} as PnpmOrYarnOverrides)
   return { type: YARN_BERRY, overrides }
 }
 
 // npm overrides documentation:
 // https://docs.npmjs.com/cli/v10/configuring-npm/package-json#overrides
-function getOverridesDataNpm(pkgEnvDetails: EnvDetails) {
-  const overrides =
-    pkgEnvDetails.editablePkgJson.content?.[OVERRIDES] ?? ({} as NpmOverrides)
+function getOverridesDataNpm(
+  pkgEnvDetails: EnvDetails,
+  pkgJson = pkgEnvDetails.editablePkgJson.content,
+) {
+  const overrides = pkgJson?.[OVERRIDES] ?? ({} as NpmOverrides)
   return { type: NPM, overrides }
 }
 
 // pnpm overrides documentation:
 // https://pnpm.io/package_json#pnpmoverrides
-function getOverridesDataPnpm(pkgEnvDetails: EnvDetails) {
+function getOverridesDataPnpm(
+  pkgEnvDetails: EnvDetails,
+  pkgJson = pkgEnvDetails.editablePkgJson.content,
+) {
   const overrides =
-    (pkgEnvDetails.editablePkgJson.content as any)?.[PNPM]?.[OVERRIDES] ??
-    ({} as PnpmOrYarnOverrides)
+    (pkgJson as any)?.[PNPM]?.[OVERRIDES] ?? ({} as PnpmOrYarnOverrides)
   return { type: PNPM, overrides }
 }
 
-function getOverridesDataVlt(pkgEnvDetails: EnvDetails) {
-  const overrides =
-    pkgEnvDetails.editablePkgJson.content?.[OVERRIDES] ?? ({} as NpmOverrides)
+function getOverridesDataVlt(
+  pkgEnvDetails: EnvDetails,
+  pkgJson = pkgEnvDetails.editablePkgJson.content,
+) {
+  const overrides = pkgJson?.[OVERRIDES] ?? ({} as NpmOverrides)
   return { type: VLT, overrides }
 }
 
 // Yarn resolutions documentation:
 // https://yarnpkg.com/configuration/manifest#resolutions
-function getOverridesDataYarn(pkgEnvDetails: EnvDetails) {
-  const overrides =
-    pkgEnvDetails.editablePkgJson.content?.[RESOLUTIONS] ??
-    ({} as PnpmOrYarnOverrides)
+function getOverridesDataYarn(
+  pkgEnvDetails: EnvDetails,
+  pkgJson = pkgEnvDetails.editablePkgJson.content,
+) {
+  const overrides = pkgJson?.[RESOLUTIONS] ?? ({} as PnpmOrYarnOverrides)
   return { type: YARN_BERRY, overrides }
 }
 
 // Yarn resolutions documentation:
 // https://classic.yarnpkg.com/en/docs/selective-version-resolutions
-function getOverridesDataYarnClassic(pkgEnvDetails: EnvDetails) {
-  const overrides =
-    pkgEnvDetails.editablePkgJson.content?.[RESOLUTIONS] ??
-    ({} as PnpmOrYarnOverrides)
+function getOverridesDataYarnClassic(
+  pkgEnvDetails: EnvDetails,
+  pkgJson = pkgEnvDetails.editablePkgJson.content,
+) {
+  const overrides = pkgJson?.[RESOLUTIONS] ?? ({} as PnpmOrYarnOverrides)
   return { type: YARN_CLASSIC, overrides }
 }
 
-export type GetOverrides = (pkgEnvDetails: EnvDetails) => GetOverridesResult
+export type GetOverrides = (
+  pkgEnvDetails: EnvDetails,
+  pkgJson?: PackageJson | undefined,
+) => GetOverridesResult
 
 export type GetOverridesResult = { type: Agent; overrides: Overrides }