add sbom document import lib helper function

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

syft/pkg/catalog.go

@@ -19,12 +19,18 @@ type Catalog struct {
 }
 
 // NewCatalog returns a new empty Catalog
-func NewCatalog() *Catalog {
-	return &Catalog{
+func NewCatalog(pkgs ...Package) *Catalog {
+	catalog := Catalog{
 		byID:   make(map[ID]*Package),
 		byType: make(map[Type][]*Package),
 		byFile: make(map[file.Reference][]*Package),
 	}
+
+	for _, p := range pkgs {
+		catalog.Add(p)
+	}
+
+	return &catalog
 }
 
 // PackageCount returns the total number of packages that have been added.
@@ -111,6 +117,9 @@ func (c *Catalog) Sorted(types ...Type) []*Package {
 
 	sort.SliceStable(pkgs, func(i, j int) bool {
 		if pkgs[i].Name == pkgs[j].Name {
+			if pkgs[i].Version == pkgs[j].Version {
+				return pkgs[i].Type < pkgs[j].Type
+			}
 			return pkgs[i].Version < pkgs[j].Version
 		}
 		return pkgs[i].Name < pkgs[j].Name

syft/pkg/language.go

@@ -1,25 +1,16 @@
 package pkg
 
+type Language string
+
 const (
-	UnknownLanguage Language = iota
-	Java
-	JavaScript
-	Python
-	Ruby
-	Go
+	UnknownLanguage Language = "UnknownLanguage"
+	Java            Language = "java"
+	JavaScript      Language = "javascript"
+	Python          Language = "python"
+	Ruby            Language = "ruby"
+	Go              Language = "go"
 )
 
-type Language uint
-
-var languageStr = []string{
-	"UnknownLanguage",
-	"java",
-	"javascript",
-	"python",
-	"ruby",
-	"go",
-}
-
 var AllLanguages = []Language{
 	Java,
 	JavaScript,
@@ -28,9 +19,6 @@ var AllLanguages = []Language{
 	Go,
 }
 
-func (t Language) String() string {
-	if int(t) >= len(languageStr) {
-		return languageStr[0]
-	}
-	return languageStr[t]
+func (l Language) String() string {
+	return string(l)
 }

syft/pkg/package.go

@@ -23,11 +23,11 @@ type Package struct {
 	FoundBy string           `json:"foundBy"`  // the specific cataloger that discovered this package
 	Source  []file.Reference `json:"sources"`  // the locations that lead to the discovery of this package (note: this is not necessarily the locations that make up this package)
 	// TODO: should we move licenses into metadata?
-	Licenses     []string     `json:"licenses"`           // licenses discovered with the package metadata
-	Language     Language     `json:"language"`           // the language ecosystem this package belongs to (e.g. JavaScript, Python, etc)
-	Type         Type         `json:"type"`               // the package type (e.g. Npm, Yarn, Python, Rpm, Deb, etc)
-	MetadataType MetadataType `json:"metadataType"`       // the shape of the additional data in the "metadata" field
-	Metadata     interface{}  `json:"metadata,omitempty"` // additional data found while parsing the package source
+	Licenses     []string     `json:"licenses"`               // licenses discovered with the package metadata
+	Language     Language     `json:"language"`               // the language ecosystem this package belongs to (e.g. JavaScript, Python, etc)
+	Type         Type         `json:"type"`                   // the package type (e.g. Npm, Yarn, Python, Rpm, Deb, etc)
+	MetadataType MetadataType `json:"metadataType,omitempty"` // the shape of the additional data in the "metadata" field
+	Metadata     interface{}  `json:"metadata,omitempty"`     // additional data found while parsing the package source
 }
 
 // ID returns the package ID, which is unique relative to a package catalog.