Try to always set namespace when suggesting

ActiveState · Sep 24, 2024 · ec2829c · ec2829c
1 parent 1d79eb6
commit ec2829c
Showing 1 changed file with 26 additions and 3 deletions.
diff --git a/internal/runners/install/rationalize.go b/internal/runners/install/rationalize.go
@@ -61,9 +61,32 @@ func (i *Install) rationalizeError(rerr *error) {
 }
 
 func (i *Install) getSuggestions(req *requirement, languages []model.Language) ([]string, error) {
-	ingredients, err := model.SearchIngredients(req.Requested.Namespace, req.Requested.Name, false, nil, i.prime.Auth())
-	if err != nil {
-		return []string{}, locale.WrapError(err, "err_package_ingredient_search", "Failed to resolve ingredient named: {{.V0}}", req.Requested.Name)
+	var namespaces []string
+
+	if req.Requested.Namespace == "" {
+		for _, language := range languages {
+			var ns string
+			switch i.nsType {
+			case model.NamespacePackage:
+				ns = model.NewNamespacePackage(language.Name).String()
+			case model.NamespaceBundle:
+				ns = model.NewNamespaceBundle(language.Name).String()
+			default:
+				continue
+			}
+			namespaces = append(namespaces, ns)
+		}
+	} else {
+		namespaces = []string{req.Requested.Namespace}
+	}
+
+	ingredients := make([]*model.IngredientAndVersion, 0)
+	for _, namespace := range namespaces {
+		results, err := model.SearchIngredients(namespace, req.Requested.Name, false, nil, i.prime.Auth())
+		if err != nil {
+			return nil, locale.WrapError(err, "err_package_ingredient_search", "Failed to resolve ingredient named: {{.V0}}", req.Requested.Name)
+		}
+		ingredients = append(ingredients, results...)
 	}
 
 	// Filter out irrelevant ingredients