Skip to content

Commit

Permalink
fix(): ignoring package.json urls and aliases
Browse files Browse the repository at this point in the history
close #2
  • Loading branch information
jossef committed Apr 1, 2021
1 parent f4707a6 commit 848d92d
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 11 deletions.
33 changes: 23 additions & 10 deletions dependencies/dependencies.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package dependencies
import (
"bufio"
"encoding/json"
"fmt"
"regexp"
"strings"
)
Expand Down Expand Up @@ -76,23 +77,35 @@ func ParsePackagesJsonFile(reader *bufio.Reader) ([]string, error) {
return nil, err
}

processPackageName := func(npmPackageName string) {
if strings.HasPrefix(npmPackageName, "@") {
return
}

value, _ := (*t.Dependencies)[npmPackageName]
version := fmt.Sprintf("%v", value)
version = strings.ToLower(version)

if strings.HasPrefix(version, "npm:") {
return
}

if strings.Contains(version, "://") {
return
}

packageNamesSet[npmPackageName] = true
}

if t.Dependencies != nil {
for npmPackageName := range *t.Dependencies {
if strings.HasPrefix(npmPackageName, "@") {
continue
}
packageNamesSet[npmPackageName] = true
continue
processPackageName(npmPackageName)
}
}

if t.DevDependencies != nil {
for npmPackageName := range *t.DevDependencies {
if strings.HasPrefix(npmPackageName, "@") {
continue
}
packageNamesSet[npmPackageName] = true
continue
processPackageName(npmPackageName)
}
}

Expand Down
8 changes: 8 additions & 0 deletions dependencies/dependencies_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ var npmTests = []t{
content: `{"dependencies":{"@angular/core":"123"}}`,
expected: []string{},
},
{
content: `{"dependencies":{"gulp": "git+ssh://git@github.com:gulpjs/gulp.git"}}`,
expected: []string{},
},
{
content: `{"dependencies":{"appboy-web-sdk": "^2.2.7","appboy-web-sdk-v2": "npm:appboy-web-sdk@^2.7.0"}}`,
expected: []string{"appboy-web-sdk"},
},
}
var pythonTests = []t{

Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func main() {
}

if hasAnyPackageAvailableForRegistration {
_, _ = fmt.Fprintln(os.Stderr, "one or more packages is available for public registration")
_, _ = fmt.Fprintln(os.Stderr, "one or more packages are available for public registration")
if !auditValue {
os.Exit(1)
}
Expand Down

0 comments on commit 848d92d

Please sign in to comment.