Skip to content

Commit bca197e

Browse files
authored
Merge pull request #93 from fosslight/develop
Fix the comment for npm root package
2 parents c119229 + 8df2f48 commit bca197e

File tree

1 file changed

+7
-1
lines changed
  • src/fosslight_dependency/package_manager

1 file changed

+7
-1
lines changed

src/fosslight_dependency/package_manager/Npm.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class Npm(PackageManager):
2222
dn_url = 'https://www.npmjs.com/package/'
2323
input_file_name = 'tmp_npm_license_output.json'
2424
flag_tmp_node_modules = False
25+
package_name = ''
2526

2627
direct_dep_dict = dict()
2728

@@ -111,7 +112,9 @@ def parse_oss_information(self, f_name):
111112
comment = 'direct'
112113
else:
113114
comment = 'transitive'
114-
115+
if self.package_name:
116+
if self.package_name == oss_init_name:
117+
comment = 'root package'
115118
multi_license = check_multi_license(license_name)
116119
manifest_file_path = os.path.join(package_path, const.SUPPORT_PACKAE.get(self.package_manager_name))
117120
if multi_license:
@@ -132,11 +135,14 @@ def parse_direct_dependencies(self):
132135
tmp_oss_list = []
133136
dependencies = 'dependencies'
134137
version = 'version'
138+
name = 'name'
135139

136140
manifest_file = const.SUPPORT_PACKAE.get(self.package_manager_name)
137141
try:
138142
with open(manifest_file, 'r') as lock_file:
139143
json_lock = json.load(lock_file)
144+
if name in json_lock:
145+
self.package_name = json_lock[name]
140146
if dependencies in json_lock:
141147
for dep in json_lock[dependencies]:
142148
tmp_oss_list.append(dep)

0 commit comments

Comments
 (0)