refactor: split GraphQL package search and count into separate queries (#31)

Replace the combined package_search_with_count.gql (which fetched both
results and aggregate count in one request) with two focused queries:
- package_search.gql: fetches package results only (FilteredPackages)
- package_search_count.gql: fetches aggregate count only (FilteredPackagesCounts)

Add buildGraphQLPackageVariables helper to avoid duplicating variable
construction between fetchGraphQLPackages and fetchGraphQLPackageCount.

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: thelonewolf1603

package_search_count.gql

@@ -0,0 +1,27 @@
+query FilteredPackagesCounts(
+  $search: String
+  $matchtags: _text
+  $registries: _int8
+  $hasfailures: Boolean
+  $installed: Boolean
+  $notinstalled: Boolean
+  $licenses: _text
+  $filter: package_rank_vw_bool_exp = {}
+) {
+  package_search_aggregate(
+    args: {
+      search: $search
+      matchtags: $matchtags
+      licenses: $licenses
+      isinstalled: $installed
+      notinstalled: $notinstalled
+      hasfailures: $hasfailures
+      registrylist: $registries
+    }
+    where: { _and: [{ fit: { _gte: 1 } }, $filter] }
+  ) {
+    aggregate {
+      count
+    }
+  }
+}

package_search_with_count.gql

@@ -11,7 +11,7 @@ import (
 	"time"
 )
 
-//go:embed package_search_with_count.gql
+//go:embed package_search.gql package_search_count.gql
 var packageSearchFS embed.FS
 
 type PackageMetadata struct {
@@ -51,20 +51,6 @@ type Package struct {
 	Failures    []PackageFailure    `json:"failures"`
 }
 
-type PackageSearchResponse struct {
-	Data struct {
-		PackageSearch    []Package `json:"package_search"`
-		PackageAggregate struct {
-			Aggregate struct {
-				Count int `json:"count"`
-			} `json:"aggregate"`
-		} `json:"package_search_aggregate"`
-	} `json:"data"`
-	Errors []struct {
-		Message string `json:"message"`
-	} `json:"errors"`
-}
-
 type RESTPackage struct {
 	Name                   string   `json:"name"`
 	UUID                   string   `json:"uuid"`
@@ -305,32 +291,89 @@ func fetchRESTPackages(server, search string, limit, offset int, registryNames [
 	return response.Packages, response.Meta.Total, nil
 }
 
-// fetchGraphQLPackages executes the package search GraphQL query and returns raw results and total count.
-func fetchGraphQLPackages(server, search string, limit, offset int, registryIDs []int) ([]Package, int, error) {
+func buildGraphQLPackageVariables(search string, limit, offset int, registryIDs []int) map[string]interface{} {
+	variables := map[string]interface{}{
+		"filter":       map[string]interface{}{},
+		"order":        map[string]string{"score": "desc"},
+		"matchtags":    "{}",
+		"licenses":     "{}",
+		"search":       search,
+		"offset":       offset,
+		"hasfailures":  false,
+		"installed":    true,
+		"notinstalled": true,
+	}
+	if limit > 0 {
+		variables["limit"] = limit
+	}
+	if len(registryIDs) > 0 {
+		registryStrs := make([]string, len(registryIDs))
+		for i, id := range registryIDs {
+			registryStrs[i] = fmt.Sprintf("%d", id)
+		}
+		variables["registries"] = fmt.Sprintf("{%s}", strings.Join(registryStrs, ","))
+	}
+	return variables
+}
+
+func fetchGraphQLPackages(server, search string, limit, offset int, registryIDs []int) ([]Package, error) {
 	token, err := ensureValidToken()
 	if err != nil {
-		return nil, 0, fmt.Errorf("authentication required: %w", err)
+		return nil, fmt.Errorf("authentication required: %w", err)
+	}
+
+	queryBytes, err := packageSearchFS.ReadFile("package_search.gql")
+	if err != nil {
+		return nil, fmt.Errorf("failed to read GraphQL query: %w", err)
+	}
+
+	body, err := executeGraphQL(server, token, GraphQLRequest{
+		OperationName: "FilteredPackages",
+		Query:         string(queryBytes),
+		Variables:     buildGraphQLPackageVariables(search, limit, offset, registryIDs),
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	var response struct {
+		Data struct {
+			PackageSearch []Package `json:"package_search"`
+		} `json:"data"`
+		Errors []struct {
+			Message string `json:"message"`
+		} `json:"errors"`
+	}
+	if err := json.Unmarshal(body, &response); err != nil {
+		return nil, fmt.Errorf("failed to parse GraphQL response: %w", err)
+	}
+	if len(response.Errors) > 0 {
+		return nil, fmt.Errorf("GraphQL errors: %v", response.Errors)
+	}
+
+	return response.Data.PackageSearch, nil
+}
+
+func fetchGraphQLPackageCount(server, search string, registryIDs []int) (int, error) {
+	token, err := ensureValidToken()
+	if err != nil {
+		return 0, fmt.Errorf("authentication required: %w", err)
 	}
 
-	queryBytes, err := packageSearchFS.ReadFile("package_search_with_count.gql")
+	queryBytes, err := packageSearchFS.ReadFile("package_search_count.gql")
 	if err != nil {
-		return nil, 0, fmt.Errorf("failed to read GraphQL query: %w", err)
+		return 0, fmt.Errorf("failed to read GraphQL query: %w", err)
 	}
 
 	variables := map[string]interface{}{
 		"filter":       map[string]interface{}{},
-		"order":        map[string]string{"score": "desc"},
 		"matchtags":    "{}",
 		"licenses":     "{}",
 		"search":       search,
-		"offset":       offset,
 		"hasfailures":  false,
 		"installed":    true,
 		"notinstalled": true,
 	}
-	if limit > 0 {
-		variables["limit"] = limit
-	}
 	if len(registryIDs) > 0 {
 		registryStrs := make([]string, len(registryIDs))
 		for i, id := range registryIDs {
@@ -340,23 +383,34 @@ func fetchGraphQLPackages(server, search string, limit, offset int, registryIDs
 	}
 
 	body, err := executeGraphQL(server, token, GraphQLRequest{
-		OperationName: "FilteredPackagesWithCount",
+		OperationName: "FilteredPackagesCounts",
 		Query:         string(queryBytes),
 		Variables:     variables,
 	})
 	if err != nil {
-		return nil, 0, err
+		return 0, err
 	}
 
-	var response PackageSearchResponse
+	var response struct {
+		Data struct {
+			PackageAggregate struct {
+				Aggregate struct {
+					Count int `json:"count"`
+				} `json:"aggregate"`
+			} `json:"package_search_aggregate"`
+		} `json:"data"`
+		Errors []struct {
+			Message string `json:"message"`
+		} `json:"errors"`
+	}
 	if err := json.Unmarshal(body, &response); err != nil {
-		return nil, 0, fmt.Errorf("failed to parse GraphQL response: %w", err)
+		return 0, fmt.Errorf("failed to parse GraphQL response: %w", err)
 	}
 	if len(response.Errors) > 0 {
-		return nil, 0, fmt.Errorf("GraphQL errors: %v", response.Errors)
+		return 0, fmt.Errorf("GraphQL errors: %v", response.Errors)
 	}
 
-	return response.Data.PackageSearch, response.Data.PackageAggregate.Aggregate.Count, nil
+	return response.Data.PackageAggregate.Aggregate.Count, nil
 }
 
 func searchPackagesREST(params PackageSearchParams) error {
@@ -373,7 +427,11 @@ func searchPackagesREST(params PackageSearchParams) error {
 }
 
 func searchPackagesGraphQL(params PackageSearchParams) error {
-	pkgs, total, err := fetchGraphQLPackages(params.Server, params.Search, params.Limit, params.Offset, params.RegistryIDs)
+	pkgs, err := fetchGraphQLPackages(params.Server, params.Search, params.Limit, params.Offset, params.RegistryIDs)
+	if err != nil {
+		return err
+	}
+	total, err := fetchGraphQLPackageCount(params.Server, params.Search, params.RegistryIDs)
 	if err != nil {
 		return err
 	}
@@ -456,7 +514,7 @@ func getPackageInfoREST(server, packageName string, registryNames []string) erro
 }
 
 func getPackageInfoGraphQL(server, packageName string, registryIDs []int, registryNames []string) error {
-	pkgs, _, err := fetchGraphQLPackages(server, packageName, 100, 0, registryIDs)
+	pkgs, err := fetchGraphQLPackages(server, packageName, 100, 0, registryIDs)
 	if err != nil {
 		return err
 	}