From 01928a50329c45162b482beaf7d52eb4496bda3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20Fo=C5=A1n=C3=A1r?= Date: Mon, 30 Jan 2023 12:06:54 +0100 Subject: [PATCH] review fixes --- d2renderers/d2sketch/sketch.go | 82 ++++---- d2renderers/d2sketch/sketch_test.go | 3 +- .../testdata/all_shapes/sketch.exp.svg | 19 +- .../d2sketch/testdata/animated/sketch.exp.svg | 19 +- .../testdata/arrowheads/sketch.exp.svg | 19 +- .../d2sketch/testdata/basic/sketch.exp.svg | 19 +- .../testdata/child_to_child/sketch.exp.svg | 19 +- .../d2sketch/testdata/class/sketch.exp.svg | 19 +- .../testdata/connection_label/sketch.exp.svg | 19 +- .../d2sketch/testdata/opacity/sketch.exp.svg | 19 +- .../d2sketch/testdata/overlay/sketch.exp.svg | 35 ++-- .../testdata/sql_tables/sketch.exp.svg | 19 +- .../d2sketch/testdata/twitter/sketch.exp.svg | 29 +-- d2renderers/d2svg/appendix/appendix_test.go | 3 +- .../diagram_wider_than_tooltip/sketch.exp.svg | 21 +-- .../appendix/testdata/links/sketch.exp.svg | 19 +- .../tooltip_wider_than_diagram/sketch.exp.svg | 19 +- d2renderers/d2svg/class.go | 14 +- d2renderers/d2svg/d2svg.go | 177 ++++++++++++------ .../d2svg/dark_theme/dark_theme_test.go | 3 +- .../testdata/all_shapes/dark_theme.exp.svg | 21 +-- .../testdata/animated/dark_theme.exp.svg | 21 +-- .../testdata/arrowheads/dark_theme.exp.svg | 21 +-- .../testdata/basic/dark_theme.exp.svg | 21 +-- .../child_to_child/dark_theme.exp.svg | 21 +-- .../testdata/class/dark_theme.exp.svg | 21 +-- .../connection_label/dark_theme.exp.svg | 21 +-- .../testdata/opacity/dark_theme.exp.svg | 21 +-- .../testdata/overlay/dark_theme.exp.svg | 21 +-- .../testdata/sql_tables/dark_theme.exp.svg | 21 +-- .../testdata/twitter/dark_theme.exp.svg | 23 +-- d2renderers/d2svg/style.css | 17 -- d2renderers/d2svg/table.go | 14 +- d2themes/d2themes.go | 14 +- d2themes/d2themescatalog/catalog.go | 2 +- .../d2themescatalog/catppuccin_mocha_mauve.go | 25 --- d2themes/d2themescatalog/dark_mauve.go | 25 +++ docs/examples/lib/1-d2lib/d2lib.go | 3 +- docs/examples/lib/3-lowlevel/lowlevel.go | 3 +- e2etests/e2e_test.go | 3 +- .../measured/empty-class/dagre/sketch.exp.svg | 19 +- .../measured/empty-shape/dagre/sketch.exp.svg | 19 +- .../empty-sql_table/dagre/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../dagre_broken_arrowhead/elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../dagre_special_ids/dagre/sketch.exp.svg | 19 +- .../dagre_special_ids/elk/sketch.exp.svg | 19 +- .../elk_alignment/dagre/sketch.exp.svg | 19 +- .../elk_alignment/elk/sketch.exp.svg | 19 +- .../dagre/board.exp.json | 2 + .../dagre/sketch.exp.svg | 21 +-- .../elk/board.exp.json | 2 + .../elk/sketch.exp.svg | 21 +-- .../elk_loop_panic/dagre/sketch.exp.svg | 19 +- .../elk_loop_panic/elk/sketch.exp.svg | 19 +- .../regression/elk_order/dagre/sketch.exp.svg | 19 +- .../regression/elk_order/elk/sketch.exp.svg | 19 +- .../empty_sequence/dagre/sketch.exp.svg | 19 +- .../empty_sequence/elk/sketch.exp.svg | 19 +- .../md_h1_li_li/dagre/sketch.exp.svg | 19 +- .../regression/md_h1_li_li/elk/sketch.exp.svg | 19 +- .../regression/no-lexer/dagre/sketch.exp.svg | 19 +- .../regression/no-lexer/elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../opacity-on-label/dagre/sketch.exp.svg | 19 +- .../opacity-on-label/elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../overlapping-edge-label/elk/sketch.exp.svg | 19 +- .../query_param_escape/dagre/board.exp.json | 1 + .../query_param_escape/dagre/sketch.exp.svg | 21 +-- .../query_param_escape/elk/board.exp.json | 1 + .../query_param_escape/elk/sketch.exp.svg | 21 +-- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../sql_table_overflow/dagre/sketch.exp.svg | 19 +- .../sql_table_overflow/elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../sanity/1_to_2/dagre/sketch.exp.svg | 19 +- .../testdata/sanity/1_to_2/elk/sketch.exp.svg | 19 +- .../sanity/basic/dagre/sketch.exp.svg | 19 +- .../testdata/sanity/basic/elk/sketch.exp.svg | 19 +- .../child_to_child/dagre/sketch.exp.svg | 19 +- .../sanity/child_to_child/elk/sketch.exp.svg | 19 +- .../connection_label/dagre/sketch.exp.svg | 19 +- .../connection_label/elk/sketch.exp.svg | 19 +- .../sanity/empty/dagre/sketch.exp.svg | 19 +- .../testdata/sanity/empty/elk/sketch.exp.svg | 19 +- .../stable/all_shapes/dagre/sketch.exp.svg | 19 +- .../stable/all_shapes/elk/sketch.exp.svg | 19 +- .../all_shapes_multiple/dagre/sketch.exp.svg | 19 +- .../all_shapes_multiple/elk/sketch.exp.svg | 19 +- .../all_shapes_shadow/dagre/sketch.exp.svg | 19 +- .../all_shapes_shadow/elk/sketch.exp.svg | 19 +- .../stable/animated/dagre/sketch.exp.svg | 19 +- .../stable/animated/elk/sketch.exp.svg | 19 +- .../arrowhead_adjustment/dagre/sketch.exp.svg | 19 +- .../arrowhead_adjustment/elk/sketch.exp.svg | 19 +- .../arrowhead_labels/dagre/sketch.exp.svg | 19 +- .../arrowhead_labels/elk/sketch.exp.svg | 19 +- .../stable/binary_tree/dagre/sketch.exp.svg | 19 +- .../stable/binary_tree/elk/sketch.exp.svg | 19 +- .../stable/border-radius/dagre/sketch.exp.svg | 19 +- .../stable/border-radius/elk/sketch.exp.svg | 19 +- .../stable/chaos1/dagre/sketch.exp.svg | 19 +- .../testdata/stable/chaos1/elk/sketch.exp.svg | 19 +- .../stable/chaos2/dagre/sketch.exp.svg | 19 +- .../testdata/stable/chaos2/elk/sketch.exp.svg | 19 +- .../child_parent_edges/dagre/sketch.exp.svg | 19 +- .../child_parent_edges/elk/sketch.exp.svg | 19 +- .../circle_arrowhead/dagre/sketch.exp.svg | 19 +- .../circle_arrowhead/elk/sketch.exp.svg | 19 +- .../circular_dependency/dagre/sketch.exp.svg | 19 +- .../circular_dependency/elk/sketch.exp.svg | 19 +- .../stable/class/dagre/sketch.exp.svg | 19 +- .../testdata/stable/class/elk/sketch.exp.svg | 19 +- .../stable/code_snippet/dagre/sketch.exp.svg | 19 +- .../stable/code_snippet/elk/sketch.exp.svg | 19 +- .../connected_container/dagre/sketch.exp.svg | 19 +- .../connected_container/elk/sketch.exp.svg | 19 +- .../constant_near_stress/dagre/sketch.exp.svg | 19 +- .../constant_near_stress/elk/sketch.exp.svg | 19 +- .../constant_near_title/dagre/sketch.exp.svg | 19 +- .../constant_near_title/elk/sketch.exp.svg | 19 +- .../container_edges/dagre/sketch.exp.svg | 19 +- .../stable/container_edges/elk/sketch.exp.svg | 19 +- .../crow_foot_arrowhead/dagre/sketch.exp.svg | 19 +- .../crow_foot_arrowhead/elk/sketch.exp.svg | 19 +- .../stable/dense/dagre/sketch.exp.svg | 19 +- .../testdata/stable/dense/elk/sketch.exp.svg | 19 +- .../different_subgraphs/dagre/sketch.exp.svg | 19 +- .../different_subgraphs/elk/sketch.exp.svg | 19 +- .../stable/direction/dagre/sketch.exp.svg | 19 +- .../stable/direction/elk/sketch.exp.svg | 19 +- .../stable/font_colors/dagre/sketch.exp.svg | 19 +- .../stable/font_colors/elk/sketch.exp.svg | 19 +- .../stable/font_sizes/dagre/sketch.exp.svg | 19 +- .../stable/font_sizes/elk/sketch.exp.svg | 19 +- .../giant_markdown_test/dagre/sketch.exp.svg | 19 +- .../giant_markdown_test/elk/sketch.exp.svg | 19 +- .../testdata/stable/hr/dagre/sketch.exp.svg | 19 +- .../testdata/stable/hr/elk/sketch.exp.svg | 19 +- .../stable/icon-label/dagre/board.exp.json | 1 + .../stable/icon-label/dagre/sketch.exp.svg | 21 +-- .../stable/icon-label/elk/board.exp.json | 1 + .../stable/icon-label/elk/sketch.exp.svg | 21 +-- .../stable/images/dagre/board.exp.json | 2 + .../stable/images/dagre/sketch.exp.svg | 21 +-- .../testdata/stable/images/elk/board.exp.json | 2 + .../testdata/stable/images/elk/sketch.exp.svg | 21 +-- .../stable/investigate/dagre/board.exp.json | 2 + .../stable/investigate/dagre/sketch.exp.svg | 21 +-- .../stable/investigate/elk/board.exp.json | 2 + .../stable/investigate/elk/sketch.exp.svg | 21 +-- .../stable/large_arch/dagre/sketch.exp.svg | 19 +- .../stable/large_arch/elk/sketch.exp.svg | 19 +- .../stable/latex/dagre/sketch.exp.svg | 19 +- .../testdata/stable/latex/elk/sketch.exp.svg | 19 +- .../testdata/stable/li1/dagre/sketch.exp.svg | 19 +- .../testdata/stable/li1/elk/sketch.exp.svg | 19 +- .../testdata/stable/li2/dagre/sketch.exp.svg | 19 +- .../testdata/stable/li2/elk/sketch.exp.svg | 19 +- .../testdata/stable/li3/dagre/sketch.exp.svg | 19 +- .../testdata/stable/li3/elk/sketch.exp.svg | 19 +- .../testdata/stable/li4/dagre/sketch.exp.svg | 19 +- .../testdata/stable/li4/elk/sketch.exp.svg | 19 +- .../stable/links/dagre/sketch.exp.svg | 19 +- .../testdata/stable/links/elk/sketch.exp.svg | 19 +- .../stable/lone_h1/dagre/sketch.exp.svg | 19 +- .../stable/lone_h1/elk/sketch.exp.svg | 19 +- .../stable/markdown/dagre/sketch.exp.svg | 19 +- .../stable/markdown/elk/sketch.exp.svg | 19 +- .../markdown_stroke_fill/dagre/sketch.exp.svg | 19 +- .../markdown_stroke_fill/elk/sketch.exp.svg | 19 +- .../md_2space_newline/dagre/sketch.exp.svg | 19 +- .../md_2space_newline/elk/sketch.exp.svg | 19 +- .../md_backslash_newline/dagre/sketch.exp.svg | 19 +- .../md_backslash_newline/elk/sketch.exp.svg | 19 +- .../md_code_block_fenced/dagre/sketch.exp.svg | 19 +- .../md_code_block_fenced/elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../md_code_block_indented/elk/sketch.exp.svg | 19 +- .../md_code_inline/dagre/sketch.exp.svg | 19 +- .../stable/md_code_inline/elk/sketch.exp.svg | 19 +- .../multiline_text/dagre/sketch.exp.svg | 19 +- .../stable/multiline_text/elk/sketch.exp.svg | 19 +- .../multiple_trees/dagre/sketch.exp.svg | 19 +- .../stable/multiple_trees/elk/sketch.exp.svg | 19 +- .../stable/n22_e32/dagre/sketch.exp.svg | 19 +- .../stable/n22_e32/elk/sketch.exp.svg | 19 +- .../stable/near-alone/dagre/sketch.exp.svg | 19 +- .../stable/near-alone/elk/sketch.exp.svg | 19 +- .../number_connections/dagre/sketch.exp.svg | 19 +- .../number_connections/elk/sketch.exp.svg | 19 +- .../one_container_loop/dagre/sketch.exp.svg | 19 +- .../one_container_loop/elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../dagre/board.exp.json | 8 + .../dagre/sketch.exp.svg | 21 +-- .../elk/board.exp.json | 8 + .../elk/sketch.exp.svg | 21 +-- .../testdata/stable/p/dagre/sketch.exp.svg | 19 +- e2etests/testdata/stable/p/elk/sketch.exp.svg | 19 +- .../testdata/stable/pre/dagre/sketch.exp.svg | 19 +- .../testdata/stable/pre/elk/sketch.exp.svg | 19 +- .../self-referencing/dagre/sketch.exp.svg | 19 +- .../self-referencing/elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../dagre/board.exp.json | 1 + .../dagre/sketch.exp.svg | 21 +-- .../elk/board.exp.json | 1 + .../elk/sketch.exp.svg | 21 +-- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../sequence_diagram_note/elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../sequence_diagram_real/elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../sequence_diagram_span/elk/sketch.exp.svg | 19 +- .../sequence_diagrams/dagre/sketch.exp.svg | 19 +- .../sequence_diagrams/elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../stable/sql_tables/dagre/sketch.exp.svg | 19 +- .../stable/sql_tables/elk/sketch.exp.svg | 19 +- .../stable/square_3d/dagre/sketch.exp.svg | 19 +- .../stable/square_3d/elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../stable/stylish/dagre/sketch.exp.svg | 19 +- .../stable/stylish/elk/sketch.exp.svg | 19 +- .../text_font_sizes/dagre/sketch.exp.svg | 19 +- .../stable/text_font_sizes/elk/sketch.exp.svg | 19 +- .../stable/tooltips/dagre/sketch.exp.svg | 19 +- .../stable/tooltips/elk/sketch.exp.svg | 19 +- .../transparent_3d/dagre/sketch.exp.svg | 19 +- .../stable/transparent_3d/elk/sketch.exp.svg | 19 +- .../unnamed_only_height/dagre/sketch.exp.svg | 19 +- .../unnamed_only_height/elk/sketch.exp.svg | 19 +- .../unnamed_only_width/dagre/sketch.exp.svg | 19 +- .../unnamed_only_width/elk/sketch.exp.svg | 19 +- .../stable/us_map/dagre/sketch.exp.svg | 19 +- .../testdata/stable/us_map/elk/sketch.exp.svg | 19 +- .../container_child_edge/dagre/sketch.exp.svg | 19 +- .../container_child_edge/elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../font_sizes_large/dagre/sketch.exp.svg | 19 +- .../todo/font_sizes_large/elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../elk/sketch.exp.svg | 19 +- .../dagre/sketch.exp.svg | 19 +- .../shape_set_width_height/elk/sketch.exp.svg | 19 +- .../todo/tall_edge_label/dagre/sketch.exp.svg | 19 +- .../todo/tall_edge_label/elk/sketch.exp.svg | 19 +- lib/color/color.go | 1 + lib/svg/style/element.go | 2 +- main.go | 10 +- .../TestCompile/basic_icon.exp.json | 1 + .../TestCompile/image_style.exp.json | 1 + .../reserved_icon_near_style.exp.json | 1 + .../shape/image_dimensions.exp.json | 1 + .../d2oracle/TestMove/slice_style.exp.json | 1 + testdata/d2oracle/TestSet/icon.exp.json | 1 + 292 files changed, 570 insertions(+), 4777 deletions(-) delete mode 100644 d2themes/d2themescatalog/catppuccin_mocha_mauve.go create mode 100644 d2themes/d2themescatalog/dark_mauve.go diff --git a/d2renderers/d2sketch/sketch.go b/d2renderers/d2sketch/sketch.go index 5c1418465..fe0111826 100644 --- a/d2renderers/d2sketch/sketch.go +++ b/d2renderers/d2sketch/sketch.go @@ -15,7 +15,7 @@ import ( "oss.terrastruct.com/d2/lib/geo" "oss.terrastruct.com/d2/lib/label" "oss.terrastruct.com/d2/lib/svg" - svg_style "oss.terrastruct.com/d2/lib/svg/style" + svgstyle "oss.terrastruct.com/d2/lib/svg/style" "oss.terrastruct.com/util-go/go2" ) @@ -83,9 +83,9 @@ func Rect(r *Runner, shape d2target.Shape) (string, error) { return "", err } output := "" - pathEl := svg_style.NewThemableElement("path") + pathEl := svgstyle.NewThemableElement("path") pathEl.Transform = fmt.Sprintf("translate(%d %d)", shape.Pos.X, shape.Pos.Y) - pathEl.Fill, pathEl.Stroke = svg_style.ShapeTheme(shape) + pathEl.Fill, pathEl.Stroke = svgstyle.ShapeTheme(shape) pathEl.Class = "shape" pathEl.Style = shape.CSSStyle() for _, p := range paths { @@ -93,11 +93,11 @@ func Rect(r *Runner, shape d2target.Shape) (string, error) { output += pathEl.Render() } - sketchOEl := svg_style.NewThemableElement("rect") + sketchOEl := svgstyle.NewThemableElement("rect") sketchOEl.Transform = fmt.Sprintf("translate(%d %d)", shape.Pos.X, shape.Pos.Y) sketchOEl.Width = float64(shape.Width) sketchOEl.Height = float64(shape.Height) - renderedSO, err := svg_style.NewThemableSketchOverlay(sketchOEl, pathEl.Fill).Render() + renderedSO, err := svgstyle.NewThemableSketchOverlay(sketchOEl, pathEl.Fill).Render() if err != nil { return "", err } @@ -130,9 +130,9 @@ func DoubleRect(r *Runner, shape d2target.Shape) (string, error) { output := "" - pathEl := svg_style.NewThemableElement("path") + pathEl := svgstyle.NewThemableElement("path") pathEl.Transform = fmt.Sprintf("translate(%d %d)", shape.Pos.X, shape.Pos.Y) - pathEl.Fill, pathEl.Stroke = svg_style.ShapeTheme(shape) + pathEl.Fill, pathEl.Stroke = svgstyle.ShapeTheme(shape) pathEl.Class = "shape" pathEl.Style = shape.CSSStyle() for _, p := range pathsBigRect { @@ -140,9 +140,9 @@ func DoubleRect(r *Runner, shape d2target.Shape) (string, error) { output += pathEl.Render() } - pathEl = svg_style.NewThemableElement("path") + pathEl = svgstyle.NewThemableElement("path") pathEl.Transform = fmt.Sprintf("translate(%d %d)", shape.Pos.X+d2target.INNER_BORDER_OFFSET, shape.Pos.Y+d2target.INNER_BORDER_OFFSET) - pathEl.Fill, pathEl.Stroke = svg_style.ShapeTheme(shape) + pathEl.Fill, pathEl.Stroke = svgstyle.ShapeTheme(shape) pathEl.Class = "shape" pathEl.Style = shape.CSSStyle() for _, p := range pathsSmallRect { @@ -169,9 +169,9 @@ func Oval(r *Runner, shape d2target.Shape) (string, error) { return "", err } output := "" - pathEl := svg_style.NewThemableElement("path") + pathEl := svgstyle.NewThemableElement("path") pathEl.Transform = fmt.Sprintf("translate(%d %d)", shape.Pos.X, shape.Pos.Y) - pathEl.Fill, pathEl.Stroke = svg_style.ShapeTheme(shape) + pathEl.Fill, pathEl.Stroke = svgstyle.ShapeTheme(shape) pathEl.Class = "shape" pathEl.Style = shape.CSSStyle() for _, p := range paths { @@ -179,11 +179,11 @@ func Oval(r *Runner, shape d2target.Shape) (string, error) { output += pathEl.Render() } - soElement := svg_style.NewThemableElement("ellipse") + soElement := svgstyle.NewThemableElement("ellipse") soElement.Transform = fmt.Sprintf("translate(%d %d)", shape.Pos.X+shape.Width/2, shape.Pos.Y+shape.Height/2) soElement.Rx = float64(shape.Width / 2) soElement.Ry = float64(shape.Height / 2) - renderedSO, err := svg_style.NewThemableSketchOverlay( + renderedSO, err := svgstyle.NewThemableSketchOverlay( soElement, pathEl.Fill, ).Render() @@ -219,9 +219,9 @@ func DoubleOval(r *Runner, shape d2target.Shape) (string, error) { output := "" - pathEl := svg_style.NewThemableElement("path") + pathEl := svgstyle.NewThemableElement("path") pathEl.Transform = fmt.Sprintf("translate(%d %d)", shape.Pos.X, shape.Pos.Y) - pathEl.Fill, pathEl.Stroke = svg_style.ShapeTheme(shape) + pathEl.Fill, pathEl.Stroke = svgstyle.ShapeTheme(shape) pathEl.Class = "shape" pathEl.Style = shape.CSSStyle() for _, p := range pathsBigCircle { @@ -229,9 +229,9 @@ func DoubleOval(r *Runner, shape d2target.Shape) (string, error) { output += pathEl.Render() } - pathEl = svg_style.NewThemableElement("path") + pathEl = svgstyle.NewThemableElement("path") pathEl.Transform = fmt.Sprintf("translate(%d %d)", shape.Pos.X, shape.Pos.Y) - pathEl.Fill, pathEl.Stroke = svg_style.ShapeTheme(shape) + pathEl.Fill, pathEl.Stroke = svgstyle.ShapeTheme(shape) pathEl.Class = "shape" pathEl.Style = shape.CSSStyle() for _, p := range pathsSmallCircle { @@ -260,8 +260,8 @@ func Paths(r *Runner, shape d2target.Shape, paths []string) (string, error) { if err != nil { return "", err } - pathEl := svg_style.NewThemableElement("path") - pathEl.Fill, pathEl.Stroke = svg_style.ShapeTheme(shape) + pathEl := svgstyle.NewThemableElement("path") + pathEl.Fill, pathEl.Stroke = svgstyle.ShapeTheme(shape) pathEl.Class = "shape" pathEl.Style = shape.CSSStyle() for _, p := range sketchPaths { @@ -269,10 +269,10 @@ func Paths(r *Runner, shape d2target.Shape, paths []string) (string, error) { output += pathEl.Render() } - soElement := svg_style.NewThemableElement("path") + soElement := svgstyle.NewThemableElement("path") for _, p := range sketchPaths { soElement.D = p - renderedSO, err := svg_style.NewThemableSketchOverlay( + renderedSO, err := svgstyle.NewThemableSketchOverlay( soElement, pathEl.Fill, ).Render() @@ -298,9 +298,9 @@ func Connection(r *Runner, connection d2target.Connection, path, attrs string) ( animatedClass = " animated-connection" } - pathEl := svg_style.NewThemableElement("path") + pathEl := svgstyle.NewThemableElement("path") pathEl.Fill = color.None - pathEl.Stroke = svg_style.ConnectionTheme(connection) + pathEl.Stroke = svgstyle.ConnectionTheme(connection) pathEl.Class = fmt.Sprintf("connection%s", animatedClass) pathEl.Style = connection.CSSStyle() pathEl.Attributes = attrs @@ -324,9 +324,9 @@ func Table(r *Runner, shape d2target.Shape) (string, error) { if err != nil { return "", err } - pathEl := svg_style.NewThemableElement("path") + pathEl := svgstyle.NewThemableElement("path") pathEl.Transform = fmt.Sprintf("translate(%d %d)", shape.Pos.X, shape.Pos.Y) - pathEl.Fill, pathEl.Stroke = svg_style.ShapeTheme(shape) + pathEl.Fill, pathEl.Stroke = svgstyle.ShapeTheme(shape) pathEl.Class = "shape" pathEl.Style = shape.CSSStyle() for _, p := range paths { @@ -350,7 +350,7 @@ func Table(r *Runner, shape d2target.Shape) (string, error) { if err != nil { return "", err } - pathEl = svg_style.NewThemableElement("path") + pathEl = svgstyle.NewThemableElement("path") pathEl.Transform = fmt.Sprintf("translate(%d %d)", shape.Pos.X, shape.Pos.Y) pathEl.Fill = shape.Fill pathEl.Class = "class_header" @@ -367,7 +367,7 @@ func Table(r *Runner, shape d2target.Shape) (string, error) { float64(shape.LabelHeight), ) - textEl := svg_style.NewThemableElement("text") + textEl := svgstyle.NewThemableElement("text") textEl.X = tl.X textEl.Y = tl.Y + float64(shape.LabelHeight)*3/4 textEl.Fill = shape.Stroke @@ -400,7 +400,7 @@ func Table(r *Runner, shape d2target.Shape) (string, error) { float64(shape.FontSize), ) - textEl := svg_style.NewThemableElement("text") + textEl := svgstyle.NewThemableElement("text") textEl.X = nameTL.X textEl.Y = nameTL.Y + float64(shape.FontSize)*3/4 textEl.Fill = shape.PrimaryAccentColor @@ -430,7 +430,7 @@ func Table(r *Runner, shape d2target.Shape) (string, error) { if err != nil { return "", err } - pathEl := svg_style.NewThemableElement("path") + pathEl := svgstyle.NewThemableElement("path") pathEl.Fill = shape.Fill for _, p := range paths { pathEl.D = p @@ -438,11 +438,11 @@ func Table(r *Runner, shape d2target.Shape) (string, error) { } } - sketchOEl := svg_style.NewThemableElement("rect") + sketchOEl := svgstyle.NewThemableElement("rect") sketchOEl.Transform = fmt.Sprintf("translate(%d %d)", shape.Pos.X, shape.Pos.Y) sketchOEl.Width = float64(shape.Width) sketchOEl.Height = float64(shape.Height) - renderedSO, err := svg_style.NewThemableSketchOverlay(sketchOEl, pathEl.Fill).Render() + renderedSO, err := svgstyle.NewThemableSketchOverlay(sketchOEl, pathEl.Fill).Render() if err != nil { return "", err } @@ -463,9 +463,9 @@ func Class(r *Runner, shape d2target.Shape) (string, error) { if err != nil { return "", err } - pathEl := svg_style.NewThemableElement("path") + pathEl := svgstyle.NewThemableElement("path") pathEl.Transform = fmt.Sprintf("translate(%d %d)", shape.Pos.X, shape.Pos.Y) - pathEl.Fill, pathEl.Stroke = svg_style.ShapeTheme(shape) + pathEl.Fill, pathEl.Stroke = svgstyle.ShapeTheme(shape) pathEl.Class = "shape" pathEl.Style = shape.CSSStyle() for _, p := range paths { @@ -490,7 +490,7 @@ func Class(r *Runner, shape d2target.Shape) (string, error) { if err != nil { return "", err } - pathEl = svg_style.NewThemableElement("path") + pathEl = svgstyle.NewThemableElement("path") pathEl.Transform = fmt.Sprintf("translate(%d %d)", shape.Pos.X, shape.Pos.Y) pathEl.Fill = shape.Fill pathEl.Class = "class_header" @@ -499,11 +499,11 @@ func Class(r *Runner, shape d2target.Shape) (string, error) { output += pathEl.Render() } - sketchOEl := svg_style.NewThemableElement("rect") + sketchOEl := svgstyle.NewThemableElement("rect") sketchOEl.Transform = fmt.Sprintf("translate(%d %d)", shape.Pos.X, shape.Pos.Y) sketchOEl.Width = float64(shape.Width) sketchOEl.Height = headerBox.Height - renderedSO, err := svg_style.NewThemableSketchOverlay(sketchOEl, pathEl.Fill).Render() + renderedSO, err := svgstyle.NewThemableSketchOverlay(sketchOEl, pathEl.Fill).Render() if err != nil { return "", err } @@ -517,7 +517,7 @@ func Class(r *Runner, shape d2target.Shape) (string, error) { float64(shape.LabelHeight), ) - textEl := svg_style.NewThemableElement("text") + textEl := svgstyle.NewThemableElement("text") textEl.X = tl.X + float64(shape.LabelWidth)/2 textEl.Y = tl.Y + float64(shape.LabelHeight)*3/4 textEl.Fill = shape.Stroke @@ -544,7 +544,7 @@ func Class(r *Runner, shape d2target.Shape) (string, error) { if err != nil { return "", err } - pathEl = svg_style.NewThemableElement("path") + pathEl = svgstyle.NewThemableElement("path") pathEl.Fill = shape.Fill pathEl.Class = "class_header" for _, p := range paths { @@ -575,7 +575,7 @@ func classRow(shape d2target.Shape, box *geo.Box, prefix, nameText, typeText str fontSize, ) - textEl := svg_style.NewThemableElement("text") + textEl := svgstyle.NewThemableElement("text") textEl.X = prefixTL.X textEl.Y = prefixTL.Y + fontSize*3/4 textEl.Fill = shape.PrimaryAccentColor @@ -786,7 +786,7 @@ func Arrowheads(r *Runner, bgColor string, connection d2target.Connection, srcAd roughPaths = append(roughPaths, extraPaths...) } - pathEl := svg_style.NewThemableElement("path") + pathEl := svgstyle.NewThemableElement("path") pathEl.Class = "connection" pathEl.Attributes = transform for _, rp := range roughPaths { @@ -825,7 +825,7 @@ func Arrowheads(r *Runner, bgColor string, connection d2target.Connection, srcAd roughPaths = append(roughPaths, extraPaths...) } - pathEl := svg_style.NewThemableElement("path") + pathEl := svgstyle.NewThemableElement("path") pathEl.Class = "connection" pathEl.Attributes = transform for _, rp := range roughPaths { diff --git a/d2renderers/d2sketch/sketch_test.go b/d2renderers/d2sketch/sketch_test.go index 8ac5ca2df..9bb4b1fc9 100644 --- a/d2renderers/d2sketch/sketch_test.go +++ b/d2renderers/d2sketch/sketch_test.go @@ -4,7 +4,6 @@ import ( "context" "encoding/xml" "io/ioutil" - "math" "os" "path/filepath" "strings" @@ -422,7 +421,7 @@ func run(t *testing.T, tc testCase) { Pad: d2svg.DEFAULT_PADDING, Sketch: true, ThemeID: 0, - DarkThemeID: math.MaxInt64, + DarkThemeID: -1, }) assert.Success(t, err) err = os.MkdirAll(dataPath, 0755) diff --git a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg index bc712cef7..8852f3fe5 100644 --- a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg @@ -1,4 +1,4 @@ -