Fix meow patch and test fails

jdalton · jdalton · commit 6ab059aae17b · 2025-06-27T16:19:40.000-04:00
diff --git a/patches/meow#13.2.0.patch b/patches/meow#13.2.0.patch
@@ -47,17 +47,31 @@ Index: /meow/build/index.js
  const buildResult = (options, parserOptions) => {
  	const {pkg: package_} = options;
  	const argv = yargsParser(options.argv, parserOptions);
-@@ -54,8 +54,9 @@
+@@ -54,8 +54,23 @@
  		checkUnknownFlags(input);
  	}
  
  	const flags = camelcaseKeys(argv, {exclude: ['--', /^\w$/]});
-+	const unknownFlags = options.collectUnknownFlags ? collectUnknownFlags(input) : [];
++	const unknownFlags = options.collectUnknownFlags
++    ? collectUnknownFlags(
++        options.allowUnknownFlags
++          ? yargsParser(
++              options.argv,
++              buildParserOptions({
++                ...options,
++                allowUnknownFlags: false,
++                autoHelp: false,
++                autoVersion: false
++              })
++            )._
++          : input
++      )
++    : [];
  	const unnormalizedFlags = {...flags};
  
  	validate(flags, options);
  
-@@ -73,8 +74,9 @@
+@@ -73,8 +88,9 @@
  
  	return {
  		input,
@@ -67,21 +81,6 @@ Index: /meow/build/index.js
  		pkg: package_,
  		help,
  		showHelp,
-Index: /meow/build/parser.js
-===================================================================
---- /meow/build/parser.js
-+++ /meow/build/parser.js
-@@ -72,9 +72,9 @@
- 	if (parserOptions['--']) {
- 		parserOptions.configuration['populate--'] = true;
- 	}
- 
--	if (!options.allowUnknownFlags) {
-+	if (!options.allowUnknownFlags || options.collectUnknownFlags) {
- 		// Collect unknown options in `argv._` to be checked later.
- 		parserOptions.configuration['unknown-options-as-args'] = true;
- 	}
- 
 Index: /meow/build/validate.js
 ===================================================================
 --- /meow/build/validate.js
diff --git a/src/commands/fix/cmd-fix.mts b/src/commands/fix/cmd-fix.mts
@@ -20,78 +20,76 @@ import type { RangeStyle } from '../../utils/semver.mts'
 
 const { DRY_RUN_NOT_SAVING } = constants
 
-const flags: CliCommandConfig['flags'] = {
-  ...commonFlags,
-  autoMerge: {
-    type: 'boolean',
-    default: false,
-    description: `Enable auto-merge for pull requests that Socket opens.\n                        See ${terminalLink(
-      'GitHub documentation',
-      'https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-auto-merge-for-pull-requests-in-your-repository',
-    )} for managing auto-merge for pull requests in your repository.`,
-  },
-  autopilot: {
-    type: 'boolean',
-    default: false,
-    description: `Shorthand for --autoMerge --test`,
-  },
-  ghsa: {
-    type: 'string',
-    default: [],
-    description: `Provide a list of ${terminalLink(
-      'GHSA IDs',
-      'https://docs.github.com/en/code-security/security-advisories/working-with-global-security-advisories-from-the-github-advisory-database/about-the-github-advisory-database#about-ghsa-ids',
-    )} to compute fixes for, as either a comma separated value or as multiple flags.\n                        Use '--ghsa auto' to automatically lookup GHSA IDs and compute fixes for them.`,
-    isMultiple: true,
-  },
-  limit: {
-    type: 'number',
-    default: Infinity,
-    description: 'The number of fixes to attempt at a time',
-  },
-  purl: {
-    type: 'string',
-    default: [],
-    description: `Provide a list of ${terminalLink(
-      'PURLs',
-      'https://github.com/package-url/purl-spec?tab=readme-ov-file#purl',
-    )} to compute fixes for, as either a comma separated value or as multiple flags,\n                        instead of querying the Socket API`,
-    isMultiple: true,
-    shortFlag: 'p',
-  },
-  rangeStyle: {
-    type: 'string',
-    default: 'preserve',
-    description: `
-                      Define how updated dependency versions should be written in package.json.
-                      Available styles:
-                        * caret - Use ^ range for compatible updates (e.g. ^1.2.3)
-                        * gt - Use > to allow any newer version (e.g. >1.2.3)
-                        * gte - Use >= to allow any newer version (e.g. >=1.2.3)
-                        * lt - Use < to allow only lower versions (e.g. <1.2.3)
-                        * lte - Use <= to allow only lower versions (e.g. <=1.2.3)
-                        * pin - Use the exact version (e.g. 1.2.3)
-                        * preserve - Retain the existing version range style as-is
-                        * tilde - Use ~ range for patch/minor updates (e.g. ~1.2.3)
-    `.trim(),
-  },
-  test: {
-    type: 'boolean',
-    default: false,
-    description: 'Verify the fix by running unit tests',
-  },
-  testScript: {
-    type: 'string',
-    default: 'test',
-    description: 'The test script to run for each fix attempt',
-  },
-}
-
 const config: CliCommandConfig = {
   commandName: 'fix',
   description: 'Update dependencies with "fixable" Socket alerts',
   hidden: false,
-  flags,
+  flags: {
+    ...commonFlags,
+    autoMerge: {
+      type: 'boolean',
+      default: false,
+      description: `Enable auto-merge for pull requests that Socket opens.\n                        See ${terminalLink(
+        'GitHub documentation',
+        'https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-auto-merge-for-pull-requests-in-your-repository',
+      )} for managing auto-merge for pull requests in your repository.`,
+    },
+    autopilot: {
+      type: 'boolean',
+      default: false,
+      description: `Shorthand for --autoMerge --test`,
+    },
+    ghsa: {
+      type: 'string',
+      default: [],
+      description: `Provide a list of ${terminalLink(
+        'GHSA IDs',
+        'https://docs.github.com/en/code-security/security-advisories/working-with-global-security-advisories-from-the-github-advisory-database/about-the-github-advisory-database#about-ghsa-ids',
+      )} to compute fixes for, as either a comma separated value or as multiple flags.\n                        Use '--ghsa auto' to automatically lookup GHSA IDs and compute fixes for them.`,
+      isMultiple: true,
+    },
+    limit: {
+      type: 'number',
+      default: Infinity,
+      description: 'The number of fixes to attempt at a time',
+    },
+    purl: {
+      type: 'string',
+      default: [],
+      description: `Provide a list of ${terminalLink(
+        'PURLs',
+        'https://github.com/package-url/purl-spec?tab=readme-ov-file#purl',
+      )} to compute fixes for, as either a comma separated value or as multiple flags,\n                        instead of querying the Socket API`,
+      isMultiple: true,
+      shortFlag: 'p',
+    },
+    rangeStyle: {
+      type: 'string',
+      default: 'preserve',
+      description: `
+                        Define how updated dependency versions should be written in package.json.
+                        Available styles:
+                          * caret - Use ^ range for compatible updates (e.g. ^1.2.3)
+                          * gt - Use > to allow any newer version (e.g. >1.2.3)
+                          * gte - Use >= to allow any newer version (e.g. >=1.2.3)
+                          * lt - Use < to allow only lower versions (e.g. <1.2.3)
+                          * lte - Use <= to allow only lower versions (e.g. <=1.2.3)
+                          * pin - Use the exact version (e.g. 1.2.3)
+                          * preserve - Retain the existing version range style as-is
+                          * tilde - Use ~ range for patch/minor updates (e.g. ~1.2.3)
+      `.trim(),
+    },
+    test: {
+      type: 'boolean',
+      default: false,
+      description: 'Verify the fix by running unit tests',
+    },
+    testScript: {
+      type: 'string',
+      default: 'test',
+      description: 'The test script to run for each fix attempt',
+    },
+  },
   help: (command, config) => `
     Usage
       $ ${command} [options] [CWD=.]
diff --git a/src/commands/raw-npm/cmd-raw-npm.mts b/src/commands/raw-npm/cmd-raw-npm.mts
@@ -2,6 +2,7 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 
 import { runRawNpm } from './run-raw-npm.mts'
 import constants from '../../constants.mts'
+import { commonFlags } from '../../flags.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
@@ -12,7 +13,9 @@ const config: CliCommandConfig = {
   commandName: 'raw-npm',
   description: `Temporarily disable the Socket ${NPM} wrapper`,
   hidden: false,
-  flags: {},
+  flags: {
+    ...commonFlags,
+  },
   help: command => `
     Usage
       $ ${command} ...
diff --git a/src/commands/raw-npx/cmd-raw-npx.mts b/src/commands/raw-npx/cmd-raw-npx.mts
@@ -2,6 +2,7 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 
 import { runRawNpx } from './run-raw-npx.mts'
 import constants from '../../constants.mts'
+import { commonFlags } from '../../flags.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
@@ -12,7 +13,9 @@ const config: CliCommandConfig = {
   commandName: 'raw-npx',
   description: `Temporarily disable the Socket ${NPX} wrapper`,
   hidden: false,
-  flags: {},
+  flags: {
+    ...commonFlags,
+  },
   help: command => `
     Usage
       $ ${command} ...
