From f166077e7b5f38313222d0b51f05177b2edc8bf7 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 16 Dec 2022 17:15:37 -0800 Subject: [PATCH 1/4] always define the referenced mask --- d2renderers/d2svg/d2svg.go | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index 6e31221c8..cf844c234 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -1024,19 +1024,18 @@ func Render(diagram *d2target.Diagram, pad int) ([]byte, error) { } } - if len(labelMasks) > 0 { - fmt.Fprint(buf, strings.Join([]string{ - fmt.Sprintf(``, - labelMaskID, w, h, - ), - fmt.Sprintf(``, - w, - h, - ), - strings.Join(labelMasks, "\n"), - ``, - }, "\n")) - } + // Note: we always want this since we reference it on connections even if there end up being no masked labels + fmt.Fprint(buf, strings.Join([]string{ + fmt.Sprintf(``, + labelMaskID, w, h, + ), + fmt.Sprintf(``, + w, + h, + ), + strings.Join(labelMasks, "\n"), + ``, + }, "\n")) embedFonts(buf) From 8e4096b83cf1e42e440a42e19aa9a5aa08db9f90 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 16 Dec 2022 17:15:58 -0800 Subject: [PATCH 2/4] typo --- d2renderers/d2svg/d2svg.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index cf844c234..db5b650bc 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -1020,7 +1020,7 @@ func Render(diagram *d2target.Diagram, pad int) ([]byte, error) { labelMasks = append(labelMasks, labelMask) } } else { - return nil, fmt.Errorf("unknow object of type %T", obj) + return nil, fmt.Errorf("unknown object of type %T", obj) } } From b031cc840c9bfd9abcb6e2946aa08dcf3e37c9bf Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 16 Dec 2022 17:17:29 -0800 Subject: [PATCH 3/4] update tests --- .../regression/dagre_special_ids/dagre/sketch.exp.svg | 5 ++++- .../testdata/regression/dagre_special_ids/elk/sketch.exp.svg | 5 ++++- .../testdata/regression/empty_sequence/dagre/sketch.exp.svg | 5 ++++- .../testdata/regression/empty_sequence/elk/sketch.exp.svg | 5 ++++- .../sequence_diagram_no_message/dagre/sketch.exp.svg | 5 ++++- .../sequence_diagram_no_message/elk/sketch.exp.svg | 5 ++++- .../sequence_diagram_span_cover/dagre/sketch.exp.svg | 5 ++++- .../sequence_diagram_span_cover/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/sanity/basic/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/sanity/basic/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/sanity/child_to_child/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/sanity/empty/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/sanity/empty/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg | 5 ++++- .../testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg | 5 ++++- .../testdata/stable/all_shapes_multiple/elk/sketch.exp.svg | 5 ++++- .../testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg | 5 ++++- .../testdata/stable/all_shapes_shadow/elk/sketch.exp.svg | 5 ++++- .../stable/arrowhead_adjustment/dagre/sketch.exp.svg | 5 ++++- .../testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg | 5 ++++- .../testdata/stable/child_parent_edges/dagre/sketch.exp.svg | 5 ++++- .../testdata/stable/child_parent_edges/elk/sketch.exp.svg | 5 ++++- .../testdata/stable/circular_dependency/dagre/sketch.exp.svg | 5 ++++- .../testdata/stable/circular_dependency/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/class/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/class/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg | 5 ++++- .../testdata/stable/connected_container/dagre/sketch.exp.svg | 5 ++++- .../testdata/stable/connected_container/elk/sketch.exp.svg | 5 ++++- .../testdata/stable/container_edges/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/container_edges/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/dense/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/dense/elk/sketch.exp.svg | 5 ++++- .../testdata/stable/different_subgraphs/dagre/sketch.exp.svg | 5 ++++- .../testdata/stable/different_subgraphs/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/direction/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/direction/elk/sketch.exp.svg | 5 ++++- .../testdata/stable/giant_markdown_test/dagre/sketch.exp.svg | 5 ++++- .../testdata/stable/giant_markdown_test/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/hr/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/hr/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/icon-label/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/images/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/images/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/large_arch/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/li1/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/li1/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/li2/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/li2/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/li3/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/li3/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/li4/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/li4/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/lone_h1/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/lone_h1/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/markdown/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/markdown/elk/sketch.exp.svg | 5 ++++- .../testdata/stable/md_2space_newline/dagre/sketch.exp.svg | 5 ++++- .../testdata/stable/md_2space_newline/elk/sketch.exp.svg | 5 ++++- .../stable/md_backslash_newline/dagre/sketch.exp.svg | 5 ++++- .../testdata/stable/md_backslash_newline/elk/sketch.exp.svg | 5 ++++- .../stable/md_code_block_fenced/dagre/sketch.exp.svg | 5 ++++- .../testdata/stable/md_code_block_fenced/elk/sketch.exp.svg | 5 ++++- .../stable/md_code_block_indented/dagre/sketch.exp.svg | 5 ++++- .../stable/md_code_block_indented/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/md_code_inline/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/md_code_inline/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/multiline_text/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/multiline_text/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg | 5 ++++- .../testdata/stable/number_connections/dagre/sketch.exp.svg | 5 ++++- .../testdata/stable/number_connections/elk/sketch.exp.svg | 5 ++++- .../testdata/stable/one_container_loop/dagre/sketch.exp.svg | 5 ++++- .../testdata/stable/one_container_loop/elk/sketch.exp.svg | 5 ++++- .../stable/one_three_one_container/dagre/sketch.exp.svg | 5 ++++- .../stable/one_three_one_container/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/p/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/p/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/pre/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/pre/elk/sketch.exp.svg | 5 ++++- .../stable/sequence_diagram_long_note/dagre/sketch.exp.svg | 5 ++++- .../stable/sequence_diagram_long_note/elk/sketch.exp.svg | 5 ++++- .../stable/sequence_diagram_nested_span/dagre/sketch.exp.svg | 5 ++++- .../stable/sequence_diagram_nested_span/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/square_3d/elk/sketch.exp.svg | 5 ++++- .../stable/straight_hierarchy_container/dagre/sketch.exp.svg | 5 ++++- .../stable/straight_hierarchy_container/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/transparent_3d/elk/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/us_map/dagre/sketch.exp.svg | 5 ++++- e2etests/testdata/stable/us_map/elk/sketch.exp.svg | 5 ++++- .../todo/font_sizes_containers_large/dagre/sketch.exp.svg | 5 ++++- .../todo/font_sizes_containers_large/elk/sketch.exp.svg | 5 ++++- 108 files changed, 432 insertions(+), 108 deletions(-) diff --git a/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg index 1fcf71c22..f7a7922d5 100644 --- a/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg @@ -18,7 +18,10 @@ width="1427" height="568" viewBox="-100 -100 1427 568">ninetynineeighty eightseventy sevena\yodetherea\"odea\node ninetynineeighty eightseventy sevena\yodetherea\"odea\node + + +ninetynineeighty eightseventy sevena\yodetherea\"odea\node ninetynineeighty eightseventy sevena\yodetherea\"odea\node + + +hellogoodbye hellogoodbye + + +hellogoodbye hellogoodbye + + +ABAB + + +ABAB + + +b b + + +b b + + +abc abc + + +abc abc + + +ab ab + + +ab ab + + +acbd acbd + + +acbd acbd + + + \ No newline at end of file + + + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/empty/elk/sketch.exp.svg b/e2etests/testdata/sanity/empty/elk/sketch.exp.svg index 9563e1411..20d55bdc1 100644 --- a/e2etests/testdata/sanity/empty/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/empty/elk/sketch.exp.svg @@ -18,4 +18,7 @@ width="200" height="200" viewBox="-100 -100 200 200"> \ No newline at end of file + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg index 864693eac..095790f60 100644 --- a/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg @@ -18,7 +18,10 @@ width="1539" height="824" viewBox="-100 -100 1539 824">rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + + +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + + +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + + +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + + +cba * cba * + + +cba * cba * + + +abcdefghijklmno abcdefghijklmno + + +abcdefghijklmno abcdefghijklmno + + +abcd abcd + + +abcd abcd + + +abc abc + + +abc abc + + +acfbdhg acfbdhg + + +acfbdhg acfbdhg + + +agdfbhec agdfbhec + + +agdfbhec agdfbhec + + +abcdefghijklmnopq abcdefghijklmnopq + + +abcdefghijklmnopq abcdefghijklmnopq + + +finallyatreeandnodessomemoremanythenhereyouhavehierarchyanotherofnestingtreesatreeinsidehierarchyroot finallyatreeandnodessomemoremanythenhereyouhavehierarchyanotherofnestingtreesatreeinsidehierarchyroot + + +finallyatreeandnodessomemoremanythenhereyouhavehierarchyanotherofnestingtreesatreeinsidehierarchyroot finallyatreeandnodessomemoremanythenhereyouhavehierarchyanotherofnestingtreesatreeinsidehierarchyroot + + +bacde21345abcde bacde21345abcde + + +bacde21345abcde bacde21345abcde + + +hellohello + + +hellohello + + +ab ab + + +ab ab + + +abcdefghiqrjmnoszaabbeeffggklptuwxyccddv abcdefghiqrjmnoszaabbeeffggklptuwxyccddv + + +abcdefghiqrjmnoszaabbeeffggklptuwxyccddv abcdefghiqrjmnoszaabbeeffggklptuwxyccddv + + +

Markdown: Syntax

-
ab

Markdown: Syntax

-
ab markdown

Lorem ipsum dolor sit amet, consectetur adipiscing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

-
markdown

Lorem ipsum dolor sit amet, consectetur adipiscing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

-
markdown

Lorem ipsum dolor sit amet, consectetur adipiscing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

-
markdown

Lorem ipsum dolor sit amet, consectetur adipiscing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

-

code

-
ab

code

-
ab thisgoesmultiple linesthisgoesmultiple lines + + +thisgoesmultiple linesthisgoesmultiple lines + + +abcdefghijklmnopqrstuvw abcdefghijklmnopqrstuvw + + +abcdefghijklmnopqrstuvw abcdefghijklmnopqrstuvw + + +abcdefghijklmnopqrstu abcdefghijklmnopqrstu + + +abcdefghijklmnopqrstu abcdefghijklmnopqrstu + + +Foo Baz12hello Foo Baz12hello + + +Foo Baz12hello Foo Baz12hello + + +acdefgbh acdefgbh + + +acdefgbh acdefgbh + + +topabcbottomstartend topabcbottomstartend + + +topabcbottomstartend topabcbottomstartend + + +ba a note here to remember that padding must consider notes toojustalongnotehereba a note here to remember that padding must consider notes toojustalongnotehere + + +ba a note here to remember that padding must consider notes toojustalongnotehereba a note here to remember that padding must consider notes toojustalongnotehere + + +scoreritemResponseitemessayRubricconceptitemOutcome scoreritemResponseitemessayRubricconceptitemOutcome + + +scoreritemResponseitemessayRubricconceptitemOutcome scoreritemResponseitemessayRubricconceptitemOutcome + + +acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + + +acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + + + -cube -cubeAKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTNDAKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND + + +AKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTNDAKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND + + +ninety ninesixty fourthirty twosixteeneightninety ninesixty fourthirty twosixteeneight + + +ninety ninesixty fourthirty twosixteeneightninety ninesixty fourthirty twosixteeneight + + +