[Fixed] Fix 'unknown' Yarn 2 licenses

Yarn 2 groups packages by the license, so there shouldn't be any
'unknown's during regular processing. The "incompatible match"
condition seems to apply to the version, not the license, so it doesn't
need to be set to 'unknown' when this condition is met.

Author: swarren12

lib/license_finder/package_managers/yarn.rb

@@ -96,8 +96,8 @@ def get_yarn_packages(json_objects)
         body = json_object['children']
 
         body.each do |package_name, vendor_info|
-          valid_match = %r{(?<name>[@,\w,\-,/,.]+)@(?<manager>\D*):\D*(?<version>(\d+\.?)+)} =~ package_name.to_s
-          valid_match = %r{(?<name>[@,\w,\-,/,.]+)@virtual:.+#(\D*):\D*(?<version>(\d+\.?)+)} =~ package_name.to_s if manager.eql?('virtual')
+          valid_match = %r{(?<name>@?[\w/.-]+)@(?<manager>\D*):\D*(?<version>(\d+\.?)+)} =~ package_name.to_s
+          valid_match = %r{(?<name>@?[\w/.-]+)@virtual:.+#(\D*):\D*(?<version>(\d+\.?)+)} =~ package_name.to_s if manager.eql?('virtual')
 
           if valid_match
             homepage = vendor_info['children']['vendorUrl']
@@ -112,10 +112,10 @@ def get_yarn_packages(json_objects)
             )
             packages << package
           end
-          incompatible_match = /(?<name>[\w,-]+)@[a-z]*:(?<version>(\.))/ =~ package_name.to_s
 
+          incompatible_match = %r{(?<name>@?[\w/.-]+)@[a-z]*:(?<version>(\.))} =~ package_name.to_s
           if incompatible_match
-            package = YarnPackage.new(name, version, spec_licenses: ['unknown'])
+            package = YarnPackage.new(name, version, spec_licenses: [license])
             incompatible_packages.push(package)
           end
         end
@@ -126,14 +126,14 @@ def get_yarn_packages(json_objects)
 
     def get_yarn1_packages(json_objects)
       packages = []
-      incompatible_packages = []
       if json_objects.last['type'] == 'table'
         license_json = json_objects.pop['data']
         packages = packages_from_json(license_json)
       end
 
+      incompatible_packages = []
       json_objects.each do |json_object|
-        match = /(?<name>[\w,-]+)@(?<version>(\d+\.?)+)/ =~ json_object['data'].to_s
+        match = %r{(?<name>@?[\w/.-]+)@(?<version>(\d+\.?)+)} =~ json_object['data'].to_s
         if match
           package = YarnPackage.new(name, version, spec_licenses: ['unknown'])
           incompatible_packages.push(package)

spec/lib/license_finder/package_managers/yarn_spec.rb

@@ -13,7 +13,10 @@ module LicenseFinder
       {
         'type' => 'table',
         'data' => {
-          'body' => [['yn', '2.0.0', 'MIT', 'https://github.com/sindresorhus/yn.git', 'sindresorhus.com', 'Sindre Sorhus']],
+          'body' => [
+            ['@sindresorhus/is', '0.7.0', 'MIT', 'https://github.com/sindresorhus/is.git', 'sindresorhus.com', 'Sindre Sorhus'],
+            ['yn', '2.0.0', 'MIT', 'https://github.com/sindresorhus/yn.git', 'sindresorhus.com', 'Sindre Sorhus']
+          ],
           'head' => %w[Name Version License URL VendorUrl VendorName]
         }
       }.to_json
@@ -161,6 +164,21 @@ module LicenseFinder
           expect(subject.current_packages.last.authors).to eq ''
           expect(subject.current_packages.last.install_path).to eq Pathname(root).join('yarn_modules', '@types/jest')
         end
+
+        it 'displays incompatible packages with correct license type' do
+          allow(SharedHelpers::Cmd).to receive(:run).with(Yarn::SHELL_COMMAND) do
+            [
+              '{"value":"Internal","children":{"@company/package@workspace:.":{"value":{"locator":"@company/package@workspace:.","descriptor":"@company/package@workspace:."},"children":{}}}}',
+              '',
+              cmd_success
+            ]
+          end
+
+          expect(subject.current_packages.length).to eq 1
+          expect(subject.current_packages.last.name).to eq '@company/package'
+          expect(subject.current_packages.last.version).to eq '.'
+          expect(subject.current_packages.last.license_names_from_spec).to eq ['Internal']
+        end
       end
 
       it 'displays packages as returned from "yarn list"' do
@@ -171,13 +189,19 @@ module LicenseFinder
           [yarn1_shell_command_output, '', cmd_success]
         end
 
-        expect(subject.current_packages.length).to eq 1
-        expect(subject.current_packages.first.name).to eq 'yn'
-        expect(subject.current_packages.first.version).to eq '2.0.0'
+        expect(subject.current_packages.length).to eq 2
+        expect(subject.current_packages.first.name).to eq '@sindresorhus/is'
+        expect(subject.current_packages.first.version).to eq '0.7.0'
         expect(subject.current_packages.first.license_names_from_spec).to eq ['MIT']
         expect(subject.current_packages.first.homepage).to eq 'sindresorhus.com'
         expect(subject.current_packages.first.authors).to eq 'Sindre Sorhus'
-        expect(subject.current_packages.first.install_path).to eq Pathname(root).join('yarn_modules', 'yn')
+        expect(subject.current_packages.first.install_path).to eq Pathname(root).join('yarn_modules', '@sindresorhus/is')
+        expect(subject.current_packages.last.name).to eq 'yn'
+        expect(subject.current_packages.last.version).to eq '2.0.0'
+        expect(subject.current_packages.last.license_names_from_spec).to eq ['MIT']
+        expect(subject.current_packages.last.homepage).to eq 'sindresorhus.com'
+        expect(subject.current_packages.last.authors).to eq 'Sindre Sorhus'
+        expect(subject.current_packages.last.install_path).to eq Pathname(root).join('yarn_modules', 'yn')
       end
 
       it 'uses node_modules as fallback for install path' do
@@ -188,7 +212,7 @@ module LicenseFinder
           [yarn1_shell_command_output, '', cmd_success]
         end
 
-        expect(subject.current_packages.first.install_path).to eq Pathname(root).join('node_modules', 'yn')
+        expect(subject.current_packages.last.install_path).to eq Pathname(root).join('node_modules', 'yn')
       end
 
       it 'displays incompatible packages with license type unknown' do