Merge pull request #283 from snyk/fix/add-alias-in-graph-yarn

fix: add missing alias labels in yarn [SOSE-22]

Author: aarlaud

lib/dep-graph-builders/util.ts

@@ -163,6 +163,7 @@ export const getChildNode = (
         dependencies: {},
         isDev: depInfo.isDev,
         missingLockFileEntry: true,
+        alias: depInfo.alias,
       };
     }
   } else {
@@ -180,6 +181,7 @@ export const getChildNode = (
       version: depData.version,
       dependencies: { ...dependencies, ...optionalDependencies },
       isDev: depInfo.isDev,
+      alias: depInfo.alias,
     };
   }
 

lib/dep-graph-builders/yarn-lock-v1/build-depgraph-simple.ts

@@ -109,6 +109,9 @@ const dfsVisit = async (
               ...(node.missingLockFileEntry && {
                 missingLockFileEntry: 'true',
               }),
+              ...(childNode.alias && {
+                alias: `${childNode.alias.aliasName}=>${childNode.alias.aliasTargetDepName}@${childNode.version}`,
+              }),
             },
           },
         );
@@ -128,6 +131,9 @@ const dfsVisit = async (
           ...(node.missingLockFileEntry && {
             missingLockFileEntry: 'true',
           }),
+          ...(childNode.alias && {
+            alias: `${childNode.alias.aliasName}=>${childNode.alias.aliasTargetDepName}@${childNode.version}`,
+          }),
         },
       },
     );

lib/dep-graph-builders/yarn-lock-v2/build-depgraph-simple.ts

@@ -123,6 +123,9 @@ const dfsVisit = async (
               ...(node.missingLockFileEntry && {
                 missingLockFileEntry: 'true',
               }),
+              ...(childNode.alias && {
+                alias: `${childNode.alias.aliasName}=>${childNode.alias.aliasTargetDepName}@${childNode.version}`,
+              }),
             },
           },
         );
@@ -142,6 +145,9 @@ const dfsVisit = async (
           ...(node.missingLockFileEntry && {
             missingLockFileEntry: 'true',
           }),
+          ...(childNode.alias && {
+            alias: `${childNode.alias.aliasName}=>${childNode.alias.aliasTargetDepName}@${childNode.version}`,
+          }),
         },
       },
     );

test/jest/dep-graph-builders/aliases.test.ts

@@ -36,6 +36,9 @@ describe('Testing aliases for yarn', () => {
     const pkgs = newDepGraph.getPkgs();
     expect(pkgs.some((x) => x.name === 'pkg')).toBeFalsy();
     expect(pkgs.some((x) => x.name === '@yao-pkg/pkg')).toBeTruthy();
+    expect(JSON.stringify(newDepGraph)).toContain(
+      '"alias":"pkg=>@yao-pkg/[email protected]"',
+    );
   });
 
   it('match aliased package also used in transitive deps - yarn-lock-v1', async () => {
@@ -170,6 +173,9 @@ describe('Testing aliases for yarn', () => {
     const pkgs = newDepGraph.getPkgs();
     expect(pkgs.some((x) => x.name === 'pkg')).toBeFalsy();
     expect(pkgs.some((x) => x.name === '@yao-pkg/pkg')).toBeTruthy();
+    expect(JSON.stringify(newDepGraph)).toContain(
+      '"alias":"pkg=>@yao-pkg/[email protected]"',
+    );
   });
 
   it('match aliased package also used in transitive deps - yarn-lock-v2', async () => {

test/jest/dep-graph-builders/fixtures/yarn-lock-v2/real/git-remote-url/expected.json

@@ -1330,7 +1330,8 @@
         "deps": [],
         "info": {
           "labels": {
-            "scope": "prod"
+            "scope": "prod",
+            "alias": "ms=>[email protected]"
           }
         }
       },