Skip to content

[fp-enhancer] Improve pkg/cli - functional/immutability enhancements (round 1) #23658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
github-actions wants to merge 1 commit into from
+11 −14
Closed

[fp-enhancer] Improve pkg/cli - functional/immutability enhancements (round 1) #23658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/cli/actionlint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ func runActionlintOnFiles(lockFiles []string, verbose bool, strict bool) error {
}

// Get relative paths from git root for all files
var relPaths []string
relPaths := make([]string, 0, len(lockFiles))
for _, lockFile := range lockFiles {
relPath, err := filepath.Rel(gitRoot, lockFile)
if err != nil {
Expand Down
23 changes: 10 additions & 13 deletions pkg/cli/tool_graph.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ package cli

import (
"fmt"
"maps"
"os"
"sort"
"slices"
"strings"

"github.com/github/gh-aw/pkg/console"
Expand Down Expand Up @@ -73,11 +74,7 @@ func (g *ToolGraph) GenerateMermaidGraph() string {

// Add tool states with normalized names for Mermaid
toolToStateMap := make(map[string]string)
var tools []string
for tool := range g.Tools {
tools = append(tools, tool)
}
sort.Strings(tools)
tools := slices.Sorted(maps.Keys(g.Tools))

for i, tool := range tools {
stateId := fmt.Sprintf("tool%d", i)
Expand Down Expand Up @@ -119,7 +116,7 @@ func (g *ToolGraph) GenerateMermaidGraph() string {
}

// Add transitions with counts as labels
var transitions []ToolTransition
transitions := make([]ToolTransition, 0, len(g.Transitions))
for key, count := range g.Transitions {
parts := strings.Split(key, "->")
if len(parts) == 2 {
Expand All @@ -132,14 +129,14 @@ func (g *ToolGraph) GenerateMermaidGraph() string {
}

// Sort transitions by count (descending) for better visualization
sort.Slice(transitions, func(i, j int) bool {
if transitions[i].Count != transitions[j].Count {
return transitions[i].Count > transitions[j].Count
slices.SortFunc(transitions, func(a, b ToolTransition) int {
if a.Count != b.Count {
return b.Count - a.Count // descending by count
}
if transitions[i].From != transitions[j].From {
return transitions[i].From < transitions[j].From
if a.From != b.From {
return strings.Compare(a.From, b.From)
}
return transitions[i].To < transitions[j].To
return strings.Compare(a.To, b.To)
})

for _, transition := range transitions {
Expand Down