Skip to content

Fix implementation of PackageName#library_name #5119

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

Merged
mattt merged 4 commits into from
May 10, 2022
Merged

Fix implementation of PackageName#library_name #5119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4894d62
Fix PackageName#types_package?
mattt May 10, 2022
7f3d7d7
Add new test cases for PackageName#library_name
mattt May 10, 2022
2d65bdb
Formatting
mattt May 10, 2022
d47c5f8
Inline DEFINITELY_TYPED_SCOPE in regex pattern
mattt May 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions npm_and_yarn/lib/dependabot/npm_and_yarn/package_name.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
module Dependabot
module NpmAndYarn
class PackageName
DEFINITELY_TYPED_SCOPE = /types/i.freeze
PACKAGE_NAME_REGEX = %r{
PACKAGE_NAME_REGEX = %r{
\A # beginning of string
(?=.{1,214}\z) # enforce length (1 - 214)
(@(?<scope>[a-z0-9\-~][a-z0-9\-\._~]*)\/)? # capture 'scope' if present
(?<name>[a-z0-9\-~][a-z0-9\-._~]*) # capture package name
\z # end of string
}xi.freeze # multi-line/case-insensitive

TYPES_PACKAGE_NAME_REGEX = %r{
\A # beginning of string
@#{DEFINITELY_TYPED_SCOPE}\/ # starts with @types/
@types\/ # starts with @types/
((?<scope>.+)__)? # capture scope
(?<name>.+) # capture name
\z # end of string
Expand Down Expand Up @@ -81,7 +81,7 @@ def scoped?
end

def types_package?
DEFINITELY_TYPED_SCOPE.match?(@scope)
"types".casecmp?(@scope)
end
end
end
Expand Down
8 changes: 3 additions & 5 deletions npm_and_yarn/spec/dependabot/npm_and_yarn/package_name_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,9 @@

describe "#library_name" do
it "returns nil if it is not a types package" do
jquery = "jquery"

library_name = described_class.new(jquery).library_name

expect(library_name).to be_nil
expect(described_class.new("jquery").library_name).to be_nil
expect(described_class.new("@babel/core").library_name).to be_nil
expect(described_class.new("@typescript-eslint/parser").library_name).to be_nil
end

it "returns the corresponding library for a types package" do
Expand Down