Skip to content

Commit 494b87d

Browse files
pombredannepombredanne
committed
Adopt new handler design for npm packages
We now have these data file handlers: * NpmPackageJsonHandler * NpmPackageLockJsonHandler * NpmShrinkwrapJsonHandler * YarnLockV2Handler * YarnLockV1Handler And we assemble these in Packages correctly Signed-off-by: Philippe Ombredanne <[email protected]>
1 parent fb93891 commit 494b87d

File tree

55 files changed

+28042
-23957
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+28042
-23957
lines changed

‎src/packagedcode/npm.py‎

Lines changed: 558 additions & 382 deletions
Large diffs are not rendered by default.

‎tests/packagedcode/data/npm/as_installed/package.json.expected‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2210,8 +2210,8 @@
22102210
"Artistic-2.0"
22112211
],
22122212
"notice_text": null,
2213-
"contains_source_code": null,
22142213
"source_packages": [],
2214+
"file_references": [],
22152215
"extra_data": {},
22162216
"dependencies": [
22172217
{
@@ -2908,9 +2908,10 @@
29082908
"resolved_package": {}
29092909
}
29102910
],
2911-
"purl": "pkg:npm/[email protected]",
29122911
"repository_homepage_url": "https://www.npmjs.com/package/npm",
29132912
"repository_download_url": "https://registry.npmjs.org/npm/-/npm-2.13.5.tgz",
2914-
"api_data_url": "https://registry.npmjs.org/npm/2.13.5"
2913+
"api_data_url": "https://registry.npmjs.org/npm/2.13.5",
2914+
"datasource_id": "npm_package_json",
2915+
"purl": "pkg:npm/[email protected]"
29152916
}
29162917
]

‎tests/packagedcode/data/npm/authors_list_dicts/package.json.expected‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
}
5959
],
6060
"notice_text": null,
61-
"contains_source_code": null,
6261
"source_packages": [],
62+
"file_references": [],
6363
"extra_data": {},
6464
"dependencies": [
6565
{
@@ -117,9 +117,10 @@
117117
"resolved_package": {}
118118
}
119119
],
120-
"purl": "pkg:npm/[email protected]",
121120
"repository_homepage_url": "https://www.npmjs.com/package/grunt-csscomb",
122121
"repository_download_url": "https://registry.npmjs.org/grunt-csscomb/-/grunt-csscomb-3.1.1.tgz",
123-
"api_data_url": "https://registry.npmjs.org/grunt-csscomb/3.1.1"
122+
"api_data_url": "https://registry.npmjs.org/grunt-csscomb/3.1.1",
123+
"datasource_id": "npm_package_json",
124+
"purl": "pkg:npm/[email protected]"
124125
}
125126
]

‎tests/packagedcode/data/npm/authors_list_strings/package.json.expected‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
"MIT"
5454
],
5555
"notice_text": null,
56-
"contains_source_code": null,
5756
"source_packages": [],
57+
"file_references": [],
5858
"extra_data": {},
5959
"dependencies": [
6060
{
@@ -391,9 +391,10 @@
391391
"resolved_package": {}
392392
}
393393
],
394-
"purl": "pkg:npm/[email protected]",
395394
"repository_homepage_url": "https://www.npmjs.com/package/react-motion",
396395
"repository_download_url": "https://registry.npmjs.org/react-motion/-/react-motion-0.5.2.tgz",
397-
"api_data_url": "https://registry.npmjs.org/react-motion/0.5.2"
396+
"api_data_url": "https://registry.npmjs.org/react-motion/0.5.2",
397+
"datasource_id": "npm_package_json",
398+
"purl": "pkg:npm/[email protected]"
398399
}
399400
]

‎tests/packagedcode/data/npm/authors_list_strings2/package.json.expected‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
"license_expression": null,
4848
"declared_license": [],
4949
"notice_text": null,
50-
"contains_source_code": null,
5150
"source_packages": [],
51+
"file_references": [],
5252
"extra_data": {},
5353
"dependencies": [
5454
{
@@ -70,9 +70,10 @@
7070
"resolved_package": {}
7171
}
7272
],
73-
"purl": "pkg:npm/[email protected]",
7473
"repository_homepage_url": "https://www.npmjs.com/package/exif",
7574
"repository_download_url": "https://registry.npmjs.org/exif/-/exif-0.6.0.tgz",
76-
"api_data_url": "https://registry.npmjs.org/exif/0.6.0"
75+
"api_data_url": "https://registry.npmjs.org/exif/0.6.0",
76+
"datasource_id": "npm_package_json",
77+
"purl": "pkg:npm/[email protected]"
7778
}
7879
]

‎tests/packagedcode/data/npm/basic/package.json.expected‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
"license_expression": null,
3838
"declared_license": [],
3939
"notice_text": null,
40-
"contains_source_code": null,
4140
"source_packages": [],
41+
"file_references": [],
4242
"extra_data": {},
4343
"dependencies": [
4444
{
@@ -60,9 +60,10 @@
6060
"resolved_package": {}
6161
}
6262
],
63-
"purl": "pkg:npm/[email protected]",
6463
"repository_homepage_url": "https://www.npmjs.com/package/cookie-signature",
6564
"repository_download_url": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz",
66-
"api_data_url": "https://registry.npmjs.org/cookie-signature/1.0.3"
65+
"api_data_url": "https://registry.npmjs.org/cookie-signature/1.0.3",
66+
"datasource_id": "npm_package_json",
67+
"purl": "pkg:npm/[email protected]"
6768
}
6869
]

‎tests/packagedcode/data/npm/bundledDeps/package.json.expected‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"license_expression": null,
2626
"declared_license": [],
2727
"notice_text": null,
28-
"contains_source_code": null,
2928
"source_packages": [],
29+
"file_references": [],
3030
"extra_data": {},
3131
"dependencies": [
3232
{
@@ -57,9 +57,10 @@
5757
"resolved_package": {}
5858
}
5959
],
60-
"purl": "pkg:npm/[email protected]",
6160
"repository_homepage_url": "https://www.npmjs.com/package/pahub",
6261
"repository_download_url": "https://registry.npmjs.org/pahub/-/pahub-0.4.0.tgz",
63-
"api_data_url": "https://registry.npmjs.org/pahub/0.4.0"
62+
"api_data_url": "https://registry.npmjs.org/pahub/0.4.0",
63+
"datasource_id": "npm_package_json",
64+
"purl": "pkg:npm/[email protected]"
6465
}
6566
]

‎tests/packagedcode/data/npm/casepath/package.json.expected‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
"MIT"
3636
],
3737
"notice_text": null,
38-
"contains_source_code": null,
3938
"source_packages": [],
39+
"file_references": [],
4040
"extra_data": {},
4141
"dependencies": [
4242
{
@@ -301,9 +301,10 @@
301301
"resolved_package": {}
302302
}
303303
],
304-
"purl": "pkg:npm/[email protected]",
305304
"repository_homepage_url": "https://www.npmjs.com/package/casesensitivepathswebpackpluginDemo",
306305
"repository_download_url": "https://registry.npmjs.org/casesensitivepathswebpackpluginDemo/-/casesensitivepathswebpackpluginDemo-0.0.1.tgz",
307-
"api_data_url": "https://registry.npmjs.org/casesensitivepathswebpackpluginDemo/0.0.1"
306+
"api_data_url": "https://registry.npmjs.org/casesensitivepathswebpackpluginDemo/0.0.1",
307+
"datasource_id": "npm_package_json",
308+
"purl": "pkg:npm/[email protected]"
308309
}
309310
]

‎tests/packagedcode/data/npm/chartist/package.json.expected‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
}
4949
],
5050
"notice_text": null,
51-
"contains_source_code": null,
5251
"source_packages": [],
52+
"file_references": [],
5353
"extra_data": {},
5454
"dependencies": [
5555
{
@@ -323,9 +323,10 @@
323323
"resolved_package": {}
324324
}
325325
],
326-
"purl": "pkg:npm/[email protected]",
327326
"repository_homepage_url": "https://www.npmjs.com/package/chartist",
328327
"repository_download_url": "https://registry.npmjs.org/chartist/-/chartist-0.11.0.tgz",
329-
"api_data_url": "https://registry.npmjs.org/chartist/0.11.0"
328+
"api_data_url": "https://registry.npmjs.org/chartist/0.11.0",
329+
"datasource_id": "npm_package_json",
330+
"purl": "pkg:npm/[email protected]"
330331
}
331332
]

‎tests/packagedcode/data/npm/dist/package.json.expected‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
"MIT"
3636
],
3737
"notice_text": null,
38-
"contains_source_code": null,
3938
"source_packages": [],
39+
"file_references": [],
4040
"extra_data": {},
4141
"dependencies": [
4242
{
@@ -85,9 +85,10 @@
8585
"resolved_package": {}
8686
}
8787
],
88-
"purl": "pkg:npm/[email protected]",
8988
"repository_homepage_url": "https://www.npmjs.com/package/angular-compare-validator",
9089
"repository_download_url": "https://registry.npmjs.org/angular-compare-validator/-/angular-compare-validator-0.1.1.tgz",
91-
"api_data_url": "https://registry.npmjs.org/angular-compare-validator/0.1.1"
90+
"api_data_url": "https://registry.npmjs.org/angular-compare-validator/0.1.1",
91+
"datasource_id": "npm_package_json",
92+
"purl": "pkg:npm/[email protected]"
9293
}
9394
]

0 commit comments

Comments
 (0)