Update to tableWriter 1.0.6 (#50)

2025-12-17 04:30:56 +01:00 · 2025-05-27 13:09:18 +02:00
parent eae39bbff1
commit 787178b17e
7 changed files with 246 additions and 103 deletions
--- a/lib/common.go
+++ b/lib/common.go
@@ -34,3 +34,39 @@ func (data *Tabdata) CloneEmpty() Tabdata {

 	return newdata
 }
+
+// add a TAB (\t) in front of every cell, but not the first
+func (data *Tabdata) TabEntries() [][]string {
+	newentries := make([][]string, len(data.entries))
+
+	for rowidx, row := range data.entries {
+		newentries[rowidx] = make([]string, len(row))
+
+		for colidx, cell := range row {
+			switch colidx {
+			case 0:
+				newentries[rowidx][colidx] = cell
+			default:
+				newentries[rowidx][colidx] = "\t" + cell
+			}
+		}
+	}
+
+	return newentries
+}
+
+// add a TAB (\t) in front of every header, but not the first
+func (data *Tabdata) TabHeaders() []string {
+	newheaders := make([]string, len(data.headers))
+
+	for colidx, cell := range data.headers {
+		switch colidx {
+		case 0:
+			newheaders[colidx] = cell
+		default:
+			newheaders[colidx] = "\t" + cell
+		}
+	}
+
+	return newheaders
+}
--- a/lib/helpers.go
+++ b/lib/helpers.go
@@ -254,17 +254,6 @@ func reduceColumns(conf cfg.Config, data *Tabdata) {
 	}
 }

-// FIXME: remove this when we only use Tablewriter and strip in ParseFile()!
-func trimRow(row []string) []string {
-	var fixedrow = make([]string, len(row))
-
-	for idx, cell := range row {
-		fixedrow[idx] = strings.TrimSpace(cell)
-	}
-
-	return fixedrow
-}
-
 // FIXME: refactor this beast!
 func colorizeData(conf cfg.Config, output string) string {
 	switch {
--- a/lib/printer.go
+++ b/lib/printer.go
@@ -22,12 +22,13 @@ import (
 	"fmt"
 	"io"
 	"log"
-	"regexp"
 	"strconv"
 	"strings"

 	"github.com/gookit/color"
 	"github.com/olekukonko/tablewriter"
+	"github.com/olekukonko/tablewriter/renderer"
+	"github.com/olekukonko/tablewriter/tw"
 	"github.com/tlinden/tablizer/cfg"
 	"gopkg.in/yaml.v3"
 )
@@ -76,36 +77,58 @@ Emacs org-mode compatible table (also orgtbl-mode)
 */
 func printOrgmodeData(writer io.Writer, conf cfg.Config, data *Tabdata) {
 	tableString := &strings.Builder{}
-	table := tablewriter.NewWriter(tableString)
+
+	table := tablewriter.NewTable(tableString,
+		tablewriter.WithRenderer(
+			renderer.NewBlueprint(
+				tw.Rendition{
+					Borders: tw.Border{
+						Left:   tw.On,
+						Right:  tw.On,
+						Top:    tw.On,
+						Bottom: tw.On,
+					},
+					Settings: tw.Settings{
+						Separators: tw.Separators{
+							ShowHeader:     tw.On,
+							ShowFooter:     tw.Off,
+							BetweenRows:    tw.Off,
+							BetweenColumns: 0,
+						},
+					},
+					Symbols: tw.NewSymbols(tw.StyleASCII),
+				})),
+
+		tablewriter.WithConfig(
+			tablewriter.Config{
+				Header: tw.CellConfig{
+					Formatting: tw.CellFormatting{
+						Alignment:  tw.AlignLeft,
+						AutoFormat: tw.Off,
+					},
+				},
+				Row: tw.CellConfig{
+					Formatting: tw.CellFormatting{
+						Alignment: tw.AlignLeft,
+					},
+				},
+			},
+		),
+	)

 	if !conf.NoHeaders {
-		table.SetHeader(data.headers)
+		table.Header(data.headers)
 	}

-	for _, row := range data.entries {
-		table.Append(trimRow(row))
+	if err := table.Bulk(data.entries); err != nil {
+		log.Fatalf("Failed to add data to table renderer: %s", err)
 	}

-	table.Render()
+	if err := table.Render(); err != nil {
+		log.Fatalf("Failed to render table: %s", err)
+	}

-	/* fix output for org-mode (orgtbl)
-	   tableWriter output:
-	   +------+------+
-	   | cell | cell |
-	   +------+------+
-
-	   Needed for org-mode compatibility:
-	   |------+------|
-	   | cell | cell |
-	   |------+------|
-	*/
-	leftR := regexp.MustCompile(`(?m)^\\+`)
-	rightR := regexp.MustCompile(`\\+(?m)$`)
-
-	output(writer, color.Sprint(
-		colorizeData(conf,
-			rightR.ReplaceAllString(
-				leftR.ReplaceAllString(tableString.String(), "|"), "|"))))
+	output(writer, color.Sprint(colorizeData(conf, tableString.String())))
 }

 /*
@@ -113,20 +136,57 @@ Markdown table
 */
 func printMarkdownData(writer io.Writer, conf cfg.Config, data *Tabdata) {
 	tableString := &strings.Builder{}
-	table := tablewriter.NewWriter(tableString)
+
+	table := tablewriter.NewTable(tableString,
+		tablewriter.WithRenderer(
+			renderer.NewBlueprint(
+				tw.Rendition{
+					Borders: tw.Border{
+						Left:   tw.On,
+						Right:  tw.On,
+						Top:    tw.Off,
+						Bottom: tw.Off,
+					},
+					Settings: tw.Settings{
+						Separators: tw.Separators{
+							ShowHeader:     tw.On,
+							ShowFooter:     tw.Off,
+							BetweenRows:    tw.Off,
+							BetweenColumns: 0,
+						},
+					},
+					Symbols: tw.NewSymbols(tw.StyleMarkdown),
+				})),
+
+		tablewriter.WithConfig(
+			tablewriter.Config{
+				Header: tw.CellConfig{
+					Formatting: tw.CellFormatting{
+						Alignment:  tw.AlignLeft,
+						AutoFormat: tw.Off,
+					},
+				},
+				Row: tw.CellConfig{
+					Formatting: tw.CellFormatting{
+						Alignment: tw.AlignLeft,
+					},
+				},
+			},
+		),
+	)

 	if !conf.NoHeaders {
-		table.SetHeader(data.headers)
+		table.Header(data.headers)
 	}

-	for _, row := range data.entries {
-		table.Append(trimRow(row))
+	if err := table.Bulk(data.entries); err != nil {
+		log.Fatalf("Failed to add data to table renderer: %s", err)
 	}

-	table.SetBorders(tablewriter.Border{Left: true, Top: false, Right: true, Bottom: false})
-	table.SetCenterSeparator("|")
+	if err := table.Render(); err != nil {
+		log.Fatalf("Failed to render table: %s", err)
+	}

-	table.Render()
 	output(writer, color.Sprint(colorizeData(conf, tableString.String())))
 }

@@ -135,33 +195,53 @@ Simple ASCII table without any borders etc, just like the input we expect
 */
 func printASCIIData(writer io.Writer, conf cfg.Config, data *Tabdata) {
 	tableString := &strings.Builder{}
-	table := tablewriter.NewWriter(tableString)
+
+	table := tablewriter.NewTable(tableString,
+		tablewriter.WithRenderer(
+			renderer.NewBlueprint(tw.Rendition{
+				Borders: tw.BorderNone,
+				Symbols: tw.NewSymbols(tw.StyleASCII),
+				Settings: tw.Settings{
+					Separators: tw.Separators{BetweenRows: tw.Off, BetweenColumns: tw.Off},
+					Lines:      tw.Lines{ShowFooterLine: tw.Off, ShowHeaderLine: tw.Off},
+				},
+			})),
+		tablewriter.WithConfig(tablewriter.Config{
+			Header: tw.CellConfig{
+				Formatting: tw.CellFormatting{
+					AutoFormat: tw.Off,
+				},
+				Padding: tw.CellPadding{
+					Global: tw.Padding{Left: "", Right: ""},
+				},
+			},
+			Row: tw.CellConfig{
+				Formatting: tw.CellFormatting{
+					AutoWrap:  tw.WrapNone,
+					Alignment: tw.AlignLeft,
+				},
+				Padding: tw.CellPadding{
+					Global: tw.Padding{Left: "", Right: ""},
+				},
+			},
+
+			Debug: true,
+		}),
+		tablewriter.WithPadding(tw.PaddingNone),
+	)

 	if !conf.NoHeaders {
-		table.SetHeader(data.headers)
+		table.Header(data.TabHeaders())
 	}

-	table.AppendBulk(data.entries)
-
-	table.SetAutoWrapText(false)
-	table.SetAutoFormatHeaders(true)
-	table.SetHeaderAlignment(tablewriter.ALIGN_LEFT)
-	table.SetAlignment(tablewriter.ALIGN_LEFT)
-	table.SetCenterSeparator("")
-	table.SetColumnSeparator("")
-	table.SetRowSeparator("")
-	table.SetHeaderLine(false)
-	table.SetBorder(false)
-	table.SetNoWhiteSpace(true)
-
-	if !conf.UseHighlight {
-		// the tabs destroy the highlighting
-		table.SetTablePadding("\t") // pad with tabs
-	} else {
-		table.SetTablePadding("   ")
+	if err := table.Bulk(data.TabEntries()); err != nil {
+		log.Fatalf("Failed to add data to table renderer: %s", err)
+	}
+
+	if err := table.Render(); err != nil {
+		log.Fatalf("Failed to render table: %s", err)
 	}

-	table.Render()
 	output(writer, color.Sprint(colorizeData(conf, tableString.String())))
 }

--- a/lib/printer_test.go
+++ b/lib/printer_test.go
@@ -77,9 +77,9 @@ var tests = []struct {
 		numberize: true,
 		name:      "default",
 		expect: `
-NAME(1)	DURATION(2)	COUNT(3)	WHEN(4)                    
-beta   	1d10h5m1s  	33      	3/1/2014                  	
-alpha  	4h35m      	170     	2013-Feb-03               	
+NAME(1)	DURATION(2)	COUNT(3)	WHEN(4)                   
+beta   	1d10h5m1s  	33      	3/1/2014                  
+alpha  	4h35m      	170     	2013-Feb-03               
 ceta   	33d12h     	9       	06/Jan/2008 15:04:05 -0700`,
 	},
 	{
@@ -98,11 +98,11 @@ ceta,33d12h,9,06/Jan/2008 15:04:05 -0700`,
 		mode:      cfg.Orgtbl,
 		expect: `
 +---------+-------------+----------+----------------------------+
-| NAME(1) | DURATION(2) | COUNT(3) |          WHEN(4)           |
+| NAME(1) | DURATION(2) | COUNT(3) | WHEN(4)                    |
 +---------+-------------+----------+----------------------------+
-| beta    | 1d10h5m1s   |       33 | 3/1/2014                   |
-| alpha   | 4h35m       |      170 | 2013-Feb-03                |
-| ceta    | 33d12h      |        9 | 06/Jan/2008 15:04:05 -0700 |
+| beta    | 1d10h5m1s   | 33       | 3/1/2014                   |
+| alpha   | 4h35m       | 170      | 2013-Feb-03                |
+| ceta    | 33d12h      | 9        | 06/Jan/2008 15:04:05 -0700 |
 +---------+-------------+----------+----------------------------+`,
 	},
 	{
@@ -110,11 +110,11 @@ ceta,33d12h,9,06/Jan/2008 15:04:05 -0700`,
 		mode:      cfg.Markdown,
 		numberize: true,
 		expect: `
-| NAME(1) | DURATION(2) | COUNT(3) |          WHEN(4)           |
+| NAME(1) | DURATION(2) | COUNT(3) | WHEN(4)                    |
 |---------|-------------|----------|----------------------------|
-| beta    | 1d10h5m1s   |       33 | 3/1/2014                   |
-| alpha   | 4h35m       |      170 | 2013-Feb-03                |
-| ceta    | 33d12h      |        9 | 06/Jan/2008 15:04:05 -0700 |`,
+| beta    | 1d10h5m1s   | 33       | 3/1/2014                   |
+| alpha   | 4h35m       | 170      | 2013-Feb-03                |
+| ceta    | 33d12h      | 9        | 06/Jan/2008 15:04:05 -0700 |`,
 	},
 	{
 		name:      "shell",
@@ -173,9 +173,9 @@ DURATION(2): 33d12h
 		numberize: true,
 		desc:      false,
 		expect: `
-NAME(1)	DURATION(2)	COUNT(3)	WHEN(4)                    
-ceta   	33d12h     	9       	06/Jan/2008 15:04:05 -0700	
-beta   	1d10h5m1s  	33      	3/1/2014                  	
+NAME(1)	DURATION(2)	COUNT(3)	WHEN(4)                   
+ceta   	33d12h     	9       	06/Jan/2008 15:04:05 -0700
+beta   	1d10h5m1s  	33      	3/1/2014                  
 alpha  	4h35m      	170     	2013-Feb-03`,
 	},
 	{
@@ -185,9 +185,9 @@ alpha  	4h35m      	170     	2013-Feb-03`,
 		desc:      false,
 		numberize: true,
 		expect: `
-NAME(1)	DURATION(2)	COUNT(3)	WHEN(4)                    
-ceta   	33d12h     	9       	06/Jan/2008 15:04:05 -0700	
-alpha  	4h35m      	170     	2013-Feb-03               	
+NAME(1)	DURATION(2)	COUNT(3)	WHEN(4)                   
+ceta   	33d12h     	9       	06/Jan/2008 15:04:05 -0700
+alpha  	4h35m      	170     	2013-Feb-03               
 beta   	1d10h5m1s  	33      	3/1/2014`,
 	},
 	{
@@ -197,9 +197,9 @@ beta   	1d10h5m1s  	33      	3/1/2014`,
 		numberize: true,
 		desc:      false,
 		expect: `
-NAME(1)	DURATION(2)	COUNT(3)	WHEN(4)                    
-alpha  	4h35m      	170     	2013-Feb-03               	
-beta   	1d10h5m1s  	33      	3/1/2014                  	
+NAME(1)	DURATION(2)	COUNT(3)	WHEN(4)                   
+alpha  	4h35m      	170     	2013-Feb-03               
+beta   	1d10h5m1s  	33      	3/1/2014                  
 ceta   	33d12h     	9       	06/Jan/2008 15:04:05 -0700`,
 	},

@@ -210,9 +210,9 @@ ceta   	33d12h     	9       	06/Jan/2008 15:04:05 -0700`,
 		numberize: true,
 		usecolstr: "1,4",
 		expect: `
-NAME(1)	WHEN(4)                    
-beta   	3/1/2014                  	
-alpha  	2013-Feb-03               	
+NAME(1)	WHEN(4)                   
+beta   	3/1/2014                  
+alpha  	2013-Feb-03               
 ceta   	06/Jan/2008 15:04:05 -0700`,
 	},
 	{
@@ -221,9 +221,9 @@ ceta   	06/Jan/2008 15:04:05 -0700`,
 		numberize: true,
 		usecolstr: "2",
 		expect: `
-DURATION(2) 
-1d10h5m1s  	
-4h35m      	
+DURATION(2)
+1d10h5m1s  
+4h35m      
 33d12h`,
 	},
 	{
@@ -232,9 +232,9 @@ DURATION(2)
 		numberize: true,
 		usecolstr: "3",
 		expect: `
-COUNT(3) 
-33      	
-170     	
+COUNT(3)
+33      
+170     
 9`,
 	},
 	{
@@ -244,9 +244,9 @@ COUNT(3)
 		numberize: true,
 		usecolstr: "1,3",
 		expect: `
-NAME(1)	COUNT(3) 
-beta   	33      	
-alpha  	170     	
+NAME(1)	COUNT(3)
+beta   	33      
+alpha  	170     
 ceta   	9`,
 	},
 	{
@@ -255,9 +255,9 @@ ceta   	9`,
 		numberize: true,
 		usecolstr: "2,4",
 		expect: `
-DURATION(2)	WHEN(4)                    
-1d10h5m1s  	3/1/2014                  	
-4h35m      	2013-Feb-03               	
+DURATION(2)	WHEN(4)                   
+1d10h5m1s  	3/1/2014                  
+4h35m      	2013-Feb-03               
 33d12h     	06/Jan/2008 15:04:05 -0700`,
 	},
 }