From 3ace33fd015e69f4f057319d0a9dd8b091a409e7 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Fri, 27 Jan 2023 23:28:44 -0800 Subject: [PATCH] d2ir: Review fixes #714 --- .../child_parent_edges/dagre/board.exp.json | 168 +-- .../child_parent_edges/dagre/sketch.exp.svg | 2 +- .../constant_near_stress/dagre/board.exp.json | 12 +- .../constant_near_stress/dagre/sketch.exp.svg | 6 +- .../constant_near_stress/elk/board.exp.json | 12 +- .../constant_near_stress/elk/sketch.exp.svg | 6 +- .../different_subgraphs/dagre/board.exp.json | 384 ++--- .../different_subgraphs/dagre/sketch.exp.svg | 2 +- .../different_subgraphs/elk/board.exp.json | 328 ++--- .../different_subgraphs/elk/sketch.exp.svg | 2 +- .../stable/direction/dagre/board.exp.json | 422 +++--- .../stable/direction/dagre/sketch.exp.svg | 2 +- .../stable/direction/elk/board.exp.json | 80 +- .../stable/direction/elk/sketch.exp.svg | 2 +- .../stable/investigate/dagre/board.exp.json | 288 ++-- .../stable/investigate/dagre/sketch.exp.svg | 2 +- .../stable/investigate/elk/board.exp.json | 234 ++-- .../stable/investigate/elk/sketch.exp.svg | 2 +- .../dagre/board.exp.json | 156 ++- .../dagre/sketch.exp.svg | 8 +- .../elk/board.exp.json | 156 ++- .../elk/sketch.exp.svg | 8 +- .../dagre/board.exp.json | 780 +++++++++++ .../dagre/sketch.exp.svg | 6 +- .../elk/board.exp.json | 780 +++++++++++ .../elk/sketch.exp.svg | 6 +- .../dagre/board.exp.json | 234 ++++ .../dagre/sketch.exp.svg | 6 +- .../elk/board.exp.json | 234 ++++ .../elk/sketch.exp.svg | 6 +- .../dagre/board.exp.json | 156 +++ .../dagre/sketch.exp.svg | 6 +- .../sequence_diagram_note/elk/board.exp.json | 156 +++ .../sequence_diagram_note/elk/sketch.exp.svg | 6 +- .../dagre/board.exp.json | 172 ++- .../dagre/sketch.exp.svg | 8 +- .../elk/board.exp.json | 172 ++- .../elk/sketch.exp.svg | 8 +- .../dagre/board.exp.json | 195 +++ .../dagre/sketch.exp.svg | 6 +- .../elk/board.exp.json | 195 +++ .../elk/sketch.exp.svg | 6 +- .../dagre/board.exp.json | 234 ++++ .../dagre/sketch.exp.svg | 6 +- .../sequence_diagram_span/elk/board.exp.json | 234 ++++ .../sequence_diagram_span/elk/sketch.exp.svg | 6 +- .../sequence_diagrams/dagre/board.exp.json | 1242 +++++++++++++---- .../sequence_diagrams/dagre/sketch.exp.svg | 2 +- .../sequence_diagrams/elk/board.exp.json | 1080 +++++++++++--- .../sequence_diagrams/elk/sketch.exp.svg | 2 +- .../TestCompile/sequence_container.exp.json | 4 +- .../shape/sequence_group_position.exp.json | 60 + .../d2oracle/TestCreate/edge_unique.exp.json | 68 +- .../d2oracle/TestRename/container.exp.json | 204 +-- testdata/d2oracle/TestRename/edges.exp.json | 136 +- 55 files changed, 6836 insertions(+), 1862 deletions(-) diff --git a/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json b/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json index e78a7b9ae..c70ecaf0d 100644 --- a/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json +++ b/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json @@ -168,6 +168,90 @@ } ], "connections": [ + { + "id": "(a.b -> a)[0]", + "src": "a.b", + "srcArrow": "none", + "srcLabel": "", + "dst": "a", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "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": 244, + "y": 173.24723247232473 + }, + { + "x": 270.66666666666663, + "y": 154.64944649446494 + }, + { + "x": 279, + "y": 150 + }, + { + "x": 281.5, + "y": 150 + }, + { + "x": 284, + "y": 150 + }, + { + "x": 287.33333333333337, + "y": 162.6 + }, + { + "x": 289.83333333333337, + "y": 181.5 + }, + { + "x": 292.3333333333333, + "y": 200.4 + }, + { + "x": 292.3333333333333, + "y": 225.6 + }, + { + "x": 289.83333333333337, + "y": 244.5 + }, + { + "x": 287.33333333333337, + "y": 263.4 + }, + { + "x": 270.66666666666663, + "y": 271.35055350553506 + }, + { + "x": 244, + "y": 252.75276752767527 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, { "id": "a.(b -> b.c)[0]", "src": "a.b", @@ -290,90 +374,6 @@ "tooltip": "", "icon": null, "zIndex": 0 - }, - { - "id": "(a.b -> a)[0]", - "src": "a.b", - "srcArrow": "none", - "srcLabel": "", - "dst": "a", - "dstArrow": "triangle", - "dstLabel": "", - "opacity": 1, - "strokeDash": 0, - "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": 244, - "y": 173.24723247232473 - }, - { - "x": 270.66666666666663, - "y": 154.64944649446494 - }, - { - "x": 279, - "y": 150 - }, - { - "x": 281.5, - "y": 150 - }, - { - "x": 284, - "y": 150 - }, - { - "x": 287.33333333333337, - "y": 162.6 - }, - { - "x": 289.83333333333337, - "y": 181.5 - }, - { - "x": 292.3333333333333, - "y": 200.4 - }, - { - "x": 292.3333333333333, - "y": 225.6 - }, - { - "x": 289.83333333333337, - "y": 244.5 - }, - { - "x": 287.33333333333337, - "y": 263.4 - }, - { - "x": 270.66666666666663, - "y": 271.35055350553506 - }, - { - "x": 244, - "y": 252.75276752767527 - } - ], - "isCurve": true, - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/child_parent_edges/dagre/sketch.exp.svg b/e2etests/testdata/stable/child_parent_edges/dagre/sketch.exp.svg index fe30a1d30..b61acfe6e 100644 --- a/e2etests/testdata/stable/child_parent_edges/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/child_parent_edges/dagre/sketch.exp.svg @@ -39,7 +39,7 @@ width="698" height="630" viewBox="-102 -102 698 630">xyThe top of the mountain

Cats, no less liquid than their shadows, offer no angles to the wind.

If we can't fix it, it ain't broke.

Dieters live life in the fasting lane.

-
JoeDonaldi am top lefti am top righti am bottom lefti am bottom right - +JoeDonaldi am top lefti am top righti am bottom lefti am bottom right + xyThe top of the mountain

Cats, no less liquid than their shadows, offer no angles to the wind.

If we can't fix it, it ain't broke.

Dieters live life in the fasting lane.

-
JoeDonaldi am top lefti am top righti am bottom lefti am bottom right - +JoeDonaldi am top lefti am top righti am bottom lefti am bottom right +