From 845351793b8e391ddfef30b2eec401ed72387fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Mon, 5 Dec 2022 11:57:16 -0800 Subject: [PATCH 01/12] Mask container labels --- d2renderers/d2svg/d2svg.go | 39 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index e46a0fb79..7e429e9f5 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -337,11 +337,11 @@ func pathData(connection d2target.Connection, idToShape map[string]d2target.Shap return strings.Join(path, " ") } -func makeLabelMask(connection d2target.Connection, labelTL, tl, br *geo.Point) string { +func makeLabelMask(labelTL *geo.Point, width, height int) string { return fmt.Sprintf(``, labelTL.X, labelTL.Y, - connection.LabelWidth, - connection.LabelHeight, + width, + height, ) } @@ -408,7 +408,7 @@ func drawConnection(writer io.Writer, connection d2target.Connection, markers ma br.X = math.Max(br.X, labelTL.X+float64(connection.LabelWidth)) br.Y = math.Max(br.Y, labelTL.Y+float64(connection.LabelHeight)) - labelMask = makeLabelMask(connection, labelTL, tl, br) + labelMask = makeLabelMask(labelTL, connection.LabelWidth, connection.LabelHeight) } } @@ -582,7 +582,7 @@ func render3dRect(targetShape d2target.Shape) string { return borderMask + mainRect + renderedSides + renderedBorder } -func drawShape(writer io.Writer, targetShape d2target.Shape) error { +func drawShape(writer io.Writer, targetShape d2target.Shape) (labelMask string, err error) { fmt.Fprintf(writer, ``, escapeText(targetShape.ID)) tl := geo.NewPoint(float64(targetShape.Pos.X), float64(targetShape.Pos.Y)) width := float64(targetShape.Width) @@ -615,11 +615,11 @@ func drawShape(writer io.Writer, targetShape d2target.Shape) error { case d2target.ShapeClass: drawClass(writer, targetShape) fmt.Fprintf(writer, ``) - return nil + return labelMask, nil case d2target.ShapeSQLTable: drawTable(writer, targetShape) fmt.Fprintf(writer, ``) - return nil + return labelMask, nil case d2target.ShapeOval: if targetShape.Multiple { fmt.Fprint(writer, renderOval(multipleTL, width, height, style)) @@ -701,19 +701,19 @@ func drawShape(writer io.Writer, targetShape d2target.Shape) error { case d2target.ShapeCode: lexer := lexers.Get(targetShape.Language) if lexer == nil { - return fmt.Errorf("code snippet lexer for %s not found", targetShape.Language) + return labelMask, fmt.Errorf("code snippet lexer for %s not found", targetShape.Language) } style := styles.Get("github") if style == nil { - return errors.New(`code snippet style "github" not found`) + return labelMask, errors.New(`code snippet style "github" not found`) } formatter := formatters.Get("svg") if formatter == nil { - return errors.New(`code snippet formatter "svg" not found`) + return labelMask, errors.New(`code snippet formatter "svg" not found`) } iterator, err := lexer.Tokenise(nil, targetShape.Label) if err != nil { - return err + return labelMask, err } svgStyles := styleToSVG(style) @@ -743,15 +743,15 @@ func drawShape(writer io.Writer, targetShape d2target.Shape) error { if targetShape.Language == "latex" { render, err := d2latex.Render(targetShape.Label) if err != nil { - return err + return labelMask, err } fmt.Fprintf(writer, ``, box.TopLeft.X, box.TopLeft.Y, targetShape.Opacity) - fmt.Fprintf(writer, render) + fmt.Fprint(writer, render) fmt.Fprintf(writer, "") } else { render, err := textmeasure.RenderMarkdown(targetShape.Label) if err != nil { - return err + return labelMask, err } fmt.Fprintf(writer, ``, box.TopLeft.X, box.TopLeft.Y, targetShape.Width, targetShape.Height, @@ -776,10 +776,11 @@ func drawShape(writer io.Writer, targetShape d2target.Shape) error { textStyle, renderText(targetShape.Label, x, float64(targetShape.LabelHeight)), ) + labelMask = makeLabelMask(labelTL, targetShape.LabelWidth, targetShape.LabelHeight) } } fmt.Fprintf(writer, ``) - return nil + return labelMask, nil } func escapeText(text string) string { @@ -986,14 +987,14 @@ func Render(diagram *d2target.Diagram) ([]byte, error) { markers := map[string]struct{}{} for _, obj := range allObjects { if c, is := obj.(d2target.Connection); is { - labelMask := drawConnection(buf, c, markers, idToShape) - if labelMask != "" { + if labelMask := drawConnection(buf, c, markers, idToShape); labelMask != "" { labelMasks = append(labelMasks, labelMask) } } else if s, is := obj.(d2target.Shape); is { - err := drawShape(buf, s) - if err != nil { + if labelMask, err := drawShape(buf, s); err != nil { return nil, err + } else if labelMask != "" { + labelMasks = append(labelMasks, labelMask) } } else { return nil, fmt.Errorf("unknow object of type %T", obj) From 092d196c0e60881d2ce93985006221dfcbc793ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Mon, 5 Dec 2022 11:57:50 -0800 Subject: [PATCH 02/12] Update tests --- .../sanity/1_to_2/dagre/sketch.exp.svg | 7 ++- .../testdata/sanity/1_to_2/elk/sketch.exp.svg | 7 ++- .../sanity/basic/dagre/sketch.exp.svg | 6 ++- .../testdata/sanity/basic/elk/sketch.exp.svg | 6 ++- .../child_to_child/dagre/sketch.exp.svg | 8 ++- .../sanity/child_to_child/elk/sketch.exp.svg | 8 ++- .../connection_label/dagre/sketch.exp.svg | 2 + .../connection_label/elk/sketch.exp.svg | 2 + .../stable/all_shapes/dagre/sketch.exp.svg | 21 +++++++- .../stable/all_shapes/elk/sketch.exp.svg | 21 +++++++- .../all_shapes_multiple/dagre/sketch.exp.svg | 21 +++++++- .../all_shapes_multiple/elk/sketch.exp.svg | 21 +++++++- .../all_shapes_shadow/dagre/sketch.exp.svg | 21 +++++++- .../all_shapes_shadow/elk/sketch.exp.svg | 21 +++++++- .../arrowhead_adjustment/dagre/sketch.exp.svg | 7 ++- .../arrowhead_adjustment/elk/sketch.exp.svg | 7 ++- .../arrowhead_labels/dagre/sketch.exp.svg | 2 + .../arrowhead_labels/elk/sketch.exp.svg | 2 + .../stable/binary_tree/dagre/sketch.exp.svg | 19 ++++++- .../stable/binary_tree/elk/sketch.exp.svg | 19 ++++++- .../stable/chaos1/dagre/sketch.exp.svg | 5 ++ .../testdata/stable/chaos1/elk/sketch.exp.svg | 5 ++ .../stable/chaos2/dagre/sketch.exp.svg | 12 +++++ .../testdata/stable/chaos2/elk/sketch.exp.svg | 12 +++++ .../child_parent_edges/dagre/sketch.exp.svg | 8 ++- .../child_parent_edges/elk/sketch.exp.svg | 8 ++- .../circular_dependency/dagre/sketch.exp.svg | 7 ++- .../circular_dependency/elk/sketch.exp.svg | 7 ++- .../stable/code_snippet/dagre/sketch.exp.svg | 6 ++- .../stable/code_snippet/elk/sketch.exp.svg | 6 ++- .../connected_container/dagre/sketch.exp.svg | 11 +++- .../connected_container/elk/sketch.exp.svg | 11 +++- .../container_edges/dagre/sketch.exp.svg | 12 ++++- .../stable/container_edges/elk/sketch.exp.svg | 12 ++++- .../stable/dense/dagre/sketch.exp.svg | 21 +++++++- .../testdata/stable/dense/elk/sketch.exp.svg | 21 +++++++- .../different_subgraphs/dagre/sketch.exp.svg | 26 ++++++++- .../different_subgraphs/elk/sketch.exp.svg | 26 ++++++++- .../stable/direction/dagre/sketch.exp.svg | 19 ++++++- .../stable/direction/elk/sketch.exp.svg | 19 ++++++- .../stable/font_colors/dagre/sketch.exp.svg | 2 + .../stable/font_colors/elk/sketch.exp.svg | 2 + .../stable/font_sizes/dagre/sketch.exp.svg | 12 +++++ .../stable/font_sizes/elk/sketch.exp.svg | 12 +++++ .../giant_markdown_test/dagre/sketch.exp.svg | 6 ++- .../giant_markdown_test/elk/sketch.exp.svg | 6 ++- .../testdata/stable/hr/dagre/sketch.exp.svg | 6 ++- .../testdata/stable/hr/elk/sketch.exp.svg | 6 ++- .../stable/icon-label/dagre/sketch.exp.svg | 5 +- .../stable/icon-label/elk/sketch.exp.svg | 5 +- .../stable/images/dagre/sketch.exp.svg | 6 ++- .../testdata/stable/images/elk/sketch.exp.svg | 6 ++- .../stable/investigate/dagre/sketch.exp.svg | 31 +++++++++++ .../stable/investigate/elk/sketch.exp.svg | 31 +++++++++++ .../stable/large_arch/dagre/sketch.exp.svg | 37 ++++++++++++- .../stable/large_arch/elk/sketch.exp.svg | 37 ++++++++++++- .../stable/latex/dagre/sketch.exp.svg | 3 ++ .../testdata/stable/latex/elk/sketch.exp.svg | 3 ++ .../testdata/stable/li1/dagre/sketch.exp.svg | 6 ++- .../testdata/stable/li1/elk/sketch.exp.svg | 6 ++- .../testdata/stable/li2/dagre/sketch.exp.svg | 6 ++- .../testdata/stable/li2/elk/sketch.exp.svg | 6 ++- .../testdata/stable/li3/dagre/sketch.exp.svg | 6 ++- .../testdata/stable/li3/elk/sketch.exp.svg | 6 ++- .../testdata/stable/li4/dagre/sketch.exp.svg | 6 ++- .../testdata/stable/li4/elk/sketch.exp.svg | 6 ++- .../stable/lone_h1/dagre/sketch.exp.svg | 6 ++- .../stable/lone_h1/elk/sketch.exp.svg | 6 ++- .../stable/markdown/dagre/sketch.exp.svg | 6 ++- .../stable/markdown/elk/sketch.exp.svg | 6 ++- .../md_2space_newline/dagre/sketch.exp.svg | 5 +- .../md_2space_newline/elk/sketch.exp.svg | 5 +- .../md_backslash_newline/dagre/sketch.exp.svg | 5 +- .../md_backslash_newline/elk/sketch.exp.svg | 5 +- .../md_code_block_fenced/dagre/sketch.exp.svg | 6 ++- .../md_code_block_fenced/elk/sketch.exp.svg | 6 ++- .../dagre/sketch.exp.svg | 6 ++- .../md_code_block_indented/elk/sketch.exp.svg | 6 ++- .../md_code_inline/dagre/sketch.exp.svg | 6 ++- .../stable/md_code_inline/elk/sketch.exp.svg | 6 ++- .../multiline_text/dagre/sketch.exp.svg | 5 +- .../stable/multiline_text/elk/sketch.exp.svg | 5 +- .../multiple_trees/dagre/sketch.exp.svg | 27 +++++++++- .../stable/multiple_trees/elk/sketch.exp.svg | 27 +++++++++- .../stable/n22_e32/dagre/sketch.exp.svg | 25 ++++++++- .../stable/n22_e32/elk/sketch.exp.svg | 25 ++++++++- .../number_connections/dagre/sketch.exp.svg | 8 ++- .../number_connections/elk/sketch.exp.svg | 8 ++- .../one_container_loop/dagre/sketch.exp.svg | 12 ++++- .../one_container_loop/elk/sketch.exp.svg | 12 ++++- .../dagre/sketch.exp.svg | 11 +++- .../elk/sketch.exp.svg | 11 +++- .../testdata/stable/p/dagre/sketch.exp.svg | 6 ++- e2etests/testdata/stable/p/elk/sketch.exp.svg | 6 ++- .../testdata/stable/pre/dagre/sketch.exp.svg | 6 ++- .../testdata/stable/pre/elk/sketch.exp.svg | 6 ++- .../self-referencing/dagre/sketch.exp.svg | 3 ++ .../self-referencing/elk/sketch.exp.svg | 3 ++ .../dagre/sketch.exp.svg | 17 ++++++ .../elk/sketch.exp.svg | 17 ++++++ .../dagre/sketch.exp.svg | 11 ++++ .../elk/sketch.exp.svg | 11 ++++ .../dagre/sketch.exp.svg | 10 +++- .../elk/sketch.exp.svg | 10 +++- .../dagre/sketch.exp.svg | 8 +++ .../sequence_diagram_note/elk/sketch.exp.svg | 8 +++ .../dagre/sketch.exp.svg | 12 +++++ .../sequence_diagram_real/elk/sketch.exp.svg | 12 +++++ .../dagre/sketch.exp.svg | 2 + .../elk/sketch.exp.svg | 2 + .../dagre/sketch.exp.svg | 5 ++ .../elk/sketch.exp.svg | 5 ++ .../dagre/sketch.exp.svg | 6 +++ .../sequence_diagram_span/elk/sketch.exp.svg | 6 +++ .../sequence_diagrams/dagre/sketch.exp.svg | 25 +++++++++ .../sequence_diagrams/elk/sketch.exp.svg | 25 +++++++++ .../stable/square_3d/dagre/sketch.exp.svg | 6 ++- .../stable/square_3d/elk/sketch.exp.svg | 6 ++- .../dagre/sketch.exp.svg | 29 +++++++++- .../elk/sketch.exp.svg | 29 +++++++++- .../stable/stylish/dagre/sketch.exp.svg | 6 ++- .../stable/stylish/elk/sketch.exp.svg | 6 ++- .../transparent_3d/dagre/sketch.exp.svg | 5 +- .../stable/transparent_3d/elk/sketch.exp.svg | 5 +- .../stable/us_map/dagre/sketch.exp.svg | 54 ++++++++++++++++++- .../testdata/stable/us_map/elk/sketch.exp.svg | 54 ++++++++++++++++++- .../container_child_edge/dagre/sketch.exp.svg | 3 ++ .../container_child_edge/elk/sketch.exp.svg | 3 ++ .../dagre/sketch.exp.svg | 9 +++- .../elk/sketch.exp.svg | 9 +++- .../font_sizes_large/dagre/sketch.exp.svg | 5 ++ .../todo/font_sizes_large/elk/sketch.exp.svg | 5 ++ .../todo/tall_edge_label/dagre/sketch.exp.svg | 2 + .../todo/tall_edge_label/elk/sketch.exp.svg | 2 + 134 files changed, 1368 insertions(+), 94 deletions(-) diff --git a/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg b/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg index 8e0b6bde3..0dd00fb61 100644 --- a/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg @@ -14,7 +14,12 @@ width="486" height="552" viewBox="-100 -100 486 552">abc abc + + + + +abc abc + + + + +ab ab + + + +ab ab + + + +acbd acbd + + + + + +acbd acbd + + + + + +ab hello + + ab hello + + rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + + + + + + + + + + + + + + + + + + +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + + + + + + + + + + + + + + + + + + +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + + + + + + + + + + + + + + + + + + +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + + + + + + + + + + + + + + + + + + +cba * cba * + + + + +cba * cba * + + + + +ab To err is human, to moo bovine1* + + ab To err is human, to moo bovine1* + + abcdefghijklmno abcdefghijklmno + + + + + + + + + + + + + + + + +abcdefghijklmno abcdefghijklmno + + + + + + + + + + + + + + + + +aaadddeeebbbccc111 222 + + + + + aaadddeeebbbccc111 222 + + + + + 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 + + + + + + + + + + + + + + + + +alphabeta gamma + + alphabeta gamma + + size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg index c69206fcb..1c3944a12 100644 --- a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg @@ -16,6 +16,18 @@ width="1965" height="793" viewBox="-88 -88 1965 793">size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg b/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg index aa40b0cde..6eabdf50e 100644 --- a/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg @@ -1027,7 +1027,11 @@ title for the link, surrounded in quotes. For example:

Code

Unlike a pre-formatted code block, a code span indicates code within a normal paragraph. For example:

-ab hellohello + + +hellohello + + +ab ab + + + +ab ab + + + +aabbccddllffwwyynniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 123456 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg index cd4553a99..2368bb846 100644 --- a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg @@ -16,6 +16,37 @@ width="860" height="4868" viewBox="-82 -88 860 4868">aabbccddllffwwyynniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 123456 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg index ee5c062cc..f832324d7 100644 --- a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg @@ -14,7 +14,42 @@ width="3244" height="1780" viewBox="-100 -100 3244 1780">abcdefghiqrjmnoszaabbeeffggklptuwxyccddv abcdefghiqrjmnoszaabbeeffggklptuwxyccddv + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +abcdefghiqrjmnoszaabbeeffggklptuwxyccddv abcdefghiqrjmnoszaabbeeffggklptuwxyccddv + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +mixed togethersugarsolution we get + + + mixed togethersugarsolution we get + + +

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 + + + + + + + + +xyz hello + + + xyz hello + + + abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + + + + + + + + + + + abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + + + + + + + + + + + scoreritemResponseitemessayRubricconceptitemOutcome scoreritemResponseitemessayRubricconceptitemOutcome + + + + + + + +scoreritemResponseitemessayRubricconceptitemOutcome scoreritemResponseitemessayRubricconceptitemOutcome + + + + + + + +abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier + + + + + + + + abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier + + + + + + + + How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place + + + + + + + + + + + @@ -29,6 +40,7 @@ width="2374" height="2488" viewBox="-100 -100 2374 2488">How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place + + + + + + + + + + + @@ -29,6 +40,7 @@ width="2374" height="2488" viewBox="-88 -88 2374 2488">ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + + diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg index f604a0366..ef3021650 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg @@ -16,6 +16,8 @@ width="666" height="1366" viewBox="-100 -50 666 1366">ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + + diff --git a/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg index 40e95fbe8..a97665af9 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg @@ -16,6 +16,11 @@ width="1285" height="1868" viewBox="-100 -50 1285 1868">AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentialsAuthentication ResponseAnother authentication Requestdo it later storedAnother authentication Response + + + + + diff --git a/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg index 40e95fbe8..a97665af9 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg @@ -16,6 +16,11 @@ width="1285" height="1868" viewBox="-100 -50 1285 1868">AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentialsAuthentication ResponseAnother authentication Requestdo it later storedAnother authentication Response + + + + + diff --git a/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg index 062ed1eed..e563e1df0 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg @@ -16,6 +16,12 @@ width="1593" height="2146" viewBox="-100 -50 1593 2146">scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + diff --git a/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg index 062ed1eed..e563e1df0 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg @@ -16,6 +16,12 @@ width="1593" height="2146" viewBox="-100 -50 1593 2146">scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg index 5c7e8ffd3..3ac4ca8e0 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg @@ -16,6 +16,31 @@ width="3244" height="4173" viewBox="-100 -100 3244 4173">a_shapea_sequenceanotherfinallysequencesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponsescoreritemResponseitemessayRubricconceptitemOutcome getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg index c37e331bd..7a94dcd5f 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg @@ -16,6 +16,31 @@ width="3166" height="4293" viewBox="-88 -88 3166 4293">a_shapea_sequenceanotherfinallysequencesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponsescoreritemResponseitemessayRubricconceptitemOutcome getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg index 0ccdd04b2..f66617f27 100644 --- a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg @@ -18,7 +18,11 @@ width="371" height="580" viewBox="-100 -100 371 580">acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + + + + + + + + + + + + + + + + + + + + + + + + + + +acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + + + + + + + + + + + + + + + + + + + + + + + + + + + -cube -cubeAKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTNDAKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +AKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTNDAKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +containerfirstsecond 1->2c->2 + + + containerfirstsecond 1->2c->2 + + + ninety ninesixty fourthirty twosixteeneightninety ninesixty fourthirty twosixteeneight + + + + + + +ninety ninesixty fourthirty twosixteeneightninety ninesixty fourthirty twosixteeneight + + + + + + +eightsixteenthirty twosixty fourninety nine twelvetwenty fourforty eighteighty one + + + + + diff --git a/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg b/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg index 0a92d5cc1..8e20cfbee 100644 --- a/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg @@ -16,6 +16,11 @@ width="789" height="2014" viewBox="-39 -88 789 2014">eightsixteenthirty twosixty fourninety nine twelvetwenty fourforty eighteighty one + + + + + diff --git a/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg b/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg index 9077c2058..ba3e7b43e 100644 --- a/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg @@ -16,6 +16,8 @@ width="313" height="552" viewBox="-100 -100 313 552">ab Thereoncewasaverytalledgelabel + + ab Thereoncewasaverytalledgelabel + + abc - - - + + + abc - - - + + + ab - - + + ab - - + + acbd - - - - + + + + acbd - - - - + + + + ab hello - - + + ab hello - - + + rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + cba * - - - + + + cba * - - - + + + ab To err is human, to moo bovine1* - - + + ab To err is human, to moo bovine1* - - + + abcdefghijklmno - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + abcdefghijklmno - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + aaadddeeebbbccc111 222 - - - - - + + + + + aaadddeeebbbccc111 222 - - - - - + + + + + abcd - - - - + + + + abcd - - - - + + + + abc - - - + + + abc - - - + + + acfbdhg - - - - - - - + + + + + + + acfbdhg - - - - - - - + + + + + + + agdfbhec - - - - - - - - + + + + + + + + agdfbhec - - - - - - - - + + + + + + + + abcdefghijklmnopq - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + abcdefghijklmnopq - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + finallyatreeandnodessomemoremanythenhereyouhavehierarchyanotherofnestingtreesatreeinsidehierarchyroot - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + finallyatreeandnodessomemoremanythenhereyouhavehierarchyanotherofnestingtreesatreeinsidehierarchyroot - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + bacde21345abcde - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + bacde21345abcde - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + alphabeta gamma - - + + alphabeta gamma - - + + size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg index 1c3944a12..438c51546 100644 --- a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg @@ -16,18 +16,18 @@ width="1965" height="793" viewBox="-88 -88 1965 793">size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg b/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg index 6eabdf50e..70857d5dc 100644 --- a/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg @@ -1029,8 +1029,8 @@ title for the link, surrounded in quotes. For example:

normal paragraph. For example:

ab - - + + hello - + hello - + ab - - + + ab - - + + aabbccddllffwwyynniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 123456 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg index 2368bb846..da9e66679 100644 --- a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg @@ -16,37 +16,37 @@ width="860" height="4868" viewBox="-82 -88 860 4868">aabbccddllffwwyynniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 123456 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg index f832324d7..95f9a3c5d 100644 --- a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg @@ -16,39 +16,39 @@ width="3244" height="1780" viewBox="-100 -100 3244 1780">abcdefghiqrjmnoszaabbeeffggklptuwxyccddv - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + abcdefghiqrjmnoszaabbeeffggklptuwxyccddv - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + mixed togethersugarsolution we get - - - + + + mixed togethersugarsolution we get - - - + + +

Markdown: Syntax

ab - - + +

Markdown: Syntax

ab - - + +

code

ab - - + +

code

ab - - + + thisgoesmultiple lines - + thisgoesmultiple lines - + abcdefghijklmnopqrstuvw - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + abcdefghijklmnopqrstuvw - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + abcdefghijklmnopqrstu - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + abcdefghijklmnopqrstu - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + Foo Baz12hello - - - - + + + + Foo Baz12hello - - - - + + + + acdefgbh - - - - - - - - + + + + + + + + acdefgbh - - - - - - - - + + + + + + + + topabcbottomstartend - - - - - - - + + + + + + + topabcbottomstartend - - - - - - - + + + + + + + xyz hello - - - + + + xyz hello - - - + + + abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note - - - - - - - - - + + + + + + + + + - - + + abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note - - - - - - - - - + + + + + + + + + - - + + scoreritemResponseitemessayRubricconceptitemOutcome - - - - - - + + + + + + scoreritemResponseitemessayRubricconceptitemOutcome - - - - - - + + + + + + abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier - - - - + + + + - - - - + + + + abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier - - - - + + + + - - - - + + + + How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place - - - - - - - - - - - + + + + + + + + + + + @@ -40,7 +40,7 @@ width="2374" height="2488" viewBox="-100 -100 2374 2488">How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place - - - - - - - - - - - + + + + + + + + + + + @@ -40,7 +40,7 @@ width="2374" height="2488" viewBox="-88 -88 2374 2488">ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - - + + diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg index ef3021650..5a25df531 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg @@ -16,8 +16,8 @@ width="666" height="1366" viewBox="-100 -50 666 1366">ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - - + + diff --git a/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg index a97665af9..bae455c2f 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg @@ -16,11 +16,11 @@ width="1285" height="1868" viewBox="-100 -50 1285 1868">AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentialsAuthentication ResponseAnother authentication Requestdo it later storedAnother authentication Response - - - - - + + + + + diff --git a/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg index a97665af9..bae455c2f 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg @@ -16,11 +16,11 @@ width="1285" height="1868" viewBox="-100 -50 1285 1868">AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentialsAuthentication ResponseAnother authentication Requestdo it later storedAnother authentication Response - - - - - + + + + + diff --git a/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg index e563e1df0..a350672a8 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg @@ -16,12 +16,12 @@ width="1593" height="2146" viewBox="-100 -50 1593 2146">scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - + + + + + + diff --git a/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg index e563e1df0..a350672a8 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg @@ -16,12 +16,12 @@ width="1593" height="2146" viewBox="-100 -50 1593 2146">scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - + + + + + + diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg index 3ac4ca8e0..0c9c21fea 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg @@ -16,31 +16,31 @@ width="3244" height="4173" viewBox="-100 -100 3244 4173">a_shapea_sequenceanotherfinallysequencesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponsescoreritemResponseitemessayRubricconceptitemOutcome getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg index 7a94dcd5f..1155c8d50 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg @@ -16,31 +16,31 @@ width="3166" height="4293" viewBox="-88 -88 3166 4293">a_shapea_sequenceanotherfinallysequencesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponsescoreritemResponseitemessayRubricconceptitemOutcome getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg index f66617f27..9d6be448d 100644 --- a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg @@ -20,8 +20,8 @@ width="371" height="580" viewBox="-100 -100 371 580">acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + AKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + containerfirstsecond 1->2c->2 - - - + + + containerfirstsecond 1->2c->2 - - - + + + ninety ninesixty fourthirty twosixteeneight - - - - - + + + + + ninety ninesixty fourthirty twosixteeneight - - - - - + + + + + eightsixteenthirty twosixty fourninety nine twelvetwenty fourforty eighteighty one - - - - - + + + + + diff --git a/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg b/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg index 8e20cfbee..43821218a 100644 --- a/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg @@ -16,11 +16,11 @@ width="789" height="2014" viewBox="-39 -88 789 2014">eightsixteenthirty twosixty fourninety nine twelvetwenty fourforty eighteighty one - - - - - + + + + + diff --git a/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg b/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg index ba3e7b43e..2a59cfc02 100644 --- a/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg @@ -16,8 +16,8 @@ width="313" height="552" viewBox="-100 -100 313 552">ab Thereoncewasaverytalledgelabel - - + + ab Thereoncewasaverytalledgelabel - - + + abc - - - - -abc abc - - - - -abc ab - - - -ab ab - - - -ab acbd - - - - - -acbd acbd - - - - - -acbd ab hello - - ab hello - - rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - - -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - - -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - - -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - - -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud cba * - - - - -cba * cba * - - - - -cba * ab To err is human, to moo bovine1* - - ab To err is human, to moo bovine1* - - abcdefghijklmno - - - - - - - - - - - - - - - - -abcdefghijklmno abcdefghijklmno - - - - - - - - - - - - - - - - -abcdefghijklmno aaadddeeebbbccc111 222 - - - - - aaadddeeebbbccc111 222 - - - - - 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 alphabeta gamma - - alphabeta gamma - - size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 - - - - - - - - - - - - diff --git a/e2etests/testdata/stable/font_sizes/elk/board.exp.json b/e2etests/testdata/stable/font_sizes/elk/board.exp.json index 2d5446e61..83ac6ddee 100644 --- a/e2etests/testdata/stable/font_sizes/elk/board.exp.json +++ b/e2etests/testdata/stable/font_sizes/elk/board.exp.json @@ -38,6 +38,7 @@ "labelWidth": 45, "labelHeight": 22, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -78,6 +79,7 @@ "labelWidth": 40, "labelHeight": 23, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -118,6 +120,7 @@ "labelWidth": 47, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -158,6 +161,7 @@ "labelWidth": 53, "labelHeight": 31, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -198,6 +202,7 @@ "labelWidth": 77, "labelHeight": 36, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -238,6 +243,7 @@ "labelWidth": 104, "labelHeight": 41, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -278,6 +284,7 @@ "labelWidth": 137, "labelHeight": 46, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -318,6 +325,7 @@ "labelWidth": 37, "labelHeight": 16, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -358,6 +366,7 @@ "labelWidth": 60, "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -398,6 +407,7 @@ "labelWidth": 86, "labelHeight": 28, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -438,6 +448,7 @@ "labelWidth": 100, "labelHeight": 32, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -478,6 +489,7 @@ "labelWidth": 293, "labelHeight": 86, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 } diff --git a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg index dcc655183..02055f08d 100644 --- a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg @@ -20,18 +20,6 @@ width="1965" height="793" viewBox="-88 -88 1965 793">size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 - - - - - - - - - - - - diff --git a/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json b/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json index 62256201b..446ab2acb 100644 --- a/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json +++ b/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json @@ -37,6 +37,7 @@ "underline": false, "labelWidth": 3051, "labelHeight": 4848, + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -77,6 +78,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -117,6 +119,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 } diff --git a/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg b/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg index 610a4e1b1..91b32cb2e 100644 --- a/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg @@ -1031,11 +1031,7 @@ title for the link, surrounded in quotes. For example:

Code

Unlike a pre-formatted code block, a code span indicates code within a normal paragraph. For example:

-ab - - - -hello - - -hellohello - - -helloab - - - -ab ab - - - -ab aabbccddllffwwyynniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 123456 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/e2etests/testdata/stable/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json index 6e983b96d..8b3e17aa5 100644 --- a/e2etests/testdata/stable/investigate/elk/board.exp.json +++ b/e2etests/testdata/stable/investigate/elk/board.exp.json @@ -38,6 +38,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -78,6 +79,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -118,6 +120,7 @@ "labelWidth": 21, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -158,6 +161,7 @@ "labelWidth": 34, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -198,6 +202,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -238,6 +243,7 @@ "labelWidth": 18, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -278,6 +284,7 @@ "labelWidth": 31, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -318,6 +325,7 @@ "labelWidth": 23, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -358,6 +366,7 @@ "labelWidth": 31, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -398,6 +407,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -438,6 +448,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -489,6 +500,7 @@ "labelWidth": 31, "labelHeight": 26, "labelPosition": "OUTSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -529,6 +541,7 @@ "labelWidth": 32, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -580,6 +593,7 @@ "labelWidth": 20, "labelHeight": 26, "labelPosition": "OUTSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -620,6 +634,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -660,6 +675,7 @@ "labelWidth": 33, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -700,6 +716,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -740,6 +757,7 @@ "labelWidth": 15, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -780,6 +798,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -820,6 +839,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -860,6 +880,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -900,6 +921,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -940,6 +962,7 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -980,6 +1003,7 @@ "labelWidth": 28, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -1020,6 +1044,7 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -1060,6 +1085,7 @@ "labelWidth": 32, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -1100,6 +1126,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -1140,6 +1167,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -1180,6 +1208,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -1220,6 +1249,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -1260,6 +1290,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 } diff --git a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg index 0ca6fabc8..6655cd820 100644 --- a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg @@ -20,37 +20,6 @@ width="860" height="4868" viewBox="-82 -88 860 4868">aabbccddllffwwyynniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 123456 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/e2etests/testdata/stable/large_arch/dagre/board.exp.json b/e2etests/testdata/stable/large_arch/dagre/board.exp.json index f62e8f5a5..bffa520fc 100644 --- a/e2etests/testdata/stable/large_arch/dagre/board.exp.json +++ b/e2etests/testdata/stable/large_arch/dagre/board.exp.json @@ -38,6 +38,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -78,6 +79,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -118,6 +120,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -158,6 +161,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -198,6 +202,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -238,6 +243,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -278,6 +284,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -318,6 +325,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -358,6 +366,7 @@ "labelWidth": 9, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -398,6 +407,7 @@ "labelWidth": 11, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -438,6 +448,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -478,6 +489,7 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -518,6 +530,7 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -558,6 +571,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -598,6 +612,7 @@ "labelWidth": 16, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -638,6 +653,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -678,6 +694,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -718,6 +735,7 @@ "labelWidth": 13, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -758,6 +776,7 @@ "labelWidth": 15, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -798,6 +817,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -838,6 +858,7 @@ "labelWidth": 14, "labelHeight": 31, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -878,6 +899,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 4 }, @@ -918,6 +940,7 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -958,6 +981,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -998,6 +1022,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -1038,6 +1063,7 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -1078,6 +1104,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -1118,6 +1145,7 @@ "labelWidth": 31, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -1158,6 +1186,7 @@ "labelWidth": 21, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -1198,6 +1227,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -1238,6 +1268,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -1278,6 +1309,7 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -1318,6 +1350,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 } diff --git a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg index a5dfdb802..13eab90b5 100644 --- a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg @@ -18,42 +18,7 @@ width="3244" height="1780" viewBox="-100 -100 3244 1780">abcdefghiqrjmnoszaabbeeffggklptuwxyccddv - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -abcdefghiqrjmnoszaabbeeffggklptuwxyccddv abcdefghiqrjmnoszaabbeeffggklptuwxyccddv - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -abcdefghiqrjmnoszaabbeeffggklptuwxyccddv mixed togethersugarsolution we get - - - mixed togethersugarsolution we get - - -

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 lines - - -thisgoesmultiple linesthisgoesmultiple lines - - -thisgoesmultiple linesabcdefghijklmnopqrstuvw - - - - - - - - - - - - - - - - - - - - - - - - -abcdefghijklmnopqrstuvw abcdefghijklmnopqrstuvw - - - - - - - - - - - - - - - - - - - - - - - - -abcdefghijklmnopqrstuvw abcdefghijklmnopqrstu - - - - - - - - - - - - - - - - - - - - - - -abcdefghijklmnopqrstu abcdefghijklmnopqrstu - - - - - - - - - - - - - - - - - - - - - - -abcdefghijklmnopqrstu Foo Baz12hello - - - - - -Foo Baz12hello Foo Baz12hello - - - - - -Foo Baz12hello acdefgbh - - - - - - - - - -acdefgbh acdefgbh - - - - - - - - - -acdefgbh topabcbottomstartend - - - - - - - - -topabcbottomstartend topabcbottomstartend - - - - - - - - -topabcbottomstartend xyz hello - - - xyz hello - - - an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long - - - - - - diff --git a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json index 775f8b93e..81d295fb4 100644 --- a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json @@ -38,6 +38,7 @@ "labelWidth": 387, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -78,6 +79,7 @@ "labelWidth": 77, "labelHeight": 186, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -118,6 +120,7 @@ "labelWidth": 50, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -158,6 +161,7 @@ "labelWidth": 80, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -198,6 +202,7 @@ "labelWidth": 63, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -238,6 +243,7 @@ "labelWidth": 461, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 } diff --git a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg index 9933248f6..a2518e2ba 100644 --- a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg @@ -20,12 +20,6 @@ width="2692" height="1396" viewBox="-100 -50 2692 1396">an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long - - - - - - diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json index 8e0bfe6a8..c90698567 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json @@ -38,6 +38,7 @@ "labelWidth": 50, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -78,6 +79,7 @@ "labelWidth": 44, "labelHeight": 42, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -129,6 +131,7 @@ "labelWidth": 71, "labelHeight": 36, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -169,6 +172,7 @@ "labelWidth": 74, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -209,6 +213,7 @@ "labelWidth": 196, "labelHeight": 70, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -249,6 +254,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -289,6 +295,7 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -329,6 +336,7 @@ "labelWidth": 37, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -369,6 +377,7 @@ "labelWidth": 77, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -420,6 +429,7 @@ "labelWidth": 101, "labelHeight": 26, "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -460,6 +470,7 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -500,6 +511,7 @@ "labelWidth": 37, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -540,6 +552,7 @@ "labelWidth": 73, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -580,6 +593,7 @@ "labelWidth": 77, "labelHeight": 42, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -620,6 +634,7 @@ "labelWidth": 51, "labelHeight": 42, "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -660,6 +675,7 @@ "labelWidth": 59, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -700,6 +716,7 @@ "labelWidth": 63, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -740,6 +757,7 @@ "labelWidth": 107, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -780,6 +798,7 @@ "labelWidth": 35, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -833,6 +852,7 @@ "labelWidth": 58, "labelHeight": 36, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 } diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg index 14b82154c..ed0985a85 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg @@ -30,23 +30,6 @@ width="5145" height="2984" viewBox="-100 -50 5145 2984">abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note - - - - @@ -33,8 +29,6 @@ width="1147" height="2268" viewBox="-100 -50 1147 2268">abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note - - - - @@ -33,8 +29,6 @@ width="1147" height="2268" viewBox="-100 -50 1147 2268">ba 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 - - - - - -ba a note here to remember that padding must consider notes toojustalongnotehereabjust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townwhoa a notea note here to remember that padding must consider notes toojustalongnotehere - - - @@ -33,9 +30,6 @@ width="1054" height="2458" viewBox="-221 -50 1054 2458">abjust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townwhoa a notea note here to remember that padding must consider notes toojustalongnotehere - - - @@ -33,9 +30,6 @@ width="1054" height="2458" viewBox="-221 -50 1054 2458">scoreritemResponseitemessayRubricconceptitemOutcome - - - - - - - -scoreritemResponseitemessayRubricconceptitemOutcome scoreritemResponseitemessayRubricconceptitemOutcome - - - - - - - -scoreritemResponseitemessayRubricconceptitemOutcome abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier - - - - - - - - abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier - - - - - - - - How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place - - - - - - - - - - @@ -44,7 +34,6 @@ width="2399" height="2488" viewBox="-100 -100 2399 2488">How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place - - - - - - - - - - @@ -44,7 +34,6 @@ width="2399" height="2488" viewBox="-88 -88 2399 2488">ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - - diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json index a82ecfc32..f12cd46fe 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json @@ -38,6 +38,7 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -78,6 +79,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -117,6 +119,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -156,6 +159,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -195,6 +199,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -234,6 +239,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -273,6 +279,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 } diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg index a4151fcd5..da4f56495 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg @@ -20,8 +20,6 @@ width="696" height="1366" viewBox="-100 -50 696 1366">ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - - diff --git a/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json index 2309eba49..2f10eacf3 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json @@ -38,6 +38,7 @@ "labelWidth": 58, "labelHeight": 58, "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -78,6 +79,7 @@ "labelWidth": 32, "labelHeight": 26, "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -118,6 +120,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -158,6 +161,7 @@ "labelWidth": 48, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -198,6 +202,7 @@ "labelWidth": 97, "labelHeight": 138, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 } diff --git a/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg index 334ec0ca8..20d110d82 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg @@ -20,11 +20,6 @@ width="1589" height="1868" viewBox="-100 -50 1589 1868">AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentialsAuthentication ResponseAnother authentication Requestdo it later storedAnother authentication Response - - - - - diff --git a/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json index 2309eba49..2f10eacf3 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json @@ -38,6 +38,7 @@ "labelWidth": 58, "labelHeight": 58, "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -78,6 +79,7 @@ "labelWidth": 32, "labelHeight": 26, "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -118,6 +120,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -158,6 +161,7 @@ "labelWidth": 48, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -198,6 +202,7 @@ "labelWidth": 97, "labelHeight": 138, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 } diff --git a/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg index 334ec0ca8..20d110d82 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg @@ -20,11 +20,6 @@ width="1589" height="1868" viewBox="-100 -50 1589 1868">AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentialsAuthentication ResponseAnother authentication Requestdo it later storedAnother authentication Response - - - - - diff --git a/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json index e91e7be35..5765aa2be 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json @@ -38,6 +38,7 @@ "labelWidth": 48, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -77,6 +78,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -117,6 +119,7 @@ "labelWidth": 100, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -156,6 +159,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -196,6 +200,7 @@ "labelWidth": 35, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -235,6 +240,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -275,6 +281,7 @@ "labelWidth": 86, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -314,6 +321,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -353,6 +361,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -393,6 +402,7 @@ "labelWidth": 60, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -432,6 +442,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -472,6 +483,7 @@ "labelWidth": 97, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -511,6 +523,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -550,6 +563,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -589,6 +603,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -628,6 +643,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -667,6 +683,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 } diff --git a/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg index 1e77c893b..f756c4475 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg @@ -20,12 +20,6 @@ width="1624" height="2146" viewBox="-100 -50 1624 2146">scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - diff --git a/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json index e91e7be35..5765aa2be 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json @@ -38,6 +38,7 @@ "labelWidth": 48, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -77,6 +78,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -117,6 +119,7 @@ "labelWidth": 100, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -156,6 +159,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -196,6 +200,7 @@ "labelWidth": 35, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -235,6 +240,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -275,6 +281,7 @@ "labelWidth": 86, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -314,6 +321,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -353,6 +361,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -393,6 +402,7 @@ "labelWidth": 60, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -432,6 +442,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -472,6 +483,7 @@ "labelWidth": 97, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -511,6 +523,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -550,6 +563,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -589,6 +603,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -628,6 +643,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 }, @@ -667,6 +683,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 2 } diff --git a/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg index 1e77c893b..f756c4475 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg @@ -20,12 +20,6 @@ width="1624" height="2146" viewBox="-100 -50 1624 2146">scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json index e716f845f..c36098716 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json @@ -38,6 +38,7 @@ "labelWidth": 64, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -78,6 +79,7 @@ "labelWidth": 144, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -118,6 +120,7 @@ "labelWidth": 98, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -158,6 +161,7 @@ "labelWidth": 101, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -198,6 +202,7 @@ "labelWidth": 77, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -238,6 +243,7 @@ "labelWidth": 101, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -278,6 +284,7 @@ "labelWidth": 48, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -318,6 +325,7 @@ "labelWidth": 60, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -358,6 +366,7 @@ "labelWidth": 86, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -398,6 +407,7 @@ "labelWidth": 35, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -438,6 +448,7 @@ "labelWidth": 97, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -478,6 +489,7 @@ "labelWidth": 100, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -518,6 +530,7 @@ "labelWidth": 48, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -557,6 +570,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -597,6 +611,7 @@ "labelWidth": 100, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -636,6 +651,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -676,6 +692,7 @@ "labelWidth": 35, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -715,6 +732,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -755,6 +773,7 @@ "labelWidth": 86, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -794,6 +813,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -833,6 +853,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -873,6 +894,7 @@ "labelWidth": 60, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -912,6 +934,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -952,6 +975,7 @@ "labelWidth": 97, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -991,6 +1015,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -1030,6 +1055,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -1069,6 +1095,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -1108,6 +1135,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -1147,6 +1175,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -1187,6 +1216,7 @@ "labelWidth": 48, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -1226,6 +1256,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1266,6 +1297,7 @@ "labelWidth": 100, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -1305,6 +1337,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1345,6 +1378,7 @@ "labelWidth": 35, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -1384,6 +1418,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1424,6 +1459,7 @@ "labelWidth": 86, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -1463,6 +1499,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1502,6 +1539,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 5 }, @@ -1542,6 +1580,7 @@ "labelWidth": 60, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -1581,6 +1620,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1621,6 +1661,7 @@ "labelWidth": 97, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -1660,6 +1701,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1699,6 +1741,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1738,6 +1781,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1777,6 +1821,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1816,6 +1861,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1856,6 +1902,7 @@ "labelWidth": 72, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -1895,6 +1942,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1934,6 +1982,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1973,6 +2022,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 5 }, @@ -2012,6 +2062,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -2051,6 +2102,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 5 }, @@ -2090,6 +2142,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 6 }, @@ -2129,6 +2182,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -2168,6 +2222,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 5 }, @@ -2207,6 +2262,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 6 }, @@ -2246,6 +2302,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 7 }, @@ -2285,6 +2342,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -2324,6 +2382,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 5 }, @@ -2363,6 +2422,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 6 }, @@ -2402,6 +2462,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 7 }, @@ -2441,6 +2502,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 8 }, @@ -2480,6 +2542,7 @@ "underline": false, "labelWidth": 29, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -2519,6 +2582,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 } diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg index 0afbc4588..f0f099f66 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg @@ -20,31 +20,6 @@ width="3306" height="4173" viewBox="-100 -100 3306 4173">a_shapea_sequenceanotherfinallysequencesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponsescoreritemResponseitemessayRubricconceptitemOutcome getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json index 853462bf3..8425081be 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json @@ -38,6 +38,7 @@ "labelWidth": 64, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -78,6 +79,7 @@ "labelWidth": 144, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -118,6 +120,7 @@ "labelWidth": 98, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -158,6 +161,7 @@ "labelWidth": 101, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -198,6 +202,7 @@ "labelWidth": 77, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -238,6 +243,7 @@ "labelWidth": 101, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -278,6 +284,7 @@ "labelWidth": 48, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -318,6 +325,7 @@ "labelWidth": 60, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -358,6 +366,7 @@ "labelWidth": 86, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -398,6 +407,7 @@ "labelWidth": 35, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -438,6 +448,7 @@ "labelWidth": 97, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -478,6 +489,7 @@ "labelWidth": 100, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -518,6 +530,7 @@ "labelWidth": 48, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -557,6 +570,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -597,6 +611,7 @@ "labelWidth": 100, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -636,6 +651,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -676,6 +692,7 @@ "labelWidth": 35, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -715,6 +732,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -755,6 +773,7 @@ "labelWidth": 86, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -794,6 +813,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -833,6 +853,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -873,6 +894,7 @@ "labelWidth": 60, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -912,6 +934,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -952,6 +975,7 @@ "labelWidth": 97, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 2 }, @@ -991,6 +1015,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -1030,6 +1055,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -1069,6 +1095,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -1108,6 +1135,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -1147,6 +1175,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 3 }, @@ -1187,6 +1216,7 @@ "labelWidth": 48, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -1226,6 +1256,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1266,6 +1297,7 @@ "labelWidth": 100, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -1305,6 +1337,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1345,6 +1378,7 @@ "labelWidth": 35, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -1384,6 +1418,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1424,6 +1459,7 @@ "labelWidth": 86, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -1463,6 +1499,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1502,6 +1539,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 5 }, @@ -1542,6 +1580,7 @@ "labelWidth": 60, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -1581,6 +1620,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1621,6 +1661,7 @@ "labelWidth": 97, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 3 }, @@ -1660,6 +1701,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1699,6 +1741,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1738,6 +1781,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1777,6 +1821,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1816,6 +1861,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1856,6 +1902,7 @@ "labelWidth": 72, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -1895,6 +1942,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1934,6 +1982,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -1973,6 +2022,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 5 }, @@ -2012,6 +2062,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -2051,6 +2102,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 5 }, @@ -2090,6 +2142,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 6 }, @@ -2129,6 +2182,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -2168,6 +2222,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 5 }, @@ -2207,6 +2262,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 6 }, @@ -2246,6 +2302,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 7 }, @@ -2285,6 +2342,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -2324,6 +2382,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 5 }, @@ -2363,6 +2422,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 6 }, @@ -2402,6 +2462,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 7 }, @@ -2441,6 +2502,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 8 }, @@ -2480,6 +2542,7 @@ "underline": false, "labelWidth": 29, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 }, @@ -2519,6 +2582,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, + "maskLabel": false, "zIndex": 2, "level": 4 } diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg index 22505f1ac..2b8e84882 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg @@ -20,31 +20,6 @@ width="3228" height="4293" viewBox="-88 -88 3228 4293">a_shapea_sequenceanotherfinallysequencesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponsescoreritemResponseitemessayRubricconceptitemOutcome getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json index b6e0dfc1d..3c230d2cb 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json @@ -68,6 +68,7 @@ "underline": false, "labelWidth": 61, "labelHeight": 36, + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -132,6 +133,7 @@ "underline": false, "labelWidth": 99, "labelHeight": 36, + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -190,6 +192,7 @@ "underline": false, "labelWidth": 74, "labelHeight": 36, + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -254,6 +257,7 @@ "underline": false, "labelWidth": 116, "labelHeight": 36, + "maskLabel": false, "zIndex": 0, "level": 1 } diff --git a/e2etests/testdata/stable/sql_tables/elk/board.exp.json b/e2etests/testdata/stable/sql_tables/elk/board.exp.json index 2734f02ca..7ee28e71f 100644 --- a/e2etests/testdata/stable/sql_tables/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/elk/board.exp.json @@ -68,6 +68,7 @@ "underline": false, "labelWidth": 61, "labelHeight": 36, + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -132,6 +133,7 @@ "underline": false, "labelWidth": 99, "labelHeight": 36, + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -190,6 +192,7 @@ "underline": false, "labelWidth": 74, "labelHeight": 36, + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -254,6 +257,7 @@ "underline": false, "labelWidth": 116, "labelHeight": 36, + "maskLabel": false, "zIndex": 0, "level": 1 } diff --git a/e2etests/testdata/stable/square_3d/dagre/board.exp.json b/e2etests/testdata/stable/square_3d/dagre/board.exp.json index 8a037500b..b20e9ce35 100644 --- a/e2etests/testdata/stable/square_3d/dagre/board.exp.json +++ b/e2etests/testdata/stable/square_3d/dagre/board.exp.json @@ -38,6 +38,7 @@ "labelWidth": 71, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -78,6 +79,7 @@ "labelWidth": 54, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 } diff --git a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg index 5ba3219c3..834d15ac7 100644 --- a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg @@ -22,11 +22,7 @@ width="371" height="580" viewBox="-100 -100 371 580">acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - - - - - - - - - - - - - - - - - - - - - - - - - - -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - - - - - - - - - - - - - - - - - - - - - - - - - - -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc -cube - - - -cube - - -AKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -AKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTNDAKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -AKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTNDcontainerfirstsecond 1->2c->2 - - - containerfirstsecond 1->2c->2 - - - ninety ninesixty fourthirty twosixteeneight - - - - - - -ninety ninesixty fourthirty twosixteeneightninety ninesixty fourthirty twosixteeneight - - - - - - -ninety ninesixty fourthirty twosixteeneighteightsixteenthirty twosixty fourninety nine twelvetwenty fourforty eighteighty one - - - - - diff --git a/e2etests/testdata/todo/font_sizes_large/elk/board.exp.json b/e2etests/testdata/todo/font_sizes_large/elk/board.exp.json index d012e76be..6b5fe14a7 100644 --- a/e2etests/testdata/todo/font_sizes_large/elk/board.exp.json +++ b/e2etests/testdata/todo/font_sizes_large/elk/board.exp.json @@ -38,6 +38,7 @@ "labelWidth": 24, "labelHeight": 16, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -78,6 +79,7 @@ "labelWidth": 57, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -118,6 +120,7 @@ "labelWidth": 147, "labelHeight": 46, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -158,6 +161,7 @@ "labelWidth": 274, "labelHeight": 86, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -198,6 +202,7 @@ "labelWidth": 489, "labelHeight": 130, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 } diff --git a/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg b/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg index fca37bdce..c417a43f7 100644 --- a/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg @@ -20,11 +20,6 @@ width="789" height="2014" viewBox="-39 -88 789 2014">eightsixteenthirty twosixty fourninety nine twelvetwenty fourforty eighteighty one - - - - - diff --git a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/board.exp.json b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/board.exp.json index cf833fad1..75883623f 100644 --- a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/board.exp.json +++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/board.exp.json @@ -38,6 +38,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -78,6 +79,7 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -118,6 +120,7 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -157,6 +160,7 @@ "underline": false, "labelWidth": 160, "labelHeight": 26, + "maskLabel": true, "zIndex": 3, "level": 1 }, @@ -196,6 +200,7 @@ "underline": false, "labelWidth": 238, "labelHeight": 26, + "maskLabel": true, "zIndex": 3, "level": 2 }, @@ -235,6 +240,7 @@ "underline": false, "labelWidth": 173, "labelHeight": 26, + "maskLabel": true, "zIndex": 3, "level": 3 }, @@ -274,6 +280,7 @@ "underline": false, "labelWidth": 21, "labelHeight": 26, + "maskLabel": true, "zIndex": 3, "level": 4 }, @@ -313,6 +320,7 @@ "underline": false, "labelWidth": 21, "labelHeight": 26, + "maskLabel": true, "zIndex": 3, "level": 5 } diff --git a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg index c9d626270..aa3e24ae2 100644 --- a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg @@ -20,9 +20,6 @@ width="921" height="1242" viewBox="-171 -50 921 1242">bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo - - - diff --git a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/board.exp.json b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/board.exp.json index cf833fad1..75883623f 100644 --- a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/board.exp.json +++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/board.exp.json @@ -38,6 +38,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -78,6 +79,7 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -118,6 +120,7 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -157,6 +160,7 @@ "underline": false, "labelWidth": 160, "labelHeight": 26, + "maskLabel": true, "zIndex": 3, "level": 1 }, @@ -196,6 +200,7 @@ "underline": false, "labelWidth": 238, "labelHeight": 26, + "maskLabel": true, "zIndex": 3, "level": 2 }, @@ -235,6 +240,7 @@ "underline": false, "labelWidth": 173, "labelHeight": 26, + "maskLabel": true, "zIndex": 3, "level": 3 }, @@ -274,6 +280,7 @@ "underline": false, "labelWidth": 21, "labelHeight": 26, + "maskLabel": true, "zIndex": 3, "level": 4 }, @@ -313,6 +320,7 @@ "underline": false, "labelWidth": 21, "labelHeight": 26, + "maskLabel": true, "zIndex": 3, "level": 5 } diff --git a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg index c9d626270..aa3e24ae2 100644 --- a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg @@ -20,9 +20,6 @@ width="921" height="1242" viewBox="-171 -50 921 1242">bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo - - - diff --git a/e2etests/testdata/todo/tall_edge_label/dagre/board.exp.json b/e2etests/testdata/todo/tall_edge_label/dagre/board.exp.json index 4050c622f..d71773832 100644 --- a/e2etests/testdata/todo/tall_edge_label/dagre/board.exp.json +++ b/e2etests/testdata/todo/tall_edge_label/dagre/board.exp.json @@ -38,6 +38,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 }, @@ -78,6 +79,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", + "maskLabel": false, "zIndex": 0, "level": 1 } diff --git a/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg b/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg index f8e2484f2..48d953e8d 100644 --- a/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg @@ -20,8 +20,6 @@ width="313" height="552" viewBox="-100 -100 313 552">ab Thereoncewasaverytalledgelabel - - ab Thereoncewasaverytalledgelabel - - abjust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townwhoa a notea note here to remember that padding must consider notes toojustalongnoteherebajust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townawhoaa note a note here to remember that padding must consider notes toojustalongnotehereabjust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townwhoa a notea note here to remember that padding must consider notes toojustalongnoteherebajust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townawhoaa note a note here to remember that padding must consider notes toojustalongnotehereHow this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place - +How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2dagrelayoutd2sequencelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place + - - - + + + diff --git a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json index b303818b1..a58eaf548 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json @@ -8,7 +8,7 @@ "x": 12, "y": 12 }, - "width": 2247, + "width": 2254, "height": 2336, "opacity": 1, "strokeDash": 0, @@ -321,6 +321,46 @@ "zIndex": 0, "level": 2 }, + { + "id": "How this is rendered.d2dagrelayout", + "type": "", + "pos": { + "x": 1759, + "y": 122 + }, + "width": 204, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d2dagrelayout", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 104, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, { "id": "How this is rendered.d2compiler.measurements also take place", "type": "rectangle", @@ -368,7 +408,7 @@ "x": 817, "y": 1374 }, - "width": 1365, + "width": 1093, "height": 80, "opacity": 1, "strokeDash": 0, @@ -443,7 +483,7 @@ "id": "How this is rendered.d2sequencelayout", "type": "", "pos": { - "x": 1752, + "x": 2013, "y": 122 }, "width": 229, @@ -479,46 +519,6 @@ "zIndex": 0, "level": 2 }, - { - "id": "How this is rendered.d2dagrelayout", - "type": "", - "pos": { - "x": 2031, - "y": 122 - }, - "width": 204, - "height": 126, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "#EDF0FD", - "stroke": "#0D32B2", - "shadow": false, - "3d": false, - "multiple": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "d2dagrelayout", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "#0A0F25", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 104, - "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 2 - }, { "id": "How this is rendered.d2exporter.export", "type": "rectangle", @@ -785,7 +785,7 @@ "y": 1284 }, { - "x": 1866.5, + "x": 2127.5, "y": 1284 } ], @@ -824,7 +824,7 @@ "y": 1414 }, { - "x": 2133, + "x": 1861, "y": 1414 } ], @@ -863,7 +863,7 @@ "y": 1544 }, { - "x": 1866.5, + "x": 2127.5, "y": 1544 } ], @@ -1340,45 +1340,6 @@ "icon": null, "zIndex": 1 }, - { - "id": "(How this is rendered.d2sequencelayout -- )[0]", - "src": "How this is rendered.d2sequencelayout", - "srcArrow": "none", - "srcLabel": "", - "dst": "d2sequencelayout-lifeline-end-3085844671", - "dstArrow": "none", - "dstLabel": "", - "opacity": 1, - "strokeDash": 6, - "strokeWidth": 2, - "stroke": "#0D32B2", - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "#676C7E", - "italic": true, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0, - "labelPosition": "", - "labelPercentage": 0, - "route": [ - { - "x": 1866.5, - "y": 248 - }, - { - "x": 1866.5, - "y": 2324 - } - ], - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 1 - }, { "id": "(How this is rendered.d2dagrelayout -- )[0]", "src": "How this is rendered.d2dagrelayout", @@ -1405,11 +1366,50 @@ "labelPercentage": 0, "route": [ { - "x": 2133, + "x": 1861, "y": 248 }, { - "x": 2133, + "x": 1861, + "y": 2324 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(How this is rendered.d2sequencelayout -- )[0]", + "src": "How this is rendered.d2sequencelayout", + "srcArrow": "none", + "srcLabel": "", + "dst": "d2sequencelayout-lifeline-end-3085844671", + "dstArrow": "none", + "dstLabel": "", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 2127.5, + "y": 248 + }, + { + "x": 2127.5, "y": 2324 } ], diff --git a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg index 9e6ceb66d..46d41d475 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg @@ -2,7 +2,7 @@ How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2dagrelayoutd2sequencelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place + - - - + + + diff --git a/e2etests/todo_test.go b/e2etests/todo_test.go index cc15f14ec..defa87cd6 100644 --- a/e2etests/todo_test.go +++ b/e2etests/todo_test.go @@ -75,15 +75,15 @@ ninety nine: { b;a;c b -> c this is a message group: { - _.a -> _.b + a -> b and this is a nested message group: { - _._.a -> _._.b + a -> b what about more nesting: { - _._._.a -> _._._.b + a -> b yo: { - _._._._.a -> _._._._.b + a -> b yo: { - _._._._._.a -> _._._._._.b + a -> b } } } diff --git a/testdata/d2compiler/TestCompile/leaky_sequence.exp.json b/testdata/d2compiler/TestCompile/leaky_sequence.exp.json index 8e993226b..e0a147f90 100644 --- a/testdata/d2compiler/TestCompile/leaky_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/leaky_sequence.exp.json @@ -4,7 +4,7 @@ "ioerr": null, "errs": [ { - "range": "d2/testdata/d2compiler/TestCompile/leaky_sequence.d2,4:0:36-4:8:44", + "range": "d2/testdata/d2compiler/TestCompile/leaky_sequence.d2,4:0:37-4:8:45", "errmsg": "d2/testdata/d2compiler/TestCompile/leaky_sequence.d2:5:1: connections within sequence diagrams can connect only to other objects within the same sequence diagram" } ] diff --git a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json new file mode 100644 index 000000000..df9cc8f88 --- /dev/null +++ b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json @@ -0,0 +1,395 @@ +{ + "graph": { + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,0:0:0-5:0:54", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,0:0:0-0:23:23", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,0:0:0-0:5:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,0:0:0-0:5:5", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,0:7:7-0:23:23", + "value": [ + { + "string": "sequence_diagram", + "raw_string": "sequence_diagram" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,1:0:24-1:1:25", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,1:0:24-1:1:25", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,1:0:24-1:1:25", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,1:2:26-1:3:27", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,1:2:26-1:3:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,1:2:26-1:3:27", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,2:0:28-4:1:53", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,2:0:28-2:4:32", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,2:0:28-2:4:32", + "value": [ + { + "string": "choo", + "raw_string": "choo" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,2:6:34-4:0:52", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,3:2:38-3:15:51", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,3:2:38-3:15:51", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,3:2:38-3:3:39", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,3:4:40-3:15:51", + "value": [ + { + "string": "this note", + "raw_string": "this note" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "attributes": { + "label": { + "value": "" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "sequence_diagram" + }, + "direction": { + "value": "" + } + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,1:0:24-1:1:25", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,1:0:24-1:1:25", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + } + }, + "zIndex": 0 + }, + { + "id": "d", + "id_val": "d", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,1:2:26-1:3:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,1:2:26-1:3:27", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,3:2:38-3:15:51", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,3:2:38-3:3:39", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,3:4:40-3:15:51", + "value": [ + { + "string": "this note", + "raw_string": "this note" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "d" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + } + }, + "zIndex": 0 + }, + { + "id": "choo", + "id_val": "choo", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,2:0:28-2:4:32", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,2:0:28-2:4:32", + "value": [ + { + "string": "choo", + "raw_string": "choo" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "choo" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + } + }, + "zIndex": 0 + }, + { + "id": "this note", + "id_val": "this note", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,3:2:38-3:15:51", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,3:2:38-3:3:39", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,3:4:40-3:15:51", + "value": [ + { + "string": "this note", + "raw_string": "this note" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "this note" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + } + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json new file mode 100644 index 000000000..815fbddb0 --- /dev/null +++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json @@ -0,0 +1,1059 @@ +{ + "graph": { + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,0:0:0-9:0:101", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,0:0:0-8:1:100", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,0:3:3-8:0:99", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,1:2:7-1:25:30", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,1:2:7-1:7:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,1:2:7-1:7:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,1:9:14-1:25:30", + "value": [ + { + "string": "sequence_diagram", + "raw_string": "sequence_diagram" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,2:1:32-2:2:33", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,2:1:32-2:2:33", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,2:1:32-2:2:33", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,2:3:34-2:4:35", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,2:3:34-2:4:35", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,2:3:34-2:4:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,3:2:38-7:3:98", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,3:2:38-3:7:43", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,3:2:38-3:7:43", + "value": [ + { + "string": "group", + "raw_string": "group" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,3:9:45-7:2:97", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:4:51-4:10:57", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:4:51-4:10:57", + "src": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:4:51-4:6:53", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:4:51-4:5:52", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:8:55-4:10:57", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:9:56-4:10:57", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:16:74", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:16:74", + "src": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:9:67", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:5:63", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:6:64-5:8:66", + "value": [ + { + "string": "t1", + "raw_string": "t1" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:11:69-5:16:74", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:12:70-5:13:71", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:14:72-5:16:74", + "value": [ + { + "string": "t1", + "raw_string": "t1" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:19:94", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:19:94", + "src": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:12:87", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:5:80", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:6:81-6:8:83", + "value": [ + { + "string": "t1", + "raw_string": "t1" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:9:84-6:11:86", + "value": [ + { + "string": "t2", + "raw_string": "t2" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:14:89-6:19:94", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:15:90-6:16:91", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:17:92-6:19:94", + "value": [ + { + "string": "t1", + "raw_string": "t1" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "attributes": { + "label": { + "value": "" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + } + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "minWidth": 0, + "minHeight": 0, + "label_dimensions": { + "width": 0, + "height": 0 + }, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + } + }, + "zIndex": 0 + }, + { + "index": 0, + "minWidth": 0, + "minHeight": 0, + "label_dimensions": { + "width": 0, + "height": 0 + }, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + } + }, + "zIndex": 0 + }, + { + "index": 0, + "minWidth": 0, + "minHeight": 0, + "label_dimensions": { + "width": 0, + "height": 0 + }, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + } + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "x", + "id_val": "x", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "sequence_diagram" + }, + "direction": { + "value": "" + } + }, + "zIndex": 0 + }, + { + "id": "a", + "id_val": "a", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,2:1:32-2:2:33", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,2:1:32-2:2:33", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:4:51-4:6:53", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:4:51-4:5:52", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:9:67", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:5:63", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:6:64-5:8:66", + "value": [ + { + "string": "t1", + "raw_string": "t1" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + } + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,2:3:34-2:4:35", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,2:3:34-2:4:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:8:55-4:10:57", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:9:56-4:10:57", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:11:69-5:16:74", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:12:70-5:13:71", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:14:72-5:16:74", + "value": [ + { + "string": "t1", + "raw_string": "t1" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:12:87", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:5:80", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:6:81-6:8:83", + "value": [ + { + "string": "t1", + "raw_string": "t1" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:9:84-6:11:86", + "value": [ + { + "string": "t2", + "raw_string": "t2" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:14:89-6:19:94", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:15:90-6:16:91", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:17:92-6:19:94", + "value": [ + { + "string": "t1", + "raw_string": "t1" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + } + }, + "zIndex": 0 + }, + { + "id": "group", + "id_val": "group", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,3:2:38-3:7:43", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,3:2:38-3:7:43", + "value": [ + { + "string": "group", + "raw_string": "group" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "group" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + } + }, + "zIndex": 0 + }, + { + "id": "t1", + "id_val": "t1", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:9:67", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:5:63", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:6:64-5:8:66", + "value": [ + { + "string": "t1", + "raw_string": "t1" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "t1" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + } + }, + "zIndex": 0 + }, + { + "id": "t1", + "id_val": "t1", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:11:69-5:16:74", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:12:70-5:13:71", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:14:72-5:16:74", + "value": [ + { + "string": "t1", + "raw_string": "t1" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:12:87", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:5:80", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:6:81-6:8:83", + "value": [ + { + "string": "t1", + "raw_string": "t1" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:9:84-6:11:86", + "value": [ + { + "string": "t2", + "raw_string": "t2" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:14:89-6:19:94", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:15:90-6:16:91", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:17:92-6:19:94", + "value": [ + { + "string": "t1", + "raw_string": "t1" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "t1" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + } + }, + "zIndex": 0 + }, + { + "id": "t2", + "id_val": "t2", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:12:87", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:5:80", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:6:81-6:8:83", + "value": [ + { + "string": "t1", + "raw_string": "t1" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:9:84-6:11:86", + "value": [ + { + "string": "t2", + "raw_string": "t2" + } + ] + } + } + ] + }, + "key_path_index": 2, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "t2" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + } + }, + "zIndex": 0 + } + ] + }, + "err": null +} From 662aef46603c160f420a45cc0fb5b2416d81fe55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Mon, 5 Dec 2022 19:50:42 -0800 Subject: [PATCH 08/12] Fix nit --- d2renderers/d2svg/d2svg.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index affcd1de5..2af505713 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -995,11 +995,13 @@ func Render(diagram *d2target.Diagram) ([]byte, error) { markers := map[string]struct{}{} for _, obj := range allObjects { if c, is := obj.(d2target.Connection); is { - if labelMask := drawConnection(buf, c, markers, idToShape); labelMask != "" { + labelMask := drawConnection(buf, c, markers, idToShape) + if labelMask != "" { labelMasks = append(labelMasks, labelMask) } } else if s, is := obj.(d2target.Shape); is { - if labelMask, err := drawShape(buf, s); err != nil { + labelMask, err := drawShape(buf, s) + if err != nil { return nil, err } else if labelMask != "" { labelMasks = append(labelMasks, labelMask) From ecbef4d75113c03492fc315c2523f97960cb4b3b Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 5 Dec 2022 19:51:16 -0800 Subject: [PATCH 09/12] save --- e2etests/stable_test.go | 2 +- .../dagre/board.exp.json | 174 +++++++++--------- .../dagre/sketch.exp.svg | 12 +- .../sequence_diagram_real/elk/board.exp.json | 174 +++++++++--------- .../sequence_diagram_real/elk/sketch.exp.svg | 12 +- 5 files changed, 187 insertions(+), 187 deletions(-) diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index dde123649..852e9a635 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -1431,7 +1431,7 @@ c: "just an actor" script: `How this is rendered: { shape: sequence_diagram - CLI; d2ast; d2compiler; d2layout; d2exporter; d2themes; d2renderer; d2dagrelayout + CLI; d2ast; d2compiler; d2layout; d2exporter; d2themes; d2renderer; d2sequencelayout; d2dagrelayout CLI -> d2ast: "'How this is rendered: {...}'" d2ast -> CLI: tokenized AST diff --git a/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json index ca4d9a833..27ff4c10a 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json @@ -8,7 +8,7 @@ "x": 0, "y": 0 }, - "width": 2254, + "width": 2247, "height": 2336, "opacity": 1, "strokeDash": 0, @@ -321,11 +321,51 @@ "zIndex": 0, "level": 2 }, + { + "id": "How this is rendered.d2sequencelayout", + "type": "", + "pos": { + "x": 1740, + "y": 110 + }, + "width": 229, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d2sequencelayout", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 129, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, { "id": "How this is rendered.d2dagrelayout", "type": "", "pos": { - "x": 1747, + "x": 2019, "y": 110 }, "width": 204, @@ -408,7 +448,7 @@ "x": 805, "y": 1362 }, - "width": 1093, + "width": 1365, "height": 80, "opacity": 1, "strokeDash": 0, @@ -479,46 +519,6 @@ "zIndex": 2, "level": 3 }, - { - "id": "How this is rendered.d2sequencelayout", - "type": "", - "pos": { - "x": 2001, - "y": 110 - }, - "width": 229, - "height": 126, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "#EDF0FD", - "stroke": "#0D32B2", - "shadow": false, - "3d": false, - "multiple": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "d2sequencelayout", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "#0A0F25", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 129, - "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 2 - }, { "id": "How this is rendered.d2exporter.export", "type": "rectangle", @@ -785,7 +785,7 @@ "y": 1272 }, { - "x": 2115.5, + "x": 1854.5, "y": 1272 } ], @@ -824,7 +824,7 @@ "y": 1402 }, { - "x": 1849, + "x": 2121, "y": 1402 } ], @@ -863,7 +863,7 @@ "y": 1532 }, { - "x": 2115.5, + "x": 1854.5, "y": 1532 } ], @@ -1340,45 +1340,6 @@ "icon": null, "zIndex": 1 }, - { - "id": "(How this is rendered.d2dagrelayout -- )[0]", - "src": "How this is rendered.d2dagrelayout", - "srcArrow": "none", - "srcLabel": "", - "dst": "d2dagrelayout-lifeline-end-3371915605", - "dstArrow": "none", - "dstLabel": "", - "opacity": 1, - "strokeDash": 6, - "strokeWidth": 2, - "stroke": "#0D32B2", - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "#676C7E", - "italic": true, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0, - "labelPosition": "", - "labelPercentage": 0, - "route": [ - { - "x": 1849, - "y": 236 - }, - { - "x": 1849, - "y": 2312 - } - ], - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 1 - }, { "id": "(How this is rendered.d2sequencelayout -- )[0]", "src": "How this is rendered.d2sequencelayout", @@ -1405,11 +1366,50 @@ "labelPercentage": 0, "route": [ { - "x": 2115.5, + "x": 1854.5, "y": 236 }, { - "x": 2115.5, + "x": 1854.5, + "y": 2312 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(How this is rendered.d2dagrelayout -- )[0]", + "src": "How this is rendered.d2dagrelayout", + "srcArrow": "none", + "srcLabel": "", + "dst": "d2dagrelayout-lifeline-end-3371915605", + "dstArrow": "none", + "dstLabel": "", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 2121, + "y": 236 + }, + { + "x": 2121, "y": 2312 } ], diff --git a/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg index 48a1c3f70..c61e17ede 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg @@ -2,7 +2,7 @@ How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place + - - - + + + diff --git a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json index a58eaf548..c6304f462 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json @@ -8,7 +8,7 @@ "x": 12, "y": 12 }, - "width": 2254, + "width": 2247, "height": 2336, "opacity": 1, "strokeDash": 0, @@ -321,11 +321,51 @@ "zIndex": 0, "level": 2 }, + { + "id": "How this is rendered.d2sequencelayout", + "type": "", + "pos": { + "x": 1752, + "y": 122 + }, + "width": 229, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d2sequencelayout", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 129, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, { "id": "How this is rendered.d2dagrelayout", "type": "", "pos": { - "x": 1759, + "x": 2031, "y": 122 }, "width": 204, @@ -408,7 +448,7 @@ "x": 817, "y": 1374 }, - "width": 1093, + "width": 1365, "height": 80, "opacity": 1, "strokeDash": 0, @@ -479,46 +519,6 @@ "zIndex": 2, "level": 3 }, - { - "id": "How this is rendered.d2sequencelayout", - "type": "", - "pos": { - "x": 2013, - "y": 122 - }, - "width": 229, - "height": 126, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "#EDF0FD", - "stroke": "#0D32B2", - "shadow": false, - "3d": false, - "multiple": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "d2sequencelayout", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "#0A0F25", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 129, - "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 2 - }, { "id": "How this is rendered.d2exporter.export", "type": "rectangle", @@ -785,7 +785,7 @@ "y": 1284 }, { - "x": 2127.5, + "x": 1866.5, "y": 1284 } ], @@ -824,7 +824,7 @@ "y": 1414 }, { - "x": 1861, + "x": 2133, "y": 1414 } ], @@ -863,7 +863,7 @@ "y": 1544 }, { - "x": 2127.5, + "x": 1866.5, "y": 1544 } ], @@ -1340,45 +1340,6 @@ "icon": null, "zIndex": 1 }, - { - "id": "(How this is rendered.d2dagrelayout -- )[0]", - "src": "How this is rendered.d2dagrelayout", - "srcArrow": "none", - "srcLabel": "", - "dst": "d2dagrelayout-lifeline-end-3371915605", - "dstArrow": "none", - "dstLabel": "", - "opacity": 1, - "strokeDash": 6, - "strokeWidth": 2, - "stroke": "#0D32B2", - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "#676C7E", - "italic": true, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0, - "labelPosition": "", - "labelPercentage": 0, - "route": [ - { - "x": 1861, - "y": 248 - }, - { - "x": 1861, - "y": 2324 - } - ], - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 1 - }, { "id": "(How this is rendered.d2sequencelayout -- )[0]", "src": "How this is rendered.d2sequencelayout", @@ -1405,11 +1366,50 @@ "labelPercentage": 0, "route": [ { - "x": 2127.5, + "x": 1866.5, "y": 248 }, { - "x": 2127.5, + "x": 1866.5, + "y": 2324 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(How this is rendered.d2dagrelayout -- )[0]", + "src": "How this is rendered.d2dagrelayout", + "srcArrow": "none", + "srcLabel": "", + "dst": "d2dagrelayout-lifeline-end-3371915605", + "dstArrow": "none", + "dstLabel": "", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 2133, + "y": 248 + }, + { + "x": 2133, "y": 2324 } ], diff --git a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg index 46d41d475..9e6ceb66d 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg @@ -2,7 +2,7 @@ How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place + - - - + + + From 1512ea6253bf3a9c6e6cf85bb7d269982973c616 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 5 Dec 2022 19:52:20 -0800 Subject: [PATCH 10/12] save --- e2etests/stable_test.go | 2 + .../dagre/board.exp.json | 510 ++++++++---------- .../dagre/sketch.exp.svg | 4 +- .../elk/board.exp.json | 510 ++++++++---------- .../elk/sketch.exp.svg | 4 +- 5 files changed, 478 insertions(+), 552 deletions(-) diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index 852e9a635..a7e7d93e3 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -1389,6 +1389,8 @@ choo: { name: "sequence_diagram_nested_groups", script: `shape: sequence_diagram +a; b; c + this is a message group: { a -> b and this is a nested message group: { diff --git a/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/board.exp.json index a6530a598..659f3e957 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/board.exp.json @@ -1,15 +1,135 @@ { "name": "", "shapes": [ + { + "id": "a", + "type": "", + "pos": { + "x": 24, + "y": 74 + }, + "width": 150, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "", + "pos": { + "x": 337, + "y": 74 + }, + "width": 150, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c", + "type": "", + "pos": { + "x": 629, + "y": 74 + }, + "width": 190, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "just an actor", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 90, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, { "id": "this is a message group", "type": "", "pos": { - "x": -47, + "x": -97, "y": 290 }, - "width": 0, - "height": 0, + "width": 655, + "height": 952, "opacity": 1, "strokeDash": 0, "strokeWidth": 0, @@ -44,11 +164,11 @@ "id": "this is a message group.and this is a nested message group", "type": "", "pos": { - "x": -23, + "x": -73, "y": 420 }, - "width": 0, - "height": 0, + "width": 607, + "height": 798, "opacity": 1, "strokeDash": 0, "strokeWidth": 0, @@ -83,11 +203,11 @@ "id": "this is a message group.and this is a nested message group.what about more nesting", "type": "", "pos": { - "x": 1, + "x": -49, "y": 550 }, - "width": 0, - "height": 0, + "width": 559, + "height": 644, "opacity": 1, "strokeDash": 0, "strokeWidth": 0, @@ -122,16 +242,16 @@ "id": "this is a message group.and this is a nested message group.what about more nesting.crazy town", "type": "", "pos": { - "x": 25, + "x": -25, "y": 680 }, - "width": 0, - "height": 0, + "width": 511, + "height": 490, "opacity": 1, "strokeDash": 0, - "strokeWidth": 2, + "strokeWidth": 0, "borderRadius": 0, - "fill": "#EEF1F8", + "fill": "#DEE1EB", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -140,7 +260,7 @@ "link": "", "icon": null, "iconPosition": "", - "blend": false, + "blend": true, "fields": null, "methods": null, "columns": null, @@ -158,53 +278,14 @@ "level": 4 }, { - "id": "this is a message group.and this is a nested message group.what about more nesting.crazy town.a", - "type": "", + "id": "a.a note", + "type": "rectangle", "pos": { - "x": 9223372036854775807, - "y": 9223372036854775807 + "x": 25, + "y": 720 }, - "width": 0, - "height": 0, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "#FFFFFF", - "stroke": "#0D32B2", - "shadow": false, - "3d": false, - "multiple": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "a", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "#0A0F25", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 12, - "labelHeight": 26, - "zIndex": 3, - "level": 5 - }, - { - "id": "this is a message group.and this is a nested message group.what about more nesting.crazy town.a.a note", - "type": "", - "pos": { - "x": 9223372036854775807, - "y": 9223372036854775807 - }, - "width": -9223372036854775808, - "height": -9223372036854775808, + "width": 148, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -232,15 +313,16 @@ "underline": false, "labelWidth": 48, "labelHeight": 26, - "zIndex": 3, - "level": 6 + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 2 }, { "id": "this is a message group.and this is a nested message group.what about more nesting.crazy town.whoa", "type": "", "pos": { "x": 49, - "y": 810 + "y": 1066 }, "width": 413, "height": 80, @@ -278,10 +360,10 @@ "id": "alt", "type": "", "pos": { - "x": 25, - "y": 916 + "x": 338, + "y": 1172 }, - "width": 711, + "width": 460, "height": 518, "opacity": 1, "strokeDash": 0, @@ -317,10 +399,10 @@ "id": "alt.case 1", "type": "", "pos": { - "x": 49, - "y": 940 + "x": 362, + "y": 1196 }, - "width": 663, + "width": 412, "height": 80, "opacity": 1, "strokeDash": 0, @@ -356,10 +438,10 @@ "id": "alt.case 2", "type": "", "pos": { - "x": 49, - "y": 1070 + "x": 362, + "y": 1326 }, - "width": 663, + "width": 412, "height": 80, "opacity": 1, "strokeDash": 0, @@ -395,10 +477,10 @@ "id": "alt.case 3", "type": "", "pos": { - "x": 49, - "y": 1200 + "x": 362, + "y": 1456 }, - "width": 663, + "width": 412, "height": 80, "opacity": 1, "strokeDash": 0, @@ -434,10 +516,10 @@ "id": "alt.case 4", "type": "", "pos": { - "x": 49, - "y": 1330 + "x": 362, + "y": 1586 }, - "width": 663, + "width": 412, "height": 80, "opacity": 1, "strokeDash": 0, @@ -469,52 +551,12 @@ "zIndex": 3, "level": 2 }, - { - "id": "b", - "type": "", - "pos": { - "x": 24, - "y": 74 - }, - "width": 150, - "height": 126, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "#EDF0FD", - "stroke": "#0D32B2", - "shadow": false, - "3d": false, - "multiple": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "b", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "#0A0F25", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 13, - "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 1 - }, { "id": "b.note", "type": "rectangle", "pos": { - "x": -163, - "y": 1500 + "x": 149, + "y": 2076 }, "width": 525, "height": 126, @@ -549,51 +591,11 @@ "zIndex": 5, "level": 2 }, - { - "id": "a", - "type": "", - "pos": { - "x": 337, - "y": 74 - }, - "width": 150, - "height": 126, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "#EDF0FD", - "stroke": "#0D32B2", - "shadow": false, - "3d": false, - "multiple": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "a", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "#0A0F25", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 12, - "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 1 - }, { "id": "a.note", "type": "rectangle", "pos": { - "x": 343, + "x": 30, "y": 1756 }, "width": 137, @@ -628,46 +630,6 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 5, "level": 2 - }, - { - "id": "c", - "type": "", - "pos": { - "x": 567, - "y": 74 - }, - "width": 190, - "height": 126, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "#EDF0FD", - "stroke": "#0D32B2", - "shadow": false, - "3d": false, - "multiple": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "just an actor", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "#0A0F25", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 90, - "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 1 } ], "connections": [ @@ -697,11 +659,11 @@ "labelPercentage": 0, "route": [ { - "x": 412, + "x": 99, "y": 330 }, { - "x": 99, + "x": 412, "y": 330 } ], @@ -736,11 +698,11 @@ "labelPercentage": 0, "route": [ { - "x": 412, + "x": 99, "y": 460 }, { - "x": 99, + "x": 412, "y": 460 } ], @@ -775,11 +737,11 @@ "labelPercentage": 0, "route": [ { - "x": 412, + "x": 99, "y": 590 }, { - "x": 99, + "x": 412, "y": 590 } ], @@ -814,12 +776,12 @@ "labelPercentage": 0, "route": [ { - "x": 412, - "y": 720 + "x": 99, + "y": 976 }, { - "x": 99, - "y": 720 + "x": 412, + "y": 976 } ], "animated": false, @@ -853,12 +815,12 @@ "labelPercentage": 0, "route": [ { - "x": 412, - "y": 850 + "x": 99, + "y": 1106 }, { - "x": 99, - "y": 850 + "x": 412, + "y": 1106 } ], "animated": false, @@ -892,12 +854,12 @@ "labelPercentage": 0, "route": [ { - "x": 99, - "y": 980 + "x": 412, + "y": 1236 }, { - "x": 662, - "y": 980 + "x": 724, + "y": 1236 } ], "animated": false, @@ -931,12 +893,12 @@ "labelPercentage": 0, "route": [ { - "x": 99, - "y": 1110 + "x": 412, + "y": 1366 }, { - "x": 662, - "y": 1110 + "x": 724, + "y": 1366 } ], "animated": false, @@ -970,12 +932,12 @@ "labelPercentage": 0, "route": [ { - "x": 99, - "y": 1240 + "x": 412, + "y": 1496 }, { - "x": 662, - "y": 1240 + "x": 724, + "y": 1496 } ], "animated": false, @@ -1009,12 +971,12 @@ "labelPercentage": 0, "route": [ { - "x": 99, - "y": 1370 + "x": 412, + "y": 1626 }, { - "x": 662, - "y": 1370 + "x": 724, + "y": 1626 } ], "animated": false, @@ -1022,45 +984,6 @@ "icon": null, "zIndex": 4 }, - { - "id": "(b -- )[0]", - "src": "b", - "srcArrow": "none", - "srcLabel": "", - "dst": "b-lifeline-end-668380428", - "dstArrow": "none", - "dstLabel": "", - "opacity": 1, - "strokeDash": 6, - "strokeWidth": 2, - "stroke": "#0D32B2", - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "#676C7E", - "italic": true, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0, - "labelPosition": "", - "labelPercentage": 0, - "route": [ - { - "x": 99, - "y": 200 - }, - { - "x": 99, - "y": 2076 - } - ], - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 1 - }, { "id": "(a -- )[0]", "src": "a", @@ -1085,6 +1008,45 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "route": [ + { + "x": 99, + "y": 200 + }, + { + "x": 99, + "y": 2332 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(b -- )[0]", + "src": "b", + "srcArrow": "none", + "srcLabel": "", + "dst": "b-lifeline-end-668380428", + "dstArrow": "none", + "dstLabel": "", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, "route": [ { "x": 412, @@ -1092,7 +1054,7 @@ }, { "x": 412, - "y": 2076 + "y": 2332 } ], "animated": false, @@ -1126,12 +1088,12 @@ "labelPercentage": 0, "route": [ { - "x": 662, + "x": 724, "y": 200 }, { - "x": 662, - "y": 2076 + "x": 724, + "y": 2332 } ], "animated": false, diff --git a/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg index 1a1f846f3..e97ce77dc 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg @@ -2,7 +2,7 @@