Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
## NEXT

* `bom show` now also shows the group, if it exists.
* Improve dependency detection in `getdependencies javascript`.
* Fix issue in `project prerequisites` when reading an empty project.

## 2.10.0
Expand Down
12 changes: 8 additions & 4 deletions capycli/dependencies/javascript.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,9 @@ def get_dependency_lockversion3(self, data: Dict[str, Any], sbom: Bom) -> Bom:
if "dev" in dep:
isdev = dep["dev"]

version = dep.get("version", "")
if isdev:
# LOG.debug("Ignoring dev dependency: " + key + "," + dep["version"])
print_yellow("Ignoring dev dependency: " + key + "," + dep["version"])
continue

modified_key = ""
Expand All @@ -115,11 +116,14 @@ def get_dependency_lockversion3(self, data: Dict[str, Any], sbom: Bom) -> Bom:
else:
modified_key = key

LOG.debug("Checking dependency: " + modified_key + "," + dep["version"])
purl = PackageURL("npm", "", modified_key, dep["version"], "", "")
if dep.get("link", ""):
print_yellow("Ignoring linked dependency: " + modified_key + "," + version)
continue
LOG.debug("Checking dependency: " + modified_key + "," + version)
purl = PackageURL("npm", "", modified_key, version, "", "")
cxcomp = Component(
name=modified_key.strip(),
version=dep["version"].strip(),
version=version.strip(),
purl=purl,
bom_ref=purl.to_string())

Expand Down