Add sorting (#13)

Author: knightpp

flake.nix

@@ -34,6 +34,9 @@
         packages = with pkgs; [
           go_1_21
           go-tools
+          gopls
+          delve
+          gomodifytags
         ];
       };
     });

go.mod

@@ -4,7 +4,7 @@ go 1.21
 
 require (
 	github.com/koki-develop/go-fzf v0.15.0
-	golang.org/x/mod v0.12.0
+	golang.org/x/mod v0.14.0
 )
 
 require (

go.sum

@@ -38,6 +38,8 @@ github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUc
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
 golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

main.go

@@ -15,23 +15,25 @@ import (
 )
 
 var (
-	selectAll          bool
-	selectAllNoConfirm bool
-	dryRun             bool
-	flagVersion        bool
+	fSelectAll          bool
+	fSelectAllNoConfirm bool
+	fDryRun             bool
+	fVersion            bool
+	fSort               bool
 )
 
 func init() {
-	flag.BoolVar(&selectAll, "a", false, "select everything by default")
-	flag.BoolVar(&selectAllNoConfirm, "A", false, "select and update everything without confirmation")
-	flag.BoolVar(&dryRun, "d", false, "dry run, just print what will be executed")
-	flag.BoolVar(&flagVersion, "v", false, "show version information")
+	flag.BoolVar(&fSelectAll, "a", false, "select everything by default")
+	flag.BoolVar(&fSelectAllNoConfirm, "A", false, "select and update everything without confirmation")
+	flag.BoolVar(&fDryRun, "d", false, "dry run, just print what will be executed")
+	flag.BoolVar(&fVersion, "v", false, "show version information")
+	flag.BoolVar(&fSort, "s", false, "sort require lines")
 }
 
 func main() {
 	flag.Parse()
 
-	if flagVersion {
+	if fVersion {
 		if version != "" {
 			fmt.Printf("version:\t%s\n", version)
 		}
@@ -73,19 +75,25 @@ func updateGoMod(gomodPath string) error {
 		gomodPath = filepath.Join(gomodPath, "go.mod")
 	}
 
-	modules, err := parseDirectDeps(gomodPath)
+	gomod, err := parseGoMod(gomodPath)
 	if err != nil {
 		return fmt.Errorf("parse direct deps: %w", err)
 	}
 
+	modules := extractDirectDeps(gomod)
+
 	if len(modules) == 0 {
 		return errors.New("no direct dependencies found")
 	}
 
-	if selectAllNoConfirm {
+	if fSelectAllNoConfirm {
 		return runGoGet(gomodPath, modulesToPaths(modules))
 	}
 
+	if fSort {
+		return sortImports(gomodPath, gomod)
+	}
+
 	selected, err := runUI(modules)
 	if err != nil {
 		return fmt.Errorf("ui failed: %w", err)
@@ -98,7 +106,7 @@ func updateGoMod(gomodPath string) error {
 	return runGoGet(gomodPath, modulesToPaths(selected))
 }
 
-func parseDirectDeps(path string) ([]module.Version, error) {
+func parseGoMod(path string) (*modfile.File, error) {
 	content, err := os.ReadFile(path)
 	if err != nil {
 		return nil, fmt.Errorf("read file: %w", err)
@@ -109,16 +117,20 @@ func parseDirectDeps(path string) ([]module.Version, error) {
 		return nil, fmt.Errorf("parse go.mod: %w", err)
 	}
 
+	return ast, nil
+}
+
+func extractDirectDeps(gomod *modfile.File) []module.Version {
 	var modules []module.Version
-	for _, req := range ast.Require {
+	for _, req := range gomod.Require {
 		if req.Indirect {
 			continue
 		}
 
 		modules = append(modules, req.Mod)
 	}
 
-	return modules, nil
+	return modules
 }
 
 func runUI(modules []module.Version) ([]module.Version, error) {
@@ -128,7 +140,7 @@ func runUI(modules []module.Version) ([]module.Version, error) {
 	}
 
 	var findOpts []fzf.FindOption
-	if selectAll {
+	if fSelectAll {
 		findOpts = append(findOpts, fzf.WithPreselectAll(true))
 	}
 
@@ -151,7 +163,7 @@ func runUI(modules []module.Version) ([]module.Version, error) {
 func runGoGet(path string, selected []string) error {
 	fmt.Println("go get", strings.Join(selected, " "))
 
-	if dryRun {
+	if fDryRun {
 		return nil
 	}
 
@@ -176,3 +188,43 @@ func modulesToPaths(modules []module.Version) []string {
 	}
 	return paths
 }
+
+func sortImports(gomodPath string, gomod *modfile.File) error {
+	var direct, indirect []modfile.Require
+	for _, req := range gomod.Require {
+		if req.Indirect {
+			indirect = append(indirect, *req)
+		} else {
+			direct = append(direct, *req)
+		}
+		gomod.DropRequire(req.Mod.Path)
+	}
+
+	for _, dep := range direct {
+		gomod.AddNewRequire(dep.Mod.Path, dep.Mod.Version, false)
+	}
+	for _, dep := range indirect {
+		gomod.AddNewRequire(dep.Mod.Path, dep.Mod.Version, true)
+	}
+
+	gomod.Cleanup()
+
+	gomod.SetRequireSeparateIndirect(gomod.Require)
+
+	bytes, err := gomod.Format()
+	if err != nil {
+		return fmt.Errorf("format gomod: %w", err)
+	}
+
+	info, err := os.Stat(gomodPath)
+	if err != nil {
+		return fmt.Errorf("stat gomod: %w", err)
+	}
+
+	err = os.WriteFile(gomodPath, bytes, info.Mode())
+	if err != nil {
+		return fmt.Errorf("write gomod: %w", err)
+	}
+
+	return nil
+}

modupdate.nix

@@ -15,7 +15,7 @@ buildGoModule {
         ./version.go
       ];
   };
-  vendorSha256 = "sha256-XU4kLbEAPCL8mNk4omk2OIijKdiiAsJKBfoKkJJfHkI=";
+  vendorSha256 = "sha256-QWeXMgZUEg0fAyc4DS3QaWqv2VxDznhUP9Fl8GOuIYk=";
 
   ldflags = ["-s" "-w"];