From d928f29aeee31239054c27b5c081d19ed35f23da Mon Sep 17 00:00:00 2001 From: fujiwara-manabu-0516 Date: Wed, 20 Aug 2025 20:00:51 +0900 Subject: [PATCH] chore: upgrade to Go 1.24 and add support for *types.Alias - bump Go version to 1.24 - update code handling for *types.Alias introduced in 1.24 --- go.mod | 11 +++--- go.sum | 66 +++++----------------------------- parser.go | 6 ++++ testdata/success/base/main.go | 4 +++ testdata/success/export_all.go | 24 ++++++++----- testdata/success/normal.go | 12 +++++-- 6 files changed, 49 insertions(+), 74 deletions(-) diff --git a/go.mod b/go.mod index 99d9822..d7ef55d 100644 --- a/go.mod +++ b/go.mod @@ -1,16 +1,15 @@ module github.com/go-generalize/go-easyparser -go 1.22 +go 1.24 require ( github.com/go-utils/gopackages v0.1.0 github.com/google/go-cmp v0.6.0 - golang.org/x/tools v0.23.0 + golang.org/x/tools v0.36.0 ) require ( - golang.org/x/mod v0.19.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.22.0 // indirect - golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect + golang.org/x/mod v0.27.0 // indirect + golang.org/x/sync v0.16.0 // indirect + golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect ) diff --git a/go.sum b/go.sum index 699e1e7..18fe6e7 100644 --- a/go.sum +++ b/go.sum @@ -2,74 +2,24 @@ github.com/go-utils/gopackages v0.1.0 h1:zXn3KS4HzPGjpUcMZd2LzZ2wQ8K6haxGEebxCyx github.com/go-utils/gopackages v0.1.0/go.mod h1:QPVW4BzGDze3cEu7TbM7Gw9ppfYTj4NDgBW0JwNZE1g= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= -golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -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/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= -golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ= +golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= -golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= -golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= +golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= -golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= -golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= -golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= -golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg= -golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI= +golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg= +golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 h1:LLhsEBxRTBLuKlQxFBYUOU8xyFgXv6cOTp2HASDlsDk= -golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= +golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY= +golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= diff --git a/parser.go b/parser.go index 154fad5..9ad4f0a 100644 --- a/parser.go +++ b/parser.go @@ -315,6 +315,10 @@ func (p *pkgParser) parseInterface(_ *types.Interface) tstypes.Type { return &tstypes.Any{} } +func (p *pkgParser) parseAlias(u *types.Alias, dep bool) tstypes.Type { + return p.parseType(u.Underlying(), dep) +} + func (p *pkgParser) parseType(u types.Type, dep bool) tstypes.Type { var typ tstypes.Type if p.Replacer != nil { @@ -342,6 +346,8 @@ func (p *pkgParser) parseType(u types.Type, dep bool) tstypes.Type { typ = p.parseMap(u) case *types.Interface: typ = p.parseInterface(u) + case *types.Alias: + typ = p.parseAlias(u, dep) default: panic("unsupported named type: " + reflect.TypeOf(u).String()) } diff --git a/testdata/success/base/main.go b/testdata/success/base/main.go index 3981dc3..d06860f 100644 --- a/testdata/success/base/main.go +++ b/testdata/success/base/main.go @@ -43,6 +43,8 @@ type Data struct { Hidden int `json:"-"` ByteSlice []byte + + Alias AliasInt } type foo struct { @@ -52,3 +54,5 @@ type foo struct { type Unexported struct { Data int } + +type AliasInt = int diff --git a/testdata/success/export_all.go b/testdata/success/export_all.go index 95a7956..779fb8b 100644 --- a/testdata/success/export_all.go +++ b/testdata/success/export_all.go @@ -41,7 +41,7 @@ var AllExportedType = map[string]tstypes.Type{ "github.com/go-generalize/go-easyparser/testdata/success/base.foo": &tstypes.Object{ Common: tstypes.Common{ PkgName: "main", - Position: testutil.ParsePositionString("testdata/success/base/main.go:48:6"), + Position: testutil.ParsePositionString("testdata/success/base/main.go:50:6"), }, Name: "github.com/go-generalize/go-easyparser/testdata/success/base.foo", Entries: map[string]tstypes.ObjectEntry{ @@ -50,7 +50,7 @@ var AllExportedType = map[string]tstypes.Type{ Type: &tstypes.Number{ RawType: types.Int, }, - Position: testutil.ParsePositionString("testdata/success/base/main.go:49:2"), + Position: testutil.ParsePositionString("testdata/success/base/main.go:51:2"), }, }, }, @@ -73,7 +73,7 @@ var AllExportedType = map[string]tstypes.Type{ "github.com/go-generalize/go-easyparser/testdata/success/base.Unexported": &tstypes.Object{ Common: tstypes.Common{ PkgName: "main", - Position: testutil.ParsePositionString("testdata/success/base/main.go:52:6"), + Position: testutil.ParsePositionString("testdata/success/base/main.go:54:6"), }, Name: "github.com/go-generalize/go-easyparser/testdata/success/base.Unexported", Entries: map[string]tstypes.ObjectEntry{ @@ -82,7 +82,7 @@ var AllExportedType = map[string]tstypes.Type{ Type: &tstypes.Number{ RawType: types.Int, }, - Position: testutil.ParsePositionString("testdata/success/base/main.go:53:2"), + Position: testutil.ParsePositionString("testdata/success/base/main.go:55:2"), }, }, }, @@ -244,7 +244,7 @@ var AllExportedType = map[string]tstypes.Type{ Type: &tstypes.Object{ Common: tstypes.Common{ PkgName: "main", - Position: testutil.ParsePositionString("testdata/success/base/main.go:48:6"), + Position: testutil.ParsePositionString("testdata/success/base/main.go:50:6"), }, Name: "github.com/go-generalize/go-easyparser/testdata/success/base.foo", Entries: map[string]tstypes.ObjectEntry{ @@ -253,7 +253,7 @@ var AllExportedType = map[string]tstypes.Type{ Type: &tstypes.Number{ RawType: types.Int, }, - Position: testutil.ParsePositionString("testdata/success/base/main.go:49:2"), + Position: testutil.ParsePositionString("testdata/success/base/main.go:51:2"), }, }, }, @@ -265,7 +265,7 @@ var AllExportedType = map[string]tstypes.Type{ Type: &tstypes.Object{ Common: tstypes.Common{ PkgName: "main", - Position: testutil.ParsePositionString("testdata/success/base/main.go:52:6"), + Position: testutil.ParsePositionString("testdata/success/base/main.go:54:6"), }, Name: "github.com/go-generalize/go-easyparser/testdata/success/base.Unexported", Entries: map[string]tstypes.ObjectEntry{ @@ -274,7 +274,7 @@ var AllExportedType = map[string]tstypes.Type{ Type: &tstypes.Number{ RawType: types.Int, }, - Position: testutil.ParsePositionString("testdata/success/base/main.go:53:2"), + Position: testutil.ParsePositionString("testdata/success/base/main.go:55:2"), }, }, }, @@ -289,6 +289,14 @@ var AllExportedType = map[string]tstypes.Type{ FieldIndex: 13, Position: testutil.ParsePositionString("testdata/success/base/main.go:45:2"), }, + "Alias": { + RawName: "Alias", + Type: &tstypes.Number{ + RawType: types.Int, + }, + FieldIndex: 14, + Position: testutil.ParsePositionString("testdata/success/base/main.go:47:2"), + }, }, }, } diff --git a/testdata/success/normal.go b/testdata/success/normal.go index 06afabf..2a99ee0 100644 --- a/testdata/success/normal.go +++ b/testdata/success/normal.go @@ -200,7 +200,7 @@ var NormalType = map[string]tstypes.Type{ Type: &tstypes.Number{ RawType: types.Int, }, - Position: testutil.ParsePositionString("testdata/success/base/main.go:49:2"), + Position: testutil.ParsePositionString("testdata/success/base/main.go:51:2"), }, }, }, @@ -216,7 +216,7 @@ var NormalType = map[string]tstypes.Type{ Type: &tstypes.Number{ RawType: types.Int, }, - Position: testutil.ParsePositionString("testdata/success/base/main.go:53:2"), + Position: testutil.ParsePositionString("testdata/success/base/main.go:55:2"), }, }, }, @@ -231,6 +231,14 @@ var NormalType = map[string]tstypes.Type{ FieldIndex: 13, Position: testutil.ParsePositionString("testdata/success/base/main.go:45:2"), }, + "Alias": { + RawName: "Alias", + Type: &tstypes.Number{ + RawType: types.Int, + }, + FieldIndex: 14, + Position: testutil.ParsePositionString("testdata/success/base/main.go:47:2"), + }, }, }, }