Skip to content

Commit 3b9c8bf

Browse files
TvdWTvdW
authored
chore(deps): upgrade github.com/olekukonko/tablewriter from v0.0.5 to v1.1.4 (#1092)
1 parent e251662 commit 3b9c8bf

5 files changed

Lines changed: 71 additions & 30 deletions

File tree

‎cmd/vale/color.go‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"strings"
77

8-
"github.com/olekukonko/tablewriter"
8+
"github.com/olekukonko/tablewriter/tw"
99
"github.com/pterm/pterm"
1010

1111
"github.com/errata-ai/vale/v3/internal/core"
@@ -58,11 +58,11 @@ func printVerboseAlert(f *core.File, wrap bool) (int, int, int) {
5858
return 0, 0, 0
5959
}
6060

61-
table := tablewriter.NewWriter(os.Stdout)
62-
table.SetCenterSeparator("")
63-
table.SetColumnSeparator("")
64-
table.SetRowSeparator("")
65-
table.SetAutoWrapText(!wrap)
61+
wrapMode := tw.WrapNone
62+
if !wrap {
63+
wrapMode = tw.WrapNormal
64+
}
65+
table := newBorderlessTable(os.Stdout, wrapMode)
6666

6767
fmt.Printf("\n %s", pterm.Underscore.Sprint(f.Path))
6868
for _, a := range alerts {
@@ -80,6 +80,8 @@ func printVerboseAlert(f *core.File, wrap bool) (int, int, int) {
8080
loc = fmt.Sprintf("%d:%d", a.Line, a.Span[0])
8181
table.Append([]string{loc, level, a.Message, a.Check})
8282
}
83+
fmt.Println()
8384
table.Render()
85+
fmt.Println()
8486
return errors, warnings, notifications
8587
}

‎cmd/vale/funcs.go‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,32 @@ package main
22

33
import (
44
"encoding/json"
5+
"fmt"
6+
"io"
57
"os"
68
"text/template"
79

810
"github.com/olekukonko/tablewriter"
11+
"github.com/olekukonko/tablewriter/tw"
912
"github.com/pterm/pterm"
1013
)
1114

1215
var funcs = template.FuncMap{}
1316

17+
func newBorderlessTable(w io.Writer, wrap int) *tablewriter.Table {
18+
return tablewriter.NewTable(w,
19+
tablewriter.WithRowAutoWrap(wrap),
20+
tablewriter.WithRendition(tw.Rendition{
21+
Borders: tw.BorderNone,
22+
Symbols: tw.NewSymbols(tw.StyleNone),
23+
Settings: tw.Settings{
24+
Lines: tw.LinesNone,
25+
Separators: tw.SeparatorsNone,
26+
},
27+
}),
28+
)
29+
}
30+
1431
func init() {
1532
funcs["red"] = func(s string) string {
1633
return pterm.Red(s)
@@ -25,20 +42,21 @@ func init() {
2542
return pterm.Underscore.Sprint(s)
2643
}
2744
funcs["newTable"] = func(wrap bool) *tablewriter.Table {
28-
table := tablewriter.NewWriter(os.Stdout)
29-
table.SetCenterSeparator("")
30-
table.SetColumnSeparator("")
31-
table.SetRowSeparator("")
32-
table.SetAutoWrapText(wrap)
33-
return table
45+
wrapMode := tw.WrapNone
46+
if wrap {
47+
wrapMode = tw.WrapNormal
48+
}
49+
return newBorderlessTable(os.Stdout, wrapMode)
3450
}
3551
funcs["addRow"] = func(t *tablewriter.Table, r []string) *tablewriter.Table {
3652
t.Append(r)
3753
return t
3854
}
3955
funcs["renderTable"] = func(t *tablewriter.Table) *tablewriter.Table {
56+
fmt.Println()
4057
t.Render()
41-
t.ClearRows()
58+
fmt.Println()
59+
t.Reset()
4260
return t
4361
}
4462
funcs["jsonEscape"] = func(i string) string {

‎cmd/vale/info.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"slices"
77

8-
"github.com/olekukonko/tablewriter"
8+
"github.com/olekukonko/tablewriter/tw"
99
"github.com/pterm/pterm"
1010
"github.com/spf13/pflag"
1111
"golang.org/x/exp/maps"
@@ -91,11 +91,7 @@ func init() {
9191
pflag.Usage = func() {
9292
fmt.Println(intro)
9393

94-
table := tablewriter.NewWriter(os.Stdout)
95-
table.SetCenterSeparator("")
96-
table.SetColumnSeparator("")
97-
table.SetRowSeparator("")
98-
table.SetAutoWrapText(false)
94+
table := newBorderlessTable(os.Stdout, tw.WrapNone)
9995

10096
fmt.Println(pterm.Bold.Sprintf("\nFlags:"))
10197
pflag.VisitAll(func(f *pflag.Flag) {
@@ -104,8 +100,10 @@ func init() {
104100
}
105101
})
106102

103+
fmt.Println()
107104
table.Render()
108-
table.ClearRows()
105+
fmt.Println()
106+
table.Reset()
109107

110108
commandKeys := maps.Keys(commandInfo)
111109
slices.Sort(commandKeys)
@@ -116,7 +114,9 @@ func init() {
116114
table.Append([]string{toCodeStyle(cmd), commandInfo[cmd]})
117115
}
118116
}
117+
fmt.Println()
119118
table.Render()
119+
fmt.Println()
120120

121121
os.Exit(0)
122122
}

‎go.mod‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/jdkato/twine v0.10.2
1818
github.com/mitchellh/mapstructure v1.5.0
1919
github.com/niklasfasching/go-org v1.7.0
20-
github.com/olekukonko/tablewriter v0.0.5
20+
github.com/olekukonko/tablewriter v1.1.4
2121
github.com/otiai10/copy v1.14.0
2222
github.com/pelletier/go-toml/v2 v2.2.5-0.20250826075308-a0e846496753
2323
github.com/pterm/pterm v0.12.40
@@ -40,15 +40,22 @@ require (
4040
github.com/Masterminds/goutils v1.1.1 // indirect
4141
github.com/Masterminds/semver/v3 v3.3.1 // indirect
4242
github.com/atomicgo/cursor v0.0.1 // indirect
43-
github.com/clipperhouse/stringish v0.1.1 // indirect
44-
github.com/clipperhouse/uax29/v2 v2.5.0 // indirect
43+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
44+
github.com/clipperhouse/displaywidth v0.10.0 // indirect
45+
github.com/clipperhouse/uax29/v2 v2.6.0 // indirect
46+
github.com/fatih/color v1.18.0 // indirect
4547
github.com/google/uuid v1.6.0 // indirect
4648
github.com/gookit/color v1.5.4 // indirect
4749
github.com/huandu/xstrings v1.5.0 // indirect
50+
github.com/mattn/go-colorable v0.1.14 // indirect
51+
github.com/mattn/go-isatty v0.0.20 // indirect
4852
github.com/mattn/go-runewidth v0.0.19 // indirect
4953
github.com/mitchellh/copystructure v1.2.0 // indirect
5054
github.com/mitchellh/reflectwalk v1.0.2 // indirect
5155
github.com/montanaflynn/stats v0.7.1 // indirect
56+
github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect
57+
github.com/olekukonko/errors v1.2.0 // indirect
58+
github.com/olekukonko/ll v0.1.6 // indirect
5259
github.com/shopspring/decimal v1.4.0 // indirect
5360
github.com/spf13/cast v1.7.1 // indirect
5461
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect

‎go.sum‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ github.com/atomicgo/cursor v0.0.1 h1:xdogsqa6YYlLfM+GyClC/Lchf7aiMerFiZQn7soTOoU
2626
github.com/atomicgo/cursor v0.0.1/go.mod h1:cBON2QmmrysudxNBFthvMtN32r3jxVRIvzkUiF/RuIk=
2727
github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q=
2828
github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
29-
github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
30-
github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
31-
github.com/clipperhouse/uax29/v2 v2.5.0 h1:x7T0T4eTHDONxFJsL94uKNKPHrclyFI0lm7+w94cO8U=
32-
github.com/clipperhouse/uax29/v2 v2.5.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
29+
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
30+
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
31+
github.com/clipperhouse/displaywidth v0.10.0 h1:GhBG8WuerxjFQQYeuZAeVTuyxuX+UraiZGD4HJQ3Y8g=
32+
github.com/clipperhouse/displaywidth v0.10.0/go.mod h1:XqJajYsaiEwkxOj4bowCTMcT1SgvHo9flfF3jQasdbs=
33+
github.com/clipperhouse/uax29/v2 v2.6.0 h1:z0cDbUV+aPASdFb2/ndFnS9ts/WNXgTNNGFoKXuhpos=
34+
github.com/clipperhouse/uax29/v2 v2.6.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
3335
github.com/d5/tengo/v2 v2.17.0 h1:BWUN9NoJzw48jZKiYDXDIF3QrIVZRm1uV1gTzeZ2lqM=
3436
github.com/d5/tengo/v2 v2.17.0/go.mod h1:XRGjEs5I9jYIKTxly6HCF8oiiilk5E/RYXOZ5b0DZC8=
3537
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -41,6 +43,8 @@ github.com/errata-ai/regexp2 v1.7.0 h1:N+weOlhwTd5iyDTcTCAMljXnfzkftcOZrdXno6G+Q
4143
github.com/errata-ai/regexp2 v1.7.0/go.mod h1:59rO+jaxayJPF1WKI5m9R5F3Y3zR2Wn0DHnQbxtPm4A=
4244
github.com/expr-lang/expr v1.17.7 h1:Q0xY/e/2aCIp8g9s/LGvMDCC5PxYlvHgDZRQ4y16JX8=
4345
github.com/expr-lang/expr v1.17.7/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
46+
github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
47+
github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
4448
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
4549
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
4650
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
@@ -69,7 +73,10 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
6973
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
7074
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
7175
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
72-
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
76+
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
77+
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
78+
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
79+
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
7380
github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
7481
github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
7582
github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
@@ -85,8 +92,14 @@ github.com/neurosnap/sentences v1.1.2 h1:iphYOzx/XckXeBiLIUBkPu2EKMJ+6jDbz/sLJZ7
8592
github.com/neurosnap/sentences v1.1.2/go.mod h1:/pwU4E9XNL21ygMIkOIllv/SMy2ujHwpf8GQPu1YPbQ=
8693
github.com/niklasfasching/go-org v1.7.0 h1:vyMdcMWWTe/XmANk19F4k8XGBYg0GQ/gJGMimOjGMek=
8794
github.com/niklasfasching/go-org v1.7.0/go.mod h1:WuVm4d45oePiE0eX25GqTDQIt/qPW1T9DGkRscqLW5o=
88-
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
89-
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
95+
github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 h1:zrbMGy9YXpIeTnGj4EljqMiZsIcE09mmF8XsD5AYOJc=
96+
github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6/go.mod h1:rEKTHC9roVVicUIfZK7DYrdIoM0EOr8mK1Hj5s3JjH0=
97+
github.com/olekukonko/errors v1.2.0 h1:10Zcn4GeV59t/EGqJc8fUjtFT/FuUh5bTMzZ1XwmCRo=
98+
github.com/olekukonko/errors v1.2.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
99+
github.com/olekukonko/ll v0.1.6 h1:lGVTHO+Qc4Qm+fce/2h2m5y9LvqaW+DCN7xW9hsU3uA=
100+
github.com/olekukonko/ll v0.1.6/go.mod h1:NVUmjBb/aCtUpjKk75BhWrOlARz3dqsM+OtszpY4o88=
101+
github.com/olekukonko/tablewriter v1.1.4 h1:ORUMI3dXbMnRlRggJX3+q7OzQFDdvgbN9nVWj1drm6I=
102+
github.com/olekukonko/tablewriter v1.1.4/go.mod h1:+kedxuyTtgoZLwif3P1Em4hARJs+mVnzKxmsCL/C5RY=
90103
github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
91104
github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
92105
github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=
@@ -150,6 +163,7 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
150163
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
151164
golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
152165
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
166+
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
153167
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
154168
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
155169
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

0 commit comments

Comments
 (0)