Merge pull request #95 from fosslight/develop

Fix to separate multi license for npm

Author: dd-jy

src/fosslight_dependency/package_manager/Npm.py

@@ -168,11 +168,9 @@ def check_multi_license(license_name, manifest_file_path):
             multi_license = ','.join(multi_license_list)
         else:
             if license_name.startswith('(') and license_name.endswith(')'):
-                license_name = license_name[1:]
-                license_name = license_name[:-1]
+                license_name = license_name.lstrip('(').rstrip(')')
                 license_comment = license_name
-                re_result = re.findall(r'(\S+)\s(AND|OR)\s(\S+)', license_comment)
-                multi_license = f'{re_result[0][0]},{re_result[0][2]}'
+                multi_license = ','.join(re.split(r'OR|AND', license_name))
     except Exception as e:
         multi_license = license_name
         logger.warning(f'Fail to parse multi license in npm: {e}')

tests/test_npm1/package.json

@@ -32,7 +32,8 @@
         "url-parse": "^1.5.0",
         "xmlbuilder": "^13.0.2",
         "node-forge": "1.3.1",
-        "sha.js": "2.4.11"
+        "sha.js": "2.4.11",
+        "rc": "1.2.8"
     },
     "devDependencies": {
         "@types/node": "9.6.57",