snyk 1.837.0 → 1.841.0

package/dist/cli/{925.index.js → 293.index.js}

@@ -1,5 +1,5 @@
-exports.id = 925;
-exports.ids = [925];
+exports.id = 293;
+exports.ids = [293];
 exports.modules = {
 
 /***/ 61452:
@@ -4230,11 +4230,9 @@ exports.getExtraProjectCount = getExtraProjectCount;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getMultiPluginResult = void 0;
+exports.filterOutProcessedWorkspaces = exports.getMultiPluginResult = void 0;
 const cloneDeep = __webpack_require__(83465);
 const pathLib = __webpack_require__(85622);
-const sortBy = __webpack_require__(58254);
-const groupBy = __webpack_require__(20276);
 const cliInterface = __webpack_require__(65266);
 const chalk_1 = __webpack_require__(32589);
 const theme_1 = __webpack_require__(86988);
@@ -4254,6 +4252,7 @@ async function getMultiPluginResult(root, options, targetFiles) {
     // the files need to be proceeded together as they provide context to each other
     const { scannedProjects, unprocessedFiles, } = await processYarnWorkspacesProjects(root, options, targetFiles);
     allResults.push(...scannedProjects);
+    debug(`Not part of a workspace: ${unprocessedFiles.join(', ')}}`);
     // process the rest 1 by 1 sent to relevant plugins
     for (const targetFile of unprocessedFiles) {
         const optionsClone = cloneDeep(options);
@@ -4304,7 +4303,7 @@ async function processYarnWorkspacesProjects(root, options, targetFiles) {
             strictOutOfSync: options.strictOutOfSync,
             dev: options.dev,
         }, targetFiles);
-        const unprocessedFiles = filterOutProcessedWorkspaces(scannedProjects, targetFiles);
+        const unprocessedFiles = filterOutProcessedWorkspaces(root, scannedProjects, targetFiles);
         return { scannedProjects, unprocessedFiles };
     }
     catch (e) {
@@ -4312,30 +4311,32 @@ async function processYarnWorkspacesProjects(root, options, targetFiles) {
         return { scannedProjects: [], unprocessedFiles: targetFiles };
     }
 }
-function filterOutProcessedWorkspaces(scannedProjects, allTargetFiles) {
-    const mapped = allTargetFiles.map((p) => ({ path: p, ...pathLib.parse(p) }));
-    const sorted = sortBy(mapped, 'dir');
-    const targetFilesByDirectory = groupBy(sorted, 'dir');
-    const scanned = scannedProjects.map((p) => p.targetFile);
+function filterOutProcessedWorkspaces(root, scannedProjects, allTargetFiles) {
     const targetFiles = [];
-    for (const directory of Object.keys(targetFilesByDirectory)) {
-        for (const targetFile of targetFilesByDirectory[directory]) {
-            const { base, path } = targetFile;
-            // any non yarn workspace files should be scanned
-            if (!['package.json', 'yarn.lock'].includes(base)) {
-                targetFiles.push(path);
-                continue;
-            }
-            // check if Node manifest has already been processed a part or a workspace
-            const packageJsonFileName = pathLib.join(directory, 'package.json');
-            const alreadyScanned = scanned.some((f) => packageJsonFileName.endsWith(f));
-            if (!alreadyScanned) {
-                targetFiles.push(path);
-            }
+    const scanned = scannedProjects
+        .map((p) => p.targetFile)
+        .map((p) => pathLib.resolve(process.cwd(), root, p));
+    const all = allTargetFiles.map((p) => ({
+        path: pathLib.resolve(process.cwd(), root, p),
+        original: p,
+    }));
+    for (const entry of all) {
+        const { path, original } = entry;
+        const { base } = pathLib.parse(path);
+        if (!['package.json', 'yarn.lock'].includes(base)) {
+            targetFiles.push(original);
+            continue;
+        }
+        // standardise to package.json
+        // we discover the lockfiles but targetFile is package.json
+        if (!scanned.includes(path.replace('yarn.lock', 'package.json'))) {
+            targetFiles.push(original);
+            continue;
         }
     }
     return targetFiles;
 }
+exports.filterOutProcessedWorkspaces = filterOutProcessedWorkspaces;
 
 
 /***/ }),
@@ -5290,7 +5291,7 @@ exports.codePlugin = {
         return '';
     },
     async test(paths, options) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         try {
             analytics.add('sast-scan', true);
             const sastSettings = await settings_1.getSastSettings(options);
@@ -5304,6 +5305,11 @@ exports.codePlugin = {
             analytics.add('sast-issues-found', numOfIssues);
             if (options.sarif || options.json) {
                 if (numOfIssues > 0) {
+                    if (options['no-markdown']) {
+                        (_d = (_c = sarifTypedResult.runs) === null || _c === void 0 ? void 0 : _c[0].results) === null || _d === void 0 ? void 0 : _d.forEach(({ message }) => {
+                            delete message.markdown;
+                        });
+                    }
                     hasIssues(json_1.jsonStringifyLargeObject(sarifTypedResult));
                 }
                 return { readableResult: json_1.jsonStringifyLargeObject(sarifTypedResult) };
@@ -7245,4 +7251,4 @@ function validateProjectType(options, projectType) {
 
 };
 ;
-//# sourceMappingURL=925.index.js.map
+//# sourceMappingURL=293.index.js.map