Support lockFileVersion 3

digidem · Feb 17, 2023 · 6fded38 · 6fded38
1 parent b320fff
commit 6fded38
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 40 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "js-base64": "^3.7.2",
     "markdown-table": "^3.0.2",
     "semver": "^7.3.7",
-    "snyk-nodejs-lockfile-parser": "^1.38.0"
+    "snyk-nodejs-lockfile-parser": "^1.47.3"
   },
   "devDependencies": {
     "@babel/core": "^7.17.9",

diff --git a/src/utils.js b/src/utils.js
@@ -21,8 +21,9 @@ const formatForVersionCompare = (key) => {
 
 const formatLockEntry = (obj) =>
   Object.fromEntries(
-    Object.entries(obj.dependencies)
-      .map(([key, { version }]) => `${key}@${version}`)
+    Object.entries(obj.dependencies || obj.packages)
+      .map(([key, { version }]) => `${key.replace(/\bnode_modules\//g, '')}@${version}`)
+      .filter((a) => a.split('/').length === (a[0] === '@' ? 2 : 1))
       .sort((a, b) => {
         const nameCompare = formatForNameCompare(a).localeCompare(formatForNameCompare(b))
         if (nameCompare === 0) {
@@ -32,8 +33,8 @@ const formatLockEntry = (obj) =>
       })
       .map((key) => {
         const nameParts = key.split('@')
-        const name = nameParts[0] === '' ? '@' + nameParts[1] : nameParts[0]
-        const version = nameParts[0] === '' ? nameParts[2] : nameParts[1]
+        const version = nameParts.pop()
+        const name = nameParts.join('@')
         return [name, { name, version }]
       })
   )