From fb4b83cf3e5699064a6cec1f2d2bc05f4245516c Mon Sep 17 00:00:00 2001
From: Alfredo Deza <adeza@anchore.com>
Date: Wed, 22 Jul 2020 14:20:10 -0400
Subject: [PATCH] cataloger: define Javascript (npm) package type

Signed-off-by: Alfredo Deza <adeza@anchore.com>
---
 imgbom/cataloger/controller.go | 2 ++
 imgbom/pkg/language.go         | 6 +++---
 imgbom/pkg/type.go             | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/imgbom/cataloger/controller.go b/imgbom/cataloger/controller.go
index bd3c488ac..90614aa8e 100644
--- a/imgbom/cataloger/controller.go
+++ b/imgbom/cataloger/controller.go
@@ -5,6 +5,7 @@ import (
 	"github.com/anchore/imgbom/imgbom/cataloger/dpkg"
 	golang "github.com/anchore/imgbom/imgbom/cataloger/golang"
 	"github.com/anchore/imgbom/imgbom/cataloger/java"
+	"github.com/anchore/imgbom/imgbom/cataloger/npm"
 	"github.com/anchore/imgbom/imgbom/cataloger/python"
 	"github.com/anchore/imgbom/imgbom/cataloger/rpmdb"
 	"github.com/anchore/imgbom/imgbom/event"
@@ -50,6 +51,7 @@ func newController() controller {
 	ctrlr.add(rpmdb.NewCataloger())
 	ctrlr.add(java.NewCataloger())
 	ctrlr.add(golang.NewCataloger())
+	ctrlr.add(npm.NewCataloger())
 	return ctrlr
 }
 
diff --git a/imgbom/pkg/language.go b/imgbom/pkg/language.go
index b7c8c61e0..75032937d 100644
--- a/imgbom/pkg/language.go
+++ b/imgbom/pkg/language.go
@@ -3,7 +3,7 @@ package pkg
 const (
 	UnknownLanguage Language = iota
 	Java
-	//JavaScript
+	JavaScript
 	Python
 	Ruby
 	Go
@@ -14,7 +14,7 @@ type Language uint
 var languageStr = []string{
 	"UnknownLanguage",
 	"java",
-	//"javascript",
+	"javascript",
 	"python",
 	"ruby",
 	"go",
@@ -22,7 +22,7 @@ var languageStr = []string{
 
 var AllLanguages = []Language{
 	Java,
-	//JavaScript,
+	JavaScript,
 	Python,
 	Ruby,
 	Go,
diff --git a/imgbom/pkg/type.go b/imgbom/pkg/type.go
index 56d7ce8cd..0fa538d7e 100644
--- a/imgbom/pkg/type.go
+++ b/imgbom/pkg/type.go
@@ -9,6 +9,7 @@ const (
 	//PacmanPkg
 	RpmPkg
 	WheelPkg
+	NpmPkg
 	PythonRequirementsPkg
 	JavaPkg
 	JenkinsPluginPkg
@@ -26,6 +27,7 @@ var typeStr = []string{
 	//"pacman",
 	"rpm",
 	"wheel",
+	"npm",
 	"python-requirements",
 	"java-archive",
 	"jenkins-plugin",
@@ -40,6 +42,7 @@ var AllPkgs = []Type{
 	//PacmanPkg,
 	RpmPkg,
 	WheelPkg,
+	NpmPkg,
 	PythonRequirementsPkg,
 	JavaPkg,
 	JenkinsPluginPkg,