Removes dependence on x/exp/maps (#33)

Author: ufukty

go.mod

@@ -2,7 +2,4 @@ module go.ufukty.com/gonfique/v2
 
 go 1.26
 
-require (
-	golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d
-	gopkg.in/yaml.v3 v3.0.1
-)
+require gopkg.in/yaml.v3 v3.0.1

go.sum

@@ -1,5 +1,3 @@
-golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d h1:0olWaB5pg3+oychR51GUVCEsGkeCU/2JxjBgIo4f3M0=
-golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

internal/compares/compare.go

@@ -2,9 +2,8 @@ package compares
 
 import (
 	"go/ast"
+	"maps"
 	"slices"
-
-	"golang.org/x/exp/maps"
 )
 
 func sort(idts []*ast.Ident) {
@@ -50,14 +49,14 @@ func Compare(a, b any) bool {
 			}
 			af := linearizeFieldList(a)
 			bf := linearizeFieldList(b)
-			afk := maps.Keys(af)
-			bfk := maps.Keys(bf)
+			afk := slices.Collect(maps.Keys(af))
+			bfk := slices.Collect(maps.Keys(bf))
 			if len(afk) != len(bfk) {
 				return false
 			}
 			sort(afk)
 			sort(bfk)
-			for i := 0; i < len(afk); i++ {
+			for i := range afk {
 				if !Compare(afk[i], bfk[i]) || !Compare(af[afk[i]], bf[bfk[i]]) {
 					return false
 				}

internal/datas/sortby/by.go

@@ -3,20 +3,17 @@ package sortby
 import (
 	"cmp"
 	"iter"
+	"maps"
 	"slices"
-
-	"golang.org/x/exp/maps"
 )
 
 func Key[K cmp.Ordered, V any](m map[K]V) iter.Seq2[K, V] {
 	return KeyFunc(m, cmp.Compare)
 }
 
 func KeyFunc[K cmp.Ordered, V any](m map[K]V, cmp func(a, b K) int) iter.Seq2[K, V] {
-	ks := maps.Keys(m)
-	slices.SortFunc(ks, cmp)
 	return func(yield func(K, V) bool) {
-		for _, k := range ks {
+		for _, k := range slices.SortedFunc(maps.Keys(m), cmp) {
 			if !yield(k, m[k]) {
 				return
 			}

internal/files/coder/write.go

@@ -8,6 +8,7 @@ import (
 	"go/printer"
 	"go/token"
 	"io"
+	"maps"
 	"regexp"
 	"slices"
 	"strings"
@@ -19,7 +20,6 @@ import (
 	"go.ufukty.com/gonfique/v2/internal/files/input/encoders"
 	"go.ufukty.com/gonfique/v2/internal/namings"
 	"go.ufukty.com/gonfique/v2/internal/version"
-	"golang.org/x/exp/maps"
 )
 
 type Coder struct {
@@ -47,7 +47,7 @@ func uniq[K comparable](ss []K) []K {
 	for _, s := range ss {
 		m[s] = nil
 	}
-	return maps.Keys(m)
+	return slices.Collect(maps.Keys(m))
 }
 
 func (c Coder) addImports(dst *ast.File) {

internal/paths/declare/agent.go

@@ -2,10 +2,11 @@ package declare
 
 import (
 	"go/ast"
+	"maps"
+	"slices"
 
 	"go.ufukty.com/gonfique/v2/internal/files/config"
 	"go.ufukty.com/gonfique/v2/internal/paths/mapper/resolve"
-	"golang.org/x/exp/maps"
 )
 
 // keeps track of type expression and typename conflicts.
@@ -25,5 +26,5 @@ func New() *Agent {
 }
 
 func (a *Agent) Typenames() []config.Typename {
-	return maps.Keys(a.users)
+	return slices.Collect(maps.Keys(a.users))
 }

internal/paths/declare/conflicts.go

@@ -4,12 +4,12 @@ import (
 	"cmp"
 	"fmt"
 	"go/ast"
+	"maps"
 	"slices"
 
 	"go.ufukty.com/gonfique/v2/internal/compares"
 	"go.ufukty.com/gonfique/v2/internal/files/config"
 	"go.ufukty.com/gonfique/v2/internal/paths/mapper/resolve"
-	"golang.org/x/exp/maps"
 )
 
 func groupSchemas(users []resolve.Path, exprs map[resolve.Path]ast.Expr) map[ast.Expr][]resolve.Path {
@@ -94,7 +94,7 @@ func summarize(e ast.Expr) string {
 // in sorted order
 func format(cs map[config.Typename]map[ast.Expr][]resolve.Path) string {
 	msg := ""
-	tns := maps.Keys(cs)
+	tns := slices.Collect(maps.Keys(cs))
 	slices.Sort(tns)
 	for i := 0; i < len(tns); i++ {
 		heading := ternary(i != len(tns)-1, "├─ ", "╰─ ")
@@ -106,7 +106,7 @@ func format(cs map[config.Typename]map[ast.Expr][]resolve.Path) string {
 		for t := range users {
 			summaries[t] = summarize(t)
 		}
-		types := maps.Keys(users)
+		types := slices.Collect(maps.Keys(users))
 		slices.SortFunc(types, func(a, b ast.Expr) int {
 			return cmp.Compare(summaries[a], summaries[b])
 		})

internal/paths/export/auto/autogen_test.go

@@ -3,13 +3,13 @@ package auto
 import (
 	"cmp"
 	"fmt"
+	"maps"
 	"slices"
 	"strings"
 	"testing"
 
 	"go.ufukty.com/gonfique/v2/internal/files/config"
 	"go.ufukty.com/gonfique/v2/internal/paths/mapper/resolve"
-	"golang.org/x/exp/maps"
 )
 
 func bfs(a, b resolve.Path) int {
@@ -31,7 +31,7 @@ func typenames(rps []resolve.Path) (map[resolve.Path]config.Typename, error) {
 	slices.SortFunc(rps, bfs)
 	tns := map[resolve.Path]config.Typename{}
 	for _, rp := range rps {
-		tn, ok := Typename(rp, maps.Values(tns))
+		tn, ok := Typename(rp, slices.Collect(maps.Values(tns)))
 		if !ok {
 			return nil, fmt.Errorf("could not produce typename for %s", rp)
 		}
@@ -139,7 +139,7 @@ func TestAutogen(t *testing.T) {
 
 	for _, tc := range tcs {
 		t.Run(tc.testname, func(t *testing.T) {
-			got, err := typenames(maps.Keys(tc.output))
+			got, err := typenames(slices.Collect(maps.Keys(tc.output)))
 			if err != nil {
 				t.Fatal(fmt.Errorf("act: %w", err))
 			}

internal/paths/paths.go

@@ -3,6 +3,7 @@ package paths
 import (
 	"fmt"
 	"go/ast"
+	"maps"
 	"slices"
 
 	"go.ufukty.com/gonfique/v2/internal/datas/sortby"
@@ -19,7 +20,6 @@ import (
 	"go.ufukty.com/gonfique/v2/internal/paths/replace"
 	"go.ufukty.com/gonfique/v2/internal/transform"
 	"go.ufukty.com/gonfique/v2/internal/tree/bucket"
-	"golang.org/x/exp/maps"
 )
 
 type products struct {
@@ -31,7 +31,7 @@ func Process(ti *transform.Info, c *config.File, verbose bool) (*products, error
 	declare := declare.New()
 	export := export.New([]config.Typename{}) // FIXME:
 	replace := replace.New()
-	paths := maps.Keys(c.Rules)
+	paths := slices.Collect(maps.Keys(c.Rules))
 
 	mps, err := mapper.Bfs(ti, c, paths, export)
 	if err != nil {

internal/testutils/nodestring.go

@@ -3,11 +3,10 @@ package testutils
 import (
 	"fmt"
 	"go/ast"
+	"maps"
 	"reflect"
 	"slices"
 	"strings"
-
-	"golang.org/x/exp/maps"
 )
 
 func PrintPathways(v reflect.Value, anc []string) {
@@ -26,7 +25,7 @@ func PrintPathways(v reflect.Value, anc []string) {
 		for iter.Next() {
 			m[iter.Key().String()] = iter.Value()
 		}
-		ks := maps.Keys(m)
+		ks := slices.Collect(maps.Keys(m))
 		slices.Sort(ks)
 		for _, k := range ks {
 			PrintPathways(m[k], append(slices.Clone(anc), k))