refactor(plugin-js-packages): simplify command args definition

Author: matejchalk

packages/plugin-js-packages/src/lib/package-managers/constants.ts

@@ -1,7 +1,6 @@
 import { objectToKeys } from '@code-pushup/utils';
 import type { DependencyGroup } from '../../config.js';
 import { filterAuditResult } from '../../runner/utils.js';
-import { COMMON_AUDIT_ARGS, COMMON_OUTDATED_ARGS } from '../constants.js';
 import type { AuditResults, PackageManager } from '../types.js';
 import { npmToAuditResult } from './audit-result.js';
 import { npmToOutdatedResult } from './outdated-result.js';
@@ -24,9 +23,10 @@ export const npmPackageManager: PackageManager = {
   },
   audit: {
     getCommandArgs: groupDep => [
-      ...COMMON_AUDIT_ARGS,
+      'audit',
       ...npmDependencyOptions[groupDep],
       '--audit-level=none',
+      '--json',
     ],
     unifyResult: npmToAuditResult,
     // prod dependencies need to be filtered out manually since v10
@@ -49,7 +49,7 @@ export const npmPackageManager: PackageManager = {
     },
   },
   outdated: {
-    commandArgs: [...COMMON_OUTDATED_ARGS, '--long'],
+    commandArgs: ['outdated', '--long', '--json'],
     unifyResult: npmToOutdatedResult,
   },
 };

packages/plugin-js-packages/src/lib/package-managers/npm/npm.ts

@@ -1,7 +1,6 @@
 import { objectToKeys } from '@code-pushup/utils';
 import type { DependencyGroup } from '../../config.js';
 import { filterAuditResult } from '../../runner/utils.js';
-import { COMMON_AUDIT_ARGS, COMMON_OUTDATED_ARGS } from '../constants.js';
 import type { AuditResults, PackageManager } from '../types.js';
 import { pnpmToAuditResult } from './audit-result.js';
 import { pnpmToOutdatedResult } from './outdated-result.js';
@@ -24,8 +23,9 @@ export const pnpmPackageManager: PackageManager = {
   },
   audit: {
     getCommandArgs: groupDep => [
-      ...COMMON_AUDIT_ARGS,
+      'audit',
       ...pnpmDependencyOptions[groupDep],
+      '--json',
     ],
     ignoreExitCode: true,
     unifyResult: pnpmToAuditResult,
@@ -49,7 +49,7 @@ export const pnpmPackageManager: PackageManager = {
     },
   },
   outdated: {
-    commandArgs: COMMON_OUTDATED_ARGS,
+    commandArgs: ['outdated', '--json'],
     unifyResult: pnpmToOutdatedResult,
   },
 };

packages/plugin-js-packages/src/lib/package-managers/pnpm/pnpm.ts

@@ -1,5 +1,4 @@
 import { dependencyGroupToLong } from '../../constants.js';
-import { COMMON_AUDIT_ARGS, COMMON_OUTDATED_ARGS } from '../constants.js';
 import type { PackageManager } from '../types.js';
 import { yarnClassicToAuditResult } from './audit-result.js';
 import { yarnClassicToOutdatedResult } from './outdated-result.js';
@@ -16,15 +15,15 @@ export const yarnClassicPackageManager: PackageManager = {
   },
   audit: {
     getCommandArgs: groupDep => [
-      ...COMMON_AUDIT_ARGS,
-      '--groups',
-      dependencyGroupToLong[groupDep],
+      'audit',
+      `--groups=${dependencyGroupToLong[groupDep]}`,
+      '--json',
     ],
     ignoreExitCode: true,
     unifyResult: yarnClassicToAuditResult,
   },
   outdated: {
-    commandArgs: COMMON_OUTDATED_ARGS,
+    commandArgs: ['outdated', '--json'],
     unifyResult: yarnClassicToOutdatedResult,
   },
 };

packages/plugin-js-packages/src/lib/package-managers/yarn-classic/yarn-classic.ts

@@ -1,6 +1,5 @@
 // Yarn v2 does not currently audit optional dependencies
 import type { DependencyGroup } from '../../config.js';
-import { COMMON_AUDIT_ARGS, COMMON_OUTDATED_ARGS } from '../constants.js';
 import type { PackageManager } from '../types.js';
 import { yarnBerryToAuditResult } from './audit-result.js';
 import { yarnBerryToOutdatedResult } from './outdated-result.js';
@@ -23,18 +22,25 @@ export const yarnModernPackageManager: PackageManager = {
     outdated: 'https://github.com/mskelton/yarn-plugin-outdated',
   },
   audit: {
-    getCommandArgs: groupDep => [
-      'npm',
-      ...COMMON_AUDIT_ARGS,
-      '--environment',
-      yarnModernEnvironmentOptions[groupDep],
-    ],
+    getCommandArgs: groupDep => {
+      const environment = yarnModernEnvironmentOptions[groupDep];
+      return [
+        'npm',
+        'audit',
+        ...(environment ? [`--environment=${environment}`] : []),
+        '--json',
+      ];
+    },
     supportedDepGroups: ['prod', 'dev'], // Yarn v2 does not support audit for optional dependencies
     unifyResult: yarnBerryToAuditResult,
     ignoreExitCode: true,
   },
   outdated: {
-    commandArgs: [...COMMON_OUTDATED_ARGS, '--workspace=.'], // filter out other packages in case of Yarn workspaces
+    commandArgs: [
+      'outdated',
+      '--workspace=.', // filter out other packages in case of Yarn workspaces
+      '--json',
+    ],
     unifyResult: yarnBerryToOutdatedResult,
   },
 };