backport --exclude and --include flags for socket fix to v1

Author: mtorp

src/commands/fix/cmd-fix.mts

@@ -131,10 +131,20 @@ const hiddenFlags: MeowFlags = {
     ...generalFlags['id'],
     hidden: true,
   } as MeowFlag,
-  glob: {
+  exclude: {
     type: 'string',
-    default: '',
-    description: 'Glob pattern to filter workspaces by',
+    default: [],
+    description:
+      'Exclude workspaces matching these patterns. Can be provided as comma separated values or as multiple flags',
+    isMultiple: true,
+    hidden: true,
+  },
+  include: {
+    type: 'string',
+    default: [],
+    description:
+      'Include workspaces matching these patterns. Can be provided as comma separated values or as multiple flags',
+    isMultiple: true,
     hidden: true,
   },
   maxSatisfying: {
@@ -246,7 +256,8 @@ async function run(
   const {
     applyFixes,
     autopilot,
-    glob,
+    exclude,
+    include,
     json,
     limit,
     majorUpdates,
@@ -261,21 +272,22 @@ async function run(
     // socket-cli/patches/meow#13.2.0.patch.
     unknownFlags = [],
   } = cli.flags as {
-    autopilot: boolean
     applyFixes: boolean
-    glob: string
-    limit: number
+    autopilot: boolean
+    exclude: string[]
+    include: string[]
     json: boolean
+    limit: number
     majorUpdates: boolean
     markdown: boolean
     maxSatisfying: boolean
     minSatisfying: boolean
+    minimumReleaseAge: string
+    outputFile: string
     prCheck: boolean
     rangeStyle: RangeStyle
     showAffectedDirectDependencies: boolean
     unknownFlags?: string[]
-    outputFile: string
-    minimumReleaseAge: string
   }
 
   const dryRun = !!cli.flags['dryRun']
@@ -334,23 +346,27 @@ async function run(
     ...cmdFlagValueToArray(cli.flags['purl']),
   ])
 
+  const includePatterns = cmdFlagValueToArray(include)
+  const excludePatterns = cmdFlagValueToArray(exclude)
+
   await handleFix({
-    autopilot,
     applyFixes,
+    autopilot,
     cwd,
     disableMajorUpdates,
+    exclude: excludePatterns,
     ghsas,
-    glob,
+    include: includePatterns,
     limit,
     minimumReleaseAge,
     minSatisfying,
-    prCheck,
     orgSlug,
+    outputFile,
     outputKind,
+    prCheck,
     rangeStyle,
     showAffectedDirectDependencies,
     spinner,
     unknownFlags,
-    outputFile,
   })
 }

src/commands/fix/coana-fix.mts

@@ -47,8 +47,9 @@ export async function coanaFix(
     autopilot,
     cwd,
     disableMajorUpdates,
+    exclude,
     ghsas,
-    glob,
+    include,
     limit,
     minimumReleaseAge,
     orgSlug,
@@ -148,7 +149,8 @@ export async function coanaFix(
         ...(minimumReleaseAge
           ? ['--minimum-release-age', minimumReleaseAge]
           : []),
-        ...(glob ? ['--glob', glob] : []),
+        ...(include.length ? ['--include', ...include] : []),
+        ...(exclude.length ? ['--exclude', ...exclude] : []),
         ...(!applyFixes ? [FLAG_DRY_RUN] : []),
         ...(outputFile ? ['--output-file', outputFile] : []),
         ...(disableMajorUpdates ? ['--disable-major-updates'] : []),
@@ -207,7 +209,8 @@ export async function coanaFix(
         ...(minimumReleaseAge
           ? ['--minimum-release-age', minimumReleaseAge]
           : []),
-        ...(glob ? ['--glob', glob] : []),
+        ...(include.length ? ['--include', ...include] : []),
+        ...(exclude.length ? ['--exclude', ...exclude] : []),
         ...(disableMajorUpdates ? ['--disable-major-updates'] : []),
         ...(showAffectedDirectDependencies
           ? ['--show-affected-direct-dependencies']
@@ -271,7 +274,8 @@ export async function coanaFix(
         ...(minimumReleaseAge
           ? ['--minimum-release-age', minimumReleaseAge]
           : []),
-        ...(glob ? ['--glob', glob] : []),
+        ...(include.length ? ['--include', ...include] : []),
+        ...(exclude.length ? ['--exclude', ...exclude] : []),
         ...(disableMajorUpdates ? ['--disable-major-updates'] : []),
         ...(showAffectedDirectDependencies
           ? ['--show-affected-direct-dependencies']

src/commands/fix/handle-fix.mts

@@ -18,12 +18,9 @@ export type HandleFixConfig = Remap<
   FixConfig & {
     applyFixes: boolean
     ghsas: string[]
-    glob: string
     orgSlug: string
     outputKind: OutputKind
     unknownFlags: string[]
-    outputFile: string
-    minimumReleaseAge: string
   }
 >
 
@@ -103,8 +100,9 @@ export async function handleFix({
   autopilot,
   cwd,
   disableMajorUpdates,
+  exclude,
   ghsas,
-  glob,
+  include,
   limit,
   minSatisfying,
   minimumReleaseAge,
@@ -119,14 +117,16 @@ export async function handleFix({
 }: HandleFixConfig) {
   debugFn('notice', `Starting fix command for ${orgSlug}`)
   debugDir('inspect', {
+    applyFixes,
     autopilot,
     cwd,
     disableMajorUpdates,
+    exclude,
     ghsas,
-    glob,
+    include,
     limit,
     minSatisfying,
-    applyFixes,
+    minimumReleaseAge,
     outputFile,
     outputKind,
     prCheck,
@@ -137,23 +137,24 @@ export async function handleFix({
 
   await outputFixResult(
     await coanaFix({
-      autopilot,
       applyFixes,
+      autopilot,
       cwd,
       disableMajorUpdates,
-      // Convert mixed CVE/GHSA/PURL inputs to GHSA IDs only
+      exclude,
+      // Convert mixed CVE/GHSA/PURL inputs to GHSA IDs only.
       ghsas: await convertIdsToGhsas(ghsas),
-      glob,
+      include,
       limit,
       minimumReleaseAge,
       minSatisfying,
       orgSlug,
+      outputFile,
       prCheck,
       rangeStyle,
       showAffectedDirectDependencies,
       spinner,
       unknownFlags,
-      outputFile,
     }),
     outputKind,
   )

src/commands/fix/types.mts

@@ -2,20 +2,21 @@ import type { RangeStyle } from '../../utils/semver.mts'
 import type { Spinner } from '@socketsecurity/registry/lib/spinner'
 
 export type FixConfig = {
-  autopilot: boolean
   applyFixes: boolean
+  autopilot: boolean
   cwd: string
   disableMajorUpdates: boolean
+  exclude: string[]
   ghsas: string[]
-  glob: string
+  include: string[]
   limit: number
   minimumReleaseAge: string
   minSatisfying: boolean
   orgSlug: string
+  outputFile: string
   prCheck: boolean
   rangeStyle: RangeStyle
   showAffectedDirectDependencies: boolean
   spinner: Spinner | undefined
   unknownFlags: string[]
-  outputFile: string
 }