diff --git a/README.md b/README.md index 9a2d2c1..ae85f84 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ for more details. The public API surface is documented in the [wiki](http://github.com/mum4k/termdash/wiki). -Private packages can be identified by the presence of the **/internal/** +Private packages can be identified by the presence of the **/private/** directory in their import path. Stability of the private packages isn't guaranteed and changes won't be backward compatible. diff --git a/container/container.go b/container/container.go index b978d00..54cef78 100644 --- a/container/container.go +++ b/container/container.go @@ -27,10 +27,10 @@ import ( "image" "sync" - "github.com/mum4k/termdash/internal/alignfor" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/event" "github.com/mum4k/termdash/linestyle" + "github.com/mum4k/termdash/private/alignfor" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/event" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" ) diff --git a/container/container_test.go b/container/container_test.go index a6a8692..1fd2c6d 100644 --- a/container/container_test.go +++ b/container/container_test.go @@ -23,16 +23,16 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/event" - "github.com/mum4k/termdash/internal/event/testevent" - "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/fakewidget" "github.com/mum4k/termdash/keyboard" "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/mouse" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/draw" + "github.com/mum4k/termdash/private/draw/testdraw" + "github.com/mum4k/termdash/private/event" + "github.com/mum4k/termdash/private/event/testevent" + "github.com/mum4k/termdash/private/faketerm" + "github.com/mum4k/termdash/private/fakewidget" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" "github.com/mum4k/termdash/widgets/barchart" diff --git a/container/draw.go b/container/draw.go index efacadd..d186b12 100644 --- a/container/draw.go +++ b/container/draw.go @@ -22,9 +22,9 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/draw" "github.com/mum4k/termdash/widgetapi" ) diff --git a/container/draw_test.go b/container/draw_test.go index db4eda5..9789772 100644 --- a/container/draw_test.go +++ b/container/draw_test.go @@ -20,12 +20,12 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/fakewidget" "github.com/mum4k/termdash/linestyle" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/draw" + "github.com/mum4k/termdash/private/draw/testdraw" + "github.com/mum4k/termdash/private/faketerm" + "github.com/mum4k/termdash/private/fakewidget" "github.com/mum4k/termdash/widgetapi" ) diff --git a/container/focus.go b/container/focus.go index 6a87486..4320eea 100644 --- a/container/focus.go +++ b/container/focus.go @@ -19,8 +19,8 @@ package container import ( "image" - "github.com/mum4k/termdash/internal/button" "github.com/mum4k/termdash/mouse" + "github.com/mum4k/termdash/private/button" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/container/focus_test.go b/container/focus_test.go index f4c43dc..4a31ad7 100644 --- a/container/focus_test.go +++ b/container/focus_test.go @@ -21,11 +21,11 @@ import ( "time" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/event" - "github.com/mum4k/termdash/internal/event/testevent" - "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/mouse" + "github.com/mum4k/termdash/private/event" + "github.com/mum4k/termdash/private/event/testevent" + "github.com/mum4k/termdash/private/faketerm" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/container/grid/grid_test.go b/container/grid/grid_test.go index 00e23e5..3b889d7 100644 --- a/container/grid/grid_test.go +++ b/container/grid/grid_test.go @@ -23,13 +23,13 @@ import ( "github.com/mum4k/termdash" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/fakewidget" "github.com/mum4k/termdash/linestyle" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/draw" + "github.com/mum4k/termdash/private/draw/testdraw" + "github.com/mum4k/termdash/private/faketerm" + "github.com/mum4k/termdash/private/fakewidget" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/widgetapi" "github.com/mum4k/termdash/widgets/barchart" diff --git a/container/options.go b/container/options.go index ba89364..2d34af4 100644 --- a/container/options.go +++ b/container/options.go @@ -23,8 +23,8 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/linestyle" + "github.com/mum4k/termdash/private/area" "github.com/mum4k/termdash/widgetapi" ) diff --git a/container/traversal_test.go b/container/traversal_test.go index 4100f9b..7cf03fa 100644 --- a/container/traversal_test.go +++ b/container/traversal_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/private/faketerm" ) func TestRoot(t *testing.T) { diff --git a/private/alignfor/alignfor.go b/private/alignfor/alignfor.go index b1bd3a5..93cbac8 100644 --- a/private/alignfor/alignfor.go +++ b/private/alignfor/alignfor.go @@ -21,8 +21,8 @@ import ( "strings" "github.com/mum4k/termdash/align" - "github.com/mum4k/termdash/internal/runewidth" - "github.com/mum4k/termdash/internal/wrap" + "github.com/mum4k/termdash/private/runewidth" + "github.com/mum4k/termdash/private/wrap" ) // hAlign aligns the given area in the rectangle horizontally. diff --git a/private/area/area.go b/private/area/area.go index e9f6ed1..34b21a1 100644 --- a/private/area/area.go +++ b/private/area/area.go @@ -19,7 +19,7 @@ import ( "fmt" "image" - "github.com/mum4k/termdash/internal/numbers" + "github.com/mum4k/termdash/private/numbers" ) // Size returns the size of the provided area. diff --git a/private/canvas/braille/braille.go b/private/canvas/braille/braille.go index b8520e6..7cd902f 100644 --- a/private/canvas/braille/braille.go +++ b/private/canvas/braille/braille.go @@ -46,7 +46,7 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/private/canvas" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/private/canvas/braille/braille_test.go b/private/canvas/braille/braille_test.go index c84199a..c75e63a 100644 --- a/private/canvas/braille/braille_test.go +++ b/private/canvas/braille/braille_test.go @@ -20,10 +20,10 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/faketerm" ) func Example_copiedToCanvas() { diff --git a/private/canvas/braille/testbraille/testbraille.go b/private/canvas/braille/testbraille/testbraille.go index 33512fa..7822c5d 100644 --- a/private/canvas/braille/testbraille/testbraille.go +++ b/private/canvas/braille/testbraille/testbraille.go @@ -20,9 +20,9 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/braille" + "github.com/mum4k/termdash/private/faketerm" ) // MustNew returns a new canvas or panics. diff --git a/private/canvas/buffer/buffer.go b/private/canvas/buffer/buffer.go index ba8c26b..5c21dd0 100644 --- a/private/canvas/buffer/buffer.go +++ b/private/canvas/buffer/buffer.go @@ -20,8 +20,8 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/runewidth" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/runewidth" ) // NewCells breaks the provided text into cells and applies the options. diff --git a/private/canvas/canvas.go b/private/canvas/canvas.go index cb5aa01..65a1e69 100644 --- a/private/canvas/canvas.go +++ b/private/canvas/canvas.go @@ -20,9 +20,9 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/canvas/buffer" - "github.com/mum4k/termdash/internal/runewidth" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/canvas/buffer" + "github.com/mum4k/termdash/private/runewidth" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/private/canvas/canvas_test.go b/private/canvas/canvas_test.go index ea130bc..d7a5e33 100644 --- a/private/canvas/canvas_test.go +++ b/private/canvas/canvas_test.go @@ -20,9 +20,9 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/canvas/buffer" - "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/canvas/buffer" + "github.com/mum4k/termdash/private/faketerm" ) func TestNew(t *testing.T) { diff --git a/private/canvas/testcanvas/testcanvas.go b/private/canvas/testcanvas/testcanvas.go index b7aadf7..280f290 100644 --- a/private/canvas/testcanvas/testcanvas.go +++ b/private/canvas/testcanvas/testcanvas.go @@ -20,9 +20,9 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/buffer" - "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/buffer" + "github.com/mum4k/termdash/private/faketerm" ) // MustNew returns a new canvas or panics. diff --git a/private/draw/border.go b/private/draw/border.go index b97d2c2..a19ec09 100644 --- a/private/draw/border.go +++ b/private/draw/border.go @@ -22,9 +22,9 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/alignfor" - "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/linestyle" + "github.com/mum4k/termdash/private/alignfor" + "github.com/mum4k/termdash/private/canvas" ) // BorderOption is used to provide options to Border(). diff --git a/private/draw/border_test.go b/private/draw/border_test.go index a9d2cc8..07d9d76 100644 --- a/private/draw/border_test.go +++ b/private/draw/border_test.go @@ -20,10 +20,10 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/linestyle" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/faketerm" ) func TestBorder(t *testing.T) { diff --git a/private/draw/braille_circle.go b/private/draw/braille_circle.go index ef7de90..d2b3b86 100644 --- a/private/draw/braille_circle.go +++ b/private/draw/braille_circle.go @@ -21,8 +21,8 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/numbers/trig" + "github.com/mum4k/termdash/private/canvas/braille" + "github.com/mum4k/termdash/private/numbers/trig" ) // BrailleCircleOption is used to provide options to BrailleCircle. diff --git a/private/draw/braille_circle_test.go b/private/draw/braille_circle_test.go index 95fd08e..1a51bad 100644 --- a/private/draw/braille_circle_test.go +++ b/private/draw/braille_circle_test.go @@ -19,10 +19,10 @@ import ( "testing" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/canvas/braille/testbraille" - "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/canvas/braille" + "github.com/mum4k/termdash/private/canvas/braille/testbraille" + "github.com/mum4k/termdash/private/faketerm" ) // mustBrailleLine draws the braille line or panics. diff --git a/private/draw/braille_fill.go b/private/draw/braille_fill.go index 790d06f..8bb311f 100644 --- a/private/draw/braille_fill.go +++ b/private/draw/braille_fill.go @@ -21,7 +21,7 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas/braille" + "github.com/mum4k/termdash/private/canvas/braille" ) // BrailleFillOption is used to provide options to BrailleFill. diff --git a/private/draw/braille_fill_test.go b/private/draw/braille_fill_test.go index e5990b0..db723c2 100644 --- a/private/draw/braille_fill_test.go +++ b/private/draw/braille_fill_test.go @@ -19,10 +19,10 @@ import ( "testing" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/canvas/braille/testbraille" - "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/canvas/braille" + "github.com/mum4k/termdash/private/canvas/braille/testbraille" + "github.com/mum4k/termdash/private/faketerm" ) func TestBrailleFill(t *testing.T) { diff --git a/private/draw/braille_line.go b/private/draw/braille_line.go index fcd5d6b..c9f4123 100644 --- a/private/draw/braille_line.go +++ b/private/draw/braille_line.go @@ -21,8 +21,8 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/numbers" + "github.com/mum4k/termdash/private/canvas/braille" + "github.com/mum4k/termdash/private/numbers" ) // braillePixelChange represents an action on a pixel on the braille canvas. diff --git a/private/draw/braille_line_test.go b/private/draw/braille_line_test.go index cc526f3..3298514 100644 --- a/private/draw/braille_line_test.go +++ b/private/draw/braille_line_test.go @@ -19,10 +19,10 @@ import ( "testing" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/canvas/braille/testbraille" - "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/canvas/braille" + "github.com/mum4k/termdash/private/canvas/braille/testbraille" + "github.com/mum4k/termdash/private/faketerm" ) func TestBrailleLine(t *testing.T) { diff --git a/private/draw/hv_line.go b/private/draw/hv_line.go index 22ea1a8..35318f4 100644 --- a/private/draw/hv_line.go +++ b/private/draw/hv_line.go @@ -21,8 +21,8 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/linestyle" + "github.com/mum4k/termdash/private/canvas" ) // HVLineOption is used to provide options to HVLine(). diff --git a/private/draw/hv_line_graph_test.go b/private/draw/hv_line_graph_test.go index 384ac01..db105d7 100644 --- a/private/draw/hv_line_graph_test.go +++ b/private/draw/hv_line_graph_test.go @@ -20,8 +20,8 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" - "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/linestyle" + "github.com/mum4k/termdash/private/canvas" ) func TestMultiEdgeNodes(t *testing.T) { diff --git a/private/draw/hv_line_test.go b/private/draw/hv_line_test.go index e8dce65..f31d4e9 100644 --- a/private/draw/hv_line_test.go +++ b/private/draw/hv_line_test.go @@ -19,10 +19,10 @@ import ( "testing" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/linestyle" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/faketerm" ) func TestHVLines(t *testing.T) { diff --git a/private/draw/line_style.go b/private/draw/line_style.go index aed26a8..41f1df4 100644 --- a/private/draw/line_style.go +++ b/private/draw/line_style.go @@ -17,8 +17,8 @@ package draw import ( "fmt" - "github.com/mum4k/termdash/internal/runewidth" "github.com/mum4k/termdash/linestyle" + "github.com/mum4k/termdash/private/runewidth" ) // line_style.go contains the Unicode characters used for drawing lines of diff --git a/private/draw/rectangle.go b/private/draw/rectangle.go index 1df54af..cd96ff7 100644 --- a/private/draw/rectangle.go +++ b/private/draw/rectangle.go @@ -21,7 +21,7 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/private/canvas" ) // RectangleOption is used to provide options to the Rectangle function. diff --git a/private/draw/rectangle_test.go b/private/draw/rectangle_test.go index d8b2434..d481f22 100644 --- a/private/draw/rectangle_test.go +++ b/private/draw/rectangle_test.go @@ -19,9 +19,9 @@ import ( "testing" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/faketerm" ) func TestRectangle(t *testing.T) { diff --git a/private/draw/testdraw/testdraw.go b/private/draw/testdraw/testdraw.go index e29f499..e6236e0 100644 --- a/private/draw/testdraw/testdraw.go +++ b/private/draw/testdraw/testdraw.go @@ -19,9 +19,9 @@ import ( "fmt" "image" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/braille" + "github.com/mum4k/termdash/private/draw" ) // MustBorder draws border on the canvas or panics. diff --git a/private/draw/text.go b/private/draw/text.go index 521bbfa..17c4954 100644 --- a/private/draw/text.go +++ b/private/draw/text.go @@ -22,8 +22,8 @@ import ( "strings" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/runewidth" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/runewidth" ) // OverrunMode represents diff --git a/private/draw/text_test.go b/private/draw/text_test.go index a9fa405..b424a22 100644 --- a/private/draw/text_test.go +++ b/private/draw/text_test.go @@ -19,9 +19,9 @@ import ( "testing" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/faketerm" ) func TestTrimText(t *testing.T) { diff --git a/private/draw/vertical_text.go b/private/draw/vertical_text.go index fd206ae..44aadc9 100644 --- a/private/draw/vertical_text.go +++ b/private/draw/vertical_text.go @@ -22,7 +22,7 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/private/canvas" ) // VerticalTextOption is used to provide options to Text(). diff --git a/private/draw/vertical_text_test.go b/private/draw/vertical_text_test.go index bca03de..4144798 100644 --- a/private/draw/vertical_text_test.go +++ b/private/draw/vertical_text_test.go @@ -19,9 +19,9 @@ import ( "testing" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/faketerm" ) func TestVerticalText(t *testing.T) { diff --git a/private/event/event.go b/private/event/event.go index c953c9a..e9ef18d 100644 --- a/private/event/event.go +++ b/private/event/event.go @@ -21,7 +21,7 @@ import ( "reflect" "sync" - "github.com/mum4k/termdash/internal/event/eventqueue" + "github.com/mum4k/termdash/private/event/eventqueue" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/private/event/event_test.go b/private/event/event_test.go index ae8e84d..9219e95 100644 --- a/private/event/event_test.go +++ b/private/event/event_test.go @@ -23,8 +23,8 @@ import ( "time" "github.com/kylelemons/godebug/pretty" - "github.com/mum4k/termdash/internal/event/testevent" "github.com/mum4k/termdash/keyboard" + "github.com/mum4k/termdash/private/event/testevent" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/private/faketerm/faketerm.go b/private/faketerm/faketerm.go index 6d3145b..3677e21 100644 --- a/private/faketerm/faketerm.go +++ b/private/faketerm/faketerm.go @@ -24,8 +24,8 @@ import ( "sync" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas/buffer" - "github.com/mum4k/termdash/internal/event/eventqueue" + "github.com/mum4k/termdash/private/canvas/buffer" + "github.com/mum4k/termdash/private/event/eventqueue" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/private/fakewidget/fakewidget.go b/private/fakewidget/fakewidget.go index dea1a82..5392ace 100644 --- a/private/fakewidget/fakewidget.go +++ b/private/fakewidget/fakewidget.go @@ -21,11 +21,11 @@ import ( "image" "sync" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/keyboard" "github.com/mum4k/termdash/mouse" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/draw" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" ) diff --git a/private/fakewidget/fakewidget_test.go b/private/fakewidget/fakewidget_test.go index ad5553e..223471f 100644 --- a/private/fakewidget/fakewidget_test.go +++ b/private/fakewidget/fakewidget_test.go @@ -19,12 +19,12 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/keyboard" "github.com/mum4k/termdash/mouse" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/draw/testdraw" + "github.com/mum4k/termdash/private/faketerm" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" ) diff --git a/private/numbers/trig/trig.go b/private/numbers/trig/trig.go index 1e908d3..16d179d 100644 --- a/private/numbers/trig/trig.go +++ b/private/numbers/trig/trig.go @@ -21,7 +21,7 @@ import ( "math" "sort" - "github.com/mum4k/termdash/internal/numbers" + "github.com/mum4k/termdash/private/numbers" ) // CirclePointAtAngle given an angle in degrees and a circle midpoint and diff --git a/private/segdisp/dotseg/attributes.go b/private/segdisp/dotseg/attributes.go index 3ab2148..dd8d294 100644 --- a/private/segdisp/dotseg/attributes.go +++ b/private/segdisp/dotseg/attributes.go @@ -23,10 +23,10 @@ import ( "math" "github.com/mum4k/termdash/align" - "github.com/mum4k/termdash/internal/alignfor" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/segdisp" - "github.com/mum4k/termdash/internal/segdisp/sixteen" + "github.com/mum4k/termdash/private/alignfor" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/segdisp" + "github.com/mum4k/termdash/private/segdisp/sixteen" ) // attributes contains attributes needed to draw the segment display. diff --git a/private/segdisp/dotseg/dotseg.go b/private/segdisp/dotseg/dotseg.go index 2605c5b..2d603e2 100644 --- a/private/segdisp/dotseg/dotseg.go +++ b/private/segdisp/dotseg/dotseg.go @@ -42,9 +42,9 @@ import ( "strings" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/segdisp" - "github.com/mum4k/termdash/internal/segdisp/segment" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/segdisp" + "github.com/mum4k/termdash/private/segdisp/segment" ) // Segment represents a single segment in the display. diff --git a/private/segdisp/dotseg/dotseg_test.go b/private/segdisp/dotseg/dotseg_test.go index 2537e77..6ed319b 100644 --- a/private/segdisp/dotseg/dotseg_test.go +++ b/private/segdisp/dotseg/dotseg_test.go @@ -21,14 +21,14 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/braille/testbraille" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/segdisp" - "github.com/mum4k/termdash/internal/segdisp/segment" - "github.com/mum4k/termdash/internal/segdisp/segment/testsegment" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/braille/testbraille" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/faketerm" + "github.com/mum4k/termdash/private/segdisp" + "github.com/mum4k/termdash/private/segdisp/segment" + "github.com/mum4k/termdash/private/segdisp/segment/testsegment" ) func TestSegmentString(t *testing.T) { diff --git a/private/segdisp/dotseg/testdotseg/testdotseg.go b/private/segdisp/dotseg/testdotseg/testdotseg.go index 9324f21..7601b95 100644 --- a/private/segdisp/dotseg/testdotseg/testdotseg.go +++ b/private/segdisp/dotseg/testdotseg/testdotseg.go @@ -18,8 +18,8 @@ package testdotseg import ( "fmt" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/segdisp/dotseg" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/segdisp/dotseg" ) // MustSetCharacter sets the character on the display or panics. diff --git a/private/segdisp/segdisp.go b/private/segdisp/segdisp.go index 65f405f..71c6c17 100644 --- a/private/segdisp/segdisp.go +++ b/private/segdisp/segdisp.go @@ -20,9 +20,9 @@ import ( "image" "math" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/braille" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/braille" ) // Minimum valid size of a cell canvas in order to draw a segment display. diff --git a/private/segdisp/segdisp_test.go b/private/segdisp/segdisp_test.go index 1fa5e3b..f31d3c8 100644 --- a/private/segdisp/segdisp_test.go +++ b/private/segdisp/segdisp_test.go @@ -19,9 +19,9 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/canvas/braille/testbraille" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/braille" + "github.com/mum4k/termdash/private/canvas/braille/testbraille" ) func TestRequired(t *testing.T) { diff --git a/private/segdisp/segment/segment.go b/private/segdisp/segment/segment.go index 2d4553b..37e4f1f 100644 --- a/private/segdisp/segment/segment.go +++ b/private/segdisp/segment/segment.go @@ -20,8 +20,8 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/private/canvas/braille" + "github.com/mum4k/termdash/private/draw" ) // Type identifies the type of the segment that is drawn. diff --git a/private/segdisp/segment/segment_test.go b/private/segdisp/segment/segment_test.go index 012cffd..28ea6ce 100644 --- a/private/segdisp/segment/segment_test.go +++ b/private/segdisp/segment/segment_test.go @@ -20,12 +20,12 @@ import ( "testing" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/canvas/braille/testbraille" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/canvas/braille" + "github.com/mum4k/termdash/private/canvas/braille/testbraille" + "github.com/mum4k/termdash/private/draw" + "github.com/mum4k/termdash/private/draw/testdraw" + "github.com/mum4k/termdash/private/faketerm" ) func TestHV(t *testing.T) { diff --git a/private/segdisp/segment/testsegment/testsegment.go b/private/segdisp/segment/testsegment/testsegment.go index d8a2b35..1941e14 100644 --- a/private/segdisp/segment/testsegment/testsegment.go +++ b/private/segdisp/segment/testsegment/testsegment.go @@ -19,8 +19,8 @@ import ( "fmt" "image" - "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/segdisp/segment" + "github.com/mum4k/termdash/private/canvas/braille" + "github.com/mum4k/termdash/private/segdisp/segment" ) // MustHV draws the segment or panics. diff --git a/private/segdisp/sixteen/attributes.go b/private/segdisp/sixteen/attributes.go index 39d8e02..cb0fe32 100644 --- a/private/segdisp/sixteen/attributes.go +++ b/private/segdisp/sixteen/attributes.go @@ -22,9 +22,9 @@ import ( "image" "math" - "github.com/mum4k/termdash/internal/numbers" - "github.com/mum4k/termdash/internal/segdisp" - "github.com/mum4k/termdash/internal/segdisp/segment" + "github.com/mum4k/termdash/private/numbers" + "github.com/mum4k/termdash/private/segdisp" + "github.com/mum4k/termdash/private/segdisp/segment" ) // hvSegType maps horizontal and vertical segments to their type. diff --git a/private/segdisp/sixteen/sixteen.go b/private/segdisp/sixteen/sixteen.go index 5c4dae4..2013f7f 100644 --- a/private/segdisp/sixteen/sixteen.go +++ b/private/segdisp/sixteen/sixteen.go @@ -44,9 +44,9 @@ import ( "strings" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/segdisp" - "github.com/mum4k/termdash/internal/segdisp/segment" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/segdisp" + "github.com/mum4k/termdash/private/segdisp/segment" ) // Segment represents a single segment in the display. diff --git a/private/segdisp/sixteen/sixteen_test.go b/private/segdisp/sixteen/sixteen_test.go index d416b3b..1f7ccc8 100644 --- a/private/segdisp/sixteen/sixteen_test.go +++ b/private/segdisp/sixteen/sixteen_test.go @@ -21,14 +21,14 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/braille/testbraille" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/segdisp" - "github.com/mum4k/termdash/internal/segdisp/segment" - "github.com/mum4k/termdash/internal/segdisp/segment/testsegment" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/braille/testbraille" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/faketerm" + "github.com/mum4k/termdash/private/segdisp" + "github.com/mum4k/termdash/private/segdisp/segment" + "github.com/mum4k/termdash/private/segdisp/segment/testsegment" ) func TestDraw(t *testing.T) { diff --git a/private/segdisp/sixteen/testsixteen/testsixteen.go b/private/segdisp/sixteen/testsixteen/testsixteen.go index a9be809..48a70a5 100644 --- a/private/segdisp/sixteen/testsixteen/testsixteen.go +++ b/private/segdisp/sixteen/testsixteen/testsixteen.go @@ -18,8 +18,8 @@ package testsixteen import ( "fmt" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/segdisp/sixteen" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/segdisp/sixteen" ) // MustSetCharacter sets the character on the display or panics. diff --git a/private/wrap/wrap.go b/private/wrap/wrap.go index 2b6f62a..5ee78a7 100644 --- a/private/wrap/wrap.go +++ b/private/wrap/wrap.go @@ -21,8 +21,8 @@ import ( "strings" "unicode" - "github.com/mum4k/termdash/internal/canvas/buffer" - "github.com/mum4k/termdash/internal/runewidth" + "github.com/mum4k/termdash/private/canvas/buffer" + "github.com/mum4k/termdash/private/runewidth" ) // Mode sets the wrapping mode. diff --git a/private/wrap/wrap_test.go b/private/wrap/wrap_test.go index da712f8..b015135 100644 --- a/private/wrap/wrap_test.go +++ b/private/wrap/wrap_test.go @@ -22,7 +22,7 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas/buffer" + "github.com/mum4k/termdash/private/canvas/buffer" ) func TestValidTextAndCells(t *testing.T) { diff --git a/termdash.go b/termdash.go index 2376278..8103ee7 100644 --- a/termdash.go +++ b/termdash.go @@ -31,7 +31,7 @@ import ( "time" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/event" + "github.com/mum4k/termdash/private/event" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/termdash_test.go b/termdash_test.go index a2a4534..7be6a7d 100644 --- a/termdash_test.go +++ b/termdash_test.go @@ -24,14 +24,14 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/event" - "github.com/mum4k/termdash/internal/event/eventqueue" - "github.com/mum4k/termdash/internal/event/testevent" - "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/fakewidget" "github.com/mum4k/termdash/keyboard" "github.com/mum4k/termdash/mouse" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/event" + "github.com/mum4k/termdash/private/event/eventqueue" + "github.com/mum4k/termdash/private/event/testevent" + "github.com/mum4k/termdash/private/faketerm" + "github.com/mum4k/termdash/private/fakewidget" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" diff --git a/terminal/tcell/tcell.go b/terminal/tcell/tcell.go index 6177202..048453f 100644 --- a/terminal/tcell/tcell.go +++ b/terminal/tcell/tcell.go @@ -21,7 +21,7 @@ import ( "github.com/gdamore/tcell" "github.com/gdamore/tcell/encoding" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/event/eventqueue" + "github.com/mum4k/termdash/private/event/eventqueue" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/terminal/termbox/termbox.go b/terminal/termbox/termbox.go index 6edb104..4329e46 100644 --- a/terminal/termbox/termbox.go +++ b/terminal/termbox/termbox.go @@ -20,7 +20,7 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/event/eventqueue" + "github.com/mum4k/termdash/private/event/eventqueue" "github.com/mum4k/termdash/terminal/terminalapi" tbx "github.com/nsf/termbox-go" ) diff --git a/widgetapi/widgetapi.go b/widgetapi/widgetapi.go index fc4df78..ee27136 100644 --- a/widgetapi/widgetapi.go +++ b/widgetapi/widgetapi.go @@ -18,7 +18,7 @@ package widgetapi import ( "image" - "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/private/canvas" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/widgets/barchart/barchart.go b/widgets/barchart/barchart.go index 2bf4d46..413d3e2 100644 --- a/widgets/barchart/barchart.go +++ b/widgets/barchart/barchart.go @@ -25,10 +25,10 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/alignfor" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/private/alignfor" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/draw" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" ) diff --git a/widgets/barchart/barchart_test.go b/widgets/barchart/barchart_test.go index 9bc4782..71b9d55 100644 --- a/widgets/barchart/barchart_test.go +++ b/widgets/barchart/barchart_test.go @@ -20,11 +20,11 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/draw" + "github.com/mum4k/termdash/private/draw/testdraw" + "github.com/mum4k/termdash/private/faketerm" "github.com/mum4k/termdash/widgetapi" ) diff --git a/widgets/barchart/options.go b/widgets/barchart/options.go index 3806132..f5468f8 100644 --- a/widgets/barchart/options.go +++ b/widgets/barchart/options.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/private/draw" ) // Option is used to provide options. diff --git a/widgets/button/button.go b/widgets/button/button.go index beaf5ca..d0c848f 100644 --- a/widgets/button/button.go +++ b/widgets/button/button.go @@ -24,11 +24,11 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/alignfor" - "github.com/mum4k/termdash/internal/button" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/mouse" + "github.com/mum4k/termdash/private/alignfor" + "github.com/mum4k/termdash/private/button" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/draw" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" ) diff --git a/widgets/button/button_test.go b/widgets/button/button_test.go index 0d8fee6..20721b7 100644 --- a/widgets/button/button_test.go +++ b/widgets/button/button_test.go @@ -23,13 +23,13 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/keyboard" "github.com/mum4k/termdash/mouse" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/draw" + "github.com/mum4k/termdash/private/draw/testdraw" + "github.com/mum4k/termdash/private/faketerm" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" ) diff --git a/widgets/button/options.go b/widgets/button/options.go index c671e43..2226bce 100644 --- a/widgets/button/options.go +++ b/widgets/button/options.go @@ -21,8 +21,8 @@ import ( "time" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/runewidth" "github.com/mum4k/termdash/keyboard" + "github.com/mum4k/termdash/private/runewidth" "github.com/mum4k/termdash/widgetapi" ) diff --git a/widgets/donut/circle.go b/widgets/donut/circle.go index 780a716..302d93a 100644 --- a/widgets/donut/circle.go +++ b/widgets/donut/circle.go @@ -20,7 +20,7 @@ import ( "image" "math" - "github.com/mum4k/termdash/internal/canvas/braille" + "github.com/mum4k/termdash/private/canvas/braille" ) // startEndAngles given progress indicators and the desired start angle and diff --git a/widgets/donut/donut.go b/widgets/donut/donut.go index 4c7476a..52c2fbf 100644 --- a/widgets/donut/donut.go +++ b/widgets/donut/donut.go @@ -24,12 +24,12 @@ import ( "sync" "github.com/mum4k/termdash/align" - "github.com/mum4k/termdash/internal/alignfor" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/runewidth" + "github.com/mum4k/termdash/private/alignfor" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/braille" + "github.com/mum4k/termdash/private/draw" + "github.com/mum4k/termdash/private/runewidth" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" ) diff --git a/widgets/donut/donut_test.go b/widgets/donut/donut_test.go index 84e2325..bdb0d50 100644 --- a/widgets/donut/donut_test.go +++ b/widgets/donut/donut_test.go @@ -21,12 +21,12 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/braille/testbraille" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/braille/testbraille" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/draw" + "github.com/mum4k/termdash/private/draw/testdraw" + "github.com/mum4k/termdash/private/faketerm" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" ) diff --git a/widgets/gauge/gauge.go b/widgets/gauge/gauge.go index bc3e92a..fd7f852 100644 --- a/widgets/gauge/gauge.go +++ b/widgets/gauge/gauge.go @@ -23,12 +23,12 @@ import ( "sync" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/alignfor" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/runewidth" "github.com/mum4k/termdash/linestyle" + "github.com/mum4k/termdash/private/alignfor" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/draw" + "github.com/mum4k/termdash/private/runewidth" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" ) diff --git a/widgets/gauge/gauge_test.go b/widgets/gauge/gauge_test.go index ec80ca5..ac6331d 100644 --- a/widgets/gauge/gauge_test.go +++ b/widgets/gauge/gauge_test.go @@ -22,12 +22,12 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/linestyle" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/draw" + "github.com/mum4k/termdash/private/draw/testdraw" + "github.com/mum4k/termdash/private/faketerm" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" ) diff --git a/widgets/gauge/options.go b/widgets/gauge/options.go index 62f1e43..0540abb 100644 --- a/widgets/gauge/options.go +++ b/widgets/gauge/options.go @@ -21,8 +21,8 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/linestyle" + "github.com/mum4k/termdash/private/draw" ) // Option is used to provide options. diff --git a/widgets/linechart/internal/axes/axes.go b/widgets/linechart/internal/axes/axes.go index de9ce53..d2dbbd4 100644 --- a/widgets/linechart/internal/axes/axes.go +++ b/widgets/linechart/internal/axes/axes.go @@ -19,7 +19,7 @@ import ( "fmt" "image" - "github.com/mum4k/termdash/internal/runewidth" + "github.com/mum4k/termdash/private/runewidth" ) const ( diff --git a/widgets/linechart/internal/axes/label.go b/widgets/linechart/internal/axes/label.go index 46e6888..5b0b496 100644 --- a/widgets/linechart/internal/axes/label.go +++ b/widgets/linechart/internal/axes/label.go @@ -21,7 +21,7 @@ import ( "image" "github.com/mum4k/termdash/align" - "github.com/mum4k/termdash/internal/alignfor" + "github.com/mum4k/termdash/private/alignfor" ) // LabelOrientation represents the orientation of text labels. diff --git a/widgets/linechart/internal/axes/scale.go b/widgets/linechart/internal/axes/scale.go index 1a144ab..f193aae 100644 --- a/widgets/linechart/internal/axes/scale.go +++ b/widgets/linechart/internal/axes/scale.go @@ -20,7 +20,7 @@ import ( "fmt" "math" - "github.com/mum4k/termdash/internal/canvas/braille" + "github.com/mum4k/termdash/private/canvas/braille" ) // YScaleMode determines whether the Y scale is anchored to the zero value. diff --git a/widgets/linechart/internal/axes/value.go b/widgets/linechart/internal/axes/value.go index dea08b3..158d53c 100644 --- a/widgets/linechart/internal/axes/value.go +++ b/widgets/linechart/internal/axes/value.go @@ -20,7 +20,7 @@ import ( "fmt" "math" - "github.com/mum4k/termdash/internal/numbers" + "github.com/mum4k/termdash/private/numbers" ) // ValueOption is used to provide options to the NewValue function. diff --git a/widgets/linechart/internal/zoom/zoom.go b/widgets/linechart/internal/zoom/zoom.go index bcde567..5b42d58 100644 --- a/widgets/linechart/internal/zoom/zoom.go +++ b/widgets/linechart/internal/zoom/zoom.go @@ -20,9 +20,9 @@ import ( "image" "reflect" - "github.com/mum4k/termdash/internal/button" - "github.com/mum4k/termdash/internal/numbers" "github.com/mum4k/termdash/mouse" + "github.com/mum4k/termdash/private/button" + "github.com/mum4k/termdash/private/numbers" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/linechart/internal/axes" ) diff --git a/widgets/linechart/linechart.go b/widgets/linechart/linechart.go index 62afc9e..0a4f83d 100644 --- a/widgets/linechart/linechart.go +++ b/widgets/linechart/linechart.go @@ -24,11 +24,11 @@ import ( "sync" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/numbers" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/braille" + "github.com/mum4k/termdash/private/draw" + "github.com/mum4k/termdash/private/numbers" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" "github.com/mum4k/termdash/widgets/linechart/internal/axes" diff --git a/widgets/linechart/linechart_test.go b/widgets/linechart/linechart_test.go index b04fc08..6c6ad63 100644 --- a/widgets/linechart/linechart_test.go +++ b/widgets/linechart/linechart_test.go @@ -22,13 +22,13 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/braille/testbraille" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/mouse" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/braille/testbraille" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/draw" + "github.com/mum4k/termdash/private/draw/testdraw" + "github.com/mum4k/termdash/private/faketerm" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" ) diff --git a/widgets/segmentdisplay/segment_area.go b/widgets/segmentdisplay/segment_area.go index aa135c3..1357bd3 100644 --- a/widgets/segmentdisplay/segment_area.go +++ b/widgets/segmentdisplay/segment_area.go @@ -21,7 +21,7 @@ import ( "fmt" "image" - "github.com/mum4k/termdash/internal/segdisp" + "github.com/mum4k/termdash/private/segdisp" ) // segArea contains information about the area that will contain the segments. diff --git a/widgets/segmentdisplay/segmentdisplay.go b/widgets/segmentdisplay/segmentdisplay.go index e0c09a8..ed6b750 100644 --- a/widgets/segmentdisplay/segmentdisplay.go +++ b/widgets/segmentdisplay/segmentdisplay.go @@ -23,12 +23,12 @@ import ( "strings" "sync" - "github.com/mum4k/termdash/internal/alignfor" - "github.com/mum4k/termdash/internal/attrrange" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/segdisp" - "github.com/mum4k/termdash/internal/segdisp/dotseg" - "github.com/mum4k/termdash/internal/segdisp/sixteen" + "github.com/mum4k/termdash/private/alignfor" + "github.com/mum4k/termdash/private/attrrange" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/segdisp" + "github.com/mum4k/termdash/private/segdisp/dotseg" + "github.com/mum4k/termdash/private/segdisp/sixteen" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" ) diff --git a/widgets/segmentdisplay/segmentdisplay_test.go b/widgets/segmentdisplay/segmentdisplay_test.go index d23b13a..b2dcbf6 100644 --- a/widgets/segmentdisplay/segmentdisplay_test.go +++ b/widgets/segmentdisplay/segmentdisplay_test.go @@ -21,14 +21,14 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/segdisp" - "github.com/mum4k/termdash/internal/segdisp/dotseg" - "github.com/mum4k/termdash/internal/segdisp/dotseg/testdotseg" - "github.com/mum4k/termdash/internal/segdisp/sixteen" - "github.com/mum4k/termdash/internal/segdisp/sixteen/testsixteen" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/faketerm" + "github.com/mum4k/termdash/private/segdisp" + "github.com/mum4k/termdash/private/segdisp/dotseg" + "github.com/mum4k/termdash/private/segdisp/dotseg/testdotseg" + "github.com/mum4k/termdash/private/segdisp/sixteen" + "github.com/mum4k/termdash/private/segdisp/sixteen/testsixteen" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" ) diff --git a/widgets/sparkline/sparkline.go b/widgets/sparkline/sparkline.go index 36cfb9d..117248c 100644 --- a/widgets/sparkline/sparkline.go +++ b/widgets/sparkline/sparkline.go @@ -22,9 +22,9 @@ import ( "sync" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/draw" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" ) diff --git a/widgets/sparkline/sparkline_test.go b/widgets/sparkline/sparkline_test.go index efb57e3..8fff4e7 100644 --- a/widgets/sparkline/sparkline_test.go +++ b/widgets/sparkline/sparkline_test.go @@ -20,11 +20,11 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/draw" + "github.com/mum4k/termdash/private/draw/testdraw" + "github.com/mum4k/termdash/private/faketerm" "github.com/mum4k/termdash/widgetapi" ) diff --git a/widgets/sparkline/sparks.go b/widgets/sparkline/sparks.go index 029478d..4dbbe8c 100644 --- a/widgets/sparkline/sparks.go +++ b/widgets/sparkline/sparks.go @@ -21,7 +21,7 @@ import ( "fmt" "math" - "github.com/mum4k/termdash/internal/runewidth" + "github.com/mum4k/termdash/private/runewidth" ) // sparks are the characters used to draw the SparkLine. diff --git a/widgets/text/line_trim.go b/widgets/text/line_trim.go index 29ab983..6ca8c83 100644 --- a/widgets/text/line_trim.go +++ b/widgets/text/line_trim.go @@ -18,9 +18,9 @@ import ( "fmt" "image" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/runewidth" - "github.com/mum4k/termdash/internal/wrap" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/runewidth" + "github.com/mum4k/termdash/private/wrap" ) // line_trim.go contains code that trims lines that are too long. diff --git a/widgets/text/line_trim_test.go b/widgets/text/line_trim_test.go index 3a0b864..92ec806 100644 --- a/widgets/text/line_trim_test.go +++ b/widgets/text/line_trim_test.go @@ -19,11 +19,11 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/wrap" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/draw/testdraw" + "github.com/mum4k/termdash/private/faketerm" + "github.com/mum4k/termdash/private/wrap" ) func TestLineTrim(t *testing.T) { diff --git a/widgets/text/options.go b/widgets/text/options.go index 0933170..b91cec8 100644 --- a/widgets/text/options.go +++ b/widgets/text/options.go @@ -17,9 +17,9 @@ package text import ( "fmt" - "github.com/mum4k/termdash/internal/wrap" "github.com/mum4k/termdash/keyboard" "github.com/mum4k/termdash/mouse" + "github.com/mum4k/termdash/private/wrap" ) // options.go contains configurable options for Text. diff --git a/widgets/text/text.go b/widgets/text/text.go index 0ae5f8c..0712cbc 100644 --- a/widgets/text/text.go +++ b/widgets/text/text.go @@ -20,9 +20,9 @@ import ( "image" "sync" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/buffer" - "github.com/mum4k/termdash/internal/wrap" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/buffer" + "github.com/mum4k/termdash/private/wrap" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" ) diff --git a/widgets/text/text_test.go b/widgets/text/text_test.go index 461d979..784db8d 100644 --- a/widgets/text/text_test.go +++ b/widgets/text/text_test.go @@ -20,13 +20,13 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/keyboard" "github.com/mum4k/termdash/mouse" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/draw" + "github.com/mum4k/termdash/private/draw/testdraw" + "github.com/mum4k/termdash/private/faketerm" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" ) diff --git a/widgets/textinput/editor.go b/widgets/textinput/editor.go index 2977561..8df4d76 100644 --- a/widgets/textinput/editor.go +++ b/widgets/textinput/editor.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/mum4k/termdash/internal/numbers" - "github.com/mum4k/termdash/internal/runewidth" + "github.com/mum4k/termdash/private/numbers" + "github.com/mum4k/termdash/private/runewidth" ) // fieldData are the data currently present inside the text input field. diff --git a/widgets/textinput/options.go b/widgets/textinput/options.go index b170b24..915fe9a 100644 --- a/widgets/textinput/options.go +++ b/widgets/textinput/options.go @@ -21,9 +21,9 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/runewidth" - "github.com/mum4k/termdash/internal/wrap" "github.com/mum4k/termdash/linestyle" + "github.com/mum4k/termdash/private/runewidth" + "github.com/mum4k/termdash/private/wrap" ) // Option is used to provide options. diff --git a/widgets/textinput/textinput.go b/widgets/textinput/textinput.go index 2f769d7..13f7bee 100644 --- a/widgets/textinput/textinput.go +++ b/widgets/textinput/textinput.go @@ -22,15 +22,15 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/alignfor" - "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/runewidth" - "github.com/mum4k/termdash/internal/wrap" "github.com/mum4k/termdash/keyboard" "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/mouse" + "github.com/mum4k/termdash/private/alignfor" + "github.com/mum4k/termdash/private/area" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/draw" + "github.com/mum4k/termdash/private/runewidth" + "github.com/mum4k/termdash/private/wrap" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" ) diff --git a/widgets/textinput/textinput_test.go b/widgets/textinput/textinput_test.go index 2eb9124..1af333e 100644 --- a/widgets/textinput/textinput_test.go +++ b/widgets/textinput/textinput_test.go @@ -23,14 +23,14 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/keyboard" "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/mouse" + "github.com/mum4k/termdash/private/canvas" + "github.com/mum4k/termdash/private/canvas/testcanvas" + "github.com/mum4k/termdash/private/draw" + "github.com/mum4k/termdash/private/draw/testdraw" + "github.com/mum4k/termdash/private/faketerm" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" )