From ecbef4d75113c03492fc315c2523f97960cb4b3b Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 5 Dec 2022 19:51:16 -0800 Subject: [PATCH] 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 + - - - + + +