snyk 1.1121.0 → 1.1122.0

package/dist/cli/95.index.js

@@ -180909,10 +180909,10 @@ const manifest = __webpack_require__(91314);
 const lockFile = __webpack_require__(95531);
 const poetryDepGraphBuilder = __webpack_require__(42393);
 function buildDepGraph(manifestFileContents, lockFileContents, includeDevDependencies = false) {
-    const dependencyNames = manifest.getDependencyNamesFrom(manifestFileContents, includeDevDependencies);
+    const dependencies = manifest.getDependenciesFrom(manifestFileContents, includeDevDependencies);
     const pkgDetails = manifest.pkgInfoFrom(manifestFileContents);
     const pkgSpecs = lockFile.packageSpecsFrom(lockFileContents);
-    return poetryDepGraphBuilder.build(pkgDetails, dependencyNames, pkgSpecs);
+    return poetryDepGraphBuilder.build(pkgDetails, dependencies, pkgSpecs);
 }
 exports.buildDepGraph = buildDepGraph;
 //# sourceMappingURL=index.js.map
@@ -180958,7 +180958,7 @@ exports.LockFileNotValid = LockFileNotValid;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.ManifestFileNotValid = exports.getDependencyNamesFrom = exports.pkgInfoFrom = void 0;
+exports.ManifestFileNotValid = exports.getDependenciesFrom = exports.pkgInfoFrom = void 0;
 const toml = __webpack_require__(5022);
 function pkgInfoFrom(manifestFileContents) {
     let manifest;
@@ -180974,21 +180974,44 @@ function pkgInfoFrom(manifestFileContents) {
     }
 }
 exports.pkgInfoFrom = pkgInfoFrom;
-function getDependencyNamesFrom(manifestFileContents, includeDevDependencies) {
+function getDependenciesFrom(manifestFileContents, includeDevDependencies) {
     var _a;
     const manifest = toml.parse(manifestFileContents);
     if (!((_a = manifest.tool) === null || _a === void 0 ? void 0 : _a.poetry)) {
         throw new ManifestFileNotValid();
     }
-    const dependencies = dependenciesFrom(manifest);
-    const devDependencies = includeDevDependencies
-        ? devDependenciesFrom(manifest)
+    const dependencies = dependenciesFrom(manifest).map((dep) => ({
+        name: dep,
+        isDev: false,
+    }));
+    const devDependencies = (includeDevDependencies ? devDependenciesFrom(manifest) : []).map((devDep) => ({
+        name: devDep,
+        isDev: true,
+    }));
+    return [...dependencies, ...devDependencies].filter((pkg) => pkg.name != 'python');
+}
+exports.getDependenciesFrom = getDependenciesFrom;
+const getGroupDevDepNames = (obj) => {
+    const groupDevDepNames = Object.values(obj)
+        .map((group) => group.dependencies)
+        .map((depsObj) => Object.keys(depsObj))
+        .reduce((acc, curr) => [...acc, ...curr], []);
+    return groupDevDepNames;
+};
+function getAllDevDependencyNames(manifest) {
+    var _a;
+    // pre-v1.2.0 naming convention
+    const devDepsProperty = Object.keys((_a = manifest.tool.poetry['dev-dependencies']) !== null && _a !== void 0 ? _a : []);
+    // post-v1.2.0 dependency groups
+    // https://python-poetry.org/docs/master/managing-dependencies
+    // we will handle all tool.poetry.group.<group> as dev-deps
+    const groupDevDepsProperty = manifest.tool.poetry.group
+        ? getGroupDevDepNames(manifest.tool.poetry.group)
         : [];
-    return [...dependencies, ...devDependencies].filter((pkgName) => pkgName != 'python');
+    return [...devDepsProperty, ...groupDevDepsProperty];
 }
-exports.getDependencyNamesFrom = getDependencyNamesFrom;
 function devDependenciesFrom(manifest) {
-    return Object.keys(manifest.tool.poetry['dev-dependencies'] || []);
+    return getAllDevDependencyNames(manifest);
 }
 function dependenciesFrom(manifest) {
     return Object.keys(manifest.tool.poetry.dependencies || []);
@@ -181021,18 +181044,19 @@ const IGNORED_DEPENDENCIES = [
     'pip',
     'wheel',
 ];
-function build(pkgDetails, pkgDependencyNames, pkgSpecs) {
+function build(pkgDetails, dependencies, pkgSpecs) {
     const builder = new dep_graph_1.DepGraphBuilder({ name: 'poetry' }, pkgDetails);
-    addDependenciesToGraph(pkgDependencyNames, pkgSpecs, builder.rootNodeId, builder);
+    addDependenciesToGraph(dependencies, pkgSpecs, builder.rootNodeId, builder);
     return builder.build();
 }
 exports.build = build;
-function addDependenciesToGraph(pkgNames, pkgSpecs, parentNodeId, builder) {
-    for (const pkgName of pkgNames) {
-        addDependenciesForPkg(pkgName, pkgSpecs, parentNodeId, builder);
+function addDependenciesToGraph(dependencies, pkgSpecs, parentNodeId, builder) {
+    for (const dep of dependencies) {
+        addDependenciesForPkg(dep, pkgSpecs, parentNodeId, builder);
     }
 }
-function addDependenciesForPkg(pkgName, pkgSpecs, parentNodeId, builder) {
+function addDependenciesForPkg(dependency, pkgSpecs, parentNodeId, builder) {
+    const pkgName = dependency.name;
     if (IGNORED_DEPENDENCIES.includes(pkgName)) {
         return;
     }
@@ -181045,8 +181069,15 @@ function addDependenciesForPkg(pkgName, pkgSpecs, parentNodeId, builder) {
         return;
     }
     const pkgInfo = { name: pkg.name, version: pkg.version };
-    builder.addPkgNode(pkgInfo, pkg.name).connectDep(parentNodeId, pkg.name);
-    addDependenciesToGraph(pkg.dependencies, pkgSpecs, pkg.name, builder);
+    builder
+        .addPkgNode(pkgInfo, pkg.name, {
+        labels: { scope: dependency.isDev ? 'dev' : 'prod' },
+    })
+        .connectDep(parentNodeId, pkg.name);
+    addDependenciesToGraph(pkg.dependencies.map((dep) => ({
+        name: dep,
+        isDev: dependency.isDev,
+    })), pkgSpecs, pkg.name, builder);
 }
 function isPkgAlreadyInGraph(pkg, builder) {
     return builder
@@ -181223,6 +181254,18 @@ function createAssets() {
         path.join(__dirname, '../../pysrc/pytoml/core.py'),
         path.join(__dirname, '../../pysrc/pytoml/parser.py'),
         path.join(__dirname, '../../pysrc/pytoml/writer.py'),
+        path.join(__dirname, '../../pysrc/packaging/tags.py'),
+        path.join(__dirname, '../../pysrc/packaging/_typing.py'),
+        path.join(__dirname, '../../pysrc/packaging/version.py'),
+        path.join(__dirname, '../../pysrc/packaging/__init__.py'),
+        path.join(__dirname, '../../pysrc/packaging/utils.py'),
+        path.join(__dirname, '../../pysrc/packaging/requirements.py'),
+        path.join(__dirname, '../../pysrc/packaging/_structures.py'),
+        path.join(__dirname, '../../pysrc/packaging/markers.py'),
+        path.join(__dirname, '../../pysrc/packaging/__about__.py'),
+        path.join(__dirname, '../../pysrc/packaging/_compat.py'),
+        path.join(__dirname, '../../pysrc/packaging/specifiers.py'),
+        path.join(__dirname, '../../pysrc/pyparsing.py'),
     ];
 }
 function writeFile(writeFilePath, contents) {