snyk 1.1162.0 → 1.1163.0

package/dist/cli/784.index.js

@@ -4093,9 +4093,20 @@ async function buildDepGraph(root, manifestFilePath, lockfilePath, lockfileVersi
     const lockFileContents = fs.readFileSync(lockFileFullPath, 'utf-8');
     switch (lockfileVersion) {
         case snyk_nodejs_lockfile_parser_1.NodeLockfileVersion.YarnLockV1:
-            return await lockFileParser.parseYarnLockV1Project(manifestFileContents, lockFileContents, options);
+            return await lockFileParser.parseYarnLockV1Project(manifestFileContents, lockFileContents, {
+                includeDevDeps: options.includeDevDeps,
+                includeOptionalDeps: options.includeOptionalDeps,
+                includePeerDeps: options.includePeerDeps || false,
+                pruneLevel: 'withinTopLevelDeps',
+                strictOutOfSync: options.strictOutOfSync,
+            });
         case snyk_nodejs_lockfile_parser_1.NodeLockfileVersion.YarnLockV2:
-            return await lockFileParser.parseYarnLockV2Project(manifestFileContents, lockFileContents, options);
+            return await lockFileParser.parseYarnLockV2Project(manifestFileContents, lockFileContents, {
+                includeDevDeps: options.includeDevDeps,
+                includeOptionalDeps: options.includeOptionalDeps,
+                pruneWithinTopLevelDeps: true,
+                strictOutOfSync: options.strictOutOfSync,
+            });
         case snyk_nodejs_lockfile_parser_1.NodeLockfileVersion.NpmLockV2:
         case snyk_nodejs_lockfile_parser_1.NodeLockfileVersion.NpmLockV3:
             return await lockFileParser.parseNpmLockV2Project(manifestFileContents, lockFileContents, options);
@@ -4350,7 +4361,6 @@ async function processYarnWorkspaces(root, settings, targetFiles) {
         },
         scannedProjects: [],
     };
-    let rootWorkspaceManifestContent = {};
     // the folders must be ordered highest first
     for (const directory of Object.keys(yarnTargetFiles)) {
         debug(`Processing ${directory} as a potential Yarn workspace`);
@@ -4373,7 +4383,6 @@ async function processYarnWorkspaces(root, settings, targetFiles) {
             }
             if (packageJsonFileName === workspaceRoot) {
                 isRootPackageJson = true;
-                rootWorkspaceManifestContent = JSON.parse(packageJson.content);
             }
         }
         if (!(isYarnWorkspacePackage || isRootPackageJson)) {
@@ -4385,21 +4394,38 @@ async function processYarnWorkspaces(root, settings, targetFiles) {
                 ? pathUtil.dirname(yarnWorkspacesFilesMap[packageJsonFileName].root)
                 : pathUtil.dirname(packageJsonFileName);
             const rootYarnLockfileName = pathUtil.join(rootDir, 'yarn.lock');
-            const yarnLock = await get_file_contents_1.getFileContents(root, rootYarnLockfileName);
-            if (rootWorkspaceManifestContent.hasOwnProperty('resolutions') &&
-                lockFileParser.getYarnLockfileType(yarnLock.content) ===
-                    lockFileParser.LockfileType.yarn2) {
-                const parsedManifestContent = JSON.parse(packageJson.content);
-                packageJson.content = JSON.stringify({
-                    ...parsedManifestContent,
-                    resolutions: rootWorkspaceManifestContent['resolutions'],
-                });
+            const yarnLock = get_file_contents_1.getFileContents(root, rootYarnLockfileName);
+            const lockfileVersion = lockFileParser.getYarnLockfileVersion(yarnLock.content);
+            let res;
+            switch (lockfileVersion) {
+                case lockFileParser.NodeLockfileVersion.YarnLockV1:
+                    res = await lockFileParser.parseYarnLockV1Project(packageJson.content, yarnLock.content, {
+                        includeDevDeps: settings.dev || false,
+                        includeOptionalDeps: false,
+                        includePeerDeps: false,
+                        pruneLevel: 'withinTopLevelDeps',
+                        strictOutOfSync: settings.strictOutOfSync === undefined
+                            ? true
+                            : settings.strictOutOfSync,
+                    });
+                    break;
+                case lockFileParser.NodeLockfileVersion.YarnLockV2:
+                    res = await lockFileParser.parseYarnLockV2Project(packageJson.content, yarnLock.content, {
+                        includeDevDeps: settings.dev || false,
+                        includeOptionalDeps: false,
+                        pruneWithinTopLevelDeps: true,
+                        strictOutOfSync: settings.strictOutOfSync === undefined
+                            ? true
+                            : settings.strictOutOfSync,
+                    });
+                    break;
+                default:
+                    throw new Error('Failed to build dep graph from current project');
             }
-            const res = await lockFileParser.buildDepTree(packageJson.content, yarnLock.content, settings.dev, lockFileParser.LockfileType.yarn, settings.strictOutOfSync !== false);
             const project = {
                 packageManager: 'yarn',
                 targetFile: pathUtil.relative(root, packageJson.fileName),
-                depTree: res,
+                depGraph: res,
                 plugin: {
                     name: 'snyk-nodejs-lockfile-parser',
                     runtime: process.version,
@@ -6252,11 +6278,13 @@ const snyk_module_1 = __webpack_require__(60390);
 const depGraphLib = __webpack_require__(71479);
 const theme = __webpack_require__(86988);
 const json_1 = __webpack_require__(27019);
+const pMap = __webpack_require__(86301);
 const legacy_1 = __webpack_require__(34013);
 const errors_1 = __webpack_require__(55191);
 const snyk = __webpack_require__(9146);
 const is_ci_1 = __webpack_require__(10090);
 const common = __webpack_require__(53110);
+const common_1 = __webpack_require__(53110);
 const config_1 = __webpack_require__(25425);
 const analytics = __webpack_require__(82744);
 const print_deps_1 = __webpack_require__(79792);
@@ -6272,8 +6300,7 @@ const assemble_payloads_1 = __webpack_require__(38080);
 const request_1 = __webpack_require__(52050);
 const spinner_1 = __webpack_require__(86766);
 const dep_graph_1 = __webpack_require__(73399);
-const common_1 = __webpack_require__(70527);
-const common_2 = __webpack_require__(53110);
+const common_2 = __webpack_require__(70527);
 const debug = debugModule('snyk:run-test');
 // Controls the number of simultaneous test requests that can be in-flight.
 const MAX_CONCURRENCY = 5;
@@ -6380,53 +6407,35 @@ async function sendAndParseResults(payloads, spinnerLbl, root, options) {
     if (!options.quiet) {
         await spinner_1.spinner(spinnerLbl);
     }
-    const requests = [];
-    for (const originalPayload of payloads) {
-        const request = async () => {
-            let step = 0;
-            let error;
-            while (step < common_2.RETRY_ATTEMPTS) {
-                debug(`sendTestPayload retry step ${step} out of ${common_2.RETRY_ATTEMPTS}`);
-                try {
-                    /** sendTestPayload() deletes the request.body from the payload once completed. */
-                    const payload = Object.assign({}, originalPayload);
-                    const response = await sendTestPayload(payload);
-                    return { payload, originalPayload, response };
+    const sendRequest = async (originalPayload) => {
+        let step = 0;
+        let error;
+        while (step < common_1.RETRY_ATTEMPTS) {
+            debug(`sendTestPayload retry step ${step} out of ${common_1.RETRY_ATTEMPTS}`);
+            try {
+                /** sendTestPayload() deletes the request.body from the payload once completed. */
+                const payload = Object.assign({}, originalPayload);
+                const response = await sendTestPayload(payload);
+                return { payload, originalPayload, response };
+            }
+            catch (err) {
+                error = err;
+                step++;
+                if (err instanceof errors_1.InternalServerError ||
+                    err instanceof errors_1.BadGatewayError ||
+                    err instanceof errors_1.ServiceUnavailableError) {
+                    await common_2.sleep(common_1.RETRY_DELAY);
                 }
-                catch (err) {
-                    error = err;
-                    step++;
-                    if (err instanceof errors_1.InternalServerError ||
-                        err instanceof errors_1.BadGatewayError ||
-                        err instanceof errors_1.ServiceUnavailableError) {
-                        await common_1.sleep(common_2.RETRY_DELAY);
-                    }
-                    else {
-                        break;
-                    }
+                else {
+                    break;
                 }
             }
-            throw error;
-        };
-        requests.push(request);
-    }
-    // Start block adapted from https://gist.github.com/jcouyang/632709f30e12a7879a73e9e132c0d56b?permalink_comment_id=3591045#gistcomment-3591045
-    let index = 0;
-    const responses = [];
-    const execRequest = async () => {
-        while (index < requests.length) {
-            // index is shared across "threads", so capture the current value for this
-            // iteration on this "thread" and increment it for the rest of the world.
-            const curIndex = index++;
-            responses[curIndex] = await requests[curIndex]();
         }
+        throw error;
     };
-    const threads = [];
-    for (let thread = 0; thread < MAX_CONCURRENCY; thread++) {
-        threads.push(execRequest());
-    }
-    await Promise.all(threads);
-    // End block adapted from https://gist.github.com/jcouyang/632709f30e12a7879a73e9e132c0d56b?permalink_comment_id=3591045#gistcomment-3591045
+    const responses = await pMap(payloads, sendRequest, {
+        concurrency: MAX_CONCURRENCY,
+    });
     for (const { payload, originalPayload, response } of responses) {
         const { depGraph, payloadPolicy, pkgManager, targetFile, projectName, foundProjectCount, displayTargetFile, dockerfilePackages, platform, scanResult, hasUnknownVersions, } = prepareResponseForParsing(originalPayload, response, options);
         const ecosystem = ecosystems_1.getEcosystem(options);