Merge pull request #260 from snyk/fix/OSM-2314/handle-codelab-references-pnpm

gemaxim · web-flow · commit e76c4afff32c · 2025-01-28T12:55:56.000+02:00
fix: [OSM-2314] handle codelab references in pnpm
diff --git a/lib/dep-graph-builders/pnpm/utils.ts b/lib/dep-graph-builders/pnpm/utils.ts
@@ -31,6 +31,9 @@ export const getPnpmChildNode = (
   if (lockfileParser.resolvedPackages[resolvedVersion]) {
     childNodeKey = lockfileParser.resolvedPackages[resolvedVersion];
   }
+  if (lockfileParser.resolvedPackages[childNodeKey]) {
+    childNodeKey = lockfileParser.resolvedPackages[childNodeKey];
+  }
   if (!pkgs[childNodeKey]) {
     if (strictOutOfSync && !/^file:/.test(depInfo.version)) {
       const errMessage =
diff --git a/test/jest/dep-graph-builders/fixtures/pnpm-lock-v5/codelab-ref-deps/expected.json b/test/jest/dep-graph-builders/fixtures/pnpm-lock-v5/codelab-ref-deps/expected.json
@@ -0,0 +1,46 @@
+{
+  "schemaVersion": "1.3.0",
+  "pkgManager": {
+    "name": "pnpm"
+  },
+  "pkgs": [
+    {
+      "id": "codelab-ref-deps@0.1.0",
+      "info": {
+        "name": "codelab-ref-deps",
+        "version": "0.1.0"
+      }
+    },
+    {
+      "id": "@snyk/gemfile@0.0.0",
+      "info": {
+        "name": "@snyk/gemfile",
+        "version": "0.0.0"
+      }
+    }
+  ],
+  "graph": {
+    "rootNodeId": "root-node",
+    "nodes": [
+      {
+        "nodeId": "root-node",
+        "pkgId": "codelab-ref-deps@0.1.0",
+        "deps": [
+          {
+            "nodeId": "@snyk/gemfile@0.0.0"
+          }
+        ]
+      },
+      {
+        "nodeId": "@snyk/gemfile@0.0.0",
+        "pkgId": "@snyk/gemfile@0.0.0",
+        "deps": [],
+        "info": {
+          "labels": {
+            "scope": "prod"
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/test/jest/dep-graph-builders/fixtures/pnpm-lock-v5/codelab-ref-deps/package.json b/test/jest/dep-graph-builders/fixtures/pnpm-lock-v5/codelab-ref-deps/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "codelab-ref-deps",
+  "version": "0.1.0",
+  "private": true,
+  "dependencies": {
+    "@snyk/gemfile": "https://codeload.github.com/snyk/gemfile/tar.gz/fff475b"
+  }
+}
diff --git a/test/jest/dep-graph-builders/fixtures/pnpm-lock-v5/codelab-ref-deps/pnpm-lock.yaml b/test/jest/dep-graph-builders/fixtures/pnpm-lock-v5/codelab-ref-deps/pnpm-lock.yaml
diff --git a/test/jest/dep-graph-builders/fixtures/pnpm-lock-v5/git-protocol-peer-deps/expected.json b/test/jest/dep-graph-builders/fixtures/pnpm-lock-v5/git-protocol-peer-deps/expected.json
@@ -635,4 +635,4 @@
       }
     ]
   }
-}
+}
diff --git a/test/jest/dep-graph-builders/fixtures/pnpm-lock-v6/codelab-ref-deps/expected.json b/test/jest/dep-graph-builders/fixtures/pnpm-lock-v6/codelab-ref-deps/expected.json
@@ -0,0 +1,46 @@
+{
+  "schemaVersion": "1.3.0",
+  "pkgManager": {
+    "name": "pnpm"
+  },
+  "pkgs": [
+    {
+      "id": "codelab-ref-deps@0.1.0",
+      "info": {
+        "name": "codelab-ref-deps",
+        "version": "0.1.0"
+      }
+    },
+    {
+      "id": "@snyk/gemfile@0.0.0",
+      "info": {
+        "name": "@snyk/gemfile",
+        "version": "0.0.0"
+      }
+    }
+  ],
+  "graph": {
+    "rootNodeId": "root-node",
+    "nodes": [
+      {
+        "nodeId": "root-node",
+        "pkgId": "codelab-ref-deps@0.1.0",
+        "deps": [
+          {
+            "nodeId": "@snyk/gemfile@0.0.0"
+          }
+        ]
+      },
+      {
+        "nodeId": "@snyk/gemfile@0.0.0",
+        "pkgId": "@snyk/gemfile@0.0.0",
+        "deps": [],
+        "info": {
+          "labels": {
+            "scope": "prod"
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/test/jest/dep-graph-builders/fixtures/pnpm-lock-v6/codelab-ref-deps/package.json b/test/jest/dep-graph-builders/fixtures/pnpm-lock-v6/codelab-ref-deps/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "codelab-ref-deps",
+  "version": "0.1.0",
+  "private": true,
+  "dependencies": {
+    "@snyk/gemfile": "https://codeload.github.com/snyk/gemfile/tar.gz/fff475b"
+  }
+}
diff --git a/test/jest/dep-graph-builders/fixtures/pnpm-lock-v6/codelab-ref-deps/pnpm-lock.yaml b/test/jest/dep-graph-builders/fixtures/pnpm-lock-v6/codelab-ref-deps/pnpm-lock.yaml
diff --git a/test/jest/dep-graph-builders/fixtures/pnpm-lock-v6/git-protocol-peer-deps/expected.json b/test/jest/dep-graph-builders/fixtures/pnpm-lock-v6/git-protocol-peer-deps/expected.json
@@ -635,4 +635,4 @@
       }
     ]
   }
-}
+}
diff --git a/test/jest/dep-graph-builders/fixtures/pnpm-lock-v9/codelab-ref-deps/expected.json b/test/jest/dep-graph-builders/fixtures/pnpm-lock-v9/codelab-ref-deps/expected.json
@@ -0,0 +1,46 @@
+{
+  "schemaVersion": "1.3.0",
+  "pkgManager": {
+    "name": "pnpm"
+  },
+  "pkgs": [
+    {
+      "id": "codelab-ref-deps@0.1.0",
+      "info": {
+        "name": "codelab-ref-deps",
+        "version": "0.1.0"
+      }
+    },
+    {
+      "id": "@snyk/gemfile@0.0.0",
+      "info": {
+        "name": "@snyk/gemfile",
+        "version": "0.0.0"
+      }
+    }
+  ],
+  "graph": {
+    "rootNodeId": "root-node",
+    "nodes": [
+      {
+        "nodeId": "root-node",
+        "pkgId": "codelab-ref-deps@0.1.0",
+        "deps": [
+          {
+            "nodeId": "@snyk/gemfile@0.0.0"
+          }
+        ]
+      },
+      {
+        "nodeId": "@snyk/gemfile@0.0.0",
+        "pkgId": "@snyk/gemfile@0.0.0",
+        "deps": [],
+        "info": {
+          "labels": {
+            "scope": "prod"
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/test/jest/dep-graph-builders/fixtures/pnpm-lock-v9/codelab-ref-deps/package.json b/test/jest/dep-graph-builders/fixtures/pnpm-lock-v9/codelab-ref-deps/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "codelab-ref-deps",
+  "version": "0.1.0",
+  "private": true,
+  "dependencies": {
+    "@snyk/gemfile": "https://codeload.github.com/snyk/gemfile/tar.gz/fff475b"
+  }
+}
diff --git a/test/jest/dep-graph-builders/fixtures/pnpm-lock-v9/codelab-ref-deps/pnpm-lock.yaml b/test/jest/dep-graph-builders/fixtures/pnpm-lock-v9/codelab-ref-deps/pnpm-lock.yaml
diff --git a/test/jest/dep-graph-builders/fixtures/pnpm-lock-v9/git-protocol-peer-deps/expected.json b/test/jest/dep-graph-builders/fixtures/pnpm-lock-v9/git-protocol-peer-deps/expected.json
@@ -635,4 +635,4 @@
       }
     ]
   }
-}
+}
diff --git a/test/jest/dep-graph-builders/pnpm-lock.test.ts b/test/jest/dep-graph-builders/pnpm-lock.test.ts
@@ -26,6 +26,7 @@ describe.each(['pnpm-lock-v5', 'pnpm-lock-v6', 'pnpm-lock-v9'])(
           'alias-sub-dependency',
           'empty-project',
           'git-protocol-peer-deps',
+          'codelab-ref-deps',
         ])('[simple tests] project: %s ', (fixtureName) => {
           jest.setTimeout(50 * 1000);
           it('matches expected', async () => {

Original file line number	Diff line number	Diff line change
`@@ -635,4 +635,4 @@`
`635`	`635`	`}`
`636`	`636`	`]`
`637`	`637`	`}`
`638`		`-}`
	`638`	`+}`