Merge branch 'pr/69'

Author: Frank Martinez

.gitignore

@@ -1,6 +1,7 @@
 
 ## OS X Resources
 .DS_Store
+.vscode/
 
 # Binaries
 *.exe

api/build.go

@@ -221,7 +221,7 @@ func optimizeImports(project common.AppProject) error {
 	var unused []util.Import
 	appImports.GetAllImports()
 	for _, impDetails := range appImports.GetAllImportDetails() {
-		if !impDetails.Used() {
+		if !impDetails.Referenced() && impDetails.IsCoreContrib() {
 			unused = append(unused, impDetails.Imp)
 		}
 	}

api/list.go

@@ -13,7 +13,6 @@ import (
 
 type ListFilter int
 
-
 func ListContribs(project common.AppProject, jsonFormat bool, filter string) error {
 
 	ai, err := util.GetAppImports(filepath.Join(project.Dir(), fileFlogoJson), project.DepManager(), true)
@@ -90,32 +89,32 @@ func ListContribs(project common.AppProject, jsonFormat bool, filter string) err
 
 func includeContrib(details *util.AppImportDetails, filter string) bool {
 
-	if !details.IsContrib() {
-		return false
-	}
+	if details.IsCoreContrib() {
 
-	switch strings.ToLower(filter) {
-	case "used":
-		return details.Used()
-	case "unused":
-		return !details.Used()
-	default:
-		return true
+		switch strings.ToLower(filter) {
+		case "used":
+			return details.Referenced()
+		case "unused":
+			return !details.Referenced()
+		default:
+			return true
+		}
 	}
+	return false
+
 }
 
 type ContribSpec struct {
-	Name        string `json:"name"`
-	Type        string `json:"type"`
-	Description string `json:"description"`
-	Homepage    string `json:"homepage"`
-	Ref         string `json:"ref"`
-	Path        string `json:"path"`
-	Descriptor  string `json:"descriptor"`
+	Name        string      `json:"name"`
+	Type        string      `json:"type"`
+	Description string      `json:"description"`
+	Homepage    string      `json:"homepage"`
+	Ref         string      `json:"ref"`
+	Path        string      `json:"path"`
+	Descriptor  string      `json:"descriptor"`
 	IsLegacy    interface{} `json:"isLegacy,omitempty"`
 }
 
-
 func ListOrphanedRefs(project common.AppProject, jsonFormat bool) error {
 
 	ai, err := util.GetAppImports(filepath.Join(project.Dir(), fileFlogoJson), project.DepManager(), true)

commands/list.go

@@ -42,4 +42,4 @@ var listCmd = &cobra.Command{
 			os.Exit(1)
 		}
 	},
-}
+}

util/app.go

@@ -27,12 +27,23 @@ type AppImportDetails struct {
 	HasDirectRef bool // a direct reference exists for this import
 }
 
-func (d *AppImportDetails) Used() bool {
+func (d *AppImportDetails) Referenced() bool {
 	return d.HasAliasRef || d.HasDirectRef
 }
 
-func (d *AppImportDetails) IsContrib() bool {
-	return d.ContribDesc != nil
+func (d *AppImportDetails) IsCoreContrib() bool {
+
+	if d.ContribDesc == nil {
+		return false
+	}
+	ct := d.ContribDesc.GetContribType()
+
+	switch ct {
+	case "action", "trigger", "activity":
+		return true
+	default:
+		return false
+	}
 }
 
 type AppImports struct {