Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve dependencies and improve JS support #3779

Merged
merged 14 commits into from
Jun 19, 2024
Merged

Resolve dependencies and improve JS support #3779

merged 14 commits into from
Jun 19, 2024

Conversation

AyanSinhaMahapatra
Copy link
Member

@AyanSinhaMahapatra AyanSinhaMahapatra commented May 16, 2024 •
edited
Loading

This PR adds support for resolving package dependencies with an initial focus on JavaScript npm packages as support by npm and yarn.

In particular:

Tasks

  • Reviewed contribution guidelines
  • PR is descriptively titled 📑 and links the original issue above 🔗
  • Tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR
    Run tests locally to check for errors.
  • Commits are in uniquely-named feature branch and has no merge conflicts 📁
  • Updated documentation pages (if applicable)
  • Updated CHANGELOG.rst (if applicable)

@AyanSinhaMahapatra
Add basic pnpm lockfile parsers
ccf346a 
Add parsers for pnpm-lock.yaml v5 and v6,
and shrinkwrap.yaml specs with examples
and package assembly.

Reference: #3766
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Update is_resolved from resolved_packages
514e1fd 
Apply updates for all npm lockfiles.

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Update resolved package support for npm #3780
86d9d63 
Reference: #3780
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add attribute to track private packages #3102
f848741 
Reference: #3102
Reference: #1514
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add npm and pnpm workspace example #3746
ae2af48 
Reference: #3746
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add npm and pnpm workspace support #3746
69ea6b7 
Reference: #3746
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra AyanSinhaMahapatra force-pushed the improve-npm-support branch 2 times, most recently from 02e83da to 3e11778 Compare June 10, 2024 10:02
@pombredanne pombredanne changed the title Add basic pnpm support and improve npm support Resolve dependencies and improve JS support Jun 10, 2024
pombredanne
pombredanne requested changes Jun 10, 2024
View reviewed changes
Copy link
Member

@pombredanne pombredanne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks... here are some first nits.

src/packagedcode/models.py Outdated Show resolved Hide resolved
src/packagedcode/npm.py Outdated Show resolved Hide resolved
src/packagedcode/npm.py Outdated Show resolved Hide resolved
src/packagedcode/npm.py Show resolved Hide resolved
src/packagedcode/npm.py Outdated Show resolved Hide resolved
@AyanSinhaMahapatra
Add is_direct attribute to dependency model #3780
448fc36 
Adds is_direct attribute to differentiate between direct
dependecy relationships and dependencies listed in lockfiles
which have both direct and transitive dependencies together,
which will have is_direct as False.

Reference: #3780
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add is_virtual attribute and update tests
9af1547 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra AyanSinhaMahapatra force-pushed the improve-npm-support branch 2 times, most recently from 74f402d to 82a51c0 Compare June 13, 2024 10:03
@AyanSinhaMahapatra
Merge branch 'develop' into improve-npm-support
b24b29f 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Handle duplicate aliases in yarn v1
ce8e0d1 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
pombredanne
pombredanne requested changes Jun 17, 2024
View reviewed changes
Copy link
Member

@pombredanne pombredanne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some final nits... then please merge!

src/packagedcode/models.py Outdated Show resolved Hide resolved
src/packagedcode/models.py Outdated Show resolved Hide resolved
src/packagedcode/models.py Outdated Show resolved Hide resolved
src/packagedcode/models.py Outdated Show resolved Hide resolved
src/packagedcode/npm.py Outdated Show resolved Hide resolved
src/packagedcode/npm.py Outdated Show resolved Hide resolved
src/packagedcode/npm.py Outdated Show resolved Hide resolved
src/packagedcode/npm.py Outdated Show resolved Hide resolved
src/packagedcode/utils.py Outdated Show resolved Hide resolved
src/packagedcode/utils.py Outdated Show resolved Hide resolved
@AyanSinhaMahapatra
Address feedback and comments
f74a89b 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Copy link
Member Author

@pombredanne Thanks for your comments, suggestions and improved texts for the attributes. I've added all of them, and now ready to merge.

@AyanSinhaMahapatra
Fix yarn lock v1 parser bug extra quotes
ae22b45 
Fixes a bug where there was remaining double quotes on
namespace and name for dependencies, which was effecting
package resolution.

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
pombredanne
pombredanne approved these changes Jun 19, 2024
View reviewed changes
Copy link
Member

@pombredanne pombredanne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to merge with just a minor nit wrt. a function name!

src/packagedcode/npm.py Outdated Show resolved Hide resolved
@AyanSinhaMahapatra
Support resolutions in npm package.json
5536ede 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra AyanSinhaMahapatra mentioned this pull request Jun 19, 2024
Open
@AyanSinhaMahapatra
Address feedback and update CHNAGELOG and docs
8f932da 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Copy link
Member Author

All green, merging! Thanks @pombredanne

@AyanSinhaMahapatra AyanSinhaMahapatra merged commit 2295c7f into develop Jun 19, 2024
32 of 34 checks passed
@AyanSinhaMahapatra AyanSinhaMahapatra deleted the improve-npm-support branch June 19, 2024 14:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pombredanne pombredanne pombredanne approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@AyanSinhaMahapatra @pombredanne