snyk 1.1072.0 → 1.1074.0

package/dist/cli/784.index.js

@@ -1098,7 +1098,7 @@ async function fetchIssues(start_time, dep_graph_data, component_details, target
     };
 }
 async function resolveAndTestFactsUnmanagedDeps(scans, options) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const results = [];
     const errors = [];
     const packageManager = 'Unmanaged (C/C++)';
@@ -1114,6 +1114,9 @@ async function resolveAndTestFactsUnmanagedDeps(scans, options) {
         for (const scanResult of scanResults) {
             try {
                 const id = await submitHashes({ hashes: (_a = scanResult === null || scanResult === void 0 ? void 0 : scanResult.facts[0]) === null || _a === void 0 ? void 0 : _a.data }, orgId);
+                if (scanResult.analytics) {
+                    plugin_analytics_1.extractAndApplyPluginAnalytics(scanResult.analytics, id);
+                }
                 const { start_time, dep_graph_data, component_details, } = await pollDepGraphAttributes(id, orgId);
                 const { issues, issuesData, depGraphData, dependencyCount, depsFilePaths, fileSignaturesDetails, } = await fetchIssues(start_time, dep_graph_data, component_details, target_severity, orgId);
                 const issuesMap = new Map();
@@ -1134,6 +1137,20 @@ async function resolveAndTestFactsUnmanagedDeps(scans, options) {
                 }
                 const policy = await policy_1.findAndLoadPolicy(path, 'cpp', options);
                 const [issuesFiltered, issuesDataFiltered] = policy_2.filterIgnoredIssues(issues, issuesData, policy);
+                plugin_analytics_1.extractAndApplyPluginAnalytics([
+                    {
+                        name: 'packageManager',
+                        data: (_f = (_e = depGraphData === null || depGraphData === void 0 ? void 0 : depGraphData.pkgManager) === null || _e === void 0 ? void 0 : _e.name) !== null && _f !== void 0 ? _f : '',
+                    },
+                    {
+                        name: 'unmanagedDependencyCount',
+                        data: (_g = depGraphData === null || depGraphData === void 0 ? void 0 : depGraphData.pkgs.length) !== null && _g !== void 0 ? _g : 0,
+                    },
+                    {
+                        name: 'unmanagedIssuesCount',
+                        data: (_h = issues.length) !== null && _h !== void 0 ? _h : 0,
+                    },
+                ]);
                 results.push({
                     issues: issuesFiltered,
                     issuesData: issuesDataFiltered,
@@ -3864,21 +3881,34 @@ async function inspect(root, targetFile, options = {}) {
     const isLockFileBased = targetFile.endsWith('package-lock.json') ||
         targetFile.endsWith('yarn.lock');
     const getLockFileDeps = isLockFileBased && !options.traverseNodeModules;
-    const depTree = getLockFileDeps
+    const depRes = getLockFileDeps
         ? await lockParser.parse(root, targetFile, options)
         : await modulesParser.parse(root, targetFile, options);
-    if ((_a = depTree === null || depTree === void 0 ? void 0 : depTree.meta) === null || _a === void 0 ? void 0 : _a.lockfileVersion) {
-        analytics.add('lockfileVersion', depTree.meta.lockfileVersion);
+    let scannedProjects = [];
+    if (isResDepGraph(depRes)) {
+        if (depRes.pkgManager.version) {
+            analytics.add('lockfileVersion', depRes.pkgManager.version);
+        }
+        scannedProjects = [{ depGraph: depRes }];
+    }
+    else {
+        if ((_a = depRes.meta) === null || _a === void 0 ? void 0 : _a.lockfileVersion) {
+            analytics.add('lockfileVersion', depRes.meta.lockfileVersion);
+        }
+        scannedProjects = [{ depTree: depRes }];
     }
     return {
         plugin: {
             name: 'snyk-nodejs-lockfile-parser',
             runtime: process.version,
         },
-        scannedProjects: [{ depTree }],
+        scannedProjects,
     };
 }
 exports.inspect = inspect;
+function isResDepGraph(depRes) {
+    return 'rootPkg' in depRes;
+}
 
 
 /***/ }),
@@ -3897,6 +3927,7 @@ const spinner_1 = __webpack_require__(86766);
 const analytics = __webpack_require__(82744);
 const fs = __webpack_require__(35747);
 const lockFileParser = __webpack_require__(423);
+const snyk_nodejs_lockfile_parser_1 = __webpack_require__(423);
 async function parse(root, targetFile, options) {
     const lockFileFullPath = path.resolve(root, targetFile);
     if (!fs.existsSync(lockFileFullPath)) {
@@ -3922,9 +3953,19 @@ async function parse(root, targetFile, options) {
     });
     const resolveModuleSpinnerLabel = `Analyzing npm dependencies for ${lockFileFullPath}`;
     debug(resolveModuleSpinnerLabel);
+    const strictOutOfSync = options.strictOutOfSync !== false;
+    const lockfileVersion = lockFileParser.getLockfileVersionFromFile(lockFileFullPath);
+    if (lockfileVersion === snyk_nodejs_lockfile_parser_1.NodeLockfileVersion.YarnLockV1 ||
+        lockfileVersion === snyk_nodejs_lockfile_parser_1.NodeLockfileVersion.YarnLockV2) {
+        return await buildDepGraph(root, manifestFileFullPath, lockFileFullPath, lockfileVersion, {
+            includeDevDeps: options.dev || false,
+            includeOptionalDeps: true,
+            strictOutOfSync,
+            pruneCycles: true,
+        });
+    }
     try {
         await spinner_1.spinner(resolveModuleSpinnerLabel);
-        const strictOutOfSync = options.strictOutOfSync !== false;
         return lockFileParser.buildDepTreeFromFiles(root, manifestFileFullPath, lockFileFullPath, options.dev, strictOutOfSync);
     }
     finally {
@@ -3932,6 +3973,26 @@ async function parse(root, targetFile, options) {
     }
 }
 exports.parse = parse;
+async function buildDepGraph(root, manifestFilePath, lockfilePath, lockfileVersion, options) {
+    const manifestFileFullPath = path.resolve(root, manifestFilePath);
+    const lockFileFullPath = path.resolve(root, lockfilePath);
+    if (!fs.existsSync(manifestFileFullPath)) {
+        throw new snyk_nodejs_lockfile_parser_1.InvalidUserInputError('Target file package.json not found at ' +
+            `location: ${manifestFileFullPath}`);
+    }
+    if (!fs.existsSync(lockFileFullPath)) {
+        throw new snyk_nodejs_lockfile_parser_1.InvalidUserInputError('Lockfile not found at location: ' + lockFileFullPath);
+    }
+    const manifestFileContents = fs.readFileSync(manifestFileFullPath, 'utf-8');
+    const lockFileContents = fs.readFileSync(lockFileFullPath, 'utf-8');
+    switch (lockfileVersion) {
+        case snyk_nodejs_lockfile_parser_1.NodeLockfileVersion.YarnLockV1:
+            return await lockFileParser.parseYarnLockV1Project(manifestFileContents, lockFileContents, options);
+        case snyk_nodejs_lockfile_parser_1.NodeLockfileVersion.YarnLockV2:
+            return lockFileParser.parseYarnLockV2Project(manifestFileContents, lockFileContents, options);
+    }
+    throw new Error('Failed to build dep graph from current project');
+}
 
 
 /***/ }),