Add safe overrides to arborist use

Author: jdalton

src/commands/fix/agent-fix.mts

@@ -286,7 +286,7 @@ export async function agentFix(
       )
 
       if (!oldVersions.length) {
-        debugFn('notice', `skip: ${name} not found\n`)
+        debugFn('notice', `skip: ${name} not found`)
         cleanupInfoEntriesLoop()
         // Skip to next package.
         continue infoEntriesLoop

src/commands/fix/get-actual-tree.mts

@@ -1,7 +1,5 @@
-import {
-  Arborist,
-  SAFE_ARBORIST_REIFY_OPTIONS_OVERRIDES,
-} from '../../shadow/npm/arborist/index.mts'
+import { Arborist } from '../../shadow/npm/arborist/index.mts'
+import { SAFE_NO_SAVE_ARBORIST_REIFY_OPTIONS_OVERRIDES } from '../../shadow/npm/arborist/lib/arborist/index.mts'
 
 import type { NodeClass } from '../../shadow/npm/arborist/types.mts'
 
@@ -14,7 +12,7 @@ export async function getActualTree(
   // of the node_modules folder.
   const arb = new Arborist({
     path: cwd,
-    ...SAFE_ARBORIST_REIFY_OPTIONS_OVERRIDES,
+    ...SAFE_NO_SAVE_ARBORIST_REIFY_OPTIONS_OVERRIDES,
   })
   return await arb.loadActual()
 }

src/commands/fix/npm-fix.mts

@@ -4,6 +4,7 @@ import { agentFix } from './agent-fix.mts'
 import { getActualTree } from './get-actual-tree.mts'
 import { getFixAlertsMapOptions } from './shared.mts'
 import { Arborist } from '../../shadow/npm/arborist/index.mts'
+import { SAFE_WITH_SAVE_ARBORIST_REIFY_OPTIONS_OVERRIDES } from '../../shadow/npm/arborist/lib/arborist/index.mts'
 import {
   findPackageNode,
   getAlertsMapFromArborist,
@@ -67,6 +68,7 @@ export async function npmFix(
       const arb = new Arborist({
         path: pkgEnvDetails.pkgPath,
         ...flatConfig,
+        ...SAFE_WITH_SAVE_ARBORIST_REIFY_OPTIONS_OVERRIDES,
       })
       actualTree = await arb.reify()
       // Calling arb.reify() creates the arb.diff object, nulls-out arb.idealTree,
@@ -114,6 +116,7 @@ export async function npmFix(
           const arb = new Arborist({
             path: pkgEnvDetails.pkgPath,
             ...flatConfig,
+            ...SAFE_WITH_SAVE_ARBORIST_REIFY_OPTIONS_OVERRIDES,
           })
           const idealTree = await arb.buildIdealTree()
           const node = findPackageNode(idealTree, packument.name, oldVersion)

src/shadow/npm/arborist/index.mts

@@ -19,18 +19,6 @@ import type { EdgeClass, NodeClass, OverrideSetClass } from './types.mts'
 
 const require = createRequire(import.meta.url)
 
-export const SAFE_ARBORIST_REIFY_OPTIONS_OVERRIDES = {
-  __proto__: null,
-  audit: false,
-  dryRun: true,
-  fund: false,
-  ignoreScripts: true,
-  progress: false,
-  save: false,
-  saveBundle: false,
-  silent: true,
-}
-
 export { Arborist, SafeArborist }
 
 export const Edge: EdgeClass = UntypedEdge

src/shadow/npm/arborist/lib/arborist/index.mts

@@ -24,7 +24,7 @@ const {
   [kInternalsSymbol as unknown as 'Symbol(kInternalsSymbol)']: { getIpc },
 } = constants
 
-export const SAFE_ARBORIST_REIFY_OPTIONS_OVERRIDES = {
+export const SAFE_NO_SAVE_ARBORIST_REIFY_OPTIONS_OVERRIDES = {
   __proto__: null,
   audit: false,
   dryRun: true,
@@ -36,6 +36,14 @@ export const SAFE_ARBORIST_REIFY_OPTIONS_OVERRIDES = {
   silent: true,
 }
 
+export const SAFE_WITH_SAVE_ARBORIST_REIFY_OPTIONS_OVERRIDES = {
+  // @ts-ignore
+  __proto__: null,
+  ...SAFE_NO_SAVE_ARBORIST_REIFY_OPTIONS_OVERRIDES,
+  dryRun: false,
+  save: true,
+}
+
 export const kCtorArgs = Symbol('ctorArgs')
 
 export const kRiskyReify = Symbol('riskyReify')
@@ -51,7 +59,7 @@ export class SafeArborist extends Arborist {
         path:
           (ctorArgs.length ? ctorArgs[0]?.path : undefined) ?? process.cwd(),
         ...(ctorArgs.length ? ctorArgs[0] : undefined),
-        ...SAFE_ARBORIST_REIFY_OPTIONS_OVERRIDES,
+        ...SAFE_NO_SAVE_ARBORIST_REIFY_OPTIONS_OVERRIDES,
       },
       ...ctorArgs.slice(1),
     )
@@ -97,7 +105,7 @@ export class SafeArborist extends Arborist {
     await super.reify(
       {
         ...options,
-        ...SAFE_ARBORIST_REIFY_OPTIONS_OVERRIDES,
+        ...SAFE_NO_SAVE_ARBORIST_REIFY_OPTIONS_OVERRIDES,
         progress: false,
       },
       // @ts-ignore: TypeScript gets grumpy about rest parameters.