bug: yarn 2 lock file parsing issues snyk#56

regevbr · Apr 14, 2020 · 1a45373 · 1a45373
1 parent 5ef2940
commit 1a45373
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/lib/parsers/yarn-utils.ts b/lib/parsers/yarn-utils.ts
@@ -8,12 +8,18 @@ export type ParseResolution = typeof parseResolution;
 
 const keyNormalizer = (resolutionParser: ParseResolution) => (key: string): string => {
     // See https://yarnpkg.com/features/protocols
+    key = key.replace(/::.*$/, '')
+        .trim();
     let normalizedKey = key
-        .replace(/(#|::).*$/, '')
+        .replace(/#.*$/, '')
         .trim();
     const patchIndex = normalizedKey.indexOf(PATCH_PLACEHOLDER);
     if (patchIndex > -1) {
-        normalizedKey = normalizedKey.substr(patchIndex + PATCH_PLACEHOLDER.length);
+        if (key.indexOf('#builtin') > -1) {
+            normalizedKey = normalizedKey.substr(patchIndex + PATCH_PLACEHOLDER.length);
+        } else {
+            return key;
+        }
     }
     const fileProtocol = normalizedKey.match(/^(.+)@((file|link|portal):.+)$/);
     if (fileProtocol) {

diff --git a/test/lib/yarn-utils.test.ts b/test/lib/yarn-utils.test.ts
@@ -62,11 +62,21 @@ if (getRuntimeVersion() >= 10) {
   });
 
   test('Should work for patch protocol', async (t) => {
+    const key = normalizer('left-pad@patch:[email protected]#./my-patch.patch::locator=external-tarball%40workspace%3A.');
+    t.deepEqual(key, [ 'left-pad@patch:[email protected]#./my-patch.patch'], 'Resolution is normalized');
+  });
+
+  test('Should work for patch protocol with scope', async (t) => {
+    const key = normalizer('@types/istanbul-reports@patch:@types/[email protected]#./my-patch.patch::locator=external-tarball%40workspace%3A.');
+    t.deepEqual(key, [ '@types/istanbul-reports@patch:@types/[email protected]#./my-patch.patch'], 'Resolution is normalized');
+  });
+
+  test('Should work for builtin patch protocol', async (t) => {
     const key = normalizer('fsevents@patch:fsevents@^1.2.7#builtin<compat/fsevents>');
     t.deepEqual(key, [ 'fsevents@^1.2.7'], 'Resolution is normalized');
   });
 
-  test('Should work for patch protocol - multiple resolutions', async (t) => {
+  test('Should work for builtin patch protocol - multiple resolutions', async (t) => {
     const key = normalizer('fsevents@patch:fsevents@^1.2.7#builtin<compat/fsevents>, fsevents@patch:fsevents@^1.2.6#builtin<compat/fsevents>');
     t.deepEqual(key, [ 'fsevents@^1.2.7', 'fsevents@^1.2.6'], 'Resolution is normalized');
   });