refactor WithPreservedFields

Author: kerobbi

pkg/github/pullrequests.go

@@ -1170,7 +1170,7 @@ func ListPullRequests(t translations.TranslationHelperFunc) inventory.ServerTool
 			}
 
 			r, err := response.OptimizeList(prs,
-				response.WithPreservedFields(map[string]bool{"html_url": true, "draft": true}),
+				response.WithPreservedFields("html_url", "draft"),
 				response.WithCollectionExtractors(map[string][]string{
 					"labels":              {"name"},
 					"requested_reviewers": {"login"},

pkg/github/repositories.go

@@ -219,7 +219,7 @@ func ListCommits(t translations.TranslationHelperFunc) inventory.ServerTool {
 
 			r, err := response.OptimizeList(minimalCommits,
 				response.WithMaxDepth(3),
-				response.WithPreservedFields(map[string]bool{"html_url": true}),
+				response.WithPreservedFields("html_url"),
 			)
 			if err != nil {
 				return nil, nil, fmt.Errorf("failed to marshal response: %w", err)
@@ -1675,7 +1675,7 @@ func ListReleases(t translations.TranslationHelperFunc) inventory.ServerTool {
 			}
 
 			r, err := response.OptimizeList(releases,
-				response.WithPreservedFields(map[string]bool{"html_url": true, "prerelease": true}),
+				response.WithPreservedFields("html_url", "prerelease"),
 			)
 			if err != nil {
 				return nil, nil, fmt.Errorf("failed to marshal response: %w", err)

pkg/response/optimize.go

@@ -32,9 +32,12 @@ func WithMaxDepth(d int) OptimizeListOption {
 // WithPreservedFields sets keys that are exempt from all destructive strategies except whitespace normalization.
 // Keys are matched against post-flatten map keys, so for nested fields like "user.html_url", the dotted key must be
 // added explicitly. Empty collections are still dropped. Wins over collectionExtractors.
-func WithPreservedFields(fields map[string]bool) OptimizeListOption {
+func WithPreservedFields(fields ...string) OptimizeListOption {
 	return func(c *OptimizeListConfig) {
-		c.preservedFields = fields
+		c.preservedFields = make(map[string]bool, len(fields))
+		for _, f := range fields {
+			c.preservedFields[f] = true
+		}
 	}
 }
 

pkg/response/optimize_test.go

@@ -153,7 +153,7 @@ func TestOptimizeList_AllStrategies(t *testing.T) {
 	}
 
 	raw, err := OptimizeList(items,
-		WithPreservedFields(map[string]bool{"html_url": true, "draft": true}),
+		WithPreservedFields("html_url", "draft"),
 		WithCollectionExtractors(map[string][]string{"labels": {"name"}}),
 	)
 	require.NoError(t, err)