snyk 1.1211.0 → 1.1213.0

package/dist/cli/245.index.js

@@ -179885,7 +179885,7 @@ function computeDependencyId(name, version) {
     return `${name}@${version || ''}`;
 }
 function displayDependencies(depGraph, fileSignaturesDetails, depsFilePaths = {}) {
-    var _a;
+    var _a, _b;
     let result = [];
     const dependencies = depGraph === null || depGraph === void 0 ? void 0 : depGraph.getDepPkgs();
     const hasDependencies = (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) > 0;
@@ -179897,7 +179897,10 @@ function displayDependencies(depGraph, fileSignaturesDetails, depsFilePaths = {}
         const dependencyId = computeDependencyId(name, version);
         const dependencyName = computeDependencyName(name, version);
         result.push(`\n${common_1.leftPad(dependencyName, 2)}`);
-        if (fileSignaturesDetails && ((_a = fileSignaturesDetails[dependencyId]) === null || _a === void 0 ? void 0 : _a.confidence)) {
+        if (fileSignaturesDetails && ((_a = fileSignaturesDetails[dependencyId]) === null || _a === void 0 ? void 0 : _a.purl)) {
+            result.push(common_1.leftPad(`purl: ${fileSignaturesDetails[dependencyId].purl}`, 2));
+        }
+        if (fileSignaturesDetails && ((_b = fileSignaturesDetails[dependencyId]) === null || _b === void 0 ? void 0 : _b.confidence)) {
             result.push(common_1.leftPad(`confidence: ${fileSignaturesDetails[dependencyId].confidence.toFixed(3)}`, 2));
         }
         if (!object_1.isEmpty(depsFilePaths)) {
@@ -179934,11 +179937,14 @@ function displayIssues(depGraph, issues, issuesData) {
     const issuesCount = issues.length == 1 ? '1 issue' : `${issues.length} issues`;
     const hasIssues = issues.length > 0;
     if (hasIssues) {
-        const vulnerabilityIssues = issues.filter((issue) => issue.type === 'vulnerability');
-        if (vulnerabilityIssues.length > 0) {
-            prepareResults(result, vulnerabilityIssues, issuesData, 'Issues:');
+        const nonLicenseIssues = issues.filter((issue) => {
+            var _a;
+            return ((_a = issuesData[issue.issueId]) === null || _a === void 0 ? void 0 : _a.type) !== 'license';
+        });
+        if (nonLicenseIssues.length > 0) {
+            prepareResults(result, nonLicenseIssues, issuesData, 'Issues:');
         }
-        const licenseIssues = issues.filter((issue) => issue.type === 'license');
+        const licenseIssues = issues.filter((issue) => { var _a; return ((_a = issuesData[issue.issueId]) === null || _a === void 0 ? void 0 : _a.type) === 'license'; });
         if (licenseIssues.length > 0) {
             prepareResults(result, licenseIssues, issuesData, 'License issues:');
         }
@@ -179956,7 +179962,7 @@ exports.displayIssues = displayIssues;
 function prepareResults(result, issues, issuesData, typeTitle) {
     result.push(chalk.bold(typeTitle));
     for (const { pkgName: name, pkgVersion: version, issueId: vulnId, } of issues) {
-        const { title, severity } = issuesData[vulnId];
+        const { title, severity, legalInstructionsArray } = issuesData[vulnId];
         const color = common_1.getColorBySeverity(severity);
         const severityAndTitle = color.bold(`\n ✗ [${common_1.capitalize(severity)}] ${title}`);
         const dependencyName = computeDependencyName(name, version);
@@ -179966,6 +179972,12 @@ function prepareResults(result, issues, issuesData, typeTitle) {
         result.push(severityAndTitle);
         result.push(introducedThrough);
         result.push(urlText);
+        if (legalInstructionsArray) {
+            result.push(common_1.leftPad(chalk.bold(`Legal instructions:`), 3));
+            const { licenseName, legalContent } = legalInstructionsArray[0];
+            const legalInstructionsText = common_1.leftPad(`○ for ${licenseName}: ${legalContent}`, 3);
+            result.push(legalInstructionsText);
+        }
     }
     result.push('');
 }
@@ -180014,9 +180026,6 @@ async function display(scanResults, testResults, errors, options) {
             result = result.concat(display_1.displaySignatures(scanResults));
         }
         for (const testResult of testResults) {
-            testResult.issues.forEach((issue) => (issue.type = issue.issueId.startsWith('snyk:lic:unmanaged:')
-                ? 'license'
-                : 'vulnerability'));
             const depGraph = dep_graph_1.createFromJSON(testResult.depGraphData);
             const [dependencies, issues] = display_1.selectDisplayStrategy(options, depGraph, testResult);
             if (testResult.issues.length > 0) {