diff --git a/e2etests/testdata/files/nested_diagram_types.d2 b/e2etests/testdata/files/nested_diagram_types.d2 index 7435a7776..61dbfcdf9 100644 --- a/e2etests/testdata/files/nested_diagram_types.d2 +++ b/e2etests/testdata/files/nested_diagram_types.d2 @@ -24,27 +24,25 @@ b: { shape: sequence_diagram 1 -> 2 - # # TODO This should work - # near: bottom-right - # # + near: bottom-right - # 2: { - # # TODO compile error grid on sequence actor - # # grid-rows: 3 - # x - # y - # z - # } + 2: { + # TODO compile error grid on sequence actor? + grid-columns: 3 + x + y + z + } - # 1: { - # x: { - # # TODO compile error grid in sequence (anywhere) - # # grid-rows: 3 - # u - # v - # w - # } - # y - # z - # } + 1: { + x: { + # TODO compile error grid in sequence (group) + grid-columns: 3 + u + v + w + } + y + z + } } diff --git a/e2etests/testdata/stable/nested_diagram_types/dagre/board.exp.json b/e2etests/testdata/stable/nested_diagram_types/dagre/board.exp.json index 678409ed9..01a2851cd 100644 --- a/e2etests/testdata/stable/nested_diagram_types/dagre/board.exp.json +++ b/e2etests/testdata/stable/nested_diagram_types/dagre/board.exp.json @@ -3,53 +3,12 @@ "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ - { - "id": "b", - "type": "sequence_diagram", - "pos": { - "x": 0, - "y": 0 - }, - "width": 699, - "height": 393, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 0, - "borderRadius": 0, - "fill": "N7", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "b", - "fontSize": 28, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 13, - "labelHeight": 36, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 1 - }, { "id": "c", "type": "rectangle", "pos": { - "x": 759, - "y": 164 + "x": 0, + "y": 0 }, "width": 53, "height": 66, @@ -86,14 +45,96 @@ "level": 1 }, { - "id": "b.1", + "id": "a", "type": "rectangle", "pos": { - "x": 0, - "y": 0 + "x": 73, + "y": -142 }, - "width": 617, - "height": 187, + "width": 579, + "height": 351, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "sequence_diagram", + "pos": { + "x": 73, + "y": 228 + }, + "width": 521, + "height": 1106, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a.1", + "type": "rectangle", + "pos": { + "x": 133, + "y": -82 + }, + "width": 52, + "height": 231, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -118,23 +159,23 @@ "language": "", "color": "N1", "italic": false, - "bold": false, + "bold": true, "underline": false, "labelWidth": 7, "labelHeight": 21, - "labelPosition": "OUTSIDE_TOP_CENTER", + "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 2 }, { - "id": "b.2", + "id": "a.2", "type": "rectangle", "pos": { - "x": 422, - "y": 327 + "x": 225, + "y": -82 }, - "width": 277, - "height": 66, + "width": 53, + "height": 231, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -159,7 +200,7 @@ "language": "", "color": "N1", "italic": false, - "bold": false, + "bold": true, "underline": false, "labelWidth": 8, "labelHeight": 21, @@ -168,19 +209,60 @@ "level": 2 }, { - "id": "b.1.x", + "id": "a.3", + "type": "sequence_diagram", + "pos": { + "x": 318, + "y": -82 + }, + "width": 274, + "height": 231, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "3", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.3.x", "type": "rectangle", "pos": { - "x": 30, - "y": 31 + "x": 330, + "y": 0 }, - "width": 342, - "height": 126, + "width": 100, + "height": 66, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "B4", + "fill": "N7", "stroke": "B1", "shadow": false, "3d": false, @@ -204,141 +286,18 @@ "underline": false, "labelWidth": 7, "labelHeight": 21, - "labelPosition": "OUTSIDE_TOP_CENTER", + "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 3 }, { - "id": "b.1.x.u", + "id": "a.3.y", "type": "rectangle", "pos": { - "x": 60, - "y": 61 + "x": 480, + "y": 0 }, - "width": 52, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "N7", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "u", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 7, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 4 - }, - { - "id": "b.1.x.v", - "type": "rectangle", - "pos": { - "x": 172, - "y": 61 - }, - "width": 53, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "N7", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "v", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 8, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 4 - }, - { - "id": "b.1.x.w", - "type": "rectangle", - "pos": { - "x": 285, - "y": 61 - }, - "width": 57, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "N7", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "w", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 12, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 4 - }, - { - "id": "b.1.y", - "type": "rectangle", - "pos": { - "x": 534, - "y": 61 - }, - "width": 53, + "width": 100, "height": 66, "opacity": 1, "strokeDash": 0, @@ -373,11 +332,297 @@ "level": 3 }, { - "id": "b.1.z", + "id": "b.1", "type": "rectangle", "pos": { - "x": 422, - "y": 61 + "x": 85, + "y": 436 + }, + "width": 100, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "b.2", + "type": "rectangle", + "pos": { + "x": 225, + "y": 316 + }, + "width": 357, + "height": 186, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "b.1.x", + "type": "rectangle", + "pos": { + "x": 129, + "y": 632 + }, + "width": 12, + "height": 358, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "zIndex": 2, + "level": 3 + }, + { + "id": "b.1.x.u", + "type": "page", + "pos": { + "x": 109, + "y": 642 + }, + "width": 52, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "u", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 4 + }, + { + "id": "b.1.x.v", + "type": "page", + "pos": { + "x": 108, + "y": 778 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "v", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 4 + }, + { + "id": "b.1.x.w", + "type": "page", + "pos": { + "x": 106, + "y": 914 + }, + "width": 57, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "w", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 4 + }, + { + "id": "b.1.y", + "type": "page", + "pos": { + "x": 108, + "y": 1050 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "y", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 3 + }, + { + "id": "b.1.z", + "type": "page", + "pos": { + "x": 109, + "y": 1186 }, "width": 52, "height": 66, @@ -410,15 +655,15 @@ "labelWidth": 7, "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, + "zIndex": 5, "level": 3 }, { "id": "b.2.x", "type": "rectangle", "pos": { - "x": 422, - "y": 327 + "x": 285, + "y": 376 }, "width": 52, "height": 66, @@ -458,8 +703,8 @@ "id": "b.2.y", "type": "rectangle", "pos": { - "x": 534, - "y": 327 + "x": 377, + "y": 376 }, "width": 53, "height": 66, @@ -499,8 +744,8 @@ "id": "b.2.z", "type": "rectangle", "pos": { - "x": 647, - "y": 327 + "x": 470, + "y": 376 }, "width": 52, "height": 66, @@ -535,255 +780,161 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 3 - }, - { - "id": "a", - "type": "rectangle", - "pos": { - "x": 832, - "y": -444 - }, - "width": 285, - "height": 398, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "B4", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "a", - "fontSize": 28, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 12, - "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 0, - "level": 1 - }, - { - "id": "a.1", - "type": "rectangle", - "pos": { - "x": 892, - "y": -384 - }, - "width": 165, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "B5", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "1", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": true, - "underline": false, - "labelWidth": 7, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 2 - }, - { - "id": "a.2", - "type": "rectangle", - "pos": { - "x": 892, - "y": -278 - }, - "width": 165, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "B5", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "2", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": true, - "underline": false, - "labelWidth": 8, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 2 - }, - { - "id": "a.3", - "type": "sequence_diagram", - "pos": { - "x": 892, - "y": -172 - }, - "width": 165, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 0, - "borderRadius": 0, - "fill": "N7", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "3", - "fontSize": 24, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 11, - "labelHeight": 31, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 2 - }, - { - "id": "a.3.x", - "type": "rectangle", - "pos": { - "x": 892, - "y": -172 - }, - "width": 52, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "N7", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "x", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 7, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 3 - }, - { - "id": "a.3.y", - "type": "rectangle", - "pos": { - "x": 1004, - "y": -172 - }, - "width": 53, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "N7", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "y", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 8, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 3 } ], "connections": [ + { + "id": "a.(1 -> 2)[0]", + "src": "a.1", + "srcArrow": "none", + "dst": "a.2", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 184.5, + "y": 33 + }, + { + "x": 225.5, + "y": 33 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "a.(2 -> 3)[0]", + "src": "a.2", + "srcArrow": "none", + "dst": "a.3", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 278, + "y": 33 + }, + { + "x": 318, + "y": 33 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.3.x -- )[0]", + "src": "a.3.x", + "srcArrow": "none", + "dst": "x-lifeline-end-1678191278", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 380, + "y": 66.5 + }, + { + "x": 380, + "y": 136.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(a.3.y -- )[0]", + "src": "a.3.y", + "srcArrow": "none", + "dst": "y-lifeline-end-35261543", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 530, + "y": 66.5 + }, + { + "x": 530, + "y": 136.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, { "id": "b.(1 -> 2)[0]", "src": "b.1", @@ -809,27 +960,94 @@ "labelPercentage": 0, "route": [ { - "x": 560.5, - "y": 187 + "x": 135, + "y": 572.5 }, { - "x": 560.5, - "y": 259 - }, - { - "x": 560.5, - "y": 287 - }, - { - "x": 560.5, - "y": 327 + "x": 403.5, + "y": 572.5 } ], - "isCurve": true, "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 4 + }, + { + "id": "(b.1 -- )[0]", + "src": "b.1", + "srcArrow": "none", + "dst": "1-lifeline-end-1719232319", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 135, + "y": 502.5 + }, + { + "x": 135, + "y": 1322.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(b.2 -- )[0]", + "src": "b.2", + "srcArrow": "none", + "dst": "2-lifeline-end-1739547740", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 403.5, + "y": 502.5 + }, + { + "x": 403.5, + "y": 1322.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 } ], "root": { diff --git a/e2etests/testdata/stable/nested_diagram_types/dagre/sketch.exp.svg b/e2etests/testdata/stable/nested_diagram_types/dagre/sketch.exp.svg index 10abb5e04..145aa8194 100644 --- a/e2etests/testdata/stable/nested_diagram_types/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/nested_diagram_types/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -bca12123xyzxyzxyuvw - - - - - - - - - - - - - - - - - - - - + .d2-3076621705 .fill-N1{fill:#0A0F25;} + .d2-3076621705 .fill-N2{fill:#676C7E;} + .d2-3076621705 .fill-N3{fill:#9499AB;} + .d2-3076621705 .fill-N4{fill:#CFD2DD;} + .d2-3076621705 .fill-N5{fill:#DEE1EB;} + .d2-3076621705 .fill-N6{fill:#EEF1F8;} + .d2-3076621705 .fill-N7{fill:#FFFFFF;} + .d2-3076621705 .fill-B1{fill:#0D32B2;} + .d2-3076621705 .fill-B2{fill:#0D32B2;} + .d2-3076621705 .fill-B3{fill:#E3E9FD;} + .d2-3076621705 .fill-B4{fill:#E3E9FD;} + .d2-3076621705 .fill-B5{fill:#EDF0FD;} + .d2-3076621705 .fill-B6{fill:#F7F8FE;} + .d2-3076621705 .fill-AA2{fill:#4A6FF3;} + .d2-3076621705 .fill-AA4{fill:#EDF0FD;} + .d2-3076621705 .fill-AA5{fill:#F7F8FE;} + .d2-3076621705 .fill-AB4{fill:#EDF0FD;} + .d2-3076621705 .fill-AB5{fill:#F7F8FE;} + .d2-3076621705 .stroke-N1{stroke:#0A0F25;} + .d2-3076621705 .stroke-N2{stroke:#676C7E;} + .d2-3076621705 .stroke-N3{stroke:#9499AB;} + .d2-3076621705 .stroke-N4{stroke:#CFD2DD;} + .d2-3076621705 .stroke-N5{stroke:#DEE1EB;} + .d2-3076621705 .stroke-N6{stroke:#EEF1F8;} + .d2-3076621705 .stroke-N7{stroke:#FFFFFF;} + .d2-3076621705 .stroke-B1{stroke:#0D32B2;} + .d2-3076621705 .stroke-B2{stroke:#0D32B2;} + .d2-3076621705 .stroke-B3{stroke:#E3E9FD;} + .d2-3076621705 .stroke-B4{stroke:#E3E9FD;} + .d2-3076621705 .stroke-B5{stroke:#EDF0FD;} + .d2-3076621705 .stroke-B6{stroke:#F7F8FE;} + .d2-3076621705 .stroke-AA2{stroke:#4A6FF3;} + .d2-3076621705 .stroke-AA4{stroke:#EDF0FD;} + .d2-3076621705 .stroke-AA5{stroke:#F7F8FE;} + .d2-3076621705 .stroke-AB4{stroke:#EDF0FD;} + .d2-3076621705 .stroke-AB5{stroke:#F7F8FE;} + .d2-3076621705 .background-color-N1{background-color:#0A0F25;} + .d2-3076621705 .background-color-N2{background-color:#676C7E;} + .d2-3076621705 .background-color-N3{background-color:#9499AB;} + .d2-3076621705 .background-color-N4{background-color:#CFD2DD;} + .d2-3076621705 .background-color-N5{background-color:#DEE1EB;} + .d2-3076621705 .background-color-N6{background-color:#EEF1F8;} + .d2-3076621705 .background-color-N7{background-color:#FFFFFF;} + .d2-3076621705 .background-color-B1{background-color:#0D32B2;} + .d2-3076621705 .background-color-B2{background-color:#0D32B2;} + .d2-3076621705 .background-color-B3{background-color:#E3E9FD;} + .d2-3076621705 .background-color-B4{background-color:#E3E9FD;} + .d2-3076621705 .background-color-B5{background-color:#EDF0FD;} + .d2-3076621705 .background-color-B6{background-color:#F7F8FE;} + .d2-3076621705 .background-color-AA2{background-color:#4A6FF3;} + .d2-3076621705 .background-color-AA4{background-color:#EDF0FD;} + .d2-3076621705 .background-color-AA5{background-color:#F7F8FE;} + .d2-3076621705 .background-color-AB4{background-color:#EDF0FD;} + .d2-3076621705 .background-color-AB5{background-color:#F7F8FE;} + .d2-3076621705 .color-N1{color:#0A0F25;} + .d2-3076621705 .color-N2{color:#676C7E;} + .d2-3076621705 .color-N3{color:#9499AB;} + .d2-3076621705 .color-N4{color:#CFD2DD;} + .d2-3076621705 .color-N5{color:#DEE1EB;} + .d2-3076621705 .color-N6{color:#EEF1F8;} + .d2-3076621705 .color-N7{color:#FFFFFF;} + .d2-3076621705 .color-B1{color:#0D32B2;} + .d2-3076621705 .color-B2{color:#0D32B2;} + .d2-3076621705 .color-B3{color:#E3E9FD;} + .d2-3076621705 .color-B4{color:#E3E9FD;} + .d2-3076621705 .color-B5{color:#EDF0FD;} + .d2-3076621705 .color-B6{color:#F7F8FE;} + .d2-3076621705 .color-AA2{color:#4A6FF3;} + .d2-3076621705 .color-AA4{color:#EDF0FD;} + .d2-3076621705 .color-AA5{color:#F7F8FE;} + .d2-3076621705 .color-AB4{color:#EDF0FD;} + .d2-3076621705 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>cab12312xyxyz yzuvw + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/nested_diagram_types/elk/board.exp.json b/e2etests/testdata/stable/nested_diagram_types/elk/board.exp.json index 8f5124b95..723443863 100644 --- a/e2etests/testdata/stable/nested_diagram_types/elk/board.exp.json +++ b/e2etests/testdata/stable/nested_diagram_types/elk/board.exp.json @@ -3,53 +3,12 @@ "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ - { - "id": "b", - "type": "sequence_diagram", - "pos": { - "x": 12, - "y": 12 - }, - "width": 547, - "height": 402, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 0, - "borderRadius": 0, - "fill": "N7", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "b", - "fontSize": 28, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 13, - "labelHeight": 36, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 1 - }, { "id": "c", "type": "rectangle", "pos": { - "x": 579, - "y": 180 + "x": 12, + "y": 12 }, "width": 53, "height": 66, @@ -86,14 +45,96 @@ "level": 1 }, { - "id": "b.1", + "id": "a", "type": "rectangle", "pos": { - "x": 12, - "y": 12 + "x": 85, + "y": -130 }, - "width": 547, - "height": 266, + "width": 579, + "height": 351, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "sequence_diagram", + "pos": { + "x": 85, + "y": 240 + }, + "width": 521, + "height": 1106, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a.1", + "type": "rectangle", + "pos": { + "x": 145, + "y": -70 + }, + "width": 52, + "height": 231, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -118,23 +159,23 @@ "language": "", "color": "N1", "italic": false, - "bold": false, + "bold": true, "underline": false, "labelWidth": 7, "labelHeight": 21, - "labelPosition": "INSIDE_TOP_CENTER", + "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 2 }, { - "id": "b.2", + "id": "a.2", "type": "rectangle", "pos": { - "x": 187, - "y": 348 + "x": 237, + "y": -70 }, - "width": 197, - "height": 66, + "width": 53, + "height": 231, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -159,7 +200,7 @@ "language": "", "color": "N1", "italic": false, - "bold": false, + "bold": true, "underline": false, "labelWidth": 8, "labelHeight": 21, @@ -168,19 +209,60 @@ "level": 2 }, { - "id": "b.1.x", + "id": "a.3", + "type": "sequence_diagram", + "pos": { + "x": 330, + "y": -70 + }, + "width": 274, + "height": 231, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "3", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.3.x", "type": "rectangle", "pos": { - "x": 62, - "y": 62 + "x": 342, + "y": 12 }, - "width": 302, - "height": 166, + "width": 100, + "height": 66, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "B4", + "fill": "N7", "stroke": "B1", "shadow": false, "3d": false, @@ -204,141 +286,18 @@ "underline": false, "labelWidth": 7, "labelHeight": 21, - "labelPosition": "INSIDE_TOP_CENTER", + "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 3 }, { - "id": "b.1.x.u", + "id": "a.3.y", "type": "rectangle", "pos": { - "x": 112, - "y": 112 + "x": 492, + "y": 12 }, - "width": 52, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "N7", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "u", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 7, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 4 - }, - { - "id": "b.1.x.v", - "type": "rectangle", - "pos": { - "x": 184, - "y": 112 - }, - "width": 53, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "N7", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "v", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 8, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 4 - }, - { - "id": "b.1.x.w", - "type": "rectangle", - "pos": { - "x": 257, - "y": 112 - }, - "width": 57, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "N7", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "w", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 12, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 4 - }, - { - "id": "b.1.y", - "type": "rectangle", - "pos": { - "x": 384, - "y": 112 - }, - "width": 53, + "width": 100, "height": 66, "opacity": 1, "strokeDash": 0, @@ -373,11 +332,297 @@ "level": 3 }, { - "id": "b.1.z", + "id": "b.1", "type": "rectangle", "pos": { - "x": 457, - "y": 112 + "x": 97, + "y": 448 + }, + "width": 100, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "b.2", + "type": "rectangle", + "pos": { + "x": 237, + "y": 328 + }, + "width": 357, + "height": 186, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "b.1.x", + "type": "rectangle", + "pos": { + "x": 141, + "y": 644 + }, + "width": 12, + "height": 358, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "zIndex": 2, + "level": 3 + }, + { + "id": "b.1.x.u", + "type": "page", + "pos": { + "x": 121, + "y": 654 + }, + "width": 52, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "u", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 4 + }, + { + "id": "b.1.x.v", + "type": "page", + "pos": { + "x": 120, + "y": 790 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "v", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 4 + }, + { + "id": "b.1.x.w", + "type": "page", + "pos": { + "x": 118, + "y": 926 + }, + "width": 57, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "w", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 4 + }, + { + "id": "b.1.y", + "type": "page", + "pos": { + "x": 120, + "y": 1062 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "y", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 3 + }, + { + "id": "b.1.z", + "type": "page", + "pos": { + "x": 121, + "y": 1198 }, "width": 52, "height": 66, @@ -410,15 +655,15 @@ "labelWidth": 7, "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, + "zIndex": 5, "level": 3 }, { "id": "b.2.x", "type": "rectangle", "pos": { - "x": 187, - "y": 348 + "x": 297, + "y": 388 }, "width": 52, "height": 66, @@ -458,8 +703,8 @@ "id": "b.2.y", "type": "rectangle", "pos": { - "x": 259, - "y": 348 + "x": 389, + "y": 388 }, "width": 53, "height": 66, @@ -499,8 +744,8 @@ "id": "b.2.z", "type": "rectangle", "pos": { - "x": 332, - "y": 348 + "x": 482, + "y": 388 }, "width": 52, "height": 66, @@ -535,255 +780,161 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 3 - }, - { - "id": "a", - "type": "rectangle", - "pos": { - "x": 652, - "y": -406 - }, - "width": 245, - "height": 398, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "B4", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "a", - "fontSize": 28, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 12, - "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 0, - "level": 1 - }, - { - "id": "a.1", - "type": "rectangle", - "pos": { - "x": 712, - "y": -346 - }, - "width": 125, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "B5", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "1", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": true, - "underline": false, - "labelWidth": 7, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 2 - }, - { - "id": "a.2", - "type": "rectangle", - "pos": { - "x": 712, - "y": -240 - }, - "width": 125, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "B5", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "2", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": true, - "underline": false, - "labelWidth": 8, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 2 - }, - { - "id": "a.3", - "type": "sequence_diagram", - "pos": { - "x": 712, - "y": -134 - }, - "width": 125, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 0, - "borderRadius": 0, - "fill": "N7", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "3", - "fontSize": 24, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 11, - "labelHeight": 31, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 2 - }, - { - "id": "a.3.x", - "type": "rectangle", - "pos": { - "x": 712, - "y": -134 - }, - "width": 52, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "N7", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "x", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 7, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 3 - }, - { - "id": "a.3.y", - "type": "rectangle", - "pos": { - "x": 784, - "y": -134 - }, - "width": 53, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "N7", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "y", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 8, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 3 } ], "connections": [ + { + "id": "a.(1 -> 2)[0]", + "src": "a.1", + "srcArrow": "none", + "dst": "a.2", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 196.5, + "y": 45 + }, + { + "x": 237.5, + "y": 45 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "a.(2 -> 3)[0]", + "src": "a.2", + "srcArrow": "none", + "dst": "a.3", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 290, + "y": 45 + }, + { + "x": 330, + "y": 45 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.3.x -- )[0]", + "src": "a.3.x", + "srcArrow": "none", + "dst": "x-lifeline-end-1678191278", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 392, + "y": 78.5 + }, + { + "x": 392, + "y": 148.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(a.3.y -- )[0]", + "src": "a.3.y", + "srcArrow": "none", + "dst": "y-lifeline-end-35261543", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 542, + "y": 78.5 + }, + { + "x": 542, + "y": 148.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, { "id": "b.(1 -> 2)[0]", "src": "b.1", @@ -809,18 +960,94 @@ "labelPercentage": 0, "route": [ { - "x": 285.5, - "y": 278 + "x": 147, + "y": 584.5 }, { - "x": 285.5, - "y": 348 + "x": 415.5, + "y": 584.5 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 4 + }, + { + "id": "(b.1 -- )[0]", + "src": "b.1", + "srcArrow": "none", + "dst": "1-lifeline-end-1719232319", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 147, + "y": 514.5 + }, + { + "x": 147, + "y": 1334.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(b.2 -- )[0]", + "src": "b.2", + "srcArrow": "none", + "dst": "2-lifeline-end-1739547740", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 415.5, + "y": 514.5 + }, + { + "x": 415.5, + "y": 1334.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 } ], "root": { diff --git a/e2etests/testdata/stable/nested_diagram_types/elk/sketch.exp.svg b/e2etests/testdata/stable/nested_diagram_types/elk/sketch.exp.svg index 0bc4e994d..93df04694 100644 --- a/e2etests/testdata/stable/nested_diagram_types/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/nested_diagram_types/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -bca12123xyzxyzxyuvw - - - - - - - - - - - - - - - - - - - - + .d2-1319705341 .fill-N1{fill:#0A0F25;} + .d2-1319705341 .fill-N2{fill:#676C7E;} + .d2-1319705341 .fill-N3{fill:#9499AB;} + .d2-1319705341 .fill-N4{fill:#CFD2DD;} + .d2-1319705341 .fill-N5{fill:#DEE1EB;} + .d2-1319705341 .fill-N6{fill:#EEF1F8;} + .d2-1319705341 .fill-N7{fill:#FFFFFF;} + .d2-1319705341 .fill-B1{fill:#0D32B2;} + .d2-1319705341 .fill-B2{fill:#0D32B2;} + .d2-1319705341 .fill-B3{fill:#E3E9FD;} + .d2-1319705341 .fill-B4{fill:#E3E9FD;} + .d2-1319705341 .fill-B5{fill:#EDF0FD;} + .d2-1319705341 .fill-B6{fill:#F7F8FE;} + .d2-1319705341 .fill-AA2{fill:#4A6FF3;} + .d2-1319705341 .fill-AA4{fill:#EDF0FD;} + .d2-1319705341 .fill-AA5{fill:#F7F8FE;} + .d2-1319705341 .fill-AB4{fill:#EDF0FD;} + .d2-1319705341 .fill-AB5{fill:#F7F8FE;} + .d2-1319705341 .stroke-N1{stroke:#0A0F25;} + .d2-1319705341 .stroke-N2{stroke:#676C7E;} + .d2-1319705341 .stroke-N3{stroke:#9499AB;} + .d2-1319705341 .stroke-N4{stroke:#CFD2DD;} + .d2-1319705341 .stroke-N5{stroke:#DEE1EB;} + .d2-1319705341 .stroke-N6{stroke:#EEF1F8;} + .d2-1319705341 .stroke-N7{stroke:#FFFFFF;} + .d2-1319705341 .stroke-B1{stroke:#0D32B2;} + .d2-1319705341 .stroke-B2{stroke:#0D32B2;} + .d2-1319705341 .stroke-B3{stroke:#E3E9FD;} + .d2-1319705341 .stroke-B4{stroke:#E3E9FD;} + .d2-1319705341 .stroke-B5{stroke:#EDF0FD;} + .d2-1319705341 .stroke-B6{stroke:#F7F8FE;} + .d2-1319705341 .stroke-AA2{stroke:#4A6FF3;} + .d2-1319705341 .stroke-AA4{stroke:#EDF0FD;} + .d2-1319705341 .stroke-AA5{stroke:#F7F8FE;} + .d2-1319705341 .stroke-AB4{stroke:#EDF0FD;} + .d2-1319705341 .stroke-AB5{stroke:#F7F8FE;} + .d2-1319705341 .background-color-N1{background-color:#0A0F25;} + .d2-1319705341 .background-color-N2{background-color:#676C7E;} + .d2-1319705341 .background-color-N3{background-color:#9499AB;} + .d2-1319705341 .background-color-N4{background-color:#CFD2DD;} + .d2-1319705341 .background-color-N5{background-color:#DEE1EB;} + .d2-1319705341 .background-color-N6{background-color:#EEF1F8;} + .d2-1319705341 .background-color-N7{background-color:#FFFFFF;} + .d2-1319705341 .background-color-B1{background-color:#0D32B2;} + .d2-1319705341 .background-color-B2{background-color:#0D32B2;} + .d2-1319705341 .background-color-B3{background-color:#E3E9FD;} + .d2-1319705341 .background-color-B4{background-color:#E3E9FD;} + .d2-1319705341 .background-color-B5{background-color:#EDF0FD;} + .d2-1319705341 .background-color-B6{background-color:#F7F8FE;} + .d2-1319705341 .background-color-AA2{background-color:#4A6FF3;} + .d2-1319705341 .background-color-AA4{background-color:#EDF0FD;} + .d2-1319705341 .background-color-AA5{background-color:#F7F8FE;} + .d2-1319705341 .background-color-AB4{background-color:#EDF0FD;} + .d2-1319705341 .background-color-AB5{background-color:#F7F8FE;} + .d2-1319705341 .color-N1{color:#0A0F25;} + .d2-1319705341 .color-N2{color:#676C7E;} + .d2-1319705341 .color-N3{color:#9499AB;} + .d2-1319705341 .color-N4{color:#CFD2DD;} + .d2-1319705341 .color-N5{color:#DEE1EB;} + .d2-1319705341 .color-N6{color:#EEF1F8;} + .d2-1319705341 .color-N7{color:#FFFFFF;} + .d2-1319705341 .color-B1{color:#0D32B2;} + .d2-1319705341 .color-B2{color:#0D32B2;} + .d2-1319705341 .color-B3{color:#E3E9FD;} + .d2-1319705341 .color-B4{color:#E3E9FD;} + .d2-1319705341 .color-B5{color:#EDF0FD;} + .d2-1319705341 .color-B6{color:#F7F8FE;} + .d2-1319705341 .color-AA2{color:#4A6FF3;} + .d2-1319705341 .color-AA4{color:#EDF0FD;} + .d2-1319705341 .color-AA5{color:#F7F8FE;} + .d2-1319705341 .color-AB4{color:#EDF0FD;} + .d2-1319705341 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>cab12312xyxyz yzuvw + + + + + + + + + + + + + + + + + + + \ No newline at end of file