Skip to content

Commit b1a3620

Browse files
pombredannepombredanne
authored
Merge pull request #3555 from schischi/yarn-v1-alias
npm: support aliases in yarn lock v1 Signed-off-by: Philippe Ombredanne <[email protected]>
2 parents d6a9e41 + 0d20d10 commit b1a3620

File tree

3 files changed

+180
-2
lines changed

3 files changed

+180
-2
lines changed

‎src/packagedcode/npm.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,15 +623,21 @@ def parse(cls, location):
623623
elif not line.startswith(' ') and stripped.endswith(':'):
624624
# the first line of a dependency has the name and requirements
625625
# "@babel/core@^7.1.0", "@babel/core@^7.3.4":
626+
# For aliases: "@alias@npm:@package@^12":
626627
requirements = stripped.strip(':').split(', ')
627628
requirements = [r.strip().strip("\"'") for r in requirements]
628629
for req in requirements:
629630
if req.startswith('@'):
630-
assert req.count('@') == 2
631+
# 2 = package, 4 = alias
632+
assert req.count('@') in [2, 4]
631633

632634
ns_name, _, constraint = req.rpartition('@')
633635
ns, _ , name = ns_name.rpartition('/')
634636
constraint = constraint.strip("\"'")
637+
# If we have an alias, just keep the package part:
638+
# <alias-package>@npm:<package>
639+
if "@npm:" in ns:
640+
ns = ns.split(':')[1]
635641
top_requirements.append((ns, name, constraint,))
636642

637643
else:

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,20 @@
2525
integrity sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==
2626
dependencies:
2727
"@babel/types" "^7.0.0"
28+
29+
"@react-spring/[email protected]", "react-spring@npm:@react-spring/[email protected]":
30+
version "9.7.3"
31+
resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.7.3.tgz#da977382f91d9af4c400e4aa7dc37d3db07b87e0"
32+
integrity sha512-rEvipblmihiz8+Eo01zDp5dqWn6XfYk8q2rlN9c18YIOL4o6nuY/VplDoocUMHYfH4liurpO4o1QudKOO1nAiQ==
33+
dependencies:
34+
"@react-spring/animated" "9.7.3"
35+
"@react-spring/core" "9.7.3"
36+
"@react-spring/shared" "9.7.3"
37+
38+
"@testing-library/react-12@npm:@testing-library/react@^12":
39+
version "12.1.2"
40+
resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.2.tgz#f1bc9a45943461fa2a598bb4597df1ae044cfc76"
41+
integrity sha512-ihQiEOklNyHIpo2Y8FREkyD1QAea054U0MVbwH1m8N9TxeFz+KoJ9LkqoKqJlzx2JDm56DVwaJ1r36JYxZM05g==
42+
dependencies:
43+
"@babel/runtime" "^7.12.5"
44+
"@testing-library/dom" "^8.0.0"

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

Lines changed: 156 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,161 @@
250250
"purl": "pkg:npm/%40babel/[email protected]"
251251
},
252252
"extra_data": {}
253+
},
254+
{
255+
"purl": "pkg:npm/%40react-spring/[email protected]",
256+
"extracted_requirement": "9.7.3 9.7.3",
257+
"scope": "dependencies",
258+
"is_runtime": true,
259+
"is_optional": false,
260+
"is_resolved": true,
261+
"resolved_package": {
262+
"type": "npm",
263+
"namespace": "@react-spring",
264+
"name": "web",
265+
"version": "9.7.3",
266+
"qualifiers": {},
267+
"subpath": null,
268+
"primary_language": "JavaScript",
269+
"description": null,
270+
"release_date": null,
271+
"parties": [],
272+
"keywords": [],
273+
"homepage_url": null,
274+
"download_url": "https://registry.yarnpkg.com/@react-spring/web/-/web-9.7.3.tgz",
275+
"size": null,
276+
"sha1": "da977382f91d9af4c400e4aa7dc37d3db07b87e0",
277+
"md5": null,
278+
"sha256": null,
279+
"sha512":
280+
"ac4be2a5b9668a18b3f3e128d35cc3a7976a5a7e977d893cab6ae537d735f1820e2f8a3a9ee63f569943a2871430761f1f8962baba4ee28d50b9d28e3b59c089",
281+
"bug_tracking_url": null,
282+
"code_view_url": null,
283+
"vcs_url": null,
284+
"copyright": null,
285+
"holder": null,
286+
"declared_license_expression": null,
287+
"declared_license_expression_spdx": null,
288+
"license_detections": [],
289+
"other_license_expression": null,
290+
"other_license_expression_spdx": null,
291+
"other_license_detections": [],
292+
"extracted_license_statement": null,
293+
"notice_text": null,
294+
"source_packages": [],
295+
"file_references": [],
296+
"extra_data": {},
297+
"dependencies": [
298+
{
299+
"purl": "pkg:npm/%22%40react-spring/animated%22",
300+
"extracted_requirement": "9.7.3",
301+
"scope": "dependencies",
302+
"is_runtime": true,
303+
"is_optional": false,
304+
"is_resolved": false,
305+
"resolved_package": {},
306+
"extra_data": {}
307+
},
308+
{
309+
"purl": "pkg:npm/%22%40react-spring/core%22",
310+
"extracted_requirement": "9.7.3",
311+
"scope": "dependencies",
312+
"is_runtime": true,
313+
"is_optional": false,
314+
"is_resolved": false,
315+
"resolved_package": {},
316+
"extra_data": {}
317+
},
318+
{
319+
"purl": "pkg:npm/%22%40react-spring/shared%22",
320+
"extracted_requirement": "9.7.3",
321+
"scope": "dependencies",
322+
"is_runtime": true,
323+
"is_optional": false,
324+
"is_resolved": false,
325+
"resolved_package": {},
326+
"extra_data": {}
327+
}
328+
],
329+
"repository_homepage_url": "https://www.npmjs.com/package/@react-spring/web",
330+
"repository_download_url": "https://registry.npmjs.org/@react-spring/web/-/web-9.7.3.tgz",
331+
"api_data_url": "https://registry.npmjs.org/@react-spring%2fweb/9.7.3",
332+
"datasource_id": "yarn_lock_v1",
333+
"purl": "pkg:npm/%40react-spring/[email protected]"
334+
},
335+
"extra_data": {}
336+
},
337+
{
338+
"purl": "pkg:npm/%40testing-library/[email protected]",
339+
"extracted_requirement": "^12",
340+
"scope": "dependencies",
341+
"is_runtime": true,
342+
"is_optional": false,
343+
"is_resolved": true,
344+
"resolved_package": {
345+
"type": "npm",
346+
"namespace": "@testing-library",
347+
"name": "react",
348+
"version": "12.1.2",
349+
"qualifiers": {},
350+
"subpath": null,
351+
"primary_language": "JavaScript",
352+
"description": null,
353+
"release_date": null,
354+
"parties": [],
355+
"keywords": [],
356+
"homepage_url": null,
357+
"download_url": "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.2.tgz",
358+
"size": null,
359+
"sha1": "f1bc9a45943461fa2a598bb4597df1ae044cfc76",
360+
"md5": null,
361+
"sha256": null,
362+
"sha512": "8a142210e9253721c8a68d98f054449320f540079ad39e14d0c55bc07d66f0df53c5e173f8aa09f4b92aa0aa89973c762439b9e83570689d6bdfa258c59334e6",
363+
"bug_tracking_url": null,
364+
"code_view_url": null,
365+
"vcs_url": null,
366+
"copyright": null,
367+
"holder": null,
368+
"declared_license_expression": null,
369+
"declared_license_expression_spdx": null,
370+
"license_detections": [],
371+
"other_license_expression": null,
372+
"other_license_expression_spdx": null,
373+
"other_license_detections": [],
374+
"extracted_license_statement": null,
375+
"notice_text": null,
376+
"source_packages": [],
377+
"file_references": [],
378+
"extra_data": {},
379+
"dependencies": [
380+
{
381+
"purl": "pkg:npm/%22%40babel/runtime%22",
382+
"extracted_requirement": "^7.12.5",
383+
"scope": "dependencies",
384+
"is_runtime": true,
385+
"is_optional": false,
386+
"is_resolved": false,
387+
"resolved_package": {},
388+
"extra_data": {}
389+
},
390+
{
391+
"purl": "pkg:npm/%22%40testing-library/dom%22",
392+
"extracted_requirement": "^8.0.0",
393+
"scope": "dependencies",
394+
"is_runtime": true,
395+
"is_optional": false,
396+
"is_resolved": false,
397+
"resolved_package": {},
398+
"extra_data": {}
399+
}
400+
],
401+
"repository_homepage_url": "https://www.npmjs.com/package/@testing-library/react",
402+
"repository_download_url": "https://registry.npmjs.org/@testing-library/react/-/react-12.1.2.tgz",
403+
"api_data_url": "https://registry.npmjs.org/@testing-library%2freact/12.1.2",
404+
"datasource_id": "yarn_lock_v1",
405+
"purl": "pkg:npm/%40testing-library/[email protected]"
406+
},
407+
"extra_data": {}
253408
}
254409
],
255410
"repository_homepage_url": null,
@@ -258,4 +413,4 @@
258413
"datasource_id": "yarn_lock_v1",
259414
"purl": null
260415
}
261-
]
416+
]

0 commit comments

Comments
 (0)