Add test-script flag to fix command

Author: jdalton

src/commands/fix/cmd-fix.ts

@@ -15,7 +15,12 @@ const config: CliCommandConfig = {
   description: 'Fix "fixable" Socket alerts',
   hidden: true,
   flags: {
-    ...commonFlags
+    ...commonFlags,
+    testScript: {
+      type: 'string',
+      default: 'test',
+      description: 'The test script to run for each fix attempt'
+    }
   },
   help: (command, config) => `
     Usage
@@ -49,5 +54,7 @@ async function run(
     return
   }
 
-  await runFix()
+  await runFix({
+    testScript: cli.flags['testScript'] as string | undefined
+  })
 }

src/commands/fix/npm-fix.ts

@@ -29,15 +29,20 @@ function isTopLevel(tree: SafeNode, node: SafeNode): boolean {
 }
 
 type NpmFixOptions = {
+  cwd?: string | undefined
   spinner?: Spinner | undefined
+  testScript?: string | undefined
 }
 
 export async function npmFix(
   _pkgEnvDetails: EnvDetails,
-  cwd: string,
   options?: NpmFixOptions | undefined
 ) {
-  const { spinner } = { __proto__: null, ...options } as NpmFixOptions
+  const {
+    cwd = process.cwd(),
+    spinner,
+    testScript = 'test'
+  } = { __proto__: null, ...options } as NpmFixOptions
 
   spinner?.start()
 
@@ -113,7 +118,7 @@ export async function npmFix(
         ) {
           try {
             // eslint-disable-next-line no-await-in-loop
-            await runScript('test', [], { spinner, stdio: 'ignore' })
+            await runScript(testScript, [], { spinner, stdio: 'ignore' })
 
             spinner?.info(`Patched ${name} ${oldVersion} -> ${node.version}`)
 

src/commands/fix/pnpm-fix.ts

@@ -1,6 +1,7 @@
 import { readWantedLockfile } from '@pnpm/lockfile.fs'
 
 import { getManifestData } from '@socketsecurity/registry'
+import { runScript } from '@socketsecurity/registry/lib/npm'
 import {
   fetchPackagePackument,
   readPackageJson
@@ -25,15 +26,20 @@ import type { Spinner } from '@socketsecurity/registry/lib/spinner'
 const { NPM, OVERRIDES, PNPM } = constants
 
 type PnpmFixOptions = {
+  cwd?: string | undefined
   spinner?: Spinner | undefined
+  testScript?: string | undefined
 }
 
 export async function pnpmFix(
   pkgEnvDetails: EnvDetails,
-  cwd: string,
   options?: PnpmFixOptions | undefined
 ) {
-  const { spinner } = { __proto__: null, ...options } as PnpmFixOptions
+  const {
+    cwd = process.cwd(),
+    spinner,
+    testScript = 'test'
+  } = { __proto__: null, ...options } as PnpmFixOptions
 
   spinner?.start()
 
@@ -125,6 +131,8 @@ export async function pnpmFix(
                 }
               }
             })
+            // eslint-disable-next-line no-await-in-loop
+            await runScript(testScript, [], { spinner, stdio: 'ignore' })
 
             spinner?.info(`Patched ${name} ${oldVersion} -> ${node.version}`)
 

src/commands/fix/run-fix.ts

@@ -9,14 +9,12 @@ const { NPM, PNPM } = constants
 
 const CMD_NAME = 'socket fix'
 
-export async function runFix() {
+export async function runFix({ cwd = process.cwd(), testScript = 'test' }) {
   // Lazily access constants.spinner.
   const { spinner } = constants
 
   spinner.start()
 
-  const cwd = process.cwd()
-
   const pkgEnvDetails = await detectAndValidatePackageEnvironment(cwd, {
     cmdName: CMD_NAME,
     logger
@@ -28,11 +26,15 @@ export async function runFix() {
 
   switch (pkgEnvDetails.agent) {
     case NPM: {
-      await npmFix(pkgEnvDetails, cwd)
+      await npmFix(pkgEnvDetails, {
+        testScript
+      })
       break
     }
     case PNPM: {
-      await pnpmFix(pkgEnvDetails, cwd)
+      await pnpmFix(pkgEnvDetails, {
+        testScript
+      })
       break
     }
   }