Skip to content

Commit 7b2a7de

Browse files
JonoYangJonoYang
authored
Merge pull request #3398 from nexB/3393-npm-api-url-fix
Do not set version to empty string in npm_api_url #3393
2 parents 35ecb9b + 71eb7ba commit 7b2a7de

File tree

12 files changed

+38
-39
lines changed

12 files changed

+38
-39
lines changed

‎src/packagedcode/npm.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -794,16 +794,17 @@ def npm_api_url(namespace, name, version=None, registry='https://registry.npmjs.
794794
Return a package API data URL given a namespace, name, version and a base
795795
registry URL.
796796
797-
Note that for scoped packages (with a namespace), the URL is not version
798-
specific but contains the data for all versions as the default behvior of
799-
the registries is to return nothing in this case. Special quoting rules are
800-
applied for scoped npms.
797+
Special quoting rules are applied for scoped npms.
801798
802799
For example:
803800
>>> result = npm_api_url('@invisionag', 'eslint-config-ivx', '0.1.4', 'https://registry.yarnpkg.com')
801+
>>> assert result == 'https://registry.yarnpkg.com/@invisionag%2feslint-config-ivx/0.1.4'
802+
803+
>>> result = npm_api_url('@invisionag', 'eslint-config-ivx', registry='https://registry.yarnpkg.com')
804804
>>> assert result == 'https://registry.yarnpkg.com/@invisionag%2feslint-config-ivx'
805805
806806
>>> assert npm_api_url(None, 'angular', '1.6.6') == 'https://registry.npmjs.org/angular/1.6.6'
807+
>>> assert npm_api_url(None, 'angular') == 'https://registry.npmjs.org/angular'
807808
808809
>>> assert not npm_api_url(None, None, None)
809810
"""
@@ -812,8 +813,6 @@ def npm_api_url(namespace, name, version=None, registry='https://registry.npmjs.
812813
# this is a legacy wart: older registries used to always encode this /
813814
# FIXME: do NOT encode and use plain / instead
814815
ns_name = '%2f'.join([namespace, name])
815-
# there is no version-specific URL for scoped packages
816-
version = ''
817816
else:
818817
ns_name = name
819818

‎tests/packagedcode/data/npm/package-lock-v2-2/package-lock.json-expected‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/packagedcode/data/npm/package-lock-v2/package-lock.json-expected‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/packagedcode/data/npm/private-and-yarn/scan.expected.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
],
7272
"repository_homepage_url": "https://www.npmjs.com/package/@babel/runtime",
7373
"repository_download_url": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.2.0.tgz",
74-
"api_data_url": "https://registry.npmjs.org/@babel%2fruntime",
74+
"api_data_url": "https://registry.npmjs.org/@babel%2fruntime/7.2.0",
7575
"datasource_id": "yarn_lock_v1",
7676
"purl": "pkg:npm/%40babel/[email protected]"
7777
},
@@ -197,7 +197,7 @@
197197
],
198198
"repository_homepage_url": "https://www.npmjs.com/package/@ballerina/api-designer",
199199
"repository_download_url": "https://registry.npmjs.org/@ballerina/api-designer/-/api-designer-0.99.0-RC3.tgz",
200-
"api_data_url": "https://registry.npmjs.org/@ballerina%2fapi-designer",
200+
"api_data_url": "https://registry.npmjs.org/@ballerina%2fapi-designer/0.99.0-RC3",
201201
"datasource_id": "yarn_lock_v1",
202202
"purl": "pkg:npm/%40ballerina/[email protected]"
203203
},
@@ -313,7 +313,7 @@
313313
],
314314
"repository_homepage_url": "https://www.npmjs.com/package/@ballerina/ast-model",
315315
"repository_download_url": "https://registry.npmjs.org/@ballerina/ast-model/-/ast-model-0.99.0-RC3.tgz",
316-
"api_data_url": "https://registry.npmjs.org/@ballerina%2fast-model",
316+
"api_data_url": "https://registry.npmjs.org/@ballerina%2fast-model/0.99.0-RC3",
317317
"datasource_id": "yarn_lock_v1",
318318
"purl": "pkg:npm/%40ballerina/[email protected]"
319319
},
@@ -379,7 +379,7 @@
379379
],
380380
"repository_homepage_url": "https://www.npmjs.com/package/@ballerina/ballerina-by-examples",
381381
"repository_download_url": "https://registry.npmjs.org/@ballerina/ballerina-by-examples/-/ballerina-by-examples-0.99.0-RC3.tgz",
382-
"api_data_url": "https://registry.npmjs.org/@ballerina%2fballerina-by-examples",
382+
"api_data_url": "https://registry.npmjs.org/@ballerina%2fballerina-by-examples/0.99.0-RC3",
383383
"datasource_id": "yarn_lock_v1",
384384
"purl": "pkg:npm/%40ballerina/[email protected]"
385385
},
@@ -505,7 +505,7 @@
505505
],
506506
"repository_homepage_url": "https://www.npmjs.com/package/@ballerina/diagram",
507507
"repository_download_url": "https://registry.npmjs.org/@ballerina/diagram/-/diagram-0.99.0-RC3.tgz",
508-
"api_data_url": "https://registry.npmjs.org/@ballerina%2fdiagram",
508+
"api_data_url": "https://registry.npmjs.org/@ballerina%2fdiagram/0.99.0-RC3",
509509
"datasource_id": "yarn_lock_v1",
510510
"purl": "pkg:npm/%40ballerina/[email protected]"
511511
},
@@ -621,7 +621,7 @@
621621
],
622622
"repository_homepage_url": "https://www.npmjs.com/package/@ballerina/distribution",
623623
"repository_download_url": "https://registry.npmjs.org/@ballerina/distribution/-/distribution-0.99.0-RC3.tgz",
624-
"api_data_url": "https://registry.npmjs.org/@ballerina%2fdistribution",
624+
"api_data_url": "https://registry.npmjs.org/@ballerina%2fdistribution/0.99.0-RC3",
625625
"datasource_id": "yarn_lock_v1",
626626
"purl": "pkg:npm/%40ballerina/[email protected]"
627627
},
@@ -717,7 +717,7 @@
717717
],
718718
"repository_homepage_url": "https://www.npmjs.com/package/@ballerina/documentation",
719719
"repository_download_url": "https://registry.npmjs.org/@ballerina/documentation/-/documentation-0.99.0-RC3.tgz",
720-
"api_data_url": "https://registry.npmjs.org/@ballerina%2fdocumentation",
720+
"api_data_url": "https://registry.npmjs.org/@ballerina%2fdocumentation/0.99.0-RC3",
721721
"datasource_id": "yarn_lock_v1",
722722
"purl": "pkg:npm/%40ballerina/[email protected]"
723723
},
@@ -772,7 +772,7 @@
772772
"dependencies": [],
773773
"repository_homepage_url": "https://www.npmjs.com/package/@ballerina/font",
774774
"repository_download_url": "https://registry.npmjs.org/@ballerina/font/-/font-0.99.0-RC3.tgz",
775-
"api_data_url": "https://registry.npmjs.org/@ballerina%2ffont",
775+
"api_data_url": "https://registry.npmjs.org/@ballerina%2ffont/0.99.0-RC3",
776776
"datasource_id": "yarn_lock_v1",
777777
"purl": "pkg:npm/%40ballerina/[email protected]"
778778
},
@@ -1024,7 +1024,7 @@
10241024
],
10251025
"repository_homepage_url": "https://www.npmjs.com/package/@babel/runtime",
10261026
"repository_download_url": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.2.0.tgz",
1027-
"api_data_url": "https://registry.npmjs.org/@babel%2fruntime",
1027+
"api_data_url": "https://registry.npmjs.org/@babel%2fruntime/7.2.0",
10281028
"datasource_id": "yarn_lock_v1",
10291029
"purl": "pkg:npm/%40babel/[email protected]"
10301030
},
@@ -1146,7 +1146,7 @@
11461146
],
11471147
"repository_homepage_url": "https://www.npmjs.com/package/@ballerina/api-designer",
11481148
"repository_download_url": "https://registry.npmjs.org/@ballerina/api-designer/-/api-designer-0.99.0-RC3.tgz",
1149-
"api_data_url": "https://registry.npmjs.org/@ballerina%2fapi-designer",
1149+
"api_data_url": "https://registry.npmjs.org/@ballerina%2fapi-designer/0.99.0-RC3",
11501150
"datasource_id": "yarn_lock_v1",
11511151
"purl": "pkg:npm/%40ballerina/[email protected]"
11521152
},
@@ -1258,7 +1258,7 @@
12581258
],
12591259
"repository_homepage_url": "https://www.npmjs.com/package/@ballerina/ast-model",
12601260
"repository_download_url": "https://registry.npmjs.org/@ballerina/ast-model/-/ast-model-0.99.0-RC3.tgz",
1261-
"api_data_url": "https://registry.npmjs.org/@ballerina%2fast-model",
1261+
"api_data_url": "https://registry.npmjs.org/@ballerina%2fast-model/0.99.0-RC3",
12621262
"datasource_id": "yarn_lock_v1",
12631263
"purl": "pkg:npm/%40ballerina/[email protected]"
12641264
},
@@ -1320,7 +1320,7 @@
13201320
],
13211321
"repository_homepage_url": "https://www.npmjs.com/package/@ballerina/ballerina-by-examples",
13221322
"repository_download_url": "https://registry.npmjs.org/@ballerina/ballerina-by-examples/-/ballerina-by-examples-0.99.0-RC3.tgz",
1323-
"api_data_url": "https://registry.npmjs.org/@ballerina%2fballerina-by-examples",
1323+
"api_data_url": "https://registry.npmjs.org/@ballerina%2fballerina-by-examples/0.99.0-RC3",
13241324
"datasource_id": "yarn_lock_v1",
13251325
"purl": "pkg:npm/%40ballerina/[email protected]"
13261326
},
@@ -1442,7 +1442,7 @@
14421442
],
14431443
"repository_homepage_url": "https://www.npmjs.com/package/@ballerina/diagram",
14441444
"repository_download_url": "https://registry.npmjs.org/@ballerina/diagram/-/diagram-0.99.0-RC3.tgz",
1445-
"api_data_url": "https://registry.npmjs.org/@ballerina%2fdiagram",
1445+
"api_data_url": "https://registry.npmjs.org/@ballerina%2fdiagram/0.99.0-RC3",
14461446
"datasource_id": "yarn_lock_v1",
14471447
"purl": "pkg:npm/%40ballerina/[email protected]"
14481448
},
@@ -1554,7 +1554,7 @@
15541554
],
15551555
"repository_homepage_url": "https://www.npmjs.com/package/@ballerina/distribution",
15561556
"repository_download_url": "https://registry.npmjs.org/@ballerina/distribution/-/distribution-0.99.0-RC3.tgz",
1557-
"api_data_url": "https://registry.npmjs.org/@ballerina%2fdistribution",
1557+
"api_data_url": "https://registry.npmjs.org/@ballerina%2fdistribution/0.99.0-RC3",
15581558
"datasource_id": "yarn_lock_v1",
15591559
"purl": "pkg:npm/%40ballerina/[email protected]"
15601560
},
@@ -1646,7 +1646,7 @@
16461646
],
16471647
"repository_homepage_url": "https://www.npmjs.com/package/@ballerina/documentation",
16481648
"repository_download_url": "https://registry.npmjs.org/@ballerina/documentation/-/documentation-0.99.0-RC3.tgz",
1649-
"api_data_url": "https://registry.npmjs.org/@ballerina%2fdocumentation",
1649+
"api_data_url": "https://registry.npmjs.org/@ballerina%2fdocumentation/0.99.0-RC3",
16501650
"datasource_id": "yarn_lock_v1",
16511651
"purl": "pkg:npm/%40ballerina/[email protected]"
16521652
},
@@ -1697,7 +1697,7 @@
16971697
"dependencies": [],
16981698
"repository_homepage_url": "https://www.npmjs.com/package/@ballerina/font",
16991699
"repository_download_url": "https://registry.npmjs.org/@ballerina/font/-/font-0.99.0-RC3.tgz",
1700-
"api_data_url": "https://registry.npmjs.org/@ballerina%2ffont",
1700+
"api_data_url": "https://registry.npmjs.org/@ballerina%2ffont/0.99.0-RC3",
17011701
"datasource_id": "yarn_lock_v1",
17021702
"purl": "pkg:npm/%40ballerina/[email protected]"
17031703
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@
676676
],
677677
"repository_homepage_url": "https://www.npmjs.com/package/@ionic/app-scripts",
678678
"repository_download_url": "https://registry.npmjs.org/@ionic/app-scripts/-/app-scripts-3.0.1-201710301651.tgz",
679-
"api_data_url": "https://registry.npmjs.org/@ionic%2fapp-scripts",
679+
"api_data_url": "https://registry.npmjs.org/@ionic%2fapp-scripts/3.0.1-201710301651",
680680
"datasource_id": "npm_package_json",
681681
"purl": "pkg:npm/%40ionic/[email protected]"
682682
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
],
187187
"repository_homepage_url": "https://www.npmjs.com/package/@invisionag/eslint-config-ivx",
188188
"repository_download_url": "https://registry.npmjs.org/@invisionag/eslint-config-ivx/-/eslint-config-ivx-0.0.2.tgz",
189-
"api_data_url": "https://registry.npmjs.org/@invisionag%2feslint-config-ivx",
189+
"api_data_url": "https://registry.npmjs.org/@invisionag%2feslint-config-ivx/0.0.2",
190190
"datasource_id": "npm_package_json",
191191
"purl": "pkg:npm/%40invisionag/[email protected]"
192192
}

‎tests/packagedcode/data/npm/yarn-lock/v1-complex/yarn.lock-expected‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
],
9292
"repository_homepage_url": "https://www.npmjs.com/package/@babel/code-frame",
9393
"repository_download_url": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
94-
"api_data_url": "https://registry.npmjs.org/@babel%2fcode-frame",
94+
"api_data_url": "https://registry.npmjs.org/@babel%2fcode-frame/7.0.0",
9595
"datasource_id": "yarn_lock_v1",
9696
"purl": "pkg:npm/%40babel/[email protected]"
9797
},
@@ -183,7 +183,7 @@
183183
],
184184
"repository_homepage_url": "https://www.npmjs.com/package/@babel/core",
185185
"repository_download_url": "https://registry.npmjs.org/@babel/core/-/core-7.3.4.tgz",
186-
"api_data_url": "https://registry.npmjs.org/@babel%2fcore",
186+
"api_data_url": "https://registry.npmjs.org/@babel%2fcore/7.3.4",
187187
"datasource_id": "yarn_lock_v1",
188188
"purl": "pkg:npm/%40babel/[email protected]"
189189
},
@@ -245,7 +245,7 @@
245245
],
246246
"repository_homepage_url": "https://www.npmjs.com/package/@babel/helper-annotate-as-pure",
247247
"repository_download_url": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz",
248-
"api_data_url": "https://registry.npmjs.org/@babel%2fhelper-annotate-as-pure",
248+
"api_data_url": "https://registry.npmjs.org/@babel%2fhelper-annotate-as-pure/7.0.0",
249249
"datasource_id": "yarn_lock_v1",
250250
"purl": "pkg:npm/%40babel/[email protected]"
251251
},

‎tests/summarycode/data/score/basic-expected.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"extra_data": {},
7777
"repository_homepage_url": "https://www.npmjs.com/package/@invisionag/eslint-config-ivx",
7878
"repository_download_url": "https://registry.npmjs.org/@invisionag/eslint-config-ivx/-/eslint-config-ivx-0.0.10.tgz",
79-
"api_data_url": "https://registry.npmjs.org/@invisionag%2feslint-config-ivx",
79+
"api_data_url": "https://registry.npmjs.org/@invisionag%2feslint-config-ivx/0.0.10",
8080
"package_uid": "pkg:npm/%40invisionag/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758",
8181
"datafile_paths": [
8282
"basic/package.json"
@@ -684,7 +684,7 @@
684684
],
685685
"repository_homepage_url": "https://www.npmjs.com/package/@invisionag/eslint-config-ivx",
686686
"repository_download_url": "https://registry.npmjs.org/@invisionag/eslint-config-ivx/-/eslint-config-ivx-0.0.10.tgz",
687-
"api_data_url": "https://registry.npmjs.org/@invisionag%2feslint-config-ivx",
687+
"api_data_url": "https://registry.npmjs.org/@invisionag%2feslint-config-ivx/0.0.10",
688688
"datasource_id": "npm_package_json",
689689
"purl": "pkg:npm/%40invisionag/[email protected]"
690690
}

‎tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"extra_data": {},
7777
"repository_homepage_url": "https://www.npmjs.com/package/@invisionag/eslint-config-ivx",
7878
"repository_download_url": "https://registry.npmjs.org/@invisionag/eslint-config-ivx/-/eslint-config-ivx-0.0.10.tgz",
79-
"api_data_url": "https://registry.npmjs.org/@invisionag%2feslint-config-ivx",
79+
"api_data_url": "https://registry.npmjs.org/@invisionag%2feslint-config-ivx/0.0.10",
8080
"package_uid": "pkg:npm/%40invisionag/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758",
8181
"datafile_paths": [
8282
"inconsistent_licenses_copyleft/package.json"
@@ -689,7 +689,7 @@
689689
],
690690
"repository_homepage_url": "https://www.npmjs.com/package/@invisionag/eslint-config-ivx",
691691
"repository_download_url": "https://registry.npmjs.org/@invisionag/eslint-config-ivx/-/eslint-config-ivx-0.0.10.tgz",
692-
"api_data_url": "https://registry.npmjs.org/@invisionag%2feslint-config-ivx",
692+
"api_data_url": "https://registry.npmjs.org/@invisionag%2feslint-config-ivx/0.0.10",
693693
"datasource_id": "npm_package_json",
694694
"purl": "pkg:npm/%40invisionag/[email protected]"
695695
}

‎tests/summarycode/data/score/no_license_or_copyright-expected.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"extra_data": {},
5757
"repository_homepage_url": "https://www.npmjs.com/package/@invisionag/eslint-config-ivx",
5858
"repository_download_url": "https://registry.npmjs.org/@invisionag/eslint-config-ivx/-/eslint-config-ivx-0.0.10.tgz",
59-
"api_data_url": "https://registry.npmjs.org/@invisionag%2feslint-config-ivx",
59+
"api_data_url": "https://registry.npmjs.org/@invisionag%2feslint-config-ivx/0.0.10",
6060
"package_uid": "pkg:npm/%40invisionag/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758",
6161
"datafile_paths": [
6262
"no_license_or_copyright/package.json"
@@ -571,7 +571,7 @@
571571
],
572572
"repository_homepage_url": "https://www.npmjs.com/package/@invisionag/eslint-config-ivx",
573573
"repository_download_url": "https://registry.npmjs.org/@invisionag/eslint-config-ivx/-/eslint-config-ivx-0.0.10.tgz",
574-
"api_data_url": "https://registry.npmjs.org/@invisionag%2feslint-config-ivx",
574+
"api_data_url": "https://registry.npmjs.org/@invisionag%2feslint-config-ivx/0.0.10",
575575
"datasource_id": "npm_package_json",
576576
"purl": "pkg:npm/%40invisionag/[email protected]"
577577
}

0 commit comments

Comments
 (0)