@code-pushup/js-packages-plugin 0.69.3 → 0.69.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@code-pushup/js-packages-plugin",
-  "version": "0.69.3",
+  "version": "0.69.4",
   "description": "Code PushUp plugin for JavaScript packages 🛡️",
   "license": "MIT",
   "homepage": "https://github.com/code-pushup/cli/tree/main/packages/plugin-js-packages#readme",
@@ -37,8 +37,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@code-pushup/models": "0.69.3",
-    "@code-pushup/utils": "0.69.3",
+    "@code-pushup/models": "0.69.4",
+    "@code-pushup/utils": "0.69.4",
     "build-md": "^0.4.1",
     "semver": "^7.6.0",
     "yargs": "^17.7.2",

package/src/lib/package-managers/package-managers.js

@@ -1,11 +1,11 @@
 import { npmPackageManager } from './npm/npm.js';
 import { pnpmPackageManager } from './pnpm/pnpm.js';
-import { yarnv1PackageManager } from './yarn-classic/yarn-classic.js';
-import { yarnv2PackageManager } from './yarn-modern/yarn-modern.js';
+import { yarnClassicPackageManager } from './yarn-classic/yarn-classic.js';
+import { yarnModernPackageManager } from './yarn-modern/yarn-modern.js';
 export const packageManagers = {
     npm: npmPackageManager,
-    'yarn-classic': yarnv1PackageManager,
-    'yarn-modern': yarnv2PackageManager,
+    'yarn-classic': yarnClassicPackageManager,
+    'yarn-modern': yarnModernPackageManager,
     pnpm: pnpmPackageManager,
 };
 //# sourceMappingURL=package-managers.js.map

package/src/lib/package-managers/package-managers.js.map

@@ -1 +1 @@
-{"version":3,"file":"package-managers.js","sourceRoot":"","sources":["../../../../../../packages/plugin-js-packages/src/lib/package-managers/package-managers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,CAAC,MAAM,eAAe,GAA6C;IACvE,GAAG,EAAE,iBAAiB;IACtB,cAAc,EAAE,oBAAoB;IACpC,aAAa,EAAE,oBAAoB;IACnC,IAAI,EAAE,kBAAkB;CACzB,CAAC"}
+{"version":3,"file":"package-managers.js","sourceRoot":"","sources":["../../../../../../packages/plugin-js-packages/src/lib/package-managers/package-managers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAExE,MAAM,CAAC,MAAM,eAAe,GAA6C;IACvE,GAAG,EAAE,iBAAiB;IACtB,cAAc,EAAE,yBAAyB;IACzC,aAAa,EAAE,wBAAwB;IACvC,IAAI,EAAE,kBAAkB;CACzB,CAAC"}

package/src/lib/package-managers/yarn-classic/audit-result.d.ts

@@ -1,2 +1,2 @@
 import type { AuditResult } from '../../runner/audit/types.js';
-export declare function yarnv1ToAuditResult(output: string): AuditResult;
+export declare function yarnClassicToAuditResult(output: string): AuditResult;

package/src/lib/package-managers/yarn-classic/audit-result.js

@@ -1,9 +1,9 @@
 import { fromJsonLines } from '@code-pushup/utils';
 import { filterAuditResult } from '../../runner/utils.js';
-export function yarnv1ToAuditResult(output) {
-    const yarnv1Result = fromJsonLines(output);
-    const [yarnv1Advisory, yarnv1Summary] = validateYarnv1Result(yarnv1Result);
-    const vulnerabilities = yarnv1Advisory.map(({ data: { resolution, advisory } }) => {
+export function yarnClassicToAuditResult(output) {
+    const yarnResult = fromJsonLines(output);
+    const [yarnAdvisories, yarnSummary] = validateYarnAuditResult(yarnResult);
+    const vulnerabilities = yarnAdvisories.map(({ data: { resolution, advisory } }) => {
         const { id, path } = resolution;
         const directDependency = path.slice(0, path.indexOf('>'));
         const { module_name: name, title, url, severity, vulnerable_versions: versionRange, recommendation: fixInformation, } = advisory;
@@ -19,18 +19,18 @@ export function yarnv1ToAuditResult(output) {
         };
     });
     const summary = {
-        ...yarnv1Summary.data.vulnerabilities,
-        total: Object.values(yarnv1Summary.data.vulnerabilities).reduce((acc, amount) => acc + amount, 0),
+        ...yarnSummary.data.vulnerabilities,
+        total: Object.values(yarnSummary.data.vulnerabilities).reduce((acc, amount) => acc + amount, 0),
     };
     // duplicates are filtered out based on their ID
     return filterAuditResult({ vulnerabilities, summary }, 'id');
 }
-function validateYarnv1Result(result) {
+function validateYarnAuditResult(result) {
     const summary = result.at(-1);
     if (summary?.type !== 'auditSummary') {
         throw new Error('Invalid Yarn v1 audit result - no summary found.');
     }
-    const vulnerabilities = result.filter((item) => item.type === 'auditAdvisory');
+    const vulnerabilities = result.filter(item => item.type === 'auditAdvisory');
     return [vulnerabilities, summary];
 }
 //# sourceMappingURL=audit-result.js.map

package/src/lib/package-managers/yarn-classic/audit-result.js.map

@@ -1 +1 @@
-{"version":3,"file":"audit-result.js","sourceRoot":"","sources":["../../../../../../../packages/plugin-js-packages/src/lib/package-managers/yarn-classic/audit-result.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAO1D,MAAM,UAAU,mBAAmB,CAAC,MAAc;IAChD,MAAM,YAAY,GAAG,aAAa,CAAwB,MAAM,CAAC,CAAC;IAClE,MAAM,CAAC,cAAc,EAAE,aAAa,CAAC,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAE3E,MAAM,eAAe,GAAG,cAAc,CAAC,GAAG,CACxC,CAAC,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAiB,EAAE;QACpD,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;QAChC,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QAE1D,MAAM,EACJ,WAAW,EAAE,IAAI,EACjB,KAAK,EACL,GAAG,EACH,QAAQ,EACR,mBAAmB,EAAE,YAAY,EACjC,cAAc,EAAE,cAAc,GAC/B,GAAG,QAAQ,CAAC;QAEb,OAAO;YACL,IAAI;YACJ,KAAK;YACL,EAAE;YACF,GAAG;YACH,QAAQ;YACR,YAAY;YACZ,gBAAgB,EAAE,IAAI,KAAK,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB;YACrE,cAAc;SACf,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,MAAM,OAAO,GAAG;QACd,GAAG,aAAa,CAAC,IAAI,CAAC,eAAe;QACrC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,CAC7D,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,EAC7B,CAAC,CACF;KACF,CAAC;IAEF,gDAAgD;IAChD,OAAO,iBAAiB,CAAC,EAAE,eAAe,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,oBAAoB,CAC3B,MAA6B;IAE7B,MAAM,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9B,IAAI,OAAO,EAAE,IAAI,KAAK,cAAc,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CACnC,CAAC,IAAI,EAA+B,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,eAAe,CACrE,CAAC;IAEF,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"audit-result.js","sourceRoot":"","sources":["../../../../../../../packages/plugin-js-packages/src/lib/package-managers/yarn-classic/audit-result.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAO1D,MAAM,UAAU,wBAAwB,CAAC,MAAc;IACrD,MAAM,UAAU,GAAG,aAAa,CAA6B,MAAM,CAAC,CAAC;IACrE,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC,GAAG,uBAAuB,CAAC,UAAU,CAAC,CAAC;IAE1E,MAAM,eAAe,GAAG,cAAc,CAAC,GAAG,CACxC,CAAC,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAiB,EAAE;QACpD,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;QAChC,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QAE1D,MAAM,EACJ,WAAW,EAAE,IAAI,EACjB,KAAK,EACL,GAAG,EACH,QAAQ,EACR,mBAAmB,EAAE,YAAY,EACjC,cAAc,EAAE,cAAc,GAC/B,GAAG,QAAQ,CAAC;QAEb,OAAO;YACL,IAAI;YACJ,KAAK;YACL,EAAE;YACF,GAAG;YACH,QAAQ;YACR,YAAY;YACZ,gBAAgB,EAAE,IAAI,KAAK,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB;YACrE,cAAc;SACf,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,MAAM,OAAO,GAAG;QACd,GAAG,WAAW,CAAC,IAAI,CAAC,eAAe;QACnC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,CAC3D,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,EAC7B,CAAC,CACF;KACF,CAAC;IAEF,gDAAgD;IAChD,OAAO,iBAAiB,CAAC,EAAE,eAAe,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,uBAAuB,CAC9B,MAAkC;IAElC,MAAM,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9B,IAAI,OAAO,EAAE,IAAI,KAAK,cAAc,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC;IAE7E,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;AACpC,CAAC"}

package/src/lib/package-managers/yarn-classic/constants.d.ts

@@ -1,4 +1,4 @@
 import type { OutdatedDependency } from '../../runner/outdated/types.js';
-import type { Yarnv1FieldName } from './types.js';
-export declare const outdatedtoFieldMapper: Record<keyof OutdatedDependency, Yarnv1FieldName>;
-export declare const REQUIRED_OUTDATED_FIELDS: Yarnv1FieldName[];
+import type { YarnClassicFieldName } from './types.js';
+export declare const outdatedtoFieldMapper: Record<keyof OutdatedDependency, YarnClassicFieldName>;
+export declare const REQUIRED_OUTDATED_FIELDS: YarnClassicFieldName[];

package/src/lib/package-managers/yarn-classic/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../../packages/plugin-js-packages/src/lib/package-managers/yarn-classic/constants.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,qBAAqB,GAG9B;IACF,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,cAAc;IACpB,GAAG,EAAE,KAAK;CACX,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAsB;IACzD,SAAS;IACT,SAAS;IACT,QAAQ;IACR,cAAc;CACf,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../../packages/plugin-js-packages/src/lib/package-managers/yarn-classic/constants.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,qBAAqB,GAG9B;IACF,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,cAAc;IACpB,GAAG,EAAE,KAAK;CACX,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAA2B;IAC9D,SAAS;IACT,SAAS;IACT,QAAQ;IACR,cAAc;CACf,CAAC"}

package/src/lib/package-managers/yarn-classic/outdated-result.d.ts

@@ -1,4 +1,4 @@
 import type { OutdatedDependency, OutdatedResult } from '../../runner/outdated/types.js';
-export declare function yarnv1ToOutdatedResult(output: string): OutdatedResult;
+export declare function yarnClassicToOutdatedResult(output: string): OutdatedResult;
 export declare function validateOutdatedFields(head: string[]): boolean;
 export declare function getOutdatedFieldIndexes(all: string[]): Record<keyof OutdatedDependency, number>;

package/src/lib/package-managers/yarn-classic/outdated-result.js

@@ -1,10 +1,10 @@
 import { fromJsonLines, objectFromEntries, objectToEntries, objectToKeys, } from '@code-pushup/utils';
 import { REQUIRED_OUTDATED_FIELDS, outdatedtoFieldMapper, } from './constants.js';
-import { yarnv1FieldNames, } from './types.js';
-export function yarnv1ToOutdatedResult(output) {
-    const yarnv1Outdated = fromJsonLines(output);
-    const fields = yarnv1Outdated[1]?.data.head ?? [];
-    const dependencies = yarnv1Outdated[1]?.data.body ?? [];
+import { yarnClassicFieldNames, } from './types.js';
+export function yarnClassicToOutdatedResult(output) {
+    const yarnOutdated = fromJsonLines(output);
+    const fields = yarnOutdated[1]?.data.head ?? [];
+    const dependencies = yarnOutdated[1]?.data.body ?? [];
     // no outdated dependencies
     if (dependencies.length === 0) {
         return [];
@@ -17,14 +17,14 @@ export function yarnv1ToOutdatedResult(output) {
         .filter((entry) => entry[1] != null)));
 }
 export function validateOutdatedFields(head) {
-    const relevantFields = head.filter(isYarnv1FieldName);
+    const relevantFields = head.filter(isYarnClassicFieldName);
     if (hasAllRequiredFields(relevantFields)) {
         return true;
     }
-    throw new Error(`Yarn v1 outdated: Template [${head.join(', ')}] does not contain all required fields [${yarnv1FieldNames.join(', ')}]`);
+    throw new Error(`Yarn v1 outdated: Template [${head.join(', ')}] does not contain all required fields [${yarnClassicFieldNames.join(', ')}]`);
 }
-function isYarnv1FieldName(value) {
-    const names = yarnv1FieldNames;
+function isYarnClassicFieldName(value) {
+    const names = yarnClassicFieldNames;
     return names.includes(value);
 }
 function hasAllRequiredFields(head) {

package/src/lib/package-managers/yarn-classic/outdated-result.js.map

@@ -1 +1 @@
-{"version":3,"file":"outdated-result.js","sourceRoot":"","sources":["../../../../../../../packages/plugin-js-packages/src/lib/package-managers/yarn-classic/outdated-result.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,eAAe,EACf,YAAY,GACb,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EACL,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAGL,gBAAgB,GACjB,MAAM,YAAY,CAAC;AAEpB,MAAM,UAAU,sBAAsB,CAAC,MAAc;IACnD,MAAM,cAAc,GAAG,aAAa,CAA2B,MAAM,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;IAClD,MAAM,YAAY,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;IAExD,2BAA2B;IAC3B,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,qBAAqB;IACrB,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC/B,MAAM,YAAY,GAAG,uBAAuB,CAAC,MAAM,CAAC,CAAC;IAErD,OAAO,YAAY,CAAC,GAAG,CACrB,GAAG,CAAC,EAAE,CACJ,iBAAiB,CACf,YAAY,CAAC,YAAY,CAAC;SACvB,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAU,CAAC;SACxD,MAAM,CACL,CAAC,KAAK,EAA+C,EAAE,CACrD,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CACnB,CACkB,CAC1B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,IAAc;IACnD,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IACtD,IAAI,oBAAoB,CAAC,cAAc,CAAC,EAAE,CAAC;QACzC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,IAAI,KAAK,CACb,+BAA+B,IAAI,CAAC,IAAI,CACtC,IAAI,CACL,2CAA2C,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAC3E,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAa;IACtC,MAAM,KAAK,GAAsB,gBAAgB,CAAC;IAClD,OAAO,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAuB;IACnD,OAAO,wBAAwB,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,GAAa;IACnD,OAAO,iBAAiB,CACtB,eAAe,CAAC,qBAAqB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC;QACzE,aAAa;QACb,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC;KACvB,CAAC,CACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"outdated-result.js","sourceRoot":"","sources":["../../../../../../../packages/plugin-js-packages/src/lib/package-managers/yarn-classic/outdated-result.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,eAAe,EACf,YAAY,GACb,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EACL,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAGL,qBAAqB,GACtB,MAAM,YAAY,CAAC;AAEpB,MAAM,UAAU,2BAA2B,CAAC,MAAc;IACxD,MAAM,YAAY,GAAG,aAAa,CAAgC,MAAM,CAAC,CAAC;IAC1E,MAAM,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;IAChD,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;IAEtD,2BAA2B;IAC3B,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,qBAAqB;IACrB,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC/B,MAAM,YAAY,GAAG,uBAAuB,CAAC,MAAM,CAAC,CAAC;IAErD,OAAO,YAAY,CAAC,GAAG,CACrB,GAAG,CAAC,EAAE,CACJ,iBAAiB,CACf,YAAY,CAAC,YAAY,CAAC;SACvB,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAU,CAAC;SACxD,MAAM,CACL,CAAC,KAAK,EAA+C,EAAE,CACrD,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CACnB,CACkB,CAC1B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,IAAc;IACnD,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;IAC3D,IAAI,oBAAoB,CAAC,cAAc,CAAC,EAAE,CAAC;QACzC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,IAAI,KAAK,CACb,+BAA+B,IAAI,CAAC,IAAI,CACtC,IAAI,CACL,2CAA2C,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAChF,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAa;IAC3C,MAAM,KAAK,GAAsB,qBAAqB,CAAC;IACvD,OAAO,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,oBAAoB,CAAC,IAA4B;IACxD,OAAO,wBAAwB,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,GAAa;IACnD,OAAO,iBAAiB,CACtB,eAAe,CAAC,qBAAqB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC;QACzE,aAAa;QACb,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC;KACvB,CAAC,CACH,CAAC;AACJ,CAAC"}

package/src/lib/package-managers/yarn-classic/types.d.ts

@@ -1,5 +1,5 @@
 import type { PackageAuditLevel } from '../../config.js';
-export type Yarnv1AuditAdvisory = {
+export type YarnClassicAuditAdvisory = {
     type: 'auditAdvisory';
     data: {
         resolution: {
@@ -16,27 +16,27 @@ export type Yarnv1AuditAdvisory = {
         };
     };
 };
-export type Yarnv1AuditSummary = {
+export type YarnClassicAuditSummary = {
     type: 'auditSummary';
     data: {
         vulnerabilities: Record<PackageAuditLevel, number>;
     };
 };
-export type Yarnv1AuditResultJson = [
-    ...Yarnv1AuditAdvisory[],
-    Yarnv1AuditSummary
+export type YarnClassicAuditResultJson = [
+    ...YarnClassicAuditAdvisory[],
+    YarnClassicAuditSummary
 ];
-export declare const yarnv1FieldNames: readonly ["Package", "Current", "Latest", "Package Type", "URL"];
-export type Yarnv1FieldName = (typeof yarnv1FieldNames)[number];
-type Yarnv1Info = {
+export declare const yarnClassicFieldNames: readonly ["Package", "Current", "Latest", "Package Type", "URL"];
+export type YarnClassicFieldName = (typeof yarnClassicFieldNames)[number];
+type YarnClassicInfo = {
     type: 'info';
 };
-type Yarnv1Table = {
+type YarnClassicTable = {
     type: 'table';
     data: {
         head: string[];
         body: string[][];
     };
 };
-export type Yarnv1OutdatedResultJson = [Yarnv1Info, Yarnv1Table] | [];
+export type YarnClassicOutdatedResultJson = [YarnClassicInfo, YarnClassicTable] | [];
 export {};

package/src/lib/package-managers/yarn-classic/types.js

@@ -1,4 +1,4 @@
-export const yarnv1FieldNames = [
+export const yarnClassicFieldNames = [
     'Package',
     'Current',
     'Latest',

package/src/lib/package-managers/yarn-classic/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../../packages/plugin-js-packages/src/lib/package-managers/yarn-classic/types.ts"],"names":[],"mappings":"AAkCA,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,SAAS;IACT,SAAS;IACT,QAAQ;IACR,cAAc;IACd,KAAK;CACG,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../../packages/plugin-js-packages/src/lib/package-managers/yarn-classic/types.ts"],"names":[],"mappings":"AAiCA,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,SAAS;IACT,SAAS;IACT,QAAQ;IACR,cAAc;IACd,KAAK;CACG,CAAC"}

package/src/lib/package-managers/yarn-classic/yarn-classic.d.ts

@@ -1,2 +1,2 @@
 import type { PackageManager } from '../types.js';
-export declare const yarnv1PackageManager: PackageManager;
+export declare const yarnClassicPackageManager: PackageManager;

package/src/lib/package-managers/yarn-classic/yarn-classic.js

@@ -1,8 +1,8 @@
 import { dependencyGroupToLong } from '../../constants.js';
 import { COMMON_AUDIT_ARGS, COMMON_OUTDATED_ARGS } from '../constants.js';
-import { yarnv1ToAuditResult } from './audit-result.js';
-import { yarnv1ToOutdatedResult } from './outdated-result.js';
-export const yarnv1PackageManager = {
+import { yarnClassicToAuditResult } from './audit-result.js';
+import { yarnClassicToOutdatedResult } from './outdated-result.js';
+export const yarnClassicPackageManager = {
     slug: 'yarn-classic',
     name: 'Yarn v1',
     command: 'yarn',
@@ -19,11 +19,11 @@ export const yarnv1PackageManager = {
             dependencyGroupToLong[groupDep],
         ],
         ignoreExitCode: true,
-        unifyResult: yarnv1ToAuditResult,
+        unifyResult: yarnClassicToAuditResult,
     },
     outdated: {
         commandArgs: COMMON_OUTDATED_ARGS,
-        unifyResult: yarnv1ToOutdatedResult,
+        unifyResult: yarnClassicToOutdatedResult,
     },
 };
 //# sourceMappingURL=yarn-classic.js.map

package/src/lib/package-managers/yarn-classic/yarn-classic.js.map

@@ -1 +1 @@
-{"version":3,"file":"yarn-classic.js","sourceRoot":"","sources":["../../../../../../../packages/plugin-js-packages/src/lib/package-managers/yarn-classic/yarn-classic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAE1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,MAAM,CAAC,MAAM,oBAAoB,GAAmB;IAClD,IAAI,EAAE,cAAc;IACpB,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,MAAM;IACf,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE;QACJ,QAAQ,EAAE,mCAAmC;QAC7C,KAAK,EAAE,4CAA4C;QACnD,QAAQ,EAAE,gDAAgD;KAC3D;IACD,KAAK,EAAE;QACL,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC1B,GAAG,iBAAiB;YACpB,UAAU;YACV,qBAAqB,CAAC,QAAQ,CAAC;SAChC;QACD,cAAc,EAAE,IAAI;QACpB,WAAW,EAAE,mBAAmB;KACjC;IACD,QAAQ,EAAE;QACR,WAAW,EAAE,oBAAoB;QACjC,WAAW,EAAE,sBAAsB;KACpC;CACF,CAAC"}
+{"version":3,"file":"yarn-classic.js","sourceRoot":"","sources":["../../../../../../../packages/plugin-js-packages/src/lib/package-managers/yarn-classic/yarn-classic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAE1E,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AAEnE,MAAM,CAAC,MAAM,yBAAyB,GAAmB;IACvD,IAAI,EAAE,cAAc;IACpB,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,MAAM;IACf,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE;QACJ,QAAQ,EAAE,mCAAmC;QAC7C,KAAK,EAAE,4CAA4C;QACnD,QAAQ,EAAE,gDAAgD;KAC3D;IACD,KAAK,EAAE;QACL,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC1B,GAAG,iBAAiB;YACpB,UAAU;YACV,qBAAqB,CAAC,QAAQ,CAAC;SAChC;QACD,cAAc,EAAE,IAAI;QACpB,WAAW,EAAE,wBAAwB;KACtC;IACD,QAAQ,EAAE;QACR,WAAW,EAAE,oBAAoB;QACjC,WAAW,EAAE,2BAA2B;KACzC;CACF,CAAC"}

package/src/lib/package-managers/yarn-modern/audit-result.d.ts

@@ -1,2 +1,2 @@
 import type { AuditResult } from '../../runner/audit/types.js';
-export declare function yarnv2ToAuditResult(output: string): AuditResult;
+export declare function yarnBerryToAuditResult(output: string): AuditResult;

package/src/lib/package-managers/yarn-modern/audit-result.js

@@ -1,7 +1,17 @@
-import { getVulnerabilitiesTotal } from '../../runner/audit/utils.js';
-export function yarnv2ToAuditResult(output) {
-    const yarnv2Audit = JSON.parse(output);
-    const vulnerabilities = Object.values(yarnv2Audit.advisories).map(({ module_name: name, severity, title, url, vulnerable_versions: versionRange, recommendation: fixInformation, findings, }) => {
+import { fromJsonLines } from '@code-pushup/utils';
+import { getVulnerabilitiesTotal, summaryStatsFromVulnerabilities, } from '../../runner/audit/utils.js';
+export function yarnBerryToAuditResult(output) {
+    const json = fromJsonLines(output);
+    if (json.length === 1 && 'advisories' in json[0] && 'metadata' in json[0]) {
+        return transformYarn2or3(json[0]);
+    }
+    if (json.every(item => 'value' in item && 'children' in item)) {
+        return transformYarn4(json);
+    }
+    throw new Error(`Unknown output format from 'yarn npm audit --json':\n${output}`);
+}
+function transformYarn2or3(json) {
+    const vulnerabilities = Object.values(json.advisories).map(({ module_name: name, severity, title, url, vulnerable_versions: versionRange, recommendation: fixInformation, findings, }) => {
         // TODO missing example of an indirect dependency to verify this
         const directDep = findings[0]?.paths[0];
         return {
@@ -17,9 +27,23 @@ export function yarnv2ToAuditResult(output) {
     return {
         vulnerabilities,
         summary: {
-            ...yarnv2Audit.metadata.vulnerabilities,
-            total: getVulnerabilitiesTotal(yarnv2Audit.metadata.vulnerabilities),
+            ...json.metadata.vulnerabilities,
+            total: getVulnerabilitiesTotal(json.metadata.vulnerabilities),
         },
     };
 }
+function transformYarn4(json) {
+    const vulnerabilities = json.map(({ value, children }) => ({
+        name: value,
+        severity: children['Severity'],
+        title: children['Issue'],
+        url: children['URL'],
+        id: children['ID'],
+        versionRange: children['Vulnerable Versions'],
+        directDependency: children['Dependents'].some(spec => spec.endsWith('@workspace:.')) ||
+            '',
+    }));
+    const summary = summaryStatsFromVulnerabilities(vulnerabilities);
+    return { vulnerabilities, summary };
+}
 //# sourceMappingURL=audit-result.js.map

package/src/lib/package-managers/yarn-modern/audit-result.js.map

@@ -1 +1 @@
-{"version":3,"file":"audit-result.js","sourceRoot":"","sources":["../../../../../../../packages/plugin-js-packages/src/lib/package-managers/yarn-modern/audit-result.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAGtE,MAAM,UAAU,mBAAmB,CAAC,MAAc;IAChD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAA0B,CAAC;IAEhE,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,GAAG,CAC/D,CAAC,EACC,WAAW,EAAE,IAAI,EACjB,QAAQ,EACR,KAAK,EACL,GAAG,EACH,mBAAmB,EAAE,YAAY,EACjC,cAAc,EAAE,cAAc,EAC9B,QAAQ,GACT,EAAiB,EAAE;QAClB,gEAAgE;QAChE,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QACxC,OAAO;YACL,IAAI;YACJ,QAAQ;YACR,KAAK;YACL,GAAG;YACH,YAAY;YACZ,cAAc;YACd,gBAAgB,EACd,SAAS,IAAI,IAAI,IAAI,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;SAC7D,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,OAAO;QACL,eAAe;QACf,OAAO,EAAE;YACP,GAAG,WAAW,CAAC,QAAQ,CAAC,eAAe;YACvC,KAAK,EAAE,uBAAuB,CAAC,WAAW,CAAC,QAAQ,CAAC,eAAe,CAAC;SACrE;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"audit-result.js","sourceRoot":"","sources":["../../../../../../../packages/plugin-js-packages/src/lib/package-managers/yarn-modern/audit-result.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EACL,uBAAuB,EACvB,+BAA+B,GAChC,MAAM,6BAA6B,CAAC;AAMrC,MAAM,UAAU,sBAAsB,CAAC,MAAc;IACnD,MAAM,IAAI,GAAG,aAAa,CAExB,MAAM,CAAC,CAAC;IAEV,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,YAAY,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,IAAI,IAAI,IAAI,UAAU,IAAI,IAAI,CAAC,EAAE,CAAC;QAC9D,OAAO,cAAc,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,IAAI,KAAK,CACb,wDAAwD,MAAM,EAAE,CACjE,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAkC;IAC3D,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CACxD,CAAC,EACC,WAAW,EAAE,IAAI,EACjB,QAAQ,EACR,KAAK,EACL,GAAG,EACH,mBAAmB,EAAE,YAAY,EACjC,cAAc,EAAE,cAAc,EAC9B,QAAQ,GACT,EAAiB,EAAE;QAClB,gEAAgE;QAChE,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QACxC,OAAO;YACL,IAAI;YACJ,QAAQ;YACR,KAAK;YACL,GAAG;YACH,YAAY;YACZ,cAAc;YACd,gBAAgB,EACd,SAAS,IAAI,IAAI,IAAI,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;SAC7D,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,OAAO;QACL,eAAe;QACf,OAAO,EAAE;YACP,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe;YAChC,KAAK,EAAE,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC;SAC9D;KACF,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,IAA+B;IACrD,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAC9B,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAiB,EAAE,CAAC,CAAC;QACvC,IAAI,EAAE,KAAK;QACX,QAAQ,EAAE,QAAQ,CAAC,UAAU,CAAC;QAC9B,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC;QACxB,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC;QACpB,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC;QAClB,YAAY,EAAE,QAAQ,CAAC,qBAAqB,CAAC;QAC7C,gBAAgB,EACd,QAAQ,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YAClE,EAAE;KACL,CAAC,CACH,CAAC;IAEF,MAAM,OAAO,GAAG,+BAA+B,CAAC,eAAe,CAAC,CAAC;IAEjE,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,CAAC;AACtC,CAAC"}

package/src/lib/package-managers/yarn-modern/outdated-result.d.ts

@@ -1,2 +1,2 @@
 import type { OutdatedResult } from '../../runner/outdated/types.js';
-export declare function yarnv2ToOutdatedResult(output: string): OutdatedResult;
+export declare function yarnBerryToOutdatedResult(output: string): OutdatedResult;

package/src/lib/package-managers/yarn-modern/outdated-result.js

@@ -1,4 +1,4 @@
-export function yarnv2ToOutdatedResult(output) {
+export function yarnBerryToOutdatedResult(output) {
     const npmOutdated = JSON.parse(output);
     return npmOutdated.map(({ name, current, latest, type }) => ({
         name,

package/src/lib/package-managers/yarn-modern/outdated-result.js.map

@@ -1 +1 @@
-{"version":3,"file":"outdated-result.js","sourceRoot":"","sources":["../../../../../../../packages/plugin-js-packages/src/lib/package-managers/yarn-modern/outdated-result.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,sBAAsB,CAAC,MAAc;IACnD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAA6B,CAAC;IAEnE,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAC3D,IAAI;QACJ,OAAO;QACP,MAAM;QACN,IAAI;KACL,CAAC,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"outdated-result.js","sourceRoot":"","sources":["../../../../../../../packages/plugin-js-packages/src/lib/package-managers/yarn-modern/outdated-result.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,yBAAyB,CAAC,MAAc;IACtD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAgC,CAAC;IAEtE,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAC3D,IAAI;QACJ,OAAO;QACP,MAAM;QACN,IAAI;KACL,CAAC,CAAC,CAAC;AACN,CAAC"}

package/src/lib/package-managers/yarn-modern/types.d.ts

@@ -1,6 +1,6 @@
 import type { PackageAuditLevel } from '../../config.js';
 import type { DependencyGroupLong } from '../../runner/outdated/types.js';
-export type Yarnv2AuditAdvisory = {
+export type YarnBerry2or3AuditAdvisory = {
     module_name: string;
     severity: PackageAuditLevel;
     vulnerable_versions: string;
@@ -11,17 +11,30 @@ export type Yarnv2AuditAdvisory = {
         paths: string[];
     }[];
 };
-export type Yarnv2AuditResultJson = {
-    advisories: Record<string, Yarnv2AuditAdvisory>;
+export type YarnBerry2or3AuditResultJson = {
+    advisories: Record<string, YarnBerry2or3AuditAdvisory>;
     metadata: {
         vulnerabilities: Record<PackageAuditLevel, number>;
     };
 };
-export type Yarnv2VersionOverview = {
+export type YarnBerry4AuditVulnerability = {
+    value: string;
+    children: {
+        ID: number;
+        Issue: string;
+        URL: string;
+        Severity: PackageAuditLevel;
+        'Vulnerable Versions': string;
+        'Tree Versions': string[];
+        Dependents: string[];
+    };
+};
+export type YarnBerry4AuditResultJson = YarnBerry4AuditVulnerability[];
+export type YarnBerryOutdatedPackage = {
     current: string;
     latest: string;
     name: string;
     type: DependencyGroupLong;
     workspace?: string;
 };
-export type Yarnv2OutdatedResultJson = Yarnv2VersionOverview[];
+export type YarnBerryOutdatedResultJson = YarnBerryOutdatedPackage[];

package/src/lib/package-managers/yarn-modern/yarn-modern.d.ts

@@ -1,2 +1,2 @@
 import type { PackageManager } from '../types.js';
-export declare const yarnv2PackageManager: PackageManager;
+export declare const yarnModernPackageManager: PackageManager;

package/src/lib/package-managers/yarn-modern/yarn-modern.js

@@ -1,13 +1,13 @@
 import { COMMON_AUDIT_ARGS, COMMON_OUTDATED_ARGS } from '../constants.js';
-import { yarnv2ToAuditResult } from './audit-result.js';
-import { yarnv2ToOutdatedResult } from './outdated-result.js';
+import { yarnBerryToAuditResult } from './audit-result.js';
+import { yarnBerryToOutdatedResult } from './outdated-result.js';
 // see https://github.com/yarnpkg/berry/blob/master/packages/plugin-npm-cli/sources/npmAuditTypes.ts#L5
-const yarnv2EnvironmentOptions = {
+const yarnModernEnvironmentOptions = {
     prod: 'production',
     dev: 'development',
     optional: '',
 };
-export const yarnv2PackageManager = {
+export const yarnModernPackageManager = {
     slug: 'yarn-modern',
     name: 'yarn-modern',
     command: 'yarn',
@@ -22,15 +22,15 @@ export const yarnv2PackageManager = {
             'npm',
             ...COMMON_AUDIT_ARGS,
             '--environment',
-            yarnv2EnvironmentOptions[groupDep],
+            yarnModernEnvironmentOptions[groupDep],
         ],
         supportedDepGroups: ['prod', 'dev'], // Yarn v2 does not support audit for optional dependencies
-        unifyResult: yarnv2ToAuditResult,
+        unifyResult: yarnBerryToAuditResult,
         ignoreExitCode: true,
     },
     outdated: {
         commandArgs: [...COMMON_OUTDATED_ARGS, '--workspace=.'], // filter out other packages in case of Yarn workspaces
-        unifyResult: yarnv2ToOutdatedResult,
+        unifyResult: yarnBerryToOutdatedResult,
     },
 };
 //# sourceMappingURL=yarn-modern.js.map

package/src/lib/package-managers/yarn-modern/yarn-modern.js.map

@@ -1 +1 @@
-{"version":3,"file":"yarn-modern.js","sourceRoot":"","sources":["../../../../../../../packages/plugin-js-packages/src/lib/package-managers/yarn-modern/yarn-modern.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAE1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,uGAAuG;AACvG,MAAM,wBAAwB,GAAoC;IAChE,IAAI,EAAE,YAAY;IAClB,GAAG,EAAE,aAAa;IAClB,QAAQ,EAAE,EAAE;CACb,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAmB;IAClD,IAAI,EAAE,aAAa;IACnB,IAAI,EAAE,aAAa;IACnB,OAAO,EAAE,MAAM;IACf,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE;QACJ,QAAQ,EAAE,qCAAqC;QAC/C,KAAK,EAAE,mCAAmC;QAC1C,QAAQ,EAAE,kDAAkD;KAC7D;IACD,KAAK,EAAE;QACL,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC1B,KAAK;YACL,GAAG,iBAAiB;YACpB,eAAe;YACf,wBAAwB,CAAC,QAAQ,CAAC;SACnC;QACD,kBAAkB,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,2DAA2D;QAChG,WAAW,EAAE,mBAAmB;QAChC,cAAc,EAAE,IAAI;KACrB;IACD,QAAQ,EAAE;QACR,WAAW,EAAE,CAAC,GAAG,oBAAoB,EAAE,eAAe,CAAC,EAAE,uDAAuD;QAChH,WAAW,EAAE,sBAAsB;KACpC;CACF,CAAC"}
+{"version":3,"file":"yarn-modern.js","sourceRoot":"","sources":["../../../../../../../packages/plugin-js-packages/src/lib/package-managers/yarn-modern/yarn-modern.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAE1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEjE,uGAAuG;AACvG,MAAM,4BAA4B,GAAoC;IACpE,IAAI,EAAE,YAAY;IAClB,GAAG,EAAE,aAAa;IAClB,QAAQ,EAAE,EAAE;CACb,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAmB;IACtD,IAAI,EAAE,aAAa;IACnB,IAAI,EAAE,aAAa;IACnB,OAAO,EAAE,MAAM;IACf,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE;QACJ,QAAQ,EAAE,qCAAqC;QAC/C,KAAK,EAAE,mCAAmC;QAC1C,QAAQ,EAAE,kDAAkD;KAC7D;IACD,KAAK,EAAE;QACL,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC1B,KAAK;YACL,GAAG,iBAAiB;YACpB,eAAe;YACf,4BAA4B,CAAC,QAAQ,CAAC;SACvC;QACD,kBAAkB,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,2DAA2D;QAChG,WAAW,EAAE,sBAAsB;QACnC,cAAc,EAAE,IAAI;KACrB;IACD,QAAQ,EAAE;QACR,WAAW,EAAE,CAAC,GAAG,oBAAoB,EAAE,eAAe,CAAC,EAAE,uDAAuD;QAChH,WAAW,EAAE,yBAAyB;KACvC;CACF,CAAC"}

package/src/lib/runner/audit/types.d.ts

@@ -7,7 +7,7 @@ export type Vulnerability = {
     severity: PackageAuditLevel;
     versionRange: string;
     directDependency: string | true;
-    fixInformation: string | false;
+    fixInformation?: string | false;
 };
 export type AuditSummary = Record<PackageAuditLevel | 'total', number>;
 export type AuditResult = {

package/src/lib/runner/audit/utils.d.ts

@@ -1,2 +1,6 @@
-import type { PackageAuditLevel } from '../../config.js';
+import { type PackageAuditLevel } from '../../config.js';
+import type { AuditSummary } from './types.js';
 export declare function getVulnerabilitiesTotal(summary: Record<PackageAuditLevel, number>): number;
+export declare function summaryStatsFromVulnerabilities(vulnerabilities: {
+    severity: PackageAuditLevel;
+}[]): AuditSummary;

package/src/lib/runner/audit/utils.js

@@ -1,4 +1,14 @@
+import { objectFromEntries } from '@code-pushup/utils';
+import { packageAuditLevels } from '../../config.js';
 export function getVulnerabilitiesTotal(summary) {
     return Object.values(summary).reduce((acc, value) => acc + value, 0);
 }
+export function summaryStatsFromVulnerabilities(vulnerabilities) {
+    const initial = objectFromEntries([...packageAuditLevels, 'total'].map(key => [key, 0]));
+    return vulnerabilities.reduce((acc, { severity }) => ({
+        ...acc,
+        [severity]: acc[severity] + 1,
+        total: acc.total + 1,
+    }), initial);
+}
 //# sourceMappingURL=utils.js.map

package/src/lib/runner/audit/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../../packages/plugin-js-packages/src/lib/runner/audit/utils.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,uBAAuB,CACrC,OAA0C;IAE1C,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC;AACvE,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../../packages/plugin-js-packages/src/lib/runner/audit/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAA0B,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAG7E,MAAM,UAAU,uBAAuB,CACrC,OAA0C;IAE1C,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,+BAA+B,CAC7C,eAAkD;IAElD,MAAM,OAAO,GAAiB,iBAAiB,CAC5C,CAAC,GAAG,kBAAkB,EAAE,OAAO,CAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CACjE,CAAC;IACF,OAAO,eAAe,CAAC,MAAM,CAC3B,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;QACtB,GAAG,GAAG;QACN,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC7B,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,CAAC;KACrB,CAAC,EACF,OAAO,CACR,CAAC;AACJ,CAAC"}